2108 files changed, 60894 insertions, 28201 deletions

diff --git a/.gitmodules b/.gitmodules
index 86e1ef843..ed8fd1cd1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [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
 [submodule "libltdl"]
 	path = libltdl
 	url = https://system@scm.trinitydesktop.org/scm/git/libltdl
diff --git a/CMakeL10n.txt b/CMakeL10n.txt
index ca597109c..d4599c271 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 )
 
 
@@ -35,7 +38,7 @@ endif( )
 if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp )
   # hide "#define" to allow strings to be extracted using xgettext
   file( READ ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp _tqt_qxml )
-  string( REGEX REPLACE "\n(#define[^\n]*)(QT_TRANSLATE_NOOP)" "\n/*\\1*/\\2" _tqt_qxml ${_tqt_qxml} )
+  string( REGEX REPLACE "\n(#define[^\n]*)(TQT_TRANSLATE_NOOP)" "\n/*\\1*/\\2" _tqt_qxml ${_tqt_qxml} )
   file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/../../dependencies/tqt3/src/xml/qxml.cpp.tde_l10n "${_tqt_qxml}" )
 endif( )
 
@@ -120,6 +123,7 @@ tde_l10n_create_template(
     "^tdecore/tdeconfig_compiler/example/"
     "^tdeio/"
     "^tdeioslave/"
+    "^tdemarkdown/md4c/"
     "^tdeprint/"
     "^tdeui/colors/"
     "^tdestyles/.*/config/"
@@ -127,7 +131,7 @@ tde_l10n_create_template(
   KEYWORDS
     tr tr:1,2
     translate translate:1,2
-    QT_TRANSLATE_NOOP QT_TRANSLATE_NOOP:1,2
+    TQT_TRANSLATE_NOOP TQT_TRANSLATE_NOOP:1,2
   X-POT "-"
 )
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1807c474d..631e7a5a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,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 #####################
@@ -17,13 +22,13 @@ cmake_minimum_required( VERSION 2.8 )
 project( tdelibs )
 
 set( PACKAGE tdelibs )
-set( VERSION R14.1.0 )
 
 
 ##### include essential cmake modules ###########
 
 include( FindPkgConfig )
 include( CheckIncludeFile )
+include( CheckIncludeFiles )
 include( CheckSymbolExists )
 include( CheckFunctionExists )
 include( CheckCSourceCompiles )
@@ -31,11 +36,11 @@ include( CheckCXXSourceCompiles )
 include( CheckTypeSize )
 include( CheckCSourceRuns )
 include( CheckLibraryExists )
+include( CheckStructHasMember )
 
 
 ##### include our cmake modules #################
 
-set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
 include( TDEMacros )
 include( TDESetupPaths )
 
@@ -52,68 +57,90 @@ list( APPEND TDECORE_LIBRARY_DIRS ${TQT_LIBRARY_DIRS} )
 
 ##### add apidox targets ############
 
-add_custom_target(apidox
-  COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/tqt3/doc/html"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+add_custom_target( apidox
+  COMMAND ${CMAKE_COMMAND} -E env
+    "TQTDOCDIR=/usr/share/tqt3/doc/html"
+    ${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()"
+)
 
 
 ##### user requested OPTIONs ####################
 
-OPTION( WITH_ALL_OPTIONS "Enable all OPTIONal support" OFF )
-
-OPTION( TDE_MALLOC "Use own malloc implementation" OFF )
-OPTION( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF )
-OPTION( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF )
-
-OPTION( WITH_ARTS "Build with aRts" ON )
-OPTION( WITH_ALSA "Enable ALSA support" ON )
-OPTION( WITH_LIBART "Enable libart support (for SVG icons)" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LIBIDN "Enable support for libidn" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_SSL "Enable support for SSL" ON )
-OPTION( WITH_CUPS "Enable CUPS support" ON )
-OPTION( WITH_LUA "Enable LUA support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_TIFF "Enable tiff support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_JASPER "Enable jasper (jpeg2k) support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
-OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
-OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_TDEHWLIB "Enable TDE hwlib globally" ON )
-OPTION( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} )
-OPTION( WITH_HAL "Enable HAL support" OFF )
-OPTION( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )
-OPTION( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )
-OPTION( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_UDEVIL "Enable udevil support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_CONSOLEKIT "Enable ConsoleKit support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
-OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
-OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
-OPTION( WITH_PCSC "Enable PC/SC SmartCard support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_PKCS "Enable PKCS support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_CRYPTSETUP "Enable cryptsetup support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
-OPTION( WITH_XRANDR "Build the tderandr library" ON )
-OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON )
-OPTION( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
-
-OPTION( WITH_ISPELL "Enable ispell support" ON )
-OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
-OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
-
-OPTION( WITH_TDEICONLOADER_DEBUG "Enable debugging in TDEIconLoader class" OFF )
+option( WITH_ALL_OPTIONS "Enable all OPTIONal support" OFF )
+
+option( TDE_MALLOC "Use own malloc implementation" OFF )
+option( TDE_MALLOC_DEBUG "Enable debugging in fast malloc" OFF )
+option( TDE_MALLOC_FULL "Make alloc as fast as possible" OFF )
+
+option( WITH_ARTS "Build with aRts" ON )
+option( WITH_ALSA "Enable ALSA support" ON )
+option( WITH_LIBART "Enable libart support (for SVG icons)" ${WITH_ALL_OPTIONS} )
+option( WITH_LIBIDN "Enable support for libidn" ${WITH_ALL_OPTIONS} )
+option( WITH_SSL "Enable support for SSL" ON )
+option( WITH_CUPS "Enable CUPS support" ON )
+option( WITH_IMAGETOPS_BINARY "Enable installation of imagetops binary" ${WITH_ALL_OPTIONS} )
+option( WITH_LUA "Enable LUA support" ${WITH_ALL_OPTIONS} )
+option( WITH_TIFF "Enable tiff support" ${WITH_ALL_OPTIONS} )
+option( WITH_JASPER "Enable jasper (jpeg2k) support" ${WITH_ALL_OPTIONS} )
+option( WITH_OPENEXR "Enable openexr support" ${WITH_ALL_OPTIONS} )
+option( WITH_UTEMPTER "Use utempter for utmp management" ${WITH_ALL_OPTIONS} )
+option( WITH_AVAHI "Enable AVAHI support" ${WITH_ALL_OPTIONS} )
+option( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
+option( WITH_PCRE "Enable pcre regex support for kjs" ON )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+option( WITH_INOTIFY "Enable inotify support for tdeio" ON )
+option( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
+option( WITH_TDEHWLIB "Enable TDE hwlib globally" ON )
+option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} )
+option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )
+option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )
+option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )
+option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )
+option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )
+option( WITH_UDEVIL "Enable udevil support" ${WITH_ALL_OPTIONS} )
+option( WITH_CONSOLEKIT "Enable ConsoleKit support" ${WITH_ALL_OPTIONS} )
+option( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
+option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
+option( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
+option( WITH_PCSC "Enable PC/SC SmartCard support" ${WITH_ALL_OPTIONS} )
+option( WITH_PKCS "Enable PKCS support" ${WITH_ALL_OPTIONS} )
+option( WITH_CRYPTSETUP "Enable cryptsetup support" ${WITH_ALL_OPTIONS} )
+option( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
+option( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
+option( WITH_XRANDR "Build the tderandr library" ON )
+option( WITH_XCOMPOSITE "Enable xcomposite support" ON )
+option( WITH_MITSHM "Use MIT-SHM for pixmap loading/saving" ${WITH_ALL_OPTIONS} )
+option( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
+
+option( WITH_ISPELL "Enable ispell support" ON )
+option( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
+option( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
+
+option( WITH_TDEICONLOADER_DEBUG "Enable debugging in TDEIconLoader class" OFF )
 
 
 ##### set PKG_CONFIG_PATH #######################
@@ -193,6 +220,7 @@ check_include_file( "dirent.h" HAVE_DIRENT_H )
 check_include_file( "dld.h" HAVE_DLD_H )
 check_include_file( "dlfcn.h" HAVE_DLFCN_H )
 check_include_file( "dl.h" HAVE_DL_H )
+check_include_files( "sys/types.h;sys/dl.h" HAVE_SYS_DL_H )
 check_include_file( "float.h" HAVE_FLOAT_H )
 check_include_file( "fstab.h" HAVE_FSTAB_H )
 check_include_file( "ieeefp.h" HAVE_IEEEFP_H )
@@ -205,6 +233,7 @@ check_include_file( "machine/soundcard.h" HAVE_MACHINE_SOUNDCARD_H )
 check_include_file( "malloc.h" HAVE_MALLOC_H )
 check_include_file( "memory.h" HAVE_MEMORY_H )
 check_include_file( "mntent.h" HAVE_MNTENT_H )
+check_include_file( "sys/mntent.h" HAVE_SYS_MNTENT_H )
 check_include_file( "ndir.h" HAVE_NDIR_H )
 check_include_file( "netinet/in.h" HAVE_NETINET_IN_H )
 check_include_file( "net/if.h" HAVE_NET_IF_H )
@@ -228,7 +257,7 @@ check_include_file( "sys/dir.h" HAVE_SYS_DIR_H )
 check_include_file( "sys/filio.h" HAVE_SYS_FILIO_H )
 check_include_file( "sys/mman.h" HAVE_SYS_MMAN_H )
 check_include_file( "sys/mntent.h" HAVE_SYS_MNTENT_H )
-check_include_file( "sys/mnttab.h" HAVE_SYS_MNTTAB_H )
+check_include_files( "stdio.h;sys/mnttab.h" HAVE_SYS_MNTTAB_H )
 check_include_file( "sys/mount.h" HAVE_SYS_MOUNT_H )
 if( NOT HAVE_SYS_MOUNT_H )
   find_path( SYS_MOUNT_PATH "sys/mount.h" )
@@ -248,9 +277,16 @@ check_include_file( "sys/ucred.h" HAVE_SYS_UCRED_H )
 if( NOT HAVE_SYS_UCRED_H )
   find_path( SYS_UCRED_PATH "sys/ucred.h" )
   if( SYS_UCRED_PATH )
-    set( HAVE_SYS_UCRED_H "1" )
+    set( HAVE_SYS_UCRED_H 1 )
   endif( )
 endif( )
+check_include_file( "ucred.h" HAVE_UCRED_H )
+if( NOT HAVE_UCRED_H )
+  find_path( UCRED_PATH "ucred.h" )
+  if( UCRED_PATH )
+    set( HAVE_UCRED_H 1 )
+  endif()
+endif()
 check_include_file( "sys/xattr.h" HAVE_SYS_XATTR_H )
 check_include_file( "termios.h" HAVE_TERMIOS_H )
 check_include_file( "termio.h" HAVE_TERMIO_H )
@@ -317,7 +353,7 @@ check_function_exists( mkstemp HAVE_MKSTEMP )
 check_symbol_exists( mkstemp "stdlib.h" HAVE_MKSTEMP_PROTO )
 
 check_function_exists( mkstemps HAVE_MKSTEMPS )
-check_symbol_exists( mkstemps "stdlib.h" HAVE_MKSTEMPS_PROTO )
+check_symbol_exists( mkstemps "stdlib.h;unistd.h" HAVE_MKSTEMPS_PROTO )
 
 check_function_exists( initgroups HAVE_INITGROUPS )
 check_symbol_exists( initgroups "grp.h;unistd.h" HAVE_INITGROUPS_PROTO )
@@ -345,6 +381,9 @@ else ()
   find_package( Backtrace )
   if ( Backtrace_FOUND )
     set ( HAVE_BACKTRACE 1 )
+  else ()
+    set ( Backtrace_LIBRARY "" )
+    set ( Backtrace_HEADER "" )
   endif ()
 endif ()
 check_cxx_source_compiles( "#include <cxxabi.h>
@@ -392,6 +431,7 @@ endif( HAVE_GETMNTINFO )
 check_function_exists( getnameinfo HAVE_GETNAMEINFO )
 check_function_exists( getpagesize HAVE_GETPAGESIZE )
 check_function_exists( getpeereid HAVE_GETPEEREID )
+check_function_exists( getpeerucred HAVE_GETPEERUCRED )
 check_function_exists( getpeername HAVE_GETPEERNAME )
 check_function_exists( getprotobyname_r HAVE_GETPROTOBYNAME_R )
 check_function_exists( getpt HAVE_GETPT )
@@ -431,12 +471,20 @@ check_function_exists( __argz_count HAVE___ARGZ_COUNT )
 check_function_exists( __argz_next HAVE___ARGZ_NEXT )
 check_function_exists( __argz_stringify HAVE___ARGZ_STRINGIFY )
 check_function_exists( sendfile HAVE_SENDFILE )
+set( SENDFILE_LIBRARIES "" )
+if( NOT HAVE_SENDFILE)
+  check_library_exists( sendfile sendfile "" HAVE_SENDFILE_LIB )
+  if( HAVE_SENDFILE_LIB )
+    set( HAVE_SENDFILE 1 )
+    set( SENDFILE_LIBRARIES sendfile )
+  endif( HAVE_SENDFILE_LIB )
+endif()
 check_function_exists( rindex HAVE_RINDEX )
 check_function_exists( putenv HAVE_PUTENV )
 check_function_exists( poll HAVE_POLL )
-check_function_exists( memcpy HAVE_MEMCPY )
 check_function_exists( madvise HAVE_MADVISE )
 check_function_exists( getgroups HAVE_GETGROUPS )
+check_symbol_exists( posix_fadvise "fcntl.h" HAVE_FADVISE )
 check_function_exists( getcwd HAVE_GETCWD )
 check_function_exists( dlerror HAVE_DLERROR )
 if( NOT HAVE_DLERROR )
@@ -461,7 +509,6 @@ if( NOT HAVE_CRYPT )
     set( CRYPT_LIBRARIES c )
   endif( HAVE_CRYPT_LIBC )
 endif( NOT HAVE_CRYPT )
-check_function_exists( bcopy HAVE_BCOPY )
 check_function_exists( mmap HAVE_MMAP )
 check_function_exists( munmap HAVE_MUNMAP )
 
@@ -475,7 +522,13 @@ check_type_size( "unsigned long" SIZEOF_UNSIGNED_LONG )
 set( CMAKE_EXTRA_INCLUDE_FILES "netdb.h" )
 check_type_size( "struct addrinfo" STRUCT_ADDRINFO )
 set( CMAKE_EXTRA_INCLUDE_FILES "netinet/in.h" )
-check_type_size( "struct sockaddr_in6" HAVE_STRUCT_SOCKADDR_IN6 )
+check_type_size( "struct sockaddr_in6" STRUCT_SOCKADDR_IN6 )
+check_struct_has_member( "struct sockaddr_in6" sin6_scope_id "sys/types.h;sys/socket.h;netinet/in.h" HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID )
+check_struct_has_member( "struct sockaddr" sa_len "sys/types.h;sys/socket.h;netinet/in.h" HAVE_STRUCT_SOCKADDR_SA_LEN )
+check_struct_has_member( "struct sockaddr_un" sun_len "sys/types.h;sys/un.h" HAVE_STRUCT_SOCKADDR_UN_SUN_LEN )
+set( CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h" )
+check_type_size( "struct ucred" STRUCT_UCRED )
+check_struct_has_member( "struct sockaddr_in" sin_len "sys/types.h;sys/socket.h;netinet/in.h" HAVE_STRUCT_SOCKADDR_IN_SIN_LEN )
 unset( CMAKE_EXTRA_INCLUDE_FILES )
 
 check_c_source_compiles("
@@ -521,6 +574,8 @@ endif( NOT HAVE_GOOD_GETADDRINFO )
 # save CMAKE_REQUIRED_LIBRARIES
 set( bak_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} )
 
+check_symbol_exists( res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO )
+
 set( CMAKE_REQUIRED_LIBRARIES resolv )
 check_c_source_compiles("
   #include <sys/types.h>
@@ -607,6 +662,7 @@ if( NOT HAVE_LIBDL )
     set( HAVE_LIBDL 1 )
   endif( HAVE_DLOPEN )
 endif( NOT HAVE_LIBDL )
+check_library_exists( dld, dld_link "" HAVE_DLD )
 
 
 ##### check for magic ###########################
@@ -713,26 +769,29 @@ endif( WITH_LZMA )
 
 ##### check for pcsc ############################
 
-if( WITH_PCSC )
-  find_path( PCSCLITE_INCLUDE_DIR pcsclite.h
-    HINTS /usr/include/PCSC )
-  find_library( PCSCLITE_LIBRARY NAMES pcsclite libpcsclite PCSC )
-  if( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR )
-    message( STATUS "Found PCSCLITE: ${PCSCLITE_LIBRARY}" )
-    set( PCSCLITE_FOUND 1 )
-    set( PCSCLITE_INCLUDE_DIRS ${PCSCLITE_INCLUDE_DIR} )
-    set( PCSCLITE_LIBRARIES ${PCSCLITE_LIBRARY} )
-  endif( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR )
+if( WITH_TDEHWLIB AND WITH_PCSC )
+  pkg_search_module( PCSCLITE libpcsclite )
+  if( NOT PCSCLITE_FOUND )
+    find_path( PCSCLITE_INCLUDE_DIR pcsclite.h
+      HINTS /usr/include/PCSC )
+    find_library( PCSCLITE_LIBRARY NAMES pcsclite libpcsclite PCSC )
+    if( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR )
+      message( STATUS "Found PCSCLITE: ${PCSCLITE_LIBRARY}" )
+      set( PCSCLITE_FOUND 1 )
+      set( PCSCLITE_INCLUDE_DIRS ${PCSCLITE_INCLUDE_DIR} )
+      set( PCSCLITE_LIBRARIES ${PCSCLITE_LIBRARY} )
+    endif( PCSCLITE_LIBRARY AND PCSCLITE_INCLUDE_DIR )
+  endif( NOT PCSCLITE_FOUND )
   if( NOT PCSCLITE_FOUND )
     tde_message_fatal( "PCSCLITE is requested, but not found on your system" )
   endif( NOT PCSCLITE_FOUND )
   set( HAVE_PCSC_SUPPORT 1 )
-endif( WITH_PCSC )
+endif( WITH_TDEHWLIB AND WITH_PCSC )
 
 
 ##### check for pkcs ############################
 
-if( WITH_PKCS )
+if( WITH_TDEHWLIB AND WITH_PKCS )
   pkg_search_module( LIBPKCS11-HELPER libpkcs11-helper-1 )
   if( NOT LIBPKCS11-HELPER_FOUND )
       message(FATAL_ERROR "\nPKCS support was requested, but libpkcs11-helper-1 was not found on your system" )
@@ -754,7 +813,7 @@ endif( )
 
 ##### check for pkcs ############################
 
-if( WITH_CRYPTSETUP )
+if( WITH_TDEHWLIB AND WITH_CRYPTSETUP )
   pkg_search_module( LIBCRYPTSETUP libcryptsetup )
   if( NOT LIBCRYPTSETUP_FOUND )
     find_library( LIBCRYPTSETUP_LIBRARY cryptsetup )
@@ -771,7 +830,7 @@ if( WITH_CRYPTSETUP )
     check_c_source_compiles("
       #include <stddef.h>
       #include <libcryptsetup.h>
-      int main(int argc, char *argv[]) { crypt_keyslot_info status = CRYPT_SLOT_INVALID; return 0; } "
+      int main(int argc, char *argv[]) { crypt_keyslot_info status = CRYPT_SLOT_ACTIVE; return 0; } "
       HAVE_NEW_CRYPTSETUP )
     check_c_source_compiles("
       #include <stddef.h>
@@ -1130,9 +1189,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( )
 
@@ -1406,6 +1465,7 @@ add_subdirectory( kate )
 add_subdirectory( tdecert )
 tde_conditional_add_subdirectory( WITH_XRANDR tderandr )
 add_subdirectory( tdehtml )
+add_subdirectory( tdemarkdown )
 add_subdirectory( tdecmshell )
 add_subdirectory( tdeconf_update )
 add_subdirectory( tdewidgets )
diff --git a/KDE3PORTING.html b/KDE3PORTING.html
index d57e90b39..ba92f9313 100644
--- a/KDE3PORTING.html
+++ b/KDE3PORTING.html
@@ -155,9 +155,9 @@ not be available.
 	<li> TDEAccel::insertItem() and TDEAccel::connectItem().
 <pre>
 	- tdeaccel-&gt;insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
-	- tdeaccel-&gt;connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
+	- tdeaccel-&gt;connectItem( "Scroll Up", this, TQ_SLOT(scrollUp()) );
 	+ tdeaccel-&gt;insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
-		Key_Up, this, TQT_SLOT(scrollUp()) );
+		Key_Up, this, TQ_SLOT(scrollUp()) );
 </pre>
 	Note that a What's This parameter is now a part of the insert function.
 	You might replace the TQString::null parameter with
@@ -176,7 +176,7 @@ not be available.
 The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
 <pre>
 	new TDEAction( i18n("Scroll Up"), Key_Up,
-		this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
+		this, TQ_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
 </pre>
 
 <h5>TDEGlobalAccel</h5>
@@ -196,7 +196,7 @@ The preferred means of defining a shortcut, however, is to use <b>TDEAction</b>.
 	have been removed. (Nobody on the list knew what its function was
 	supposed to be.)  Calls to <i>insert()</i> and the equivalent
 	<i>key(TDEStdAccel::Insert)</i> can be replaced with the former default
-	of <i>Qt::CTRL+Qt::Key_Insert</i>.</li>
+	of <i>TQt::CTRL+TQt::Key_Insert</i>.</li>
 	<li>The following functions have been deprecated and will need to be changed if KDE_NO_COMPAT is defined:
 		<table border=1>
 			<tr><th>Old</th><th>New</th></tr>
@@ -474,7 +474,7 @@ setURLArgs does the job.
 The API has been cleaned up to be in line with the rest of tdelibs, in particular:
 <ul>
 <li>suggestions() now returns a TQStringList instead of a pointer to a QStringList
-<li>intermediateBuffer() now returns a TQString instead of a pointer to a QString
+<li>intermediateBuffer() now returns a TQString instead of a pointer to a TQString
 <li>The signal <b>misspelling(TQString, TQStringList *, unsigned)</b> has changed to
     misspelling(const TQString &amp;, const TQStringList &amp;, unsigned int)
 <li>The signal <b>corrected(TQString, TQString, unsigned)</b> has changed to
diff --git a/Makefile.am.in b/Makefile.am.in
index 94e20cf66..9dcc14524 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -51,7 +51,6 @@ messages:
 	fgrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
 	dirs=`cat dirs` ;\
 	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
-	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	echo ./tdecore/tde-config.cpp.in >> files ;\
 	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
diff --git a/README b/README
index b131dc607..7973e5f21 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ In this file:
 
 About tdelibs
 -------------
-This is version R14.1.0 of the Trinity Desktop Environment [TDE] libraries.
+This is version R14.2.0~[DEVELOPMENT] of the Trinity Desktop Environment [TDE] libraries.
 
 This package includes libraries that are central to the development and 
 execution of a KDE program, as well as internationalization files for these 
diff --git a/TODO b/TODO
index 2fcb51b44..020661076 100644
--- a/TODO
+++ b/TODO
@@ -3,13 +3,12 @@ that we would like to make for the next binary incompatible release.
 
 - Check for forked classes in kde pim and other modules
 
-- There is no reason why TDEConfigBase should inherit from QObject, get rid of that.
+- There is no reason why TDEConfigBase should inherit from TQObject, get rid of that.
 
 - Change all FooPrivate *d; -> Private * const d; and place initialization
   in the constructor (for classes that would benefit from this).  To help catch silly
   mistakes since d should never change. Also consider changing to use KStaticDeleter to
-  help prevent mistakes where developers forget to delete the pointer. Maybe make use of
-  Qt4 helper macros? 
+  help prevent mistakes where developers forget to delete the pointer.
 
 - Move all utility functions away from TDEApplication. TBD: Make TDEApplication 
   a very thin wrapper around QApplication. Ideally, TDEApplication should go 
@@ -203,14 +202,14 @@ an alternative help->contents action)
   requests for things like re-reading the config of a KPanelExtension can be
   done by its parent.
 
-- Fix KURLRequester API to use KURL for urls instead of QString to make clear that
+- Fix KURLRequester API to use KURL for urls instead of TQString to make clear that
   we work with URLs and not with paths.
 
 - Dump KPixmapIO class. QPixmap with qt-copy patches #0005 and #0007 can perform just as well,
   KPixmapIO can't dither, and it generally doesn't make much sense to have this class.
 
 - TDEListView: merge setDropHighlighter and setDropVisualizer, add a setDnDMode to choose between
-  "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail). Unless Qt4 does it all :)
+  "dnd to move items" (e.g. keditbookmarks) and "dnd onto items" (e.g. kmail).
 
 - Move TDEIO::findDeviceMountPoint, findPathMoundPoint, probably_slow_mounted, and testFileSystemFlag to KMountPoint,
   to merge that code.
diff --git a/admin b/admin
-Subproject 65b6c5ac6f39c266c114d1fdc452d92442f776c
+Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 091be3526..211a76924 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -43,15 +43,15 @@ install( FILES
 set( target artskde )
 
 set( ${target}_SRCS
-  artskde.cc kioinputstream_impl.cpp kplayobject.cc
-  kplayobjectfactory.cc kartsfloatwatch.cpp kartsdispatcher.cc
+  artskde.cpp kioinputstream_impl.cpp kplayobject.cpp
+  kplayobjectfactory.cpp kartsfloatwatch.cpp kartsdispatcher.cpp
   kaudiorecordstream.cpp kaudioplaystream.cpp kartsserver.cpp
-  kdatarequest_impl.cpp kaudioconverter.cc kvideowidget.cpp
-  kplayobjectcreator.cc kaudiomanagerplay.cpp
+  kdatarequest_impl.cpp kaudioconverter.cpp kvideowidget.cpp
+  kplayobjectcreator.cpp kaudiomanagerplay.cpp
 )
 
 add_custom_command(
-  OUTPUT artskde.cc artskde.h
+  OUTPUT artskde.cpp artskde.h
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
   DEPENDS artskde.idl
diff --git a/arts/kde/Makefile.am b/arts/kde/Makefile.am
index 37a86f2ad..394b0a32a 100644
--- a/arts/kde/Makefile.am
+++ b/arts/kde/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES = -I$(top_builddir)/arts/kde \
            -I$(top_srcdir) -I$(includedir)/arts $(all_includes)
 
 lib_LTLIBRARIES = libartskde.la
-libartskde_la_SOURCES = artskde.cc kioinputstream_impl.cpp kplayobject.cc \
-                        kplayobjectfactory.cc kartsfloatwatch.cpp kartsdispatcher.cc \
+libartskde_la_SOURCES = artskde.cpp kioinputstream_impl.cpp kplayobject.cpp \
+                        kplayobjectfactory.cpp kartsfloatwatch.cpp kartsdispatcher.cpp \
                         kaudiorecordstream.cpp kaudioplaystream.cpp \
-                        kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
-                        kvideowidget.cpp kplayobjectcreator.cc \
+                        kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cpp \
+                        kvideowidget.cpp kplayobjectcreator.cpp \
                         kaudiomanagerplay.cpp
 libartskde_la_LIBADD = $(LIB_TDEIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_TQT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
 libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
@@ -23,15 +23,15 @@ noinst_HEADERS = kplayobjectcreator.h kplayobjectfactory_p.h
 artskde.mcoptype: artskde.h
 artskde.mcopclass: artskde.h
 MCOPINC = -I$(srcdir)
-artskde.cc artskde.h: $(top_srcdir)/arts/kde/artskde.idl $(MCOPIDL)
+artskde.cpp artskde.h: $(top_srcdir)/arts/kde/artskde.idl $(MCOPIDL)
 	     $(MCOPIDL) -I$(includedir)/arts -t $(MCOPINC) $(top_srcdir)/arts/kde/artskde.idl
 
-DISTCLEANFILES = artskde.cc artskde.h artskde.mcoptype artskde.mcopclass
+DISTCLEANFILES = artskde.cpp artskde.h artskde.mcoptype artskde.mcopclass
 
 check_PROGRAMS = kiotest kiotestslow kconverttest
-kiotest_SOURCES = kiotest.cc
-kiotestslow_SOURCES = kiotestslow.cc
-kconverttest_SOURCES = kconverttest.cc
+kiotest_SOURCES = kiotest.cpp
+kiotestslow_SOURCES = kiotestslow.cpp
+kconverttest_SOURCES = kconverttest.cpp
 
 kiotest_LDADD = libartskde.la -lqtmcop -lkmedia2 -lsoundserver_idl
 kiotestslow_LDADD = $(kiotest_LDADD)
diff --git a/arts/kde/README b/arts/kde/README
index 2d34f08fd..8c3405e33 100644
--- a/arts/kde/README
+++ b/arts/kde/README
@@ -6,7 +6,7 @@ libartskde is a simple KDE->aRts wrapper
 that allows the developer to use KDE
 technology to access aRts.
 ie. no need to deal with std::string's anymore
-etc.. you can just use QString's or KURL's
+etc.. you can just use TQString's or KURL's
 to play sound
 
 2. How to use it to play sounds?
diff --git a/arts/kde/kartsdispatcher.cc b/arts/kde/kartsdispatcher.cpp
index fa41502f8..fa41502f8 100644
--- a/arts/kde/kartsdispatcher.cc
+++ b/arts/kde/kartsdispatcher.cpp
diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index b25085a78..ea2e1e66a 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -63,7 +63,7 @@ namespace Arts
  */
 class KDE_EXPORT KArtsDispatcher : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	/**
 	 * Constructor.
diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h
index cc6671556..b8cb229f0 100644
--- a/arts/kde/kartsfloatwatch.h
+++ b/arts/kde/kartsfloatwatch.h
@@ -44,11 +44,11 @@ namespace Arts { class KFloatWatchProxy_impl; }
  * \code
  *   StereoVolumeControl stereoVolumeControl = ...;
  *   KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this);
- *   connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float)));
+ *   connect(w, TQ_SIGNAL(valueChanged(float)), this, TQ_SLOT(setValue(float)));
  * \endcode
  */
 class KArtsFloatWatch : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 private:
 	KArtsFloatWatchPrivate *d;
 	friend class Arts::KFloatWatchProxy_impl;
diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h
index c0c04e66d..a5346aa06 100644
--- a/arts/kde/kartsserver.h
+++ b/arts/kde/kartsserver.h
@@ -36,7 +36,7 @@
  */
 class KDE_ARTS_EXPORT KArtsServer : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/**
diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cpp
index 1eb8c20e5..d387535d2 100644
--- a/arts/kde/kaudioconverter.cc
+++ b/arts/kde/kaudioconverter.cpp
@@ -88,7 +88,7 @@ void KAudioConverter::requestPlayObject(const KURL &url)
 		Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl();
 		inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl);
 
-		TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &)));
+		TQObject::connect(inputStreamImpl, TQ_SIGNAL(mimeTypeFound(const TQString &)), TQ_SLOT(slotMimeType(const TQString &)));
 
 		inputStream.openURL(url.url().latin1());
 		inputStream.streamStart();
@@ -161,9 +161,9 @@ void KAudioConverter::start()
 	Arts::connect(m_incoming->object(), "left", m_request, "left");
 	Arts::connect(m_incoming->object(), "right", m_request, "right");
 
-	TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long)));
-	TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long)));
-	TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData()));
+	TQObject::connect(requestImpl, TQ_SIGNAL(newBlockSize(long)), TQ_SIGNAL(newBlockSize(long)));
+	TQObject::connect(requestImpl, TQ_SIGNAL(newBlockPointer(long)), TQ_SIGNAL(newBlockPointer(long)));
+	TQObject::connect(requestImpl, TQ_SIGNAL(newData()), TQ_SIGNAL(newData()));
 
 	// Special mpeglib case
 	// TODO: needed at all??
diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h
index 0022d9bba..773018021 100644
--- a/arts/kde/kaudioconverter.h
+++ b/arts/kde/kaudioconverter.h
@@ -31,7 +31,7 @@ class TQString;
 
 class KAudioConverter : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KAudioConverter();
 	~KAudioConverter();
diff --git a/arts/kde/kaudioplaystream.h b/arts/kde/kaudioplaystream.h
index 6bcbd20ce..106112b6a 100644
--- a/arts/kde/kaudioplaystream.h
+++ b/arts/kde/kaudioplaystream.h
@@ -40,7 +40,7 @@ class KAudioPlayStreamPrivate;
 */
 
 class KDE_ARTS_EXPORT KAudioPlayStream : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	/**
 	 * Creates a KAudioPlayStream on server with a title. You should pass the KArtsServer also
diff --git a/arts/kde/kaudioplaystream_p.h b/arts/kde/kaudioplaystream_p.h
index a790a8c33..93cb92429 100644
--- a/arts/kde/kaudioplaystream_p.h
+++ b/arts/kde/kaudioplaystream_p.h
@@ -37,7 +37,7 @@ class KAudioPlayStream;
 class KByteSoundProducer;
 
 class KAudioPlayStreamPrivate : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	KAudioPlayStreamPrivate( KArtsServer*, const TQString title, TQObject*, const char* =0 );
 	~KAudioPlayStreamPrivate();
diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp
index eb08abdb7..02c88411a 100644
--- a/arts/kde/kaudiorecordstream.cpp
+++ b/arts/kde/kaudiorecordstream.cpp
@@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString &
 	d->inqueue.setAutoDelete( true );
 	d->title = title;
 
-	connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) );
+	connect( d->kserver, TQ_SIGNAL( restartedServer() ), TQ_SLOT( slotRestartedServer() ) );
 
 	d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) );
 	d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) );
@@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels )
 
 			d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() );
 			d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base );
-			connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ),
-					TQT_SLOT( slotData( const char *, unsigned int ) ) );
+			connect( d->receiver_base, TQ_SIGNAL( data( const char *, unsigned int ) ),
+					TQ_SLOT( slotData( const char *, unsigned int ) ) );
 			Arts::connect( d->convert, "outdata", d->receiver, "indata" );
 
 			d->convert.start();
diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h
index bbdb6d736..a1e4f1931 100644
--- a/arts/kde/kaudiorecordstream.h
+++ b/arts/kde/kaudiorecordstream.h
@@ -40,7 +40,7 @@ namespace Arts { class StereoEffectStack; }
 */
 class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/arts/kde/kaudiorecordstream_p.h b/arts/kde/kaudiorecordstream_p.h
index 1d38b2278..727f384ec 100644
--- a/arts/kde/kaudiorecordstream_p.h
+++ b/arts/kde/kaudiorecordstream_p.h
@@ -32,7 +32,7 @@ class KByteSoundReceiver : public TQObject,
                            public Arts::ByteSoundReceiver_skel,
                            public Arts::StdSynthModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KByteSoundReceiver( int rate, int bits, int channels, const char * title );
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cpp
index 647c2f320..6c5706122 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cpp
@@ -81,13 +81,13 @@ int main(int argc, char **argv)
 	// converter.setup(44100);
 	converter.requestPlayObject(url);
 
-	TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart()));
+	TQObject::connect(&converter, TQ_SIGNAL(rawStreamStart()), get, TQ_SLOT(slotRawStreamStart()));
 
-	TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long)));
-	TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long)));
-	TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData()));
+	TQObject::connect(&converter, TQ_SIGNAL(newBlockSize(long)), get, TQ_SLOT(slotNewBlockSize(long)));
+	TQObject::connect(&converter, TQ_SIGNAL(newBlockPointer(long)), get, TQ_SLOT(slotNewBlockPointer(long)));
+	TQObject::connect(&converter, TQ_SIGNAL(newData()), get, TQ_SLOT(slotNewData()));
 	
-	TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished()));
+	TQObject::connect(&converter, TQ_SIGNAL(rawStreamFinished()), get, TQ_SLOT(slotRawStreamFinished()));
 
 	converter.start();
 
diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h
index 7e7cc6c50..f74b62859 100644
--- a/arts/kde/kconverttest.h
+++ b/arts/kde/kconverttest.h
@@ -26,7 +26,7 @@
 
 class KConvertTest : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KConvertTest();
 
diff --git a/arts/kde/kdatarequest_impl.h b/arts/kde/kdatarequest_impl.h
index 7d90c8b73..4abe72c03 100644
--- a/arts/kde/kdatarequest_impl.h
+++ b/arts/kde/kdatarequest_impl.h
@@ -32,7 +32,7 @@ namespace Arts
 class KDataRequest_impl : public TQObject, virtual public KDataRequest_skel,
 						  virtual public StdSynthModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KDataRequest_impl();
 	~KDataRequest_impl();
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index d893675cd..38acef54d 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -80,14 +80,14 @@ void TDEIOInputStream_impl::streamStart()
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
 	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
 
-	TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-			 this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));		     
-	TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
-			 this, TQT_SLOT(slotResult(TDEIO::Job *)));		     
-	TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-			 this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
-	TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
-			 this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
+	TQObject::connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+			 this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));		     
+	TQObject::connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)),
+			 this, TQ_SLOT(slotResult(TDEIO::Job *)));		     
+	TQObject::connect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+			 this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+	TQObject::connect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+			 this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
 
 	m_streamStarted = true;
 }
@@ -98,14 +98,14 @@ void TDEIOInputStream_impl::streamEnd()
 
 	if(m_job != 0)
 	{
-		TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-	    				this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-		TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)),
-						this, TQT_SLOT(slotResult(TDEIO::Job *)));		     
-		TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
-				 this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
-		TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
-				 this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
+		TQObject::disconnect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	    				this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+		TQObject::disconnect(m_job, TQ_SIGNAL(result(TDEIO::Job *)),
+						this, TQ_SLOT(slotResult(TDEIO::Job *)));		     
+		TQObject::disconnect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)),
+				 this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &)));
+		TQObject::disconnect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)),
+				 this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t)));
 
 		if ( m_streamPulled )
 			outdata.endPull();
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index 1d18f6421..45bb34cd1 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -35,7 +35,7 @@ class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_s
 					    virtual public InputStream_skel,
 					    virtual public StdSynthModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	TDEIOInputStream_impl();
 	~TDEIOInputStream_impl();
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cpp
index ed9a3fadf..ed9a3fadf 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cpp
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cpp
index 93bfac388..93bfac388 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cpp
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cpp
index f11c0eb8f..a9b3a8a36 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cpp
@@ -179,7 +179,7 @@ void KDE::PlayObject::play()
 			if ( d->creator )
 				delete d->creator;
 			d->creator = new KDE::PlayObjectCreator( d->server );
-			d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) );
+			d->creator->create( d->url, d->createBUS, this, TQ_SLOT( attachPlayObject( Arts::PlayObject ) ) );
 			kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl;
 			d->internalState = Arts::posPlaying;
 		}
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index f5bd849be..8626405f0 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -29,7 +29,7 @@
 
 class KDE_EXPORT KPlayObject : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KPlayObject();
 	KPlayObject(Arts::PlayObject playobject, bool isStream);
@@ -187,7 +187,7 @@ class PlayObjectFactory;
   */
 class KDE_EXPORT PlayObject : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	~PlayObject();
 
diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cpp
index 039c8a3bc..4b8f0ba01 100644
--- a/arts/kde/kplayobjectcreator.cc
+++ b/arts/kde/kplayobjectcreator.cpp
@@ -44,7 +44,7 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj
 	if (m_server.isNull() || url.isEmpty() )
 		return false;
 
-	connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ),
+	connect( this, TQ_SIGNAL( playObjectCreated( Arts::PlayObject ) ),
 			receiver, slot );
 
 	// check if the URL is a local file
@@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj
 		m_instream = Arts::TDEIOInputStream::_from_base(instream_impl);
 
 		// signal will be called once the ioslave knows the mime-type of the stream
-		connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)),
-				 this, TQT_SLOT(slotMimeType(const TQString &)));
+		connect(instream_impl, TQ_SIGNAL(mimeTypeFound(const TQString &)),
+				 this, TQ_SLOT(slotMimeType(const TQString &)));
 
 		// GO!
 		m_instream.openURL(url.url().latin1());
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index 74e571c8e..e0935ed22 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -31,7 +31,7 @@ namespace KDE {
 
 class PlayObjectCreator : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	PlayObjectCreator(Arts::SoundServerV2 server);
 	~PlayObjectCreator();
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cpp
index 708fe516e..ef10a925b 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cpp
@@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
 		d->helper->po = d->playObj;
 		d->helper->ap = d->amanPlay;
 		if( d->playObj->object().isNull() && d->amanPlay )
-			TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) );
+			TQObject::connect( d->playObj, TQ_SIGNAL( playObjectCreated() ), d->helper, TQ_SLOT( connectAmanPlay() ) );
 		else
 			d->helper->connectAmanPlay();
 	}
diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h
index d1eb32a3c..9f4586e18 100644
--- a/arts/kde/kplayobjectfactory_p.h
+++ b/arts/kde/kplayobjectfactory_p.h
@@ -32,7 +32,7 @@ namespace KDE
 class POFHelper : public TQObject
 {
 	friend class PlayObjectFactory;
-	Q_OBJECT
+	TQ_OBJECT
 private slots:
 	void connectAmanPlay();
 private:
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index f78c5c5db..618a2ccd5 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -19,7 +19,7 @@
 #include <tqaccel.h>
 #include <tqcursor.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/Xutil.h>
 #else
@@ -49,7 +49,7 @@ KFullscreenVideoWidget::KFullscreenVideoWidget( KVideoWidget *parent, const char
 {
     this->videoWidget = parent;
     setEraseColor( black );
-    setCursor(TQCursor(Qt::BlankCursor));
+    setCursor(TQCursor(TQt::BlankCursor));
 }
 
 void KFullscreenVideoWidget::windowActivationChange( bool )
@@ -62,7 +62,7 @@ void KFullscreenVideoWidget::windowActivationChange( bool )
 
 bool KFullscreenVideoWidget::x11Event( XEvent *event )
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     if (event->type == ClientMessage &&
 	event->xclient.message_type ==
 		XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False ))
@@ -93,7 +93,7 @@ void KVideoWidget::init(void)
 {
     setMinimumSize(0, 0);
     setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
-    setFocusPolicy( TQ_ClickFocus );
+    setFocusPolicy( TQWidget::ClickFocus );
 
     fullscreenWidget = 0;
     poVideo	     = Arts::VideoPlayObject::null();
@@ -102,16 +102,16 @@ void KVideoWidget::init(void)
 
     // Setup actions
     new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen",
-		       CTRL+SHIFT+Key_F, TQT_TQOBJECT(this), TQT_SLOT(fullscreenActivated()),
+		       CTRL+SHIFT+Key_F, this, TQ_SLOT(fullscreenActivated()),
 		       actionCollection(), "fullscreen_mode" );
     new TDERadioAction( i18n("&Half Size"), ALT+Key_0,
-		      TQT_TQOBJECT(this), TQT_SLOT(halfSizeActivated()),
+		      this, TQ_SLOT(halfSizeActivated()),
 		      actionCollection(), "half_size" );
     new TDERadioAction( i18n("&Normal Size"), ALT+Key_1,
-		      TQT_TQOBJECT(this), TQT_SLOT(normalSizeActivated()),
+		      this, TQ_SLOT(normalSizeActivated()),
 		      actionCollection(), "normal_size" );
     new TDERadioAction( i18n("&Double Size"), ALT+Key_2,
-		      TQT_TQOBJECT(this), TQT_SLOT(doubleSizeActivated()),
+		      this, TQ_SLOT(doubleSizeActivated()),
 		      actionCollection(), "double_size" );
 
     ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" );
@@ -191,7 +191,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
 
 TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     Window root;
     Pixmap pixmap;
     XImage *xImage;
@@ -213,7 +213,7 @@ TQImage KVideoWidget::snapshot( Arts::VideoPlayObject vpo )
     }
 
     // Convert 32bit RGBA image data into Qt image
-    TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (QRgb *)0, 0, TQImage::IgnoreEndian ).copy();
+    TQImage qImage = TQImage( (uchar *)xImage->data, width/32, height, 32, (TQRgb *)0, 0, TQImage::IgnoreEndian ).copy();
 
     // Free X11 resources and return Qt image
     XDestroyImage( xImage );
@@ -306,7 +306,7 @@ void KVideoWidget::mousePressEvent( TQMouseEvent *event )
 	emit mouseButtonPressed( event->button(), pos, event->state() );
 
 	// ### Remove in KDE4
-	if ( event->button() == Qt::RightButton )
+	if ( event->button() == TQt::RightButton )
 		emit rightButtonPressed( pos );
 }
 
@@ -358,7 +358,7 @@ void KVideoWidget::resizeNotify( int width, int height )
 
 bool KVideoWidget::x11Event( XEvent *event )
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     if (event->type == ClientMessage &&
 	event->xclient.message_type ==
 		XInternAtom( tqt_xdisplay(), "VPO_RESIZE_NOTIFY", False ))
@@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated()
 	fullscreenWidget = new KFullscreenVideoWidget( this );
 
 	// Interconnect mouse button signals
-	connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )),
-		 this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) );
+	connect( fullscreenWidget, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )),
+		 this, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) );
 
-	connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )),
-		 this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) );
+	connect( fullscreenWidget, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )),
+		 this, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) );
 
 	// ### Remove in KDE4
-	 connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)),
-		this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) );
+	 connect( fullscreenWidget, TQ_SIGNAL(rightButtonPressed(const TQPoint &)),
+		this, TQ_SIGNAL(rightButtonPressed(const TQPoint &)) );
 		 
 	// Leave fullscreen mode with <Escape> key
 	TQAccel *a = new TQAccel( fullscreenWidget );
 	a->connectItem( a->insertItem( Key_Escape ),
-			this, TQT_SLOT(setWindowed()) );
+			this, TQ_SLOT(setWindowed()) );
 
 	fullscreenWidget->setFocus();
 	fullscreenWidget->showFullScreen();
diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h
index 0e3881a93..9cd8239a9 100644
--- a/arts/kde/kvideowidget.h
+++ b/arts/kde/kvideowidget.h
@@ -20,7 +20,7 @@
 
 class KDE_ARTS_EXPORT KVideoWidget : public TQWidget, virtual public KXMLGUIClient
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/arts/kde/mcop-dcop/kmcop.h b/arts/kde/mcop-dcop/kmcop.h
index 5ffa57bcd..aae0792b3 100644
--- a/arts/kde/mcop-dcop/kmcop.h
+++ b/arts/kde/mcop-dcop/kmcop.h
@@ -29,7 +29,7 @@ class KMCOPPrivate;
 class KMCOP : public TQObject,
 			  public DCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 
 public:
diff --git a/arts/knotify/README b/arts/knotify/README
index 3257cdc33..676dcc25e 100644
--- a/arts/knotify/README
+++ b/arts/knotify/README
@@ -31,3 +31,17 @@ example, while the screen is locked, it is very likely that the user is not
 present. Thus, he will not be able to hear a "You have mail" sound (or to
 see a talk request). Re-routing this to a log window sounds like a very good
 idea.
+
+Notes:
+------
+
+KNotify can be accessed directly using one of the available methods.
+ - void notify(TQString event, TQString fromApp, TQString text, TQString sound,
+               TQString file, int present, int level)
+ - void notify(TQString event, TQString fromApp, TQString text, TQString sound,
+               TQString file, int present, int level, int winId)
+ - void notify(TQString event, TQString fromApp, TQString text, TQString sound,
+               TQString file, int present, int level, int winId, int eventId)
+
+For example:
+  dcop knotify Notify notify event "Msg from MyApp" "Hello World!" "" "" 16 0
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 101c7967b..176559bea 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts )
 	d->playObjects.setAutoDelete(true);
 	d->audioManager = 0;
 	if( useArts ) {
-		connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) );
+		connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) );
 		restartedArtsd(); //started allready need to initialize d->audioManager
 	}
 #endif
@@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
 	
 		if ( !d->playTimer ) {
 			d->playTimer = new TQTimer( this );
-			connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) );
+			connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) );
 		}
 		if ( !d->playTimer->isActive() ) {
 			d->playTimer->start( 1000 );
@@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int
 		TDEProcess *proc = d->externalPlayerProc;
 		if (!proc) {
 			proc = d->externalPlayerProc = new TDEProcess;
-			connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * )));
+			connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * )));
 		}
 		if (proc->isRunning()) {
 			soundFinished( eventId, PlayerBusy );
diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h
index 8348f3d40..b74fca3b2 100644
--- a/arts/knotify/knotify.h
+++ b/arts/knotify/knotify.h
@@ -30,7 +30,7 @@ class TDEConfig;
 
 class KNotify : public TQObject, public DCOPObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 	
 	public:
diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt
index 12e91f65e..0a9be01cb 100644
--- a/arts/message/CMakeLists.txt
+++ b/arts/message/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 set( target artsmessage )
 
 set( ${target}_SRCS
-  artsmessage.cc
+  artsmessage.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am
index 24b7a6d18..363d561df 100644
--- a/arts/message/Makefile.am
+++ b/arts/message/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = artsmessage
 
-artsmessage_SOURCES = artsmessage.cc
+artsmessage_SOURCES = artsmessage.cpp
 
 artsmessage_LDADD = ../../tdeui/libtdeui.la
 artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cpp
index eaa5c8e2c..eaa5c8e2c 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cpp
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject 35d01987874772b6d83189d302186b881dbf2e3
diff --git a/config.h.cmake b/config.h.cmake
index 76c299e08..17a871252 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -13,20 +13,9 @@
 #cmakedefine HAVE_DNSSD 1
 #cmakedefine AVAHI_API_0_6 1
 
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
 /* Use su or sudo */
 #define DEFAULT_SUPER_USER_COMMAND "@DEFAULT_SUPER_USER_COMMAND@"
 
-/* Define if getaddrinfo returns AF_UNIX sockets */
-#undef GETADDRINFO_RETURNS_UNIX
-
 /* getmntinfo() uses struct statvfs */
 #cmakedefine GETMNTINFO_USES_STATVFS
 
@@ -119,12 +108,6 @@
 /* Define to 1 if libbfd provides demangle.h header */
 #cmakedefine HAVE_DEMANGLE_H 1
 
-/* Define to 1 if you have the `bcopy' function. */
-#cmakedefine HAVE_BCOPY 1
-
-/* You _must_ have bool */
-#undef HAVE_BOOL
-
 /* Define if getaddrinfo is broken and should be replaced */
 #cmakedefine HAVE_BROKEN_GETADDRINFO 1
 
@@ -177,7 +160,7 @@
 #cmakedefine HAVE_DIRENT_H 1
 
 /* Define if you have the GNU dld library. */
-#undef HAVE_DLD
+#cmakedefine HAVE_DLD
 
 /* Define to 1 if you have the <dld.h> header file. */
 #cmakedefine HAVE_DLD_H 1
@@ -191,6 +174,9 @@
 /* Define to 1 if you have the <dl.h> header file. */
 #cmakedefine HAVE_DL_H 1
 
+/* Define to 1 if you have the <sys/dl.h> header file. */
+#cmakedefine HAVE_SYS_DL_H 1
+
 /* Define if your system has Linux Directory Notification */
 #undef HAVE_DNOTIFY
 
@@ -204,7 +190,7 @@
 #cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
 
 /* Define is posix_fadvise is supported */
-#undef HAVE_FADVISE
+#cmakedefine HAVE_FADVISE
 
 /* Define if your system has libfam */
 #cmakedefine HAVE_FAM 1
@@ -257,6 +243,9 @@
 /* Define to 1 if you have the `getpeereid' function. */
 #cmakedefine HAVE_GETPEEREID 1
 
+/* Define to 1 if you have the `getpeerucred' function. */
+#cmakedefine HAVE_GETPEERUCRED 1
+
 /* Define to 1 if you have the `getpeername' function. */
 #cmakedefine HAVE_GETPEERNAME 1
 
@@ -317,9 +306,6 @@
 /* Define if you have jasper */
 #cmakedefine HAVE_JASPER 1
 
-/* Define if your locale.h file contains LC_MESSAGES */
-#undef HAVE_LC_MESSAGES
-
 /* Defines if your system has the libart library */
 #cmakedefine HAVE_LIBART 1
 
@@ -344,12 +330,6 @@
 /* Define if you have libpng */
 #cmakedefine HAVE_LIBPNG 1
 
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define to 1 if you have the `qt-mt' library (-lqt-mt). */
-#undef HAVE_LIBTQT_MT
-
 /* Defined if you have libthai and want to have it compiled in */
 #undef HAVE_LIBTHAI
 
@@ -383,9 +363,6 @@
 /* Define to 1 if you have the <malloc.h> header file. */
 #cmakedefine HAVE_MALLOC_H 1
 
-/* Define to 1 if you have the `memcpy' function. */
-#cmakedefine HAVE_MEMCPY 1
-
 /* Define to 1 if you have the <memory.h> header file. */
 #cmakedefine HAVE_MEMORY_H 1
 
@@ -428,9 +405,6 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #cmakedefine HAVE_NET_IF_H 1
 
-/* Define to 1 if you have the <nl_types.h> header file. */
-#undef HAVE_NL_TYPES_H
-
 /* Define if system has non-POSIX extensions to the ACL support. */
 #cmakedefine HAVE_NON_POSIX_ACL_EXTENSIONS 1
 
@@ -486,7 +460,7 @@
 #cmakedefine HAVE_RES_INIT 1
 
 /* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
+#cmakedefine HAVE_RES_INIT_PROTO
 
 /* Define if revoke(tty) is present in unistd.h */
 #cmakedefine HAVE_REVOKE 1
@@ -609,13 +583,19 @@
 #cmakedefine HAVE_STRUCT_SOCKADDR_IN6 1
 
 /* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
-#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
+#cmakedefine HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
 
 /* Define to 1 if `sa_len' is member of `struct sockaddr'. */
-#undef HAVE_STRUCT_SOCKADDR_SA_LEN
+#cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1
+
+/* Define to 1 if `sin_len' is member of `struct sockaddr_in'. */
+#cmakedefine HAVE_STRUCT_SOCKADDR_IN_SIN_LEN 1
+
+/* Define to 1 if `sun_len' is member of `struct sockaddr_un'. */
+#cmakedefine HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
 
 /* Define if struct ucred is present from sys/socket.h */
-#undef HAVE_STRUCT_UCRED
+#cmakedefine HAVE_STRUCT_UCRED 1
 
 /* Define to 1 if you have the <sysent.h> header file. */
 #cmakedefine HAVE_SYSENT_H 1
@@ -677,6 +657,9 @@
 /* Define to 1 if you have the <sys/ucred.h> header file. */
 #cmakedefine HAVE_SYS_UCRED_H 1
 
+/* Define to 1 if you have the <ucred.h> header file. */
+#cmakedefine HAVE_UCRED_H 1
+
 /* Define if system has the sys/xattr.h header. */
 #cmakedefine HAVE_SYS_XATTR_H 1
 
@@ -1179,6 +1162,7 @@ __END_DECLS
 #endif
 #ifdef __cplusplus
 extern "C"
+{
 #endif
 #if !defined(HAVE_VSNPRINTF_PROTO)
 int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
@@ -1187,7 +1171,7 @@ int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
 int snprintf(char *str, size_t n, char const *fmt, ...);
 #endif
 #ifdef __cplusplus
-extern "C"
+}
 #endif
 #endif
 
@@ -1248,7 +1232,10 @@ extern "C"
 #define HAVE_SETEUID_FAKE
 #ifdef __cplusplus
 extern "C"
+{
 #endif
 int seteuid(INT32_BASETYPE euid); /* defined in fakes.c */
+#ifdef __cplusplus
+}
+#endif
 #endif
-
diff --git a/dcop/HOWTO b/dcop/HOWTO
index dedcf97dd..344ed82d1 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -169,8 +169,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)",
   tqDebug("there was some error using DCOP.");
 else {
   QDataStream reply(replyData, IO_ReadOnly);
-  if (replyType == "QString") {
-    QString result;
+  if (replyType == "TQString") {
+    TQString result;
     reply >> result;
     print("the result is: %s",result.latin1());
   } else
@@ -190,7 +190,7 @@ Receiving Data via DCOP:
 
 Currently the only real way to receive data from DCOP is to multiply
 inherit from the normal class that you are inheriting (usually some
-sort of QWidget subclass or QObject) as well as the DCOPObject class.
+sort of TQWidget subclass or TQObject) as well as the DCOPObject class.
 DCOPObject provides one very important method: DCOPObject::process().
 This is a pure virtual method that you must implement in order to
 process DCOP messages that you receive.  It takes a function
@@ -210,10 +210,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt (i);
+    TQString result = self->doIt (i);
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
-    replyType = "QString";
+    replyType = "TQString";
     return true;
   } else {
     tqDebug("unknown function call to BarObject::process()");
@@ -244,7 +244,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt(i);
+    TQString result = self->doIt(i);
 
     DCOPClientTransaction *myTransaction;
     myTransaction = kapp->dcopClient()->beginTransaction();
@@ -260,9 +260,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
   }
 }
 
-slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result)
+slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
 {
-    QCString replyType = "QString";
+    QCString replyType = "TQString";
     QByteArray replyData;
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
@@ -358,7 +358,7 @@ class MyInterface : virtual public DCOPObject
 
   k_dcop:
 
-    virtual ASYNC myAsynchronousMethod(QString someParameter) = 0;
+    virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0;
     virtual QRect mySynchronousMethod() = 0;
 };
 
@@ -385,19 +385,19 @@ but virtual, not pure virtual.
 
 Example:
 
-class MyClass: public QObject, virtual public MyInterface
+class MyClass: public TQObject, virtual public MyInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     MyClass(); 
     ~MyClass();
 
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 
-Note: (Qt issue) Remember that if you are inheriting from QObject, you must
+Note: (Qt issue) Remember that if you are inheriting from TQObject, you must
 place it first in the list of inherited classes.
 
 In the implementation of your class' ctor, you must explicitly initialize
@@ -408,7 +408,7 @@ the interface which your are implementing.
 Example:
 
 MyClass::MyClass()
-  : QObject(),
+  : TQObject(),
     DCOPObject("MyInterface")
 {
   // whatever...
@@ -419,7 +419,7 @@ exactly the same as you would normally.
 
 Example:
 
-void MyClass::myAsynchronousMethod(QString someParameter)
+void MyClass::myAsynchronousMethod(TQString someParameter)
 {
   tqDebug("myAsyncMethod called with param `" + someParameter + "'");
 }
@@ -429,9 +429,9 @@ It is not necessary (though very clean) to define an interface as an
 abstract class of its own, like we did in the example above. We could
 just as well have defined a k_dcop section directly within MyClass:
 
-class MyClass: public QObject, virtual public DCOPObject
+class MyClass: public TQObject, virtual public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
@@ -439,7 +439,7 @@ class MyClass: public QObject, virtual public DCOPObject
     ~MyClass();
 
   k_dcop:
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 
diff --git a/dcop/KDE-ICE/ICElibint.h b/dcop/KDE-ICE/ICElibint.h
index f36ab7acc..268b664db 100644
--- a/dcop/KDE-ICE/ICElibint.h
+++ b/dcop/KDE-ICE/ICElibint.h
@@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium
 #define _ICELIBINT_H_
 
 #include "config.h"
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xos.h>
 #include <X11/Xfuncs.h>
 #include <X11/Xmd.h> //schroder
diff --git a/dcop/KDE-ICE/ICEproto.h b/dcop/KDE-ICE/ICEproto.h
index ff848df04..471b80314 100644
--- a/dcop/KDE-ICE/ICEproto.h
+++ b/dcop/KDE-ICE/ICEproto.h
@@ -27,7 +27,7 @@ Author: Ralph Mor, X Consortium
 #define _ICEPROTO_H_
 
 #include "config.h"
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xmd.h>
 #else
 #if defined(__alpha__) || defined(__ia64__) || defined(__s390x__)
@@ -37,8 +37,6 @@ typedef unsigned long CARD32;
 #endif
 typedef unsigned short CARD16;
 typedef unsigned char CARD8;
-#define B32 :32
-#define B16 :16
 #include <unistd.h>
 #endif
 
@@ -46,18 +44,18 @@ typedef struct {
     CARD8	majorOpcode;
     CARD8	minorOpcode;
     CARD8	data[2];
-    CARD32	length B32;
+    CARD32	length :32;
 } iceMsg;
 
 typedef struct {
     CARD8	majorOpcode;
     CARD8	minorOpcode;
-    CARD16	errorClass B16;
-    CARD32	length B32;
+    CARD16	errorClass :16;
+    CARD32	length :32;
     CARD8	offendingMinorOpcode;
     CARD8	severity;
-    CARD16	unused B16;
-    CARD32	offendingSequenceNum B32;
+    CARD16	unused :16;
+    CARD32	offendingSequenceNum :32;
     /* n	varying values */
     /* p	p = pad (n, 8) */
 } iceErrorMsg;
@@ -67,7 +65,7 @@ typedef struct {
     CARD8	minorOpcode;
     CARD8	byteOrder;
     CARD8	unused;
-    CARD32	length B32;
+    CARD32	length :32;
 } iceByteOrderMsg;
 
 typedef struct {
@@ -75,7 +73,7 @@ typedef struct {
     CARD8	minorOpcode;
     CARD8	versionCount;
     CARD8	authCount;
-    CARD32	length B32;
+    CARD32	length :32;
     CARD8	mustAuthenticate;
     CARD8	unused[7];
     /* i	STRING		vendor */
@@ -90,8 +88,8 @@ typedef struct {
     CARD8	minorOpcode;
     CARD8	authIndex;
     CARD8	unused1;
-    CARD32	length B32;
-    CARD16	authDataLength B16;
+    CARD32	length :32;
+    CARD16	authDataLength :16;
     CARD8	unused2[6];
     /* n	varying data */
     /* p	p = pad (n, 8) */
@@ -101,8 +99,8 @@ typedef struct {
     CARD8	majorOpcode;
     CARD8	minorOpcode;
     CARD8	unused1[2];
-    CARD32	length B32;
-    CARD16	authDataLength B16;
+    CARD32	length :32;
+    CARD16	authDataLength :16;
     CARD8	unused2[6];
     /* n	varying data */
     /* p	p = pad (n, 8) */
@@ -112,8 +110,8 @@ typedef struct {
     CARD8	majorOpcode;
     CARD8	minorOpcode;
     CARD8	unused1[2];
-    CARD32	length B32;
-    CARD16	authDataLength B16;
+    CARD32	length :32;
+    CARD16	authDataLength :16;
     CARD8	unused2[6];
     /* n	varying data */
     /* p	p = pad (n, 8) */
@@ -124,7 +122,7 @@ typedef struct {
     CARD8	minorOpcode;
     CARD8	versionIndex;
     CARD8	unused;
-    CARD32	length B32;
+    CARD32	length :32;
     /* i	STRING		vendor */
     /* j	STRING		release */
     /* p	p = pad (i+j, 8) */
@@ -135,7 +133,7 @@ typedef struct {
     CARD8	minorOpcode;
     CARD8	protocolOpcode;
     CARD8	mustAuthenticate;
-    CARD32	length B32;
+    CARD32	length :32;
     CARD8	versionCount;
     CARD8	authCount;
     CARD8	unused[6];
@@ -152,7 +150,7 @@ typedef struct {
     CARD8	minorOpcode;
     CARD8	versionIndex;
     CARD8	protocolOpcode;
-    CARD32	length B32;
+    CARD32	length :32;
     /* i	STRING		vendor */
     /* j	STRING		release */
     /* p	p = pad (i+j, 8) */
diff --git a/dcop/KDE-ICE/Xtrans.h b/dcop/KDE-ICE/Xtrans.h
index 95c817fa1..08d28966f 100644
--- a/dcop/KDE-ICE/Xtrans.h
+++ b/dcop/KDE-ICE/Xtrans.h
@@ -51,7 +51,7 @@ from The Open Group.
 #define _XTRANS_H_
 
 #include "config.h"
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xfuncproto.h>
 #include <X11/Xos.h>
 #else
diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c
index bb6d122bc..31a35fcd9 100644
--- a/dcop/KDE-ICE/Xtranssock.c
+++ b/dcop/KDE-ICE/Xtranssock.c
@@ -47,6 +47,10 @@ from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <ctype.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -873,7 +877,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char *port)
     else
 	sockname.sin_port = htons (0);
 
-#ifdef BSD44SOCKETS
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
     sockname.sin_len = sizeof (sockname);
 #endif
     sockname.sin_family = AF_INET;
@@ -947,7 +951,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
     }
 
     namelen = sizeof( sockname ) - sizeof( sockname.sun_path ) + strlen( sockname.sun_path ) + 1;
-#if defined(BSD44SOCKETS)
+#if defined(HAVE_STRUCT_SOCKADDR_UN_SUN_LEN)
     sockname.sun_len = namelen;
 #endif
 
@@ -1278,7 +1282,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
      * Build the socket name.
      */
 
-#ifdef BSD44SOCKETS
+#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
     sockname.sin_len = sizeof (struct sockaddr_in);
 #endif
     sockname.sin_family = AF_INET;
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 62fd3cf44..ca596022c 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -134,8 +134,8 @@ if (!client->call("someAppId", "fooObject/barObject", "doIt(int)",
   tqDebug("there was some error using DCOP.");
 else {
   QDataStream reply(replyData, IO_ReadOnly);
-  if (replyType == "QString") {
-    QString result;
+  if (replyType == "TQString") {
+    TQString result;
     reply >> result;
     print("the result is: %s",result.latin1());
   } else
@@ -148,7 +148,7 @@ else {
 
 Currently the only real way to receive data from DCOP is to multiply
 inherit from the normal class that you are inheriting (usually some
-sort of QWidget subclass or QObject) as well as the DCOPObject class.
+sort of TQWidget subclass or TQObject) as well as the DCOPObject class.
 DCOPObject provides one very important method: DCOPObject::process().
 This is a pure virtual method that you must implement in order to
 process DCOP messages that you receive.  It takes a function
@@ -169,10 +169,10 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt (i);
+    TQString result = self->doIt (i);
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
-    replyType = "QString";
+    replyType = "TQString";
     return true;
   } else {
     tqDebug("unknown function call to BarObject::process()");
@@ -205,7 +205,7 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
     QDataStream arg(data, IO_ReadOnly);
     int i; // parameter
     arg >> i;
-    QString result = self->doIt(i);
+    TQString result = self->doIt(i);
 
     DCOPClientTransaction *myTransaction;
     myTransaction = kapp->dcopClient()->beginTransaction();
@@ -221,9 +221,9 @@ bool BarObject::process(const QCString &fun, const QByteArray &data,
   }
 }
 
-slotProcessingDone(DCOPClientTransaction *myTransaction, const QString &result)
+slotProcessingDone(DCOPClientTransaction *myTransaction, const TQString &result)
 {
-    QCString replyType = "QString";
+    QCString replyType = "TQString";
     QByteArray replyData;
     QDataStream reply(replyData, IO_WriteOnly);
     reply << result;
@@ -260,7 +260,7 @@ class MyInterface : virtual public DCOPObject
 
   k_dcop:
 
-    virtual ASYNC myAsynchronousMethod(QString someParameter) = 0;
+    virtual ASYNC myAsynchronousMethod(TQString someParameter) = 0;
     virtual QRect mySynchronousMethod() = 0;
 };
 
@@ -289,19 +289,19 @@ but virtual, not pure virtual.
 Example:
 
 \code
-class MyClass: public QObject, virtual public MyInterface
+class MyClass: public TQObject, virtual public MyInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     MyClass();
     ~MyClass();
 
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 \endcode
-\note (Qt issue) Remember that if you are inheriting from QObject, you must
+\note (Qt issue) Remember that if you are inheriting from TQObject, you must
 place it first in the list of inherited classes.
 
 In the implementation of your class' ctor, you must explicitly initialize
@@ -313,7 +313,7 @@ Example:
 
 \code
 MyClass::MyClass()
-  : QObject(),
+  : TQObject(),
     DCOPObject("MyInterface")
 {
   // whatever...
@@ -327,7 +327,7 @@ exactly the same as you would normally.
 Example:
 
 \code
-void MyClass::myAsynchronousMethod(QString someParameter)
+void MyClass::myAsynchronousMethod(TQString someParameter)
 {
   tqDebug("myAsyncMethod called with param `" + someParameter + "'");
 }
@@ -338,9 +338,9 @@ abstract class of its own, like we did in the example above. We could
 just as well have defined a k_dcop section directly within MyClass:
 
 \code
-class MyClass: public QObject, virtual public DCOPObject
+class MyClass: public TQObject, virtual public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
@@ -348,7 +348,7 @@ class MyClass: public QObject, virtual public DCOPObject
     ~MyClass();
 
   k_dcop:
-    ASYNC myAsynchronousMethod(QString someParameter);
+    ASYNC myAsynchronousMethod(TQString someParameter);
     QRect mySynchronousMethod();
 };
 \endcode
diff --git a/dcop/client/README.dcop b/dcop/client/README.dcop
index e352cb439..b20a9d2c0 100644
--- a/dcop/client/README.dcop
+++ b/dcop/client/README.dcop
@@ -43,10 +43,10 @@ error message is printed to stderr and the command exits with exit-code '2'.
 
 The default selection criteria is "any". Applications can declare their own 
 select_func as they see fit, e.g. konqueror could declare 
-"isDoingProtocol(QString protocol)" and then the following command would 
+"isDoingProtocol(TQString protocol)" and then the following command would 
 select a konqueror mainwindow that is currently handling the help-protocol:
 
-   "dcopfind 'konqueror*'  'konqueror-mainwindow*' 'isDoingProtocol(QString 
+   "dcopfind 'konqueror*'  'konqueror-mainwindow*' 'isDoingProtocol(TQString 
 protocol)' help"
 
 
diff --git a/dcop/client/dcop.cpp b/dcop/client/dcop.cpp
index 53acbd1c7..6a395c222 100644
--- a/dcop/client/dcop.cpp
+++ b/dcop/client/dcop.cpp
@@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "marshall.cpp"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #endif
@@ -429,7 +429,7 @@ TQStringList dcopSessionList( const TQString &user, const TQString &home )
 
 void sendUserTime( const char* app )
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     static unsigned long time = 0;
     if( time == 0 )
     {
@@ -590,69 +590,76 @@ int runDCOP( QCStringList args, UserList users, Session session,
 	    }
 	}
 
-	if( users.count() > 1 || ( users.count() == 1 &&
-	    ( getenv( "ICEAUTHORITY" ) == 0 || getenv( "DISPLAY" ) == 0 ) ) )
+	if ((users.count() > 1) || ((users.count() == 1) &&
+		((getenv("ICEAUTHORITY") == 0) || (getenv("DISPLAY") == 0))))
 	{
-	    // Check for ICE authority file and if the file can be read by us
-	    TQString iceFileBase = "ICEauthority";
-	    TQString iceFile;
-	    TQFileInfo fi;
+		// Check for ICE authority file and if the file can be read by us
+		TQString iceFileBase = "ICEauthority";
+		TQString iceFile;
+		TQFileInfo fi;
 
-	    if (getenv("XDG_RUNTIME_DIR") != 0 )
-	    {
-		TQFileInfo xdgRuntime(getenv("XDG_RUNTIME_DIR"));
-		passwd* pstruct = getpwnam(it.key().local8Bit());
-		if (pstruct)
+		TQString xdgRuntimeDir = TQString::fromLocal8Bit(getenv("XDG_RUNTIME_DIR"));
+		if (xdgRuntimeDir.isEmpty())
 		{
-		    iceFile = TQString("%1/%2/%3").arg(xdgRuntime.dirPath()).arg(pstruct->pw_uid).arg(iceFileBase);
-		    fi.setFile(iceFile);
+			xdgRuntimeDir = "/run/user/<uid>";
 		}
-		if (!pstruct || !fi.exists())
+		if (!xdgRuntimeDir.isEmpty())
 		{
-		    iceFile = TQString::null;
+			TQFileInfo xdgRuntime(xdgRuntimeDir);
+			passwd* pstruct = getpwnam(it.key().local8Bit());
+			if (pstruct)
+			{
+				iceFile = TQString("%1/%2/%3").arg(xdgRuntime.dirPath()).arg(pstruct->pw_uid).arg(iceFileBase);
+				fi.setFile(iceFile);
+			}
+			if (!pstruct || !fi.exists())
+			{
+				iceFile = TQString::null;
+			}
 		}
-	    }
-	    if (iceFile.isEmpty())
-	    {
-		iceFile = TQString("%1/.%2").arg(it.data()).arg(iceFileBase);
-		fi.setFile(iceFile);
-	    }
-	    if( iceFile.isEmpty() )
-	    {
-		cerr_ << "WARNING: Cannot determine home directory for user "
-		     << it.key() << "!" << endl
-		     << "Please check permissions or set the $ICEAUTHORITY variable manually before" << endl
-		     << "calling dcop." << endl;
-	    }
-	    else if( fi.exists() )
-	    {
-		if( fi.isReadable() )
+		if (iceFile.isEmpty())
 		{
-		    char *envStr = strdup( ( "ICEAUTHORITY=" + iceFile ).ascii() );
-		    putenv( envStr );
-		    //cerr_ << "ice: " << envStr << endl;
+			iceFile = TQString("%1/.%2").arg(it.data()).arg(iceFileBase);
+			fi.setFile(iceFile);
 		}
-		else
+		if (iceFile.isEmpty())
 		{
-		    cerr_ << "WARNING: ICE authority file " << iceFile
-			 << "is not readable by you!" << endl
-			 << "Please check permissions or set the $ICEAUTHORITY variable manually before" << endl
-			 << "calling dcop." << endl;
+			cerr_ << "WARNING: Cannot determine home directory for user "
+				<< it.key() << "!" << endl
+				<< "Please check permissions or set the $ICEAUTHORITY variable manually before" << endl
+				<< "calling dcop." << endl;
+		}
+		else if (fi.exists())
+		{
+			if (fi.isReadable())
+			{
+				char *envStr = strdup(("ICEAUTHORITY=" + iceFile).local8Bit());
+				putenv(envStr);
+				//cerr_ << "ice: " << envStr << endl;
+			}
+			else
+			{
+				cerr_ << "WARNING: ICE authority file " << iceFile
+					<< "is not readable by you!" << endl
+					<< "Please check permissions or set the $ICEAUTHORITY variable manually before" << endl
+					<< "calling dcop." << endl;
+			}
 		}
-	    }
-	    else
-	    {
-		if( users.count() > 1 )
-		    continue;
 		else
 		{
-		    cerr_ << "WARNING: Cannot find ICE authority file "
-		         << iceFile << "!" << endl
-			 << "Please check permissions or set the $ICEAUTHORITY"
-			 << " variable manually before" << endl
-			 << "calling dcop." << endl;
+			if (users.count() > 1)
+			{
+				continue;
+			}
+			else
+			{
+				cerr_ << "WARNING: Cannot find ICE authority file "
+					<< iceFile << "!" << endl
+					<< "Please check permissions or set the $ICEAUTHORITY"
+					<< " variable manually before" << endl
+					<< "calling dcop." << endl;
+			}
 		}
-	    }
 	}
 
 	// Main loop
diff --git a/dcop/client/marshall.cpp b/dcop/client/marshall.cpp
index 5128be80b..64c10857d 100644
--- a/dcop/client/marshall.cpp
+++ b/dcop/client/marshall.cpp
@@ -145,31 +145,34 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         bool b;
         stream >> b;
         result = b ? "true" : "false";
-    } else if ( type == TQSTRING_OBJECT_NAME_STRING )
+    } else if ( type == "TQString" )
     {
         TQString s;
         stream >> s;
         result = s.local8Bit();
-    } else if ( type == TQCSTRING_OBJECT_NAME_STRING )
+    } else if ( type == "TQCString" )
     {
         stream >> result;
     } else if ( type == "QCStringList" )
     {
-        return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQCSTRING_OBJECT_NAME_STRING ">" );
-    } else if ( type == TQSTRINGLIST_OBJECT_NAME_STRING )
+        return demarshal( stream, "TQValueList" "<" "TQCString" ">" );
+    } else if ( type == "TQStringList" )
     {
-        return demarshal( stream, TQVALUELIST_OBJECT_NAME_STRING "<" TQCSTRING_OBJECT_NAME_STRING ">" );
-    } else if ( type == TQCOLOR_OBJECT_NAME_STRING )
+        return demarshal( stream, "TQValueList" "<" "TQString" ">" );
+    } else if ( type == "TQStringVariantMap" )
+    {
+        return demarshal(stream, "TQMap" "<" "TQString" "," "TQVariant" ">");
+    } else if ( type == "TQColor" )
     {
         TQColor c;
         stream >> c;
         result = TQString(c.name()).local8Bit();
-    } else if ( type == TQSIZE_OBJECT_NAME_STRING )
+    } else if ( type == "TQSize" )
     {
         TQSize s;
         stream >> s;
         result.sprintf( "%dx%d", s.width(), s.height() );
-    } else if ( type == TQPIXMAP_OBJECT_NAME_STRING || type == TQIMAGE_OBJECT_NAME_STRING )
+    } else if ( type == "TQPixmap" || type == "TQImage" )
     {
         TQImage i;
         stream >> i;
@@ -178,17 +181,17 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         buf.open( IO_WriteOnly );
         i.save( &buf, "XPM" );
         result = buf.buffer();
-    } else if ( type == TQPOINT_OBJECT_NAME_STRING )
+    } else if ( type == "TQPoint" )
     {
         TQPoint p;
         stream >> p;
         result.sprintf( "+%d+%d", p.x(), p.y() );
-    } else if ( type == TQRECT_OBJECT_NAME_STRING )
+    } else if ( type == "TQRect" )
     {
         TQRect r;
         stream >> r;
         result.sprintf( "%dx%d+%d+%d", r.width(), r.height(), r.x(), r.y() );
-    } else if ( type == TQVARIANT_OBJECT_NAME_STRING )
+    } else if ( type == "TQVariant" )
     {
         TQ_INT32 type;
         stream >> type;
@@ -203,12 +206,12 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         KURL r;
         stream >> r;
         result = r.url().local8Bit();
-    } else if ( type.left( 11 ) == TQVALUELIST_OBJECT_NAME_STRING "<" )
+    } else if ( type.left( 12 ) == "TQValueList" "<" )
     {
-        if ( (uint)type.find( '>', 11 ) != type.length() - 1 )
+        if ( (uint)type.find( '>', 12 ) != type.length() - 1 )
             return result;
 
-        TQString nestedType = type.mid( 11, type.length() - 12 );
+        TQString nestedType = type.mid( 12, type.length() - 13 );
 
         if ( nestedType.isEmpty() )
             return result;
@@ -225,9 +228,9 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
             if ( i < count - 1 )
                 result += '\n';
         }
-    } else if ( type.left( 5 ) == TQMAP_OBJECT_NAME_STRING "<" )
+    } else if ( type.left( 6 ) == "TQMap" "<" )
     {
-        int commaPos = type.find( ',', 5 );
+        int commaPos = type.find( ',', 6 );
 
         if ( commaPos == -1 )
             return result;
@@ -235,7 +238,7 @@ TQCString demarshal( TQDataStream &stream, const TQString &type )
         if ( (uint)type.find( '>', commaPos ) != type.length() - 1 )
             return result;
 
-        TQString keyType = type.mid( 5, commaPos - 5 );
+        TQString keyType = type.mid( 6, commaPos - 6 );
         TQString valueType = type.mid( commaPos + 1, type.length() - commaPos - 2 );
 
         TQ_UINT32 count;
@@ -278,11 +281,11 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
     }
     TQString s = TQString::fromLocal8Bit( args[ i ] );
 
-    if (type == TQSTRINGLIST_OBJECT_NAME_STRING) {
-       type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">";
+    if (type == "TQStringList") {
+       type = "TQValueList" "<" "TQString" ">";
     }
     if (type == "QCStringList") {
-       type = TQVALUELIST_OBJECT_NAME_STRING "<" TQSTRING_OBJECT_NAME_STRING ">";
+       type = "TQValueList" "<" "TQString" ">";
     }
 
     if ( type == "int" )
@@ -319,52 +322,52 @@ void marshall( TQDataStream &arg, QCStringList args, uint &i, TQString type )
 	arg << s.toDouble();
     else if ( type == "bool" )
 	arg << mkBool( s );
-    else if ( type == TQSTRING_OBJECT_NAME_STRING )
+    else if ( type == "TQString" )
 	arg << s;
-    else if ( type == TQCSTRING_OBJECT_NAME_STRING )
+    else if ( type == "TQCString" )
 	arg << TQCString( args[ i ] );
-    else if ( type == TQCOLOR_OBJECT_NAME_STRING )
+    else if ( type == "TQColor" )
 	arg << mkColor( s );
-    else if ( type == TQPOINT_OBJECT_NAME_STRING )
+    else if ( type == "TQPoint" )
 	arg << mkPoint( s );
-    else if ( type == TQSIZE_OBJECT_NAME_STRING )
+    else if ( type == "TQSize" )
 	arg << mkSize( s );
-    else if ( type == TQRECT_OBJECT_NAME_STRING )
+    else if ( type == "TQRect" )
 	arg << mkRect( s );
     else if ( type == "KURL" )
 	arg << KURL( s );
-    else if ( type == TQVARIANT_OBJECT_NAME_STRING ) {
-	int tqPointKeywordLength = strlen(TQPOINT_OBJECT_NAME_STRING);
-	int tqSizeKeywordLength = strlen(TQSIZE_OBJECT_NAME_STRING);
-	int tqRectKeywordLength = strlen(TQRECT_OBJECT_NAME_STRING);
-	int tqColorKeywordLength = strlen(TQCOLOR_OBJECT_NAME_STRING);
+    else if ( type == "TQVariant" ) {
+	int tqPointKeywordLength = strlen("TQPoint");
+	int tqSizeKeywordLength = strlen("TQSize");
+	int tqRectKeywordLength = strlen("TQRect");
+	int tqColorKeywordLength = strlen("TQColor");
 	if ( s == "true" || s == "false" ) {
 	    arg << TQVariant( mkBool( s ) );
 	}
 	else if ( s.left( 4 ) == "int(" ) {
 	    arg << TQVariant( s.mid(4, s.length()-5).toInt() );
 	}
-	else if ( s.left( (tqPointKeywordLength+1) ) == TQPOINT_OBJECT_NAME_STRING "(" ) {
+	else if ( s.left( (tqPointKeywordLength+1) ) == "TQPoint" "(" ) {
 	    arg << TQVariant( mkPoint( s.mid((tqPointKeywordLength+1), s.length()-(tqPointKeywordLength+2)) ) );
 	}
-	else if ( s.left( (tqSizeKeywordLength+1) ) == TQSIZE_OBJECT_NAME_STRING "(" ) {
+	else if ( s.left( (tqSizeKeywordLength+1) ) == "TQSize" "(" ) {
 	    arg << TQVariant( mkSize( s.mid((tqSizeKeywordLength+1), s.length()-(tqSizeKeywordLength+2)) ) );
 	}
-	else if ( s.left( (tqRectKeywordLength+1) ) == TQRECT_OBJECT_NAME_STRING "(" ) {
+	else if ( s.left( (tqRectKeywordLength+1) ) == "TQRect" "(" ) {
 	    arg << TQVariant( mkRect( s.mid((tqRectKeywordLength+1), s.length()-(tqRectKeywordLength+2)) ) );
 	}
-	else if ( s.left( (tqColorKeywordLength+1) ) == TQCOLOR_OBJECT_NAME_STRING "(" ) {
+	else if ( s.left( (tqColorKeywordLength+1) ) == "TQColor" "(" ) {
 	    arg << TQVariant( mkColor( s.mid((tqColorKeywordLength+1), s.length()-(tqColorKeywordLength+2)) ) );
 	}
 	else {
 	    arg << TQVariant( s );
 	}
-    } else if ( type.startsWith(TQVALUELIST_OBJECT_NAME_STRING "<") || type == "KURL::List" ) {
+    } else if ( type.startsWith("TQValueList" "<") || type == "KURL::List" ) {
 	if ( type == "KURL::List" ) {
             type = "KURL";
         }
         else {
-	    int tqValueListKeywordLength = strlen(TQVALUELIST_OBJECT_NAME_STRING);
+	    int tqValueListKeywordLength = strlen("TQValueList");
 	    type = type.mid((tqValueListKeywordLength+1), type.length() - (tqValueListKeywordLength+2));
 	}
 	TQStringList list;
diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp
index 1ab43f730..515aca6a1 100644
--- a/dcop/dcop_deadlock_test.cpp
+++ b/dcop/dcop_deadlock_test.cpp
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 MyDCOPObject::MyDCOPObject(const TQCString &name, const TQCString &remoteName) 
 : TQObject(0, name), DCOPObject(name), m_remoteName(remoteName)
 {
-  connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+  connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 }
 
 bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
@@ -47,7 +47,7 @@ TQCString& replyType, TQByteArray &replyData)
     gettimeofday(&tv, 0);
 tqWarning("%s: function('%s') %d:%06d", name(), m_remoteName.data(), tv.tv_sec % 100, tv.tv_usec);
 
-    replyType = TQSTRING_OBJECT_NAME_STRING;
+    replyType = "TQString";
     TQDataStream reply( replyData, IO_WriteOnly );
     reply << TQString("Hey");
     m_timer.start(1000, true);
diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h
index 461c53cba..a0ee25f19 100644
--- a/dcop/dcop_deadlock_test.h
+++ b/dcop/dcop_deadlock_test.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class MyDCOPObject : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyDCOPObject(const TQCString &name, const TQCString &remoteName);
   bool process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/dcopc.c b/dcop/dcopc.c
index 5f1818cae..0d34c7f4b 100644
--- a/dcop/dcopc.c
+++ b/dcop/dcopc.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include <tqglobal.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/X.h>
 #include <X11/Xproto.h>
diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp
index 607e2e52a..8965b6062 100644
--- a/dcop/dcopclient.cpp
+++ b/dcop/dcopclient.cpp
@@ -50,6 +50,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#ifdef HAVE_UCRED_H
+#include <ucred.h>
+#endif /* HAVE_UCRED_H */
 
 #include <tqguardedptr.h>
 #include <tqtextstream.h>
@@ -65,7 +68,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dcopclient.h>
 #include <dcopobject.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <X11/Xmd.h> 
 #endif
 extern "C" {
@@ -212,7 +215,7 @@ TQCString DCOPClient::iceauthPath()
 {
 #if defined(ICEAUTH_PATH)
     if (
-#       if defined(Q_WS_WIN)
+#       if defined(TQ_WS_WIN)
         access(ICEAUTH_PATH, 0) == 0
 #       else
         access(ICEAUTH_PATH, X_OK) == 0
@@ -263,9 +266,9 @@ static TQCString dcopServerFile(const TQCString &hostname, bool old)
         fprintf(stderr, "Aborting. $HOME is not set.\n");
         exit(1);
     }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQCString disp = getenv("DISPLAY");
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
     TQCString disp = getenv("QWS_DISPLAY");
 #else
     TQCString disp;
@@ -331,10 +334,10 @@ void DCOPClient::handleAsyncReply(ReplyStruct *replyStruct)
 {
     if (replyStruct->replyObject)
     {
-        TQObject::connect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
+        TQObject::connect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
                replyStruct->replyObject, replyStruct->replySlot);
         emit callBack(replyStruct->replyId, *(replyStruct->replyType), *(replyStruct->replyData));
-        TQObject::disconnect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
+        TQObject::disconnect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)),
                replyStruct->replyObject, replyStruct->replySlot);
     }
     delete replyStruct;
@@ -436,9 +439,9 @@ static void DCOPProcessMessage(IceConn iceConn, IcePointer clientObject,
                     return;
                 }
             }
+            tqWarning("Very strange! got a DCOPReplyDelayed opcode, but we were not waiting for a reply!");
+            return;
         }
-        tqWarning("Very strange! got a DCOPReplyDelayed opcode, but we were not waiting for a reply!");
-        return;
     case DCOPCall:
     case DCOPFind:
     case DCOPSend:
@@ -622,8 +625,8 @@ DCOPClient::DCOPClient()
     d->qt_bridge_enabled = true;
     d->transactionList = 0L;
     d->transactionId = 0;
-    TQObject::connect( &d->postMessageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( processPostedMessagesInternal() ) );
-    TQObject::connect( &d->eventLoopTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( eventLoopTimeout() ) );
+    TQObject::connect( &d->postMessageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( processPostedMessagesInternal() ) );
+    TQObject::connect( &d->eventLoopTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( eventLoopTimeout() ) );
 
     if ( !mainClient() )
         setMainClient( this );
@@ -690,14 +693,14 @@ void DCOPClient::bindToApp()
             delete d->notifier;
         d->notifier = new TQSocketNotifier(socket(),
                                           TQSocketNotifier::Read, 0, 0);
-        TQObject::connect(d->notifier, TQT_SIGNAL(activated(int)),
-                TQT_SLOT(processSocketData(int)));
+        TQObject::connect(d->notifier, TQ_SIGNAL(activated(int)),
+                TQ_SLOT(processSocketData(int)));
     }
 }
 
 void DCOPClient::suspend()
 {
-#ifdef Q_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers)
+#ifdef TQ_WS_WIN //TODO: remove (win32 ports sometimes do not create notifiers)
     if (!d->notifier)
         return;
 #endif
@@ -707,7 +710,7 @@ void DCOPClient::suspend()
 
 void DCOPClient::resume()
 {
-#ifdef Q_WS_WIN //TODO: remove
+#ifdef TQ_WS_WIN //TODO: remove
     if (!d->notifier)
         return;
 #endif
@@ -717,14 +720,14 @@ void DCOPClient::resume()
 
 bool DCOPClient::isSuspended() const
 {
-#if defined(Q_WS_WIN) || defined(Q_WS_MAC) //TODO: REMOVE
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MAC) //TODO: REMOVE
     if (!d->notifier)
         return false;
 #endif
     return !d->notifier->isEnabled();
 }
 
-#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID)
+#if defined(SO_PEERCRED) || defined(LOCAL_PEEREID) || defined(HAVE_GETPEERUCRED)
 #define USE_PEER_IS_US
 // Check whether the remote end is owned by the same user.
 static bool peerIsUs(int sockfd)
@@ -745,6 +748,18 @@ static bool peerIsUs(int sockfd)
     if (getsockopt(sockfd, 0, LOCAL_PEEREID, &cred, &siz) != 0 || siz != sizeof(cred))
         return false;
     return (cred.unp_euid == geteuid());
+#elif defined(HAVE_GETPEERUCRED)
+    ucred_t *cred = nullptr;
+    uint_t peer_uid;
+
+    if (getpeerucred(sockfd, &cred) != 0) {
+        if (cred != nullptr)
+            ucred_free(cred);
+        return false;
+    }
+    peer_uid = ucred_geteuid(cred);
+    ucred_free(cred);
+    return (peer_uid == getuid());
 #endif
 }
 #else
@@ -806,7 +821,7 @@ bool DCOPClient::attachInternal( bool registerAsAnonymous )
                 emit attachFailed(TQString::fromLatin1( "Could not read network connection list.\n" )+TQFile::decodeName(fName));
                 return false;
             }
-            int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
+            int size = TQMIN( (long)1024, f.size() ); // protection against a huge file
             TQCString contents( size+1 );
             if ( f.readBlock( contents.data(), size ) != size )
             {
@@ -1497,7 +1512,7 @@ static bool receiveQtObject( const TQCString &objId, const TQCString &fun, const
             TQStrList lst = o->metaObject()->slotNames( true );
             int i = 0;
             for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-                if ( o->metaObject()->slot( i++, true )->tqt_mo_access != TQMetaData::Public )
+                if ( o->metaObject()->slot( i++, true )->access != TQMetaData::Public )
                     continue;
                 TQCString slot = it.current();
                 if ( slot.contains( "()" ) ) {
@@ -1841,7 +1856,7 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId,
     if (replyStruct->transactionId == 0)
     {
         // Call is finished already
-        TQTimer::singleShot(0, this, TQT_SLOT(asyncReplyReady()));
+        TQTimer::singleShot(0, this, TQ_SLOT(asyncReplyReady()));
         d->asyncReplyQueue.append(replyStruct);
     }
 
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 4cb4b2f6e..7035e3c72 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -67,7 +67,7 @@ typedef TQValueList<TQCString> QCStringList;
  */
 class DCOP_EXPORT DCOPClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/dcop/dcopglobal.h b/dcop/dcopglobal.h
index 8e018226d..f8bf78789 100644
--- a/dcop/dcopglobal.h
+++ b/dcop/dcopglobal.h
@@ -37,8 +37,7 @@
 #define DCOPReplyDelayed 6
 #define DCOPFind 7
 
-#define INT32 QINT32
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>
 #endif
@@ -52,18 +51,13 @@ extern "C" {
 #include <KDE-ICE/ICEmsg.h>
 #include <KDE-ICE/ICEproto.h>
 
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern IcePoAuthStatus _kde_IcePoMagicCookie1Proc (IceConn, void **, int, int, int, void *, int *, void **, char **);
 extern IcePaAuthStatus _kde_IcePaMagicCookie1Proc (IceConn, void **, int, int, void *, int *, void **, char **);
+
 #ifdef __cplusplus
 }
 #endif
+
 /* these 4 below are static, otherwise build with --disable-shared will fail */
 static IcePoAuthProc DCOPClientAuthProcs[] = {_kde_IcePoMagicCookie1Proc};
 static IcePaAuthProc DCOPServerAuthProcs[] = {_kde_IcePaMagicCookie1Proc};
diff --git a/dcop/dcopidl/CMakeLists.txt b/dcop/dcopidl/CMakeLists.txt
index f3a8c5049..989a959be 100644
--- a/dcop/dcopidl/CMakeLists.txt
+++ b/dcop/dcopidl/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 set( target dcopidl )
 
 set( ${target}_SRCS
-  main.cpp yacc.cc scanner.cc
+  main.cpp yacc.cpp scanner.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/dcop/dcopidl/Makefile.am b/dcop/dcopidl/Makefile.am
index d896a4a34..7b071dd6a 100644
--- a/dcop/dcopidl/Makefile.am
+++ b/dcop/dcopidl/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = -DYYDEBUG
 
 bin_PROGRAMS = dcopidl
 
-dcopidl_SOURCES = main.cpp yacc.cc scanner.cc
-noinst_HEADERS = yacc.cc.h
+dcopidl_SOURCES = main.cpp yacc.cpp scanner.cpp
+noinst_HEADERS = yacc.cpp.h
 
 dcopidl_LDADD = $(LIB_TQT)
 dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
@@ -16,12 +16,12 @@ dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
 ####### Build rules
 
 parser:
-	cd $(srcdir) && flex -B -8 -oscanner.cc scanner.ll  ;\
-	bison -t -d -v -o yacc.cc yacc.yy && mv yacc.hh yacc.cc.h
+	cd $(srcdir) && flex -B -8 -oscanner.cpp scanner.ll  ;\
+	bison -t -d -v -o yacc.cpp yacc.yy && mv yacc.hh yacc.cpp.h
 
 check-local: 
 	$(srcdir)/run_test.sh $(srcdir)
 
 EXTRA_DIST = dcopidl_test.h scanner.ll yacc.yy
 
-MAINTAINERCLEANFILES = yacc.cc.output
+MAINTAINERCLEANFILES = yacc.cpp.output
diff --git a/dcop/dcopidl/dcopidl_output.kidl b/dcop/dcopidl/dcopidl_output.kidl
index 678ff6732..a0ffc5353 100644
--- a/dcop/dcopidl/dcopidl_output.kidl
+++ b/dcop/dcopidl/dcopidl_output.kidl
@@ -8,13 +8,13 @@
     <LINK_SCOPE>TDEUI_EXPORT</LINK_SCOPE>
     <SUPER>MyNamespace::MyParentClass</SUPER>
     <SUPER>DCOPObject</SUPER>
-    <SUPER>QValueList&lt;<TYPE>QString</TYPE>&gt;</SUPER>
+    <SUPER>QValueList&lt;<TYPE>TQString</TYPE>&gt;</SUPER>
     <FUNC>
-        <TYPE>QString</TYPE>
+        <TYPE>TQString</TYPE>
         <NAME>url</NAME>
      </FUNC>
     <FUNC qual="const">
-        <TYPE>QString</TYPE>
+        <TYPE>TQString</TYPE>
         <NAME>constTest</NAME>
      </FUNC>
     <FUNC>
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cpp
index 55a20aba3..4ff8d1ac3 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cpp
@@ -1,6 +1,6 @@
-#line 2 "scanner.cc"
+#line 2 "scanner.cpp"
 
-#line 4 "scanner.cc"
+#line 4 "scanner.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -940,7 +940,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQString;
 
 #ifndef KDE_USE_FINAL
-#include "yacc.cc.h"
+#include "yacc.cpp.h"
 #endif
 
 extern int idl_line_no;
@@ -1026,7 +1026,7 @@ static char translate_char( const char *s )
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
-#line 1030 "scanner.cc"
+#line 1030 "scanner.cpp"
 
 #define INITIAL 0
 
@@ -1216,7 +1216,7 @@ YY_DECL
 #line 148 "scanner.ll"
 
 
-#line 1220 "scanner.cc"
+#line 1220 "scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -1767,7 +1767,7 @@ YY_RULE_SETUP
 #line 288 "scanner.ll"
 ECHO;
 	YY_BREAK
-#line 1771 "scanner.cc"
+#line 1771 "scanner.cpp"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index ad0f564e9..710cbc3f4 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQString;
 
 #ifndef KDE_USE_FINAL
-#include "yacc.cc.h"
+#include "yacc.cpp.h"
 #endif
 
 extern int idl_line_no;
@@ -235,7 +235,6 @@ FALSE			return T_FALSE;
 "k_dcop_signals"		return T_DCOP_SIGNAL_AREA;
 typedef			return T_TYPEDEF;
 K_DCOP			return T_DCOP;
-Q_OBJECT		;
 TQ_OBJECT		;
 ("0"|"0L")		return T_NULL;
 "extern "[A-Za-z0-9_ \t*]+	return T_EXTERN;
diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cpp
index 615af46ef..ada46126c 100644
--- a/dcop/dcopidl/yacc.cc
+++ b/dcop/dcopidl/yacc.cpp
@@ -113,14 +113,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern int yylex();
 
-// extern QString idl_lexFile;
+// extern TQString idl_lexFile;
 extern int idl_line_no;
 extern int function_mode;
 
 static int dcop_area = 0;
 static int dcop_signal_area = 0;
 
-static QString in_namespace( "" );
+static TQString in_namespace( "" );
 
 void dcopidlInitFlex( const char *_code );
 
@@ -134,7 +134,7 @@ void yyerror( const char *s )
 
 
 /* Line 189 of yacc.c  */
-#line 138 "yacc.cc"
+#line 138 "yacc.cpp"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -238,14 +238,14 @@ typedef union YYSTYPE
 #line 67 "yacc.yy"
 
   long   _int;
-  QString        *_str;
+  TQString        *_str;
   unsigned short          _char;
   double _float;
 
 
 
 /* Line 214 of yacc.c  */
-#line 249 "yacc.cc"
+#line 249 "yacc.cpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -257,7 +257,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 261 "yacc.cc"
+#line 261 "yacc.cpp"
 
 #ifdef short
 # undef short
@@ -1128,7 +1128,9 @@ while (YYID (0))
 # define YYDPRINTF(Args)			\
 do {						\
   if (yydebug)					\
+	{ \
     YYFPRINTF Args;				\
+	} \
 } while (YYID (0))
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
@@ -2094,7 +2096,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 308 "yacc.yy"
     {
-	   QString* tmp = new QString( "%1::%2" );
+	   TQString* tmp = new TQString( "%1::%2" );
            *tmp = tmp->arg(*((yyvsp[(1) - (3)]._str))).arg(*((yyvsp[(3) - (3)]._str)));
            (yyval._str) = tmp;
 	;}
@@ -2105,7 +2107,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 317 "yacc.yy"
     {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) );
 		(yyval._str) = tmp;
 	  ;}
@@ -2116,7 +2118,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 323 "yacc.yy"
     {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *((yyvsp[(1) - (4)]._str)) + "&lt;" + *((yyvsp[(3) - (4)]._str)) + "&gt;" );
 		(yyval._str) = tmp;
 	  ;}
@@ -2155,7 +2157,7 @@ yyreduce:
 #line 347 "yacc.yy"
     {
 		/* $$ = $1; */
-		(yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
 	  ;}
     break;
 
@@ -2173,7 +2175,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 359 "yacc.yy"
     {
-		(yyval._str) = new QString( "" );
+		(yyval._str) = new TQString( "" );
 	  ;}
     break;
 
@@ -2190,7 +2192,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 373 "yacc.yy"
     {
-		(yyval._str) = new QString( "" );
+		(yyval._str) = new TQString( "" );
 	  ;}
     break;
 
@@ -2199,7 +2201,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 377 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
 	  ;}
     break;
 
@@ -2208,7 +2210,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 381 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(2) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
 	  ;}
     break;
 
@@ -2217,7 +2219,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 385 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (2)]._str)) + *((yyvsp[(2) - (2)]._str)) );
 	  ;}
     break;
 
@@ -2414,11 +2416,11 @@ yyreduce:
 #line 475 "yacc.yy"
     {
 		if (dcop_area) {
- 		  QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
+ 		  TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
 		  *tmp = tmp->arg( *((yyvsp[(6) - (7)]._str)) ).arg( *((yyvsp[(2) - (7)]._str)) ).arg( *((yyvsp[(4) - (7)]._str)) );
 		  (yyval._str) = tmp;
 		} else {
-		  (yyval._str) = new QString("");
+		  (yyval._str) = new TQString("");
 		}
 	  ;}
     break;
@@ -2455,140 +2457,140 @@ yyreduce:
 
 /* Line 1455 of yacc.c  */
 #line 503 "yacc.yy"
-    { (yyval._str) = new QString("signed int"); ;}
+    { (yyval._str) = new TQString("signed int"); ;}
     break;
 
   case 90:
 
 /* Line 1455 of yacc.c  */
 #line 504 "yacc.yy"
-    { (yyval._str) = new QString("signed int"); ;}
+    { (yyval._str) = new TQString("signed int"); ;}
     break;
 
   case 91:
 
 /* Line 1455 of yacc.c  */
 #line 505 "yacc.yy"
-    { (yyval._str) = new QString("unsigned int"); ;}
+    { (yyval._str) = new TQString("unsigned int"); ;}
     break;
 
   case 92:
 
 /* Line 1455 of yacc.c  */
 #line 506 "yacc.yy"
-    { (yyval._str) = new QString("unsigned int"); ;}
+    { (yyval._str) = new TQString("unsigned int"); ;}
     break;
 
   case 93:
 
 /* Line 1455 of yacc.c  */
 #line 507 "yacc.yy"
-    { (yyval._str) = new QString("signed short int"); ;}
+    { (yyval._str) = new TQString("signed short int"); ;}
     break;
 
   case 94:
 
 /* Line 1455 of yacc.c  */
 #line 508 "yacc.yy"
-    { (yyval._str) = new QString("signed short int"); ;}
+    { (yyval._str) = new TQString("signed short int"); ;}
     break;
 
   case 95:
 
 /* Line 1455 of yacc.c  */
 #line 509 "yacc.yy"
-    { (yyval._str) = new QString("signed long int"); ;}
+    { (yyval._str) = new TQString("signed long int"); ;}
     break;
 
   case 96:
 
 /* Line 1455 of yacc.c  */
 #line 510 "yacc.yy"
-    { (yyval._str) = new QString("signed long int"); ;}
+    { (yyval._str) = new TQString("signed long int"); ;}
     break;
 
   case 97:
 
 /* Line 1455 of yacc.c  */
 #line 511 "yacc.yy"
-    { (yyval._str) = new QString("unsigned short int"); ;}
+    { (yyval._str) = new TQString("unsigned short int"); ;}
     break;
 
   case 98:
 
 /* Line 1455 of yacc.c  */
 #line 512 "yacc.yy"
-    { (yyval._str) = new QString("unsigned short int"); ;}
+    { (yyval._str) = new TQString("unsigned short int"); ;}
     break;
 
   case 99:
 
 /* Line 1455 of yacc.c  */
 #line 513 "yacc.yy"
-    { (yyval._str) = new QString("unsigned long int"); ;}
+    { (yyval._str) = new TQString("unsigned long int"); ;}
     break;
 
   case 100:
 
 /* Line 1455 of yacc.c  */
 #line 514 "yacc.yy"
-    { (yyval._str) = new QString("unsigned long int"); ;}
+    { (yyval._str) = new TQString("unsigned long int"); ;}
     break;
 
   case 101:
 
 /* Line 1455 of yacc.c  */
 #line 515 "yacc.yy"
-    { (yyval._str) = new QString("int"); ;}
+    { (yyval._str) = new TQString("int"); ;}
     break;
 
   case 102:
 
 /* Line 1455 of yacc.c  */
 #line 516 "yacc.yy"
-    { (yyval._str) = new QString("long int"); ;}
+    { (yyval._str) = new TQString("long int"); ;}
     break;
 
   case 103:
 
 /* Line 1455 of yacc.c  */
 #line 517 "yacc.yy"
-    { (yyval._str) = new QString("long int"); ;}
+    { (yyval._str) = new TQString("long int"); ;}
     break;
 
   case 104:
 
 /* Line 1455 of yacc.c  */
 #line 518 "yacc.yy"
-    { (yyval._str) = new QString("short int"); ;}
+    { (yyval._str) = new TQString("short int"); ;}
     break;
 
   case 105:
 
 /* Line 1455 of yacc.c  */
 #line 519 "yacc.yy"
-    { (yyval._str) = new QString("short int"); ;}
+    { (yyval._str) = new TQString("short int"); ;}
     break;
 
   case 106:
 
 /* Line 1455 of yacc.c  */
 #line 520 "yacc.yy"
-    { (yyval._str) = new QString("char"); ;}
+    { (yyval._str) = new TQString("char"); ;}
     break;
 
   case 107:
 
 /* Line 1455 of yacc.c  */
 #line 521 "yacc.yy"
-    { (yyval._str) = new QString("signed char"); ;}
+    { (yyval._str) = new TQString("signed char"); ;}
     break;
 
   case 108:
 
 /* Line 1455 of yacc.c  */
 #line 522 "yacc.yy"
-    { (yyval._str) = new QString("unsigned char"); ;}
+    { (yyval._str) = new TQString("unsigned char"); ;}
     break;
 
   case 111:
@@ -2596,7 +2598,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 532 "yacc.yy"
     {
-		(yyval._str) = new QString( "" );
+		(yyval._str) = new TQString( "" );
 	  ;}
     break;
 
@@ -2605,7 +2607,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 537 "yacc.yy"
     {
-		(yyval._str) = new QString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
+		(yyval._str) = new TQString( *((yyvsp[(1) - (3)]._str)) + *((yyvsp[(3) - (3)]._str)) );
 	  ;}
     break;
 
@@ -2635,7 +2637,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 548 "yacc.yy"
     {
-		QString *tmp = new QString("%1&lt;%2&gt;");
+		TQString *tmp = new TQString("%1&lt;%2&gt;");
 		*tmp = tmp->arg(*((yyvsp[(1) - (4)]._str)));
 		*tmp = tmp->arg(*((yyvsp[(3) - (4)]._str)));
 		(yyval._str) = tmp;
@@ -2647,7 +2649,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 554 "yacc.yy"
     {
-		QString *tmp = new QString("%1&lt;%2&gt;::%3");
+		TQString *tmp = new TQString("%1&lt;%2&gt;::%3");
 		*tmp = tmp->arg(*((yyvsp[(1) - (6)]._str)));
 		*tmp = tmp->arg(*((yyvsp[(3) - (6)]._str)));
 		*tmp = tmp->arg(*((yyvsp[(6) - (6)]._str)));
@@ -2660,7 +2662,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 566 "yacc.yy"
     {
-	    (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
+	    (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
 	  ;}
     break;
 
@@ -2708,7 +2710,7 @@ yyreduce:
 #line 596 "yacc.yy"
     {
 	     if (dcop_area) {
-	  	QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+	  	TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
 		*tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) );
 		(yyval._str) = tmp;
 	     }
@@ -2720,7 +2722,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 603 "yacc.yy"
     {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *((yyvsp[(2) - (2)]._str)) );
 		(yyval._str) = tmp;
 	;}
@@ -2731,7 +2733,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 608 "yacc.yy"
     {
-        QString* tmp = new QString("<TYPE>%1</TYPE>");
+        TQString* tmp = new TQString("<TYPE>%1</TYPE>");
         *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) );
         (yyval._str) = tmp;
     ;}
@@ -2743,7 +2745,7 @@ yyreduce:
 #line 613 "yacc.yy"
     { 
         if (dcop_area) { 
-           QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
+           TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
            *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) ); 
            (yyval._str) = tmp; 
         } 
@@ -2765,7 +2767,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 625 "yacc.yy"
     {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *((yyvsp[(1) - (1)]._str)) );
 		(yyval._str) = tmp;
 	;}
@@ -2786,7 +2788,7 @@ yyreduce:
 /* Line 1455 of yacc.c  */
 #line 639 "yacc.yy"
     {
-	    (yyval._str) = new QString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
+	    (yyval._str) = new TQString(*((yyvsp[(1) - (3)]._str)) + "," + *((yyvsp[(3) - (3)]._str)));
 	  ;}
     break;
 
@@ -2805,11 +2807,11 @@ yyreduce:
 #line 650 "yacc.yy"
     {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
   		   *tmp = tmp->arg( *((yyvsp[(1) - (3)]._str)) );
   		   *tmp = tmp->arg( *((yyvsp[(2) - (3)]._str)) );
 		   (yyval._str) = tmp;		
-		} else (yyval._str) = new QString();
+		} else (yyval._str) = new TQString();
 	  ;}
     break;
 
@@ -2819,10 +2821,10 @@ yyreduce:
 #line 659 "yacc.yy"
     {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1</ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1</ARG>");
   		   *tmp = tmp->arg( *((yyvsp[(1) - (2)]._str)) );
 		   (yyval._str) = tmp;		
-		} else (yyval._str) = new QString();
+		} else (yyval._str) = new TQString();
 	  ;}
     break;
 
@@ -2833,7 +2835,7 @@ yyreduce:
     {
 		if (dcop_area)
 			yyerror("variable arguments not supported in dcop area.");
-		(yyval._str) = new QString("");
+		(yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -2921,8 +2923,8 @@ yyreduce:
 #line 716 "yacc.yy"
     {
 	     if (dcop_area || dcop_signal_area) {
-		QString* tmp = 0;
-                tmp = new QString(
+		TQString* tmp = 0;
+                tmp = new TQString(
                         "    <%4>\n"
                         "        %2\n"
                         "        <NAME>%1</NAME>"
@@ -2932,13 +2934,13 @@ yyreduce:
 		*tmp = tmp->arg( *((yyvsp[(1) - (6)]._str)) );
                 *tmp = tmp->arg( *((yyvsp[(4) - (6)]._str)) );
                 
-                QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
-                QString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : "";
-                *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) );
-                *tmp = tmp->arg( QString("%1").arg(tagname) );
+                TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
+                TQString attr = ((yyvsp[(6) - (6)]._int)) ? " qual=\"const\"" : "";
+                *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) );
+                *tmp = tmp->arg( TQString("%1").arg(tagname) );
 		(yyval._str) = tmp;
    	     } else
-	        (yyval._str) = new QString("");
+	        (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -2949,7 +2951,7 @@ yyreduce:
     {
 	     if (dcop_area)
 		yyerror("operators aren't allowed in dcop areas!");
-	     (yyval._str) = new QString("");
+	     (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3029,7 +3031,7 @@ yyreduce:
     {
 	      /* The constructor */
 	      assert(!dcop_area);
-              (yyval._str) = new QString("");
+              (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3040,7 +3042,7 @@ yyreduce:
     {
 	      /* The constructor */
 	      assert(!dcop_area);
-              (yyval._str) = new QString("");
+              (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3051,7 +3053,7 @@ yyreduce:
     {
 	      /* The destructor */
   	      assert(!dcop_area);
-              (yyval._str) = new QString("");
+              (yyval._str) = new TQString("");
 	  ;}
     break;
 
@@ -3066,7 +3068,7 @@ yyreduce:
                  else
                      yyerror("DCOP functions cannot be static");
               } else {
-                 (yyval._str) = new QString();
+                 (yyval._str) = new TQString();
               }  
 	  ;}
     break;
@@ -3167,7 +3169,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 3171 "yacc.cc"
+#line 3171 "yacc.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/dcop/dcopidl/yacc.cc.h b/dcop/dcopidl/yacc.cpp.h
index 2a6c1b403..5bbacfa1f 100644
--- a/dcop/dcopidl/yacc.cc.h
+++ b/dcop/dcopidl/yacc.cpp.h
@@ -116,7 +116,7 @@ typedef union YYSTYPE
 #line 67 "yacc.yy"
 
   long   _int;
-  QString        *_str;
+  TQString        *_str;
   unsigned short          _char;
   double _float;
 
diff --git a/dcop/dcopidl/yacc.yy b/dcop/dcopidl/yacc.yy
index ac744e902..82d5fc333 100644
--- a/dcop/dcopidl/yacc.yy
+++ b/dcop/dcopidl/yacc.yy
@@ -42,14 +42,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern int yylex();
 
-// extern QString idl_lexFile;
+// extern TQString idl_lexFile;
 extern int idl_line_no;
 extern int function_mode;
 
 static int dcop_area = 0;
 static int dcop_signal_area = 0;
 
-static QString in_namespace( "" );
+static TQString in_namespace( "" );
 
 void dcopidlInitFlex( const char *_code );
 
@@ -66,7 +66,7 @@ void yyerror( const char *s )
 %union
 {
   long   _int;
-  QString        *_str;
+  TQString        *_str;
   unsigned short          _char;
   double _float;
 }
@@ -306,7 +306,7 @@ Identifier
 	  $$ = $1;
 	}
 	| T_IDENTIFIER T_SCOPE Identifier {
-	   QString* tmp = new QString( "%1::%2" );
+	   TQString* tmp = new TQString( "%1::%2" );
            *tmp = tmp->arg(*($1)).arg(*($3));
            $$ = tmp;
 	}
@@ -315,13 +315,13 @@ Identifier
 super_class_name
 	: Identifier
 	  {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *($1) );
 		$$ = tmp;
 	  }
 	| Identifier T_LESS type_list T_GREATER
 	  {
-		QString* tmp = new QString( "    <SUPER>%1</SUPER>\n" );
+		TQString* tmp = new TQString( "    <SUPER>%1</SUPER>\n" );
 		*tmp = tmp->arg( *($1) + "&lt;" + *($3) + "&gt;" );
 		$$ = tmp;
 	  }
@@ -346,7 +346,7 @@ super_classes
 	| super_class T_COMMA super_classes
 	  {
 		/* $$ = $1; */
-		$$ = new QString( *($1) + *($3) );
+		$$ = new TQString( *($1) + *($3) );
 	  }
 	;
 
@@ -357,7 +357,7 @@ class_header
 	  }
 	| T_LEFT_CURLY_BRACKET
 	  {
-		$$ = new QString( "" );
+		$$ = new TQString( "" );
 	  }
 	;
 
@@ -371,19 +371,19 @@ opt_semicolon
 body
 	: T_RIGHT_CURLY_BRACKET
 	  {
-		$$ = new QString( "" );
+		$$ = new TQString( "" );
 	  }
 	| typedef body
 	  {
-		$$ = new QString( *($1) + *($2) );
+		$$ = new TQString( *($1) + *($2) );
 	  }
 	| T_INLINE function body
 	  {
-		$$ = new QString( *($2) + *($3) );
+		$$ = new TQString( *($2) + *($3) );
 	  }
 	| function body
 	  {
-		$$ = new QString( *($1) + *($2) );
+		$$ = new TQString( *($1) + *($2) );
 	  }
 	| dcop_signal_area_begin body
 	  {
@@ -474,11 +474,11 @@ typedef
 	: T_TYPEDEF Identifier T_LESS type_list T_GREATER Identifier T_SEMICOLON
 	  {
 		if (dcop_area) {
- 		  QString* tmp = new QString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
+ 		  TQString* tmp = new TQString("<TYPEDEF name=\"%1\" template=\"%2\"><PARAM %3</TYPEDEF>\n");
 		  *tmp = tmp->arg( *($6) ).arg( *($2) ).arg( *($4) );
 		  $$ = tmp;
 		} else {
-		  $$ = new QString("");
+		  $$ = new TQString("");
 		}
 	  }
 	| T_TYPEDEF Identifier T_LESS type_list T_GREATER T_SCOPE T_IDENTIFIER Identifier T_SEMICOLON
@@ -500,26 +500,26 @@ const_qualifier
 	;
 
 int_type
-	: T_SIGNED { $$ = new QString("signed int"); }
-	| T_SIGNED T_INT { $$ = new QString("signed int"); }
-	| T_UNSIGNED { $$ = new QString("unsigned int"); }
-	| T_UNSIGNED T_INT { $$ = new QString("unsigned int"); }
-	| T_SIGNED T_SHORT { $$ = new QString("signed short int"); }
-	| T_SIGNED T_SHORT T_INT { $$ = new QString("signed short int"); }
-	| T_SIGNED T_LONG { $$ = new QString("signed long int"); }
-	| T_SIGNED T_LONG T_INT { $$ = new QString("signed long int"); }
-	| T_UNSIGNED T_SHORT { $$ = new QString("unsigned short int"); }
-	| T_UNSIGNED T_SHORT T_INT { $$ = new QString("unsigned short int"); }
-	| T_UNSIGNED T_LONG { $$ = new QString("unsigned long int"); }
-	| T_UNSIGNED T_LONG T_INT { $$ = new QString("unsigned long int"); }
-	| T_INT { $$ = new QString("int"); }
-	| T_LONG { $$ = new QString("long int"); }
-	| T_LONG T_INT { $$ = new QString("long int"); }
-	| T_SHORT { $$ = new QString("short int"); }
-	| T_SHORT T_INT { $$ = new QString("short int"); }
-	| T_CHAR { $$ = new QString("char"); }
-	| T_SIGNED T_CHAR { $$ = new QString("signed char"); }
-	| T_UNSIGNED T_CHAR { $$ = new QString("unsigned char"); }
+	: T_SIGNED { $$ = new TQString("signed int"); }
+	| T_SIGNED T_INT { $$ = new TQString("signed int"); }
+	| T_UNSIGNED { $$ = new TQString("unsigned int"); }
+	| T_UNSIGNED T_INT { $$ = new TQString("unsigned int"); }
+	| T_SIGNED T_SHORT { $$ = new TQString("signed short int"); }
+	| T_SIGNED T_SHORT T_INT { $$ = new TQString("signed short int"); }
+	| T_SIGNED T_LONG { $$ = new TQString("signed long int"); }
+	| T_SIGNED T_LONG T_INT { $$ = new TQString("signed long int"); }
+	| T_UNSIGNED T_SHORT { $$ = new TQString("unsigned short int"); }
+	| T_UNSIGNED T_SHORT T_INT { $$ = new TQString("unsigned short int"); }
+	| T_UNSIGNED T_LONG { $$ = new TQString("unsigned long int"); }
+	| T_UNSIGNED T_LONG T_INT { $$ = new TQString("unsigned long int"); }
+	| T_INT { $$ = new TQString("int"); }
+	| T_LONG { $$ = new TQString("long int"); }
+	| T_LONG T_INT { $$ = new TQString("long int"); }
+	| T_SHORT { $$ = new TQString("short int"); }
+	| T_SHORT T_INT { $$ = new TQString("short int"); }
+	| T_CHAR { $$ = new TQString("char"); }
+	| T_SIGNED T_CHAR { $$ = new TQString("signed char"); }
+	| T_UNSIGNED T_CHAR { $$ = new TQString("unsigned char"); }
 	;
 
 asterisks
@@ -530,12 +530,12 @@ asterisks
 params
 	: /* empty */
 	  {
-		$$ = new QString( "" );
+		$$ = new TQString( "" );
 	  }
 	| param
 	| params T_COMMA param
 	  {
-		$$ = new QString( *($1) + *($3) );
+		$$ = new TQString( *($1) + *($3) );
 	  }
 	;
 
@@ -546,13 +546,13 @@ type_name
 	| T_STRUCT Identifier { $$ = $2; }
 	| T_CLASS Identifier { $$ = $2; }
 	| Identifier T_LESS templ_type_list T_GREATER {
-		QString *tmp = new QString("%1&lt;%2&gt;");
+		TQString *tmp = new TQString("%1&lt;%2&gt;");
 		*tmp = tmp->arg(*($1));
 		*tmp = tmp->arg(*($3));
 		$$ = tmp;
 	 }
 	| Identifier T_LESS templ_type_list T_GREATER T_SCOPE Identifier{
-		QString *tmp = new QString("%1&lt;%2&gt;::%3");
+		TQString *tmp = new TQString("%1&lt;%2&gt;::%3");
 		*tmp = tmp->arg(*($1));
 		*tmp = tmp->arg(*($3));
 		*tmp = tmp->arg(*($6));
@@ -564,7 +564,7 @@ type_name
 templ_type_list
 	: templ_type T_COMMA templ_type_list
 	  {
-	    $$ = new QString(*($1) + "," + *($3));
+	    $$ = new TQString(*($1) + "," + *($3));
 	  }
 	| templ_type
   	  {
@@ -595,24 +595,24 @@ type
 	  }
 	| T_CONST type_name T_AMPERSAND {
 	     if (dcop_area) {
-	  	QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
+	  	TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>");
 		*tmp = tmp->arg( *($2) );
 		$$ = tmp;
 	     }
 	  }
 	| T_CONST type_name %prec T_UNIMPORTANT {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *($2) );
 		$$ = tmp;
 	}
     | type_name T_CONST %prec T_UNIMPORTANT {
-        QString* tmp = new QString("<TYPE>%1</TYPE>");
+        TQString* tmp = new TQString("<TYPE>%1</TYPE>");
         *tmp = tmp->arg( *($1) );
         $$ = tmp;
     }
     | type_name T_CONST T_AMPERSAND { 
         if (dcop_area) { 
-           QString* tmp = new QString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
+           TQString* tmp = new TQString("<TYPE  qleft=\"const\" qright=\"" AMP_ENTITY "\">%1</TYPE>"); 
            *tmp = tmp->arg( *($1) ); 
            $$ = tmp; 
         } 
@@ -623,7 +623,7 @@ type
 	  }
 
 	| type_name %prec T_UNIMPORTANT {
-		QString* tmp = new QString("<TYPE>%1</TYPE>");
+		TQString* tmp = new TQString("<TYPE>%1</TYPE>");
 		*tmp = tmp->arg( *($1) );
 		$$ = tmp;
 	}
@@ -637,7 +637,7 @@ type
 type_list
 	: type T_COMMA type_list
 	  {
-	    $$ = new QString(*($1) + "," + *($3));
+	    $$ = new TQString(*($1) + "," + *($3));
 	  }
 	| type
   	  {
@@ -649,25 +649,25 @@ param
 	: type Identifier default
 	  {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1<NAME>%2</NAME></ARG>");
   		   *tmp = tmp->arg( *($1) );
   		   *tmp = tmp->arg( *($2) );
 		   $$ = tmp;		
-		} else $$ = new QString();
+		} else $$ = new TQString();
 	  }
 	| type default
 	  {
 		if (dcop_area) {
-		   QString* tmp = new QString("\n        <ARG>%1</ARG>");
+		   TQString* tmp = new TQString("\n        <ARG>%1</ARG>");
   		   *tmp = tmp->arg( *($1) );
 		   $$ = tmp;		
-		} else $$ = new QString();
+		} else $$ = new TQString();
 	  }
 	| T_TRIPLE_DOT
 	  {
 		if (dcop_area)
 			yyerror("variable arguments not supported in dcop area.");
-		$$ = new QString("");
+		$$ = new TQString("");
 	  }
 	;
 
@@ -715,8 +715,8 @@ function_header
 	: type Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier
 	  {
 	     if (dcop_area || dcop_signal_area) {
-		QString* tmp = 0;
-                tmp = new QString(
+		TQString* tmp = 0;
+                tmp = new TQString(
                         "    <%4>\n"
                         "        %2\n"
                         "        <NAME>%1</NAME>"
@@ -726,19 +726,19 @@ function_header
 		*tmp = tmp->arg( *($1) );
                 *tmp = tmp->arg( *($4) );
                 
-                QString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
-                QString attr = ($6) ? " qual=\"const\"" : "";
-                *tmp = tmp->arg( QString("%1%2").arg(tagname).arg(attr) );
-                *tmp = tmp->arg( QString("%1").arg(tagname) );
+                TQString tagname = (dcop_signal_area) ? "SIGNAL" : "FUNC";
+                TQString attr = ($6) ? " qual=\"const\"" : "";
+                *tmp = tmp->arg( TQString("%1%2").arg(tagname).arg(attr) );
+                *tmp = tmp->arg( TQString("%1").arg(tagname) );
 		$$ = tmp;
    	     } else
-	        $$ = new QString("");
+	        $$ = new TQString("");
 	  }
 	| type T_FUNOPERATOR operator T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS const_qualifier
 	  {
 	     if (dcop_area)
 		yyerror("operators aren't allowed in dcop areas!");
-	     $$ = new QString("");
+	     $$ = new TQString("");
 	  }
 	;
 
@@ -778,19 +778,19 @@ function
 	  {
 	      /* The constructor */
 	      assert(!dcop_area);
-              $$ = new QString("");
+              $$ = new TQString("");
 	  }
 	| Identifier T_LEFT_PARANTHESIS params T_RIGHT_PARANTHESIS T_COLON init_list function_body
 	  {
 	      /* The constructor */
 	      assert(!dcop_area);
-              $$ = new QString("");
+              $$ = new TQString("");
 	  }
 	| virtual_qualifier T_TILDE Identifier T_LEFT_PARANTHESIS T_RIGHT_PARANTHESIS function_body
 	  {
 	      /* The destructor */
   	      assert(!dcop_area);
-              $$ = new QString("");
+              $$ = new TQString("");
 	  }
 	| T_STATIC function_header function_body
 	  {
@@ -800,7 +800,7 @@ function
                  else
                      yyerror("DCOP functions cannot be static");
               } else {
-                 $$ = new QString();
+                 $$ = new TQString();
               }  
 	  }      
 	;
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index 66f18f92f..1d6d95a36 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -10,7 +10,7 @@
 
 class TDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    DefaultTest();
@@ -70,7 +70,7 @@ public:
 
 class NonHashingTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    NonHashingTest();
@@ -80,7 +80,7 @@ k_dcop:
 
 class HashingTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    HashingTest();
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 91814d665..e3119b3dc 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -73,9 +73,9 @@ public:
     virtual bool tqt_emit( int, QUObject* );
     virtual bool tqt_property( int, int, QVariant* );
     static QMetaObject* staticMetaObject();
-    QObject* qObject();
-    static QString tr( const char *, const char * = 0 );
-    static QString trUtf8( const char *, const char * = 0 );
+    TQObject* qObject();
+    static TQString tr( const char *, const char * = 0 );
+    static TQString trUtf8( const char *, const char * = 0 );
 private:
 CODE
 
@@ -98,9 +98,8 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     _STYLE_PLATINUM => '',
     _STYLE_SGI => '',
     _STYLE_WINDOWS => '',
-    QT_STATIC_CONST => 'static const',
-    Q_EXPORT => '',
-    Q_REFCOUNT => '',
+    TQ_EXPORT => '',
+    TQ_REFCOUNT => '',
     QM_EXPORT_CANVAS => '',
     QM_EXPORT_DNS => '',
     QM_EXPORT_ICONVIEW => '',
@@ -109,19 +108,18 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     QM_EXPORT_WORKSPACE => '',
     TQT_NO_REMOTE => 'TQT_NO_REMOTE',
     QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
-    Q_WS_X11 => 'Q_WS_X11',
+    TQ_WS_X11 => 'TQ_WS_X11',
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
-    Q_WS_QWS => 'undef',
-    Q_WS_MAC => 'undef',
-    Q_OBJECT => <<'CODE',
+    TQ_WS_QWS => 'undef',
+    TQ_WS_MAC => 'undef',
     TQ_OBJECT => <<'CODE',
 public:
     virtual QMetaObject *metaObject() const;
     virtual const char *className() const;
     virtual bool tqt_invoke( int, QUObject* );
     virtual bool tqt_emit( int, QUObject* );
-    static QString tr( const char *, const char * = 0 );
-    static QString trUtf8( const char *, const char * = 0 );
+    static TQString tr( const char *, const char * = 0 );
+    static TQString trUtf8( const char *, const char * = 0 );
 private:
 CODE
 };
@@ -373,7 +371,7 @@ sub readSourceLine
 =head2 readCxxLine
 
 	Reads a C++ source line, skipping comments, blank lines,
-	preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros
+	preprocessor tokens and the TQ_OBJECT macros
 
 =cut
 
@@ -401,16 +399,11 @@ LOOP:
 			}
 		}
 
-		if ( $p =~ /^\s*Q_OBJECT/ ) {
-			push @inputqueue, @codeqobject;
-			next;
-		}
 		if ( $p =~ /^\s*TQ_OBJECT/ ) {
 			push @inputqueue, @codeqobject;
 			next;
 		}
 		# Hack, waiting for real handling of preprocessor defines
-		$p =~ s/QT_STATIC_CONST/static const/;
 		$p =~ s/KSVG_GET/KJS::Value get();/;
 		$p =~ s/KSVG_BASECLASS_GET/KJS::Value get();/;
 		$p =~ s/KSVG_BRIDGE/KJS::ObjectImp *bridge();/;
@@ -423,7 +416,7 @@ LOOP:
 		}
 
 		next if ( $p =~ /^\s*$/s ); 		# blank lines
-#			|| $p =~ /^\s*Q_OBJECT/		# QObject macro
+#			|| $p =~ /^\s*TQ_OBJECT/		# TQObject macro
 #			);
 #
 
@@ -431,7 +424,7 @@ LOOP:
 						|| $p =~ /^\s*TQ_PROPERTY/		# and TQ_PROPERTY
 						|| $p =~ /^\s*TQ_OVERRIDE/		# and TQ_OVERRIDE
 						|| $p =~ /^\s*TQ_SETS/
-						|| $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/
+						|| $p =~ /^\s*TQ_DUMMY_COMPARISON_OPERATOR/
 						|| $p =~ /^\s*K_SYCOCATYPE/		# and K_SYCOCA stuff
 						|| $p =~ /^\s*K_SYCOCAFACTORY/	#
 						|| $p =~ /^\s*KSVG_/			# and KSVG stuff ;)
@@ -456,13 +449,13 @@ LOOP:
 			else {
 				# Skip platform-specific stuff, or #if 0 stuff
 				# or #else of something we parsed (e.g. for QKeySequence)
-				if ( $p =~ m/^#\s*ifdef\s*Q_WS_/ or
-				     $p =~ m/^#\s*if\s+defined\(Q_WS_/ or
+				if ( $p =~ m/^#\s*ifdef\s*TQ_WS_/ or
+				     $p =~ m/^#\s*if\s+defined\(TQ_WS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_OS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(TQT_THREAD_SUPPORT/ or
 				     $p =~ m/^#\s*else/ or
-				     $p =~ m/^#\s*if\s+defined\(Q_FULL_TEMPLATE_INSTANTIATION/ or
+				     $p =~ m/^#\s*if\s+defined\(TQ_FULL_TEMPLATE_INSTANTIATION/ or
 				     $p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or
 				     &$match_qt_defines( $p ) or
 				     $p =~ m/^#\s*if\s+0\s+/ ) {
@@ -713,7 +706,7 @@ sub identifyDecl
 					\s*(class|struct|union|namespace) # 2 struct type
 					\s*([A-Z_]*EXPORT[A-Z_]*)?		  # 3 export
 					(?:\s*TQ_PACKED)?
-					(?:\s*Q_REFCOUNT)?
+					(?:\s*TQ_REFCOUNT)?
 					\s+([\w_]+						  # 4 name
 							(?:<[\w_ :,]+?>)?		  # maybe explicit template
 									#	 (eat chars between <> non-hungry)
@@ -776,7 +769,10 @@ sub identifyDecl
 					  \( (.*?) \)		# parameters
 					  \s*((?:const)?)\s*
 					  (?:throw\s*\(.*?\))?
-					  \s*((?:=\s*0(?:L?))?)\s*	# Pureness. is "0L" allowed?
+					  \s*((?:=\s*(?:
+					  0(?:L?)|      # Pureness. is "0L" allowed?
+					  default       # Default method
+					  ))?)
 					  \s*[;{]+/xs ) {	# rest
 
 		my $tpn = $1; # type + name
@@ -788,7 +784,7 @@ sub identifyDecl
 		}
 
 		my $const = $3 eq "" ? 0 : 1;
-		my $pure = $4 eq "" ? 0 : 1;
+		my $pure = $4 eq "" ? 0 : ($4 =~ "default" ? 0 : 1);
 		$tpn =~ s/\s+/ /g;
 		$params =~ s/\s+/ /g;
 
@@ -1475,7 +1471,7 @@ sub newMethod
 	This property contains a list of nodes, one for each parameter.
 
 	Each parameter node has the following properties:
-	* ArgType the type of the argument, e.g. const QString&
+	* ArgType the type of the argument, e.g. const TQString&
 	* ArgName the name of the argument - optionnal
 	* DefaultValue the default value of the argument - optionnal
 
diff --git a/dcop/dcopidlng/kdocUtil.pm b/dcop/dcopidlng/kdocUtil.pm
index 629147ac3..e045a6790 100644
--- a/dcop/dcopidlng/kdocUtil.pm
+++ b/dcop/dcopidlng/kdocUtil.pm
@@ -139,7 +139,7 @@ sub userName
 =head2 splitUnnested
 	Helper to split a list using a delimiter, but looking for
 	nesting with (), {}, [] and <>.
-        Example: splitting   int a, QPair<c,b> d, e=","
+        Example: splitting   int a, TQPair<c,b> d, e=","
 	on ',' will give 3 items in the list.
 
 	Parameter: delimiter, string
diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp
index f02d07325..fd39fb347 100644
--- a/dcop/dcopobject.cpp
+++ b/dcop/dcopobject.cpp
@@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj)
     while (currentObj != 0L) {
         ident.prepend( currentObj->name() );
         ident.prepend("/");
-        currentObj = TQT_TQOBJECT(currentObj->parent());
+        currentObj = currentObj->parent();
     }
     if ( ident[0] == '/' )
         ident = ident.mid(1);
@@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj )
     {
 	identity.prepend( currentObj->name() );
 	identity.prepend("/");
-	currentObj = TQT_TQOBJECT(currentObj->parent());
+	currentObj = currentObj->parent();
     }
     if ( identity[0] == '/' )
 	identity = identity.mid(1);
diff --git a/dcop/dcopref.h b/dcop/dcopref.h
index 6864bc4ad..c85654e0e 100644
--- a/dcop/dcopref.h
+++ b/dcop/dcopref.h
@@ -238,7 +238,7 @@ inline TQDataStream & operator << (TQDataStream & str, const DCOPArg& arg )
  * dcopTypeName function, for example
  *
  * \code
- *	inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; }
+ *	inline const char* dcopTypeName( const TQString& ) { return "TQString"; }
  * \endcode
  *
  * If you use custom data types that do support TQDataStream but have
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index ec6086f09..99c3cba67 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -306,8 +306,8 @@ tqWarning("[dcopserver] waitForOutputReady fd = %d datasize = %d start = %d", so
    if (!outputBufferNotifier)
    {
       outputBufferNotifier = new TQSocketNotifier(socket(), Write);
-      connect(outputBufferNotifier, TQT_SIGNAL(activated(int)),
-              the_server, TQT_SLOT(slotOutputReady(int)));
+      connect(outputBufferNotifier, TQ_SIGNAL(activated(int)),
+              the_server, TQ_SLOT(slotOutputReady(int)));
    }
    outputBufferNotifier->setEnabled(true);
    return;
@@ -1055,16 +1055,16 @@ DCOPServer::DCOPServer(bool _suicide)
     for ( int i = 0; i < numTransports; i++) {
 	con = new DCOPListener( listenObjs[i] );
 	listener.append( con );
-	connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newClient(int) ) );
+	connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newClient(int) ) );
     }
     char c = 0;
     write(ready[1], &c, 1); // dcopserver is started
     close(ready[1]);
 
     m_timer =  new TQTimer(this);
-    connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
+    connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) );
     m_deadConnectionTimer = new TQTimer(this);
-    connect( m_deadConnectionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCleanDeadConnections()) );
+    connect( m_deadConnectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCleanDeadConnections()) );
 
 #ifdef Q_OS_WIN
 	char szEventName[256];
@@ -1183,7 +1183,7 @@ void DCOPServer::newClient( int /*socket*/ )
 void* DCOPServer::watchConnection( IceConn iceConn )
 {
     DCOPConnection* con = new DCOPConnection( iceConn );
-    connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) );
+    connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) );
 
     clients.insert(iceConn, con );
     fd_clients.insert( IceConnectionNumber(iceConn), con);
@@ -1293,8 +1293,8 @@ void DCOPServer::slotTerminate()
 #endif
     TQByteArray data;
     dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false);
-    disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
-    connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) );
+    disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) );
+    connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSuicide()) );
     system(findDcopserverShutdown()+" --nokill");
 }
 
@@ -1321,8 +1321,8 @@ void DCOPServer::slotShutdown()
        TQByteArray data;
        dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false);
        m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate
-       disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) );
-       connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) );
+       disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) );
+       connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotExit()) );
        if (appIds.isEmpty())
          slotExit(); // Exit now
     }
@@ -1618,7 +1618,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
     if (::access(fName.data(), R_OK) == 0) {
 	TQFile f(fName);
 	f.open(IO_ReadOnly);
-	int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
+	int size = TQMIN( (long)1024, f.size() ); // protection against a huge file
 	TQCString contents( size+1 );
 	bool ok = f.readBlock( contents.data(), size ) == size;
 	contents[size] = '\0';
@@ -1779,7 +1779,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] )
 	SetConsoleCtrlHandler(DCOPServer::dcopServerConsoleProc,TRUE);
 #else
 	TQSocketNotifier DEATH(pipeOfDeath[0], TQSocketNotifier::Read, 0, 0);
-		server->connect(&DEATH, TQT_SIGNAL(activated(int)), TQT_SLOT(slotShutdown()));
+		server->connect(&DEATH, TQ_SIGNAL(activated(int)), TQ_SLOT(slotShutdown()));
 #endif
 
     int ret = a.exec();
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index f0f5d1137..e17ee4ef1 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -34,8 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqintdict.h>
 #include <tqapplication.h>
 
-#define INT32 QINT32
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xmd.h>
 #endif
@@ -116,7 +115,7 @@ public:
  */
 class DCOPServer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DCOPServer(bool _suicide);
     ~DCOPServer();
diff --git a/dcop/dcopserver_shutdown.c b/dcop/dcopserver_shutdown.c
index af75c6d5a..8b1ee2884 100644
--- a/dcop/dcopserver_shutdown.c
+++ b/dcop/dcopserver_shutdown.c
@@ -54,9 +54,9 @@ static char *getDisplay()
 /*
  don't test for a value from tqglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
- on the commandline (which in tqglobal.h however triggers Q_WS_QWS,
+ on the commandline (which in tqglobal.h however triggers TQ_WS_QWS,
  but we don't want to include that here) (Simon)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
  */
 #if !defined(QWS)
    display = getenv("DISPLAY");
diff --git a/dcop/dcopserver_shutdown_win.cpp b/dcop/dcopserver_shutdown_win.cpp
index 384bd6f36..af38c66f8 100644
--- a/dcop/dcopserver_shutdown_win.cpp
+++ b/dcop/dcopserver_shutdown_win.cpp
@@ -64,9 +64,9 @@ static char *getDisplay()
 /*
  don't test for a value from tqglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
- on the commandline (which in tqglobal.h however triggers Q_WS_QWS,
+ on the commandline (which in tqglobal.h however triggers TQ_WS_QWS,
  but we don't want to include that here) (Simon)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
  */
 #if !defined(QWS)
    display = getenv("DISPLAY");
diff --git a/dcop/dcoptypes.h b/dcop/dcoptypes.h
index 548483e97..d70f787f7 100644
--- a/dcop/dcoptypes.h
+++ b/dcop/dcoptypes.h
@@ -37,38 +37,38 @@ inline const char* dcopTypeName( long ) { return "long int"; }
 inline const char* dcopTypeName( ulong ) { return "ulong"; }
 inline const char* dcopTypeName( double ) { return "double"; }
 inline const char* dcopTypeName( float ) { return "float"; }
-inline const char* dcopTypeName( const char* ) { return TQCSTRING_OBJECT_NAME_STRING; }
+inline const char* dcopTypeName( const char* ) { return "TQCString"; }
 
 // dcop specialities
 class DCOPRef; inline const char* dcopTypeName( const DCOPRef& ) { return "DCOPRef"; }
 
 // Qt variant types
-class TQString; inline const char* dcopTypeName( const TQString& ) { return TQSTRING_OBJECT_NAME_STRING; }
-class TQCString; inline const char* dcopTypeName( const TQCString& ) { return TQCSTRING_OBJECT_NAME_STRING; }
-class TQFont; inline const char* dcopTypeName( const TQFont& ) { return TQFONT_OBJECT_NAME_STRING; }
-class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return TQPIXMAP_OBJECT_NAME_STRING; }
-class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return TQBRUSH_OBJECT_NAME_STRING; }
-class TQRect; inline const char* dcopTypeName( const TQRect& ) { return TQRECT_OBJECT_NAME_STRING; }
-class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return TQPOINT_OBJECT_NAME_STRING; }
-class TQImage; inline const char* dcopTypeName( const TQImage& ) { return TQIMAGE_OBJECT_NAME_STRING; }
-class TQSize; inline const char* dcopTypeName( const TQSize& ) { return TQSIZE_OBJECT_NAME_STRING; }
-class TQColor; inline const char* dcopTypeName( const TQColor& ) { return TQCOLOR_OBJECT_NAME_STRING; }
-class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return TQPALETTE_OBJECT_NAME_STRING; }
-class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return TQCOLORGROUP_OBJECT_NAME_STRING; }
-class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return TQICONSET_OBJECT_NAME_STRING; }
-class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return TQDATASTREAM_OBJECT_NAME_STRING; }
-class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return TQPOINTARRAY_OBJECT_NAME_STRING; }
-class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return TQREGION_OBJECT_NAME_STRING; }
-class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return TQBITMAP_OBJECT_NAME_STRING; }
-class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return TQCURSOR_OBJECT_NAME_STRING; }
-class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return TQSTRINGLIST_OBJECT_NAME_STRING; }
-class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return TQSIZEPOLICY_OBJECT_NAME_STRING; }
-class TQDate; inline const char* dcopTypeName( const TQDate& ) { return TQDATE_OBJECT_NAME_STRING; }
-class TQTime; inline const char* dcopTypeName( const TQTime& ) { return TQTIME_OBJECT_NAME_STRING; }
-class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return TQDATETIME_OBJECT_NAME_STRING; }
-class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return TQBITARRAY_OBJECT_NAME_STRING; }
-class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return TQKEYSEQUENCE_OBJECT_NAME_STRING; }
-class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return TQVARIANT_OBJECT_NAME_STRING; }
+class TQString; inline const char* dcopTypeName( const TQString& ) { return "TQString"; }
+class TQCString; inline const char* dcopTypeName( const TQCString& ) { return "TQCString"; }
+class TQFont; inline const char* dcopTypeName( const TQFont& ) { return "TQFont"; }
+class TQPixmap; inline const char* dcopTypeName( const TQPixmap& ) { return "TQPixmap"; }
+class TQBrush; inline const char* dcopTypeName( const TQBrush& ) { return "TQBrush"; }
+class TQRect; inline const char* dcopTypeName( const TQRect& ) { return "TQRect"; }
+class TQPoint; inline const char* dcopTypeName( const TQPoint& ) { return "TQPoint"; }
+class TQImage; inline const char* dcopTypeName( const TQImage& ) { return "TQImage"; }
+class TQSize; inline const char* dcopTypeName( const TQSize& ) { return "TQSize"; }
+class TQColor; inline const char* dcopTypeName( const TQColor& ) { return "TQColor"; }
+class TQPalette; inline const char* dcopTypeName( const TQPalette& ) { return "TQPalette"; }
+class TQColorGroup; inline const char* dcopTypeName( const TQColorGroup& ) { return "TQColorGroup"; }
+class TQIconSet; inline const char* dcopTypeName( const TQIconSet& ) { return "TQIconSet"; }
+class TQDataStream; inline const char* dcopTypeName( const TQDataStream& ) { return "TQDataStream"; }
+class TQPointArray; inline const char* dcopTypeName( const TQPointArray& ) { return "TQPointArray"; }
+class TQRegion; inline const char* dcopTypeName( const TQRegion& ) { return "TQRegion"; }
+class TQBitmap; inline const char* dcopTypeName( const TQBitmap& ) { return "TQBitmap"; }
+class TQCursor; inline const char* dcopTypeName( const TQCursor& ) { return "TQCursor"; }
+class TQStringList; inline const char* dcopTypeName( const TQStringList& ) { return "TQStringList"; }
+class TQSizePolicy; inline const char* dcopTypeName( const TQSizePolicy& ) { return "TQSizePolicy"; }
+class TQDate; inline const char* dcopTypeName( const TQDate& ) { return "TQDate"; }
+class TQTime; inline const char* dcopTypeName( const TQTime& ) { return "TQTime"; }
+class TQDateTime; inline const char* dcopTypeName( const TQDateTime& ) { return "TQDateTime"; }
+class TQBitArray; inline const char* dcopTypeName( const TQBitArray& ) { return "TQBitArray"; }
+class TQKeySequence; inline const char* dcopTypeName( const TQKeySequence& ) { return "TQKeySequence"; }
+class TQVariant; inline const char* dcopTypeName( const TQVariant& ) { return "TQVariant"; }
 
 template<class Key, class T> class TQMap;
 typedef TQMap<TQString, TQVariant> TQStringVariantMap;
diff --git a/dcop/kdatastream.h b/dcop/kdatastream.h
index 4a135b9d9..345d46d87 100644
--- a/dcop/kdatastream.h
+++ b/dcop/kdatastream.h
@@ -3,7 +3,6 @@
 
 #include <tqdatastream.h>
 
-#ifdef USE_QT3
 inline TQDataStream & operator << (TQDataStream & str, bool b)
 {
   str << TQ_INT8(b);
@@ -17,42 +16,5 @@ inline TQDataStream & operator >> (TQDataStream & str, bool & b)
   b = bool(l);
   return str;
 }
-#endif // USE_QT3
-
-#if TQT_VERSION < 0x030200 && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
-inline TQDataStream & operator << (TQDataStream & str, long long int ll)
-{
-  TQ_UINT32 l1,l2;
-  l1 = ll & 0xffffffffLL;
-  l2 = ll >> 32;
-  str << l1 << l2;
-  return str;
-}
-
-inline TQDataStream & operator >> (TQDataStream & str, long long int&ll)
-{
-  TQ_UINT32 l1,l2;
-  str >> l1 >> l2;
-  ll = ((unsigned long long int)(l2) << 32) + (long long int) l1;
-  return str;
-}
-
-inline TQDataStream & operator << (TQDataStream & str, unsigned long long int ll)
-{
-  TQ_UINT32 l1,l2;
-  l1 = ll & 0xffffffffLL;
-  l2 = ll >> 32;
-  str << l1 << l2;
-  return str;
-}
-
-inline TQDataStream & operator >> (TQDataStream & str, unsigned long long int &ll)
-{
-  TQ_UINT32 l1,l2;
-  str >> l1 >> l2;
-  ll = ((unsigned long long int)(l2) << 32) + (unsigned long long int) l1;
-  return str;
-}
-#endif
 
 #endif
diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp
index 1e70171d2..583a0255b 100644
--- a/dcop/testdcop.cpp
+++ b/dcop/testdcop.cpp
@@ -57,7 +57,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
 
     printf("Rect x = %d, y = %d, w = %d, h = %d\n", arg1.x(), arg1.y(), arg1.width(), arg1.height());
 
-    replyType = TQRECT_OBJECT_NAME_STRING;
+    replyType = "TQRect";
     TQDataStream reply( replyData, IO_WriteOnly );
     TQRect r(10,20,100,200);
     reply << r;
@@ -74,7 +74,7 @@ bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data,
 tqDebug("countDown() countDownAction = %p", countDownAction);
     if (countDownAction2)
     {
-       replyType = TQSTRING_OBJECT_NAME_STRING;
+       replyType = "TQString";
        TQDataStream reply( replyData, IO_WriteOnly );
        reply << TQString("Hey");
        return true;
@@ -84,13 +84,13 @@ tqDebug("countDown() countDownAction = %p", countDownAction);
     {
        countDownCount = 10;       
        countDownAction = client->beginTransaction();
-       TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout()));
+       TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout()));
     }
     else
     {
        countDownCount2 = 10;       
        countDownAction2 = client->beginTransaction();
-       TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2()));
+       TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2()));
     }
     return true;
   }
@@ -104,7 +104,7 @@ void MyDCOPObject::slotTimeout()
   countDownCount--;
   if (countDownCount == 0)
   {
-     TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
+     TQCString replyType = "TQString";
      TQByteArray replyData;
      TQDataStream reply( replyData, IO_WriteOnly );
      reply << TQString("Hello World");
@@ -113,7 +113,7 @@ void MyDCOPObject::slotTimeout()
   }
   else
   {
-     TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout()));
+     TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout()));
   }
 }
 
@@ -123,7 +123,7 @@ void MyDCOPObject::slotTimeout2()
   countDownCount2--;
   if (countDownCount2 == 0)
   {
-     TQCString replyType = TQSTRING_OBJECT_NAME_STRING;
+     TQCString replyType = "TQString";
      TQByteArray replyData;
      TQDataStream reply( replyData, IO_WriteOnly );
      reply << TQString("Hello World");
@@ -132,21 +132,21 @@ void MyDCOPObject::slotTimeout2()
   }
   else
   {
-     TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2()));
+     TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2()));
   }
 }
 
 QCStringList MyDCOPObject::functions()
 {
    QCStringList result = DCOPObject::functions();
-   result << TQRECT_OBJECT_NAME_STRING " canLaunchRockets(" TQRECT_OBJECT_NAME_STRING ")";
+   result << "TQRect canLaunchRockets(TQRect)";
    return result;
 }
 
 TestObject::TestObject(const TQCString& app)
  :  m_app(app)
 {
-   TQTimer::singleShot(2500, this, TQT_SLOT(slotTimeout()));
+   TQTimer::singleShot(2500, this, TQ_SLOT(slotTimeout()));
 }
 
 void TestObject::slotTimeout()
@@ -191,10 +191,10 @@ int main(int argc, char **argv)
       TQCString appId = argv[1];
       TestObject obj(appId);
       tqWarning("#1 Calling countDown");
-      int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
+      int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
       tqDebug("#1 countDown() call id = %d", result);
       tqWarning("#2 Calling countDown");
-      result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
+      result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&)));
       tqDebug("#2 countDown() call id = %d", result);
       app.exec();
 
@@ -234,11 +234,11 @@ int main(int argc, char **argv)
   int n = client->registeredApplications().count();
   tqDebug("number of attached applications = %d", n );
 
-  TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)),
-                    obj1, TQT_SLOT( registered( const TQCString& )));
+  TQObject::connect( client, TQ_SIGNAL( applicationRegistered( const TQCString&)),
+                    obj1, TQ_SLOT( registered( const TQCString& )));
 
-  TQObject::connect( client, TQT_SIGNAL( applicationRemoved( const TQCString&)),
-                    obj1, TQT_SLOT( unregistered( const TQCString& )));
+  TQObject::connect( client, TQ_SIGNAL( applicationRemoved( const TQCString&)),
+                    obj1, TQ_SLOT( unregistered( const TQCString& )));
 
   // Enable the above signals
   client->setNotifications( true );
diff --git a/dcop/testdcop.h b/dcop/testdcop.h
index 3cb81372f..c3288bce9 100644
--- a/dcop/testdcop.h
+++ b/dcop/testdcop.h
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class TestObject : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TestObject(const TQCString &app);
 
@@ -58,7 +58,7 @@ private:
 
 class MyDCOPObject : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyDCOPObject(const TQCString &name) : DCOPObject(name) {}
   bool process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp
index a129d7d6f..74dee9edd 100644
--- a/dcop/tests/driver.cpp
+++ b/dcop/tests/driver.cpp
@@ -39,7 +39,7 @@ void Driver::test()
 	}
 
 	++count;
-	TQTimer::singleShot( 100, this, TQT_SLOT( test() ) );
+	TQTimer::singleShot( 100, this, TQ_SLOT( test() ) );
 }
 
 #include "driver.moc"
@@ -58,7 +58,7 @@ int main(int argc, char** argv)
 	app.dcopClient()->attach(  );
 	app.dcopClient()->registerAs( "TestAppDriver" );
 	Driver * object = new Driver( appname );
-	TQTimer::singleShot( 10, object, TQT_SLOT( test() ) );
+	TQTimer::singleShot( 10, object, TQ_SLOT( test() ) );
 	return app.exec();
 }
 	
diff --git a/dcop/tests/driver.h b/dcop/tests/driver.h
index 3565d88ab..654707c4f 100644
--- a/dcop/tests/driver.h
+++ b/dcop/tests/driver.h
@@ -7,7 +7,7 @@
 
 class Driver : public TQObject, public Test_stub
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		Driver(const char*);
diff --git a/dcop/tests/run-tests.sh b/dcop/tests/run-tests.sh
index dc3640511..0d0b02aad 100644
--- a/dcop/tests/run-tests.sh
+++ b/dcop/tests/run-tests.sh
@@ -10,7 +10,9 @@ clean_up
 # create temporary home
 export HOME=$PWD/test-home
 mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
+echo '* Starting dcop server'
 ../dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
@@ -22,6 +24,10 @@ die() {
 }
 
 trap 'die "The script interrupted by user"' 2 15
+while ! ../dcopserver --serverid 2>/dev/null; do
+  echo '* Wait for the dcop server'
+  sleep 2
+done
 
 echo '* Running batch mode'
 ./dcop_test --batch >batch.stdout || die "Failed to run dcop_test"
diff --git a/dcop/tests/testcases b/dcop/tests/testcases
index e2357eb1c..e3bd2e3d0 100644
--- a/dcop/tests/testcases
+++ b/dcop/tests/testcases
@@ -19,7 +19,7 @@
 # 2. First you put shell like argument:
 # "string with spaces" 4 string_without_spaces
 # Then you should put c++ style arguments: 
-# QString::fromLatin1("string with spaces"),4,"string_with_spaces"
+# TQString::fromLatin1("string with spaces"),4,"string_with_spaces"
 #
 # Note that the first argument has type TQString and the last type const char*
 # (adapt accordingly)
@@ -29,7 +29,7 @@ TQString
 url
 ()
 {
-return QString::fromLatin1( "http://www.kde.org/");
+return TQString::fromLatin1( "http://www.kde.org/");
 }
 -
 
@@ -63,7 +63,7 @@ identity
 {
 	return x;
 }
-"test";QString::fromLatin1("test")
+"test";TQString::fromLatin1("test")
 
 // 2.3 unsigned long int
 unsigned long int
diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp
index 229d56f7f..78cc2783a 100644
--- a/dnssd/domainbrowser.cpp
+++ b/dnssd/domainbrowser.cpp
@@ -86,8 +86,8 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent)
 		d->m_domains+="local.";
 		d->m_browseLAN=true;
 	}
- 	connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this,
- 	        TQT_SLOT(domainListChanged(int,int)));
+ 	connect(TDEApplication::kApplication(),TQ_SIGNAL(kipcMessage(int,int)),this,
+ 	        TQ_SLOT(domainListChanged(int,int)));
 }
 
 DomainBrowser::DomainBrowser(const TQStringList& domains, bool recursive, TQObject *parent) : TQObject(parent)
diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h
index 24cf53078..abe93507f 100644
--- a/dnssd/domainbrowser.h
+++ b/dnssd/domainbrowser.h
@@ -40,7 +40,7 @@ class DomainBrowserPrivate;
 */
 class TDEDNSSD_EXPORT DomainBrowser : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	Standard constructor. It takes all parameters from global configuration.
diff --git a/dnssd/publicservice.cpp b/dnssd/publicservice.cpp
index 05b891258..dcfc68e30 100644
--- a/dnssd/publicservice.cpp
+++ b/dnssd/publicservice.cpp
@@ -82,7 +82,7 @@ PublicService::PublicService(const TQString& name, const TQString& type, unsigne
 #ifdef HAVE_DNSSD
 	if (Responder::self().client()) {
 		d->m_group = avahi_entry_group_new(Responder::self().client(), publish_callback,this);
-		connect(&Responder::self(),TQT_SIGNAL(stateChanged(AvahiClientState)),this,TQT_SLOT(clientState(AvahiClientState)));
+		connect(&Responder::self(),TQ_SIGNAL(stateChanged(AvahiClientState)),this,TQ_SLOT(clientState(AvahiClientState)));
 	}
 #endif
 	if (domain.isNull())
diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h
index 30fbe8466..6dad448b4 100644
--- a/dnssd/publicservice.h
+++ b/dnssd/publicservice.h
@@ -49,7 +49,7 @@ Asynchronous publishing is better for responsiveness. Example:
  
 \code
 DNSSD::PublicService *service = new DNSSD::PublicService("My files","_http._tcp",80);
-connect(service,TQT_SIGNAL(published(bool)),this,TQT_SLOT(wasPublished(bool)));
+connect(service,TQ_SIGNAL(published(bool)),this,TQ_SLOT(wasPublished(bool)));
 service->publishAsync();
 \endcode
  
@@ -60,7 +60,7 @@ service->publishAsync();
 
 class TDEDNSSD_EXPORT PublicService : public TQObject, public ServiceBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	@param name Service name. If set to TQString::null, computer name will be used and will be
diff --git a/dnssd/query.cpp b/dnssd/query.cpp
index 3306dc256..2afa62401 100644
--- a/dnssd/query.cpp
+++ b/dnssd/query.cpp
@@ -74,7 +74,7 @@ public:
 Query::Query(const TQString& type, const TQString& domain)
 {
 	d = new QueryPrivate(type,domain);
-	connect(&d->timeout,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout()));
+	connect(&d->timeout,TQ_SIGNAL(timeout()),this,TQ_SLOT(timeout()));
 }
 
 
diff --git a/dnssd/query.h b/dnssd/query.h
index 037fb9fde..21ab9b166 100644
--- a/dnssd/query.h
+++ b/dnssd/query.h
@@ -38,7 +38,7 @@ name, either multicast or unicast DNS will be used.
  */
 class TDEDNSSD_EXPORT Query : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	Creates new query. 
diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h
index b5ef4dcd9..8324f1bdc 100644
--- a/dnssd/remoteservice.h
+++ b/dnssd/remoteservice.h
@@ -41,7 +41,7 @@ service is resolved are name, type.and domain.
  */
 class TDEDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	typedef TDESharedPtr<RemoteService> Ptr;
 	
diff --git a/dnssd/responder.h b/dnssd/responder.h
index 187683c7b..5a9a41596 100644
--- a/dnssd/responder.h
+++ b/dnssd/responder.h
@@ -43,7 +43,7 @@ This class should not be used directly.
  */
 class Responder : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	Responder();
diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp
index 2ca87ef86..58dd4c30f 100644
--- a/dnssd/servicebrowser.cpp
+++ b/dnssd/servicebrowser.cpp
@@ -69,9 +69,9 @@ void ServiceBrowser::init(const TQStringList& type,DomainBrowser* domains,int fl
 	d->m_types=type;
 	d->m_flags=flags;
 	d->m_domains = domains;
-	connect(d->m_domains,TQT_SIGNAL(domainAdded(const TQString& )),this,TQT_SLOT(addDomain(const TQString& )));
-	connect(d->m_domains,TQT_SIGNAL(domainRemoved(const TQString& )),this,
-		TQT_SLOT(removeDomain(const TQString& )));
+	connect(d->m_domains,TQ_SIGNAL(domainAdded(const TQString& )),this,TQ_SLOT(addDomain(const TQString& )));
+	connect(d->m_domains,TQ_SIGNAL(domainRemoved(const TQString& )),this,
+		TQ_SLOT(removeDomain(const TQString& )));
 }
 ServiceBrowser::ServiceBrowser(const TQString& type,const TQString& domain,bool autoResolve)
 {
@@ -108,9 +108,9 @@ const DomainBrowser* ServiceBrowser::browsedDomains() const
 
 void ServiceBrowser::serviceResolved(bool success)
 {
-	TQObject* sender_obj = const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender()));
+	TQObject* sender_obj = const_cast<TQObject*>(sender());
 	RemoteService* svr = static_cast<RemoteService*>(sender_obj);
-	disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool)));
+	disconnect(svr,TQ_SIGNAL(resolved(bool)),this,TQ_SLOT(serviceResolved(bool)));
 	TQValueList<RemoteService::Ptr>::Iterator it = d->m_duringResolve.begin();
 	TQValueList<RemoteService::Ptr>::Iterator itEnd = d->m_duringResolve.end();
 	while ( it!= itEnd && svr!= (*it)) ++it;
@@ -140,7 +140,7 @@ void ServiceBrowser::gotNewService(RemoteService::Ptr svr)
 {
 	if (findDuplicate(svr)==(d->m_services.end()))  {
 		if (d->m_flags & AutoResolve) {
-			connect(svr,TQT_SIGNAL(resolved(bool )),this,TQT_SLOT(serviceResolved(bool )));
+			connect(svr,TQ_SIGNAL(resolved(bool )),this,TQ_SLOT(serviceResolved(bool )));
 			d->m_duringResolve+=svr;
 			svr->resolveAsync();
 		} else	{
@@ -179,11 +179,11 @@ void ServiceBrowser::addDomain(const TQString& domain)
 		TQStringList::ConstIterator itEnd = d->m_types.end();
 		for (TQStringList::ConstIterator it=d->m_types.begin(); it!=itEnd; ++it) {
 			Query* b = new Query((*it),domain);
-			connect(b,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
-				TQT_SLOT(gotNewService(DNSSD::RemoteService::Ptr)));
-			connect(b,TQT_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr )),this,
-				TQT_SLOT(gotRemoveService(DNSSD::RemoteService::Ptr)));
-			connect(b,TQT_SIGNAL(finished()),this,TQT_SLOT(queryFinished()));
+			connect(b,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this,
+				TQ_SLOT(gotNewService(DNSSD::RemoteService::Ptr)));
+			connect(b,TQ_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr )),this,
+				TQ_SLOT(gotRemoveService(DNSSD::RemoteService::Ptr)));
+			connect(b,TQ_SIGNAL(finished()),this,TQ_SLOT(queryFinished()));
 			b->startQuery();
 			d->resolvers.insert(domain,b);
 		}
diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h
index be2b6213b..01e9d0ccd 100644
--- a/dnssd/servicebrowser.h
+++ b/dnssd/servicebrowser.h
@@ -38,8 +38,8 @@ Suppose that you need list of web servers running. Example:
 
 \code
 DNSSD::ServiceBrowser* browser = new DNSSD::ServiceBrowser("_http._tcp");
-connect(browser,TQT_SIGNAL(serviceAdded(RemoteService::Ptr)),this,TQT_SLOT(addService(RemoteService::Ptr)));
-connect(browser,TQT_SIGNAL(serviceRemoved(RemoteService::Ptr)),this,TQT_SLOT(delService(RemoteService::Ptr)));
+connect(browser,TQ_SIGNAL(serviceAdded(RemoteService::Ptr)),this,TQ_SLOT(addService(RemoteService::Ptr)));
+connect(browser,TQ_SIGNAL(serviceRemoved(RemoteService::Ptr)),this,TQ_SLOT(delService(RemoteService::Ptr)));
 browser->startBrowse();
 \endcode
 
@@ -53,7 +53,7 @@ to constructor, domains configured by user will be searched.
  */
 class TDEDNSSD_EXPORT ServiceBrowser : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	@li AutoDelete -  DomainBrowser object passes in constructor should be deleted when ServiceBrowser is deleted
diff --git a/doc/common/CMakeLists.txt b/doc/common/CMakeLists.txt
index a56e79c9f..c831ccefc 100644
--- a/doc/common/CMakeLists.txt
+++ b/doc/common/CMakeLists.txt
@@ -11,19 +11,22 @@
 
 ##### other data ################################
 
-install( FILES
-    artistic-license.html bottom1.png bottom2.png
-    bsd-license.html doctop1.png doctop2.png fdl-license
-    fdl-license.html gpl-license gpl-license.html
-    tde-common.css tde-default.css tde-web.css tde-localised.css.template
-    lgpl-license lgpl-license.html qpl-license.html shadow.png
-    web-docbottom.png x11-license.html xml.dcl web-doctop.png
-    doctop1a.png doctop1b.png 1.png 2.png 3.png 4.png
-    5.png 6.png 7.png 8.png 9.png 10.png doxygen.css
-    header.html footer.html mainheader.html appheader.html
-    mainfooter.html fdl-notice.html favicon.ico kde_gear_64.png
-    docheadergears.png headerbg.png grad.png kmenu.png
-    kde_logo.png kde_logo_bg.png bottom-left.png bottom-middle.png
-    bottom-right.png top-left.png top-middle.png top-right-konqueror.png
-    tde-docs.css
-  DESTINATION ${HTML_INSTALL_DIR}/en/common )
+install(
+  FILES
+    1.png 2.png 3.png 4.png 5.png 6.png 7.png 8.png 9.png 10.png
+    appheader.html artistic-license.html block_title_bottom.png
+		block_title_mid.png block_title_top.png bottom1.png bottom2.png
+    bottom-left.png bottom-middle.png bottom-right.png bsd-license.html
+    docheadergears.png doctop1a.png doctop1b.png doctop1.png
+    doctop2.png doxygen.css favicon.ico fdl-license
+    fdl-license.html fdl-notice.html footer.html flat.css
+    gpl-license gpl-license.html grad.png headerbg.png
+    header.html kde_gear_64.png kde_logo_bg.png kde_logo.png
+    kmenu.png lgpl-license lgpl-license.html mainfooter.html
+    mainheader.html print.css qpl-license.html shadow.png tde-common.css
+    tabs.css tde.css tde-default.css tde-docs.css tde-localised.css.template tde-web.css
+    top.jpg top-left.jpg top-left.png top-middle.png top-right-konqueror.png
+		top-right.jpg top-right.png top-trinity.jpg web-docbottom.png
+    web-doctop.png x11-license.html xml.dcl
+  DESTINATION
+    ${HTML_INSTALL_DIR}/en/common )
diff --git a/doc/common/Doxyfile.global b/doc/common/Doxyfile.global
index 67abce073..f7d85dcc7 100644
--- a/doc/common/Doxyfile.global
+++ b/doc/common/Doxyfile.global
@@ -46,13 +46,7 @@ WARN_LOGFILE           =
 INPUT                  = 
 FILE_PATTERNS          = *.h \
                          *.cpp \
-                         *.cc \
-                         *.hpp \
-                         *.dox \
-                         *.c++ \
-                         *.cxx \
-                         *.h++ \
-                         *.hh
+                         *.dox
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
diff --git a/doc/common/doxygen.css b/doc/common/doxygen.css
index 48563b473..c56c0e91a 100644
--- a/doc/common/doxygen.css
+++ b/doc/common/doxygen.css
@@ -94,3 +94,17 @@ SPAN.comment       { color: #800000 }
 SPAN.preprocessor  { color: #806020 }
 SPAN.stringliteral { color: #002080 }
 SPAN.charliteral   { color: #008080 }
+
+.line {
+text-align: left;
+font-family: monospace;
+white-space: pre;
+}
+
+.lineno {
+display: inline-block;
+width: 3em;
+margin-right: 5px;
+background: #EEEEEE;
+text-align: right;
+}
diff --git a/doc/common/footer.html b/doc/common/footer.html
index 26495f4b6..b790f9c6b 100644
--- a/doc/common/footer.html
+++ b/doc/common/footer.html
@@ -1,4 +1,3 @@
-            </div>
           </div>
         </div>
         <div id="left">
diff --git a/doc/common/header.html b/doc/common/header.html
index 8b133a3b2..b7c1304da 100644
--- a/doc/common/header.html
+++ b/doc/common/header.html
@@ -20,9 +20,9 @@
   <link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
   <link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
-  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
-  <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
-  <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
+  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/../common/tde.css" />
+  <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/../common/print.css" />
+  <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/../common/flat.css" />
 </head>
 
 <body>
@@ -35,7 +35,7 @@
 <div id="container">
 <div id="header">
   <div id="header_top"><div><div>
-    <img alt ="" src="@topdir@/top-trinity.jpg"/>
+    <img alt ="" src="@topdir@/../common/top-trinity.jpg"/>
     Trinity API Reference  </div></div></div>
   <div id="header_bottom">
     <div id="location">
@@ -46,7 +46,7 @@
     </div>
 
     <div id="menu">
-</ul>    </div>
+    </div>
   </div>
 </div>
 <!-- End page header -->
diff --git a/doc/common/mainfooter.html b/doc/common/mainfooter.html
index ef78d30b2..90f84ee8a 100644
--- a/doc/common/mainfooter.html
+++ b/doc/common/mainfooter.html
@@ -11,7 +11,6 @@ Questions about the reference manuals should be sent to
 
 </p>
 </div>
-            </div>
           </div>
         </div>
         <div id="left">
diff --git a/doc/common/mainheader.html b/doc/common/mainheader.html
index a730e325d..4c1ee53ec 100644
--- a/doc/common/mainheader.html
+++ b/doc/common/mainheader.html
@@ -20,9 +20,9 @@
   <link rel="shortcut icon" href="@topdir@/favicon.ico" /><link rel="icon" href="@topdir@/favicon.ico" />
   <link rel="stylesheet" type="text/css" href="@topdir@/doxygen.css" />
   <link rel="stylesheet" type="text/css" href="@topdir@/tabs.css" />
-  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/tde.css" />
-  <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/print.css" />
-  <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/flat.css" />
+  <link rel="stylesheet" media="screen" type="text/css" title="Trinity Colors" href="@topdir@/../common/tde.css" />
+  <link rel="stylesheet" media="print, embossed" type="text/css" href="@topdir@/../common/print.css" />
+  <link rel="stylesheet" media="screen, aural, handheld, tty, braille" type="text/css" title="Flat" href="@topdir@/../common/flat.css" />
 </head>
 
 <body>
@@ -35,7 +35,7 @@
 <div id="container">
 <div id="header">
   <div id="header_top"><div><div>
-    <img alt ="" src="@topdir@/top-trinity.jpg"/>
+    <img alt ="" src="@topdir@/../common/top-trinity.jpg"/>
     Trinity API Reference  </div></div></div>
   <div id="header_bottom">
     <div id="location">
@@ -45,7 +45,7 @@
     </div>
 
     <div id="menu">
-</ul>    </div>
+    </div>
   </div>
 </div>
 <!-- End page header -->
diff --git a/doc/common/tde.css b/doc/common/tde.css
index 183b62fa1..c9dc6095c 100644
--- a/doc/common/tde.css
+++ b/doc/common/tde.css
@@ -5,7 +5,6 @@
 body {
     margin: 0;
     padding: 0;
-    text-align: center;
     font-size: 0.8em;
     font-family: "Bitstream Vera Sans", "Lucida Grande", "Trebuchet MS", sans-serif;
     color: #535353;
diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index 3bc5749d2..bfeaa43e5 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -206,7 +206,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
   * � if( Clipboard )
   * � {
   * � � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
-  * � � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
+  * � � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) );
   * � }
   * }
   * \endcode
@@ -221,7 +221,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
 inline TQWidget *createBytesEditWidget( TQWidget *Parent = 0, const char *Name = 0 )
 {
   return KParts::ComponentFactory::createInstanceFromQuery<TQWidget>
-      ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, TQT_TQOBJECT(Parent), Name );
+      ( TQString::fromLatin1("KHexEdit/KBytesEdit"), TQString::null, Parent, Name );
 }
 
 }
diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h
index c63c5a88e..ec77b1a48 100644
--- a/interfaces/khexedit/clipboardinterface.h
+++ b/interfaces/khexedit/clipboardinterface.h
@@ -35,7 +35,7 @@ namespace KHE
  * if( Clipboard )
  * {
  * � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
- * � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
+ * � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) );
  * }
  * \endcode 
  *
@@ -78,7 +78,7 @@ ClipboardInterface *clipboardInterface( T *t )
   if( !t )
     return 0;
 
-  return ::tqqt_cast<KHE::ClipboardInterface*>( t );
+  return ::tqt_cast<KHE::ClipboardInterface*>( t );
 }
 
 }
diff --git a/interfaces/khexedit/zoominterface.h b/interfaces/khexedit/zoominterface.h
index 9c6f0f677..21145cb9a 100644
--- a/interfaces/khexedit/zoominterface.h
+++ b/interfaces/khexedit/zoominterface.h
@@ -71,7 +71,7 @@ ZoomInterface *zoomInterface( T *t )
   if( !t )
     return 0;
 
-  return ::tqqt_cast<KHE::ZoomInterface*>( t );
+  return ::tqt_cast<KHE::ZoomInterface*>( t );
 }
 
 }
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index 4124849d6..fbdc22de6 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -25,7 +25,7 @@
  * TQDialog *editorDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor" );
  * if ( editorDialog ) {
  *   // tdeutils was installed, so the dialog was found fetch the editor interface
- *   KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorDialog );
+ *   KRegExpEditorInterface *editor = ::tqt_cast<KRegExpEditorInterface *>( editorDialog );
  *   Q_ASSERT( editor ); // This should not fail!
  *   
  *   // now use the editor.
@@ -41,7 +41,7 @@
  *
  * Note: signals and slots must be connected to the editorDialog object, not to the editor object:
  * \code
- * connect( editorDialog, TQT_SIGNAL( canUndo( bool ) ), undoBut, TQT_SLOT( setEnabled( bool ) ) );
+ * connect( editorDialog, TQ_SIGNAL( canUndo( bool ) ), undoBut, TQ_SLOT( setEnabled( bool ) ) );
  * \endcode
  *
  * If you want to create an instance of the editor widget, i.e. not the
@@ -53,7 +53,7 @@
  *     "KRegExpEditor/KRegExpEditor", TQString::null, parent );
  * if ( editorWidget ) {
  *   // tdeutils was installed, so the widget was found fetch the editor interface
- *   KRegExpEditorInterface *editor = ::tqqt_cast<KRegExpEditorInterface *>( editorWidget );
+ *   KRegExpEditorInterface *editor = ::tqt_cast<KRegExpEditorInterface *>( editorWidget );
  *   Q_ASSERT( editor ); // This should not fail!
  *   
  *   // now use the editor.
diff --git a/interfaces/tdeimproxy/TODO b/interfaces/tdeimproxy/TODO
index fc66130fe..6e215680a 100644
--- a/interfaces/tdeimproxy/TODO
+++ b/interfaces/tdeimproxy/TODO
@@ -1,10 +1,10 @@
 For the future, the following modifications need to be done:
 
 Currently there is a function :
-  virtual QString presenceString( const QString & uid ) = 0;
+  virtual TQString presenceString( const TQString & uid ) = 0;
 This needs to be broken into:
-  virtual QString presenceString( const QString & uid ) = 0;
-  virtual QString presenceLongString( const QString & uid ) = 0;
+  virtual TQString presenceString( const TQString & uid ) = 0;
+  virtual TQString presenceLongString( const TQString & uid ) = 0;
 
 The former returning, say "Away", the latter returning the long away
 message.
diff --git a/interfaces/tdeimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h
index 2591c3ce0..aacb4217b 100644
--- a/interfaces/tdeimproxy/interface/kimiface.h
+++ b/interfaces/tdeimproxy/interface/kimiface.h
@@ -57,12 +57,12 @@
  * @endcode
  * and the class implementing KIMIface must pass "KIMIface" to the DCOPObject constructor:
  * @code
- * // just need TQObject inheritance and Q_OBJECT if you want signals and slots
+ * // just need TQObject inheritance and TQ_OBJECT if you want signals and slots
  * // no need to use K_DCOP macro again
  *
  * class MyIMIface : public TQObject, public KIMIface
  * {
- *     Q_OBJECT
+ *     TQ_OBJECT
  * public:
  *    MyIMIface(TQObject* parent = 0, const char* name) :
  *        DCOPObject("KIMIface"), // <-- passing the interface name as required
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index fb2db0eb4..022737ed4 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -181,8 +181,8 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject()
 
 	d->dc = dc;
 	m_initialized = false;
-	connect( d->dc, TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
-	connect( d->dc, TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) );
+	connect( d->dc, TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+	connect( d->dc, TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) );
 	d->dc->setNotifications( true );
 
 	d->presence_strings.append( "Unknown" );
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index 293d1f723..5a7ff87e9 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -106,7 +106,7 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
  */
 class TDEIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 {
-	Q_OBJECT
+	TQ_OBJECT
 	struct Private;
 
 	template<class> friend class KStaticDeleter;
diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 05582ca07..5302c721a 100644
--- a/interfaces/tdemediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -45,7 +45,7 @@ namespace KMediaPlayer
  */
 class KDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/** This constructor is what to use when no GUI is required, as in the
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 370805a74..be0f92111 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -25,7 +25,7 @@ protected:
     {
         Q_UNUSED(className);
         Q_UNUSED(args);
-        return TQT_TQOBJECT(new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name ));
+        return new KFileAudioPreview( dynamic_cast<TQWidget*>( parent ), name );
     }
 };
 
@@ -41,7 +41,7 @@ class KFileAudioPreview::KFileAudioPreviewPrivate
 public:
     KFileAudioPreviewPrivate( TQWidget *parent )
     {
-        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), TQT_TQOBJECT(parent) );
+        player = KParts::ComponentFactory::createInstanceFromQuery<KMediaPlayer::Player>( "KMediaPlayer/Player", TQString(), parent );
     }
 
     ~KFileAudioPreviewPrivate()
@@ -93,7 +93,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
     TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
-    connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
+    connect( m_autoPlay, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index 6eae52cf7..f67533df2 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
@@ -36,7 +36,7 @@ class KFileItem;
  */
 class KFileAudioPreview : public KPreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 );
diff --git a/interfaces/tdemediaplayer/view.h b/interfaces/tdemediaplayer/view.h
index c1d9dbe41..69fce7b5f 100644
--- a/interfaces/tdemediaplayer/view.h
+++ b/interfaces/tdemediaplayer/view.h
@@ -33,7 +33,7 @@ namespace KMediaPlayer
 /** View is part of the user interface of a Player. */
 class KDE_EXPORT View : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/** Your typical TQWidget constructor. */
diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 766613551..64cf89bb8 100644
--- a/interfaces/tdescript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )
 ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
 {
 	m_script =  new TDEProcess();
-	connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
-	connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
-	connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
+	connect ( m_script, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(Exit(TDEProcess *)));
+	connect ( m_script, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(stdOut(TDEProcess *, char *, int )));
+	connect ( m_script, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(stdErr(TDEProcess *, char *, int )));
 	// Connect feedback signals and slots
 	//kdDebug() << "Building new script engine" << endl;
 }
diff --git a/interfaces/tdescript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h
index 2cdaf7e5a..f03e17ba3 100644
--- a/interfaces/tdescript/sample/shellscript.h
+++ b/interfaces/tdescript/sample/shellscript.h
@@ -26,7 +26,7 @@
 //using namespace KScriptInterface;
 class ShellScript :  public KScriptInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ShellScript(KScriptClientInterface *parent, const char *name, const TQStringList &args);
 	virtual ~ShellScript();
diff --git a/interfaces/tdescript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h
index 0f07d34b2..e1c345e10 100644
--- a/interfaces/tdescript/scriptclientinterface.h
+++ b/interfaces/tdescript/scriptclientinterface.h
@@ -33,7 +33,7 @@ class TQString;
 	*	interfaces with this class.
 	* @code
 	*	class MyScript : public TQObject, public KScriptClientInterface {
-	*	Q_OBJECT
+	*	TQ_OBJECT
 	*	public:
 	*
 	*	MyScript(TQObject *parent)
diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 1c37b7f71..78e6ba960 100644
--- a/interfaces/tdescript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
@@ -46,7 +46,7 @@ class KScriptClientInterface;
 	**/
 	class KDE_EXPORT KScriptInterface : public TQObject
 	{
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		/**
 		*	Return the current script code data
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index c21f1f794..62bd33605 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -40,7 +40,7 @@ ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
 	m_theAction = new TDESelectAction ( i18n("TDE Scripts"),
 		0,
 		this,
-		TQT_SLOT(runAction()),
+		TQ_SLOT(runAction()),
 		m_parent->actionCollection(),
 		"scripts");
 }
diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index 7fa4fa93f..ece776c6d 100644
--- a/interfaces/tdescript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -26,9 +26,9 @@
 /**
  * Script loader
  */
-class ScriptLoader : virtual public QObject
+class ScriptLoader : virtual public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		/** 
 		* Default Constructor
diff --git a/interfaces/tdescript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
index d21219901..ed9db2d95 100644
--- a/interfaces/tdescript/scriptmanager.h
+++ b/interfaces/tdescript/scriptmanager.h
@@ -38,7 +38,7 @@ class ScriptInfo;
 	**/
 	class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface
 	{
-	Q_OBJECT
+	TQ_OBJECT
 	friend class KScriptInterface;
 	public:
 		/**
diff --git a/interfaces/tdetexteditor/blockselectiondcopinterface.h b/interfaces/tdetexteditor/blockselectiondcopinterface.h
index 4b74fd2a0..66045239b 100644
--- a/interfaces/tdetexteditor/blockselectiondcopinterface.h
+++ b/interfaces/tdetexteditor/blockselectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent BlockSelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		BlockSelectionDCOPInterface( BlockSelectionInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/clipboarddcopinterface.h b/interfaces/tdetexteditor/clipboarddcopinterface.h
index 8104e9d4d..9a75f9b97 100644
--- a/interfaces/tdetexteditor/clipboarddcopinterface.h
+++ b/interfaces/tdetexteditor/clipboarddcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ClipboardInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		ClipboardDCOPInterface( ClipboardInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h
index 23fa5bb38..f640ab0c5 100644
--- a/interfaces/tdetexteditor/configinterfaceextension.h
+++ b/interfaces/tdetexteditor/configinterfaceextension.h
@@ -28,7 +28,7 @@ namespace KTextEditor
 
 class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ConfigPage ( TQWidget *parent=0, const char *name=0 );
diff --git a/interfaces/tdetexteditor/document.h b/interfaces/tdetexteditor/document.h
index 83d8b7cf6..817389ba3 100644
--- a/interfaces/tdetexteditor/document.h
+++ b/interfaces/tdetexteditor/document.h
@@ -32,7 +32,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
 {
   friend class PrivateDocument;
 
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/interfaces/tdetexteditor/documentdcopinfo.h b/interfaces/tdetexteditor/documentdcopinfo.h
index ea25284fe..aedaee6a5 100644
--- a/interfaces/tdetexteditor/documentdcopinfo.h
+++ b/interfaces/tdetexteditor/documentdcopinfo.h
@@ -25,7 +25,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent DocumentInfoInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		DocumentInfoDCOPInterface( DocumentInfoInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/editdcopinterface.h b/interfaces/tdetexteditor/editdcopinterface.h
index f169fb15b..c0a0f6cdf 100644
--- a/interfaces/tdetexteditor/editdcopinterface.h
+++ b/interfaces/tdetexteditor/editdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
     Construct a new interface object for the text editor.
     @param Parent the parent EditInterface object
     that will provide us with the functions for the interface.
-    @param name the QObject's name
+    @param name the TQObject's name
     */
     EditDCOPInterface( EditInterface *Parent, const char *name );
     /**
@@ -34,7 +34,7 @@ namespace KTextEditor
     virtual ~EditDCOPInterface();
   k_dcop:
     /**
-    * @return the complete document as a single QString
+    * @return the complete document as a single TQString
     */
     virtual TQString text ();
 
diff --git a/interfaces/tdetexteditor/editinterface.h b/interfaces/tdetexteditor/editinterface.h
index 05e4941f2..9da6a275d 100644
--- a/interfaces/tdetexteditor/editinterface.h
+++ b/interfaces/tdetexteditor/editinterface.h
@@ -48,12 +48,12 @@ class KTEXTEDITOR_EXPORT EditInterface
   * slots !!!
   */
     /**
-    * @return the complete document as a single QString
+    * @return the complete document as a single TQString
     */
     virtual TQString text () const = 0;
 
     /**
-    * @return a QString
+    * @return a TQString
     */
     virtual TQString text ( uint startLine, uint startCol, uint endLine, uint endCol ) const = 0;
 
diff --git a/interfaces/tdetexteditor/editor.h b/interfaces/tdetexteditor/editor.h
index 8b6699f9f..475711a9d 100644
--- a/interfaces/tdetexteditor/editor.h
+++ b/interfaces/tdetexteditor/editor.h
@@ -40,7 +40,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
 {
   friend class PrivateEditor;
 
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/interfaces/tdetexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h
index 251776c10..62feda5c6 100644
--- a/interfaces/tdetexteditor/editorchooser.h
+++ b/interfaces/tdetexteditor/editorchooser.h
@@ -16,7 +16,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget
 {                    
   friend class PrivateEditorChooser;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     EditorChooser(TQWidget *parent=0,const char *name=0);
@@ -36,7 +36,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget
 /*
 class EditorChooserBackEnd: public ComponentChooserPlugin {
 
-Q_OBJECT
+TQ_OBJECT
 public:
 	EditorChooserBackEnd(TQObject *parent=0, const char *name=0);
 	virtual ~EditorChooserBackEnd();
diff --git a/interfaces/tdetexteditor/encodingdcopinterface.h b/interfaces/tdetexteditor/encodingdcopinterface.h
index 38de4e0aa..e13a6dff4 100644
--- a/interfaces/tdetexteditor/encodingdcopinterface.h
+++ b/interfaces/tdetexteditor/encodingdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent EncodingInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		EncodingDCOPInterface( EncodingInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h
index 68416bf78..b13dc37e9 100644
--- a/interfaces/tdetexteditor/plugin.h
+++ b/interfaces/tdetexteditor/plugin.h
@@ -37,7 +37,7 @@ class KTEXTEDITOR_EXPORT Plugin : public TQObject
 {
   friend class PrivatePlugin;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Plugin ( Document *document = 0, const char *name = 0 );
diff --git a/interfaces/tdetexteditor/printdcopinterface.h b/interfaces/tdetexteditor/printdcopinterface.h
index e41e6da5d..f3d176fbd 100644
--- a/interfaces/tdetexteditor/printdcopinterface.h
+++ b/interfaces/tdetexteditor/printdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent PrintInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		PrintDCOPInterface( PrintInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/searchdcopinterface.h b/interfaces/tdetexteditor/searchdcopinterface.h
index d4f558a26..e8a82a35b 100644
--- a/interfaces/tdetexteditor/searchdcopinterface.h
+++ b/interfaces/tdetexteditor/searchdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SearchInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		SearchDCOPInterface( SearchInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/selectiondcopinterface.h b/interfaces/tdetexteditor/selectiondcopinterface.h
index aa2973540..70e6e2f0b 100644
--- a/interfaces/tdetexteditor/selectiondcopinterface.h
+++ b/interfaces/tdetexteditor/selectiondcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent SelectionInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		SelectionDCOPInterface( SelectionInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index 25c103196..f3de57447 100644
--- a/interfaces/tdetexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget *
   TDEABC::StdAddressBook *addrBook = 0;
   TDEABC::Addressee userAddress;
   TQDateTime datetime = TQDateTime::currentDateTime();
-  TQDate date = TQT_TQDATE_OBJECT(datetime.date());
-  TQTime time = TQT_TQTIME_OBJECT(datetime.time());
+  TQDate date = datetime.date();
+  TQTime time = datetime.time();
 
   TQMap<TQString,TQString>::Iterator it;
   for ( it = map.begin(); it != map.end(); ++it )
diff --git a/interfaces/tdetexteditor/undodcopinterface.h b/interfaces/tdetexteditor/undodcopinterface.h
index b1a217036..5e324da03 100644
--- a/interfaces/tdetexteditor/undodcopinterface.h
+++ b/interfaces/tdetexteditor/undodcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent UndoInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		UndoDCOPInterface( UndoInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/view.h b/interfaces/tdetexteditor/view.h
index 0a807d6b3..c8cf586b8 100644
--- a/interfaces/tdetexteditor/view.h
+++ b/interfaces/tdetexteditor/view.h
@@ -33,7 +33,7 @@ class KTEXTEDITOR_EXPORT View : public TQWidget, public KXMLGUIClient
 {
   friend class PrivateView;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/interfaces/tdetexteditor/viewcursordcopinterface.h b/interfaces/tdetexteditor/viewcursordcopinterface.h
index 4bae0b520..e0c956da0 100644
--- a/interfaces/tdetexteditor/viewcursordcopinterface.h
+++ b/interfaces/tdetexteditor/viewcursordcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ViewCursorInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		ViewCursorDCOPInterface( ViewCursorInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
index b4c5cf72e..aba5b60b5 100644
--- a/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
+++ b/interfaces/tdetexteditor/viewstatusmsgdcopinterface.h
@@ -24,7 +24,7 @@ namespace KTextEditor
 		Construct a new interface object for the text editor.
 		@param Parent the parent ViewStatusMsgInterface object
 		that will provide us with the functions for the interface.
-		@param name the QObject's name
+		@param name the TQObject's name
 		*/
 		ViewStatusMsgDCOPInterface( ViewStatusMsgInterface *Parent, const char *name );
 		/**
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 83e82e5e2..b0f2b9d5f 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -53,13 +53,13 @@ class TQStrList;
  *  };
  *  // fetch the part..
  *  KParts::Part* p = static_cast<KParts::Part*>(
- *      factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING,
+ *      factory->create( this, "tralala", "TQObject",
  *                       "KParts::ReadOnlyPart" ) );
  *  assert( p );
  *  setCentralWidget( p->widget() );
  *
  *  // cast the part to the TerminalInterface..
- *  TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p );
+ *  TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p );
  *  if( ! t )
  *  {
  *    // This probably happens because the konsole that is installed
@@ -78,8 +78,8 @@ class TQStrList;
  *  // or connect to one of the signals.  Connect to the Part object,
  *  // not to the TerminalInterface, since the latter is no TQObject,
  *  // and as such cannot have signals..:
- *  //    connect( p, TQT_SIGNAL( processExited( int ) ),
- *  //             this, TQT_SLOT( shellExited( int ) ) );
+ *  //    connect( p, TQ_SIGNAL( processExited( int ) ),
+ *  //             this, TQ_SLOT( shellExited( int ) ) );
  *  // etc.
  *
  * \endcode
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 03a04301b..414159af1 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=$(all_includes)
 check_PROGRAMS=test
-test_SOURCES=main.cc
+test_SOURCES=main.cpp
 test_LDADD=$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
 test_LDFLAGS=$(all_libraries)
 METASOURCES=AUTO
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cpp
index 8130f85d6..f0d51b259 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cpp
@@ -17,17 +17,17 @@ Win::Win()
 {
     KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" );
     assert( factory );
-    KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) );
+    KParts::Part* p =  factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ;
     setCentralWidget( p->widget() );
 
-    TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p );
+    TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p );
     t->showShellInDir( TQDir::home().path() );
 //     TQStrList l;
 //     l.append( "python" );
 //     t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l );
 
-    connect( p, TQT_SIGNAL( processExited( int ) ),
-             this, TQT_SLOT( pythonExited( int ) ) );
+    connect( p, TQ_SIGNAL( processExited( int ) ),
+             this, TQ_SLOT( pythonExited( int ) ) );
 }
 
 
@@ -46,11 +46,11 @@ int main( int argc, char** argv )
 void Win::pythonExited()
 {
     std::cerr << "hee, " << p << std::endl;
-    std::cerr << ( ::tqqt_cast<TerminalInterface>(p) ) << std::endl;
+    std::cerr << ( ::tqt_cast<TerminalInterface>(p) ) << std::endl;
     // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) );
-    disconnect(p, TQT_SIGNAL( processExited() ),
-            this, TQT_SLOT( pythonExited() ));
-    TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p );
+    disconnect(p, TQ_SIGNAL( processExited() ),
+            this, TQ_SLOT( pythonExited() ));
+    TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p );
     TQStrList l;
     l.append( "echo" );
     l.append( "hello world" );
diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h
index 256b0840a..bf87cb041 100644
--- a/interfaces/terminal/test/main.h
+++ b/interfaces/terminal/test/main.h
@@ -5,7 +5,7 @@
 class Win
     : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
     KParts::Part* p;
 public:
     Win();
diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt
index 76c781467..a4e881466 100644
--- a/kab/CMakeLists.txt
+++ b/kab/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 set( target kab )
 
 set( ${target}_SRCS
-  kabapi.cc addressbook.cc qconfigDB.cc
+  kabapi.cpp addressbook.cpp qconfigDB.cpp
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
diff --git a/kab/ChangeLog b/kab/ChangeLog
index d3e36fcc1..51715a70d 100644
--- a/kab/ChangeLog
+++ b/kab/ChangeLog
@@ -11,7 +11,7 @@ Tue Dec 22 22:56:58 1998  Mirko Boehm  <mirko@kde.org>
 	* businesscard.h (class BusinessCard): Hopefully remove
 	trigraph.
 
-	* datepickerdialog.cc (DateLabel): Removed default value
+	* datepickerdialog.cpp (DateLabel): Removed default value
 	in the implementation.
 
 	* keyvaluemap.h: Removed a default value for a function
diff --git a/kab/Makefile.am b/kab/Makefile.am
index 89e1aab8e..66018aed5 100644
--- a/kab/Makefile.am
+++ b/kab/Makefile.am
@@ -5,9 +5,9 @@ KABVERSION=	4.0.0
 KABPATCH=	0
 
 libkab_la_SOURCES	= \
-	kabapi.cc \
-	addressbook.cc \
-	qconfigDB.cc 
+	kabapi.cpp \
+	addressbook.cpp \
+	qconfigDB.cpp 
 
 libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkab_la_LIBADD = ../tdeui/libtdeui.la
diff --git a/kab/addressbook.cc b/kab/addressbook.cpp
index 017621ac7..0cf8b9307 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cpp
@@ -100,7 +100,7 @@ const int AddressBook::Entry::NoOfFields
 =sizeof(AddressBook::Entry::Fields)/sizeof(AddressBook::Entry::Fields[0]);
 
 struct QStringLess
-  : public binary_function<const TQString&, const TQString&, bool>
+  : public std::function<bool(const TQString&, const TQString&)>
 {
   /** The function operator, inline. */
   bool operator()(const TQString& x, const TQString& y) const
@@ -420,10 +420,10 @@ AddressBook::AddressBook(TQWidget* parent, const char* name, bool loadit)
 	 i18n("Out of Memory"));
       kapp->quit(); // It is critical, but will possibly never happen.
     }
-  connect(data, TQT_SIGNAL(fileChanged()), TQT_SLOT(dataFileChanged()));
-  connect(data, TQT_SIGNAL(changed(QConfigDB*)),
-	  TQT_SLOT(reloaded(QConfigDB*)));
-  connect(config, TQT_SIGNAL(fileChanged()), TQT_SLOT(configFileChanged()));
+  connect(data, TQ_SIGNAL(fileChanged()), TQ_SLOT(dataFileChanged()));
+  connect(data, TQ_SIGNAL(changed(QConfigDB*)),
+	  TQ_SLOT(reloaded(QConfigDB*)));
+  connect(config, TQ_SIGNAL(fileChanged()), TQ_SLOT(configFileChanged()));
   // ----- set style:
 
   filename = locate( "data", STD_CONFIGFILENAME);
diff --git a/kab/addressbook.h b/kab/addressbook.h
index 8aa78411e..1137407b3 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -183,7 +183,7 @@ class CategoriesMap : public TQMap<int, TQString>
 class AddressBook : public TQFrame
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /**
diff --git a/kab/kabapi.cc b/kab/kabapi.cpp
index 62a50f162..2008f1f88 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cpp
@@ -43,8 +43,8 @@ KabAPI::KabAPI(TQWidget* parent, const char* name)
   setMainWidget(listbox);
   showButtonApply(false);
   enableButtonSeparator(true);
-  connect(listbox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(entrySelected(int)));
-  connect(listbox, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotDoubleClicked ( TQListBoxItem * )));
+  connect(listbox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(entrySelected(int)));
+  connect(listbox, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotDoubleClicked ( TQListBoxItem * )));
 }
 
 
@@ -90,8 +90,8 @@ AddressBook::ErrorCode KabAPI::init()
   book=new AddressBook(0, "KABAPI::book", true);  //change parent from "this" to "0" //dsweet
   if(book->getState()==AddressBook::NoError)
     {
-      connect(book, TQT_SIGNAL(setStatus(const TQString&)),
-	      TQT_SLOT(setStatusSlot(const TQString&)));
+      connect(book, TQ_SIGNAL(setStatus(const TQString&)),
+	      TQ_SLOT(setStatusSlot(const TQString&)));
       return AddressBook::NoError;
     } else {
       return AddressBook::InternError;
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 98cae1320..b2585760a 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -68,7 +68,7 @@ class TDEListBox;
 class KabAPI : public KDialogBase
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /**
diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cpp
index dc77a1e1b..1112f7c7d 100644
--- a/kab/qconfigDB.cc
+++ b/kab/qconfigDB.cpp
@@ -656,7 +656,7 @@ KeyValueMap::insert(const TQCString& key, const TQString& value, bool force)
   TQCString v;
   // -----
   v=value.utf8();
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::insert[QString]: trying to "
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::insert[TQString]: trying to "
       "insert \"" << (!value.isNull() ? "true" : "false")
 				  << "\" for key\n           -->"
 				  << v
@@ -670,19 +670,19 @@ KeyValueMap::get(const TQCString& key, TQString& value) const
 {
   bool GUARD; GUARD=false;
   // ###########################################################################
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: trying to get "
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[TQString]: trying to get "
       "a TQString value for key " << key << endl;
   TQCString v;
   // ----- get string representation:
   if(!get(key, v))
     {
-	kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: key "
+	kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[TQString]: key "
 					<< key << " not in KeyValueMap.\n";
 	return false;
     }
   // ----- find its state:
   value=TQString::fromUtf8(v); // is there a better way?
-  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[QString]: success, value"
+  kdDebug(GUARD, KAB_KDEBUG_AREA) <<  "KeyValueMap::get[TQString]: success, value"
 	     " (in UTF8) is " << v << endl;
   return true;
   // ###########################################################################
@@ -2221,7 +2221,7 @@ QConfigDB::watch(bool state)
       if(timer==0)
 	{
 	  timer=new TQTimer(this);
-	  connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(checkFileChanged()));
+	  connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(checkFileChanged()));
 	}
       timer->start(1000);
     } else { // stop timer
diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h
index 36fcd369d..f74e5886c 100644
--- a/kab/qconfigDB.h
+++ b/kab/qconfigDB.h
@@ -19,6 +19,7 @@
 namespace std { }
 using namespace std;
 
+#include <functional>
 #include <list>
 #include <map>
 #include <tqwidget.h>
@@ -43,7 +44,7 @@ class TQTextStream;
  * it is called with.
  */
 struct QCStringLess 
-  : public binary_function<const TQCString&, const TQCString&, bool> 
+  : public std::function<bool(const TQCString&, const TQCString&)>
 {
   /**
    * The function operator, inline.
@@ -550,7 +551,7 @@ public:
 class QConfigDB : public TQWidget
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 protected:
   /**
diff --git a/kate/data/CMakeLists.txt b/kate/data/CMakeLists.txt
index 6c9e158cb..b823e4e60 100644
--- a/kate/data/CMakeLists.txt
+++ b/kate/data/CMakeLists.txt
@@ -45,9 +45,9 @@ install( FILES
     ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml java.xml json.xml
     jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml
     literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lsl.xml lua.xml m3u.xml
-    m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml
-    maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml modelica.xml
-    modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml
+    m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml markdown.xml mason.xml mathematica.xml
+    matlab.xml maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml
+    modelica.xml modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml
     modula-2.xml monobasic.xml mup.xml nagios.xml nasm.xml nemerle.xml nesc.xml
     noweb.xml objectivecpp.xml objectivec.xml ocaml.xml ocamllex.xml ocamlyacc.xml
     octave.xml oors.xml opal.xml opencl.xml
diff --git a/kate/data/Makefile.am b/kate/data/Makefile.am
index 09df83b7f..5f1eda66d 100644
--- a/kate/data/Makefile.am
+++ b/kate/data/Makefile.am
@@ -23,9 +23,9 @@ syntaxkate_DATA = language.dtd syntax.template \
     ini.xml isocpp.xml jam.xml javadoc.xml javascript.xml javascript-php.xml java.xml json.xml \
     jsp.xml julia.xml j.xml kbasic.xml latex.xml ldif.xml ld.xml less.xml lex.xml lilypond.xml \
     literate-curry.xml literate-haskell.xml logtalk.xml lpc.xml lsl.xml lua.xml m3u.xml \
-    m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml mason.xml mathematica.xml matlab.xml \
-    maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml modelica.xml \
-    modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml \
+    m4.xml mab.xml magma.xml makefile.xml mako.xml mandoc.xml markdown.xml mason.xml mathematica.xml \
+    matlab.xml maxima.xml mediawiki.xml mel.xml mergetagtext.xml meson.xml metafont.xml mips.xml \
+    modelica.xml modelines.xml modula-2-iso-only.xml modula-2-pim-only.xml modula-2-r10-only.xml \
     modula-2.xml monobasic.xml mup.xml nagios.xml nasm.xml nemerle.xml nesc.xml \
     noweb.xml objectivecpp.xml objectivec.xml ocaml.xml ocamllex.xml ocamlyacc.xml \
     octave.xml oors.xml opal.xml opencl.xml \
diff --git a/kate/data/c.xml b/kate/data/c.xml
index 501e865e3..aa250ec9c 100644
--- a/kate/data/c.xml
+++ b/kate/data/c.xml
@@ -197,7 +197,7 @@
       <itemData name="Comment"      defStyleNum="dsComment"/>
       <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
-      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
       <itemData name="Alert"        defStyleNum="dsAlert" spellChecking="false"/>
       <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
       <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
diff --git a/kate/data/diff.xml b/kate/data/diff.xml
index b681b4270..62fdceb1e 100644
--- a/kate/data/diff.xml
+++ b/kate/data/diff.xml
@@ -15,7 +15,7 @@
     2008-02-13: 1.11 Eduardo Robles Elvira <edulix AT gmail DOT com>
      Fixed folding.
 -->
-<language name="Diff" version="1.12" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
+<language name="Diff" version="1.13" kateversion="2.4" section="Other" extensions="*.diff;*patch" mimetype="text/x-patch">
 
   <highlighting>
 
@@ -108,8 +108,8 @@
       <itemData name="Normal Text" defStyleNum="dsNormal"/>
       <itemData name="File"  defStyleNum="dsKeyword"/>
       <itemData name="Header"  defStyleNum="dsDataType"/>
-      <itemData name="Removed line"  defStyleNum="dsString" color="#FF0000"/>
-      <itemData name="Added line"  defStyleNum="dsOthers" color="#0000FF"/>
+      <itemData name="Removed line"  defStyleNum="dsString" backgroundColor="#ffeef0"/>
+      <itemData name="Added line"  defStyleNum="dsOthers" backgroundColor="#e6ffed"/>
       <itemData name="Changed line (old)"  defStyleNum="dsString" color="#FF0000"/>
       <itemData name="Changed line (new)"  defStyleNum="dsOthers" color="#0000FF"/>
     </itemDatas>
diff --git a/kate/data/fgl-4gl.xml b/kate/data/fgl-4gl.xml
index 7b2084dbd..b92523641 100644
--- a/kate/data/fgl-4gl.xml
+++ b/kate/data/fgl-4gl.xml
@@ -347,7 +347,7 @@
       <itemData name="Comment"  defStyleNum="dsComment"/>
       <itemData name="Symbol"  defStyleNum="dsNormal"/>
       <itemData name="Preprocessor"  defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
       <itemData name="Alert"        defStyleNum="dsAlert" />
     </itemDatas>
   </highlighting>
diff --git a/kate/data/fgl-per.xml b/kate/data/fgl-per.xml
index 44bc53151..21d09df57 100644
--- a/kate/data/fgl-per.xml
+++ b/kate/data/fgl-per.xml
@@ -159,7 +159,7 @@
       <itemData name="Comment"  defStyleNum="dsComment"/>
       <itemData name="Symbol"  defStyleNum="dsNormal"/>
       <itemData name="Preprocessor"  defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
       <itemData name="Alert"        defStyleNum="dsAlert" />
     </itemDatas>
   </highlighting>
diff --git a/kate/data/idl.xml b/kate/data/idl.xml
index a8a2787dd..06b37118b 100644
--- a/kate/data/idl.xml
+++ b/kate/data/idl.xml
@@ -100,7 +100,7 @@
       <itemData name="Comment"  defStyleNum="dsComment"/>
       <itemData name="Symbol"  defStyleNum="dsNormal"/>
       <itemData name="Preprocessor"  defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
       <itemData name="Alert"        defStyleNum="dsAlert" />
     </itemDatas>
   </highlighting>
diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml
index 0637867fc..3bbeb9f01 100644
--- a/kate/data/isocpp.xml
+++ b/kate/data/isocpp.xml
@@ -156,8 +156,8 @@
       <item> Q_SIGNALS </item>
       <item> Q_SLOTS </item>
       <item> Q_UNUSED </item>
-      <item> SIGNAL </item>
-      <item> SLOT </item>
+      <item> Q_SIGNAL </item>
+      <item> Q_SLOT </item>
       <item> TRUE </item>
       <item> FALSE </item>
       <item> TQ_ARG </item>
@@ -198,13 +198,8 @@
       <item> TQ_SCRIPTABLE </item>
       <item> TQ_SETS </item>
       <item> TQ_SIGNAL </item>
-      <item> TQ_SIGNALS </item>
       <item> TQ_SLOT </item>
-      <item> TQ_SLOTS </item>
       <item> TQ_UNUSED </item>
-      <item> TQT_SIGNAL </item>
-      <item> TQT_SLOT </item>
-      <item> TQT_TQOBJECT </item>
       <item> connect </item>
       <item> disconnect </item>
       <item> emit </item>
diff --git a/kate/data/javascript.xml b/kate/data/javascript.xml
index e90f0b051..916d213c1 100644
--- a/kate/data/javascript.xml
+++ b/kate/data/javascript.xml
@@ -101,6 +101,7 @@
 
         <DetectChar attribute="String" context="String" char="&quot;" />
         <DetectChar attribute="String" context="String SQ" char="'" />
+        <DetectChar attribute="String" context="Template String" char="`" />
 
         <IncludeRules context="##Doxygen" />
         <Detect2Chars attribute="Comment" context="Comment" char="/" char1="/" />
@@ -154,6 +155,11 @@
         <LineContinue/>
         <DetectChar attribute="String" context="#pop" char="'" />
       </context>
+      <context attribute="String" lineEndContext="#pop" name="Template String">
+        <HlCStringChar attribute="Char" />
+        <LineContinue/>
+        <DetectChar attribute="String" context="#pop" char="`" />
+      </context>
 
       <context attribute="Comment" lineEndContext="#pop" name="Comment">
         <IncludeRules context="##Alerts" />
diff --git a/kate/data/markdown.xml b/kate/data/markdown.xml
new file mode 100644
index 000000000..177b904da
--- /dev/null
+++ b/kate/data/markdown.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Kate syntax highlight filter for Markdown/MultiMarkdown documents.
+
+	Copyright 2008 Darrin Yeager. http://www.dyeager.org/
+	Dual-Licensed under both GPL and BSD licenses.
+
+	Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/
+-->
+
+
+<!-- the [^\s]{1} is in the regex to avoid interfering with bullet list which
+	  starts "* item". Thus emphasis/strong MUST be formed like *words here*
+	  with the asterisks next to the beginning of the first word.
+
+	  Match space or newline, followed by "*", followed by one non-space,
+	  followed by anything non-asterisk, followed by "*", followed by
+	  space, end-of-sentence punctuation, or the end of the line.
+-->
+<!DOCTYPE language SYSTEM "language.dtd"
+			 [
+			 <!ENTITY strongemphasisregex "(\s|^)[\*_]{3}[^\*_]+[\*_]{3}(\s|\.|,|;|:|\-|\?|$)">
+			 <!ENTITY strongregex "(\s|^)[\*_]{2}[^\s]{1}[^\*_]+[\*_]{2}(\s|\.|,|;|:|\-|\?|$)">
+			 <!ENTITY emphasisregex "(\s|^)[\*_]{1}[^\s]{1}[^\*_]+[\*_]{1}(\s|\.|,|;|:|\-|\?|$)">
+			 <!ENTITY reflinkregex '\[[^\]\^]+\]\s*\[[^\]]*\]\s*(\s+\"[^\"]*\"){0,1}'>
+			 <!ENTITY reflinktargetregex '\[[^\]\^]+\]\:\s+[^\s]+(\s+\"[^\"]*\"){0,1}'>
+			 <!ENTITY footnoteregex "\[\^[^\]]+\]">
+			 <!ENTITY preregex "^\s*```\s*">
+			 <!ENTITY pretilderegex "^\s*~~~\s*">
+			 <!ENTITY preendregex "^\s*```\s*$">
+			 <!ENTITY pretildeendregex "^\s*~~~\s*$">
+			 <!ENTITY presingleline '```[^`]+```'>
+			 <!ENTITY idlinkregex '\[[^\]\^]+\]\s*\(#[^\(]*\)'>
+			 <!ENTITY inlinelinkregex '\[[^\]\^]+\]\s*\([^\(]*\)'>
+			 <!ENTITY inlineimageregex '\!\[[^\]\^]+\]\([^\(]*\)'>
+			 <!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'>
+			 <!ENTITY autolinkregex '&lt;(https?|ftp):[^\"&gt;\s]+&gt;'>
+			 <!ENTITY mailtolinkregex '&lt;(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)&gt;'>
+			 <!ENTITY rulerregex '^ {,3}([\*\-_]\s*){3,}\s*$'>
+			 <!-- two spaces at end of line generates linebreak -->
+			 <!ENTITY linebreakregex "(  |\\)$">
+			 <!ENTITY strikeoutregex "~~[^~\s].*[^~\s]~~">
+			 <!ENTITY prediffregex "^(```|~~~)\s{0,}diff">
+			 <!ENTITY difflineremoveregex "^-[^-].*$">
+			 <!ENTITY difflineaddregex "^\+[^\+].*$">
+			 <!ENTITY diffheader1regex "^-{3} .*$">
+			 <!ENTITY diffheader2regex "^(\+{3} .*|^@@.*)$">
+			 <!ENTITY diffheaderdiffregex "^diff .*$">
+]>
+
+<language name="Markdown" version="1.4" section="Markup"
+		extensions="*.md;*.mmd;*.mdwn"
+		author="Darrin Yeager, Claes Holmerson"
+		license="GPL,BSD" >
+	<highlighting>
+		<contexts>
+
+			<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
+				<DetectChar context="blockquote" char="&gt;" column="0"/>
+				<RegExpr attribute="h1" String="^#\s.*[#]?$" />
+				<RegExpr attribute="h2" String="^##\s.*[#]?$" />
+				<RegExpr attribute="h3" String="^###\s.*[#]?$" />
+				<RegExpr attribute="h4" String="^####\s.*[#]?$" />
+				<RegExpr attribute="h5" String="^#####\s.*[#]?$" />
+				<RegExpr attribute="h6" String="^######\s.*[#]?$" />
+				<RegExpr attribute="strongemphasis" String="&strongemphasisregex;" />
+				<RegExpr attribute="strong" String="&strongregex;" />
+				<RegExpr attribute="emphasis" String="&emphasisregex;" />
+				<RegExpr attribute="ruler" String="&rulerregex;" />
+				<RegExpr context="bullet"  String="^ {,3}[\*\+\-]\s" />
+				<RegExpr context="numlist" String="^ {,3}[\d]+\.\s" />
+				<RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" />
+				<RegExpr attribute="meta" String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$" />
+				<IncludeRules context="inc" />
+			</context>
+
+			<context attribute="blockquote" lineEndContext="#pop" name="blockquote">
+				<RegExpr attribute="bq-strong" String="&strongregex;" />
+				<RegExpr attribute="bq-emphasis" String="&emphasisregex;" />
+				<RegExpr attribute="bq-strongemphasis" String="&strongemphasisregex;" />
+				<IncludeRules context="inc" />
+			</context>
+
+			<context attribute="bullet" lineEndContext="#pop" name="bullet" >
+				<RegExpr attribute="bl-strong" String="&strongregex;" />
+				<RegExpr attribute="bl-emphasis" String="&emphasisregex;" />
+				<RegExpr attribute="bl-strongemphasis" String="&strongemphasisregex;" />
+				<IncludeRules context="inc" />
+			</context>
+
+			<context attribute="numlist" lineEndContext="#pop" name="numlist" >
+				<RegExpr attribute="nl-strong" String="&strongregex;" />
+				<RegExpr attribute="nl-emphasis" String="&emphasisregex;" />
+				<RegExpr attribute="nl-strongemphasis" String="&strongemphasisregex;" />
+				<IncludeRules context="inc" />
+			</context>
+
+			<context attribute="comment" lineEndContext="#stay" name="comment" >
+				<RegExpr String="--&gt;" attribute="comment" context="#pop" endRegion="comment"/>
+			</context>
+
+			<context attribute="prediff" lineEndContext="#stay" name="prediff" >
+				<RegExpr String="&preendregex;" attribute="prediff" context="#pop" endRegion="prediff"/>
+				<RegExpr attribute="difflineremove" String="&difflineremoveregex;" />
+				<RegExpr attribute="difflineadd" String="&difflineaddregex;" />
+				<RegExpr attribute="diffheader1" String="&diffheader1regex;" />
+				<RegExpr attribute="diffheader2" String="&diffheader2regex;" />
+				<RegExpr attribute="diffheaderdiff" String="&diffheaderdiffregex;" />
+			</context>
+
+			<context attribute="code" lineEndContext="#stay" name="pre" >
+				<RegExpr String="&preendregex;" attribute="code" context="#pop" endRegion="pre"/>
+			</context>
+
+			<context attribute="code" lineEndContext="#stay" name="pretilde" >
+				<RegExpr String="&pretildeendregex;" attribute="code" context="#pop" endRegion="pretilde"/>
+			</context>
+
+			<context attribute="common" name="inc" lineEndContext="#stay" >
+				<RegExpr context="comment" String="&lt;!--" beginRegion="comment" />
+				<RegExpr context="prediff" String="&prediffregex;" beginRegion="prediff" />
+				<RegExpr attribute="code" minimal="true" String="&presingleline;"/>
+				<RegExpr attribute="code" context="pre" String="&preregex;" beginRegion="pre" />
+				<RegExpr attribute="code" context="pretilde" String="&pretilderegex;" beginRegion="pretilde" />
+				<RegExpr attribute="code" String="``.*``" />
+				<RegExpr attribute="code" String="`[^`]*`" />
+				<RegExpr attribute="reflink" String="&reflinkregex;" />
+				<RegExpr attribute="footnote" String="&footnoteregex;" />
+				<RegExpr attribute="idlink" String="&idlinkregex;"/>
+				<RegExpr attribute="inlinelink" String="&inlinelinkregex;"/>
+				<RegExpr attribute="reflinktarget" String="&reflinktargetregex;"/>
+				<RegExpr attribute="inlineimage" String="&inlineimageregex;"/>
+				<RegExpr attribute="refimage" String="&refimageregex;"/>
+				<RegExpr attribute="autolink" String="&autolinkregex;"/>
+				<RegExpr attribute="mailtolink" String="&mailtolinkregex;"/>
+				<RegExpr attribute="strikeout" minimal="true" String="&strikeoutregex;"/>
+				<RegExpr attribute="linebreak" minimal="true" String="&linebreakregex;"/>
+			</context>
+		</contexts>
+
+		<itemDatas>
+			<itemData name="Normal Text" defStyleNum="dsNormal" />
+			<itemData name="common" defStyleNum="dsNormal" />
+			<itemData name="emphasis" defStyleNum="dsNormal" italic="true" />
+			<itemData name="strong" defStyleNum="dsNormal" bold="true" />
+			<itemData name="diffheader1" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" bold="true" />
+			<itemData name="diffheader2" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" />
+			<itemData name="diffheaderdiff" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#000000" bold="true" />
+			<itemData name="difflineremove" defStyleNum="dsString" backgroundColor="#ffeef0" />
+			<itemData name="difflineadd" defStyleNum="dsOthers" backgroundColor="#e6ffed" />
+			<itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/>
+			<itemData name="ruler" defStyleNum="dsNormal" color="#e200e2" bold="true" />
+			<itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" backgroundColor="#fafaaf" />
+			<itemData name="linebreak" defStyleNum="dsNormal" backgroundColor="#F8E0FF" />
+			<itemData name="h1" defStyleNum="dsFunction" bold="true" />
+			<itemData name="h2" defStyleNum="dsFunction" bold="true" />
+			<itemData name="h3" defStyleNum="dsFunction" bold="true" />
+			<itemData name="h4" defStyleNum="dsFunction" bold="true" />
+			<itemData name="h5" defStyleNum="dsFunction" bold="true" />
+			<itemData name="h6" defStyleNum="dsFunction" bold="true" />
+			<itemData name="blockquote" defStyleNum="dsNormal" color="black" />
+			<itemData name="bq-emphasis" defStyleNum="dsNormal" color="black" italic="true" />
+			<itemData name="bq-strong" defStyleNum="dsNormal" color="black" bold="true" />
+			<itemData name="bq-strongemphasis" defStyleNum="dsNormal" color="black" italic="true" bold="true" />
+			<itemData name="bullet" defStyleNum="dsNormal" color="#b700b7" />
+			<itemData name="bl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
+			<itemData name="bl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
+			<itemData name="bl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
+			<itemData name="numlist" defStyleNum="dsNormal" color="#b700b7" />
+			<itemData name="nl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
+			<itemData name="nl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
+			<itemData name="nl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
+			<itemData name="comment" defStyleNum="dsComment" />
+			<itemData name="pre" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
+			<itemData name="prediff" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
+			<itemData name="code" defStyleNum="dsNormal" color="darkcyan" backgroundColor="#eeeeee" />
+			<itemData name="reflink" defStyleNum="dsOthers" color="blue"  />
+			<itemData name="idlink" defStyleNum="dsOthers" color="blue" italic="true" />
+			<itemData name="inlinelink" defStyleNum="dsOthers" color="blue" />
+			<itemData name="autolink" defStyleNum="dsOthers" underline="true" />
+			<itemData name="mailtolink" defStyleNum="dsOthers" underline="true" />
+			<itemData name="footnote" defStyleNum="dsOthers" italic="true" />
+			<itemData name="meta" defStyleNum="dsComment" />
+			<itemData name="reflinktarget" defStyleNum="dsOthers" />
+			<itemData name="inlineimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
+			<itemData name="refimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
+		</itemDatas>
+	</highlighting>
+
+	<general>
+		<comments>
+			<comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
+		</comments>
+	</general>
+
+</language>
diff --git a/kate/data/nesc.xml b/kate/data/nesc.xml
index 5a5d0db54..688281bde 100644
--- a/kate/data/nesc.xml
+++ b/kate/data/nesc.xml
@@ -172,7 +172,7 @@
       <itemData name="Comment" defStyleNum="dsComment"/>
       <itemData name="Symbol" defStyleNum="dsNormal"/>
       <itemData name="Preprocessor" defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml
index a49ed574f..a07940916 100644
--- a/kate/data/objectivec.xml
+++ b/kate/data/objectivec.xml
@@ -79,8 +79,8 @@
       <item> Q_SIGNALS </item>
       <item> Q_SLOTS </item>
       <item> Q_UNUSED </item>
-      <item> SIGNAL </item>
-      <item> SLOT </item>
+      <item> Q_SIGNAL </item>
+      <item> Q_SLOT </item>
       <item> TRUE </item>
       <item> FALSE </item>
       <item> TQ_ARG </item>
@@ -121,13 +121,8 @@
       <item> TQ_SCRIPTABLE </item>
       <item> TQ_SETS </item>
       <item> TQ_SIGNAL </item>
-      <item> TQ_SIGNALS </item>
       <item> TQ_SLOT </item>
-      <item> TQ_SLOTS </item>
       <item> TQ_UNUSED </item>
-      <item> TQT_SIGNAL </item>
-      <item> TQT_SLOT </item>
-      <item> TQT_TQOBJECT </item>
       <item> connect </item>
       <item> disconnect </item>
       <item> emit </item>
@@ -230,7 +225,7 @@
       <itemData name="Comment"  defStyleNum="dsComment"/>
       <itemData name="Symbol"  defStyleNum="dsNormal"/>
       <itemData name="Preprocessor"  defStyleNum="dsOthers"/>
-      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib"  defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
     </itemDatas>
   </highlighting>
   <general>
diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml
index 8be78b2d4..bfe4298d4 100644
--- a/kate/data/objectivecpp.xml
+++ b/kate/data/objectivecpp.xml
@@ -124,8 +124,8 @@
       <item> Q_SIGNALS </item>
       <item> Q_SLOTS </item>
       <item> Q_UNUSED </item>
-      <item> SIGNAL </item>
-      <item> SLOT </item>
+      <item> Q_SIGNAL </item>
+      <item> Q_SLOT </item>
       <item> TRUE </item>
       <item> FALSE </item>
       <item> TQ_ARG </item>
@@ -166,13 +166,8 @@
       <item> TQ_SCRIPTABLE </item>
       <item> TQ_SETS </item>
       <item> TQ_SIGNAL </item>
-      <item> TQ_SIGNALS </item>
       <item> TQ_SLOT </item>
-      <item> TQ_SLOTS </item>
       <item> TQ_UNUSED </item>
-      <item> TQT_SIGNAL </item>
-      <item> TQT_SLOT </item>
-      <item> TQT_TQOBJECT </item>
       <item> connect </item>
       <item> disconnect </item>
       <item> emit </item>
diff --git a/kate/data/opencl.xml b/kate/data/opencl.xml
index 5c5cc7c5c..c4e2b3d39 100644
--- a/kate/data/opencl.xml
+++ b/kate/data/opencl.xml
@@ -241,7 +241,7 @@
       <itemData name="Comment"      defStyleNum="dsComment"/>
       <itemData name="Symbol"       defStyleNum="dsNormal" spellChecking="false"/>
       <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/>
-      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); -->
+      <itemData name="Prep. Lib"    defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); -->
       <itemData name="Alert"        defStyleNum="dsAlert" spellChecking="false"/>
       <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
       <itemData name="Error"        defStyleNum="dsError" spellChecking="false"/>
diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml
index 7942a6afa..d1e4ed488 100644
--- a/kate/data/qt4.xml
+++ b/kate/data/qt4.xml
@@ -34,8 +34,8 @@
     <item> slots </item>
     <item> foreach </item>
     <item> forever </item>
-    <item> SIGNAL </item>
-    <item> SLOT </item>
+    <item> Q_SIGNAL </item>
+    <item> Q_SLOT </item>
     <!-- http://qt-project.org/doc/qt-4.8/QApplication.html#macros -->
     <item> qApp </item>
     <!-- http://qt-project.org/doc/qt-4.8/qcoreapplication.html#macros -->
diff --git a/kate/data/update-files.xml b/kate/data/update-files.xml
index c4cf021de..12924302b 100644
--- a/kate/data/update-files.xml
+++ b/kate/data/update-files.xml
@@ -52,7 +52,7 @@
 <Definition name="Debian Changelog" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debianchangelog.xml" version="6"/>
 <Definition name="Debian Control" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/debiancontrol.xml" version="0.84"/>
 <Definition name=".desktop" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/desktop.xml" version="2-1"/>
-<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.12"/>
+<Definition name="Diff" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/diff.xml" version="1.13"/>
 <Definition name="Django HTML Template" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/djangotemplate.xml" version="3"/>
 <Definition name="Dockerfile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dockerfile.xml" version="1.1"/>
 <Definition name="MS-DOS Batch" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/dosbat.xml" version="0.30"/>
@@ -136,6 +136,7 @@
 <Definition name="Makefile" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/makefile.xml" version="2.1"/>
 <Definition name="Mako" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mako.xml" version="1.0"/>
 <Definition name="Troff Mandoc" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mandoc.xml" version="2"/>
+<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.4"/>
 <Definition name="Mason" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mason.xml" version="4"/>
 <Definition name="Mathematica" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/mathematica.xml" version="8.1"/>
 <Definition name="Matlab" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/matlab.xml" version="2-2"/>
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 381e32fa2..c30a6d320 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -61,7 +61,7 @@ class KATEPARTINTERFACES_EXPORT Cursor : public KTextEditor::Cursor
 
 class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ConfigPage ( TQWidget *parent=0, const char *name=0 ) : KTextEditor::ConfigPage (parent, name) { ; };
@@ -79,7 +79,7 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
 
 class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
@@ -188,7 +188,7 @@ class KATEPARTINTERFACES_EXPORT Document : public KTextEditor::Document, public
                      public KTextEditor::MarkInterfaceExtension,
                      public KTextEditor::SelectionInterfaceExt
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Document ();
diff --git a/kate/interfaces/interfaces.cpp b/kate/interfaces/interfaces.cpp
index 9cbb58977..902459c24 100644
--- a/kate/interfaces/interfaces.cpp
+++ b/kate/interfaces/interfaces.cpp
@@ -100,7 +100,7 @@ Document *document (KTextEditor::Document *doc)
   if (!doc)
     return 0;
 
-  return ::tqqt_cast<Kate::Document*>(doc);
+  return ::tqt_cast<Kate::Document*>(doc);
 }
 
 DocumentExt *documentExt (KTextEditor::Document *doc)
@@ -121,7 +121,7 @@ View *view (KTextEditor::View *view)
   if (!view)
     return 0;
 
-  return ::tqqt_cast<Kate::View*>(view);
+  return ::tqt_cast<Kate::View*>(view);
 }
 
 }
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 3b2b8a4e1..fcaf43110 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -43,7 +43,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
               public KTextEditor::PopupMenuInterface, public KTextEditor::ViewCursorInterface,
               public KTextEditor::CodeCompletionInterface, public KTextEditor::DynWordWrapInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp
index 927380979..1f526b7af 100644
--- a/kate/part/katearbitraryhighlight.cpp
+++ b/kate/part/katearbitraryhighlight.cpp
@@ -73,8 +73,8 @@ KateAttribute KateArbitraryHighlightRange::merge(TQPtrList<KateSuperRange> range
 void KateArbitraryHighlight::addHighlightToDocument(KateSuperRangeList* list)
 {
   m_docHLs.append(list);
-  connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotRangeEliminated(KateSuperRange*)));
-  connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*)));
+  connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotRangeEliminated(KateSuperRange*)));
+  connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*)));
 }
 
 void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateView* view)
@@ -84,9 +84,9 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi
 
   m_viewHLs[view]->append(list);
 
-  connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*)));
-  connect(list, TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*)));
-  connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*)));
+  connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*)));
+  connect(list, TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*)));
+  connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*)));
 }
 
 void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) {
diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h
index 1bea4891f..222c82c2e 100644
--- a/kate/part/katearbitraryhighlight.h
+++ b/kate/part/katearbitraryhighlight.h
@@ -31,7 +31,7 @@ class KateView;
 
 class KateArbitraryHighlightRange : public KateSuperRange, public KateAttribute
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KateArbitraryHighlightRange(KateSuperCursor* start, KateSuperCursor* end, TQObject* parent = 0L, const char* name = 0L);
@@ -59,7 +59,7 @@ public:
  */
 class KateArbitraryHighlight : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KateArbitraryHighlight(KateDocument* parent = 0L, const char* name = 0L);
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index e39aba16c..f4a9df273 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -161,7 +161,7 @@ KateAutoIndent::~KateAutoIndent ()
 KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name)
        : TDEActionMenu (text, parent, name), doc(_doc)
 {
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewIndentationAction::slotAboutToShow()
@@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow()
 
   popupMenu()->clear ();
   for (uint z=0; z<modes.size(); ++z)
-    popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0,  z);
+    popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQ_SLOT(setMode(int)), 0,  z);
 
   popupMenu()->setItemChecked (doc->config()->indentationMode(), true);
 }
@@ -187,7 +187,7 @@ KateNormalIndent::KateNormalIndent (KateDocument *_doc)
  : KateAutoIndent (_doc)
 {
   // if highlighting changes, update attributes
-  connect(_doc, TQT_SIGNAL(hlChanged()), this, TQT_SLOT(updateConfig()));
+  connect(_doc, TQ_SIGNAL(hlChanged()), this, TQ_SLOT(updateConfig()));
 }
 
 KateNormalIndent::~KateNormalIndent ()
@@ -479,8 +479,6 @@ void KateCSmartIndent::processLine (KateDocCursor &line)
         textLine->stringAtPos (firstChar, "private") ||
         textLine->stringAtPos (firstChar, "protected") ||
         textLine->stringAtPos (firstChar, "signals") ||
-        textLine->stringAtPos (firstChar, "Q_SIGNALS") ||
-        textLine->stringAtPos (firstChar, "Q_SLOTS") ||
         textLine->stringAtPos (firstChar, "slots"))
     {
       indent = findOpeningBrace(line) + indentWidth;
@@ -859,12 +857,8 @@ uint KateCSmartIndent::calcIndent(KateDocCursor &begin, bool needContinue)
           ch = textLine->getChar(specialIndent + 9);
         else if (textLine->stringAtPos(specialIndent, "signals"))
           ch = textLine->getChar(specialIndent + 7);
-        else if (textLine->stringAtPos(specialIndent, "Q_SIGNALS"))
-          ch = textLine->getChar(specialIndent + 9);
         else if (textLine->stringAtPos(specialIndent, "slots"))
           ch = textLine->getChar(specialIndent + 5);
-        else if (textLine->stringAtPos(specialIndent, "Q_SLOTS"))
-          ch = textLine->getChar(specialIndent + 7);
 
         if (ch.isNull() || (!ch.isSpace() && ch != '(' && ch != ':'))
           continue;
@@ -2174,8 +2168,8 @@ KateVarIndent::KateVarIndent( KateDocument *doc )
   slotVariableChanged( "var-indent-handle-couples", doc->variable( "var-indent-handle-couples" ) );
 
   // update if a setting is changed
-  connect( doc, TQT_SIGNAL(variableChanged( const TQString&, const TQString&) ),
-           this, TQT_SLOT(slotVariableChanged( const TQString&, const TQString& )) );
+  connect( doc, TQ_SIGNAL(variableChanged( const TQString&, const TQString&) ),
+           this, TQ_SLOT(slotVariableChanged( const TQString&, const TQString& )) );
 }
 
 KateVarIndent::~KateVarIndent()
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index fe8980d15..6a499df8e 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -43,7 +43,7 @@ class KateDocument;
  */
 class IndenterConfigPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -69,7 +69,7 @@ class IndenterConfigPage : public TQWidget
  */
 class KateAutoIndent : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   /**
    * Static methods to create and list indention modes
@@ -194,7 +194,7 @@ class KateAutoIndent : public TQObject
  */
 class KateViewIndentationAction : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent = 0, const char* name = 0);
@@ -216,7 +216,7 @@ class KateViewIndentationAction : public TDEActionMenu
  */
 class KateNormalIndent : public KateAutoIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
@@ -347,7 +347,7 @@ protected:
 
 class KateCSmartIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCSmartIndent (KateDocument *doc);
@@ -378,7 +378,7 @@ class KateCSmartIndent : public KateNormalIndent
 
 class KatePythonIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePythonIndent (KateDocument *doc);
@@ -399,7 +399,7 @@ class KatePythonIndent : public KateNormalIndent
 
 class KateXmlIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateXmlIndent (KateDocument *doc);
@@ -428,7 +428,7 @@ class KateXmlIndent : public KateNormalIndent
 
 class KateCSAndSIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCSAndSIndent (KateDocument *doc);
@@ -491,7 +491,7 @@ class KateCSAndSIndent : public KateNormalIndent
  */
 class KateVarIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -542,7 +542,7 @@ class KateVarIndent : public KateNormalIndent
 
 class KateScriptIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateScriptIndent( KateDocument *doc );
@@ -563,7 +563,7 @@ class KateScriptIndent : public KateNormalIndent
 
 class ScriptIndentConfigPage : public IndenterConfigPage
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     ScriptIndentConfigPage ( TQWidget *parent=0, const char *name=0 );
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index cc1dcf4c5..25f00d71b 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -62,7 +62,7 @@ KateBookmarks::KateBookmarks( KateView* view, Sorting sort )
   , m_view( view )
   , m_sorting( sort )
 {
-  connect (view->getDoc(), TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()));
+  connect (view->getDoc(), TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()));
   _tries=0;
   m_bookmarksMenu = 0L;
 }
@@ -75,26 +75,26 @@ void KateBookmarks::createActions( TDEActionCollection* ac )
 {
   m_bookmarkToggle = new TDEToggleAction(
     i18n("Set &Bookmark"), "bookmark", CTRL+Key_B,
-    this, TQT_SLOT(toggleBookmark()),
+    this, TQ_SLOT(toggleBookmark()),
     ac, "bookmarks_toggle" );
   m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it."));
   m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") );
 
   m_bookmarkClear = new TDEAction(
     i18n("Clear &All Bookmarks"), 0,
-    this, TQT_SLOT(clearBookmarks()),
+    this, TQ_SLOT(clearBookmarks()),
     ac, "bookmarks_clear");
   m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document."));
 
   m_goNext = new TDEAction(
     i18n("Next Bookmark"), "go-next", ALT + Key_PageDown,
-    this, TQT_SLOT(goNext()),
+    this, TQ_SLOT(goNext()),
     ac, "bookmarks_next");
   m_goNext->setWhatsThis(i18n("Go to the next bookmark."));
 
   m_goPrevious = new TDEAction(
     i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp,
-    this, TQT_SLOT(goPrevious()),
+    this, TQ_SLOT(goPrevious()),
     ac, "bookmarks_previous");
   m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark."));
 
@@ -102,14 +102,14 @@ void KateBookmarks::createActions( TDEActionCollection* ac )
 
   //connect the aboutToShow() and aboutToHide() signals with
   //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots
-  connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow()));
-  connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) );
+  connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow()));
+  connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) );
 
   marksChanged ();
   bookmarkMenuAboutToHide();
 
-  connect( m_view, TQT_SIGNAL( gotFocus( Kate::View * ) ), this, TQT_SLOT( slotViewGotFocus( Kate::View * ) ) );
-  connect( m_view, TQT_SIGNAL( lostFocus( Kate::View * ) ), this, TQT_SLOT( slotViewLostFocus( Kate::View * ) ) );
+  connect( m_view, TQ_SIGNAL( gotFocus( Kate::View * ) ), this, TQ_SLOT( slotViewGotFocus( Kate::View * ) ) );
+  connect( m_view, TQ_SIGNAL( lostFocus( Kate::View * ) ), this, TQ_SLOT( slotViewLostFocus( Kate::View * ) ) );
 }
 
 void KateBookmarks::toggleBookmark ()
@@ -181,7 +181,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu )
 
       menu.insertItem(
           TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ),
-          m_view, TQT_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx );
+          m_view, TQ_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx );
 
       if ( (*it)->line < line )
       {
diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h
index 3295141f7..05215b66a 100644
--- a/kate/part/katebookmarks.h
+++ b/kate/part/katebookmarks.h
@@ -37,7 +37,7 @@ class TQMenuData;
 
 class KateBookmarks : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Sorting { Position, Creation };
diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h
index 2be23cbdb..96765ceba 100644
--- a/kate/part/katebuffer.h
+++ b/kate/part/katebuffer.h
@@ -340,7 +340,7 @@ class KateBufBlockList
  */
 class KateBuffer : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateBufBlock;
 
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index f00825eb5..0f6cd4e53 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -110,7 +110,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
   }
   else if ( cmd == "run-myself" )
   {
-#ifndef Q_WS_WIN //todo
+#ifndef TQ_WS_WIN //todo
     return KateFactory::self()->jscript()->execute(v, v->doc()->text(), errorMsg);
 #else
     return 0;
diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp
index 275894483..0a3dfe771 100644
--- a/kate/part/katecodecompletion.cpp
+++ b/kate/part/katecodecompletion.cpp
@@ -129,11 +129,11 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
   m_completionPopup->setFocusProxy( m_view->m_viewInternal );
 
   m_pArgHint = new KateArgHint( m_view );
-  connect( m_pArgHint, TQT_SIGNAL(argHintHidden()),
-           this, TQT_SIGNAL(argHintHidden()) );
+  connect( m_pArgHint, TQ_SIGNAL(argHintHidden()),
+           this, TQ_SIGNAL(argHintHidden()) );
 
-  connect( m_view, TQT_SIGNAL(cursorPositionChanged()),
-           this, TQT_SLOT(slotCursorPosChanged()) );
+  connect( m_view, TQ_SIGNAL(cursorPositionChanged()),
+           this, TQ_SLOT(slotCursorPosChanged()) );
 }
 
 KateCodeCompletion::~KateCodeCompletion()
@@ -163,9 +163,9 @@ void KateCodeCompletion::showCompletionBox(
 
 bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionPopup) &&
-       TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox) &&
-       TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_completionListBox->viewport()) )
+  if ( o != m_completionPopup &&
+       o != m_completionListBox &&
+       o != m_completionListBox->viewport() )
     return false;
 
    if( e->type() == TQEvent::Hide )
@@ -185,7 +185,7 @@ bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e )
    }
 
    if ( e->type() == TQEvent::MouseButtonPress ) {
-    TQTimer::singleShot(0, this, TQT_SLOT(showComment()));
+    TQTimer::singleShot(0, this, TQ_SLOT(showComment()));
     return false;
    }
 
@@ -207,7 +207,7 @@ void KateCodeCompletion::handleKey (TQKeyEvent *e)
         (e->key() == Key_Home ) || (e->key() == Key_End)   ||
         (e->key() == Key_Prior) || (e->key() == Key_Next ))
   {
-    TQTimer::singleShot(0,this,TQT_SLOT(showComment()));
+    TQTimer::singleShot(0,this,TQ_SLOT(showComment()));
     TQApplication::sendEvent( m_completionListBox, (TQEvent*)e );
     return;
   }
@@ -324,7 +324,7 @@ void KateCodeCompletion::updateBox( bool )
   m_completionListBox->setFocus();
   m_completionPopup->show();
 
-  TQTimer::singleShot(0,this,TQT_SLOT(showComment()));
+  TQTimer::singleShot(0,this,TQ_SLOT(showComment()));
 }
 
 void KateCodeCompletion::showArgHint ( TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter )
@@ -395,7 +395,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
     : TQFrame( parent, name, (WFlags)WType_Popup )
 {
     setBackgroundColor( black );
-    setPaletteForegroundColor( Qt::black );
+    setPaletteForegroundColor( TQt::black );
 
     labelDict.setAutoDelete( true );
     layout = new TQVBoxLayout( this, 1, 2 );
@@ -404,7 +404,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name )
 
     m_markCurrentFunction = true;
 
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     setFocusProxy( parent );
 
     reset( -1, -1 );
@@ -533,7 +533,7 @@ void KateArgHint::show()
 bool KateArgHint::eventFilter( TQObject*, TQEvent* e )
 {
     if( isVisible() && e->type() == TQEvent::KeyPress ){
-        TQKeyEvent* ke = TQT_TQKEYEVENT( e );
+        TQKeyEvent* ke = static_cast<TQKeyEvent*>( e );
         if( (ke->state() & ControlButton) && ke->key() == Key_Left ){
             setCurrentFunction( currentFunction() - 1 );
             ke->accept();
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index d2c9ca636..78c68a759 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -46,7 +46,7 @@ class TQVBox;
 
 class KateCodeCompletionCommentLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip",
@@ -66,7 +66,7 @@ class KateCodeCompletionCommentLabel : public TQLabel
 
 class KateCodeCompletion : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateViewInternal;
 
@@ -116,7 +116,7 @@ class KateCodeCompletion : public TQObject
 
 class KateArgHint: public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
       KateArgHint( KateView* =0, const char* =0 );
diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h
index 3f6d18b27..21faeeb0d 100644
--- a/kate/part/katecodefoldinghelpers.h
+++ b/kate/part/katecodefoldinghelpers.h
@@ -117,7 +117,7 @@ class KateCodeFoldingTree : public TQObject
 {
   friend class KateCodeFoldingNode;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCodeFoldingTree (KateBuffer *buffer);
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index c9feae9da..7625af0eb 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -1155,13 +1155,13 @@ void KateRendererConfig::setSchemaInternal( int schema )
 
     // same std colors like in KateDocument::markColor
   TQColor mark[7];
-  mark[0] = Qt::blue;
-  mark[1] = Qt::red;
-  mark[2] = Qt::yellow;
-  mark[3] = Qt::magenta;
-  mark[4] = Qt::gray;
-  mark[5] = Qt::green;
-  mark[6] = Qt::red;
+  mark[0] = TQt::blue;
+  mark[1] = TQt::red;
+  mark[2] = TQt::yellow;
+  mark[3] = TQt::magenta;
+  mark[4] = TQt::gray;
+  mark[5] = TQt::green;
+  mark[6] = TQt::red;
 
   for (int i = 1; i <= KTextEditor::MarkInterface::reservedMarkersCount(); i++) {
     TQColor col = config->readColorEntry(TQString("Color MarkType%1").arg(i), &mark[i - 1]);
diff --git a/kate/part/katecursor.h b/kate/part/katecursor.h
index 85cd5828d..5ab41e13f 100644
--- a/kate/part/katecursor.h
+++ b/kate/part/katecursor.h
@@ -60,7 +60,7 @@ class KateTextCursor
       return stream;
     }
 
-#ifndef Q_WS_WIN //not needed
+#ifndef TQ_WS_WIN //not needed
     friend void tqSwap(KateTextCursor & c1, KateTextCursor & c2) {
       KateTextCursor tmp = c1;
       c1 = c2;
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 08b63eae3..a77ecf8d7 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -117,7 +117,7 @@ KateConfigPage::KateConfigPage ( TQWidget *parent, const char *name )
   : Kate::ConfigPage (parent, name)
   , m_changed (false)
 {
-  connect (this, TQT_SIGNAL(changed()), this, TQT_SLOT(somethingHasChanged ()));
+  connect (this, TQ_SIGNAL(changed()), this, TQ_SLOT(somethingHasChanged ()));
 }
 
 KateConfigPage::~KateConfigPage ()
@@ -179,7 +179,7 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent)
   opt[4] = new TQCheckBox(i18n("&Backspace key indents"), keys);
 
   TQRadioButton *rb1, *rb2, *rb3;
-  m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this );
+  m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this );
   m_tabs->setRadioButtonExclusive( true );
   m_tabs->insert( rb1=new TQRadioButton( i18n("Insert indent &characters"), m_tabs ), 0 );
   m_tabs->insert( rb2=new TQRadioButton( i18n("I&nsert tab character"), m_tabs ), 1 );
@@ -235,27 +235,27 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent)
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(indenterSelected(int)));
+  connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(indenterSelected(int)));
 
-  connect( opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(somethingToggled()));
+  connect( opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(somethingToggled()));
 
-  connect( opt[0], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[1], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[2], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[3], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[4], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[5], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[6], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( opt[7], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
+  connect( opt[0], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[1], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[2], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[3], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[4], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[5], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[6], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( opt[7], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
 
-  connect(indentationWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(indentationWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
-  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()));
 
-  connect(m_configPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(configPage()));
+  connect(m_configPage, TQ_SIGNAL(clicked()), this, TQ_SLOT(configPage()));
 }
 
 void KateIndentConfigTab::somethingToggled() {
@@ -292,7 +292,7 @@ void KateIndentConfigTab::configPage()
     if (!page) return;
     box->setStretchFactor(page, 1);
 
-    connect( &dlg, TQT_SIGNAL(okClicked()), page, TQT_SLOT(apply()) );
+    connect( &dlg, TQ_SIGNAL(okClicked()), page, TQ_SLOT(apply()) );
 
     dlg.resize(400, 300);
     dlg.exec();
@@ -357,26 +357,26 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
 
   opt[0] = new TQCheckBox(i18n("Smart ho&me and smart end"), gbCursor);
   opt[0]->setChecked(configFlags & KateDocumentConfig::cfSmartHome);
-  connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   opt[1] = new TQCheckBox(i18n("Wrap c&ursor"), gbCursor);
   opt[1]->setChecked(configFlags & KateDocumentConfig::cfWrapCursor);
-  connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e6 = new TQCheckBox(i18n("&PageUp/PageDown moves cursor"), gbCursor);
   e6->setChecked(KateDocumentConfig::global()->pageUpDownMovesCursor());
-  connect(e6, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(e6, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e4 = new KIntNumInput(KateViewConfig::global()->autoCenterLines(), gbCursor);
   e4->setRange(0, 1000000, 1, false);
   e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter);
-  connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e4, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   layout->addWidget(gbCursor);
 
   TQRadioButton *rb1, *rb2;
 
-  m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this );
+  m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Selection Mode"), this );
   layout->add (m_tabs);
 
   m_tabs->setRadioButtonExclusive( true );
@@ -416,8 +416,8 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent)
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, 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()));
 }
 
 void KateSelectConfigTab::apply ()
@@ -473,16 +473,16 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent)
 
   opt[3] = new TQCheckBox( i18n("&Insert spaces instead of tabulators"), gbWhiteSpace );
   opt[3]->setChecked( configFlags & KateDocumentConfig::cfReplaceTabsDyn );
-  connect( opt[3], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) );
+  connect( opt[3], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) );
 
   opt[2] = new TQCheckBox(i18n("&Show tabulators"), gbWhiteSpace);
   opt[2]->setChecked(configFlags & flags[2]);
-  connect(opt[2], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[2], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e2 = new KIntNumInput(KateDocumentConfig::global()->tabWidth(), gbWhiteSpace);
   e2->setRange(1, 16, 1, false);
   e2->setLabel(i18n("Tab width:"), AlignVCenter);
-  connect(e2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   mainLayout->addWidget(gbWhiteSpace);
 
@@ -490,35 +490,35 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent)
 
   opt[0] = new TQCheckBox(i18n("Enable static &word wrap"), gbWordWrap);
   opt[0]->setChecked(KateDocumentConfig::global()->wordWrap());
-  connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   m_wwmarker = new TQCheckBox( i18n("&Show static word wrap marker (if applicable)"), gbWordWrap );
   m_wwmarker->setChecked( KateRendererConfig::global()->wordWrapMarker() );
-  connect(m_wwmarker, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(m_wwmarker, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e1 = new KIntNumInput(KateDocumentConfig::global()->wordWrapAt(), gbWordWrap);
   e1->setRange(20, 200, 1, false);
   e1->setLabel(i18n("Wrap words at:"), AlignVCenter);
-  connect(e1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   mainLayout->addWidget(gbWordWrap);
 
   opt[4] = new TQCheckBox( i18n("Remove &trailing spaces"), this );
   mainLayout->addWidget( opt[4] );
   opt[4]->setChecked( configFlags & KateDocumentConfig::cfRemoveTrailingDyn );
-  connect( opt[4], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) );
+  connect( opt[4], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) );
 
   opt[1] = new TQCheckBox(i18n("Auto &brackets"), this);
   mainLayout->addWidget(opt[1]);
   opt[1]->setChecked(configFlags & flags[1]);
-  connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 
   e3 = new KIntNumInput(e2, KateDocumentConfig::global()->undoSteps(), this);
   e3->setRange(0, 1000000, 1, false);
   e3->setSpecialValueText( i18n("Unlimited") );
   e3->setLabel(i18n("Maximum undo steps:"), AlignVCenter);
   mainLayout->addWidget(e3);
-  connect(e3, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
+  connect(e3, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
 
   TQHBoxLayout *e5Layout = new TQHBoxLayout(mainLayout);
   TQLabel *e5Label = new TQLabel(i18n("Smart search t&ext from:"), this);
@@ -532,7 +532,7 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent)
   e5->setCurrentItem(KateViewConfig::global()->textToSearchMode());
   e5Layout->addWidget(e5);
   e5Label->setBuddy(e5);
-  connect(e5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
+  connect(e5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
 
   mainLayout->addStretch();
 
@@ -684,7 +684,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
 
   blay->addWidget(gbBar);
 
-  m_bmSort = new TQButtonGroup( 1, Qt::Horizontal, i18n("Sort Bookmarks Menu"), this );
+  m_bmSort = new TQButtonGroup( 1, TQt::Horizontal, i18n("Sort Bookmarks Menu"), this );
   m_bmSort->setRadioButtonExclusive( true );
   m_bmSort->insert( rb1=new TQRadioButton( i18n("By &position"), m_bmSort ), 0 );
   m_bmSort->insert( rb2=new TQRadioButton( i18n("By c&reation"), m_bmSort ), 1 );
@@ -744,17 +744,17 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent)
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(m_dynwrap, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_dynwrapIndicatorsCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_dynwrapAlignLevel, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_icons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_scrollBarMarks, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_line, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_folding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_collapseTopLevel, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) );
-  connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect(m_showIndentLines, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
+  connect(m_dynwrap, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_dynwrapIndicatorsCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_dynwrapAlignLevel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_icons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_scrollBarMarks, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_line, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_folding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_collapseTopLevel, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) );
+  connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect(m_showIndentLines, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
 }
 
 KateViewDefaultsConfig::~KateViewDefaultsConfig()
@@ -821,7 +821,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * )
     KateView* view = (KateView*)m_doc->views().at(0);
     m_ac = view->editActionCollection();
     m_keyChooser = new KKeyChooser( m_ac, this, false );
-    connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) );
+    connect( m_keyChooser, TQ_SIGNAL( keyChange() ), this, TQ_SLOT( slotChanged() ) );
     m_keyChooser->show ();
 
     m_ready = true;
@@ -895,7 +895,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   dirSearchDepth->setSpecialValueText( i18n("Do not use config file") );
   dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter);
 
-  TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this );
+  TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Backup on Save"), this );
   layout->addWidget( gb );
   cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb );
   cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb );
@@ -947,16 +947,16 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent )
   // after initial reload, connect the stuff for the changed () signal
   //
 
-  connect(m_encoding, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect(m_eol, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged()));
-  connect( allowEolDetection, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect(blockCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
-  connect(removeSpaces, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()));
-  connect( cbLocalFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect( cbRemoteFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) );
-  connect(dirSearchDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged()));
-  connect( leBuPrefix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( leBuSuffix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
+  connect(m_encoding, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect(m_eol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged()));
+  connect( allowEolDetection, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect(blockCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
+  connect(removeSpaces, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()));
+  connect( cbLocalFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect( cbRemoteFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) );
+  connect(dirSearchDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged()));
+  connect( leBuPrefix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( leBuSuffix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 }
 
 void KateSaveConfigTab::apply()
@@ -1130,13 +1130,13 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf
 
   btnConfigure = new TQPushButton( i18n("Configure..."), this );
   btnConfigure->setEnabled( false );
-  grid->addWidget( btnConfigure, 1, 0, Qt::AlignRight );
-  connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) );
+  grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight );
+  connect( btnConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigure()) );
 
-  connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) );
-  connect( listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)),
-    this, TQT_SLOT(slotStateChanged(KatePartPluginListItem *, bool)));
-  connect(listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQT_SLOT(slotChanged()));
+  connect( listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) );
+  connect( listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)),
+    this, TQ_SLOT(slotStateChanged(KatePartPluginListItem *, bool)));
+  connect(listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQ_SLOT(slotChanged()));
 }
 
 KatePartPluginConfigPage::~KatePartPluginConfigPage ()
@@ -1266,8 +1266,8 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl );
   hlCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( hlCombo );
-  connect( hlCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(hlChanged(int)) );
+  connect( hlCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(hlChanged(int)) );
 
   for( int i = 0; i < KateHlManager::self()->highlights(); i++) {
     if (KateHlManager::self()->hlSection(i).length() > 0)
@@ -1276,7 +1276,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
       hlCombo->insertItem(KateHlManager::self()->hlNameTranslated(i));
   }
 
-  TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this );
+  TQGroupBox *gbInfo = new TQGroupBox( 1, TQt::Horizontal, i18n("Information"), this );
   layout->add (gbInfo);
 
   // author
@@ -1290,7 +1290,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   new TQLabel( i18n("License:"), hb2 );
   license  = new TQLabel (hb2);
 
-  TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this );
+  TQGroupBox *gbProps = new TQGroupBox( 1, TQt::Horizontal, i18n("Properties"), this );
   layout->add (gbProps);
 
   // file & mime types
@@ -1312,7 +1312,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
 
   TQToolButton *btnMTW = new TQToolButton(hbMT);
   btnMTW->setIconSet(TQIconSet(SmallIcon("wizard")));
-  connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
+  connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg()));
 
   // download/new buttons
   TQHBox *hbBtns = new TQHBox( this );
@@ -1321,7 +1321,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
   ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm.
   hbBtns->setSpacing( KDialog::spacingHint() );
   TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns);
-  connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) );
+  connect( btnDl, TQ_SIGNAL(clicked()), this, TQ_SLOT(hlDownload()) );
 
   int currentHl = m_doc ? m_doc->hlMode() : 0;
   hlCombo->setCurrentItem( currentHl );
@@ -1347,9 +1347,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc)
 
   layout->addStretch ();
 
-  connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 }
 
 KateHlConfigPage::~KateHlConfigPage ()
@@ -1453,8 +1453,8 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b
   actionButton (User1)->setIconSet(SmallIconSet("ok"));
 
   transferJob = TDEIO::get(KURL(TQString(HLDOWNLOADPATH)), true, true);
-  connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-    this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
+  connect(transferJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+    this, TQ_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &)));
 //        void data( TDEIO::Job *, const TQByteArray &data);
   resize(450, 400);
 }
@@ -1616,7 +1616,7 @@ KateModOnHdPrompt::KateModOnHdPrompt( KateDocument *doc,
     TQPushButton *btnDiff = new TQPushButton( i18n("&View Difference"), w );
     lo2->addStretch( 1 );
     lo2->addWidget( btnDiff );
-    connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) );
+    connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) );
     TQWhatsThis::add( btnDiff, i18n(
         "Calculates the difference between the editor contents and the disk "
         "file using diff(1) and opens the diff file with the default application "
@@ -1639,8 +1639,8 @@ void KateModOnHdPrompt::slotDiff()
   KProcIO *p = new KProcIO();
   p->setComm( TDEProcess::All );
   *p << "diff" << "-u" << "-" <<  m_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 );
 
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index 0f865fcea..b4b4eb137 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -79,7 +79,7 @@ class TQCheckBox;
 
 class KateConfigPage : public Kate::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateConfigPage ( TQWidget *parent=0, const char *name=0 );
@@ -97,7 +97,7 @@ class KateConfigPage : public Kate::ConfigPage
 
 class KateGotoLineDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -112,7 +112,7 @@ class KateGotoLineDialog : public KDialogBase
 
 class KateIndentConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateIndentConfigTab(TQWidget *parent);
@@ -141,7 +141,7 @@ class KateIndentConfigTab : public KateConfigPage
 
 class KateSelectConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSelectConfigTab(TQWidget *parent);
@@ -164,7 +164,7 @@ class KateSelectConfigTab : public KateConfigPage
 
 class KateEditConfigTab : public KateConfigPage
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     KateEditConfigTab(TQWidget *parent);
@@ -189,7 +189,7 @@ class KateEditConfigTab : public KateConfigPage
 
 class KateViewDefaultsConfig : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewDefaultsConfig( TQWidget *parent );
@@ -217,7 +217,7 @@ class KateViewDefaultsConfig : public KateConfigPage
 
 class KateEditKeyConfiguration: public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateEditKeyConfiguration( TQWidget* parent, KateDocument* doc );
@@ -240,7 +240,7 @@ class KateEditKeyConfiguration: public KateConfigPage
 
 class KateSaveConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
   KateSaveConfigTab( TQWidget *parent );
 
@@ -265,7 +265,7 @@ class KatePartPluginListItem;
 
 class KatePartPluginListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KatePartPluginListItem;
 
@@ -282,7 +282,7 @@ class KatePartPluginListView : public TDEListView
 class TQListViewItem;
 class KatePartPluginConfigPage : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePartPluginConfigPage (TQWidget *parent);
@@ -307,7 +307,7 @@ class KatePartPluginConfigPage : public KateConfigPage
 
 class KateHlConfigPage : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateHlConfigPage (TQWidget *parent, KateDocument *doc);
@@ -341,7 +341,7 @@ class KateHlConfigPage : public KateConfigPage
 
 class KateHlDownloadDialog: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateHlDownloadDialog(TQWidget *parent, const char *name, bool modal);
@@ -369,7 +369,7 @@ class TDEProcess;
  */
 class KateModOnHdPrompt : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     enum Status {
       Reload=1, // 0 is KDialogBase::Cancel
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 56e6e1846..4118cb7ef 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -171,7 +171,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   setMarksUserChangable( markType01 );
 
   m_undoMergeTimer = new TQTimer(this);
-  connect(m_undoMergeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(undoCancel()));
+  connect(m_undoMergeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(undoCancel()));
 
   clearMarks ();
   clearUndo ();
@@ -189,24 +189,24 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
   m_indenter->updateConfig ();
 
   // some nice signals from the buffer
-  connect(m_buffer, TQT_SIGNAL(tagLines(int,int)), this, TQT_SLOT(tagLines(int,int)));
-  connect(m_buffer, TQT_SIGNAL(codeFoldingUpdated()),this,TQT_SIGNAL(codeFoldingUpdated()));
+  connect(m_buffer, TQ_SIGNAL(tagLines(int,int)), this, TQ_SLOT(tagLines(int,int)));
+  connect(m_buffer, TQ_SIGNAL(codeFoldingUpdated()),this,TQ_SIGNAL(codeFoldingUpdated()));
 
   // if the user changes the highlight with the dialog, notify the doc
-  connect(KateHlManager::self(),TQT_SIGNAL(changed()),TQT_SLOT(internalHlChanged()));
+  connect(KateHlManager::self(),TQ_SIGNAL(changed()),TQ_SLOT(internalHlChanged()));
 
   // signal for the arbitrary HL
-  connect(m_arbitraryHL, TQT_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQT_SLOT(tagArbitraryLines(KateView*, KateSuperRange*)));
+  connect(m_arbitraryHL, TQ_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQ_SLOT(tagArbitraryLines(KateView*, KateSuperRange*)));
 
   // signals for mod on hd
-  connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(dirty (const TQString &)),
-           this, TQT_SLOT(slotModOnHdDirty (const TQString &)) );
+  connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(dirty (const TQString &)),
+           this, TQ_SLOT(slotModOnHdDirty (const TQString &)) );
 
-  connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(created (const TQString &)),
-           this, TQT_SLOT(slotModOnHdCreated (const TQString &)) );
+  connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(created (const TQString &)),
+           this, TQ_SLOT(slotModOnHdCreated (const TQString &)) );
 
-  connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(deleted (const TQString &)),
-           this, TQT_SLOT(slotModOnHdDeleted (const TQString &)) );
+  connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(deleted (const TQString &)),
+           this, TQ_SLOT(slotModOnHdDeleted (const TQString &)) );
 
   // update doc name
   setDocName ("");
@@ -220,7 +220,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView,
     setWidget( view );
   }
 
-  connect(this,TQT_SIGNAL(sigQueryClose(bool *, bool*)),this,TQT_SLOT(slotQueryClose_save(bool *, bool*)));
+  connect(this,TQ_SIGNAL(sigQueryClose(bool *, bool*)),this,TQ_SLOT(slotQueryClose_save(bool *, bool*)));
 
   m_isasking = 0;
 
@@ -356,9 +356,9 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin)
 KTextEditor::View *KateDocument::createView( TQWidget *parent, const char *name )
 {
   KateView* newView = new KateView( this, parent, name);
-  connect(newView, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(undoCancel()));
+  connect(newView, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(undoCancel()));
   if ( s_fileChangedDialogsActivated )
-    connect( newView, TQT_SIGNAL(gotFocus( Kate::View * )), this, TQT_SLOT(slotModifiedOnDisk()) );
+    connect( newView, TQ_SIGNAL(gotFocus( Kate::View * )), this, TQ_SLOT(slotModifiedOnDisk()) );
   return newView;
 }
 
@@ -1986,7 +1986,7 @@ void KateDocument::configDialog()
                                       KDialogBase::Ok,
                                       kapp->mainWidget() );
 
-#ifndef Q_WS_WIN //TODO: reenable
+#ifndef TQ_WS_WIN //TODO: reenable
   KWin::setIcons( kd->winId(), kapp->icon(), kapp->miniIcon() );
 #endif
 
@@ -2305,11 +2305,11 @@ bool KateDocument::openURL( const KURL &url )
     m_job = TDEIO::get ( url, false, isProgressInfoEnabled() );
 
     // connect to slots
-    connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-           TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           TQ_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) );
 
-    connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
+    connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           TQ_SLOT( slotFinishedKate( TDEIO::Job* ) ) );
 
     TQWidget *w = widget ();
     if (!w && !m_views.isEmpty ())
@@ -4654,7 +4654,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer )
     bool found = false;
     for (TQStringList::size_type i = 0; !found && i < wildcards.size(); ++i)
     {
-      TQRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*TQRegExp::Wildcard*/);
+      TQRegExp wildcard (wildcards[i], true/*TQt::CaseSensitive*/, true/*TQRegExp::Wildcard*/);
 
       found = wildcard.exactMatch (nameOfFile);
     }
@@ -4964,7 +4964,7 @@ bool KateDocument::createDigest( TQCString &result )
     if ( f.open( IO_ReadOnly) )
     {
       KMD5 md5;
-      ret = md5.update( TQT_TQIODEVICE_OBJECT(f) );
+      ret = md5.update( f );
       md5.hexDigest( result );
       f.close();
       ret = true;
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index b417c6d7d..c16a86840 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -84,7 +84,7 @@ class KateDocument : public Kate::Document,
                      public DCOPObject
 {
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateViewInternal;
   friend class KateRenderer;
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index ff4184685..9296773d5 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -31,8 +31,8 @@ KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),
   m_doc (doc)
 {
-  connect( doc, TQT_SIGNAL( selectionChanged() ),
-           this, TQT_SLOT( slotSelectionChanged() ) );
+  connect( doc, TQ_SIGNAL( selectionChanged() ),
+           this, TQ_SLOT( slotSelectionChanged() ) );
   emit enableAction( "print", true );
 }
 
diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h
index b604d47ce..0609f6841 100644
--- a/kate/part/katedocumenthelpers.h
+++ b/kate/part/katedocumenthelpers.h
@@ -35,7 +35,7 @@ class KateDocument;
  */
 class KateBrowserExtension : public KParts::BrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index 51549bda0..56bdfa307 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -27,7 +27,7 @@
 #include "kateschema.h"
 #include "katesearch.h"
 #include "kateconfig.h"
-#ifndef Q_WS_WIN //todo
+#ifndef TQ_WS_WIN //todo
 #include "katejscript.h"
 #endif
 #include "kateluaindentscript.h"
@@ -137,7 +137,7 @@ KateFactory::KateFactory ()
   // vm allocator
   m_vm = new KVMAllocator ();
 
-#ifndef Q_WS_WIN //todo
+#ifndef TQ_WS_WIN //todo
   // create script man (search scripts) + register commands
   m_jscriptManager = new KateJScriptManager ();
   KateCmd::self()->registerCommand (m_jscriptManager);
@@ -251,7 +251,7 @@ void KateFactory::deregisterRenderer ( KateRenderer  *renderer )
 
 KateJScript *KateFactory::jscript ()
 {
-#ifndef Q_WS_WIN //todo
+#ifndef TQ_WS_WIN //todo
   if (m_jscript)
     return m_jscript;
 
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index 974262290..eeecce36a 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -273,16 +273,16 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
   TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl );
   typeCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( typeCombo );
-  connect( typeCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(typeChanged(int)) );
+  connect( typeCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(typeChanged(int)) );
 
   TQPushButton *btnnew = new TQPushButton( i18n("&New"), hbHl );
-  connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newType()) );
+  connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newType()) );
 
   btndel = new TQPushButton( i18n("&Delete"), hbHl );
-  connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) );
+  connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteType()) );
 
-  gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this );
+  gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this );
   layout->add (gbProps);
 
   // file & mime types
@@ -312,7 +312,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
 
   TQToolButton *btnMTW = new TQToolButton(hbMT);
   btnMTW->setIconSet(TQIconSet(SmallIcon("wizard")));
-  connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg()));
+  connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg()));
 
   TQLabel *lprio = new TQLabel( i18n("Prio&rity:"), gbProps);
   priority = new KIntNumInput( gbProps );
@@ -322,12 +322,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent )
 
   reload();
 
-  connect( name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( section, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( varLine, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) );
-  connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) );
+  connect( name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( section, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( varLine, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   TQWhatsThis::add( btnnew, i18n("Create a new file type.") );
   TQWhatsThis::add( btndel, i18n("Delete the current file type.") );
@@ -519,9 +519,9 @@ void KateViewFileTypeAction::init()
   m_doc = 0;
   subMenus.setAutoDelete( true );
 
-  popupMenu()->insertItem ( i18n("None"), this, TQT_SLOT(setType(int)), 0,  0);
+  popupMenu()->insertItem ( i18n("None"), this, TQ_SLOT(setType(int)), 0,  0);
 
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewFileTypeAction::updateMenu (Kate::Document *doc)
@@ -551,12 +551,12 @@ void KateViewFileTypeAction::slotAboutToShow()
 
       int m = subMenusName.findIndex (hlSection);
       names << hlName;
-      subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0,  z+1);
+      subMenus.at(m)->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0,  z+1);
     }
     else if (names.contains(hlName) < 1)
     {
       names << hlName;
-      popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0,  z+1);
+      popupMenu()->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0,  z+1);
     }
   }
 
diff --git a/kate/part/katefiletype.h b/kate/part/katefiletype.h
index 7a927636b..c85682249 100644
--- a/kate/part/katefiletype.h
+++ b/kate/part/katefiletype.h
@@ -78,7 +78,7 @@ class KateFileTypeManager
 
 class KateFileTypeConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateFileTypeConfigTab( TQWidget *parent );
@@ -114,7 +114,7 @@ class KateFileTypeConfigTab : public KateConfigPage
 
 class KateViewFileTypeAction : public Kate::ActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewFileTypeAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index 66991ca8f..1f432468d 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -1289,7 +1289,7 @@ void KateHighlighting::generateContextStack(int *ctxNum, int ctx, TQMemArray<sho
  */
 int KateHighlighting::makeDynamicContext(KateHlContext *model, const TQStringList *args)
 {
-  QPair<KateHlContext *, TQString> key(model, args->front());
+  TQPair<KateHlContext *, TQString> key(model, args->front());
   short value;
 
   if (dynamicCtxs.contains(key))
@@ -1694,7 +1694,7 @@ void KateHighlighting::getKateHlItemDataList (uint schema, KateHlItemDataList &l
 
       TQString tmp=s[0]; if (!tmp.isEmpty()) p->defStyleNum=tmp.toInt();
 
-      QRgb col;
+      TQRgb col;
 
       tmp=s[1]; if (!tmp.isEmpty()) {
          col=tmp.toUInt(0,16); p->setTextColor(col); }
@@ -3193,79 +3193,79 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
   list.setAutoDelete(true);
 
   KateAttribute* normal = new KateAttribute();
-  normal->setTextColor(Qt::black);
-  normal->setSelectedTextColor(Qt::white);
+  normal->setTextColor(TQt::black);
+  normal->setSelectedTextColor(TQt::white);
   list.append(normal);
 
   KateAttribute* keyword = new KateAttribute();
-  keyword->setTextColor(Qt::black);
-  keyword->setSelectedTextColor(Qt::white);
+  keyword->setTextColor(TQt::black);
+  keyword->setSelectedTextColor(TQt::white);
   keyword->setBold(true);
   list.append(keyword);
 
   KateAttribute* dataType = new KateAttribute();
-  dataType->setTextColor(Qt::darkRed);
-  dataType->setSelectedTextColor(Qt::white);
+  dataType->setTextColor(TQt::darkRed);
+  dataType->setSelectedTextColor(TQt::white);
   list.append(dataType);
 
   KateAttribute* decimal = new KateAttribute();
-  decimal->setTextColor(Qt::blue);
-  decimal->setSelectedTextColor(Qt::cyan);
+  decimal->setTextColor(TQt::blue);
+  decimal->setSelectedTextColor(TQt::cyan);
   list.append(decimal);
 
   KateAttribute* basen = new KateAttribute();
-  basen->setTextColor(Qt::darkCyan);
-  basen->setSelectedTextColor(Qt::cyan);
+  basen->setTextColor(TQt::darkCyan);
+  basen->setSelectedTextColor(TQt::cyan);
   list.append(basen);
 
   KateAttribute* floatAttribute = new KateAttribute();
-  floatAttribute->setTextColor(Qt::darkMagenta);
-  floatAttribute->setSelectedTextColor(Qt::cyan);
+  floatAttribute->setTextColor(TQt::darkMagenta);
+  floatAttribute->setSelectedTextColor(TQt::cyan);
   list.append(floatAttribute);
 
   KateAttribute* charAttribute = new KateAttribute();
-  charAttribute->setTextColor(Qt::magenta);
-  charAttribute->setSelectedTextColor(Qt::magenta);
+  charAttribute->setTextColor(TQt::magenta);
+  charAttribute->setSelectedTextColor(TQt::magenta);
   list.append(charAttribute);
 
   KateAttribute* string = new KateAttribute();
   string->setTextColor(TQColor("#D00"));
-  string->setSelectedTextColor(Qt::red);
+  string->setSelectedTextColor(TQt::red);
   list.append(string);
 
   KateAttribute* comment = new KateAttribute();
-  comment->setTextColor(Qt::darkGray);
-  comment->setSelectedTextColor(Qt::gray);
+  comment->setTextColor(TQt::darkGray);
+  comment->setSelectedTextColor(TQt::gray);
   comment->setItalic(true);
   list.append(comment);
 
   KateAttribute* others = new KateAttribute();
-  others->setTextColor(Qt::darkGreen);
-  others->setSelectedTextColor(Qt::green);
+  others->setTextColor(TQt::darkGreen);
+  others->setSelectedTextColor(TQt::green);
   list.append(others);
 
   KateAttribute* alert = new KateAttribute();
-  alert->setTextColor(Qt::black);
+  alert->setTextColor(TQt::black);
   alert->setSelectedTextColor( TQColor("#FCC") );
   alert->setBold(true);
   alert->setBGColor( TQColor("#FCC") );
   list.append(alert);
 
   KateAttribute* functionAttribute = new KateAttribute();
-  functionAttribute->setTextColor(Qt::darkBlue);
-  functionAttribute->setSelectedTextColor(Qt::white);
+  functionAttribute->setTextColor(TQt::darkBlue);
+  functionAttribute->setSelectedTextColor(TQt::white);
   list.append(functionAttribute);
 
   KateAttribute* regionmarker = new KateAttribute();
-  regionmarker->setTextColor(Qt::white);
-  regionmarker->setBGColor(Qt::gray);
-  regionmarker->setSelectedTextColor(Qt::gray);
+  regionmarker->setTextColor(TQt::white);
+  regionmarker->setBGColor(TQt::gray);
+  regionmarker->setSelectedTextColor(TQt::gray);
   list.append(regionmarker);
 
   KateAttribute* error = new KateAttribute();
-  error->setTextColor(Qt::red);
+  error->setTextColor(TQt::red);
   error->setUnderline(true);
-  error->setSelectedTextColor(Qt::red);
+  error->setSelectedTextColor(TQt::red);
   list.append(error);
 
   TDEConfig *config = KateHlManager::self()->self()->getTDEConfig();
@@ -3281,7 +3281,7 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list)
         s << "";
 
       TQString tmp;
-      QRgb col;
+      TQRgb col;
 
       tmp=s[0]; if (!tmp.isEmpty()) {
          col=tmp.toUInt(0,16); i->setTextColor(col); }
@@ -3405,7 +3405,7 @@ void KateViewHighlightAction::init()
   m_doc = 0;
   subMenus.setAutoDelete( true );
 
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewHighlightAction::updateMenu (Kate::Document *doc)
@@ -3437,12 +3437,12 @@ void KateViewHighlightAction::slotAboutToShow()
 
         int m = subMenusName.findIndex (hlSection);
         names << hlName;
-        subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0,  z);
+        subMenus.at(m)->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0,  z);
       }
       else if (names.contains(hlName) < 1)
       {
         names << hlName;
-        popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0,  z);
+        popupMenu()->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0,  z);
       }
     }
   }
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index 207d9a245..caad80a90 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -251,7 +251,7 @@ class KateHighlighting
     TQValueVector<KateHlContext*> m_contexts;
     inline KateHlContext *contextNum (uint n) { if (n < m_contexts.size()) return m_contexts[n]; return 0; }
 
-    TQMap< QPair<KateHlContext *, TQString>, short> dynamicCtxs;
+    TQMap< TQPair<KateHlContext *, TQString>, short> dynamicCtxs;
 
     // make them pointers perhaps
     KateEmbeddedHlInfos embeddedHls;
@@ -340,7 +340,7 @@ class KateHighlighting
 
 class KateHlManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   private:
     KateHlManager();
@@ -408,7 +408,7 @@ class KateHlManager : public TQObject
 
 class KateViewHighlightAction: public Kate::ActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewHighlightAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index a5361f662..5fd486002 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -153,7 +153,7 @@ static int katelua_document_insertText(lua_State *L) {
       lua_error(L);
   }
   if ((!lua_isnumber(L,1)) || (!lua_isnumber(L,2))  ||(!lua_isstring(L,3)) )  {
-      lua_pushstring(L,i18n("document.removeText:Three parameters needed (line,col,text) (number,number,string)").utf8().data());
+      lua_pushstring(L,i18n("document.insertText:Three parameters needed (line,col,text) (number,number,string)").utf8().data());
       lua_error(L);
   }
   lua_pushboolean(L,katelua_doc->insertText((uint)lua_tonumber(L,1),(uint)lua_tonumber(L,2),TQString::fromUtf8(lua_tostring(L,3))));
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index a7bf324e8..a4fdd3627 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -57,7 +57,7 @@
 //BEGIN KatePrinter
 bool KatePrinter::print (KateDocument *doc)
 {
-#ifndef Q_WS_WIN //TODO: reenable
+#ifndef TQ_WS_WIN //TODO: reenable
   KPrinter printer;
 
   // docname is now always there, including the right Untitled name
@@ -192,9 +192,9 @@ bool KatePrinter::print (KateDocument *doc)
 
          tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false);
          tags["D"] =  TDEGlobal::locale()->formatDateTime(dt, false, false);
-         tags["h"] =  TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false);
-         tags["y"] =  TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true);
-         tags["Y"] =  TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false);
+         tags["h"] =  TDEGlobal::locale()->formatTime(dt.time(), false);
+         tags["y"] =  TDEGlobal::locale()->formatDate(dt.date(), true);
+         tags["Y"] =  TDEGlobal::locale()->formatDate(dt.date(), false);
          tags["f"] =  doc->url().fileName();
          tags["U"] =  doc->url().prettyURL();
          if ( selectionOnly )
@@ -228,9 +228,9 @@ bool KatePrinter::print (KateDocument *doc)
            headerTagList = TQStringList::split('|', headerTags, true);
 
            if (!headerBgColor.isValid())
-             headerBgColor = Qt::lightGray;
+             headerBgColor = TQt::lightGray;
            if (!headerFgColor.isValid())
-             headerFgColor = Qt::black;
+             headerFgColor = TQt::black;
          }
 
          if (useFooter)
@@ -255,9 +255,9 @@ bool KatePrinter::print (KateDocument *doc)
 
            footerTagList = TQStringList::split('|', footerTags, true);
            if (!footerBgColor.isValid())
-             footerBgColor = Qt::lightGray;
+             footerBgColor = TQt::lightGray;
            if (!footerFgColor.isValid())
-             footerFgColor = Qt::black;
+             footerFgColor = TQt::black;
            // adjust maxheight, so we can know when/where to print footer
            maxHeight -= footerHeight;
          }
@@ -275,7 +275,7 @@ bool KatePrinter::print (KateDocument *doc)
        if ( useBox )
        {
          if (!boxColor.isValid())
-           boxColor = Qt::black;
+           boxColor = TQt::black;
          if (boxWidth < 1) // shouldn't be pssible no more!
            boxWidth = 1;
          // set maxwidth to something sensible
@@ -307,7 +307,7 @@ bool KatePrinter::print (KateDocument *doc)
 
          // get a title and add the height required to draw it
          TQString _title = i18n("Typographical Conventions for %1").arg(doc->highlight()->name());
-         guideHeight += paint.boundingRect( 0, 0, _w, 1000, Qt::AlignTop|Qt::AlignHCenter, _title ).height();
+         guideHeight += paint.boundingRect( 0, 0, _w, 1000, TQt::AlignTop|TQt::AlignHCenter, _title ).height();
 
          // see how many columns we can fit in
          int _widest( 0 );
@@ -417,8 +417,8 @@ bool KatePrinter::print (KateDocument *doc)
              if (headerTagList.count() == 3)
              {
                int valign = ( (useBox||headerDrawBg||useBackground) ?
-                              Qt::AlignVCenter : Qt::AlignTop );
-               int align = valign|Qt::AlignLeft;
+                              TQt::AlignVCenter : TQt::AlignTop );
+               int align = valign|TQt::AlignLeft;
                int marg = ( useBox || headerDrawBg ) ? innerMargin : 0;
                if ( useBox ) marg += boxWidth;
                TQString s;
@@ -427,7 +427,7 @@ bool KatePrinter::print (KateDocument *doc)
                  s = headerTagList[i];
                  if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
                  paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s);
-                 align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight);
+                 align = valign|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight);
                }
              }
              if ( ! ( headerDrawBg || useBox || useBackground ) ) // draw a 1 px (!?) line to separate header from contents
@@ -446,7 +446,7 @@ bool KatePrinter::print (KateDocument *doc)
                 paint.fillRect(0, maxHeight+innerMargin+boxWidth, headerWidth, footerHeight, footerBgColor);
              if (footerTagList.count() == 3)
              {
-               int align = Qt::AlignVCenter|Qt::AlignLeft;
+               int align = TQt::AlignVCenter|TQt::AlignLeft;
                int marg = ( useBox || footerDrawBg ) ? innerMargin : 0;
                if ( useBox ) marg += boxWidth;
                TQString s;
@@ -455,7 +455,7 @@ bool KatePrinter::print (KateDocument *doc)
                  s = footerTagList[i];
                  if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage));
                  paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s);
-                 align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight);
+                 align = TQt::AlignVCenter|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight);
                }
              }
            } // done footer
@@ -524,7 +524,7 @@ bool KatePrinter::print (KateDocument *doc)
              paint.setFont( renderer.config()->fontStruct()->myFontBold );
              TQRect _r;
              paint.drawText( _marg, y, pdmWidth-(2*_marg), maxHeight - y,
-                Qt::AlignTop|Qt::AlignHCenter,
+                TQt::AlignTop|TQt::AlignHCenter,
                 i18n("Typographical Conventions for %1").arg(doc->highlight()->name()), -1, &_r );
              int _w = pdmWidth - (_marg*2) - (innerMargin*2);
              int _x = _marg + innerMargin;
@@ -543,7 +543,7 @@ bool KatePrinter::print (KateDocument *doc)
                paint.setPen( renderer.attribute(_i)->textColor() );
                paint.setFont( renderer.attribute(_i)->font( *renderer.currentFont() ) );
                paint.drawText(( _x + ((_i%guideCols)*_cw)), y, _cw, renderer.fontHeight(),
-                        Qt::AlignVCenter|Qt::AlignLeft, _d->name, -1, &_r );
+                        TQt::AlignVCenter|TQt::AlignLeft, _d->name, -1, &_r );
                _i++;
                if ( _i && ! ( _i%guideCols ) ) y += renderer.fontHeight();
                ++_it;
@@ -561,7 +561,7 @@ bool KatePrinter::print (KateDocument *doc)
            paint.setPen( renderer.config()->lineNumberColor() );
            paint.drawText( (( useBox || useBackground ) ? innerMargin : 0), y,
                         lineNumberWidth, renderer.fontHeight(),
-                        Qt::AlignRight, TQString("%1").arg( lineCount + 1 ) );
+                        TQt::AlignRight, TQString("%1").arg( lineCount + 1 ) );
          }
          endCol = renderer.textWidth(doc->kateTextLine(lineCount), startCol, maxWidth, &needWrap);
 
@@ -626,12 +626,12 @@ bool KatePrinter::print (KateDocument *doc)
      return true;
   }
 
-#endif //!Q_WS_WIN
+#endif //!TQ_WS_WIN
   return false;
 }
 //END KatePrinter
 
-#ifndef Q_WS_WIN //TODO: reenable
+#ifndef TQ_WS_WIN //TODO: reenable
 //BEGIN KatePrintTextSettings
 KatePrintTextSettings::KatePrintTextSettings( KPrinter * /*printer*/, TQWidget *parent, const char *name )
   : KPrintDialogPage( parent, name )
@@ -719,9 +719,9 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
   lo2->setStretchFactor( lFontPreview, 1 );
   TQPushButton *btnChooseFont = new TQPushButton( i18n("Choo&se Font..."), this );
   lo2->addWidget( btnChooseFont );
-  connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) );
+  connect( btnChooseFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHFFont()) );
   // header
-  gbHeader = new TQGroupBox( 2, Qt::Horizontal, i18n("Header Properties"), this );
+  gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this );
   lo->addWidget( gbHeader );
 
   TQLabel *lHeaderFormat = new TQLabel( i18n("&Format:"), gbHeader );
@@ -740,7 +740,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
   cbHeaderEnableBgColor = new TQCheckBox( i18n("Bac&kground"), hbHeaderColors );
   kcbtnHeaderBg = new KColorButton( hbHeaderColors );
 
-  gbFooter = new TQGroupBox( 2, Qt::Horizontal, i18n("Footer Properties"), this );
+  gbFooter = new TQGroupBox( 2, TQt::Horizontal, i18n("Footer Properties"), this );
   lo->addWidget( gbFooter );
 
   // footer
@@ -764,10 +764,10 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget *
   lo->addStretch( 1 );
 
   // user friendly
-  connect( cbEnableHeader, TQT_SIGNAL(toggled(bool)), gbHeader, TQT_SLOT(setEnabled(bool)) );
-  connect( cbEnableFooter, TQT_SIGNAL(toggled(bool)), gbFooter, TQT_SLOT(setEnabled(bool)) );
-  connect( cbHeaderEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQT_SLOT(setEnabled(bool)) );
-  connect( cbFooterEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnFooterBg, TQT_SLOT(setEnabled(bool)) );
+  connect( cbEnableHeader, TQ_SIGNAL(toggled(bool)), gbHeader, TQ_SLOT(setEnabled(bool)) );
+  connect( cbEnableFooter, TQ_SIGNAL(toggled(bool)), gbFooter, TQ_SLOT(setEnabled(bool)) );
+  connect( cbHeaderEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQ_SLOT(setEnabled(bool)) );
+  connect( cbFooterEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnFooterBg, TQ_SLOT(setEnabled(bool)) );
 
   // set defaults
   cbEnableHeader->setChecked( true );
@@ -922,7 +922,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons
   cbEnableBox = new TQCheckBox( i18n("Draw &boxes"), this );
   lo->addWidget( cbEnableBox );
 
-  gbBoxProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Box Properties"), this );
+  gbBoxProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Box Properties"), this );
   lo->addWidget( gbBoxProps );
 
   TQLabel *lBoxWidth = new TQLabel( i18n("W&idth:"), gbBoxProps );
@@ -937,7 +937,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons
   kcbtnBoxColor = new KColorButton( gbBoxProps );
   lBoxColor->setBuddy( kcbtnBoxColor );
 
-  connect( cbEnableBox, TQT_SIGNAL(toggled(bool)), gbBoxProps, TQT_SLOT(setEnabled(bool)) );
+  connect( cbEnableBox, TQ_SIGNAL(toggled(bool)), gbBoxProps, TQ_SLOT(setEnabled(bool)) );
 
   lo->addStretch( 1 );
   // set defaults:
@@ -1000,4 +1000,4 @@ void KatePrintLayout::setOptions( const TQMap<TQString,TQString>& opts )
 //END KatePrintLayout
 
 #include "kateprinter.moc"
-#endif //!Q_WS_WIN
+#endif //!TQ_WS_WIN
diff --git a/kate/part/kateprinter.h b/kate/part/kateprinter.h
index 283c2b58e..ef0040eac 100644
--- a/kate/part/kateprinter.h
+++ b/kate/part/kateprinter.h
@@ -40,7 +40,7 @@ class KatePrinter
     static bool print (KateDocument *doc);
 };
 
-#ifndef Q_WS_WIN //TODO: reenable
+#ifndef TQ_WS_WIN //TODO: reenable
 //BEGIN Text settings
 /*
   Text settings page:
@@ -50,7 +50,7 @@ class KatePrinter
 */
 class KatePrintTextSettings : public KPrintDialogPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KatePrintTextSettings( KPrinter *printer, TQWidget *parent=0, const char *name=0 );
     ~KatePrintTextSettings(){};
@@ -77,7 +77,7 @@ class KatePrintTextSettings : public KPrintDialogPage
 
 class KatePrintHeaderFooter : public KPrintDialogPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KatePrintHeaderFooter( KPrinter *printer, TQWidget *parent=0, const char *name=0 );
     ~KatePrintHeaderFooter(){};
@@ -115,7 +115,7 @@ class KatePrintHeaderFooter : public KPrintDialogPage
 */
 class KatePrintLayout : public KPrintDialogPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KatePrintLayout( KPrinter *printer, TQWidget *parent=0, const char *name=0 );
     ~KatePrintLayout(){};
@@ -131,6 +131,6 @@ class KatePrintLayout : public KPrintDialogPage
     KColorButton* kcbtnBoxColor;
 };
 //END Layout
-#endif //!Q_WS_WIN
+#endif //!TQ_WS_WIN
 
 #endif
diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp
index a6c524f73..67afb4bd6 100644
--- a/kate/part/katerenderer.cpp
+++ b/kate/part/katerenderer.cpp
@@ -352,7 +352,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i
 
   // Draws the dashed underline at the start of a folded block of text.
   if (range->startsInvisibleBlock) {
-    paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, Qt::DashLine));
+    paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, TQt::DashLine));
     paint.drawLine(0, fs->fontHeight - 1, xEnd - xStart, fs->fontHeight - 1);
   }
 
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index a42664dc0..6716d079d 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -310,7 +310,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   m_combobox->insertItem(i18n("Error"));               // markType07
   m_combobox->setCurrentItem(0);
   m_markers = new KColorButton(b, "marker_color_button");
-  connect( m_combobox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboBoxChanged( int ) ) );
+  connect( m_combobox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboBoxChanged( int ) ) );
 
   blay->addWidget(gbTextArea);
 
@@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char
   blay->addStretch();
 
   // connect signal changed(); changed is emitted by a ColorButton change!
-  connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) );
+  connect( this, TQ_SIGNAL( changed() ), parent->parentWidget(), TQ_SLOT( slotChanged() ) );
 
   // TQWhatsThis help
   TQWhatsThis::add(m_back, i18n("<p>Sets the background color of the editing area.</p>"));
@@ -405,15 +405,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
   m_schema = newSchema;
 
   // first disconnect all signals otherwise setColor emits changed
-  m_back      ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_selected  ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_current   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_bracket   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_wwmarker  ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_iconborder->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_tmarker   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_markers   ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
-  m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) );
+  m_back      ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_selected  ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_current   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_bracket   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_wwmarker  ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_iconborder->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_tmarker   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_markers   ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
+  m_linenumber->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) );
 
   // If we havent this schema, read in from config file
   if ( ! m_schemas.contains( newSchema ) )
@@ -431,13 +431,13 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
     // same std colors like in KateDocument::markColor
     TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount());
     Q_ASSERT(mark.size() > 6);
-    mark[0] = Qt::blue;
-    mark[1] = Qt::red;
-    mark[2] = Qt::yellow;
-    mark[3] = Qt::magenta;
-    mark[4] = Qt::gray;
-    mark[5] = Qt::green;
-    mark[6] = Qt::red;
+    mark[0] = TQt::blue;
+    mark[1] = TQt::red;
+    mark[2] = TQt::yellow;
+    mark[3] = TQt::magenta;
+    mark[4] = TQt::gray;
+    mark[5] = TQt::green;
+    mark[6] = TQt::red;
 
     SchemaColors c;
     TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema);
@@ -475,15 +475,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema )
   }
   m_markers->setColor(  m_schemas [ newSchema ].markerColors[ m_combobox->currentItem() ] );
 
-  connect( m_back      , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_selected  , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_current   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_bracket   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_wwmarker  , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_iconborder, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_tmarker   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_linenumber, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) );
-  connect( m_markers   , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
+  connect( m_back      , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_selected  , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_current   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_bracket   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_wwmarker  , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_iconborder, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_tmarker   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_linenumber, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) );
+  connect( m_markers   , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
 }
 
 void KateSchemaConfigColorTab::apply ()
@@ -527,9 +527,9 @@ void KateSchemaConfigColorTab::slotMarkerColorChanged( const TQColor& color)
 void KateSchemaConfigColorTab::slotComboBoxChanged(int index)
 {
   // temporarily disconnect the changed-signal because setColor emits changed as well
-  m_markers->disconnect( TQT_SIGNAL( changed( const TQColor& ) ) );
+  m_markers->disconnect( TQ_SIGNAL( changed( const TQColor& ) ) );
   m_markers->setColor( m_schemas[m_schema].markerColors[index] );
-  connect( m_markers, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
+  connect( m_markers, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) );
 }
 
 //END KateSchemaConfigColorTab
@@ -542,10 +542,9 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char *
   TQGridLayout *grid = new TQGridLayout( this, 1, 1 );
 
   m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false );
-  m_fontchooser->enableColumn(TDEFontChooser::StyleList, false);
   grid->addWidget( m_fontchooser, 0, 0);
 
-  connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+  connect (this, TQ_SIGNAL( changed()), parent->parentWidget(), TQ_SLOT (slotChanged()));
   m_schema = -1;
 }
 
@@ -583,7 +582,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema )
   m_fontchooser->disconnect ( this );
   m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) );
   m_fonts[ newSchema ] = m_fontchooser->font();
-  connect (m_fontchooser, TQT_SIGNAL (fontSelected( const TQFont & )), this, TQT_SLOT (slotFontSelected( const TQFont & )));
+  connect (m_fontchooser, TQ_SIGNAL (fontSelected( const TQFont & )), this, TQ_SLOT (slotFontSelected( const TQFont & )));
 }
 //END FontConfig
 
@@ -599,7 +598,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co
   m_defaultStyles = new KateStyleListView( this, false );
   grid->addWidget( m_defaultStyles, 0, 0);
 
-  connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+  connect (m_defaultStyles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged()));
 
   TQWhatsThis::add( m_defaultStyles,  i18n(
       "This list displays the default styles for the current schema and "
@@ -689,8 +688,8 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
   TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl );
   hlCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( hlCombo );
-  connect( hlCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(hlChanged(int)) );
+  connect( hlCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(hlChanged(int)) );
 
   for( int i = 0; i < KateHlManager::self()->highlights(); i++) {
     if (KateHlManager::self()->hlSection(i).length() > 0)
@@ -716,7 +715,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co
     "to edit from the popup menu.<p>You can unset the Background and Selected "
     "Background colors from the context menu when appropriate.") );
 
-  connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged()));
+  connect (m_styles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged()));
 }
 
 KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab()
@@ -834,20 +833,20 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
   TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl );
   schemaCombo = new TQComboBox( false, hbHl );
   lHl->setBuddy( schemaCombo );
-  connect( schemaCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(schemaChanged(int)) );
+  connect( schemaCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(schemaChanged(int)) );
 
   TQPushButton *btnnew = new TQPushButton( i18n("&New..."), hbHl );
-  connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newSchema()) );
+  connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newSchema()) );
 
   btndel = new TQPushButton( i18n("&Delete"), hbHl );
-  connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSchema()) );
+  connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSchema()) );
 
   m_tabWidget = new TQTabWidget ( this );
   m_tabWidget->setMargin (KDialog::marginHint());
   layout->add (m_tabWidget);
 
-  connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *)));
+  connect (m_tabWidget, TQ_SIGNAL (currentChanged (TQWidget *)), this, TQ_SLOT (newCurrentPage (TQWidget *)));
 
   m_colorTab = new KateSchemaConfigColorTab (m_tabWidget);
   m_tabWidget->addTab (m_colorTab, i18n("Colors"));
@@ -874,8 +873,8 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc
 
   reload();
 
-  connect( defaultSchemaCombo, TQT_SIGNAL(activated(int)),
-           this, TQT_SLOT(slotChanged()) );
+  connect( defaultSchemaCombo, TQ_SIGNAL(activated(int)),
+           this, TQ_SLOT(slotChanged()) );
 }
 
 KateSchemaConfigPage::~KateSchemaConfigPage ()
@@ -1004,7 +1003,7 @@ void KateViewSchemaAction::init()
   m_view = 0;
   last = 0;
 
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewSchemaAction::updateMenu (KateView *view)
@@ -1024,7 +1023,7 @@ void KateViewSchemaAction::slotAboutToShow()
     if (names.contains(hlName) < 1)
     {
       names << hlName;
-      popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0,  z+1);
+      popupMenu()->insertItem ( hlName, this, TQ_SLOT(setSchema(int)), 0,  z+1);
     }
   }
 
@@ -1061,10 +1060,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults )
   addColumn( i18n("Background Selected") );
   if ( showUseDefaults )
     addColumn( i18n("Use Default Style") );
-  connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
-           this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
-  connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
-           this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
+  connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)),
+           this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) );
+  connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)),
+           this, TQ_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) );
   // grap the bg color, selected color and default font
   normalcol = TDEGlobalSettings::textColor();
   bgcol = KateRendererConfig::global()->backgroundColor();
@@ -1094,21 +1093,21 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
 
   if ( showtitle )
     m.insertTitle( i->contextName(), KateStyleListItem::ContextName );
-  id = m.insertItem( i18n("&Bold"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold );
+  id = m.insertItem( i18n("&Bold"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold );
   m.setItemChecked( id, is->bold() );
-  id = m.insertItem( i18n("&Italic"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic );
+  id = m.insertItem( i18n("&Italic"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic );
   m.setItemChecked( id, is->italic() );
-  id = m.insertItem( i18n("&Underline"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline );
+  id = m.insertItem( i18n("&Underline"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline );
   m.setItemChecked( id, is->underline() );
-  id = m.insertItem( i18n("S&trikeout"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout );
+  id = m.insertItem( i18n("S&trikeout"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout );
   m.setItemChecked( id, is->strikeOut() );
 
   m.insertSeparator();
 
-  m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color );
-  m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor );
-  m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor );
-  m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor );
+  m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color );
+  m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor );
+  m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor );
+  m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor );
 
   // Unset [some] colors. I could show one only if that button was clicked, but that
   // would disable setting this with the keyboard (how many aren't doing just
@@ -1119,14 +1118,14 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob
   {
     m.insertSeparator();
     if ( style->itemSet( KateAttribute::BGColor) )
-      m.insertItem( i18n("Unset Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 100 );
+      m.insertItem( i18n("Unset Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 100 );
     if ( style->itemSet( KateAttribute::SelectedBGColor ) )
-      m.insertItem( i18n("Unset Selected Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 101 );
+      m.insertItem( i18n("Unset Selected Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 101 );
   }
 
   if ( ! i->isDefault() && ! i->defStyle() ) {
     m.insertSeparator();
-    id = m.insertItem( i18n("Use &Default Style"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle );
+    id = m.insertItem( i18n("Use &Default Style"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle );
     m.setItemChecked( id, i->defStyle() );
   }
   m.exec( globalPos );
@@ -1154,7 +1153,7 @@ void KateStyleListView::unsetColor( int c )
 void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c)
 {
   if ( dynamic_cast<KateStyleListItem*>(i) ) {
-     if ( btn == Qt::LeftButton && c > 0 ) {
+     if ( btn == TQt::LeftButton && c > 0 ) {
       // map pos to item/column and call KateStyleListItem::activate(col, pos)
       ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) );
     }
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index cf503be68..63cc210b5 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -92,7 +92,7 @@ class KateSchemaManager
 
 class KateViewSchemaAction : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
@@ -127,7 +127,7 @@ class KateViewSchemaAction : public TDEActionMenu
 */
 class KateStyleListView : public TQListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateStyleListItem;
 
@@ -162,7 +162,7 @@ class KateStyleListView : public TQListView
 
 class KateSchemaConfigColorTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigColorTab( TQWidget *parent = 0, const char *name = 0 );
@@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget
     void schemaChanged( int newSchema );
 
   signals:
-    void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
+    void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged)
 
   protected slots:
     void slotMarkerColorChanged(const TQColor&);
@@ -209,7 +209,7 @@ typedef TQMap<int,TQFont> FontMap; // ### remove it
 
 class KateSchemaConfigFontTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigFontTab( TQWidget *parent = 0, const char *name = 0 );
@@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget
     void schemaChanged( int newSchema );
 
   signals:
-    void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged)
+    void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged)
 
   private:
     class TDEFontChooser *m_fontchooser;
@@ -236,7 +236,7 @@ class KateSchemaConfigFontTab : public TQWidget
 
 class KateSchemaConfigFontColorTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigFontColorTab( TQWidget *parent = 0, const char *name = 0 );
@@ -256,7 +256,7 @@ class KateSchemaConfigFontColorTab : public TQWidget
 
 class KateSchemaConfigHighlightTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigHighlightTab( TQWidget *parent = 0, const char *name = 0, KateSchemaConfigFontColorTab *page = 0, uint hl = 0 );
@@ -284,7 +284,7 @@ class KateSchemaConfigHighlightTab : public TQWidget
 
 class KateSchemaConfigPage : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigPage ( TQWidget *parent, class KateDocument *doc=0 );
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index a02bbef71..b76af856b 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -58,7 +58,7 @@ KateSearch::KateSearch( KateView* view )
   m_arbitraryHLList = new KateSuperRangeList();
   if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view);
 
-  connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot()));
+  connect(replacePrompt,TQ_SIGNAL(clicked()),this,TQ_SLOT(replaceSlot()));
 }
 
 KateSearch::~KateSearch()
@@ -68,13 +68,13 @@ KateSearch::~KateSearch()
 
 void KateSearch::createActions( TDEActionCollection* ac )
 {
-  KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis(
+  KStdAction::find( this, TQ_SLOT(find()), ac )->setWhatsThis(
     i18n("Look up the first occurrence of a piece of text or regular expression."));
-  KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis(
+  KStdAction::findNext( this, TQ_SLOT(slotFindNext()), ac )->setWhatsThis(
     i18n("Look up the next occurrence of the search phrase."));
-  KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis(
+  KStdAction::findPrev( this, TQ_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis(
     i18n("Look up the previous occurrence of the search phrase."));
-  KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis(
+  KStdAction::replace( this, TQ_SLOT(replace()), ac )->setWhatsThis(
     i18n("Look up a piece of text or regular expression and replace the result with some given text."));
 }
 
@@ -729,10 +729,10 @@ bool KateSearch::doSearch( const TQString& text )
   if (arbitraryHLExample)  {
     KateArbitraryHighlightRange* hl = new KateArbitraryHighlightRange(new KateSuperCursor(m_doc, true, s.cursor), new KateSuperCursor(m_doc, true, s.cursor.line(), s.cursor.col() + s.matchedLength), this);
     hl->setBold();
-    hl->setTextColor(Qt::white);
-    hl->setBGColor(Qt::black);
+    hl->setTextColor(TQt::white);
+    hl->setBGColor(TQt::black);
     // destroy the highlight upon change
-    connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated()));
+    connect(hl, TQ_SIGNAL(contentsChanged()), hl, TQ_SIGNAL(eliminated()));
     m_arbitraryHLList->append(hl);
   }
 
diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h
index 139cd3ff9..7ff798325 100644
--- a/kate/part/katesearch.h
+++ b/kate/part/katesearch.h
@@ -41,7 +41,7 @@ class TDEActionCollection;
 
 class KateSearch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateDocument;
 
@@ -167,7 +167,7 @@ class KateSearch : public TQObject
  */
 class KateReplacePrompt : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index 84b4337d9..e19f4fb94 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -53,11 +53,11 @@ KateSpell::~KateSpell()
 
 void KateSpell::createActions( TDEActionCollection* ac )
 {
-   KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac );
-   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
+   KStdAction::spelling( this, TQ_SLOT(spellcheck()), ac );
+   TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" );
    a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward"));
 
-   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
+   m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" );
    m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text"));
 }
 
@@ -123,17 +123,17 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to
     kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<<enc<<" and KSpell::Type "<<type<<" (for '"<<mt<<"')"<<endl;
 
   m_tdespell = new KSpell( m_view, i18n("Spellcheck"),
-                         this, TQT_SLOT(ready(KSpell *)), ksc, true, true, type );
+                         this, TQ_SLOT(ready(KSpell *)), ksc, true, true, type );
 
-  connect( m_tdespell, TQT_SIGNAL(death()),
-           this, TQT_SLOT(spellCleanDone()) );
+  connect( m_tdespell, TQ_SIGNAL(death()),
+           this, TQ_SLOT(spellCleanDone()) );
 
-  connect( m_tdespell, TQT_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
-           this, TQT_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
-  connect( m_tdespell, TQT_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
-           this, TQT_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
-  connect( m_tdespell, TQT_SIGNAL(done(const TQString&)),
-           this, TQT_SLOT(spellResult(const TQString&)) );
+  connect( m_tdespell, TQ_SIGNAL(misspelling(const TQString&, const TQStringList&, unsigned int)),
+           this, TQ_SLOT(misspelling(const TQString&, const TQStringList&, unsigned int)) );
+  connect( m_tdespell, TQ_SIGNAL(corrected(const TQString&, const TQString&, unsigned int)),
+           this, TQ_SLOT(corrected(const TQString&, const TQString&, unsigned int)) );
+  connect( m_tdespell, TQ_SIGNAL(done(const TQString&)),
+           this, TQ_SLOT(spellResult(const TQString&)) );
 }
 
 void KateSpell::ready(KSpell *)
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index 6119d0ea4..6a5e3ad52 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -32,7 +32,7 @@ class KSpell;
 
 class KateSpell : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSpell( KateView* );
diff --git a/kate/part/katesupercursor.cpp b/kate/part/katesupercursor.cpp
index 287786e3d..4b5d02864 100644
--- a/kate/part/katesupercursor.cpp
+++ b/kate/part/katesupercursor.cpp
@@ -328,15 +328,15 @@ void KateSuperRange::init()
   setBehaviour(DoNotExpand);
 
   // Not necessarily the best implementation
-  connect(m_start, TQT_SIGNAL(positionDirectlyChanged()),  TQT_SIGNAL(contentsChanged()));
-  connect(m_end, TQT_SIGNAL(positionDirectlyChanged()),  TQT_SIGNAL(contentsChanged()));
+  connect(m_start, TQ_SIGNAL(positionDirectlyChanged()),  TQ_SIGNAL(contentsChanged()));
+  connect(m_end, TQ_SIGNAL(positionDirectlyChanged()),  TQ_SIGNAL(contentsChanged()));
 
-  connect(m_start, TQT_SIGNAL(positionChanged()),  TQT_SLOT(slotEvaluateChanged()));
-  connect(m_end, TQT_SIGNAL(positionChanged()),  TQT_SLOT(slotEvaluateChanged()));
-  connect(m_start, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged()));
-  connect(m_end, TQT_SIGNAL(positionUnChanged()), TQT_SLOT(slotEvaluateUnChanged()));
-  connect(m_start, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted()));
-  connect(m_end, TQT_SIGNAL(positionDeleted()), TQT_SIGNAL(boundaryDeleted()));
+  connect(m_start, TQ_SIGNAL(positionChanged()),  TQ_SLOT(slotEvaluateChanged()));
+  connect(m_end, TQ_SIGNAL(positionChanged()),  TQ_SLOT(slotEvaluateChanged()));
+  connect(m_start, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged()));
+  connect(m_end, TQ_SIGNAL(positionUnChanged()), TQ_SLOT(slotEvaluateUnChanged()));
+  connect(m_start, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted()));
+  connect(m_end, TQ_SIGNAL(positionDeleted()), TQ_SIGNAL(boundaryDeleted()));
 }
 
 KateSuperRange::~KateSuperRange()
@@ -446,7 +446,7 @@ bool KateSuperRange::boundaryOn(uint lineNum) const
 
 void KateSuperRange::slotEvaluateChanged()
 {
-  if (sender() == static_cast<TQObject*>(m_start)) {
+  if (sender() == m_start) {
     if (m_evaluate) {
       if (!m_endChanged) {
         // Only one was changed
@@ -484,7 +484,7 @@ void KateSuperRange::slotEvaluateChanged()
 
 void KateSuperRange::slotEvaluateUnChanged()
 {
-  if (sender() == static_cast<TQObject*>(m_start)) {
+  if (sender() == m_start) {
     if (m_evaluate) {
       if (m_endChanged) {
         // Only one changed
@@ -581,8 +581,8 @@ void KateSuperRangeList::connectAll()
   if (!m_connect) {
     m_connect = true;
     for (KateSuperRange* range = first(); range; range = next()) {
-      connect(range, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*)));
-      connect(range, TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated()));
+      connect(range, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*)));
+      connect(range, TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated()));
     }
   }
 }
@@ -636,7 +636,7 @@ bool KateSuperRangeList::rangesInclude(const KateTextCursor& cursor)
 void KateSuperRangeList::slotEliminated()
 {
   if (sender()) {
-    KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())));
+    KateSuperRange* range = static_cast<KateSuperRange*>(const_cast<TQObject*>(sender()));
     emit rangeEliminated(range);
 
     if (m_trackingBoundaries) {
@@ -727,9 +727,9 @@ int KateSuperRangeList::compareItems(TQPtrCollection::Item item1, TQPtrCollectio
 TQPtrCollection::Item KateSuperRangeList::newItem(TQPtrCollection::Item d)
 {
   if (m_connect) {
-    connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*)));
-    connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated()));
-    connect(static_cast<KateSuperRange*>(d), TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SIGNAL(tagRange(KateSuperRange*)));
+    connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*)));
+    connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated()));
+    connect(static_cast<KateSuperRange*>(d), TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SIGNAL(tagRange(KateSuperRange*)));
 
     // HACK HACK
     static_cast<KateSuperRange*>(d)->slotTagRange();
diff --git a/kate/part/katesupercursor.h b/kate/part/katesupercursor.h
index 74baf07df..270227925 100644
--- a/kate/part/katesupercursor.h
+++ b/kate/part/katesupercursor.h
@@ -44,7 +44,7 @@ class KateView;
  **/
 class KateSuperCursor : public TQObject, public KateDocCursor, public Kate::Cursor
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
@@ -169,7 +169,7 @@ class KateSuperRange : public TQObject, public KateRange
 {
 			  friend class KateSuperRangeList;
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /// Determine how the range reacts to characters inserted immediately outside the range.
@@ -338,7 +338,7 @@ protected:
 
 class KateSuperRangeList : public TQObject, public TQPtrList<KateSuperRange>
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp
index 52e07a2e4..5403d0308 100644
--- a/kate/part/katetemplatehandler.cpp
+++ b/kate/part/katetemplatehandler.cpp
@@ -38,7 +38,7 @@ KateTemplateHandler::KateTemplateHandler(
     , m_initOk( false )
     , m_recursion( false )
 {
-  connect( m_doc, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDocumentDestroyed() ) );
+  connect( m_doc, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDocumentDestroyed() ) );
   m_ranges = new KateSuperRangeList( false, this ); //false/*,this*/);
 
   if ( !m_doc->setTabInterceptor( this ) )
@@ -116,15 +116,15 @@ KateTemplateHandler::KateTemplateHandler(
     m_doc->tagLines( ( *it ) ->start().line(), ( *it ) ->end().line() );
   }
 
-  /* connect(doc,TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this,
-   TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));
-   connect(doc,TQT_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this,
-   TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/
-  connect( doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) );
-  connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
-  connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) );
+  /* connect(doc,TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this,
+   TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));
+   connect(doc,TQ_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this,
+   TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/
+  connect( doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) );
+  connect( doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
+  connect( doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) );
 
-  ( *this ) ( Qt::Key_Tab );
+  ( *this ) ( TQt::Key_Tab );
 }
 
 KateTemplateHandler::~KateTemplateHandler()
@@ -283,7 +283,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor )
 
 bool KateTemplateHandler::operator() ( KKey key )
 {
-  if ( key==Qt::Key_Tab )
+  if ( key==TQt::Key_Tab )
   {
     m_currentTabStop++;
 
@@ -324,9 +324,9 @@ void KateTemplateHandler::slotAboutToRemoveText( const KateTextRange &range )
 
   if ( m_doc )
   {
-    disconnect( m_doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) );
-    disconnect( m_doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
-    disconnect( m_doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) );
+    disconnect( m_doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) );
+    disconnect( m_doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) );
+    disconnect( m_doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) );
   }
 
   deleteLater();
diff --git a/kate/part/katetemplatehandler.h b/kate/part/katetemplatehandler.h
index d7d56e074..f50023f46 100644
--- a/kate/part/katetemplatehandler.h
+++ b/kate/part/katetemplatehandler.h
@@ -29,7 +29,7 @@
 class KateDocument;
 
 class KateTemplateHandler: public TQObject, public KateKeyInterceptorFunctor {
-		Q_OBJECT
+		TQ_OBJECT
 	public:
 		KateTemplateHandler(KateDocument *doc,uint line,uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues);
 		virtual ~KateTemplateHandler();
diff --git a/kate/part/katetextline.h b/kate/part/katetextline.h
index 78c28e644..dec072d9d 100644
--- a/kate/part/katetextline.h
+++ b/kate/part/katetextline.h
@@ -167,7 +167,7 @@ class KateTextLine : public TDEShared
     inline uchar *attributes () const { return m_attributes.data(); }
 
     /**
-     * Gets a QString
+     * Gets a TQString
      * @return text of line as TQString reference
      */
     inline const TQString& string() const { return m_text; }
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index bee2e4fb3..95e9d1eae 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -131,7 +131,7 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
   doc->addView( this );
 
   setFocusProxy( m_viewInternal );
-  setFocusPolicy( TQ_StrongFocus );
+  setFocusPolicy( TQWidget::StrongFocus );
 
   if (!doc->singleViewMode()) {
     setXMLFile( "katepartui.rc" );
@@ -159,8 +159,8 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name )
 
   slotHlChanged();
   /*test texthint
-  connect(this,TQT_SIGNAL(needTextHint(int, int, TQString &)),
-  this,TQT_SLOT(slotNeedTextHint(int, int, TQString &)));
+  connect(this,TQ_SIGNAL(needTextHint(int, int, TQString &)),
+  this,TQ_SLOT(slotNeedTextHint(int, int, TQString &)));
   enableTextHints(1000);
   test texthint*/
 }
@@ -186,22 +186,22 @@ KateView::~KateView()
 
 void KateView::setupConnections()
 {
-  connect( m_doc, TQT_SIGNAL(undoChanged()),
-           TQT_TQOBJECT(this), TQT_SLOT(slotNewUndo()) );
-  connect( m_doc, TQT_SIGNAL(hlChanged()),
-           TQT_TQOBJECT(this), TQT_SLOT(slotHlChanged()) );
-  connect( m_doc, TQT_SIGNAL(canceled(const TQString&)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanceled(const TQString&)) );
-  connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
-           TQT_TQOBJECT(this),           TQT_SIGNAL(dropEventPass(TQDropEvent*)) );
-  connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg()));
-  connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg()));
-  connect(m_doc, TQT_SIGNAL(undoChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg()));
+  connect( m_doc, TQ_SIGNAL(undoChanged()),
+           this, TQ_SLOT(slotNewUndo()) );
+  connect( m_doc, TQ_SIGNAL(hlChanged()),
+           this, TQ_SLOT(slotHlChanged()) );
+  connect( m_doc, TQ_SIGNAL(canceled(const TQString&)),
+           this, TQ_SLOT(slotSaveCanceled(const TQString&)) );
+  connect( m_viewInternal, TQ_SIGNAL(dropEventPass(TQDropEvent*)),
+           this,           TQ_SIGNAL(dropEventPass(TQDropEvent*)) );
+  connect(this,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(slotStatusMsg()));
+  connect(this,TQ_SIGNAL(newStatus()),this,TQ_SLOT(slotStatusMsg()));
+  connect(m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotStatusMsg()));
 
   if ( m_doc->browserView() )
   {
-    connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)),
-             TQT_TQOBJECT(this), TQT_SLOT(slotDropEventPass(TQDropEvent*)) );
+    connect( this, TQ_SIGNAL(dropEventPass(TQDropEvent*)),
+             this, TQ_SLOT(slotDropEventPass(TQDropEvent*)) );
   }
 }
 
@@ -212,84 +212,84 @@ void KateView::setupActions()
 
   m_toggleWriteLock = 0;
 
-  m_cut = a=KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(cut()), ac);
+  m_cut = a=KStdAction::cut(this, TQ_SLOT(cut()), ac);
   a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard"));
 
-  m_paste = a=KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(paste()), ac);
+  m_paste = a=KStdAction::pasteText(this, TQ_SLOT(paste()), ac);
   a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents"));
 
-  m_copy = a=KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), ac);
+  m_copy = a=KStdAction::copy(this, TQ_SLOT(copy()), ac);
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard."));
 
-  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT(copyHTML()), ac, "edit_copy_html");
+  m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQ_SLOT(copyHTML()), ac, "edit_copy_html");
   a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard."));
 
   if (!m_doc->readOnly())
   {
-    a=KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), ac);
+    a=KStdAction::save(this, TQ_SLOT(save()), ac);
     a->setWhatsThis(i18n("Save the current document"));
 
-    a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac);
+    a=m_editUndo = KStdAction::undo(m_doc, TQ_SLOT(undo()), ac);
     a->setWhatsThis(i18n("Revert the most recent editing actions"));
 
-    a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac);
+    a=m_editRedo = KStdAction::redo(m_doc, TQ_SLOT(redo()), ac);
     a->setWhatsThis(i18n("Revert the most recent undo operation"));
 
-    (new TDEAction(i18n("&Word Wrap Document"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
+    (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQ_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis(
   i18n("Use this command to wrap all lines of the current document which are longer than the width of the"
     " current view, to fit into this view.<br><br> This is a static word wrap, meaning it is not updated"
     " when the view is resized."));
 
     // setup Tools menu
-    a=new TDEAction(i18n("&Indent"), "format-indent-more", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent");
+    a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQ_SLOT(indent()), ac, "tools_indent");
     a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>"
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
-    a=new TDEAction(i18n("&Unindent"), "format-indent-less", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent");
+    a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQ_SLOT(unIndent()), ac, "tools_unindent");
     a->setWhatsThis(i18n("Use this to unindent a selected block of text."));
 
-    a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent");
+    a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQ_SLOT(cleanIndent()), ac, "tools_cleanIndent");
     a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)<br><br>"
         "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog."));
 
-    a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align");
+    a=new TDEAction(i18n("&Align"), 0, this, TQ_SLOT(align()), ac, "tools_align");
     a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level."));
 
-    a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()),
+    a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQ_SLOT(comment()),
         ac, "tools_comment");
     a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>"
         "The characters for single/multiple line comments are defined within the language's highlighting."));
 
-    a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()),
+    a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQ_SLOT(uncomment()),
                                  ac, "tools_uncomment");
     a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>"
     "The characters for single/multiple line comments are defined within the language's highlighting."));
     a = m_toggleWriteLock = new TDEToggleAction(
                 i18n("&Read Only Mode"), 0, 0,
-                TQT_TQOBJECT(this), TQT_SLOT( toggleWriteLock() ),
+                this, TQ_SLOT( toggleWriteLock() ),
                 ac, "tools_toggle_write_lock" );
     a->setWhatsThis( i18n("Lock/unlock the document for writing") );
 
-    a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this),
-      TQT_SLOT(uppercase()), ac, "tools_uppercase" );
+    a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this,
+      TQ_SLOT(uppercase()), ac, "tools_uppercase" );
     a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the "
       "right of the cursor if no text is selected.") );
 
-    a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this),
-      TQT_SLOT(lowercase()), ac, "tools_lowercase" );
+    a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this,
+      TQ_SLOT(lowercase()), ac, "tools_lowercase" );
     a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the "
       "right of the cursor if no text is selected.") );
 
-    a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this),
-      TQT_SLOT(capitalize()), ac, "tools_capitalize" );
+    a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this,
+      TQ_SLOT(capitalize()), ac, "tools_capitalize" );
     a->setWhatsThis( i18n("Capitalize the selection, or the word under the "
       "cursor if no text is selected.") );
 
-    a = new TDEAction( i18n("Delete Line"), 0, TQT_TQOBJECT(this), 
-      TQT_SLOT( killLine() ), ac, "tools_delete_line");
+    a = new TDEAction( i18n("Delete Line"), 0, this, 
+      TQ_SLOT( killLine() ), ac, "tools_delete_line");
     a->setWhatsThis(i18n("Use this to delete the current line."));
     
-    a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this),
-      TQT_SLOT( joinLines() ), ac, "tools_join_lines" );
+    a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this,
+      TQ_SLOT( joinLines() ), ac, "tools_join_lines" );
     a->setWhatsThis(i18n("Use this to join lines together."));
   }
   else
@@ -300,19 +300,19 @@ void KateView::setupActions()
     m_editRedo = 0;
   }
 
-  a=KStdAction::print( m_doc, TQT_SLOT(print()), ac );
+  a=KStdAction::print( m_doc, TQ_SLOT(print()), ac );
   a->setWhatsThis(i18n("Print the current document."));
 
-  a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(reloadFile()), ac, "file_reload");
+  a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQ_SLOT(reloadFile()), ac, "file_reload");
   a->setWhatsThis(i18n("Reload the current document from disk."));
 
-  a=KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), ac);
+  a=KStdAction::saveAs(this, TQ_SLOT(saveAs()), ac);
   a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice."));
 
-  a=KStdAction::gotoLine(TQT_TQOBJECT(this), TQT_SLOT(gotoLine()), ac);
+  a=KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), ac);
   a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to."));
 
-  a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg");
+  a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQ_SLOT(configDialog()),ac, "set_confdlg");
   a->setWhatsThis(i18n("Configure various aspects of this editor."));
 
   KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight");
@@ -329,45 +329,45 @@ void KateView::setupActions()
   new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation");
 
   // html export
-  a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(exportAsHTML()), ac, "file_export_html");
+  a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQ_SLOT(exportAsHTML()), ac, "file_export_html");
   a->setWhatsThis(i18n("This command allows you to export the current document"
                       " with all highlighting information into a HTML document."));
 
-  m_selectAll = a=KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(selectAll()), ac);
+  m_selectAll = a=KStdAction::selectAll(this, TQ_SLOT(selectAll()), ac);
   a->setWhatsThis(i18n("Select the entire text of the current document."));
 
-  m_deSelect = a=KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(clearSelection()), ac);
+  m_deSelect = a=KStdAction::deselect(this, TQ_SLOT(clearSelection()), ac);
   a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected."));
 
-  a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes");
+  a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQ_SLOT(slotIncFontSizes()), ac, "incFontSizes");
   a->setWhatsThis(i18n("This increases the display font size."));
 
-  a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, TQT_TQOBJECT(m_viewInternal), TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes");
+  a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQ_SLOT(slotDecFontSizes()), ac, "decFontSizes");
   a->setWhatsThis(i18n("This decreases the display font size."));
 
   a= m_toggleBlockSelection = new TDEToggleAction(
     i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B,
-    TQT_TQOBJECT(this), TQT_SLOT(toggleBlockSelectionMode()),
+    this, TQ_SLOT(toggleBlockSelectionMode()),
     ac, "set_verticalSelect");
   a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode."));
 
   a= m_toggleInsert = new TDEToggleAction(
     i18n("Overwr&ite Mode"), Key_Insert,
-    TQT_TQOBJECT(this), TQT_SLOT(toggleInsert()),
+    this, TQ_SLOT(toggleInsert()),
     ac, "set_insert" );
   a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text."));
 
   TDEToggleAction *toggleAction;
    a= m_toggleDynWrap = toggleAction = new TDEToggleAction(
     i18n("&Dynamic Word Wrap"), Key_F10,
-    TQT_TQOBJECT(this), TQT_SLOT(toggleDynWordWrap()),
+    this, TQ_SLOT(toggleDynWordWrap()),
     ac, "view_dynamic_word_wrap" );
   a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen."));
 
   a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators");
   a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed"));
 
-  connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setDynWrapIndicators(int)));
+  connect(m_setDynWrapIndicators, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDynWrapIndicators(int)));
   TQStringList list2;
   list2.append(i18n("&Off"));
   list2.append(i18n("Follow &Line Numbers"));
@@ -376,14 +376,14 @@ void KateView::setupActions()
 
   a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction(
     i18n("Show Folding &Markers"), Key_F9,
-    TQT_TQOBJECT(this), TQT_SLOT(toggleFoldingMarkers()),
+    this, TQ_SLOT(toggleFoldingMarkers()),
     ac, "view_folding_markers" );
   a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible."));
   toggleAction->setCheckedState(i18n("Hide Folding &Markers"));
 
    a= m_toggleIconBar = toggleAction = new TDEToggleAction(
     i18n("Show &Icon Border"), Key_F6,
-    TQT_TQOBJECT(this), TQT_SLOT(toggleIconBorder()),
+    this, TQ_SLOT(toggleIconBorder()),
     ac, "view_border");
   a=toggleAction;
   a->setWhatsThis(i18n("Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for instance."));
@@ -391,21 +391,21 @@ void KateView::setupActions()
 
   a= toggleAction=m_toggleLineNumbers = new TDEToggleAction(
      i18n("Show &Line Numbers"), Key_F11,
-     TQT_TQOBJECT(this), TQT_SLOT(toggleLineNumbersOn()),
+     this, TQ_SLOT(toggleLineNumbersOn()),
      ac, "view_line_numbers" );
   a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view."));
   toggleAction->setCheckedState(i18n("Hide &Line Numbers"));
 
   a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction(
      i18n("Show Scroll&bar Marks"), 0,
-     TQT_TQOBJECT(this), TQT_SLOT(toggleScrollBarMarks()),
+     this, TQ_SLOT(toggleScrollBarMarks()),
      ac, "view_scrollbar_marks");
   a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for instance, show bookmarks."));
   toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks"));
 
   a = toggleAction = m_toggleWWMarker = new TDEToggleAction(
         i18n("Show Static &Word Wrap Marker"), 0,
-        TQT_TQOBJECT(this), TQT_SLOT( toggleWWMarker() ),
+        this, TQ_SLOT( toggleWWMarker() ),
         ac, "view_word_wrap_marker" );
   a->setWhatsThis( i18n(
         "Show/hide the Word Wrap Marker, a vertical line drawn at the word "
@@ -414,7 +414,7 @@ void KateView::setupActions()
 
   a= m_switchCmdLine = new TDEAction(
      i18n("Switch to Command Line"), Key_F7,
-     TQT_TQOBJECT(this), TQT_SLOT(switchToCmdLine()),
+     this, TQ_SLOT(switchToCmdLine()),
      ac, "switch_to_cmd_line" );
   a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view."));
 
@@ -426,10 +426,10 @@ void KateView::setupActions()
   list.append("&Macintosh");
   m_setEndOfLine->setItems(list);
   m_setEndOfLine->setCurrentItem (m_doc->config()->eol());
-  connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setEol(int)));
+  connect(m_setEndOfLine, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEol(int)));
 
   // encoding menu
-  new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), TQT_TQOBJECT(ac), "set_encoding");
+  new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding");
 
   m_search->createActions( ac );
   m_spell->createActions( ac );
@@ -437,144 +437,144 @@ void KateView::setupActions()
 
   slotSelectionChanged ();
 
-  connect (this, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectionChanged()));
+  connect (this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()));
 }
 
 void KateView::setupEditActions()
 {
-  m_editActions = new TDEActionCollection( m_viewInternal, TQT_TQOBJECT(this), "edit_actions" );
+  m_editActions = new TDEActionCollection( m_viewInternal, this, "edit_actions" );
   TDEActionCollection* ac = m_editActions;
 
   new TDEAction(
     i18n("Move Word Left"),                         CTRL + Key_Left,
-    TQT_TQOBJECT(this),TQT_SLOT(wordLeft()),
+    this,TQ_SLOT(wordLeft()),
     ac, "word_left" );
   new TDEAction(
     i18n("Select Character Left"),          SHIFT +        Key_Left,
-    TQT_TQOBJECT(this),TQT_SLOT(shiftCursorLeft()),
+    this,TQ_SLOT(shiftCursorLeft()),
     ac, "select_char_left" );
   new TDEAction(
     i18n("Select Word Left"),               SHIFT + CTRL + Key_Left,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftWordLeft()),
+    this, TQ_SLOT(shiftWordLeft()),
     ac, "select_word_left" );
 
   new TDEAction(
     i18n("Move Word Right"),                        CTRL + Key_Right,
-    TQT_TQOBJECT(this), TQT_SLOT(wordRight()),
+    this, TQ_SLOT(wordRight()),
     ac, "word_right" );
   new TDEAction(
     i18n("Select Character Right"),         SHIFT        + Key_Right,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftCursorRight()),
+    this, TQ_SLOT(shiftCursorRight()),
     ac, "select_char_right" );
   new TDEAction(
     i18n("Select Word Right"),              SHIFT + CTRL + Key_Right,
-    TQT_TQOBJECT(this),TQT_SLOT(shiftWordRight()),
+    this,TQ_SLOT(shiftWordRight()),
     ac, "select_word_right" );
 
   new TDEAction(
     i18n("Move to Beginning of Line"),                      Key_Home,
-    TQT_TQOBJECT(this), TQT_SLOT(home()),
+    this, TQ_SLOT(home()),
     ac, "beginning_of_line" );
   new TDEAction(
     i18n("Move to Beginning of Document"),           TDEStdAccel::home(),
-    TQT_TQOBJECT(this), TQT_SLOT(top()),
+    this, TQ_SLOT(top()),
     ac, "beginning_of_document" );
   new TDEAction(
     i18n("Select to Beginning of Line"),     SHIFT +        Key_Home,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftHome()),
+    this, TQ_SLOT(shiftHome()),
     ac, "select_beginning_of_line" );
   new TDEAction(
     i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftTop()),
+    this, TQ_SLOT(shiftTop()),
     ac, "select_beginning_of_document" );
 
   new TDEAction(
     i18n("Move to End of Line"),                            Key_End,
-    TQT_TQOBJECT(this), TQT_SLOT(end()),
+    this, TQ_SLOT(end()),
     ac, "end_of_line" );
   new TDEAction(
     i18n("Move to End of Document"),                 TDEStdAccel::end(),
-    TQT_TQOBJECT(this), TQT_SLOT(bottom()),
+    this, TQ_SLOT(bottom()),
     ac, "end_of_document" );
   new TDEAction(
     i18n("Select to End of Line"),           SHIFT +        Key_End,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftEnd()),
+    this, TQ_SLOT(shiftEnd()),
     ac, "select_end_of_line" );
   new TDEAction(
     i18n("Select to End of Document"),       SHIFT + CTRL + Key_End,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftBottom()),
+    this, TQ_SLOT(shiftBottom()),
     ac, "select_end_of_document" );
 
   new TDEAction(
     i18n("Select to Previous Line"),                SHIFT + Key_Up,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftUp()),
+    this, TQ_SLOT(shiftUp()),
     ac, "select_line_up" );
   new TDEAction(
     i18n("Scroll Line Up"),"",              CTRL +          Key_Up,
-    TQT_TQOBJECT(this), TQT_SLOT(scrollUp()),
+    this, TQ_SLOT(scrollUp()),
     ac, "scroll_line_up" );
 
-  new TDEAction(i18n("Move to Next Line"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()),
+  new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQ_SLOT(down()),
 	      ac, "move_line_down");
 
-  new TDEAction(i18n("Move to Previous Line"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()),
+  new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQ_SLOT(up()),
 	      ac, "move_line_up");
 
-  new TDEAction(i18n("Move Character Right"), Key_Right, TQT_TQOBJECT(this),
-	      TQT_SLOT(cursorRight()), ac, "move_cursor_right");
+  new TDEAction(i18n("Move Character Right"), Key_Right, this,
+	      TQ_SLOT(cursorRight()), ac, "move_cursor_right");
 
-  new TDEAction(i18n("Move Character Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(cursorLeft()),
+  new TDEAction(i18n("Move Character Left"), Key_Left, this, TQ_SLOT(cursorLeft()),
 	      ac, "move_cusor_left");
 
   new TDEAction(
     i18n("Select to Next Line"),                    SHIFT + Key_Down,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftDown()),
+    this, TQ_SLOT(shiftDown()),
     ac, "select_line_down" );
   new TDEAction(
     i18n("Scroll Line Down"),               CTRL +          Key_Down,
-    TQT_TQOBJECT(this), TQT_SLOT(scrollDown()),
+    this, TQ_SLOT(scrollDown()),
     ac, "scroll_line_down" );
 
   new TDEAction(
     i18n("Scroll Page Up"),                         TDEStdAccel::prior(),
-    TQT_TQOBJECT(this), TQT_SLOT(pageUp()),
+    this, TQ_SLOT(pageUp()),
     ac, "scroll_page_up" );
   new TDEAction(
     i18n("Select Page Up"),                         SHIFT + Key_PageUp,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftPageUp()),
+    this, TQ_SLOT(shiftPageUp()),
     ac, "select_page_up" );
   new TDEAction(
     i18n("Move to Top of View"),             CTRL +         Key_PageUp,
-    TQT_TQOBJECT(this), TQT_SLOT(topOfView()),
+    this, TQ_SLOT(topOfView()),
     ac, "move_top_of_view" );
   new TDEAction(
     i18n("Select to Top of View"),             CTRL + SHIFT +  Key_PageUp,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftTopOfView()),
+    this, TQ_SLOT(shiftTopOfView()),
     ac, "select_top_of_view" );
 
   new TDEAction(
     i18n("Scroll Page Down"),                          TDEStdAccel::next(),
-    TQT_TQOBJECT(this), TQT_SLOT(pageDown()),
+    this, TQ_SLOT(pageDown()),
     ac, "scroll_page_down" );
   new TDEAction(
     i18n("Select Page Down"),                       SHIFT + Key_PageDown,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftPageDown()),
+    this, TQ_SLOT(shiftPageDown()),
     ac, "select_page_down" );
   new TDEAction(
     i18n("Move to Bottom of View"),          CTRL +         Key_PageDown,
-    TQT_TQOBJECT(this), TQT_SLOT(bottomOfView()),
+    this, TQ_SLOT(bottomOfView()),
     ac, "move_bottom_of_view" );
   new TDEAction(
     i18n("Select to Bottom of View"),         CTRL + SHIFT + Key_PageDown,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftBottomOfView()),
+    this, TQ_SLOT(shiftBottomOfView()),
     ac, "select_bottom_of_view" );
   new TDEAction(
     i18n("Move to Matching Bracket"),               CTRL + Key_6,
-    TQT_TQOBJECT(this), TQT_SLOT(toMatchingBracket()),
+    this, TQ_SLOT(toMatchingBracket()),
     ac, "to_matching_bracket" );
   new TDEAction(
     i18n("Select to Matching Bracket"),      SHIFT + CTRL + Key_6,
-    TQT_TQOBJECT(this), TQT_SLOT(shiftToMatchingBracket()),
+    this, TQ_SLOT(shiftToMatchingBracket()),
     ac, "select_matching_bracket" );
 
   // anders: shortcuts doing any changes should not be created in browserextension
@@ -582,40 +582,40 @@ void KateView::setupEditActions()
   {
     new TDEAction(
       i18n("Transpose Characters"),           CTRL + Key_T,
-      TQT_TQOBJECT(this), TQT_SLOT(transpose()),
+      this, TQ_SLOT(transpose()),
       ac, "transpose_char" );
 
     new TDEAction(
       i18n("Delete Line"),                    CTRL + Key_K,
-      TQT_TQOBJECT(this), TQT_SLOT(killLine()),
+      this, TQ_SLOT(killLine()),
       ac, "delete_line" );
 
     new TDEAction(
       i18n("Delete Word Left"),               TDEStdAccel::deleteWordBack(),
-      TQT_TQOBJECT(this), TQT_SLOT(deleteWordLeft()),
+      this, TQ_SLOT(deleteWordLeft()),
       ac, "delete_word_left" );
 
     new TDEAction(
       i18n("Delete Word Right"),              TDEStdAccel::deleteWordForward(),
-      TQT_TQOBJECT(this), TQT_SLOT(deleteWordRight()),
+      this, TQ_SLOT(deleteWordRight()),
       ac, "delete_word_right" );
 
     new TDEAction(i18n("Delete Next Character"), Key_Delete,
-                TQT_TQOBJECT(this), TQT_SLOT(keyDelete()),
+                this, TQ_SLOT(keyDelete()),
                 ac, "delete_next_character");
 
     TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace,
-                TQT_TQOBJECT(this), TQT_SLOT(backspace()),
+                this, TQ_SLOT(backspace()),
                 ac, "backspace");
     TDEShortcut cut = a->shortcut();
     cut.append( KKey( SHIFT + Key_Backspace ) );
     a->setShortcut( cut );
   }
 
-  connect( this, TQT_SIGNAL(gotFocus(Kate::View*)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotGotFocus()) );
-  connect( this, TQT_SIGNAL(lostFocus(Kate::View*)),
-           TQT_TQOBJECT(this), TQT_SLOT(slotLostFocus()) );
+  connect( this, TQ_SIGNAL(gotFocus(Kate::View*)),
+           this, TQ_SLOT(slotGotFocus()) );
+  connect( this, TQ_SIGNAL(lostFocus(Kate::View*)),
+           this, TQ_SLOT(slotLostFocus()) );
 
   m_editActions->readShortcutSettings( "Katepart Shortcuts" );
 
@@ -631,18 +631,18 @@ void KateView::setupCodeFolding()
 {
   TDEActionCollection *ac=this->actionCollection();
   new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus,
-       m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
+       m_doc->foldingTree(),TQ_SLOT(collapseToplevelNodes()),ac,"folding_toplevel");
   new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus,
-       TQT_TQOBJECT(this),TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
+       this,TQ_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel");
   new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus,
-       TQT_TQOBJECT(this),TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
+       this,TQ_SLOT(slotCollapseLocal()),ac,"folding_collapselocal");
   new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus,
-       TQT_TQOBJECT(this),TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
+       this,TQ_SLOT(slotExpandLocal()),ac,"folding_expandlocal");
 
 #ifdef DEBUGACCELS
-  TDEAccel* debugAccels = new TDEAccel(this,TQT_TQOBJECT(this));
-  debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree()));
-  debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode()));
+  TDEAccel* debugAccels = new TDEAccel(this,this);
+  debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQ_SLOT(dumpRegionTree()));
+  debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQ_SLOT(testTemplateCode()));
   debugAccels->setEnabled(true);
 #endif
 }
@@ -669,16 +669,16 @@ void KateView::slotExpandLocal()
 void KateView::setupCodeCompletion()
 {
   m_codeCompletion = new KateCodeCompletion(this);
-  connect( m_codeCompletion, TQT_SIGNAL(completionAborted()),
-           TQT_TQOBJECT(this),             TQT_SIGNAL(completionAborted()));
-  connect( m_codeCompletion, TQT_SIGNAL(completionDone()),
-           TQT_TQOBJECT(this),             TQT_SIGNAL(completionDone()));
-  connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()),
-           TQT_TQOBJECT(this),             TQT_SIGNAL(argHintHidden()));
-  connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)),
-           TQT_TQOBJECT(this),             TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)));
-  connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)),
-           TQT_TQOBJECT(this),             TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)));
+  connect( m_codeCompletion, TQ_SIGNAL(completionAborted()),
+           this,             TQ_SIGNAL(completionAborted()));
+  connect( m_codeCompletion, TQ_SIGNAL(completionDone()),
+           this,             TQ_SIGNAL(completionDone()));
+  connect( m_codeCompletion, TQ_SIGNAL(argHintHidden()),
+           this,             TQ_SIGNAL(argHintHidden()));
+  connect( m_codeCompletion, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)),
+           this,             TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)));
+  connect( m_codeCompletion, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)),
+           this,             TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)));
 }
 
 void KateView::slotGotFocus()
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index 0a00ab1fc..1e113618e 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -62,7 +62,7 @@ class KateView : public Kate::View,
                  public KTextEditor::SelectionInterfaceExt,
                  public KTextEditor::BlockSelectionInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KateViewInternal;
     friend class KateIconBorder;
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index 1074615f8..872e7467c 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -65,15 +65,15 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent,
   , m_savVisibleLines(0)
   , m_showMarks(false)
 {
-  connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderMaybeMoved(int)));
-  connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged()));
+  connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderMaybeMoved(int)));
+  connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged()));
 
   m_lines.setAutoDelete(true);
 }
 
 void KateScrollBar::mousePressEvent(TQMouseEvent* e)
 {
-  if (e->button() == Qt::MidButton)
+  if (e->button() == TQt::MidButton)
     m_middleMouseDown = true;
 
   TQScrollBar::mousePressEvent(e);
@@ -94,7 +94,7 @@ void KateScrollBar::mouseMoveEvent(TQMouseEvent* e)
 {
   TQScrollBar::mouseMoveEvent(e);
 
-  if (e->state() | Qt::LeftButton)
+  if (e->state() | TQt::LeftButton)
     redrawMarks();
 }
 
@@ -295,8 +295,8 @@ KateCmdLine::KateCmdLine (KateView *view)
   , m_command( 0L )
   , m_oldCompletionObject( 0L )
 {
-  connect (this, TQT_SIGNAL(returnPressed(const TQString &)),
-           this, TQT_SLOT(slotReturnPressed(const TQString &)));
+  connect (this, TQ_SIGNAL(returnPressed(const TQString &)),
+           this, TQ_SLOT(slotReturnPressed(const TQString &)));
 
   completionObject()->insertItems (KateCmd::self()->cmds());
   setAutoDeleteCompletionObject( false );
@@ -375,7 +375,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )
   m_cmdend = 0;
 
   m_view->setFocus ();
-  TQTimer::singleShot( 4000, this, TQT_SLOT(hideMe()) );
+  TQTimer::singleShot( 4000, this, TQ_SLOT(hideMe()) );
 }
 
 void KateCmdLine::hideMe () // unless i have focus ;)
@@ -716,7 +716,7 @@ void KateIconBorder::setIconBorderOn( bool enable )
 
   updateGeometry();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 void KateIconBorder::setLineNumbersOn( bool enable )
@@ -729,7 +729,7 @@ void KateIconBorder::setLineNumbersOn( bool enable )
 
   updateGeometry();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 void KateIconBorder::setDynWrapIndicators( int state )
@@ -742,7 +742,7 @@ void KateIconBorder::setDynWrapIndicators( int state )
 
   updateGeometry ();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 void KateIconBorder::setFoldingMarkersOn( bool enable )
@@ -754,7 +754,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable )
 
   updateGeometry();
 
-  TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(update()) );
 }
 
 TQSize KateIconBorder::sizeHint() const
@@ -953,7 +953,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height)
       if (realLine > -1)
         if (m_viewInternal->lineRanges[z].startCol == 0) {
           if (m_lineNumbersOn)
-            p.drawText( lnX + 1, y, lnWidth-4, h, Qt::AlignRight|Qt::AlignVCenter, TQString("%1").arg( realLine + 1 ) );
+            p.drawText( lnX + 1, y, lnWidth-4, h, TQt::AlignRight|TQt::AlignVCenter, TQString("%1").arg( realLine + 1 ) );
         } else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) {
           p.drawPixmap(lnX + lnWidth - m_arrow.width() - 4, y, m_arrow);
         }
@@ -1069,7 +1069,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e )
   {
     BorderArea area = positionToArea( e->pos() );
     if( area == IconBorder) {
-      if (e->button() == Qt::LeftButton) {
+      if (e->button() == TQt::LeftButton) {
         if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) {
           if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() )
             m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() );
@@ -1080,7 +1080,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e )
           }
         }
         else
-        if (e->button() == Qt::RightButton) {
+        if (e->button() == TQt::RightButton) {
           showMarkMenu( cursorOnLine, TQCursor::pos() );
         }
     }
@@ -1170,7 +1170,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos )
 KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name)
        : TDEActionMenu (text, parent, name), doc(_doc), view (_view)
 {
-  connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow()));
+  connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow()));
 }
 
 void KateViewEncodingAction::slotAboutToShow()
@@ -1180,7 +1180,7 @@ void KateViewEncodingAction::slotAboutToShow()
   popupMenu()->clear ();
   for (uint z=0; z<modes.size(); ++z)
   {
-    popupMenu()->insertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0,  z);
+    popupMenu()->insertItem ( modes[z], this, TQ_SLOT(setMode(int)), 0,  z);
 
     bool found = false;
     TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found);
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index ecaec3303..1e162af18 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -47,7 +47,7 @@ namespace Kate {
  */
 class KateScrollBar : public TQScrollBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateScrollBar(Orientation orientation, class KateViewInternal *parent, const char* name = 0L);
@@ -94,7 +94,7 @@ class KateScrollBar : public TQScrollBar
 
 class KateCmdLine : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCmdLine (KateView *view);
@@ -121,7 +121,7 @@ class KateCmdLine : public KLineEdit
 
 class KateIconBorder : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateIconBorder( KateViewInternal* internalView, TQWidget *parent );
@@ -184,7 +184,7 @@ class KateIconBorder : public TQWidget
 
 class KateViewEncodingAction : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent = 0, const char* name = 0);
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index c536974e6..0f12f8562 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -57,7 +57,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   , editIsRunning (false)
   , m_view (view)
   , m_doc (doc)
-  , cursor (doc, true, 0, 0, TQT_TQOBJECT(this))
+  , cursor (doc, true, 0, 0, this)
   , possibleTripleClick (false)
   , m_dummy (0)
   , m_startPos(doc, true, 0,0)
@@ -94,7 +94,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   //
   // scrollbar for lines
   //
-  m_lineScroll = new KateScrollBar(Qt::Vertical, this);
+  m_lineScroll = new KateScrollBar(TQt::Vertical, this);
   m_lineScroll->show();
   m_lineScroll->setTracking (true);
 
@@ -116,14 +116,14 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   m_lineLayout->addWidget(m_dummy);
 
   // Hijack the line scroller's controls, so we can scroll nicely for word-wrap
-  connect(m_lineScroll, TQT_SIGNAL(prevPage()), TQT_SLOT(scrollPrevPage()));
-  connect(m_lineScroll, TQT_SIGNAL(nextPage()), TQT_SLOT(scrollNextPage()));
+  connect(m_lineScroll, TQ_SIGNAL(prevPage()), TQ_SLOT(scrollPrevPage()));
+  connect(m_lineScroll, TQ_SIGNAL(nextPage()), TQ_SLOT(scrollNextPage()));
 
-  connect(m_lineScroll, TQT_SIGNAL(prevLine()), TQT_SLOT(scrollPrevLine()));
-  connect(m_lineScroll, TQT_SIGNAL(nextLine()), TQT_SLOT(scrollNextLine()));
+  connect(m_lineScroll, TQ_SIGNAL(prevLine()), TQ_SLOT(scrollPrevLine()));
+  connect(m_lineScroll, TQ_SIGNAL(nextLine()), TQ_SLOT(scrollNextLine()));
 
-  connect(m_lineScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(scrollLines(int)));
-  connect(m_lineScroll, TQT_SIGNAL(sliderMMBMoved(int)), TQT_SLOT(scrollLines(int)));
+  connect(m_lineScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(scrollLines(int)));
+  connect(m_lineScroll, TQ_SIGNAL(sliderMMBMoved(int)), TQ_SLOT(scrollLines(int)));
 
   // catch wheel events, completing the hijack
   m_lineScroll->installEventFilter(this);
@@ -131,7 +131,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   //
   // scrollbar for columns
   //
-  m_columnScroll = new TQScrollBar(Qt::Horizontal,m_view);
+  m_columnScroll = new TQScrollBar(TQt::Horizontal,m_view);
 
   // hide the column scrollbar in the dynamic word wrap mode
   if (m_view->dynWordWrap())
@@ -142,8 +142,8 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   m_columnScroll->setTracking(true);
   m_startX = 0;
 
-  connect( m_columnScroll, TQT_SIGNAL( valueChanged (int) ),
-           this, TQT_SLOT( scrollColumns (int) ) );
+  connect( m_columnScroll, TQ_SIGNAL( valueChanged (int) ),
+           this, TQ_SLOT( scrollColumns (int) ) );
 
   //
   // iconborder ;)
@@ -151,13 +151,13 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   leftBorder = new KateIconBorder( this, m_view );
   leftBorder->show ();
 
-  connect( leftBorder, TQT_SIGNAL(toggleRegionVisibility(unsigned int)),
-           m_doc->foldingTree(), TQT_SLOT(toggleRegionVisibility(unsigned int)));
+  connect( leftBorder, TQ_SIGNAL(toggleRegionVisibility(unsigned int)),
+           m_doc->foldingTree(), TQ_SLOT(toggleRegionVisibility(unsigned int)));
 
-  connect( doc->foldingTree(), TQT_SIGNAL(regionVisibilityChangedAt(unsigned int)),
-           this, TQT_SLOT(slotRegionVisibilityChangedAt(unsigned int)));
-  connect( doc, TQT_SIGNAL(codeFoldingUpdated()),
-           this, TQT_SLOT(slotCodeFoldingChanged()) );
+  connect( doc->foldingTree(), TQ_SIGNAL(regionVisibilityChangedAt(unsigned int)),
+           this, TQ_SLOT(slotRegionVisibilityChangedAt(unsigned int)));
+  connect( doc, TQ_SIGNAL(codeFoldingUpdated()),
+           this, TQ_SLOT(slotCodeFoldingChanged()) );
 
   displayCursor.setPos(0, 0);
   cursor.setPos(0, 0);
@@ -182,21 +182,21 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc)
   dragInfo.state = diNone;
 
   // timers
-  connect( &m_dragScrollTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( doDragScroll() ) );
+  connect( &m_dragScrollTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( doDragScroll() ) );
 
-  connect( &m_scrollTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( scrollTimeout() ) );
+  connect( &m_scrollTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( scrollTimeout() ) );
 
-  connect( &m_cursorTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( cursorTimeout() ) );
+  connect( &m_cursorTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( cursorTimeout() ) );
 
-  connect( &m_textHintTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( textHintTimeout() ) );
+  connect( &m_textHintTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( textHintTimeout() ) );
 
   // selection changed to set anchor
-  connect( m_view, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( viewSelectionChanged() ) );
+  connect( m_view, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( viewSelectionChanged() ) );
 
 
 // this is a work arround for RTL desktops
@@ -420,7 +420,7 @@ void KateViewInternal::scrollPos(KateTextCursor& c, bool force, bool calledExter
 
     Q_ASSERT(lines >= 0);
 
-    if (!calledExternally && QABS(viewLinesScrolled) < lines)
+    if (!calledExternally && TQABS(viewLinesScrolled) < lines)
     {
       updateView(false, viewLinesScrolled);
 
@@ -456,7 +456,7 @@ void KateViewInternal::scrollColumns ( int x )
   int dx = m_startX - x;
   m_startX = x;
 
-  if (QABS(dx) < width())
+  if (TQABS(dx) < width())
     scroll(dx, 0);
   else
     update();
@@ -1216,7 +1216,7 @@ void KateViewInternal::moveEdge( Bias bias, bool sel )
 void KateViewInternal::home( bool sel )
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -1257,7 +1257,7 @@ void KateViewInternal::home( bool sel )
 void KateViewInternal::end( bool sel )
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -1687,7 +1687,7 @@ int KateViewInternal::lineMaxCol(const KateLineRange& range)
 void KateViewInternal::cursorUp(bool sel)
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Up, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Up, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -1754,7 +1754,7 @@ void KateViewInternal::cursorUp(bool sel)
 void KateViewInternal::cursorDown(bool sel)
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Down, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Down, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -1889,7 +1889,7 @@ void KateViewInternal::setAutoCenterLines(int viewLines, bool updateView)
 void KateViewInternal::pageUp( bool sel )
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageUp, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageUp, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -1938,7 +1938,7 @@ void KateViewInternal::pageUp( bool sel )
 void KateViewInternal::pageDown( bool sel )
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageDown, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageDown, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -2025,7 +2025,7 @@ void KateViewInternal::bottom( bool sel )
 void KateViewInternal::top_home( bool sel )
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -2037,7 +2037,7 @@ void KateViewInternal::top_home( bool sel )
 void KateViewInternal::bottom_end( bool sel )
 {
   if (m_view->m_codeCompletion->codeCompletionVisible()) {
-    TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0);
+    TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0);
     m_view->m_codeCompletion->handleKey(&e);
     return;
   }
@@ -2438,7 +2438,7 @@ bool KateViewInternal::isTargetSelected( const TQPoint& p )
 
 bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e )
 {
-  if (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_lineScroll))
+  if (obj == m_lineScroll)
   {
     // the second condition is to make sure a scroll on the vertical bar doesn't cause a horizontal scroll ;)
     if (e->type() == TQEvent::Wheel && m_lineScroll->minValue() != m_lineScroll->maxValue())
@@ -2465,7 +2465,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e )
           m_view->m_codeCompletion->abortCompletion();
       }
 
-      if ((k->key() == Qt::Key_Escape) && !m_view->config()->persistentSelection() )
+      if ((k->key() == TQt::Key_Escape) && !m_view->config()->persistentSelection() )
       {
         m_view->clearSelection();
         return true;
@@ -2525,7 +2525,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
     kdDebug (13030) << "hint around" << endl;
 
     if( e->key() == Key_Enter || e->key() == Key_Return  ||
-    (key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) {
+    (key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) {
       m_view->m_codeCompletion->doComplete();
       e->accept();
       return;
@@ -2538,14 +2538,14 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
     return;
   }
 
-  if ((key == Qt::Key_Return) || (key == Qt::Key_Enter))
+  if ((key == TQt::Key_Return) || (key == TQt::Key_Enter))
   {
     m_view->keyReturn();
     e->accept();
     return;
   }
 
-  if ((key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter))
+  if ((key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter))
   {
     uint ln = cursor.line();
     int col = cursor.col();
@@ -2573,7 +2573,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
     return;
   }
 
-  if (key == Qt::Key_Backspace || key == SHIFT + Qt::Key_Backspace)
+  if (key == TQt::Key_Backspace || key == SHIFT + TQt::Key_Backspace)
   {
     m_view->backspace();
     e->accept();
@@ -2584,7 +2584,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
     return;
   }
 
-  if  (key == Qt::Key_Tab || key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab)
+  if  (key == TQt::Key_Tab || key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab)
   {
     if (m_doc->invokeTabInterceptor(key)) {
       e->accept();
@@ -2592,7 +2592,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
     } else
     if (m_doc->configFlags() & KateDocumentConfig::cfTabIndents)
     {
-      if( key == Qt::Key_Tab )
+      if( key == TQt::Key_Tab )
       {
         if (m_view->hasSelection() || (m_doc->configFlags() & KateDocumentConfig::cfTabIndentsMode))
           m_doc->indent( m_view, cursor.line(), 1 );
@@ -2609,7 +2609,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e )
         return;
       }
 
-      if (key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab)
+      if (key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab)
       {
         m_doc->indent( m_view, cursor.line(), -1 );
         e->accept();
@@ -2693,7 +2693,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e )
 {
   switch (e->button())
   {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
         m_selChangedByUser = false;
 
         if (possibleTripleClick)
@@ -2820,7 +2820,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
 {
   switch (e->button())
   {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
       m_selectionMode = Word;
 
       if ( e->state() & TQt::ShiftButton )
@@ -2902,7 +2902,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e)
       }
 
       possibleTripleClick = true;
-      TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQT_SLOT(tripleClickTimeout()) );
+      TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQ_SLOT(tripleClickTimeout()) );
 
       scrollX = 0;
       scrollY = 0;
@@ -2927,7 +2927,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
 {
   switch (e->button())
   {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
       m_selectionMode = Default;
 //       selStartCached.setLine( -1 );
 
@@ -2956,7 +2956,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
       e->accept ();
       break;
 
-    case Qt::MidButton:
+    case TQt::MidButton:
       placeCursor( e->pos() );
 
       if( m_doc->isReadWrite() )
@@ -2977,7 +2977,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e )
 
 void KateViewInternal::mouseMoveEvent( TQMouseEvent* e )
 {
-  if( e->state() & Qt::LeftButton )
+  if( e->state() & TQt::LeftButton )
   {
     if (dragInfo.state == diPending)
     {
@@ -3263,27 +3263,44 @@ void KateViewInternal::clear()
 
 void KateViewInternal::wheelEvent(TQWheelEvent* e)
 {
-  if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal) {
-    // React to this as a vertical event
-    if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) {
-      if (e->delta() > 0)
-        scrollPrevPage();
-      else
-        scrollNextPage();
-    } else {
-      scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines()));
-      // maybe a menu was opened or a bubbled window title is on us -> we shall erase it
-      update();
-      leftBorder->update();
-    }
-
-  } else if (columnScrollingPossible()) {
-    TQWheelEvent copy = *e;
-    TQApplication::sendEvent(m_columnScroll, &copy);
-
-  } else {
-    e->ignore();
-  }
+	if (e->state() & ControlButton)
+	{
+		if (e->delta() > 0)
+		{
+			slotIncFontSizes();
+		}
+		else
+		{
+			slotDecFontSizes();
+		}
+	}
+	else
+	{
+		if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != TQt::Horizontal)
+		{
+			// React to this as a vertical event
+			if ( e->state() & ShiftButton )
+			{
+				if (e->delta() > 0)
+					scrollPrevPage();
+				else
+					scrollNextPage();
+			}
+			else
+			{
+				scrollViewLines(-((e->delta() / 120) * TQApplication::wheelScrollLines()));
+				// maybe a menu was opened or a bubbled window title is on us -> we shall erase it
+				update();
+				leftBorder->update();
+			}
+		} else if (columnScrollingPossible()) {
+			TQWheelEvent copy = *e;
+			TQApplication::sendEvent(m_columnScroll, &copy);
+
+		} else {
+			e->ignore();
+		}
+	}
 }
 
 void KateViewInternal::startDragScroll()
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index 0d9aa7c55..77fb81e7a 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -52,7 +52,7 @@ enum Bias
 
 class KateViewInternal : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KateView;
     friend class KateIconBorder;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index d0443da71..4f4e5692d 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -549,10 +549,10 @@ int main(int argc, char *argv[])
                                                         baseDir,
                                                         args->getOption("output"),
                                                         args->isSet("genoutput"));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
-		     regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )),
-		     regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int )));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
+		     regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )),
+		     regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int )));
 
     regressionTest->m_keepOutput = args->isSet("keep-output");
     regressionTest->m_showGui = args->isSet("show");
@@ -628,7 +628,7 @@ int main(int argc, char *argv[])
                 link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>")
                         .arg(regressionTest->m_passes_new)
                         .arg(regressionTest->m_failureComp->group());
-            list.tqwriteBlock( link.latin1(), link.length() );
+            list.writeBlock( link.latin1(), link.length() );
             list.close();
 	}
     }
@@ -681,12 +681,12 @@ RegressionTest::RegressionTest(KateDocument *part, TDEConfig *baseConfig,
     TQString s;
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><body>Follow the white rabbit";
-    f.tqwriteBlock( s.latin1(), s.length() );
+    f.writeBlock( s.latin1(), s.length() );
     f.close();
     f.setName( m_outputDir + "/index.html" );
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
-    f.tqwriteBlock( s.latin1(), s.length() );
+    f.writeBlock( s.latin1(), s.length() );
     f.close();
 
     curr = this;
@@ -848,7 +848,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
     if (failures & NewFailure)
         link += "</span>";
     link += "<br>\n";
-    list.tqwriteBlock( link.latin1(), link.length() );
+    list.writeBlock( link.latin1(), link.length() );
     list.close();
 }
 
@@ -1020,7 +1020,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
     cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
 
     cl += "</body></html>";
-    compare.tqwriteBlock( cl.latin1(), cl.length() );
+    compare.writeBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index 2128ce25d..7ef1b9ee1 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -162,7 +162,7 @@ class OutputFunction : public KJS::ObjectImp
  */
 class RegressionTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
     RegressionTest(KateDocument *part, TDEConfig *baseConfig,
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 2be5b00fb..06d7c12d2 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -66,7 +66,7 @@ AutoBookmarker::AutoBookmarker( TQObject *parent,
           KTextEditor::ConfigInterfaceExtension()
 {
   if ( parent )
-    connect( parent, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) );
+    connect( parent, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) );
 }
 
 void AutoBookmarker::addView(KTextEditor::View */*view*/)
@@ -113,7 +113,7 @@ void AutoBookmarker::slotCompleted()
 {
   // get the document info
   KTextEditor::DocumentInfoInterface *di =
-      ::tqqt_cast<KTextEditor::DocumentInfoInterface*>(document());
+      ::tqt_cast<KTextEditor::DocumentInfoInterface*>(document());
   TQString mt;
   if ( di ) // we can still try match the URL otherwise
     mt = di->mimeType();
@@ -292,7 +292,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark
   TQWhatsThis::add( lePattern, i18n(
       "<p>A regular expression. Matching lines will be bookmarked.</p>" ) );
 
-  connect( lePattern, TQT_SIGNAL(textChanged ( const TQString & ) ),this, TQT_SLOT( slotPatternChanged( const TQString& ) ) );
+  connect( lePattern, TQ_SIGNAL(textChanged ( const TQString & ) ),this, TQ_SLOT( slotPatternChanged( const TQString& ) ) );
 
   cbCS = new TQCheckBox( i18n("Case &sensitive"), w );
   lo->addMultiCellWidget( cbCS, 1, 1, 0, 2 );
@@ -334,7 +334,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark
   TQToolButton *btnMTW = new TQToolButton(w);
   lo->addWidget( btnMTW, 4, 2 );
   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(
       "<p>Click this button to display a checkable list of mimetypes available "
       "on your system. When used, the file masks entry above will be filled in "
@@ -419,10 +419,10 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char
 
   lo1->addStretch( 1 );
 
-  connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) );
-  connect( btnDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDel()) );
-  connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) );
-  connect( lvPatterns, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotEdit()) );
+  connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) );
+  connect( btnDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDel()) );
+  connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) );
+  connect( lvPatterns, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotEdit()) );
 
   m_ents = new ABEntityList();
   m_ents->setAutoDelete( true );
diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h
index 9687d8ceb..1f6d1daeb 100644
--- a/kate/plugins/autobookmarker/autobookmarker.h
+++ b/kate/plugins/autobookmarker/autobookmarker.h
@@ -50,7 +50,7 @@ class AutoBookmarker
   : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface,
     public KTextEditor::ConfigInterfaceExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     AutoBookmarker( TQObject *parent = 0,
                         const char* name = 0,
@@ -96,7 +96,7 @@ class ABGlobal
 
 class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     AutoBookmarkerConfigPage( TQWidget *parent, const char *name );
     virtual ~AutoBookmarkerConfigPage() {};
@@ -118,7 +118,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
 
 class AutoBookmarkerEntEditor : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e );
     ~AutoBookmarkerEntEditor(){};
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index e2e3d354a..ed6cd3c6f 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char
   view->insertChildClient( this );
   setInstance( KGenericFactory<InsertFilePlugin>::instance() );
   _job = 0;
-  (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
+  (void) new TDEAction( i18n("Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" );
   setXMLFile( "tdetexteditor_insertfileui.rc" );
 }
 
@@ -104,7 +104,7 @@ void InsertFilePluginView::slotInsertFile()
     KURL destURL;
     destURL.setPath( _tmpfile );
     _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true );
-    connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) );
+    connect( _job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished ( TDEIO::Job * ) ) );
   }
 }
 
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index da08a02c7..0f7bfc2c9 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -32,7 +32,7 @@
 
 class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface
 {             
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     InsertFilePlugin( TQObject *parent = 0, 
@@ -50,7 +50,7 @@ class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginV
 
 class InsertFilePluginView : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     InsertFilePluginView( KTextEditor::View *view, const char *name=0 );
     ~InsertFilePluginView() {};
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index 4ee93cb87..306fcf596 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -66,11 +66,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 
 	m_searchForwardAction = new TDEAction(
 		i18n("Search Incrementally"), CTRL+ALT+Key_F,
-		this, TQT_SLOT(slotSearchForwardAction()),
+		this, TQ_SLOT(slotSearchForwardAction()),
 		actionCollection(), "edit_isearch" );
 	m_searchBackwardAction = new TDEAction(
 		i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F,
-		this, TQT_SLOT(slotSearchBackwardAction()),
+		this, TQ_SLOT(slotSearchBackwardAction()),
 		actionCollection(), "edit_isearch_reverse" );
 
 	m_label = new TQLabel( i18n("I-Search:"), 0L, "tde toolbar widget" );
@@ -84,12 +84,12 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 	m_combo->setDuplicatesEnabled( false );
 	m_combo->setMaximumWidth( 300 );
 	m_combo->lineEdit()->installEventFilter( this );
-	connect( m_combo, TQT_SIGNAL(textChanged(const TQString&)),
-	         this, TQT_SLOT(slotTextChanged(const TQString&)) );
-	connect( m_combo, TQT_SIGNAL(returnPressed(const TQString&)),
-	         this, TQT_SLOT(slotReturnPressed(const TQString&)) );
-	connect( m_combo, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)),
-		 this, TQT_SLOT(slotAddContextMenuItems(TQPopupMenu*)) );
+	connect( m_combo, TQ_SIGNAL(textChanged(const TQString&)),
+	         this, TQ_SLOT(slotTextChanged(const TQString&)) );
+	connect( m_combo, TQ_SIGNAL(returnPressed(const TQString&)),
+	         this, TQ_SLOT(slotReturnPressed(const TQString&)) );
+	connect( m_combo, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)),
+		 this, TQ_SLOT(slotAddContextMenuItems(TQPopupMenu*)) );
 	m_comboAction = new KWidgetAction(
 		m_combo,
 		i18n("Search"), 0, 0, 0,
@@ -106,8 +106,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 		i18n("Case Sensitive"), TDEShortcut(),
 		actionCollection(), "isearch_case_sensitive" );
 	action->setShortcutConfigurable( false );
-	connect( action, TQT_SIGNAL(toggled(bool)),
-	         this, TQT_SLOT(setCaseSensitive(bool)) );
+	connect( action, TQ_SIGNAL(toggled(bool)),
+	         this, TQ_SLOT(setCaseSensitive(bool)) );
 	action->setChecked( m_caseSensitive );
 	optionMenu->insert( action );
 
@@ -115,8 +115,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 		i18n("From Beginning"), TDEShortcut(),
 		actionCollection(), "isearch_from_beginning" );
 	action->setShortcutConfigurable( false );
-	connect( action, TQT_SIGNAL(toggled(bool)),
-	         this, TQT_SLOT(setFromBeginning(bool)) );
+	connect( action, TQ_SIGNAL(toggled(bool)),
+	         this, TQ_SLOT(setFromBeginning(bool)) );
 	action->setChecked( m_fromBeginning );
 	optionMenu->insert( action );
 
@@ -124,8 +124,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 		i18n("Regular Expression"), TDEShortcut(),
 		actionCollection(), "isearch_reg_exp" );
 	action->setShortcutConfigurable( false );
-	connect( action, TQT_SIGNAL(toggled(bool)),
-	         this, TQT_SLOT(setRegExp(bool)) );
+	connect( action, TQ_SIGNAL(toggled(bool)),
+	         this, TQ_SLOT(setRegExp(bool)) );
 	action->setChecked( m_regExp );
 	optionMenu->insert( action );
 
@@ -134,8 +134,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view )
 // 	action = new TDEToggleAction(
 // 		i18n("Auto-Wrap Search"), TDEShortcut(),
 // 		actionCollection(), "isearch_auto_wrap" );
-// 	connect( action, TQT_SIGNAL(toggled(bool)),
-// 	         this, TQT_SLOT(setAutoWrap(bool)) );
+// 	connect( action, TQ_SIGNAL(toggled(bool)),
+// 	         this, TQ_SLOT(setAutoWrap(bool)) );
 // 	action->setChecked( m_autoWrap );
 // 	optionMenu->insert( action );
 
@@ -204,7 +204,7 @@ void ISearchPluginView::setAutoWrap( bool autoWrap )
 
 bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e )
 {
-	if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(m_combo->lineEdit()) )
+	if( o != m_combo->lineEdit() )
 		return false;
 
 	if( e->type() == TQEvent::FocusIn ) {
@@ -225,7 +225,7 @@ bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e )
 
 	if( e->type() == TQEvent::KeyPress ) {
 		TQKeyEvent *keyEvent = (TQKeyEvent*)e;
-		if( keyEvent->key() == Qt::Key_Escape )
+		if( keyEvent->key() == TQt::Key_Escape )
 			quitToView( TQString::null );
 	}
 
@@ -410,13 +410,13 @@ void ISearchPluginView::slotAddContextMenuItems( TQPopupMenu *menu )
 	if( menu ) {
 		menu->insertSeparator();
 		menu->insertItem( i18n("Case Sensitive"), this,
-				  TQT_SLOT(setCaseSensitive(bool)));
+				  TQ_SLOT(setCaseSensitive(bool)));
 		menu->insertItem( i18n("From Beginning"), this,
-				  TQT_SLOT(setFromBeginning(bool)));
+				  TQ_SLOT(setFromBeginning(bool)));
 		menu->insertItem( i18n("Regular Expression"), this,
-				  TQT_SLOT(setRegExp(bool)));
+				  TQ_SLOT(setRegExp(bool)));
 		//menu->insertItem( i18n("Auto-Wrap Search"), this,
-		//		  TQT_SLOT(setAutoWrap(bool)));
+		//		  TQ_SLOT(setAutoWrap(bool)));
 	}
 }
 
diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h
index b11b2a8b6..e1893c516 100644
--- a/kate/plugins/isearch/ISearchPlugin.h
+++ b/kate/plugins/isearch/ISearchPlugin.h
@@ -34,7 +34,7 @@ class TQLabel;
 
 class ISearchPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	ISearchPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
@@ -49,7 +49,7 @@ private:
 
 class ISearchPluginView : public TQObject, public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	ISearchPluginView( KTextEditor::View *view );
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index e14cd9249..00edb8ced 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -76,7 +76,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view )
 	setInstance( KGenericFactory<KDataToolPlugin>::instance() );
 
 	m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool");
-	connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow()));
+	connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShow()));
 	setXMLFile("tdetexteditor_kdatatoolui.rc");
 
 	m_view = view;
@@ -151,7 +151,7 @@ void KDataToolPluginView::aboutToShow()
 			m_singleWord_line = line;
 		} else {
 			m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, 
-					TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
+					TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
 			m_menu->insert(m_notAvailable);
 			return;
 		}
@@ -160,12 +160,12 @@ void KDataToolPluginView::aboutToShow()
 	TDEInstance *inst=instance();
 
 	TQValueList<KDataToolInfo> tools;
-	tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "text/plain", inst );
+	tools += KDataToolInfo::query( "TQString", "text/plain", inst );
 	if( m_singleWord )
-		tools += KDataToolInfo::query( TQSTRING_OBJECT_NAME_STRING, "application/x-singleword", inst );
+		tools += KDataToolInfo::query( "TQString", "application/x-singleword", inst );
 
 	m_actionList = KDataToolAction::dataToolActionList( tools, this,
-		TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) );
+		TQ_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) );
 
 	for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) {
 		m_menu->insert(ac);
@@ -173,7 +173,7 @@ void KDataToolPluginView::aboutToShow()
 
 	if( m_actionList.isEmpty() ) {
 		m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this,
-			TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
+			TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av");
 		m_menu->insert(m_notAvailable);
 	}
 }
@@ -203,7 +203,7 @@ void KDataToolPluginView::slotToolActivated( const KDataToolInfo &info, const TQ
 		text = m_wordUnderCursor;
 
 	TQString mimetype = "text/plain";
-	TQString datatype = TQSTRING_OBJECT_NAME_STRING;
+	TQString datatype = "TQString";
 
 	// If unsupported (and if we have a single word indeed), try application/x-singleword
 	if ( !info.mimeTypes().contains( mimetype ) && m_singleWord )
diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h
index a217c6f27..b3ef86767 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.h
+++ b/kate/plugins/kdatatool/kate_kdatatool.h
@@ -36,7 +36,7 @@ class View;
 
 class KDataToolPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KDataToolPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
@@ -51,7 +51,7 @@ public:
 
 class KDataToolPluginView : public TQObject, public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KDataToolPluginView( KTextEditor::View *view );
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 793f9820c..83933bfce 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -146,15 +146,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au
   setInstance( KGenericFactory<DocWordCompletionPlugin>::instance() );
 
   (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this,
-    TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" );
+    TQ_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" );
   (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this,
-    TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" );
+    TQ_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" );
   (void) new TDEAction( i18n("Pop Up Completion List"), 0, this,
-    TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" );
+    TQ_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" );
   (void) new TDEAction( i18n("Shell Completion"), 0, this,
-    TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" );
+    TQ_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" );
   d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this,
-    TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" );
+    TQ_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" );
 
   d->autopopup->setChecked( autopopup );
   toggleAutoPopup();
@@ -168,8 +168,8 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au
     if ( ! e.isEmpty() )
       d->autopopup->setEnabled( e == "true" );
 
-    connect( view->document(), TQT_SIGNAL(variableChanged(const TQString &, const TQString &)),
-             this, TQT_SLOT(slotVariableChanged(const TQString &, const TQString &)) );
+    connect( view->document(), TQ_SIGNAL(variableChanged(const TQString &, const TQString &)),
+             this, TQ_SLOT(slotVariableChanged(const TQString &, const TQString &)) );
   }
 }
 
@@ -203,15 +203,15 @@ void DocWordCompletionPluginView::popupCompletionList( TQString w )
 void DocWordCompletionPluginView::toggleAutoPopup()
 {
   if ( d->autopopup->isChecked() ) {
-    if ( ! connect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),
-         this, TQT_SLOT(autoPopupCompletionList()) ))
+    if ( ! connect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),
+         this, TQ_SLOT(autoPopupCompletionList()) ))
     {
-      connect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) );
+      connect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) );
     }
   } else {
-    disconnect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) );
-    disconnect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),
-                this, TQT_SLOT(autoPopupCompletionList()) );
+    disconnect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) );
+    disconnect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),
+                this, TQ_SLOT(autoPopupCompletionList()) );
 
   }
 }
diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h
index f22f99d4e..e2ff3cfb2 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.h
+++ b/kate/plugins/wordcompletion/docwordcompletion.h
@@ -44,7 +44,7 @@ class DocWordCompletionPlugin
   , public KTextEditor::PluginViewInterface
   , public KTextEditor::ConfigInterfaceExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DocWordCompletionPlugin( TQObject *parent = 0,
@@ -81,7 +81,7 @@ class DocWordCompletionPlugin
 class DocWordCompletionPluginView
    : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DocWordCompletionPluginView( uint treshold=3, bool autopopup=true, KTextEditor::View *view=0,
@@ -113,7 +113,7 @@ class DocWordCompletionPluginView
 
 class DocWordCompletionConfigPage : public KTextEditor::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     DocWordCompletionConfigPage( DocWordCompletionPlugin *completion, TQWidget *parent, const char *name );
     virtual ~DocWordCompletionConfigPage() {};
diff --git a/kded/Mainpage.dox b/kded/Mainpage.dox
index 10a9da06a..95ba4a4cf 100644
--- a/kded/Mainpage.dox
+++ b/kded/Mainpage.dox
@@ -1,11 +1,11 @@
-/** @mainpage The Trinity Daemon
+/** @mainpage The Trinity Daemon (KDED)
 
-TrinityD runs in the background and performs a number of small tasks.  Some
+KDED runs in the background and performs a number of small tasks.  Some
 of these tasks are built in, others are started on demand.
 <p>
 The chances are you are looking here because you want to write a
-TrinityD module.  For that, see TrinityDModule in tdecore and the
-<a href="http://websvn.kde.org/trunk/Trinity/tdelibs/kded/README.kded?view=markup">TrinityD
+KDED module.  For that, see KDEDModule in tdecore and the
+<a href="https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/src/branch/master/kded">KDED
 README</a>.
 
 
@@ -22,4 +22,4 @@ Waldo Bastian \<bastian@kde.org\>
 */
 
 // DOXYGEN_REFERENCES = tdecore tdeui tdeio
-// DOXYGEN_SET_PROJECT_NAME = TrinityD
+// DOXYGEN_SET_PROJECT_NAME = KDED
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index da2863347..b85776166 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -106,7 +106,7 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource
          || (mime == "media/builtin-trash")
          || (mime == "media/builtin-webbrowser") )
     e = new KDEDesktopMimeType( &desktopFile );
-  else if ( mime == "application/x-executable" || mime == "application/x-shellscript" )
+  else if ( mime == "application/x-executable" || mime == "application/x-pie-executable" || mime == "application/x-shellscript" )
     e = new KExecMimeType( &desktopFile );
   else if ( !mime.isEmpty() )
     e = new KMimeType( &desktopFile );
diff --git a/kded/kded.cpp b/kded/kded.cpp
index e1b3b6b33..1153bcf25 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -48,7 +48,7 @@
 #include <tdeio/global.h>
 #include <kservicetype.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -110,9 +110,9 @@ Kded::Kded(bool checkUpdates, bool new_startup)
   else
      cPath = tdesycoca_env;
   m_pTimer = new TQTimer(this);
-  connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate()));
+  connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(recreate()));
 
-  TQTimer::singleShot(100, this, TQT_SLOT(installCrashHandler()));
+  TQTimer::singleShot(100, this, TQ_SLOT(installCrashHandler()));
 
   m_pDirWatch = 0;
 
@@ -316,7 +316,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)
         {
           m_modules.insert(obj, module);
           m_libs.insert(obj, lib);
-          connect(module, TQT_SIGNAL(moduleDeleted(KDEDModule *)), TQT_SLOT(slotKDEDModuleRemoved(KDEDModule *)));
+          connect(module, TQ_SIGNAL(moduleDeleted(KDEDModule *)), TQ_SLOT(slotKDEDModuleRemoved(KDEDModule *)));
           kdDebug(7020) << "Successfully loaded module '" << obj << "'\n";
           return module;
         }
@@ -400,12 +400,12 @@ void Kded::updateDirWatch()
   delete m_pDirWatch;
   m_pDirWatch = new KDirWatch;
 
-  TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
-           this, TQT_SLOT(update(const TQString&)));
-  TQObject::connect( m_pDirWatch, TQT_SIGNAL(created(const TQString&)),
-           this, TQT_SLOT(update(const TQString&)));
-  TQObject::connect( m_pDirWatch, TQT_SIGNAL(deleted(const TQString&)),
-           this, TQT_SLOT(dirDeleted(const TQString&)));
+  TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)),
+           this, TQ_SLOT(update(const TQString&)));
+  TQObject::connect( m_pDirWatch, TQ_SIGNAL(created(const TQString&)),
+           this, TQ_SLOT(update(const TQString&)));
+  TQObject::connect( m_pDirWatch, TQ_SIGNAL(deleted(const TQString&)),
+           this, TQ_SLOT(dirDeleted(const TQString&)));
 
   // For each resource
   for( TQStringList::ConstIterator it = m_allResourceDirs.begin();
@@ -480,7 +480,7 @@ void Kded::recreate(bool initial)
    if (!initial)
    {
       updateDirWatch(); // Update tree first, to be sure to miss nothing.
-      runBuildSycoca(this, TQT_SLOT(recreateDone()));
+      runBuildSycoca(this, TQ_SLOT(recreateDone()));
    }
    else
    {
@@ -491,7 +491,7 @@ void Kded::recreate(bool initial)
       if(delayedCheck)
       {
          // do a proper tdesycoca check after a delay
-         TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck()));
+         TQTimer::singleShot( 60000, this, TQ_SLOT( runDelayedCheck()));
          m_needDelayedCheck = true;
          delayedCheck = false;
       }
@@ -667,9 +667,9 @@ KUpdateD::KUpdateD()
 {
     m_pDirWatch = new KDirWatch;
     m_pTimer = new TQTimer;
-    connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runKonfUpdate()));
-    TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)),
-           this, TQT_SLOT(slotNewUpdateFile()));
+    connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runKonfUpdate()));
+    TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)),
+           this, TQ_SLOT(slotNewUpdateFile()));
 
     TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update");
     for( TQStringList::ConstIterator it = dirs.begin();
@@ -704,7 +704,7 @@ void KUpdateD::slotNewUpdateFile()
 KHostnameD::KHostnameD(int pollInterval)
 {
     m_Timer.start(pollInterval, false /* repetitive */ );
-    connect(&m_Timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkHostname()));
+    connect(&m_Timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkHostname()));
     checkHostname();
 }
 
@@ -785,7 +785,7 @@ public:
           if( Kded::self()->newStartup())
              Kded::self()->initModules();
           else
-	     TQTimer::singleShot(500, Kded::self(), TQT_SLOT(initModules()));
+	     TQTimer::singleShot(500, Kded::self(), TQ_SLOT(initModules()));
        } else 
           runBuildSycoca();
 
@@ -955,8 +955,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
         (void) new KHostnameD(HostnamePollInterval); // Watch for hostname changes
 
      DCOPClient *client = kapp->dcopClient();
-     TQObject::connect(client, TQT_SIGNAL(applicationRemoved(const TQCString&)),
-             kded, TQT_SLOT(slotApplicationRemoved(const TQCString&)));
+     TQObject::connect(client, TQ_SIGNAL(applicationRemoved(const TQCString&)),
+             kded, TQ_SLOT(slotApplicationRemoved(const TQCString&)));
      client->setNotifications(true);
      client->setDaemonMode( true );
 
@@ -969,7 +969,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      TQByteArray data;
      client->send( "*", "tdesycoca", "notifyDatabaseChanged()", data );
      client->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kded"));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
      XEvent e;
      e.xclient.type = ClientMessage;
      e.xclient.message_type = XInternAtom( tqt_xdisplay(), "_KDE_SPLASH_PROGRESS", False );
diff --git a/kded/kded.h b/kded/kded.h
index a4968624a..ad6a8353c 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -40,7 +40,7 @@ class KService;
 // No need for this in libtdeio - apps only get readonly access
 class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
    Kded(bool checkUpdates, bool new_startup);
    virtual ~Kded();
@@ -175,7 +175,7 @@ private:
 
 class KUpdateD : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KUpdateD();
    ~KUpdateD();
@@ -202,7 +202,7 @@ private:
 
 class KHostnameD : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KHostnameD(int pollInterval);
    ~KHostnameD();
diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp
index 61da755b3..230f08db2 100644
--- a/kded/kdedmodule.cpp
+++ b/kded/kdedmodule.cpp
@@ -41,7 +41,7 @@ KDEDModule::KDEDModule(const TQCString &name) : TQObject(), DCOPObject(name)
    d = new KDEDModulePrivate;
    d->objMap = 0;
    d->timeout = 0;
-   connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(idle()));
+   connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(idle()));
 }
   
 KDEDModule::~KDEDModule()
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index f3954e842..bdc9cb6d2 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -54,7 +54,7 @@ class Kded;
 
 class KDE_EXPORT KDEDModule : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 // For inclusion in KDE4 (since it's BIC) long-needed fix for allowing
 // DCOP-based kdedmodules -- Gav <gav@kde.org>.
 //  K_DCOP
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index f7ae2ce3b..d3ba42f19 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -63,7 +63,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <time.h>
-#include <memory> // auto_ptr
+#include <memory>
 
 typedef TQDict<KSycocaEntry> KBSEntryDict;
 typedef TQValueList<KSycocaEntry::List> KSycocaEntryListList;
@@ -376,8 +376,8 @@ bool KBuildSycoca::build()
      if (!m_trackId.isEmpty())
         g_vfolder->setTrackId(m_trackId);
 
-     connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
-             this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
+     connect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)),
+             this, TQ_SLOT(slotCreateEntry(const TQString &, KService **)));
              
      VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true);
 
@@ -390,8 +390,8 @@ bool KBuildSycoca::build()
      (void) existingResourceDirs();
      *g_allResourceDirs += g_vfolder->allDirectories();
 
-     disconnect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
-             this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
+     disconnect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)),
+             this, TQ_SLOT(slotCreateEntry(const TQString &, KService **)));
 
      if (g_changed || !g_allEntries)
      {
@@ -462,13 +462,13 @@ void KBuildSycoca::createMenu(TQString caption, TQString name, VFolderMenu::SubM
 bool KBuildSycoca::recreate()
 {
   TQString path(sycocaPath());
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   printf("tdebuildsycoca: path='%s'\n", (const char*)path);
 #endif
 
   // KSaveFile first writes to a temp file.
   // Upon close() it moves the stuff to the right place.
-  std::auto_ptr<KSaveFile> database( new KSaveFile(path) );
+  std::unique_ptr<KSaveFile> database( new KSaveFile(path) );
   if (database->status() == EACCES && TQFile::exists(path))
   {
     TQFile::remove( path );
@@ -709,7 +709,7 @@ static TDECmdLineOptions options[] = {
 static const char appName[] = "tdebuildsycoca";
 static const char appVersion[] = "1.1";
 
-class WaitForSignal : public QObject
+class WaitForSignal : public TQObject
 {
 public:
    ~WaitForSignal() { kapp->eventLoop()->exitLoop(); }
@@ -747,7 +747,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 #ifdef KBUILDSYCOCA_GUI
    silent = args->isSet("silent");
    showprogress = args->isSet("showprogress");
-   TQLabel progress( TQString("<p><br><nobr>    %1    </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", Qt::WType_Dialog | Qt::WStyle_DialogBorder  | Qt::WStyle_Customize| Qt::WStyle_Title );
+   TQLabel progress( TQString("<p><br><nobr>    %1    </nobr><br>").arg( i18n("Reloading TDE configuration, please wait...") ), 0, "", TQt::WType_Dialog | TQt::WStyle_DialogBorder  | TQt::WStyle_Customize| TQt::WStyle_Title );
    TQString capt = i18n("TDE Configuration Manager");
    if (!silent) {
      if (KMessageBox::No == KMessageBox::questionYesNo(0, i18n("Do you want to reload TDE configuration?"), capt, i18n("Reload"), i18n("Do Not Reload")))
@@ -790,8 +790,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      while (dcopClient->isApplicationRegistered(appName))
      {
        WaitForSignal *obj = new WaitForSignal;
-       obj->connect(dcopClient, TQT_SIGNAL(applicationRemoved(const TQCString &)),
-               TQT_SLOT(deleteLater()));
+       obj->connect(dcopClient, TQ_SIGNAL(applicationRemoved(const TQCString &)),
+               TQ_SLOT(deleteLater()));
        kapp->eventLoop()->enterLoop();
      }
      dcopClient->setNotifications( false );
diff --git a/kded/tdebuildsycoca.h b/kded/tdebuildsycoca.h
index 51e7af337..77b685a41 100644
--- a/kded/tdebuildsycoca.h
+++ b/kded/tdebuildsycoca.h
@@ -37,7 +37,7 @@ class TQDataStream;
 // No need for this in libtdeio - apps only get readonly access
 class KBuildSycoca : public KSycoca
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KBuildSycoca();
    virtual ~KBuildSycoca();
diff --git a/kded/test/test.h b/kded/test/test.h
index 9382a6fba..5ce672e0d 100644
--- a/kded/test/test.h
+++ b/kded/test/test.h
@@ -8,7 +8,7 @@
 
 class TestModule : public KDEDModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    TestModule(const TQCString &obj);
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index 2e04965ea..880a17576 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -311,25 +311,6 @@ VFolderMenu::~VFolderMenu()
    delete m_rootMenu;
 }
 
-#define FOR_ALL_APPLICATIONS(it) \
-   for(appsInfo *info = m_appsInfoStack.first(); \
-       info; info = m_appsInfoStack.next()) \
-   { \
-      for(TQDictIterator<KService> it( info->applications ); \
-          it.current(); ++it ) \
-      {
-#define FOR_ALL_APPLICATIONS_END } }
-
-#define FOR_CATEGORY(category, it) \
-   for(appsInfo *info = m_appsInfoStack.first(); \
-       info; info = m_appsInfoStack.next()) \
-   { \
-      KService::List *list = info->dictCategories.find(category); \
-      if (list) for(KService::List::ConstIterator it = list->begin(); \
-             it != list->end(); ++it) \
-      {
-#define FOR_CATEGORY_END } }
-
 KService *
 VFolderMenu::findApplication(const TQString &relPath)
 {
@@ -934,12 +915,14 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
    }
    else if (domElem.tagName() == "Not")
    {
-      FOR_ALL_APPLICATIONS(it)
-      {
-         KService *s = it.current();
-         items->replace(s->menuId(), s);
-      }
-      FOR_ALL_APPLICATIONS_END
+		 for (appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next())
+		 {
+			 for (TQDictIterator<KService> it( info->applications ); it.current(); ++it )
+			 {
+				 KService *s = it.current();
+				 items->replace(s->menuId(), s);
+			 }
+		 }
 
       TQDict<KService> notItems;
       TQDomNode n = domElem.firstChild();
@@ -955,21 +938,29 @@ VFolderMenu::processCondition(TQDomElement &domElem, TQDict<KService> *items)
    }
    else if (domElem.tagName() == "Category")
    {
-      FOR_CATEGORY(domElem.text(), it)
-      {
-         KService *s = *it;
-         items->replace(s->menuId(), s);
-      }
-      FOR_CATEGORY_END
+		 for (appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next())
+		 {
+			 KService::List *list = info->dictCategories.find(domElem.text());
+			 if (list)
+			 {
+				 for(KService::List::ConstIterator it = list->begin(); it != list->end(); ++it)
+				 {
+					 KService *s = *it;
+					 items->replace(s->menuId(), s);
+				 }
+			 }
+		 }
    }
    else if (domElem.tagName() == "All")
    {
-      FOR_ALL_APPLICATIONS(it)
-      {
-         KService *s = it.current();
-         items->replace(s->menuId(), s);
-      }
-      FOR_ALL_APPLICATIONS_END
+		 for (appsInfo *info = m_appsInfoStack.first(); info; info = m_appsInfoStack.next())
+		 {
+			 for (TQDictIterator<KService> it( info->applications ); it.current(); ++it )
+			 {
+				 KService *s = it.current();
+				 items->replace(s->menuId(), s);
+			 }
+		 }
    }
    else if (domElem.tagName() == "Filename")
    {
diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h
index a2536af7d..98f09702c 100644
--- a/kded/vfolder_menu.h
+++ b/kded/vfolder_menu.h
@@ -31,7 +31,7 @@
 
 class VFolderMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   class appsInfo;
   class SubMenu {
diff --git a/kdoctools/README b/kdoctools/README
index 869288dad..33ea7b9b1 100644
--- a/kdoctools/README
+++ b/kdoctools/README
@@ -11,5 +11,5 @@ bug reports, etc, etc.
 
 Contribute
 ----------
-Mail any problems, suggestions, ... to trinity-devel@lists.pearsoncomputing.net, a mailing
+Mail any problems, suggestions, ... to devels@trinitydesktop.org, a mailing
 list for discussing Trinity development and TDE documentation.
diff --git a/kdoctools/customization/catalog b/kdoctools/customization/catalog
index 5032e6112..26bc5749e 100644
--- a/kdoctools/customization/catalog
+++ b/kdoctools/customization/catalog
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Send suggestions, comments, etc. to the TDE Developers mailing list
-<trinity-devel@lists.pearsoncomputing.net>.
+<devels@trinitydesktop.org>.
 --
 
 OVERRIDE YES
diff --git a/kdoctools/customization/catalog.xml b/kdoctools/customization/catalog.xml
index 88b44d27d..7185dd83a 100644
--- a/kdoctools/customization/catalog.xml
+++ b/kdoctools/customization/catalog.xml
@@ -21,7 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Send suggestions, comments, etc. to the TDE Developers mailing list
-<trinity-devel@lists.pearsoncomputing.net>.
+<devels@trinitydesktop.org>.
 -->
 
 <!-- DocBook -->
diff --git a/kdoctools/customization/dtd/kdex.dtd b/kdoctools/customization/dtd/kdex.dtd
index ee0c7574a..c3070946a 100644
--- a/kdoctools/customization/dtd/kdex.dtd
+++ b/kdoctools/customization/dtd/kdex.dtd
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     
     Send suggestions, comments, etc. to the TDE development team 
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
 
     USAGE
diff --git a/kdoctools/customization/dtd/modifications.elements b/kdoctools/customization/dtd/modifications.elements
index 59f09bd5c..bdebe2e19 100644
--- a/kdoctools/customization/dtd/modifications.elements
+++ b/kdoctools/customization/dtd/modifications.elements
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     
     Send suggestions, comments, etc. to the TDE development team 
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
     USAGE
 
diff --git a/kdoctools/customization/dtd/rdbhier2.elements b/kdoctools/customization/dtd/rdbhier2.elements
index af708f79c..801ec5d5d 100644
--- a/kdoctools/customization/dtd/rdbhier2.elements
+++ b/kdoctools/customization/dtd/rdbhier2.elements
@@ -20,7 +20,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
     USAGE
 
diff --git a/kdoctools/customization/dtd/rdbpool.elements b/kdoctools/customization/dtd/rdbpool.elements
index 68509622d..605a34713 100644
--- a/kdoctools/customization/dtd/rdbpool.elements
+++ b/kdoctools/customization/dtd/rdbpool.elements
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
     USAGE
 
diff --git a/kdoctools/customization/en-GB/strings.entities b/kdoctools/customization/en-GB/strings.entities
index a1db15f0a..316ef97a8 100644
--- a/kdoctools/customization/en-GB/strings.entities
+++ b/kdoctools/customization/en-GB/strings.entities
@@ -25,7 +25,7 @@
 <!-- modespec entity: must be adapted in accordance with the normal usage
      for documents in a language; the most likely candidates are the value
      of xreflabel (now %t for title of section referred to) and the content
-     (now empty).  If more than one format is needed, contact trinity-devel@lists.pearsoncomputing.net.
+     (now empty).  If more than one format is needed, contact devels@trinitydesktop.org.
      ** In general, this setup will not work with more than one language in 
         a document **
      Usage: in <bookinfo>
diff --git a/kdoctools/customization/en/strings.entities b/kdoctools/customization/en/strings.entities
index a1db15f0a..316ef97a8 100644
--- a/kdoctools/customization/en/strings.entities
+++ b/kdoctools/customization/en/strings.entities
@@ -25,7 +25,7 @@
 <!-- modespec entity: must be adapted in accordance with the normal usage
      for documents in a language; the most likely candidates are the value
      of xreflabel (now %t for title of section referred to) and the content
-     (now empty).  If more than one format is needed, contact trinity-devel@lists.pearsoncomputing.net.
+     (now empty).  If more than one format is needed, contact devels@trinitydesktop.org.
      ** In general, this setup will not work with more than one language in 
         a document **
      Usage: in <bookinfo>
diff --git a/kdoctools/customization/entities/contributor.entities b/kdoctools/customization/entities/contributor.entities
index d858dea6b..77fc6952e 100644
--- a/kdoctools/customization/entities/contributor.entities
+++ b/kdoctools/customization/entities/contributor.entities
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team mailing list
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
     USAGE
 
@@ -447,4 +447,4 @@
 <!ENTITY Danny.Allen.mail '<email>danny@dannyallen.co.uk</email>'>
 
 <!ENTITY tde-authors '<personname><surname>The &tde; Team</surname></personname>'>
-<!ENTITY tde-authors.mail '<email>trinity-devel@lists.pearsoncomputing.net</email>'>
+<!ENTITY tde-authors.mail '<email>devels@trinitydesktop.org</email>'>
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index 478033d90..83efffc56 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
 
     USAGE
diff --git a/kdoctools/customization/entities/l10n.entities b/kdoctools/customization/entities/l10n.entities
index 8ab7d4d82..5f1509d33 100644
--- a/kdoctools/customization/entities/l10n.entities
+++ b/kdoctools/customization/entities/l10n.entities
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team mailing list
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
 
     This file sets up the mechanism to load the language-specific
@@ -30,7 +30,7 @@
 
     Every language for which there is documentation must be added
     here.  (English is the default.)  Please send requests for
-    additions to trinity-devel@lists.pearsoncomputing.net.
+    additions to devels@trinitydesktop.org.
 
     Refer to this file as
 
diff --git a/kdoctools/customization/it/strings.entities b/kdoctools/customization/it/strings.entities
index 45c02395d..6fabc54b4 100644
--- a/kdoctools/customization/it/strings.entities
+++ b/kdoctools/customization/it/strings.entities
@@ -25,7 +25,7 @@
 <!-- modespec entity: must be adapted in accordance with the normal usage
      for documents in a language; the most likely candidates are the value
      of xreflabel (now %t for title of section referred to) and the content
-     (now empty).  If more than one format is needed, contact trinity-devel@lists.pearsoncomputing.net.
+     (now empty).  If more than one format is needed, contact devels@trinitydesktop.org.
      ** In general, this setup will not work with more than one language in 
         a document **
      Usage: in <bookinfo>
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index 06a50dc5c..5792a9467 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
 
     USAGE
@@ -356,6 +356,7 @@
 <!ENTITY SGI	"<trademark>SGI</trademark>">
 <!ENTITY Solaris	"<trademark>Solaris</trademark>">
 <!ENTITY SuSE	'<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+<!ENTITY TQt	"<trademark>TQt</trademark>">
 <!ENTITY ThreeCom	'<trademark class="registered">3Com</trademark>'>
 <!ENTITY ttdemidi	"<application>ttdemidi</application>">
 <!ENTITY TrueType	'<trademark class="registered">TrueType</trademark>'>
diff --git a/kdoctools/customization/obsolete/rdbpool.elements b/kdoctools/customization/obsolete/rdbpool.elements
index d608a57da..10853d712 100644
--- a/kdoctools/customization/obsolete/rdbpool.elements
+++ b/kdoctools/customization/obsolete/rdbpool.elements
@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
     Send suggestions, comments, etc. to the TDE development team
-    <trinity-devel@lists.pearsoncomputing.net>.
+    <devels@trinitydesktop.org>.
 
     USAGE
 
diff --git a/kdoctools/customization/pt-BR/strings.entities b/kdoctools/customization/pt-BR/strings.entities
index fbbb77b09..19d03237c 100644
--- a/kdoctools/customization/pt-BR/strings.entities
+++ b/kdoctools/customization/pt-BR/strings.entities
@@ -25,7 +25,7 @@
 <!-- modespec entity: must be adapted in accordance with the normal usage
      for documents in a language; the most likely candidates are the value
      of xreflabel (now %t for title of section referred to) and the content
-     (now empty).  If more than one format is needed, contact trinity-devel@lists.pearsoncomputing.net.
+     (now empty).  If more than one format is needed, contact devels@trinitydesktop.org.
      ** In general, this setup will not work with more than one language in 
         a document **
      Usage: in <bookinfo>
diff --git a/kdoctools/customization/tde-navig.xsl b/kdoctools/customization/tde-navig.xsl
index bd6fc617c..df14bb979 100644
--- a/kdoctools/customization/tde-navig.xsl
+++ b/kdoctools/customization/tde-navig.xsl
@@ -202,7 +202,7 @@
         </div>
 <div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #000000">
 	<p>Would you like to comment or contribute an update to this page?<br/>
-        Send feedback to the <a href="mailto:trinity-devel@lists.pearsoncomputing.net" style="background:transparent; color:#000000; text-decoration: underline;">TDE Development Team</a></p>
+        Send feedback to the <a href="mailto:devels@trinitydesktop.org" style="background:transparent; color:#000000; text-decoration: underline;">TDE Development Team</a></p>
 	</div>
 
       </div>
diff --git a/kdoctools/customization/tr/strings.entities b/kdoctools/customization/tr/strings.entities
index a1db15f0a..316ef97a8 100644
--- a/kdoctools/customization/tr/strings.entities
+++ b/kdoctools/customization/tr/strings.entities
@@ -25,7 +25,7 @@
 <!-- modespec entity: must be adapted in accordance with the normal usage
      for documents in a language; the most likely candidates are the value
      of xreflabel (now %t for title of section referred to) and the content
-     (now empty).  If more than one format is needed, contact trinity-devel@lists.pearsoncomputing.net.
+     (now empty).  If more than one format is needed, contact devels@trinitydesktop.org.
      ** In general, this setup will not work with more than one language in 
         a document **
      Usage: in <bookinfo>
diff --git a/kdoctools/customization/zh-CN/strings.entities b/kdoctools/customization/zh-CN/strings.entities
index a1db15f0a..316ef97a8 100644
--- a/kdoctools/customization/zh-CN/strings.entities
+++ b/kdoctools/customization/zh-CN/strings.entities
@@ -25,7 +25,7 @@
 <!-- modespec entity: must be adapted in accordance with the normal usage
      for documents in a language; the most likely candidates are the value
      of xreflabel (now %t for title of section referred to) and the content
-     (now empty).  If more than one format is needed, contact trinity-devel@lists.pearsoncomputing.net.
+     (now empty).  If more than one format is needed, contact devels@trinitydesktop.org.
      ** In general, this setup will not work with more than one language in 
         a document **
      Usage: in <bookinfo>
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 94c66ff6a..7973fbfbc 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -205,7 +205,7 @@ static TQIODevice *getBZip2device(const TQString &fileName )
 
     if ( base )
     {
-        base->setDevice(TQT_TQIODEVICE(f), true);
+        base->setDevice(f, true);
         return new KFilterDev(base, true);
     }
     return 0;
diff --git a/kglib/TGlibEventLoop.h b/kglib/TGlibEventLoop.h
index 3576cb50d..14ef0d702 100644
--- a/kglib/TGlibEventLoop.h
+++ b/kglib/TGlibEventLoop.h
@@ -25,11 +25,7 @@ Boston, MA 02110-1301, USA.
 #include <tqeventloop.h>
 
 
-#ifdef USE_QT3
-	#define GLIB_EVENT_LOOP TGlibEventLoop glibEventLoop;
-#else
-	#define GLIB_EVENT_LOOP
-#endif
+#define GLIB_EVENT_LOOP TGlibEventLoop glibEventLoop;
 
 
 class TGlibEventLoop : public TQEventLoop {
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index e4a3a5297..be10cf809 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -142,7 +142,7 @@ if( OPENEXR_FOUND )
     DESTINATION ${PLUGIN_INSTALL_DIR}
   )
   # FIXME COMPILE_FLAGS must be written a little better
-  STRING(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}")
+  string(REGEX REPLACE ";" " -I" OPENEXR_INCLUDE_FLAGS "-I${OPENEXR_INCLUDE_DIRS}")
   set_target_properties( ${target}-module PROPERTIES COMPILE_FLAGS "${OPENEXR_INCLUDE_FLAGS}" )
   install( FILES exr.kimgio DESTINATION ${SERVICES_INSTALL_DIR} )
 endif( OPENEXR_FOUND )
diff --git a/kimgio/README b/kimgio/README
index 142823e6c..8905d31a3 100644
--- a/kimgio/README
+++ b/kimgio/README
@@ -1,7 +1,7 @@
 KDE Image I/O library
 ---------------------
 This library allows applications that use the Qt library
-(i.e. QImageIO, QImage, QPixmap and friends) to read and
+(i.e. QImageIO, TQImage, QPixmap and friends) to read and
 write images in extra formats. Current formats include:
 
 JPEG	<read> <write>
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index 22251002c..28e4f9110 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -294,7 +294,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				uchar r, g, b, a;
 				s >> b >> g >> r >> a;
@@ -311,7 +311,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				uchar r, g, b;
 				s >> b >> g >> r;
@@ -328,7 +328,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				Color1555 color;
 				s >> color.u;
@@ -349,7 +349,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				Color4444 color;
 				s >> color.u;
@@ -370,7 +370,7 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		for( uint y = 0; y < h; y++ ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 			for( uint x = 0; x < w; x++ ) {
 				Color565 color;
 				s >> color.u;
@@ -524,11 +524,11 @@ namespace {	// Private.
 		const uint h = header.height;
 
 		BlockDXT block;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -564,11 +564,11 @@ namespace {	// Private.
 
 		BlockDXT block;
 		BlockDXTAlphaExplicit alpha;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -616,11 +616,11 @@ namespace {	// Private.
 
 		BlockDXT block;
 		BlockDXTAlphaLinear alpha;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -671,11 +671,11 @@ namespace {	// Private.
 
 		BlockDXT block;
 		BlockDXTAlphaLinear alpha;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -720,11 +720,11 @@ namespace {	// Private.
 
 		BlockDXTAlphaLinear xblock;
 		BlockDXTAlphaLinear yblock;
-		QRgb * scanline[4];
+		TQRgb * scanline[4];
 
 		for( uint y = 0; y < h; y += 4 ) {
 			for( uint j = 0; j < 4; j++ ) {
-				scanline[j] = (QRgb *) img.scanLine( y + j );
+				scanline[j] = (TQRgb *) img.scanLine( y + j );
 			}
 			for( uint x = 0; x < w; x += 4 ) {
 
@@ -941,9 +941,9 @@ namespace {	// Private.
 
 			// Copy face on the image.
 			for( uint y = 0; y < header.height; y++ ) {
-				QRgb * src = (QRgb *) face.scanLine( y );
-    			QRgb * dst = (QRgb *) img.scanLine( y + offset_y ) + offset_x;
-				memcpy( dst, src, sizeof(QRgb) * header.width );
+				TQRgb * src = (TQRgb *) face.scanLine( y );
+    			TQRgb * dst = (TQRgb *) img.scanLine( y + offset_y ) + offset_x;
+				memcpy( dst, src, sizeof(TQRgb) * header.width );
 			}
 		}
 
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index 5332140fa..862d8237a 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -53,7 +53,7 @@ using namespace Imf;
  * format into the normal 32 bit pixel format. Process is from the
  * ILM code.
  */
-QRgb RgbaToQrgba(struct Rgba imagePixel)
+TQRgb RgbaToQrgba(struct Rgba imagePixel)
 {
 	float r,g,b,a;
 	
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 5f1832f02..0749ce751 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -69,7 +69,7 @@ namespace {	// Private.
 	}
 
 
-	static void RGBE_To_QRgbLine(uchar * image, QRgb * scanline, int width)
+	static void RGBE_To_QRgbLine(uchar * image, TQRgb * scanline, int width)
 	{
 		for (int j = 0; j < width; j++)
 		{
@@ -108,7 +108,7 @@ namespace {	// Private.
 	
 		for (int cline = 0; cline < height; cline++)
 		{
-			QRgb * scanline = (QRgb *) img.scanLine( cline );
+			TQRgb * scanline = (TQRgb *) img.scanLine( cline );
 
 			// determine scanline type
 			if ((width < MINELEN) || (MAXELEN < width))
diff --git a/kimgio/ico.cpp b/kimgio/ico.cpp
index e14f09fb5..bf53ecc3b 100644
--- a/kimgio/ico.cpp
+++ b/kimgio/ico.cpp
@@ -169,9 +169,9 @@ namespace
         if ( icon.isNull() ) return false;
         icon.setAlphaBuffer( true );
 
-        TQMemArray< QRgb > colorTable( paletteSize );
+        TQMemArray< TQRgb > colorTable( paletteSize );
         
-        colorTable.fill( QRgb( 0 ) );
+        colorTable.fill( TQRgb( 0 ) );
         for ( unsigned i = 0; i < paletteEntries; ++i )
         {
             unsigned char rgb[ 4 ];
@@ -188,7 +188,7 @@ namespace
         {
             stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl );
             unsigned char* pixel = buf;
-            QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
+            TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] );
             switch ( header.biBitCount )
             {
                 case 1:
@@ -230,10 +230,10 @@ namespace
             for ( unsigned y = rec.height; y--; )
             {
                 stream.readRawBytes( reinterpret_cast< char* >( buf ), bpl );
-                QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
+                TQRgb* p = reinterpret_cast< TQRgb* >( lines[ y ] );
                 for ( unsigned x = 0; x < rec.width; ++x, ++p )
                     if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
-                        *p &= TQRGB_MASK;
+                        *p &= TQT_RGB_MASK;
             }
             delete[] buf;
         }
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 1f3f09c0a..5b7e4318e 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -45,7 +45,7 @@ jas_image_t*
 read_image( const TQImageIO* io )
 {
     jas_stream_t* in = 0;
-    // for QIODevice's other than TQFile, a temp. file is used.
+    // for TQIODevice's other than TQFile, a temp. file is used.
     KTempFile* tempf = 0;
 
     TQFile* qf = 0;
@@ -279,7 +279,16 @@ kimgio_jp2_write( TQImageIO* io )
 	TQTextStream ts( &rate, IO_WriteOnly );
 	ts << "rate="
 		<< ( (io->quality() < 0) ? DEFAULT_RATE : io->quality() / 100.0F );
+#	if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3)
+	const jas_image_fmtinfo_t *jp2_fmtinfo = jas_image_lookupfmtbyname("jp2");
+	int i = -1;
+	if (jp2_fmtinfo)
+	{
+		i = jas_image_encode(ji, stream, jp2_fmtinfo->id, rate.utf8().data());
+	}
+#	else
 	int i = jp2_encode( ji, stream, rate.utf8().data() );
+#	endif
 
 	jas_image_destroy( ji );
 	jas_stream_close( stream );
diff --git a/kimgio/pcx.cpp b/kimgio/pcx.cpp
index 7a5c843fa..ea02b67a9 100644
--- a/kimgio/pcx.cpp
+++ b/kimgio/pcx.cpp
@@ -467,7 +467,7 @@ static void writeImage24( TQImage &img, TQDataStream &s, PCXHEADER &header )
 
     for ( unsigned int x=0; x<header.width(); ++x )
     {
-      QRgb rgb = *p++;
+      TQRgb rgb = *p++;
       r_buf[ x ] = tqRed( rgb );
       g_buf[ x ] = tqGreen( rgb );
       b_buf[ x ] = tqBlue( rgb );
diff --git a/kimgio/pcx.h b/kimgio/pcx.h
index 3bf111773..c72b01733 100644
--- a/kimgio/pcx.h
+++ b/kimgio/pcx.h
@@ -27,7 +27,7 @@ class RGB
   public:
     RGB() { }
 
-    RGB( const QRgb color )
+    RGB( const TQRgb color )
     {
       r = tqRed( color );
       g = tqGreen( color );
@@ -44,12 +44,12 @@ class Palette
   public:
     Palette() { }
 
-    void setColor( int i, const QRgb color )
+    void setColor( int i, const TQRgb color )
     {
       rgb[ i ] = RGB( color );
     }
 
-    QRgb color( int i ) const
+    TQRgb color( int i ) const
     {
       return tqRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b );
     }
diff --git a/kimgio/rgb.cpp b/kimgio/rgb.cpp
index cf1f2331a..bdda0959a 100644
--- a/kimgio/rgb.cpp
+++ b/kimgio/rgb.cpp
@@ -120,7 +120,7 @@ bool SGIImage::getRow(uchar *dest)
 
 bool SGIImage::readData(TQImage& img)
 {
-	QRgb *c;
+	TQRgb *c;
 	TQ_UINT32 *start = m_starttab;
 	TQByteArray lguard(m_xsize);
 	uchar *line = (uchar *)lguard.data();
@@ -134,7 +134,7 @@ bool SGIImage::readData(TQImage& img)
 			m_pos = m_data.begin() + *start++;
 		if (!getRow(line))
 			return false;
-		c = (QRgb *)img.scanLine(m_ysize - y - 1);
+		c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 		for (x = 0; x < m_xsize; x++, c++)
 			*c = tqRgb(line[x], line[x], line[x]);
 	}
@@ -148,7 +148,7 @@ bool SGIImage::readData(TQImage& img)
 				m_pos = m_data.begin() + *start++;
 			if (!getRow(line))
 				return false;
-			c = (QRgb *)img.scanLine(m_ysize - y - 1);
+			c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 			for (x = 0; x < m_xsize; x++, c++)
 				*c = tqRgb(tqRed(*c), line[x], line[x]);
 		}
@@ -158,7 +158,7 @@ bool SGIImage::readData(TQImage& img)
 				m_pos = m_data.begin() + *start++;
 			if (!getRow(line))
 				return false;
-			c = (QRgb *)img.scanLine(m_ysize - y - 1);
+			c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 			for (x = 0; x < m_xsize; x++, c++)
 				*c = tqRgb(tqRed(*c), tqGreen(*c), line[x]);
 		}
@@ -172,7 +172,7 @@ bool SGIImage::readData(TQImage& img)
 			m_pos = m_data.begin() + *start++;
 		if (!getRow(line))
 			return false;
-		c = (QRgb *)img.scanLine(m_ysize - y - 1);
+		c = (TQRgb *)img.scanLine(m_ysize - y - 1);
 		for (x = 0; x < m_xsize; x++, c++)
 			*c = tqRgba(tqRed(*c), tqGreen(*c), tqBlue(*c), line[x]);
 	}
@@ -394,12 +394,12 @@ bool SGIImage::scanData(const TQImage& img)
 	TQCString bufguard(m_xsize);
 	uchar *line = (uchar *)lineguard.data();
 	uchar *buf = (uchar *)bufguard.data();
-	QRgb *c;
+	TQRgb *c;
 	unsigned x, y;
 	uint len;
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			buf[x] = intensity(tqRed(*c++));
 		len = compact(line, buf);
@@ -411,7 +411,7 @@ bool SGIImage::scanData(const TQImage& img)
 
 	if (m_zsize != 2) {
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				buf[x] = intensity(tqGreen(*c++));
 			len = compact(line, buf);
@@ -419,7 +419,7 @@ bool SGIImage::scanData(const TQImage& img)
 		}
 
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				buf[x] = intensity(tqBlue(*c++));
 			len = compact(line, buf);
@@ -431,7 +431,7 @@ bool SGIImage::scanData(const TQImage& img)
 	}
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			buf[x] = intensity(tqAlpha(*c++));
 		len = compact(line, buf);
@@ -494,11 +494,11 @@ void SGIImage::writeVerbatim(const TQImage& img)
 	kdDebug(399) << "writing verbatim data" << endl;
 	writeHeader();
 
-	QRgb *c;
+	TQRgb *c;
 	unsigned x, y;
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			m_stream << TQ_UINT8(tqRed(*c++));
 	}
@@ -508,13 +508,13 @@ void SGIImage::writeVerbatim(const TQImage& img)
 
 	if (m_zsize != 2) {
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				m_stream << TQ_UINT8(tqGreen(*c++));
 		}
 
 		for (y = 0; y < m_ysize; y++) {
-			c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+			c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 			for (x = 0; x < m_xsize; x++)
 				m_stream << TQ_UINT8(tqBlue(*c++));
 		}
@@ -524,7 +524,7 @@ void SGIImage::writeVerbatim(const TQImage& img)
 	}
 
 	for (y = 0; y < m_ysize; y++) {
-		c = reinterpret_cast<QRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
+		c = reinterpret_cast<TQRgb *>(const_cast<TQImage&>(img).scanLine(m_ysize - y - 1));
 		for (x = 0; x < m_xsize; x++)
 			m_stream << TQ_UINT8(tqAlpha(*c++));
 	}
diff --git a/kimgio/tga.cpp b/kimgio/tga.cpp
index 3a9d88515..65e29a8cf 100644
--- a/kimgio/tga.cpp
+++ b/kimgio/tga.cpp
@@ -262,7 +262,7 @@ namespace {	// Private.
 		uchar * src = image;
                
 		for( int y = y_start; y != y_end; y += y_step ) {
-			QRgb * scanline = (QRgb *) img.scanLine( y );
+			TQRgb * scanline = (TQRgb *) img.scanLine( y );
 		
 			if( info.pal ) {
 				// Paletted.
@@ -377,7 +377,7 @@ KDE_EXPORT void kimgio_tga_write( TQImageIO *io )
 
     for( int y = 0; y < img.height(); y++ )
         for( int x = 0; x < img.width(); x++ ) {
-            const QRgb color = img.pixel( x, y );
+            const TQRgb color = img.pixel( x, y );
             s << TQ_UINT8( tqBlue( color ) );
             s << TQ_UINT8( tqGreen( color ) );
             s << TQ_UINT8( tqRed( color ) );
diff --git a/kimgio/xcf.cpp b/kimgio/xcf.cpp
index 1c0bb79d1..78af2e995 100644
--- a/kimgio/xcf.cpp
+++ b/kimgio/xcf.cpp
@@ -77,10 +77,10 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
 };
 
 
-//! Change a QRgb value's alpha only.
-inline QRgb tqRgba ( QRgb rgb, int a )
+//! Change a TQRgb value's alpha only.
+inline TQRgb tqRgba ( TQRgb rgb, int a )
 {
-	return ((a & 0xff) << 24 | (rgb & TQRGB_MASK));
+	return ((a & 0xff) << 24 | (rgb & TQT_RGB_MASK));
 }
 
 
@@ -676,7 +676,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 				for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 					layer.image_tiles[j][i].setPixel(k, l,
 							tqRgb(tile[0], tile[1], tile[2]));
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -686,7 +686,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 				for ( int k = 0; k < layer.image_tiles[j][i].width(); k++ ) {
 					layer.image_tiles[j][i].setPixel(k, l,
 							tqRgba(tile[0], tile[1], tile[2], tile[3]));
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -696,7 +696,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 			for (int l = 0; l < layer.image_tiles[j][i].height(); l++) {
 				for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 					layer.image_tiles[j][i].setPixel(k, l, tile[0]);
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -714,7 +714,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 						layer.image_tiles[j][i].setPixel(k, l, tile[0]);
 
 					layer.alpha_tiles[j][i].setPixel(k, l, tile[1]);
-					tile += sizeof(QRgb);
+					tile += sizeof(TQRgb);
 				}
 			}
 			break;
@@ -723,7 +723,7 @@ void XCFImageFormat::assignImageBytes(Layer& layer, uint i, uint j)
 
 
 /*!
- * The GIMP stores images in a "mipmap"-like hierarchy. As far as the QImage
+ * The GIMP stores images in a "mipmap"-like hierarchy. As far as the TQImage
  * is concerned, however, only the top level (i.e., the full resolution image)
  * is used.
  * \param xcf_io the data stream connected to the XCF image.
@@ -963,7 +963,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si
 
 				while (length-- > 0) {
 					*data = *xcfdata++;
-					data += sizeof(QRgb);
+					data += sizeof(TQRgb);
 				}
 			} else {
 				length += 1;
@@ -988,7 +988,7 @@ bool XCFImageFormat::loadTileRLE(TQDataStream& xcf_io, uchar* tile, int image_si
 
 				while (length-- > 0) {
 					*data = val;
-					data += sizeof(QRgb);
+					data += sizeof(TQRgb);
 				}
 			}
 		}
@@ -1071,14 +1071,14 @@ void XCFImageFormat::assignMaskBytes(Layer& layer, uint i, uint j)
 	for (int l = 0; l < layer.image_tiles[j][i].height(); l++) {
 		for (int k = 0; k < layer.image_tiles[j][i].width(); k++) {
 			layer.mask_tiles[j][i].setPixel(k, l, tile[0]);
-			tile += sizeof(QRgb);
+			tile += sizeof(TQRgb);
 		}
 	}
 }
 
 
 /*!
- * Construct the TQImage which will eventually be returned to the QImage
+ * Construct the TQImage which will eventually be returned to the TQImage
  * loader.
  *
  * There are a couple of situations which require that the TQImage is not
@@ -1320,7 +1320,7 @@ void XCFImageFormat::copyLayerToImage(XCFImage& xcf_image)
 void XCFImageFormat::copyRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
 
 	if (layer.type == RGBA_GIMAGE)
@@ -1371,7 +1371,7 @@ void XCFImageFormat::copyGrayToGray(Layer& layer, uint i, uint j, int k, int l,
 void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
 	image.setPixel(m, n, tqRgba(src, src_a));
 }
@@ -1393,7 +1393,7 @@ void XCFImageFormat::copyGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 void XCFImageFormat::copyGrayAToRGB(Layer& layer, uint i, uint j, int k, int l,
 				      TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
@@ -1474,7 +1474,7 @@ image.setPixel(m, n, src);
 void XCFImageFormat::copyIndexedAToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
@@ -1583,8 +1583,8 @@ void XCFImageFormat::mergeLayerIntoImage(XCFImage& xcf_image)
 void XCFImageFormat::mergeRGBToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
-	QRgb dst = image.pixel(m, n);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb dst = image.pixel(m, n);
 
 	uchar src_r = tqRed(src);
 	uchar src_g = tqGreen(src);
@@ -1872,7 +1872,7 @@ void XCFImageFormat::mergeGrayAToGray(Layer& layer, uint i, uint j, int k, int l
 void XCFImageFormat::mergeGrayToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.opacity;
 	image.setPixel(m, n, tqRgba(src, src_a));
 }
@@ -2034,7 +2034,7 @@ void XCFImageFormat::mergeIndexedAToIndexed(Layer& layer, uint i, uint j, int k,
 void XCFImageFormat::mergeIndexedAToRGB(Layer& layer, uint i, uint j, int k, int l,
 		TQImage& image, int m, int n)
 {
-	QRgb src = layer.image_tiles[j][i].pixel(k, l);
+	TQRgb src = layer.image_tiles[j][i].pixel(k, l);
 	uchar src_a = layer.alpha_tiles[j][i].pixelIndex(k, l);
 	src_a = INT_MULT(src_a, layer.opacity);
 
@@ -2073,7 +2073,7 @@ void XCFImageFormat::dissolveRGBPixels ( TQImage& image, int x, int y )
 
 		for (int k = 0; k < image.width(); k++) {
 			int rand_val = rand() & 0xff;
-			QRgb pixel = image.pixel(k, l);
+			TQRgb pixel = image.pixel(k, l);
 
 			if (rand_val > tqAlpha(pixel)) {
 				image.setPixel(k, l, tqRgba(pixel, 0));
diff --git a/kimgio/xcf.h b/kimgio/xcf.h
index d3b4302a9..61216488f 100644
--- a/kimgio/xcf.h
+++ b/kimgio/xcf.h
@@ -103,7 +103,7 @@ private:
 		TQ_UINT32 tattoo;		//!< (unique identifier?)
 
 		//! As each tile is read from the file, it is buffered here.
-		uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(QRgb)];
+		uchar tile[TILE_WIDTH * TILE_HEIGHT * sizeof(TQRgb)];
 
 		//! The data from tile buffer is copied to the Tile by this
 		//! method.  Depending on the type of the tile (RGB, Grayscale,
@@ -132,13 +132,13 @@ private:
 		TQ_INT32 tattoo;			//!< (unique identifier?)
 		TQ_UINT32 unit;			//!< Units of The GIMP (inch, mm, pica, etc...)
 		TQ_INT32 num_colors;		//!< number of colors in an indexed image
-		TQValueVector<QRgb> palette;	//!< indexed image color palette
+		TQValueVector<TQRgb> palette;	//!< indexed image color palette
 
 		int num_layers;			//!< number of layers
 		Layer layer;			//!< most recently read layer
 
 		bool initialized;		//!< Is the TQImage initialized?
-		TQImage image;			//!< final QImage
+		TQImage image;			//!< final TQImage
 
 		XCFImage(void) : initialized(false) {}
 	};
diff --git a/kimgio/xview.cpp b/kimgio/xview.cpp
index 722eba348..c2ceae05a 100644
--- a/kimgio/xview.cpp
+++ b/kimgio/xview.cpp
@@ -144,15 +144,15 @@ KDE_EXPORT void kimgio_xv_write( TQImageIO *imageio )
 			int r, g, b;
 			if ( image.depth() == 32 )
 			{
-				QRgb *data32 = (QRgb*) data;
+				TQRgb *data32 = (TQRgb*) data;
 				r = tqRed( *data32 ) >> 5;
 				g = tqGreen( *data32 ) >> 5;		
 				b = tqBlue( *data32 ) >> 6;
-				data += sizeof( QRgb );
+				data += sizeof( TQRgb );
 			}
 			else 
 			{
-				QRgb color = image.color( *data );
+				TQRgb color = image.color( *data );
 				r = tqRed( color ) >> 5;
 				g = tqGreen( color ) >> 5;		
 				b = tqBlue( color ) >> 6;
diff --git a/kjs/dtoa.cpp b/kjs/dtoa.cpp
index c39fa5bc6..8fc79ddf7 100644
--- a/kjs/dtoa.cpp
+++ b/kjs/dtoa.cpp
@@ -2077,7 +2077,7 @@ strtod
 			else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
  drop_down:
 				/* boundary case -- decrement exponent */
-#ifdef Sudden_Underflow /*{{*/
+#ifdef Sudden_Underflow
 				L = word0(rv) & Exp_mask;
 #ifdef IBM
 				if (L <  Exp_msk1)
@@ -2086,8 +2086,8 @@ strtod
 				if (L <= (scale ? (2*P+1)*Exp_msk1 : Exp_msk1))
 #else
 				if (L <= Exp_msk1)
-#endif /*Avoid_Underflow*/
-#endif /*IBM*/
+#endif
+#endif
 					goto undfl;
 				L -= Exp_msk1;
 #else /*Sudden_Underflow}{*/
diff --git a/kjs/grammar.cpp b/kjs/grammar.cpp
index 03eb07876..9cc7a342f 100644
--- a/kjs/grammar.cpp
+++ b/kjs/grammar.cpp
@@ -1340,7 +1340,9 @@ while (0)
 # define YYDPRINTF(Args)			\
 do {						\
   if (yydebug)					\
+    {								\
     YYFPRINTF Args;				\
+    }								\
 } while (0)
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
diff --git a/kjs/string_object.cpp b/kjs/string_object.cpp
index fadb641a0..b9321e70f 100644
--- a/kjs/string_object.cpp
+++ b/kjs/string_object.cpp
@@ -570,7 +570,9 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
     result = String(s);
     break;
   case LocaleCompare:
+  {
     return Number(localeCompare(s, a0.toString(exec)));
+  }
 #ifndef KJS_PURE_ECMA
   case Big:
     result = String("<big>" + s + "</big>");
diff --git a/kjs/value.cpp b/kjs/value.cpp
index bbf5a05c1..d5a7a9731 100644
--- a/kjs/value.cpp
+++ b/kjs/value.cpp
@@ -361,11 +361,12 @@ Number::Number(int i)
 Number::Number(unsigned int u)
   : Value(SimpleNumber::fits(u) ? SimpleNumber::make(u) : new NumberImp(static_cast<double>(u))) { }
 
-Number::Number(double d)
+// check for NaN first if we werent't compiled with -mieee on Alpha
 #if defined(__alpha) && !defined(_IEEE_FP)
-  // check for NaN first if we werent't compiled with -mieee on Alpha
+Number::Number(double d)
  : Value(KJS::isNaN(d) ? NumberImp::staticNaN : (SimpleNumber::fits(d) ? SimpleNumber::make((long)d) : new NumberImp(d))) { }
 #else
+Number::Number(double d)
  : Value(SimpleNumber::fits(d) ? SimpleNumber::make((long)d) : (KJS::isNaN(d) ? NumberImp::staticNaN : new NumberImp(d))) { }
 #endif
 
diff --git a/libltdl b/libltdl
-Subproject 1e4c04def54ff320bad1859d1a78a66b6b3ac16
+Subproject 754b445fd5519ddca551a45b9ae6385d3ee451b
diff --git a/libtdemid/CMakeLists.txt b/libtdemid/CMakeLists.txt
index 21338aac1..0cfce2c70 100644
--- a/libtdemid/CMakeLists.txt
+++ b/libtdemid/CMakeLists.txt
@@ -37,10 +37,10 @@ install( FILES
 set( target tdemid )
 
 set( ${target}_SRCS
-  midiout.cc player.cc track.cc midimapper.cc
-  midfile.cc dattypes.cc midistat.cc deviceman.cc
-  synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
-  mt32togm.cc notearray.cc libtdemid.cc
+  midiout.cpp player.cpp track.cpp midimapper.cpp
+  midfile.cpp dattypes.cpp midistat.cpp deviceman.cpp
+  synthout.cpp fmout.cpp gusout.cpp alsaout.cpp voiceman.cpp
+  mt32togm.cpp notearray.cpp libtdemid.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/libtdemid/Makefile.am b/libtdemid/Makefile.am
index 8cb347b01..2c1baf726 100644
--- a/libtdemid/Makefile.am
+++ b/libtdemid/Makefile.am
@@ -12,10 +12,10 @@ libtdemidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
 	midispec.h libtdemid.h
 
 lib_LTLIBRARIES = libtdemid.la
-libtdemid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
-	midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \
-	fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
-	libtdemid.cc
+libtdemid_la_SOURCES  = midiout.cpp player.cpp track.cpp midimapper.cpp \
+	midfile.cpp dattypes.cpp midistat.cpp deviceman.cpp synthout.cpp \
+	fmout.cpp gusout.cpp alsaout.cpp voiceman.cpp mt32togm.cpp notearray.cpp \
+	libtdemid.cpp
 
 libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
 libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_TQT)
diff --git a/libtdemid/alsaout.cc b/libtdemid/alsaout.cpp
index 517852b25..2e1b769f4 100644
--- a/libtdemid/alsaout.cc
+++ b/libtdemid/alsaout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    alsaout.cc   - class AlsaOut which represents an alsa client/port pair
+    alsaout.cpp   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/alsaout.h b/libtdemid/alsaout.h
index 016ca29c6..4dace44ce 100644
--- a/libtdemid/alsaout.h
+++ b/libtdemid/alsaout.h
@@ -1,4 +1,4 @@
-/*  alsaout.cc   - class AlsaOut which represents an alsa client/port pair
+/*  alsaout.cpp   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/dattypes.cc b/libtdemid/dattypes.cpp
index 218591fa4..7ae0aba52 100644
--- a/libtdemid/dattypes.cc
+++ b/libtdemid/dattypes.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  
-    dattypes.cc  - Some always useful definitions and functions
+    dattypes.cpp  - Some always useful definitions and functions
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cpp
index 82f973d3f..18bb9fcc2 100644
--- a/libtdemid/deviceman.cc
+++ b/libtdemid/deviceman.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    deviceman.cc  - The device manager, that hides the use of midiOut
+    deviceman.cpp  - The device manager, that hides the use of midiOut
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/fmout.cc b/libtdemid/fmout.cpp
index 72b3198c9..eb069e51c 100644
--- a/libtdemid/fmout.cc
+++ b/libtdemid/fmout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    fmout.cc   - class fmOut which handles the /dev/sequencer device
+    fmout.cpp   - class fmOut which handles the /dev/sequencer device
 			for fm synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
diff --git a/libtdemid/gusout.cc b/libtdemid/gusout.cpp
index 69aae3927..96c9fb915 100644
--- a/libtdemid/gusout.cc
+++ b/libtdemid/gusout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    gusout.cc  - class GUSOut which implements support for Gravis
+    gusout.cpp  - class GUSOut which implements support for Gravis
          Ultrasound cards through a /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
diff --git a/libtdemid/libtdemid.cc b/libtdemid/libtdemid.cpp
index 04a0dac0d..fcc75d3e5 100644
--- a/libtdemid/libtdemid.cc
+++ b/libtdemid/libtdemid.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  
-    libtdemid.cc  - class KMidSimpleAPI that makes it easy to use libtdemid
+    libtdemid.cpp  - class KMidSimpleAPI that makes it easy to use libtdemid
                         and a C wrapper.
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
diff --git a/libtdemid/midfile.cc b/libtdemid/midfile.cpp
index f8222b3f8..bfeb056f0 100644
--- a/libtdemid/midfile.cc
+++ b/libtdemid/midfile.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midfile.cc - function which reads a midi file,and creates the track classes
+    midfile.cpp - function which reads a midi file,and creates the track classes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/midimapper.cc b/libtdemid/midimapper.cpp
index 837728410..157ef864f 100644
--- a/libtdemid/midimapper.cc
+++ b/libtdemid/midimapper.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midimapper.cc  - The midi mapper object  
+    midimapper.cpp  - The midi mapper object  
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/midiout.cc b/libtdemid/midiout.cpp
index 24a209cce..c4949b03c 100644
--- a/libtdemid/midiout.cc
+++ b/libtdemid/midiout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midiout.cc   - class midiOut which handles external midi devices
+    midiout.cpp   - class midiOut which handles external midi devices
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/midistat.cc b/libtdemid/midistat.cpp
index 6a6c94b0c..7bd02c95a 100644
--- a/libtdemid/midistat.cc
+++ b/libtdemid/midistat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midistat.cc	- class MidiStatus, change it internally and then send it. 
+    midistat.cpp	- class MidiStatus, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/mt32togm.cc b/libtdemid/mt32togm.cpp
index a59eb959c..a59eb959c 100644
--- a/libtdemid/mt32togm.cc
+++ b/libtdemid/mt32togm.cpp
diff --git a/libtdemid/notearray.cc b/libtdemid/notearray.cpp
index 9899fd837..d08a5b074 100644
--- a/libtdemid/notearray.cc
+++ b/libtdemid/notearray.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    notearray.cc  - NoteArray class, which holds an array of notes
+    notearray.cpp  - NoteArray class, which holds an array of notes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/player.cc b/libtdemid/player.cpp
index ff7093496..1596d46f4 100644
--- a/libtdemid/player.cc
+++ b/libtdemid/player.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    player.cc  - class MidiPlayer. Plays a set of tracks
+    player.cpp  - class MidiPlayer. Plays a set of tracks
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/synthout.cc b/libtdemid/synthout.cpp
index 6d7ef47a1..6d06e17f2 100644
--- a/libtdemid/synthout.cc
+++ b/libtdemid/synthout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    synthout.cc   - class synthOut which handles the /dev/sequencer device
+    synthout.cpp   - class synthOut which handles the /dev/sequencer device
 			for synths (as AWE32)
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98  Antonio Larrosa Jimenez and P.J.Leonard
diff --git a/libtdemid/tests/Makefile.am b/libtdemid/tests/Makefile.am
index a00018c62..d70e61547 100644
--- a/libtdemid/tests/Makefile.am
+++ b/libtdemid/tests/Makefile.am
@@ -6,9 +6,9 @@ noinst_PROGRAMS = ctest apitest notesoff
 ctest_SOURCES = ctest.c
 ctest_LDADD = ../libtdemid.la
 
-apitest_SOURCES = apitest.cc
+apitest_SOURCES = apitest.cpp
 apitest_LDADD = ../libtdemid.la
 
-notesoff_SOURCES = notesoff.cc
+notesoff_SOURCES = notesoff.cpp
 notesoff_LDADD = ../libtdemid.la
 
diff --git a/libtdemid/tests/apitest.cc b/libtdemid/tests/apitest.cpp
index 7f370331e..7f370331e 100644
--- a/libtdemid/tests/apitest.cc
+++ b/libtdemid/tests/apitest.cpp
diff --git a/libtdemid/tests/notesoff.cc b/libtdemid/tests/notesoff.cpp
index 15e00bd6c..15e00bd6c 100644
--- a/libtdemid/tests/notesoff.cc
+++ b/libtdemid/tests/notesoff.cpp
diff --git a/libtdemid/track.cc b/libtdemid/track.cpp
index c7c858919..44375b637 100644
--- a/libtdemid/track.cc
+++ b/libtdemid/track.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    track.cc  - class track, which has a midi file track and its events
+    track.cpp  - class track, which has a midi file track and its events
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/voiceman.cc b/libtdemid/voiceman.cpp
index 867ee6024..fddf68f0e 100644
--- a/libtdemid/voiceman.cc
+++ b/libtdemid/voiceman.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    voiceman.cc - The VoiceManager class handles a set of voices for synths
+    voiceman.cpp - The VoiceManager class handles a set of voices for synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index 2260f25fd..a82c0b658 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -89,7 +89,7 @@ protected:
 
 
 //----------------------------------------------------------------------------
-#if defined(Q_WS_QWS) || defined(Q_WS_MACX)
+#if defined(TQ_WS_QWS) || defined(TQ_WS_MACX)
 typedef WId Window;
 #endif
 
@@ -131,7 +131,7 @@ KDE_EXPORT int main(int argc, char *argv[])
         saveWin = atol(args->getOption("window-id"));
     }
 
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
     if (args->isSet("root"))
     {
         saveWin = RootWindow(tqt_xdisplay(), tqt_xscreen());
diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp
index 30120b164..92c106bae 100644
--- a/libtdescreensaver/tdescreensaver.cpp
+++ b/libtdescreensaver/tdescreensaver.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <tdeapplication.h>
 #include "tdescreensaver.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #else
 typedef WId Window;
@@ -50,13 +50,13 @@ KScreenSaver::KScreenSaver( WId id ) : TQWidget()
     XSync(tqt_xdisplay(), false);
 
     d = new KScreenSaverPrivate;
-    d->owner = TQT_TQWIDGET(find( id ));
+    d->owner = find( id );
     if ( d->owner )
 	installEventFilter( this );
 
     if ( id )
     {
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
         XGetGeometry(tqt_xdisplay(), (Drawable)id, &root, &ai, &ai,
             &w, &h, &au, &au); 
 #endif
@@ -80,7 +80,7 @@ KScreenSaver::~KScreenSaver()
 void KScreenSaver::embed( TQWidget *w )
 {
     TDEApplication::sendPostedEvents();
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
     XReparentWindow(tqt_xdisplay(), w->winId(), winId(), 0, 0);
 #endif
     w->setGeometry( 0, 0, width(), height() );
@@ -90,7 +90,7 @@ void KScreenSaver::embed( TQWidget *w )
 bool KScreenSaver::eventFilter( TQObject *o, TQEvent *e )
 {
     // make sure events get to the original window owner
-    if ( d->owner && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
+    if ( d->owner && o == this ) {
 	TQApplication::sendEvent( d->owner, e );
 	return false;
     }
@@ -122,7 +122,7 @@ KBlankEffect::KBlankEffect( TQObject *parent ) : TQObject( parent )
     d->currentEffect = &KBlankEffect::blankNormal;
     d->effectProgress = 0;
     d->timer = new TQTimer( this );
-    connect( d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) );
+    connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) );
 }
 
 
diff --git a/libtdescreensaver/tdescreensaver.h b/libtdescreensaver/tdescreensaver.h
index 0dbb0e5d2..bfca411cd 100644
--- a/libtdescreensaver/tdescreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
@@ -58,7 +58,7 @@ class KBlankEffectPrivate;
 */
 class KDE_EXPORT KScreenSaver : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
     /**
      * @param id The winId() of the widget to draw the screensaver into.
@@ -93,7 +93,7 @@ private:
 */
 class KBlankEffect : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankEffect( TQObject *parent=0 );
 	~KBlankEffect();
diff --git a/libtdescreensaver/tdescreensaver_vroot.h b/libtdescreensaver/tdescreensaver_vroot.h
index aae76f9d9..adb98c964 100644
--- a/libtdescreensaver/tdescreensaver_vroot.h
+++ b/libtdescreensaver/tdescreensaver_vroot.h
@@ -62,7 +62,7 @@ static const char vroot_rcsid[] = "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolck
 #endif
 
 #include <tqwidget.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
diff --git a/licenses/CMakeLists.txt b/licenses/CMakeLists.txt
index 697fd6b8e..a48d3dbcc 100644
--- a/licenses/CMakeLists.txt
+++ b/licenses/CMakeLists.txt
@@ -12,5 +12,5 @@
 ##### other data ################################
 
 install( FILES
-    BSD GPL_V2 LGPL_V2 GPL_V3 LGPL_V3 QPL_V1.0 ARTISTIC
+    BSD GPL_V2 LGPL_V2 GPL_V3 LGPL_V3 QPL_V1.0 ARTISTIC MIT
   DESTINATION ${DATA_INSTALL_DIR}/LICENSES )
diff --git a/licenses/MIT b/licenses/MIT
new file mode 100644
index 000000000..64b34e88c
--- /dev/null
+++ b/licenses/MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/licenses/Makefile.am b/licenses/Makefile.am
index 2fd7abea3..0bf059e24 100644
--- a/licenses/Makefile.am
+++ b/licenses/Makefile.am
@@ -1,2 +1,2 @@
-licensesdata_DATA = BSD GPL_V2 LGPL_V2 QPL_V1.0 ARTISTIC
+licensesdata_DATA = BSD GPL_V2 LGPL_V2 QPL_V1.0 ARTISTIC MIT
 licensesdatadir = $(kde_datadir)/LICENSES
diff --git a/mimetypes/application/CMakeLists.txt b/mimetypes/application/CMakeLists.txt
index a602edcb5..88607766e 100644
--- a/mimetypes/application/CMakeLists.txt
+++ b/mimetypes/application/CMakeLists.txt
@@ -22,7 +22,8 @@ tde_create_translated_desktop(
     x-jar.desktop x-arj.desktop x-tarz.desktop
     x-gzpostscript.desktop postscript.desktop octet-stream.desktop
     x-shellscript.desktop x-desktop.desktop
-    x-executable.desktop x-executable-script.desktop x-archive.desktop x-lha.desktop
+    x-executable.desktop x-pie-executable.desktop x-executable-script.desktop
+    x-archive.desktop x-lha.desktop
     x-tbz.desktop x-tgz.desktop x-awk.desktop
     x-perl.desktop x-perl-module.desktop x-compress.desktop x-cpio.desktop
     x-rpm.desktop msword.desktop x-sharedlib.desktop
@@ -104,6 +105,7 @@ tde_create_translated_desktop(
     vnd.ms-powerpoint.template.macroEnabled.12.desktop
     vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop
     x-lzma.desktop x-tlzma.desktop x-lzip.desktop x-tlz.desktop x-txz.desktop x-xz.desktop
+    vnd.gentoo.ebuild.desktop
   DESTINATION ${MIME_INSTALL_DIR}/application
   PO_DIR mimetypes
 )
diff --git a/mimetypes/application/Makefile.am b/mimetypes/application/Makefile.am
index 9e5dabfa9..101a46a6c 100644
--- a/mimetypes/application/Makefile.am
+++ b/mimetypes/application/Makefile.am
@@ -8,7 +8,8 @@ mimetypeapplicationdata_DATA = x-dvi.desktop x-gzdvi.desktop x-bz2dvi.desktop \
 	x-jar.desktop x-arj.desktop x-tarz.desktop \
 	x-gzpostscript.desktop postscript.desktop octet-stream.desktop \
 	x-shellscript.desktop x-desktop.desktop \
-	x-executable.desktop x-executable-script.desktop x-archive.desktop x-lha.desktop \
+	x-executable.desktop x-pie-executable.desktop x-executable-script.desktop \
+	x-archive.desktop x-lha.desktop \
 	x-tbz.desktop x-tgz.desktop x-awk.desktop \
 	x-perl.desktop x-perl-module.desktop x-compress.desktop x-cpio.desktop \
 	x-rpm.desktop msword.desktop x-sharedlib.desktop \
@@ -85,7 +86,8 @@ mimetypeapplicationdata_DATA = x-dvi.desktop x-gzdvi.desktop x-bz2dvi.desktop \
 	vnd.ms-powerpoint.presentation.macroEnabled.12.desktop \
 	vnd.ms-powerpoint.template.macroEnabled.12.desktop \
 	vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop \
-	x-lzma.desktop x-tlzma.desktop x-lzip.desktop x-tlz.desktop x-txz.desktop x-xz.desktop
+	x-lzma.desktop x-tlzma.desktop x-lzip.desktop x-tlz.desktop x-txz.desktop x-xz.desktop \
+	vnd.gentoo.ebuild.desktop
 
 mimetypeapplicationdatadir = $(kde_mimedir)/application
 
diff --git a/mimetypes/application/vnd.gentoo.ebuild.desktop b/mimetypes/application/vnd.gentoo.ebuild.desktop
new file mode 100644
index 000000000..5a6d1b1f6
--- /dev/null
+++ b/mimetypes/application/vnd.gentoo.ebuild.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+MimeType=application/vnd.gentoo.ebuild
+Comment=Gentoo ebuild file
+Type=MimeType
+Patterns=*.ebuild
+Icon=text-x-makefile
+X-TDE-IsAlso=text/plain
+
+[Property::X-TDE-text]
+Type=bool
+Value=true
diff --git a/mimetypes/application/x-pie-executable.desktop b/mimetypes/application/x-pie-executable.desktop
new file mode 100644
index 000000000..edc09d7f0
--- /dev/null
+++ b/mimetypes/application/x-pie-executable.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Comment=Executable File
+Icon=application-x-executable
+Type=MimeType
+MimeType=application/x-pie-executable
+X-TDE-IsAlso=application/x-executable
diff --git a/mimetypes/text/CMakeLists.txt b/mimetypes/text/CMakeLists.txt
index 918024dce..7f815bf86 100644
--- a/mimetypes/text/CMakeLists.txt
+++ b/mimetypes/text/CMakeLists.txt
@@ -21,6 +21,7 @@ tde_create_translated_desktop(
     x-bibtex.desktop rdf.desktop rss.desktop calendar.desktop x-adasrc.desktop x-perl.desktop
     x-csv.desktop x-latex.desktop x-xslfo.desktop x-xslt.desktop vnd.wap.wml.desktop x-katefilelist.desktop
     docbook.desktop x-mswinurl.desktop x-hex.desktop vnd.abc.desktop javascript.desktop x-python.desktop
+    markdown.desktop
   DESTINATION ${MIME_INSTALL_DIR}/text
   PO_DIR mimetypes
 )
diff --git a/mimetypes/text/markdown.desktop b/mimetypes/text/markdown.desktop
new file mode 100644
index 000000000..41719d086
--- /dev/null
+++ b/mimetypes/text/markdown.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Comment=Markdown document
+Type=MimeType
+MimeType=text/markdown
+Icon=text-x-generic
+Patterns=*.md;
+DefaultApp=konqueror
+
+[Property::X-TDE-text]
+Type=bool
+Value=true
diff --git a/networkstatus/connectionmanager.h b/networkstatus/connectionmanager.h
index 00ca4e35c..540fef443 100644
--- a/networkstatus/connectionmanager.h
+++ b/networkstatus/connectionmanager.h
@@ -24,7 +24,7 @@ class ConnectionManagerPrivate;
 
 class ConnectionManager : public TQObject, virtual public DCOPObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 	public:
 		static ConnectionManager* self();
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp
index 41bff9edb..7060477c1 100644
--- a/networkstatus/networkstatus.cpp
+++ b/networkstatus/networkstatus.cpp
@@ -73,8 +73,8 @@ NetworkStatusModule::NetworkStatusModule( const TQCString & obj ) : KDEDModule(
 	d = new Private;
 /*	d->clientIface = new ClientIfaceImpl( this );
 	d->serviceIface = new ServiceIfaceImpl( this );*/
-	connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
-	connect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) );
+	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) );
 }
 
 NetworkStatusModule::~NetworkStatusModule()
diff --git a/networkstatus/networkstatus.h b/networkstatus/networkstatus.h
index 4ff615ef8..cd0ab42ae 100644
--- a/networkstatus/networkstatus.h
+++ b/networkstatus/networkstatus.h
@@ -34,7 +34,7 @@ struct NetworkStatusStruct;
 
 class NetworkStatusModule : virtual public KDEDModule/*, public ClientIface, ServiceIface*/ // <-spot the multiple inheritance pb
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 public:
 	NetworkStatusModule( const TQCString & obj );
diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp
index a77f1c1fd..92613626d 100644
--- a/networkstatus/networkstatusindicator.cpp
+++ b/networkstatus/networkstatusindicator.cpp
@@ -38,8 +38,8 @@ StatusBarNetworkStatusIndicator::StatusBarNetworkStatusIndicator(
   label->setPixmap( SmallIcon("connect_no") );
   TQToolTip::add( label, i18n( "The desktop is offline" ) );
 
-  connect( ConnectionManager::self(), TQT_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ),
-      TQT_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) );
+  connect( ConnectionManager::self(), TQ_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ),
+      TQ_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) );
 
 }
 
diff --git a/networkstatus/networkstatusindicator.h b/networkstatus/networkstatusindicator.h
index f1cfa966a..e88a41f17 100644
--- a/networkstatus/networkstatusindicator.h
+++ b/networkstatus/networkstatusindicator.h
@@ -29,7 +29,7 @@
 
 class StatusBarNetworkStatusIndicator : public TQHBox
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   StatusBarNetworkStatusIndicator( TQWidget * parent, const char * name );
   virtual ~StatusBarNetworkStatusIndicator();
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index 6f713cf29..93dc096e5 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -58,7 +58,7 @@ int TestService::establish( const TQString & network )
 	m_status = NetworkStatus::Establishing;
 	m_service->setNetworkStatus( "test_net", (int)m_status );
 	m_nextStatus = NetworkStatus::Online;
-	TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) );
+	TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) );
 	return (int)NetworkStatus::RequestAccepted;
 }
 
@@ -68,7 +68,7 @@ int TestService::shutdown( const TQString & network )
 	m_status = NetworkStatus::ShuttingDown;
 	m_service->setNetworkStatus( "test_net", (int)m_status );
 	m_nextStatus = NetworkStatus::Offline;
-	TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) );
+	TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) );
 	return (int)NetworkStatus::RequestAccepted;
 }
 
diff --git a/networkstatus/testservice.h b/networkstatus/testservice.h
index 9a7ef127d..e893ec6ea 100644
--- a/networkstatus/testservice.h
+++ b/networkstatus/testservice.h
@@ -29,7 +29,7 @@ class ServiceIface_stub;
 
 class TestService : virtual public TQObject, ProviderIface
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	TestService();
 	virtual ~TestService();
diff --git a/pics/crystalsvg/cr16-action-edit_rename.png b/pics/crystalsvg/cr16-action-edit_rename.png
new file mode 100644
index 000000000..0730750f1
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-edit_rename.png
diff --git a/pics/crystalsvg/cr16-action-konqui_intro.png b/pics/crystalsvg/cr16-action-konqui_intro.png
new file mode 100644
index 000000000..b7b6b1888
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-konqui_intro.png
diff --git a/pics/crystalsvg/cr16-action-window_duplicate.png b/pics/crystalsvg/cr16-action-window_duplicate.png
new file mode 100644
index 000000000..33439e716
--- /dev/null
+++ b/pics/crystalsvg/cr16-action-window_duplicate.png
diff --git a/pics/crystalsvg/cr22-action-edit_rename.png b/pics/crystalsvg/cr22-action-edit_rename.png
new file mode 100644
index 000000000..7490d1a04
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-edit_rename.png
diff --git a/pics/crystalsvg/cr22-action-konqui_intro.png b/pics/crystalsvg/cr22-action-konqui_intro.png
new file mode 100644
index 000000000..9fa33077a
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-konqui_intro.png
diff --git a/pics/crystalsvg/cr22-action-window_duplicate.png b/pics/crystalsvg/cr22-action-window_duplicate.png
new file mode 100644
index 000000000..ce841248d
--- /dev/null
+++ b/pics/crystalsvg/cr22-action-window_duplicate.png
diff --git a/pics/crystalsvg/cr32-action-edit_rename.png b/pics/crystalsvg/cr32-action-edit_rename.png
new file mode 100644
index 000000000..6c3bbba9a
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-edit_rename.png
diff --git a/pics/crystalsvg/cr32-action-konqui_intro.png b/pics/crystalsvg/cr32-action-konqui_intro.png
new file mode 100644
index 000000000..c5c4bc468
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-konqui_intro.png
diff --git a/pics/crystalsvg/cr32-action-window_duplicate.png b/pics/crystalsvg/cr32-action-window_duplicate.png
new file mode 100644
index 000000000..2de7c18db
--- /dev/null
+++ b/pics/crystalsvg/cr32-action-window_duplicate.png
diff --git a/pics/crystalsvg/cr48-action-edit_rename.png b/pics/crystalsvg/cr48-action-edit_rename.png
new file mode 100644
index 000000000..f8dbb7056
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-edit_rename.png
diff --git a/pics/crystalsvg/cr48-action-konqui_intro.png b/pics/crystalsvg/cr48-action-konqui_intro.png
new file mode 100644
index 000000000..511c74150
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-konqui_intro.png
diff --git a/pics/crystalsvg/cr48-action-window_duplicate.png b/pics/crystalsvg/cr48-action-window_duplicate.png
new file mode 100644
index 000000000..f19da6616
--- /dev/null
+++ b/pics/crystalsvg/cr48-action-window_duplicate.png
diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO
index 1070ccd4c..d53cd8725 100644
--- a/tdeabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -169,7 +169,7 @@ The following code will create a file resource and save a contact into it:
 39:
 40:  // PHOTO or LOGO
 41:  TDEABC::Picture photo;
-42:  QImage img;
+42:  TQImage img;
 43:  if ( img.load( "face.png", "PNG" ) ) {
 44:    photo.setData( img );
 45:    photo.setType( "image/png" );
@@ -252,10 +252,10 @@ as argument.
 
 In line 41 we make use of TDEABC::Picture class to store the photo of the
 contact. This class can contain either an URL or the raw image data in form
-of a QImage, in this example we use the latter.
+of a TQImage, in this example we use the latter.
 
 In line 43 we try to load the image "face.png" from the local directory and
-assign this QImage to the TDEABC::Picture class via the setData() function.
+assign this TQImage to the TDEABC::Picture class via the setData() function.
 Additionally we set the type of the picture to "image/png".
 
 From 49 - 50 we insert 2 email addresses with the first one as preferred
@@ -337,7 +337,7 @@ representation of one list.
 12:    QStringList emails = list->emails();
 13:    QStringList::Iterator eit;
 14:    for ( eit = emails.begin(); eit != emails.end(); ++eit )
-15:      kdDebug() << QString( "\t%1" ).arg( (*eit).latin1() ) << endl;
+15:      kdDebug() << TQString( "\t%1" ).arg( (*eit).latin1() ) << endl;
 16:  }
 
 In the first line a TDEABC::DistributionListManager is created. The manager takes
@@ -365,8 +365,8 @@ changed. So to make your application aware of changes use the following code:
 
      #include <tdeabc/distributionlist.h>
 
- 1:  connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ),
- 2:           this, SLOT( slotDistributionListChanged() ) );
+ 1:  connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ),
+ 2:           this, TQ_SLOT( slotDistributionListChanged() ) );
 
 You see, as usual, easy ;)
 
diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp
index b9d239ef4..a472b2bd0 100644
--- a/tdeabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -711,15 +711,15 @@ bool AddressBook::addResource( Resource *resource )
   d->mManager->add( resource );
   resource->setAddressBook( this );
 
-  connect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ),
-           this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
-  connect( resource, TQT_SIGNAL( savingFinished( Resource* ) ),
-           this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
+  connect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ),
+           this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) );
+  connect( resource, TQ_SIGNAL( savingFinished( Resource* ) ),
+           this, TQ_SLOT( resourceSavingFinished( Resource* ) ) );
 
-  connect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
-           this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
-  connect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
-           this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
+  connect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ),
+           this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+  connect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ),
+           this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
 
   return true;
 }
@@ -733,15 +733,15 @@ bool AddressBook::removeResource( Resource *resource )
 
   resource->setAddressBook( 0 );
 
-  disconnect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ),
-              this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
-  disconnect( resource, TQT_SIGNAL( savingFinished( Resource* ) ),
-              this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
+  disconnect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ),
+              this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) );
+  disconnect( resource, TQ_SIGNAL( savingFinished( Resource* ) ),
+              this, TQ_SLOT( resourceSavingFinished( Resource* ) ) );
 
-  disconnect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
-              this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
-  disconnect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
-              this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+  disconnect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ),
+              this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+  disconnect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ),
+              this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
 
   d->mManager->remove( resource );
 
diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h
index 5a3d1a45a..f2fa1e0e1 100644
--- a/tdeabc/addressbook.h
+++ b/tdeabc/addressbook.h
@@ -42,7 +42,7 @@ class Ticket;
  */
 class KABC_EXPORT AddressBook : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const AddressBook & );
   friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, AddressBook & );
diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
index 26c87d8b8..73e7b7172 100644
--- a/tdeabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -72,15 +72,15 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
-  connect( mAddresseeList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           TQT_SLOT( slotOk() ) );
-  connect( mAddresseeList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           TQT_SLOT( updateEdit( TQListViewItem * ) ) );
+  connect( mAddresseeList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           TQ_SLOT( slotOk() ) );
+  connect( mAddresseeList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           TQ_SLOT( updateEdit( TQListViewItem * ) ) );
 
   mAddresseeEdit = new KLineEdit( topWidget );
   mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-  connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ),
-           TQT_SLOT( selectItem( const TQString & ) ) );
+  connect( mAddresseeEdit->completionObject(), TQ_SIGNAL( match( const TQString & ) ),
+           TQ_SLOT( selectItem( const TQString & ) ) );
   mAddresseeEdit->setFocus();
   mAddresseeEdit->completionObject()->setIgnoreCase( true );
   listLayout->addWidget( mAddresseeEdit );
@@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
     topLayout->addLayout( selectedLayout );
     topLayout->setSpacing( spacingHint() );
 
-    TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"),
+    TQGroupBox *selectedGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Selected"),
                                               topWidget );
     selectedLayout->addWidget( selectedGroup );
 
@@ -101,23 +101,23 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
-    connect( mSelectedList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-             TQT_SLOT( removeSelected() ) );
+    connect( mSelectedList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+             TQ_SLOT( removeSelected() ) );
 
     TQPushButton *unselectButton = new TQPushButton( i18n("Unselect"), selectedGroup );
-    connect ( unselectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelected() ) );
+    connect ( unselectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelected() ) );
 
-    connect( mAddresseeList, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             TQT_SLOT( addSelected( TQListViewItem * ) ) );
+    connect( mAddresseeList, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             TQ_SLOT( addSelected( TQListViewItem * ) ) );
 
     setInitialSize( TQSize( 650, 350 ) );
   }
 
   mAddressBook = StdAddressBook::self( true );
-  connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
-           TQT_SLOT( addressBookChanged() ) );
-  connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ),
-           TQT_SLOT( addressBookChanged() ) );
+  connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+           TQ_SLOT( addressBookChanged() ) );
+  connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ),
+           TQ_SLOT( addressBookChanged() ) );
 
   loadAddressBook();
 }
diff --git a/tdeabc/addresseedialog.h b/tdeabc/addresseedialog.h
index f94b49b71..4623abdb1 100644
--- a/tdeabc/addresseedialog.h
+++ b/tdeabc/addresseedialog.h
@@ -82,7 +82,7 @@ class KABC_EXPORT AddresseeItem : public TQListViewItem
 */
 class KABC_EXPORT AddresseeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     /**
diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index 93a327889..ef6537e28 100644
--- a/tdeabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -104,22 +104,22 @@ void AddressLineEdit::init()
         ldapSearchDeleter.setObject( s_LDAPSearch, new LdapSearch );
         ldapTextDeleter.setObject( s_LDAPText, new TQString );
       }
-      connect( s_LDAPTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotStartLDAPLookup()));
-      connect( s_LDAPSearch, TQT_SIGNAL( searchData( const TQStringList& )),
-        TQT_SLOT( slotLDAPSearchData( const TQStringList& )));
+      connect( s_LDAPTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotStartLDAPLookup()));
+      connect( s_LDAPSearch, TQ_SIGNAL( searchData( const TQStringList& )),
+        TQ_SLOT( slotLDAPSearchData( const TQStringList& )));
   }
 
   if ( m_useCompletion && !m_completionInitialized )
   {
       setCompletionObject( s_completion, false ); // we handle it ourself
-      connect( this, TQT_SIGNAL( completion(const TQString&)),
-               this, TQT_SLOT(slotCompletion() ));
+      connect( this, TQ_SIGNAL( completion(const TQString&)),
+               this, TQ_SLOT(slotCompletion() ));
       
       TDECompletionBox *box = completionBox();
-      connect( box, TQT_SIGNAL( highlighted( const TQString& )),
-               this, TQT_SLOT( slotPopupCompletion( const TQString& ) ));
-      connect( box, TQT_SIGNAL( userCancelled( const TQString& )),
-               TQT_SLOT( userCancelled( const TQString& )));
+      connect( box, TQ_SIGNAL( highlighted( const TQString& )),
+               this, TQ_SLOT( slotPopupCompletion( const TQString& ) ));
+      connect( box, TQ_SIGNAL( userCancelled( const TQString& )),
+               TQ_SLOT( userCancelled( const TQString& )));
 
       m_completionInitialized = true; // don't connect muliple times. That's
                                       // ugly, tho, better have completionBox()
@@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e)
 
 void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e )
 {
-   if (m_useCompletion && (e->button() == Qt::MidButton))
+   if (m_useCompletion && (e->button() == TQt::MidButton))
    {
       m_smartPaste = true;
       KLineEdit::mouseReleaseEvent(e);
diff --git a/tdeabc/addresslineedit.h b/tdeabc/addresslineedit.h
index b8f83ceab..d42e35533 100644
--- a/tdeabc/addresslineedit.h
+++ b/tdeabc/addresslineedit.h
@@ -49,7 +49,7 @@ class LdapSearch;
  */
 class KABC_EXPORT AddressLineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   AddressLineEdit(TQWidget* parent, bool useCompletion = true,
 		const char *name = 0L);
diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index 7c55fccd6..3456418de 100644
--- a/tdeabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -108,7 +108,7 @@ DistributionList::Entry::List DistributionList::entries() const
   return mEntries;
 }
 
-typedef TQValueList< QPair<TQString, TQString> > MissingEntryList;
+typedef TQValueList< TQPair<TQString, TQString> > MissingEntryList;
 
 class DistributionListManager::DistributionListManagerPrivate
 {
@@ -275,7 +275,7 @@ DistributionListWatcher::DistributionListWatcher()
   mDirWatch = new KDirWatch;
   mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) );
   
-  connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
+  connect( mDirWatch, TQ_SIGNAL( dirty( const TQString& ) ), TQ_SIGNAL( changed() ) );
   mDirWatch->startScan();
 }
 
diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h
index 44de7f0d3..ef1b1fece 100644
--- a/tdeabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
@@ -182,13 +182,13 @@ class KABC_EXPORT DistributionListManager
   \code
   TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self()
 
-  connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) );
+  connect( watchdog, TQ_SIGNAL( changed() ), TQ_SLOT( doSomething() ) );
   \endcode
 */
 
 class KABC_EXPORT DistributionListWatcher : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
index 04578e19a..9d424a927 100644
--- a/tdeabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -46,7 +46,7 @@ DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidg
   mEditor = new DistributionListEditorWidget( addressBook, this );
   setMainWidget( mEditor );
 
-  connect( this, TQT_SIGNAL( okClicked() ), mEditor, TQT_SLOT( save() ) );
+  connect( this, TQ_SIGNAL( okClicked() ), mEditor, TQ_SLOT( save() ) );
 }
 
 DistributionListDialog::~DistributionListDialog()
@@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString &curren
   TQFrame *topFrame = plainPage();
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
-  mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
@@ -147,19 +147,19 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
 
   mNameCombo = new TQComboBox( this );
   nameLayout->addWidget( mNameCombo );
-  connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) );
+  connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) );
 
   mNewButton = new TQPushButton( i18n("New List..."), this );
   nameLayout->addWidget( mNewButton );
-  connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) );
+  connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) );
 
   mEditButton = new TQPushButton( i18n("Rename List..."), this );
   nameLayout->addWidget( mEditButton );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) );
 
   mRemoveButton = new TQPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( mRemoveButton );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) );
 
   TQGridLayout *gridLayout = new TQGridLayout( topLayout, 3, 3 );
   gridLayout->setColStretch(1, 1);
@@ -175,15 +175,15 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
   mAddresseeView->addColumn( i18n("Preferred Email") );
   mAddresseeView->setAllColumnsShowFocus( true );
   gridLayout->addWidget( mAddresseeView, 1, 0 );
-  connect( mAddresseeView, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelectionAddresseeViewChanged() ) );
-  connect( mAddresseeView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           TQT_SLOT( addEntry() ) );
+  connect( mAddresseeView, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelectionAddresseeViewChanged() ) );
+  connect( mAddresseeView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           TQ_SLOT( addEntry() ) );
 
   mAddEntryButton = new TQPushButton( i18n("Add Entry"), this );
   mAddEntryButton->setEnabled(false);
   gridLayout->addWidget( mAddEntryButton, 2, 0 );
-  connect( mAddEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) );
+  connect( mAddEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) );
 
   mEntryView = new TQListView( this );
   mEntryView->addColumn( i18n("Name") );
@@ -192,16 +192,16 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
   mEntryView->setEnabled(false);
   mEntryView->setAllColumnsShowFocus( true );
   gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 );
-  connect( mEntryView, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelectionEntryViewChanged() ) );
+  connect( mEntryView, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelectionEntryViewChanged() ) );
 
   mChangeEmailButton = new TQPushButton( i18n("Change Email..."), this );
   gridLayout->addWidget( mChangeEmailButton, 2, 1 );
-  connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
+  connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) );
 
   mRemoveEntryButton = new TQPushButton( i18n("Remove Entry"), this );
   gridLayout->addWidget( mRemoveEntryButton, 2, 2 );
-  connect( mRemoveEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) );
+  connect( mRemoveEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) );
 
   mManager = new DistributionListManager( mAddressBook );
   mManager->load();
diff --git a/tdeabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
index 0270c3605..3fd97243d 100644
--- a/tdeabc/distributionlistdialog.h
+++ b/tdeabc/distributionlistdialog.h
@@ -54,7 +54,7 @@ class DistributionListManager;
 */
 class KABC_EXPORT DistributionListDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     /**
@@ -100,7 +100,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase
 */
 class KABC_EXPORT DistributionListEditorWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     DistributionListEditorWidget( AddressBook *, TQWidget *parent );
diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
index 215382f62..e2882378f 100644
--- a/tdeabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString
   TQFrame *topFrame = plainPage();
   TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
 
-  mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   mButtonGroup->setRadioButtonExclusive( true );
   topLayout->addWidget( mButtonGroup );
@@ -128,34 +128,34 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg
 
   mNameCombo = new TQComboBox( this );
   nameLayout->addWidget( mNameCombo );
-  connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) );
+  connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) );
 
   newButton = new TQPushButton( i18n("New List"), this );
   nameLayout->addWidget( newButton );
-  connect( newButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) );
+  connect( newButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) );
 
   removeButton = new TQPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( removeButton );
-  connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
+  connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) );
 
   mEntryView = new TQListView( this );
   mEntryView->addColumn( i18n("Name") );
   mEntryView->addColumn( i18n("Email") );
   mEntryView->addColumn( i18n("Use Preferred") );
   topLayout->addWidget( mEntryView );
-  connect(mEntryView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionEntryViewChanged()));
+  connect(mEntryView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionEntryViewChanged()));
 
   changeEmailButton = new TQPushButton( i18n("Change Email"), this );
   topLayout->addWidget( changeEmailButton );
-  connect( changeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
+  connect( changeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) );
 
   removeEntryButton = new TQPushButton( i18n("Remove Entry"), this );
   topLayout->addWidget( removeEntryButton );
-  connect( removeEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) );
+  connect( removeEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) );
 
   addEntryButton = new TQPushButton( i18n("Add Entry"), this );
   topLayout->addWidget( addEntryButton );
-  connect( addEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) );
+  connect( addEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) );
 
   mAddresseeView = new TQListView( this );
   mAddresseeView->addColumn( i18n("Name") );
@@ -163,7 +163,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg
   topLayout->addWidget( mAddresseeView );
 
 
-  connect(mAddresseeView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionAddresseeViewChanged()));
+  connect(mAddresseeView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionAddresseeViewChanged()));
 
   mManager = new DistributionListManager( mAddressBook );
   mManager->load();
diff --git a/tdeabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
index 5c0b4c03a..e82d8961f 100644
--- a/tdeabc/distributionlisteditor.h
+++ b/tdeabc/distributionlisteditor.h
@@ -53,7 +53,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase
 */
 class KABC_EXPORT DistributionListEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     DistributionListEditor( AddressBook *, TQWidget *parent );
     virtual ~DistributionListEditor();
diff --git a/tdeabc/ldapclient.cpp b/tdeabc/ldapclient.cpp
index 31256f46f..5ae18b848 100644
--- a/tdeabc/ldapclient.cpp
+++ b/tdeabc/ldapclient.cpp
@@ -138,12 +138,12 @@ void LdapClient::startQuery( const TQString& filter )
   startParseLDIF();
   mActive = true;
   mJob = TDEIO::get( url, false, false );
-  connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-           this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
-  connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( slotDone() ) );
+  connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( slotDone() ) );
 }
 
 void LdapClient::cancelQuery()
@@ -158,7 +158,7 @@ void LdapClient::cancelQuery()
 
 void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data )
 {
-#ifndef NDEBUG // don't create the QString
+#ifndef NDEBUG // don't create the TQString
 //  TQString str( data );
 //  kdDebug(5700) << "LdapClient: Got \"" << str << "\"\n";
 #endif
@@ -285,18 +285,18 @@ LdapSearch::LdapSearch()
       attrs << "cn" << "mail" << "givenname" << "sn";
       ldapClient->setAttrs( attrs );
 
-      connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
-               this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
-      connect( ldapClient, TQT_SIGNAL( done() ),
-               this, TQT_SLOT( slotLDAPDone() ) );
-      connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
-               this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
+      connect( ldapClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+               this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
+      connect( ldapClient, TQ_SIGNAL( done() ),
+               this, TQ_SLOT( slotLDAPDone() ) );
+      connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ),
+               this, TQ_SLOT( slotLDAPError( const TQString& ) ) );
 
       mClients.append( ldapClient );
     }
   }
 
-  connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) );
+  connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) );
 }
 
 void LdapSearch::startSearch( const TQString& txt )
diff --git a/tdeabc/ldapclient.h b/tdeabc/ldapclient.h
index a4a5747a6..c05162a22 100644
--- a/tdeabc/ldapclient.h
+++ b/tdeabc/ldapclient.h
@@ -84,7 +84,7 @@ class KABC_EXPORT LdapObject
   */
 class KABC_EXPORT LdapClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     LdapClient( TQObject* parent = 0, const char* name = 0 );
@@ -206,7 +206,7 @@ typedef TQValueList<LdapResult> LdapResultList;
   */
 class KABC_EXPORT LdapSearch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     LdapSearch();
diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
index 2c2dfbe75..0c5b845be 100644
--- a/tdeabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -180,7 +180,7 @@ void LdapConfigWidget::initWidget()
     //without host query doesn't make sense
     if ( mHost ) {
       TQPushButton *dnquery = new TQPushButton( i18n( "Query Server" ), this );
-      connect( dnquery, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryDNClicked() ) );
+      connect( dnquery, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryDNClicked() ) );
       mainLayout->addMultiCellWidget( dnquery, row, row, 2, 3 );
     }
     row++;
@@ -202,9 +202,9 @@ void LdapConfigWidget::initWidget()
     mSecSSL = new TQRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" );
     mainLayout->addMultiCellWidget( btgroup, row, row, 0, 3 );
 
-    connect( mSecNO, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) );
-    connect( mSecTLS, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) );
-    connect( mSecSSL, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPSPort( ) ) );
+    connect( mSecNO, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) );
+    connect( mSecTLS, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) );
+    connect( mSecSSL, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPSPort( ) ) );
 
     mSecNO->setChecked( true );
     row++;
@@ -213,7 +213,7 @@ void LdapConfigWidget::initWidget()
   if ( mFlags & W_AUTHBOX ) {
 
     TQButtonGroup *authbox =
-      new TQButtonGroup( 3, Qt::Horizontal, i18n( "Authentication" ), this );
+      new TQButtonGroup( 3, TQt::Horizontal, i18n( "Authentication" ), this );
 
     mAnonymous = new TQRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" );
     mSimple = new TQRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" );
@@ -229,14 +229,14 @@ void LdapConfigWidget::initWidget()
     //without host query doesn't make sense
     if ( mHost ) {
       mQueryMech = new TQPushButton( i18n( "Query Server" ), authbox );
-      connect( mQueryMech, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryMechClicked() ) );
+      connect( mQueryMech, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryMechClicked() ) );
     }
 
     mainLayout->addMultiCellWidget( authbox, row, row+1, 0, 3 );
 
-    connect( mAnonymous, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setAnonymous(int) ) );
-    connect( mSimple, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSimple(int) ) );
-    connect( mSASL, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSASL(int) ) );
+    connect( mAnonymous, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setAnonymous(int) ) );
+    connect( mSimple, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSimple(int) ) );
+    connect( mSASL, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSASL(int) ) );
 
     mAnonymous->setChecked( true );
   }
@@ -293,10 +293,10 @@ void LdapConfigWidget::sendQuery()
   mLdif.startParsing();
   TDEIO::Job *job = TDEIO::get( _url, true, false );
   job->addMetaData("no-auth-prompt","true");
-  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-    this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-    this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+    this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQ_SLOT( loadResult( TDEIO::Job* ) ) );
 
   if ( mProg == NULL )
     mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
@@ -615,7 +615,7 @@ void LdapConfigWidget::setFlags( int flags )
   obj = ch2.first();
   while ( obj != 0 ) {
     widget = dynamic_cast<TQWidget*> (obj);
-    if ( widget && TQT_BASE_OBJECT(widget->parent()) == TQT_BASE_OBJECT(this) ) {
+    if ( widget && widget->parent() == this ) {
       mainLayout->remove( widget );
       delete ( widget );
     }
diff --git a/tdeabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
index ed39bb776..9f053bfd9 100644
--- a/tdeabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -49,7 +49,7 @@ namespace TDEABC {
 
   class KABC_EXPORT LdapConfigWidget : public TQWidget
   {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( LCW_Flags flags READ flagsProp WRITE setFlagsProp )
     TQ_PROPERTY( TQString user READ user WRITE setUser )
diff --git a/tdeabc/ldapurl.cpp b/tdeabc/ldapurl.cpp
index c20dbd39e..c1e943688 100644
--- a/tdeabc/ldapurl.cpp
+++ b/tdeabc/ldapurl.cpp
@@ -36,7 +36,7 @@ LDAPUrl::LDAPUrl(const KURL &_url)
 {
   m_dn = path();
   if ( !TQDir::isRelativePath(m_dn) )
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     m_dn.remove(0,3); // e.g. "c:/"
 #else
     m_dn.remove(0,1);
@@ -48,7 +48,7 @@ void LDAPUrl::setDn( const TQString &dn)
 {
   m_dn = dn;
   if ( !TQDir::isRelativePath(m_dn) )
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     m_dn.remove(0,3); // e.g. "c:/"
 #else
     m_dn.remove(0,1);
diff --git a/tdeabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp
index 1527b4893..7c4a72025 100644
--- a/tdeabc/ldifconverter.cpp
+++ b/tdeabc/ldifconverter.cpp
@@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str )
   ldif_out( t, "homeurl", addr.url().prettyURL() );
   ldif_out( t, "description", addr.note() );
   if (addr.revision().isValid())
-    ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) );
+    ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) );
 
   t << "objectclass: top\n";
   t << "objectclass: person\n";
diff --git a/tdeabc/lock.h b/tdeabc/lock.h
index d4d04532a..6b96d9fe7 100644
--- a/tdeabc/lock.h
+++ b/tdeabc/lock.h
@@ -34,7 +34,7 @@ namespace TDEABC {
 */
 class KABC_EXPORT Lock : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
       Constructor.
diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index 304f585f0..7502084aa 100644
--- a/tdeabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -87,9 +87,9 @@ void ResourceDir::init( const TQString &path, const TQString &format )
 
   mLock = 0;
 
-  connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( pathChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( pathChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( pathChanged() ) );
 
   setPath( path );
 }
diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
index dc9d1d06a..8c9eb66a4 100644
--- a/tdeabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -40,7 +40,7 @@ class Lock;
 */
 class KABC_EXPORT ResourceDir : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceDir( const TDEConfig* );
diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
index 51fac5812..9ba2ec492 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.h
+++ b/tdeabc/plugins/dir/resourcedirconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceDirConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index 3fa2a9406..2b25db4c4 100644
--- a/tdeabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -83,9 +83,9 @@ void ResourceFile::init( const TQString &fileName, const TQString &formatName )
     mFormat = factory->format( mFormatName );
   }
 
-  connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( fileChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( fileChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( fileChanged() ) );
 
   setFileName( fileName );
 
@@ -333,9 +333,9 @@ bool ResourceFile::asyncSave( Ticket *ticket )
   bool ok = save( ticket );
 
   if ( !ok )
-    TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingError() ) );
   else
-    TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingFinished() ) );
 
   return ok;
 }
diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
index ffa19a4bf..2f38254a2 100644
--- a/tdeabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -39,7 +39,7 @@ class Lock;
 */
 class KABC_EXPORT ResourceFile : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 2c8e0fce6..7995f3be1 100644
--- a/tdeabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -51,8 +51,8 @@ ResourceFileConfig::ResourceFileConfig( TQWidget* parent,  const char* name )
   label = new TQLabel( i18n( "Location:" ), this );
   mFileNameEdit = new KURLRequester( this );
 
-  connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SLOT( checkFilePermissions( const TQString & ) ) );
+  connect( mFileNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SLOT( checkFilePermissions( const TQString & ) ) );
 
   mainLayout->addWidget( label, 1, 0 );
   mainLayout->addWidget( mFileNameEdit, 1, 1 );
diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
index 3be4cca49..0f3c12cd5 100644
--- a/tdeabc/plugins/file/resourcefileconfig.h
+++ b/tdeabc/plugins/file/resourcefileconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceFileConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index ed6675392..f7c6ed36a 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -123,7 +123,7 @@ ResourceLDAPTDEIO::~ResourceLDAPTDEIO()
 void ResourceLDAPTDEIO::enter_loop()
 {
   TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
-  dummy.setFocusPolicy( TQ_NoFocus );
+  dummy.setFocusPolicy( TQWidget::NoFocus );
   tqt_enter_modal(&dummy);
   tqApp->enter_loop();
   tqt_leave_modal(&dummy);
@@ -173,10 +173,10 @@ TQString ResourceLDAPTDEIO::findUid( const TQString &uid )
   
   TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ );
   connect( listJob, 
-    TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
-    TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
-  connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), 
-    this, TQT_SLOT( listResult( TDEIO::Job* ) ) );
+    TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+    TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+  connect( listJob, TQ_SIGNAL( result( TDEIO::Job* ) ), 
+    this, TQ_SLOT( listResult( TDEIO::Job* ) ) );
 
   enter_loop();
   return d->mResultDn;
@@ -511,8 +511,8 @@ TDEIO::Job *ResourceLDAPTDEIO::loadFromCache()
   
     KURL url( d->mCacheDst );
     job = TDEIO::get( url, true, false );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
   }
   return job;
 }
@@ -535,17 +535,17 @@ bool ResourceLDAPTDEIO::load()
   createCache();
   if ( d->mCachePolicy != Cache_Always ) {
     job = TDEIO::get( d->mLDAPUrl, true, false );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
     enter_loop();
   }
 
   job = loadFromCache();    
   if ( job ) {
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
     enter_loop();
   }
   if ( mErrorMsg.isEmpty() ) {
@@ -572,10 +572,10 @@ bool ResourceLDAPTDEIO::asyncLoad()
   createCache();
   if ( d->mCachePolicy != Cache_Always ) {
     TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( result( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( result( TDEIO::Job* ) ) );
   } else {
     result( NULL );
   }
@@ -714,8 +714,8 @@ void ResourceLDAPTDEIO::result( TDEIO::Job *job )
   TDEIO::Job *cjob;
   cjob = loadFromCache();
   if ( cjob ) {
-    connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) );
+    connect( cjob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( loadCacheResult( TDEIO::Job* ) ) );
   } else {
     if ( !mErrorMsg.isEmpty() )
       emit loadingError( this, mErrorMsg );
@@ -730,10 +730,10 @@ bool ResourceLDAPTDEIO::save( Ticket* )
   
   d->mSaveIt = begin();
   TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
-  connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
-    this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-    this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+    this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
   enter_loop();
   if ( mErrorMsg.isEmpty() ) {
     kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; 
@@ -750,10 +750,10 @@ bool ResourceLDAPTDEIO::asyncSave( Ticket* )
   kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl;
   d->mSaveIt = begin();
   TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
-  connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
-    this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-    this, TQT_SLOT( saveResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+    this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQ_SLOT( saveResult( TDEIO::Job* ) ) );
   return true;
 }
 
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index 8f0565c3e..e82e94c83 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -32,7 +32,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceLDAPTDEIO : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always };
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index 429e6b494..9dc8a8a57 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -58,8 +58,8 @@ ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent,  const char*
   mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box );
   mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box );
 
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) );
-  connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editAttributes() ) );
+  connect( mCacheButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCache() ) );
 }
 
 void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res )
@@ -247,7 +247,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   mMapCombo->insertItem( i18n( "Netscape" ) );
   mMapCombo->insertItem( i18n( "Evolution" ) );
   mMapCombo->insertItem( i18n( "Outlook" ) );
-  connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) );
+  connect( mMapCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( mapChanged( int ) ) );
 
   label = new TQLabel( i18n( "RDN prefix attribute:" ), page );
   layout->addWidget( label, 1, 0 );
@@ -342,7 +342,7 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
   layout->setAutoAdd( true );
 
   mSrc = src; mDst = dst;
-  mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal, 
+  mCacheGroup = new TQButtonGroup( 1, TQt::Horizontal, 
     i18n("Offline Cache Policy"), page );
     
   TQRadioButton *bt;
@@ -356,10 +356,10 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
   mAutoCache->setChecked( autoCache );
   mAutoCache->setEnabled( bt->isChecked() );
 
-  connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) );
+  connect( bt, TQ_SIGNAL(toggled(bool)), mAutoCache, TQ_SLOT(setEnabled(bool)) );
   
   TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page );
-  connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) );
+  connect( lcache, TQ_SIGNAL( clicked() ), TQ_SLOT( loadCache() ) );
 }
 
 OfflineDialog::~OfflineDialog()
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index d56b4de31..2d3f3571f 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -44,7 +44,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 );
@@ -68,7 +68,7 @@ class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 
 class AttributesDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     AttributesDialog( const TQMap<TQString, TQString> &attributes, int rdnprefix,
@@ -93,7 +93,7 @@ class AttributesDialog : public KDialogBase
 
 class OfflineDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, 
diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index cb908cd22..08fa8764a 100644
--- a/tdeabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad()
   TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false );
   d->mIsLoading = true;
-  connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) );
+  connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* )
   TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mIsSaving = true;
   d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false );
-  connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) );
+  connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* )
 
   if ( !hasTempFile() || mTempFile->status() != 0 ) {
     d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" );
-    TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) );
     return;
   }
 
diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index e190c63c8..0ce7bf862 100644
--- a/tdeabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -44,7 +44,7 @@ class FormatPlugin;
 */
 class KABC_EXPORT ResourceNet : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceNet( const TDEConfig* );
diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index 513c77de2..df1a73ba6 100644
--- a/tdeabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
index b72afea15..a820b56df 100644
--- a/tdeabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -247,7 +247,7 @@ bool ResourceSql::save( Ticket * )
         (*it).prefix() + "','" +
         (*it).suffix() + "','" +
         (*it).nickName() + "','" +
-        (*it).birthday().toString( Qt::ISODate ) + "','" +
+        (*it).birthday().toString( TQt::ISODate ) + "','" +
         (*it).mailer() + "','" +
         TQString::number( (*it).timeZone().offset() ) + "','" +
         TQString::number( (*it).geo().latitude() ) + "','" +
@@ -257,7 +257,7 @@ bool ResourceSql::save( Ticket * )
         (*it).organization() + "','" +
         (*it).note() + "','" +
         (*it).productId() + "','" +
-        (*it).revision().toString( Qt::ISODate ) + "','" +
+        (*it).revision().toString( TQt::ISODate ) + "','" +
         (*it).sortString() + "','" +
         (*it).url().url() + "')"
     );
diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
index e0c08880c..116248809 100644
--- a/tdeabc/plugins/sql/resourcesqlconfig.h
+++ b/tdeabc/plugins/sql/resourcesqlconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class ResourceSqlConfig : public ResourceConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/resource.h b/tdeabc/resource.h
index 5e9d9cb0d..d18c551d3 100644
--- a/tdeabc/resource.h
+++ b/tdeabc/resource.h
@@ -54,7 +54,7 @@ class KABC_EXPORT Ticket
  */
 class KABC_EXPORT Resource : public KRES::Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
index a12e83611..1bede4a84 100644
--- a/tdeabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -42,7 +42,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
   mainLayout->setMargin( marginHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal,  this );
+  TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal,  this );
   groupBox->setTitle( i18n( "Resources" ) );
 
   mResourceId = new TDEListBox( groupBox );
@@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   KButtonBox *buttonBox = new KButtonBox( this );
 
   buttonBox->addStretch();
-  buttonBox->addButton(  KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) );
-  buttonBox->addButton(  KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) );
+  buttonBox->addButton(  KStdGuiItem::ok(), this, TQ_SLOT( accept() ) );
+  buttonBox->addButton(  KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) );
   buttonBox->layout();
 
   mainLayout->addWidget( buttonBox );
diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index 1d820ece1..b8df436ac 100644
--- a/tdeabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@@ -38,7 +38,7 @@ class Resource;
  */
 class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceSelectDialog( AddressBook *ab, TQWidget *parent = 0,
diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
index f8f126b83..e162ea961 100644
--- a/tdeabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -121,7 +121,7 @@ TQString Field::value( const TDEABC::Addressee &a )
       return a.preferredEmail();
     case FieldImpl::Birthday:
       if ( a.birthday().isValid() )
-        return a.birthday().date().toString( Qt::ISODate );
+        return a.birthday().date().toString( TQt::ISODate );
       else
         return TQString::null;
     case FieldImpl::Url:
@@ -362,7 +362,7 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value )
         return true;
       }
     case FieldImpl::Birthday:
-      a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) );
+      a.setBirthday( TQDate::fromString( value, TQt::ISODate ) );
       return true;
     case FieldImpl::CustomField:
       a.insertCustom( mImpl->app(), mImpl->key(), value );
@@ -378,7 +378,7 @@ TQString Field::sortKey( const TDEABC::Addressee &a )
     --CASEVALUE--
     case FieldImpl::Birthday:
       if ( a.birthday().isValid() ) {
-        TQDate date = TQT_TQDATE_OBJECT(a.birthday().date());
+        TQDate date = a.birthday().date();
         TQString key;
         key.sprintf( "%02d-%02d", date.month(), date.day() );
         return key;
diff --git a/tdeabc/sound.h b/tdeabc/sound.h
index 3ee64ac57..d4d00131f 100644
--- a/tdeabc/sound.h
+++ b/tdeabc/sound.h
@@ -35,7 +35,7 @@ namespace TDEABC {
  *  \code
  *    KTempFile tmp;
  *    if(sound.isIntern()) {
- *      tmp.file()->tqwriteBlock( sound.data() );
+ *      tmp.file()->writeBlock( sound.data() );
  *      tmp.close();
  *      KAudioPlayer::play( tmp.name() );
  *    } else if(!sound.url().isEmpty()) {
diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index 73343d8a9..d834215c3 100644
--- a/tdeabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -103,15 +103,15 @@ void StdAddressBook::init( bool asynchronous )
       error( TQString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
       continue;
     }
-    connect( *it, TQT_SIGNAL( loadingFinished( Resource* ) ),
-             this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
-    connect( *it, TQT_SIGNAL( savingFinished( Resource* ) ),
-             this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
-
-    connect( *it, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
-             this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
-    connect( *it, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
-             this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
+    connect( *it, TQ_SIGNAL( loadingFinished( Resource* ) ),
+             this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) );
+    connect( *it, TQ_SIGNAL( savingFinished( Resource* ) ),
+             this, TQ_SLOT( resourceSavingFinished( Resource* ) ) );
+
+    connect( *it, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ),
+             this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+    connect( *it, TQ_SIGNAL( savingError( Resource*, const TQString& ) ),
+             this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
   }
 
   Resource *res = standardResource();
diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
index 80bd311da..ee4513d98 100644
--- a/tdeabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -21,7 +21,7 @@ int main( int argc,char **argv )
   lineEdit->show();
   app.setMainWidget( lineEdit );
   
-  TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
 
   app.exec();
   
diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
index 833dca84e..4a46f8e83 100644
--- a/tdeabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -51,7 +51,7 @@ int main(int argc,char **argv)
   editor->show();
   app.setMainWidget(editor);
   
-  TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
 
   app.exec();
   
diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index a48ce043f..338d703f3 100644
--- a/tdeabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
@@ -97,12 +97,12 @@ void TestLDAPClient::testIntevation()
   // But this certainly looks fishy, it might break on non-utf8 systems.
   TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*�gypten MDK*)(sn=*�gypten MDK*))";
 
-  connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
-           this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
-  connect( mClient, TQT_SIGNAL( done() ),
-           this, TQT_SLOT( slotLDAPDone() ) );
-  connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
-           this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
+  connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+           this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
+  connect( mClient, TQ_SIGNAL( done() ),
+           this, TQ_SLOT( slotLDAPDone() ) );
+  connect( mClient, TQ_SIGNAL( error( const TQString& ) ),
+           this, TQ_SLOT( slotLDAPError( const TQString& ) ) );
   mClient->startQuery( filter );
   kapp->eventLoop()->enterLoop();
   delete mClient; mClient = 0;
diff --git a/tdeabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
index 502115b07..8b1a9bda4 100644
--- a/tdeabc/tests/testldapclient.h
+++ b/tdeabc/tests/testldapclient.h
@@ -26,7 +26,7 @@ typedef TDEABC::LdapClient LdapClient;
 
 class TestLDAPClient : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TestLDAPClient() {}
diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index f9d880753..d593945bf 100644
--- a/tdeabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -77,11 +77,11 @@ LockWidget::LockWidget( const TQString &identifier )
 
     TQPushButton *button = new TQPushButton( "Lock", this );
     topLayout->addWidget( button );
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) );
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ) );
 
     button = new TQPushButton( "Unlock", this );
     topLayout->addWidget( button );
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) );
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( unlock() ) );
   }
 
   mLockView = new TQListView( this );
@@ -94,15 +94,15 @@ LockWidget::LockWidget( const TQString &identifier )
 
   TQPushButton *quitButton = new TQPushButton( "Quit", this );
   topLayout->addWidget( quitButton );
-  connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
+  connect( quitButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) );
   
   KDirWatch *watch = KDirWatch::self();
-  connect( watch, TQT_SIGNAL( dirty( const TQString & ) ),
-           TQT_SLOT( updateLockView() ) );
-  connect( watch, TQT_SIGNAL( created( const TQString & ) ),
-           TQT_SLOT( updateLockView() ) );
-  connect( watch, TQT_SIGNAL( deleted( const TQString & ) ),
-           TQT_SLOT( updateLockView() ) );
+  connect( watch, TQ_SIGNAL( dirty( const TQString & ) ),
+           TQ_SLOT( updateLockView() ) );
+  connect( watch, TQ_SIGNAL( created( const TQString & ) ),
+           TQ_SLOT( updateLockView() ) );
+  connect( watch, TQ_SIGNAL( deleted( const TQString & ) ),
+           TQ_SLOT( updateLockView() ) );
   watch->addDir( Lock::locksDir() );
   watch->startScan();
 }
diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h
index 62466b89a..a093a9ecb 100644
--- a/tdeabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
@@ -30,7 +30,7 @@ class TQListView;
 
 class KABC_EXPORT LockWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     LockWidget( const TQString &identifier );
     ~LockWidget();
diff --git a/tdeabc/vcard/CMakeLists.txt b/tdeabc/vcard/CMakeLists.txt
index 0e08d3426..2ec679cfa 100644
--- a/tdeabc/vcard/CMakeLists.txt
+++ b/tdeabc/vcard/CMakeLists.txt
@@ -14,7 +14,6 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/generated
   ${CMAKE_BINARY_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdecore
 )
diff --git a/tdeabc/vcard/Makefile.am b/tdeabc/vcard/Makefile.am
index 5807f25d4..cf466e516 100644
--- a/tdeabc/vcard/Makefile.am
+++ b/tdeabc/vcard/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES = \
 	-I$(srcdir)/include \
-	-I$(srcdir)/include/generated \
 	$(all_includes)
 
 ### KDE 4.0: either make noinst or rename to something like libkvcard
diff --git a/tdeabc/vcard/include/VCardAdrParam.h b/tdeabc/vcard/include/VCardAdrParam.h
index d40165f4a..00d016c31 100644
--- a/tdeabc/vcard/include/VCardAdrParam.h
+++ b/tdeabc/vcard/include/VCardAdrParam.h
@@ -34,25 +34,42 @@ namespace VCARD
 	
 class KVCARD_EXPORT AdrParam : public Param
 {
+	public:
+		AdrParam();
+		AdrParam(const AdrParam&);
+		AdrParam(const TQCString&);
+		AdrParam & operator = (AdrParam&);
+		AdrParam & operator = (const TQCString&);
+		bool operator ==(AdrParam&);
+		bool operator !=(AdrParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {AdrParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-#include "AdrParam-generated.h"
-	
-	TQStrList adrTypeList()
-	{ parse(); return adrTypeList_; }
-	
-	TQCString textParam()
-	{ parse(); return textParam_; }
-	
-	void setAdrTypeList(const TQStrList & l)
-	{ adrTypeList_ = l; assembled_ = false; }
-	
-	void setTextParam(const TQCString & s)
-	{ textParam_ = s; assembled_ = false; }
+		virtual ~AdrParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "AdrParam"; }
+
+		TQStrList adrTypeList()
+		{ parse(); return adrTypeList_; }
+
+		TQCString textParam()
+		{ parse(); return textParam_; }
 	
-	enum AdrType {
-		AdrDom, AdrIntl, AdrPostal, AdrParcel, AdrHome, AdrWork, AdrPref,
-		AdrIANA, AdrX
-	};
+		void setAdrTypeList(const TQStrList & l)
+		{ adrTypeList_ = l; assembled_ = false; }
+
+		void setTextParam(const TQCString & s)
+		{ textParam_ = s; assembled_ = false; }
+
+		enum AdrType {
+			AdrDom, AdrIntl, AdrPostal, AdrParcel, AdrHome, AdrWork, AdrPref,
+			AdrIANA, AdrX
+		};
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardAdrValue.h b/tdeabc/vcard/include/VCardAdrValue.h
index 94ed93aee..7325c10c5 100644
--- a/tdeabc/vcard/include/VCardAdrValue.h
+++ b/tdeabc/vcard/include/VCardAdrValue.h
@@ -32,39 +32,56 @@ namespace VCARD
 
 class KVCARD_EXPORT AdrValue : public Value
 {
-	
-#include "AdrValue-generated.h"
-	
-	AdrValue *clone();
-	
-	void setPOBox(const TQCString & s)
-	{ poBox_ = s; assembled_ = false; }
-	
-	void setExtAddress(const TQCString & s)
-	{ extAddress_ = s; assembled_ = false; }
+	public:
+		AdrValue();
+		AdrValue(const AdrValue&);
+		AdrValue(const TQCString&);
+		AdrValue & operator = (AdrValue&);
+		AdrValue & operator = (const TQCString&);
+		bool operator ==(AdrValue&);
+		bool operator !=(AdrValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {AdrValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-	void setStreet(const TQCString & s)
-	{ street_ = s; assembled_ = false; }
+		virtual ~AdrValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
-	void setLocality(const TQCString & s)
-	{ locality_ = s; assembled_ = false; }
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
-	void setRegion(const TQCString & s)
-	{ region_ = s; assembled_ = false; }
+		void _parse();
+		void _assemble();
+		const char * className() const { return "AdrValue"; }
 
-	void setPostCode(const TQCString & s)
-	{ postCode_ = s; assembled_ = false; }
-	
-	void setCountryName(const TQCString & s)
-	{ countryName_ = s; assembled_ = false; }
-	
-	TQCString poBox()	{ parse(); return poBox_;	}
-	TQCString extAddress()	{ parse(); return extAddress_;	}
-	TQCString street()	{ parse(); return street_;	}
-	TQCString locality()	{ parse(); return locality_;	}
-	TQCString region()	{ parse(); return region_;	}
-	TQCString postCode()	{ parse(); return postCode_;	}
-	TQCString countryName()	{ parse(); return countryName_;	}
+		AdrValue *clone();
+
+		void setPOBox(const TQCString & s)
+		{ poBox_ = s; assembled_ = false; }
+
+		void setExtAddress(const TQCString & s)
+		{ extAddress_ = s; assembled_ = false; }
+
+		void setStreet(const TQCString & s)
+		{ street_ = s; assembled_ = false; }
+
+		void setLocality(const TQCString & s)
+		{ locality_ = s; assembled_ = false; }
+
+		void setRegion(const TQCString & s)
+		{ region_ = s; assembled_ = false; }
+
+		void setPostCode(const TQCString & s)
+		{ postCode_ = s; assembled_ = false; }
+
+		void setCountryName(const TQCString & s)
+		{ countryName_ = s; assembled_ = false; }
+
+		TQCString poBox()	{ parse(); return poBox_;	}
+		TQCString extAddress()	{ parse(); return extAddress_;	}
+		TQCString street()	{ parse(); return street_;	}
+		TQCString locality()	{ parse(); return locality_;	}
+		TQCString region()	{ parse(); return region_;	}
+		TQCString postCode()	{ parse(); return postCode_;	}
+		TQCString countryName()	{ parse(); return countryName_;	}
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardAgentParam.h b/tdeabc/vcard/include/VCardAgentParam.h
index 90c3bd528..b7b84c800 100644
--- a/tdeabc/vcard/include/VCardAgentParam.h
+++ b/tdeabc/vcard/include/VCardAgentParam.h
@@ -34,20 +34,37 @@ namespace VCARD
 
 class KVCARD_EXPORT AgentParam : public Param
 {
+	public:
+		AgentParam();
+		AgentParam(const AgentParam&);
+		AgentParam(const TQCString&);
+		AgentParam & operator = (AgentParam&);
+		AgentParam & operator = (const TQCString&);
+		bool operator ==(AgentParam&);
+		bool operator !=(AgentParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {AgentParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~AgentParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "AgentParam"; }
 	
-#include "AgentParam-generated.h"
-	
-	bool refer()
-	{ parse(); return refer_; }
-	
-	URIValue uri()
-	{ parse(); return uri_; }
-	
-	void setRefer(bool b)
-	{ refer_ = b; assembled_ = false; }
+		bool refer()
+		{ parse(); return refer_; }
+
+		URIValue uri()
+		{ parse(); return uri_; }
+
+		void setRefer(bool b)
+		{ refer_ = b; assembled_ = false; }
 
-	void setURI(const TQCString & s)
-	{ uri_ = s; assembled_ = false; }
+		void setURI(const TQCString & s)
+		{ uri_ = s; assembled_ = false; }
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardAgentValue.h b/tdeabc/vcard/include/VCardAgentValue.h
index dd68145c9..bb4ac4eff 100644
--- a/tdeabc/vcard/include/VCardAgentValue.h
+++ b/tdeabc/vcard/include/VCardAgentValue.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT AgentValue : public Value
 {
-	
-#include "AgentValue-generated.h"
-	
-	private:
+	public:
+		AgentValue();
+		AgentValue(const AgentValue&);
+		AgentValue(const TQCString&);
+		AgentValue & operator = (AgentValue&);
+		AgentValue & operator = (const TQCString&);
+		bool operator ==(AgentValue&);
+		bool operator !=(AgentValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {AgentValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~AgentValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "AgentValue"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardClassValue.h b/tdeabc/vcard/include/VCardClassValue.h
index 5de79167b..fd2b499d1 100644
--- a/tdeabc/vcard/include/VCardClassValue.h
+++ b/tdeabc/vcard/include/VCardClassValue.h
@@ -35,8 +35,25 @@ namespace VCARD
 
 class KVCARD_EXPORT ClassValue : public Value
 {
+	public:
+		ClassValue();
+		ClassValue(const ClassValue&);
+		ClassValue(const TQCString&);
+		ClassValue & operator = (ClassValue&);
+		ClassValue & operator = (const TQCString&);
+		bool operator ==(ClassValue&);
+		bool operator !=(ClassValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {ClassValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-#include "ClassValue-generated.h"
+		virtual ~ClassValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "ClassValue"; }
 
 	  enum ClassType {
 		  Public, Private, Confidential, Other
diff --git a/tdeabc/vcard/include/VCardContentLine.h b/tdeabc/vcard/include/VCardContentLine.h
index ea59444a0..e62ba9864 100644
--- a/tdeabc/vcard/include/VCardContentLine.h
+++ b/tdeabc/vcard/include/VCardContentLine.h
@@ -36,30 +36,47 @@ namespace VCARD
 
 class KVCARD_EXPORT ContentLine : public Entity
 {
+	public:
+		ContentLine();
+		ContentLine(const ContentLine&);
+		ContentLine(const TQCString&);
+		ContentLine & operator = (ContentLine&);
+		ContentLine & operator = (const TQCString&);
+		bool operator ==(ContentLine&);
+		bool operator !=(ContentLine& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {ContentLine a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-#include "ContentLine-generated.h"
-	
-	TQCString	group()		{ parse(); return group_;	}
-	TQCString	name()		{ parse(); return name_;	}
-	Value	*	value()		{ parse(); return value_;	}
-	ParamList	paramList()	{ parse(); return paramList_;	}
-	ParamType	paramType()	{ parse(); return paramType_;	}
-	ValueType	valueType()	{ parse(); return valueType_;	}
-	EntityType	entityType()	{ parse(); return entityType_;	}
-	
-	void setGroup		(const TQCString & s)
-	{ group_ = s; assembled_ = false; }
-	
-	void setName		(const TQCString & s)
-	{ name_ = s; assembled_ = false; }
-	
-	void setValue		(Value *s)
-	{ value_ = s; assembled_ = false; }
-	
-	void setParamList	(const ParamList & l)
-	{ paramList_ = l; assembled_ = false; }
+		virtual ~ContentLine();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "ContentLine"; }
+
+		TQCString	group()		{ parse(); return group_;	}
+		TQCString	name()		{ parse(); return name_;	}
+		Value	*	value()		{ parse(); return value_;	}
+		ParamList	paramList()	{ parse(); return paramList_;	}
+		ParamType	paramType()	{ parse(); return paramType_;	}
+		ValueType	valueType()	{ parse(); return valueType_;	}
+		EntityType	entityType()	{ parse(); return entityType_;	}
+
+		void setGroup		(const TQCString & s)
+		{ group_ = s; assembled_ = false; }
+
+		void setName		(const TQCString & s)
+		{ name_ = s; assembled_ = false; }
+
+		void setValue		(Value *s)
+		{ value_ = s; assembled_ = false; }
+
+		void setParamList	(const ParamList & l)
+		{ paramList_ = l; assembled_ = false; }
 
-	void clear		();
+		void clear		();
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardDateParam.h b/tdeabc/vcard/include/VCardDateParam.h
index 410eae6b7..6c6092346 100644
--- a/tdeabc/vcard/include/VCardDateParam.h
+++ b/tdeabc/vcard/include/VCardDateParam.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT DateParam : public Param
 {
-	
-#include "DateParam-generated.h"
-	
-	private:
+	public:
+		DateParam();
+		DateParam(const DateParam&);
+		DateParam(const TQCString&);
+		DateParam & operator = (DateParam&);
+		DateParam & operator = (const TQCString&);
+		bool operator ==(DateParam&);
+		bool operator !=(DateParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {DateParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~DateParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "DateParam"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardDateValue.h b/tdeabc/vcard/include/VCardDateValue.h
index 4f2e2fe7f..60db0f330 100644
--- a/tdeabc/vcard/include/VCardDateValue.h
+++ b/tdeabc/vcard/include/VCardDateValue.h
@@ -34,52 +34,70 @@ namespace VCARD
 
 class KVCARD_EXPORT DateValue : public Value
 {
-#include "DateValue-generated.h"
-	
-	DateValue(
-		unsigned int	year,
-		unsigned int	month,
-		unsigned int	day,
-		unsigned int	hour = 0,
-		unsigned int	minute = 0,
-		unsigned int	second = 0,
-		double			secFrac = 0,
-		bool			zonePositive = true,
-		unsigned int	zoneHour = 0,
-		unsigned int	zoneMinute = 0);
-
-	DateValue(const TQDate &);
-	DateValue(const TQDateTime &);
-
-	DateValue *clone();
-	
-	bool hasTime();
-	
-	unsigned int	year();
-	unsigned int	month();
-	unsigned int	day();
-	unsigned int	hour();
-	unsigned int	minute();
-	unsigned int	second();
-	double			secondFraction();
-	bool			zonePositive();
-	unsigned int	zoneHour();
-	unsigned int	zoneMinute();
-	
-	void setYear			(unsigned int);
-	void setMonth			(unsigned int);
-	void setDay				(unsigned int);
-	void setHour			(unsigned int);
-	void setMinute			(unsigned int);
-	void setSecond			(unsigned int);
-	void setSecondFraction	(double);
-	void setZonePositive	(bool);
-	void setZoneHour		(unsigned int);
-	void setZoneMinute		(unsigned int);
-	
-	TQDate qdate();
-	TQTime qtime();
-	TQDateTime qdt();
+	public:
+		DateValue();
+		DateValue(const DateValue&);
+		DateValue(const TQCString&);
+		DateValue & operator = (DateValue&);
+		DateValue & operator = (const TQCString&);
+		bool operator ==(DateValue&);
+		bool operator !=(DateValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {DateValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~DateValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "DateValue"; }
+
+		DateValue(
+				unsigned int	year,
+				unsigned int	month,
+				unsigned int	day,
+				unsigned int	hour = 0,
+				unsigned int	minute = 0,
+				unsigned int	second = 0,
+				double			secFrac = 0,
+				bool			zonePositive = true,
+				unsigned int	zoneHour = 0,
+				unsigned int	zoneMinute = 0);
+
+		DateValue(const TQDate &);
+		DateValue(const TQDateTime &);
+
+		DateValue *clone();
+
+		bool hasTime();
+
+		unsigned int	year();
+		unsigned int	month();
+		unsigned int	day();
+		unsigned int	hour();
+		unsigned int	minute();
+		unsigned int	second();
+		double			secondFraction();
+		bool			zonePositive();
+		unsigned int	zoneHour();
+		unsigned int	zoneMinute();
+
+		void setYear			(unsigned int);
+		void setMonth			(unsigned int);
+		void setDay				(unsigned int);
+		void setHour			(unsigned int);
+		void setMinute			(unsigned int);
+		void setSecond			(unsigned int);
+		void setSecondFraction	(double);
+		void setZonePositive	(bool);
+		void setZoneHour		(unsigned int);
+		void setZoneMinute		(unsigned int);
+
+		TQDate qdate();
+		TQTime qtime();
+		TQDateTime qdt();
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardEmailParam.h b/tdeabc/vcard/include/VCardEmailParam.h
index 1fe558afd..4ed4af5a0 100644
--- a/tdeabc/vcard/include/VCardEmailParam.h
+++ b/tdeabc/vcard/include/VCardEmailParam.h
@@ -33,17 +33,34 @@ namespace VCARD
 
 class KVCARD_EXPORT EmailParam : public Param
 {
+	public:
+		EmailParam();
+		EmailParam(const EmailParam&);
+		EmailParam(const TQCString&);
+		EmailParam & operator = (EmailParam&);
+		EmailParam & operator = (const TQCString&);
+		bool operator ==(EmailParam&);
+		bool operator !=(EmailParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {EmailParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~EmailParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "EmailParam"; }
 	
-#include "EmailParam-generated.h"
-	
-	TQCString	emailType() { parse(); return emailType_;	}
-	bool		pref()		{ parse(); return pref_;		}
-	
-	void setEmailType(const TQCString & s)
-	{ emailType_ = s; assembled_ = false; }
-	
-	void setPref(bool b)
-	{ pref_ = b; assembled_ = false; }
+		TQCString	emailType() { parse(); return emailType_;	}
+		bool		pref()		{ parse(); return pref_;		}
+
+		void setEmailType(const TQCString & s)
+		{ emailType_ = s; assembled_ = false; }
+
+		void setPref(bool b)
+		{ pref_ = b; assembled_ = false; }
 	
 	private:
 	
diff --git a/tdeabc/vcard/include/VCardFloatValue.h b/tdeabc/vcard/include/VCardFloatValue.h
index 45a6823be..24c4760b8 100644
--- a/tdeabc/vcard/include/VCardFloatValue.h
+++ b/tdeabc/vcard/include/VCardFloatValue.h
@@ -33,13 +33,30 @@ namespace VCARD
 
 class KVCARD_EXPORT FloatValue : public Value
 {
-	
-#include "FloatValue-generated.h"
-	
-	FloatValue(float);
-	
-	float value();
-	void setValue(float);
+	public:
+		FloatValue();
+		FloatValue(const FloatValue&);
+		FloatValue(const TQCString&);
+		FloatValue & operator = (FloatValue&);
+		FloatValue & operator = (const TQCString&);
+		bool operator ==(FloatValue&);
+		bool operator !=(FloatValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {FloatValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~FloatValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "FloatValue"; }
+
+		FloatValue(float);
+
+		float value();
+		void setValue(float);
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardGeoValue.h b/tdeabc/vcard/include/VCardGeoValue.h
index 4228587a4..5d5720df5 100644
--- a/tdeabc/vcard/include/VCardGeoValue.h
+++ b/tdeabc/vcard/include/VCardGeoValue.h
@@ -28,8 +28,25 @@ namespace VCARD
 
 class KVCARD_EXPORT GeoValue : public Value
 {
-	
-#include "GeoValue-generated.h"
+	public:
+		GeoValue();
+		GeoValue(const GeoValue&);
+		GeoValue(const TQCString&);
+		GeoValue & operator = (GeoValue&);
+		GeoValue & operator = (const TQCString&);
+		bool operator ==(GeoValue&);
+		bool operator !=(GeoValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {GeoValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~GeoValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "GeoValue"; }
 
     GeoValue *clone();
 
diff --git a/tdeabc/vcard/include/VCardGroup.h b/tdeabc/vcard/include/VCardGroup.h
index ce884f100..878e6ab78 100644
--- a/tdeabc/vcard/include/VCardGroup.h
+++ b/tdeabc/vcard/include/VCardGroup.h
@@ -31,7 +31,25 @@ namespace VCARD
 
 class KVCARD_EXPORT Group : public Entity
 {
-#include "Group-generated.h"
+	public:
+		Group();
+		Group(const Group&);
+		Group(const TQCString&);
+		Group & operator = (Group&);
+		Group & operator = (const TQCString&);
+		bool operator ==(Group&);
+		bool operator !=(Group& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {Group a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~Group();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "Group"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardImageParam.h b/tdeabc/vcard/include/VCardImageParam.h
index 10ab8a3f5..b679dab4d 100644
--- a/tdeabc/vcard/include/VCardImageParam.h
+++ b/tdeabc/vcard/include/VCardImageParam.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT ImageParam : public Param
 {
-	
-#include "ImageParam-generated.h"
-	
-	private:
+	public:
+		ImageParam();
+		ImageParam(const ImageParam&);
+		ImageParam(const TQCString&);
+		ImageParam & operator = (ImageParam&);
+		ImageParam & operator = (const TQCString&);
+		bool operator ==(ImageParam&);
+		bool operator !=(ImageParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {ImageParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~ImageParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "ImageParam"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardImageValue.h b/tdeabc/vcard/include/VCardImageValue.h
index 45fbcad9c..ed703121b 100644
--- a/tdeabc/vcard/include/VCardImageValue.h
+++ b/tdeabc/vcard/include/VCardImageValue.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT ImageValue : public Value
 {
-	
-#include "ImageValue-generated.h"
-	
-	private:
+	public:
+		ImageValue();
+		ImageValue(const ImageValue&);
+		ImageValue(const TQCString&);
+		ImageValue & operator = (ImageValue&);
+		ImageValue & operator = (const TQCString&);
+		bool operator ==(ImageValue&);
+		bool operator !=(ImageValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {ImageValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~ImageValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "ImageValue"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardImgValue.h b/tdeabc/vcard/include/VCardImgValue.h
index 7d4bbfa2d..3e57e94e0 100644
--- a/tdeabc/vcard/include/VCardImgValue.h
+++ b/tdeabc/vcard/include/VCardImgValue.h
@@ -31,7 +31,25 @@ namespace VCARD
 
 class KVCARD_EXPORT ImgValue : public Value
 {
-#include "ImgValue-generated.h"
+	public:
+		ImgValue();
+		ImgValue(const ImgValue&);
+		ImgValue(const TQCString&);
+		ImgValue & operator = (ImgValue&);
+		ImgValue & operator = (const TQCString&);
+		bool operator ==(ImgValue&);
+		bool operator !=(ImgValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {ImgValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~ImgValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		virtual const char * className() const { return "ImgValue"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardLangValue.h b/tdeabc/vcard/include/VCardLangValue.h
index 7767d52fa..96eea4f71 100644
--- a/tdeabc/vcard/include/VCardLangValue.h
+++ b/tdeabc/vcard/include/VCardLangValue.h
@@ -34,16 +34,34 @@ namespace VCARD
 
 class KVCARD_EXPORT LangValue : public Value
 {
-#include "LangValue-generated.h"
-	
-	TQCString primary();
-	TQStrList subtags();
-	
-	void setPrimary(const TQCString &);	
-	void setSubTags(const TQStrList &);
-	
-	TQCString primary_;
-	TQStrList subtags_;
+	public:
+		LangValue();
+		LangValue(const LangValue&);
+		LangValue(const TQCString&);
+		LangValue & operator = (LangValue&);
+		LangValue & operator = (const TQCString&);
+		bool operator ==(LangValue&);
+		bool operator !=(LangValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {LangValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~LangValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "LangValue"; }
+
+		TQCString primary();
+		TQStrList subtags();
+
+		void setPrimary(const TQCString &);	
+		void setSubTags(const TQStrList &);
+
+		TQCString primary_;
+		TQStrList subtags_;
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardNValue.h b/tdeabc/vcard/include/VCardNValue.h
index 9db37fbbc..cd15c6b53 100644
--- a/tdeabc/vcard/include/VCardNValue.h
+++ b/tdeabc/vcard/include/VCardNValue.h
@@ -31,24 +31,43 @@ namespace VCARD
 
 class KVCARD_EXPORT NValue : public Value
 {
-#include "NValue-generated.h"
-	NValue *clone();
-
-	TQCString family()	{ parse(); return family_;	}
-	TQCString given()	{ parse(); return given_;	}
-	TQCString middle()	{ parse(); return middle_;	}
-	TQCString prefix()	{ parse(); return prefix_;	}
-	TQCString suffix()	{ parse(); return suffix_;	}
-
-	void setFamily	(const TQCString & s) { family_	= s; assembled_ = false; }
-	void setGiven	(const TQCString & s) { given_	= s; assembled_ = false; }
-	void setMiddle	(const TQCString & s) { middle_	= s; assembled_ = false; }
-	void setPrefix	(const TQCString & s) { prefix_	= s; assembled_ = false; }
-	void setSuffix	(const TQCString & s) { suffix_	= s; assembled_ = false; }
-	
+	public:
+		NValue();
+		NValue(const NValue&);
+		NValue(const TQCString&);
+		NValue & operator = (NValue&);
+		NValue & operator = (const TQCString&);
+		bool operator ==(NValue&);
+		bool operator !=(NValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {NValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~NValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "NValue"; }
+
+		NValue *clone();
+
+		TQCString family()	{ parse(); return family_;	}
+		TQCString given()	{ parse(); return given_;	}
+		TQCString middle()	{ parse(); return middle_;	}
+		TQCString prefix()	{ parse(); return prefix_;	}
+		TQCString suffix()	{ parse(); return suffix_;	}
+
+		void setFamily	(const TQCString & s) { family_	= s; assembled_ = false; }
+		void setGiven	(const TQCString & s) { given_	= s; assembled_ = false; }
+		void setMiddle	(const TQCString & s) { middle_	= s; assembled_ = false; }
+		void setPrefix	(const TQCString & s) { prefix_	= s; assembled_ = false; }
+		void setSuffix	(const TQCString & s) { suffix_	= s; assembled_ = false; }
+
 	private:
-	
-	TQCString family_, given_, middle_, prefix_, suffix_;
+
+		TQCString family_, given_, middle_, prefix_, suffix_;
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardOrgValue.h b/tdeabc/vcard/include/VCardOrgValue.h
index a2bd803e5..f4bad70ac 100644
--- a/tdeabc/vcard/include/VCardOrgValue.h
+++ b/tdeabc/vcard/include/VCardOrgValue.h
@@ -34,11 +34,28 @@ namespace VCARD
 
 class KVCARD_EXPORT OrgValue : public Value
 {
+	public:
+		OrgValue();
+		OrgValue(const OrgValue&);
+		OrgValue(const TQCString&);
+		OrgValue & operator = (OrgValue&);
+		OrgValue & operator = (const TQCString&);
+		bool operator ==(OrgValue&);
+		bool operator !=(OrgValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {OrgValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~OrgValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "OrgValue"; }
 	
-#include "OrgValue-generated.h"
-	
-	unsigned int numValues();
-	TQCString value(unsigned int);
+		unsigned int numValues();
+		TQCString value(unsigned int);
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardParam.h b/tdeabc/vcard/include/VCardParam.h
index 93d70f06b..8114e28e5 100644
--- a/tdeabc/vcard/include/VCardParam.h
+++ b/tdeabc/vcard/include/VCardParam.h
@@ -34,16 +34,33 @@ namespace VCARD
 
 class KVCARD_EXPORT Param : public Entity
 {
+	public:
+		Param();
+		Param(const Param&);
+		Param(const TQCString&);
+		Param & operator = (Param&);
+		Param & operator = (const TQCString&);
+		bool operator ==(Param&);
+		bool operator !=(Param& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {Param a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-#include "Param-generated.h"
+		virtual ~Param();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
-        Param(const TQCString &name, const TQCString &value);
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
-	void setName(const TQCString &);
-	void setValue(const TQCString &);
-		
-	TQCString name();
-	TQCString value();
+		void _parse();
+		void _assemble();
+		const char * className() const { return "Param"; }
+
+		Param(const TQCString &name, const TQCString &value);
+
+		void setName(const TQCString &);
+		void setValue(const TQCString &);
+
+		TQCString name();
+		TQCString value();
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardPhoneNumberValue.h b/tdeabc/vcard/include/VCardPhoneNumberValue.h
index 3f9e106ca..3a44da2d2 100644
--- a/tdeabc/vcard/include/VCardPhoneNumberValue.h
+++ b/tdeabc/vcard/include/VCardPhoneNumberValue.h
@@ -31,7 +31,25 @@ namespace VCARD
 
 class KVCARD_EXPORT PhoneNumberValue : public Value
 {
-#include "PhoneNumberValue-generated.h"
+	public:
+		PhoneNumberValue();
+		PhoneNumberValue(const PhoneNumberValue&);
+		PhoneNumberValue(const TQCString&);
+		PhoneNumberValue & operator = (PhoneNumberValue&);
+		PhoneNumberValue & operator = (const TQCString&);
+		bool operator ==(PhoneNumberValue&);
+		bool operator !=(PhoneNumberValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {PhoneNumberValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~PhoneNumberValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "PhoneNumberValue"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardSndValue.h b/tdeabc/vcard/include/VCardSndValue.h
deleted file mode 100644
index 09a3a8238..000000000
--- a/tdeabc/vcard/include/VCardSndValue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-	libvcard - vCard parsing library for vCard version 3.0
-	
-	Copyright (C) 1999 Rik Hemsley rik@kde.org
-	
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-  ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef  SNDVALUE_H
-#define  SNDVALUE_H
-
-#include <VCardValue.h>
-
-namespace VCARD
-{
-
-class KVCARD_EXPORT SndValue : public Value
-{
-#include "SndValue-generated.h"
-};
-
-}
-
-#endif
diff --git a/tdeabc/vcard/include/VCardSoundValue.h b/tdeabc/vcard/include/VCardSoundValue.h
index 61858f058..591449f7d 100644
--- a/tdeabc/vcard/include/VCardSoundValue.h
+++ b/tdeabc/vcard/include/VCardSoundValue.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT SoundValue : public Value
 {
-	
-#include "SoundValue-generated.h"
-	
-	private:
+	public:
+		SoundValue();
+		SoundValue(const SoundValue&);
+		SoundValue(const TQCString&);
+		SoundValue & operator = (SoundValue&);
+		SoundValue & operator = (const TQCString&);
+		bool operator ==(SoundValue&);
+		bool operator !=(SoundValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {SoundValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~SoundValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "SoundValue"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardSourceParam.h b/tdeabc/vcard/include/VCardSourceParam.h
index 1d9d03d47..5d80dd2f4 100644
--- a/tdeabc/vcard/include/VCardSourceParam.h
+++ b/tdeabc/vcard/include/VCardSourceParam.h
@@ -33,15 +33,32 @@ namespace VCARD
 
 class KVCARD_EXPORT SourceParam : public Param
 {
+	public:
+		SourceParam();
+		SourceParam(const SourceParam&);
+		SourceParam(const TQCString&);
+		SourceParam & operator = (SourceParam&);
+		SourceParam & operator = (const TQCString&);
+		bool operator ==(SourceParam&);
+		bool operator !=(SourceParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {SourceParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~SourceParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "SourceParam"; }
+
+		enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
 
-#include "SourceParam-generated.h"
-	
-	enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
-	
 		SourceParamType type()	{ parse(); return type_;}
 		TQCString par()			{ parse(); return par_; }
 		TQCString val()			{ parse(); return val_; }
-		
+
 		void setType(SourceParamType t) { type_	= t; assembled_ = false; }
 		void setPar(const TQCString & s) { par_	= s; assembled_ = false; }
 		void setVal(const TQCString & s) { val_	= s; assembled_ = false; }
diff --git a/tdeabc/vcard/include/VCardTelParam.h b/tdeabc/vcard/include/VCardTelParam.h
index 9eea5da2f..a780108d8 100644
--- a/tdeabc/vcard/include/VCardTelParam.h
+++ b/tdeabc/vcard/include/VCardTelParam.h
@@ -33,13 +33,31 @@ namespace VCARD
 
 class KVCARD_EXPORT TelParam : public Param
 {
-#include "TelParam-generated.h"
-	
-	enum TelType {
-		TelHome, TelWork, TelPref, TelVoice, TelFex, TelMsg, TelCell,
-		TelPager, TelBBS, TelModem, TelCar, TelISDN, TelVideo, TelPCS,
-		TelIANA, TelX
-	};
+	public:
+		TelParam();
+		TelParam(const TelParam&);
+		TelParam(const TQCString&);
+		TelParam & operator = (TelParam&);
+		TelParam & operator = (const TQCString&);
+		bool operator ==(TelParam&);
+		bool operator !=(TelParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TelParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TelParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TelParam"; }
+
+		enum TelType {
+			TelHome, TelWork, TelPref, TelVoice, TelFex, TelMsg, TelCell,
+			TelPager, TelBBS, TelModem, TelCar, TelISDN, TelVideo, TelPCS,
+			TelIANA, TelX
+		};
 	
 	private:
 		
diff --git a/tdeabc/vcard/include/VCardTelValue.h b/tdeabc/vcard/include/VCardTelValue.h
index 043a45aa9..e02504112 100644
--- a/tdeabc/vcard/include/VCardTelValue.h
+++ b/tdeabc/vcard/include/VCardTelValue.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT TelValue : public Value
 {
-	
-#include "TelValue-generated.h"
-	
-	private:
+	public:
+		TelValue();
+		TelValue(const TelValue&);
+		TelValue(const TQCString&);
+		TelValue & operator = (TelValue&);
+		TelValue & operator = (const TQCString&);
+		bool operator ==(TelValue&);
+		bool operator !=(TelValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TelValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TelValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TelValue"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardTextBinParam.h b/tdeabc/vcard/include/VCardTextBinParam.h
index 5a681ad48..f4c1e908b 100644
--- a/tdeabc/vcard/include/VCardTextBinParam.h
+++ b/tdeabc/vcard/include/VCardTextBinParam.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT TextBinParam : public Param
 {
-	
-#include "TextBinParam-generated.h"
-	
-	private:
+	public:
+		TextBinParam();
+		TextBinParam(const TextBinParam&);
+		TextBinParam(const TQCString&);
+		TextBinParam & operator = (TextBinParam&);
+		TextBinParam & operator = (const TQCString&);
+		bool operator ==(TextBinParam&);
+		bool operator !=(TextBinParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TextBinParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TextBinParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TextBinParam"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardTextBinValue.h b/tdeabc/vcard/include/VCardTextBinValue.h
index 316fa7832..d90d1e9d5 100644
--- a/tdeabc/vcard/include/VCardTextBinValue.h
+++ b/tdeabc/vcard/include/VCardTextBinValue.h
@@ -33,28 +33,45 @@ namespace VCARD
 
 class KVCARD_EXPORT TextBinValue : public Value
 {
-	
-#include "TextBinValue-generated.h"
-
-  TextBinValue *clone();
-
-  bool isBinary() { parse(); return mIsBinary_; }
-  TQByteArray data() { parse(); return mData_; }
-  TQString url() { parse(); return mUrl_; }
-
-  void setData( const TQByteArray &data )
-  {
-    mData_ = data;
-    mIsBinary_ = true;
-    assembled_ = false;
-  }
-
-  void setUrl( const TQString &url )
-  {
-    mUrl_ = url;
-    mIsBinary_ = false;
-    assembled_ = false;
-  }
+	public:
+		TextBinValue();
+		TextBinValue(const TextBinValue&);
+		TextBinValue(const TQCString&);
+		TextBinValue & operator = (TextBinValue&);
+		TextBinValue & operator = (const TQCString&);
+		bool operator ==(TextBinValue&);
+		bool operator !=(TextBinValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TextBinValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TextBinValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TextBinValue"; }
+
+		TextBinValue *clone();
+
+		bool isBinary() { parse(); return mIsBinary_; }
+		TQByteArray data() { parse(); return mData_; }
+		TQString url() { parse(); return mUrl_; }
+
+		void setData( const TQByteArray &data )
+		{
+			mData_ = data;
+			mIsBinary_ = true;
+			assembled_ = false;
+		}
+
+		void setUrl( const TQString &url )
+		{
+			mUrl_ = url;
+			mIsBinary_ = false;
+			assembled_ = false;
+		}
 
 	private:
     int mIsBinary_;
diff --git a/tdeabc/vcard/include/VCardTextListValue.h b/tdeabc/vcard/include/VCardTextListValue.h
index 53760c75a..4c3cfafe6 100644
--- a/tdeabc/vcard/include/VCardTextListValue.h
+++ b/tdeabc/vcard/include/VCardTextListValue.h
@@ -35,12 +35,29 @@ namespace VCARD
 
 class KVCARD_EXPORT TextListValue : public Value
 {
+	public:
+		TextListValue();
+		TextListValue(const TextListValue&);
+		TextListValue(const TQCString&);
+		TextListValue & operator = (TextListValue&);
+		TextListValue & operator = (const TQCString&);
+		bool operator ==(TextListValue&);
+		bool operator !=(TextListValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TextListValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TextListValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TextListValue"; }
 	
-#include "TextListValue-generated.h"
-	
-	unsigned int numValues();
-	TQCString value(unsigned int);
-	
+		unsigned int numValues();
+		TQCString value(unsigned int);
+
 	private:
 		
 		TQStrList valueList_;
diff --git a/tdeabc/vcard/include/VCardTextParam.h b/tdeabc/vcard/include/VCardTextParam.h
index d593c0578..1bdd70aa6 100644
--- a/tdeabc/vcard/include/VCardTextParam.h
+++ b/tdeabc/vcard/include/VCardTextParam.h
@@ -33,10 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT TextParam : public Param
 {
-	
-#include "TextParam-generated.h"
-	
-	private:
+	public:
+		TextParam();
+		TextParam(const TextParam&);
+		TextParam(const TQCString&);
+		TextParam & operator = (TextParam&);
+		TextParam & operator = (const TQCString&);
+		bool operator ==(TextParam&);
+		bool operator !=(TextParam& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TextParam a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TextParam();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TextParam"; }
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardTextValue.h b/tdeabc/vcard/include/VCardTextValue.h
index 66eed32a8..ae573c5d6 100644
--- a/tdeabc/vcard/include/VCardTextValue.h
+++ b/tdeabc/vcard/include/VCardTextValue.h
@@ -31,9 +31,27 @@ namespace VCARD
 
 class KVCARD_EXPORT TextValue : public Value
 {
-#include "TextValue-generated.h"
-
-  TextValue *clone();
+	public:
+		TextValue();
+		TextValue(const TextValue&);
+		TextValue(const TQCString&);
+		TextValue & operator = (TextValue&);
+		TextValue & operator = (const TQCString&);
+		bool operator ==(TextValue&);
+		bool operator !=(TextValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {TextValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~TextValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "TextValue"; }
+
+		TextValue *clone();
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardURIValue.h b/tdeabc/vcard/include/VCardURIValue.h
index 696887774..0158b1b00 100644
--- a/tdeabc/vcard/include/VCardURIValue.h
+++ b/tdeabc/vcard/include/VCardURIValue.h
@@ -31,15 +31,33 @@ namespace VCARD
 
 class KVCARD_EXPORT URIValue : public Value
 {
-#include "URIValue-generated.h"
+	public:
+		URIValue();
+		URIValue(const URIValue&);
+		URIValue(const TQCString&);
+		URIValue & operator = (URIValue&);
+		URIValue & operator = (const TQCString&);
+		bool operator ==(URIValue&);
+		bool operator !=(URIValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {URIValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-	URIValue(const TQCString & scheme, const TQCString & schemeSpecificPart);
-	
-	TQCString scheme();
-	TQCString schemeSpecificPart();
-	
-	void setScheme				(const TQCString &);
-	void setSchemeSpecificPart	(const TQCString &);
+		virtual ~URIValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "URIValue"; }
+
+		URIValue(const TQCString & scheme, const TQCString & schemeSpecificPart);
+
+		TQCString scheme();
+		TQCString schemeSpecificPart();
+
+		void setScheme				(const TQCString &);
+		void setSchemeSpecificPart	(const TQCString &);
 	
 	private:
 	
diff --git a/tdeabc/vcard/include/VCardUTCValue.h b/tdeabc/vcard/include/VCardUTCValue.h
index cb09ccf00..6a623aa6a 100644
--- a/tdeabc/vcard/include/VCardUTCValue.h
+++ b/tdeabc/vcard/include/VCardUTCValue.h
@@ -33,19 +33,36 @@ namespace VCARD
 
 class KVCARD_EXPORT UTCValue : public Value
 {
-	
-#include "UTCValue-generated.h"
+	public:
+		UTCValue();
+		UTCValue(const UTCValue&);
+		UTCValue(const TQCString&);
+		UTCValue & operator = (UTCValue&);
+		UTCValue & operator = (const TQCString&);
+		bool operator ==(UTCValue&);
+		bool operator !=(UTCValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {UTCValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-  UTCValue *clone();
-	
-  void setPositive( int p ) { positive_ = p; assembled_ = false; }
-  void setHour( int h ) { hour_ = h; assembled_ = false; }
-  void setMinute( int m ) { minute_ = m; assembled_ = false; }
+		virtual ~UTCValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
-	bool positive() { parse(); return positive_; }
-	unsigned int hour() { parse(); return hour_; }
-	unsigned int minute() { parse(); return minute_; }
-	
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "UTCValue"; }
+		
+		UTCValue *clone();
+		
+		void setPositive( int p ) { positive_ = p; assembled_ = false; }
+		void setHour( int h ) { hour_ = h; assembled_ = false; }
+		void setMinute( int m ) { minute_ = m; assembled_ = false; }
+
+		bool positive() { parse(); return positive_; }
+		unsigned int hour() { parse(); return hour_; }
+		unsigned int minute() { parse(); return minute_; }
+		
 	private:
 		
 		bool positive_;
diff --git a/tdeabc/vcard/include/VCardVCard.h b/tdeabc/vcard/include/VCardVCard.h
index 53563e8c0..1d2bbb1ef 100644
--- a/tdeabc/vcard/include/VCardVCard.h
+++ b/tdeabc/vcard/include/VCardVCard.h
@@ -36,26 +36,43 @@ namespace VCARD
 
 class KVCARD_EXPORT VCard : public Entity
 {
+	public:
+		VCard();
+		VCard(const VCard&);
+		VCard(const TQCString&);
+		VCard & operator = (VCard&);
+		VCard & operator = (const TQCString&);
+		bool operator ==(VCard&);
+		bool operator !=(VCard& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {VCard a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-#include "VCard-generated.h"
-	
-	bool has(EntityType);
-	bool has(const TQCString &);
-	
-	void add(const ContentLine &);
-	void add(const TQCString &);
-	
-	ContentLine * contentLine(EntityType);
-	ContentLine * contentLine(const TQCString &);
-	
-	TQCString group() { parse(); return group_; }
-	
-	TQPtrList<ContentLine>	contentLineList() { parse(); return contentLineList_; }
+		virtual ~VCard();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "VCard"; }
 	
+		bool has(EntityType);
+		bool has(const TQCString &);
+
+		void add(const ContentLine &);
+		void add(const TQCString &);
+
+		ContentLine * contentLine(EntityType);
+		ContentLine * contentLine(const TQCString &);
+
+		TQCString group() { parse(); return group_; }
+
+		TQPtrList<ContentLine>	contentLineList() { parse(); return contentLineList_; }
+
 	private:
 
-	TQCString		group_;
-	TQPtrList<ContentLine>	contentLineList_;
+		TQCString		group_;
+		TQPtrList<ContentLine>	contentLineList_;
 };
 
 }
diff --git a/tdeabc/vcard/include/VCardVCardEntity.h b/tdeabc/vcard/include/VCardVCardEntity.h
index 422790c22..7f012cfa2 100644
--- a/tdeabc/vcard/include/VCardVCardEntity.h
+++ b/tdeabc/vcard/include/VCardVCardEntity.h
@@ -39,15 +39,32 @@ typedef TQPtrListIterator<VCard> VCardListIterator;
 
 class KVCARD_EXPORT VCardEntity : public Entity
 {
+	public:
+		VCardEntity();
+		VCardEntity(const VCardEntity&);
+		VCardEntity(const TQCString&);
+		VCardEntity & operator = (VCardEntity&);
+		VCardEntity & operator = (const TQCString&);
+		bool operator ==(VCardEntity&);
+		bool operator !=(VCardEntity& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {VCardEntity a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-#include "VCardEntity-generated.h"
-	
-	void setCardList(const VCardList & l);
-	VCardList & cardList();
+		virtual ~VCardEntity();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "VCardEntity"; }
+
+		void setCardList(const VCardList & l);
+		VCardList & cardList();
 	
 	private:
   
-  VCardList cardList_;
+		VCardList cardList_;
 
 };
 
diff --git a/tdeabc/vcard/include/VCardValue.h b/tdeabc/vcard/include/VCardValue.h
index 3c167d70a..f9c052c8e 100644
--- a/tdeabc/vcard/include/VCardValue.h
+++ b/tdeabc/vcard/include/VCardValue.h
@@ -33,7 +33,25 @@ namespace VCARD
 
 class KVCARD_EXPORT Value : public Entity
 {
-#include "Value-generated.h"
+public:
+	Value();
+	Value(const Value&);
+	Value(const TQCString&);
+	Value & operator = (Value&);
+	Value & operator = (const TQCString&);
+	bool operator ==(Value&);
+	bool operator !=(Value& x) {return !(*this==x);}
+	bool operator ==(const TQCString& s) {Value a(s);return(*this==a);} 
+	bool operator != (const TQCString& s) {return !(*this == s);}
+
+	virtual ~Value();
+	void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+	void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+	void _parse();
+	void _assemble();
+	const char * className() const { return "Value"; }
 
 	virtual Value *clone() { return new Value( *this ); }
 };
diff --git a/tdeabc/vcard/include/generated/AdrParam-generated.h b/tdeabc/vcard/include/generated/AdrParam-generated.h
deleted file mode 100644
index 1afdcd36a..000000000
--- a/tdeabc/vcard/include/generated/AdrParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-AdrParam();
-AdrParam(const AdrParam&);
-AdrParam(const TQCString&);
-AdrParam & operator = (AdrParam&);
-AdrParam & operator = (const TQCString&);
-bool operator ==(AdrParam&);
-bool operator !=(AdrParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {AdrParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~AdrParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "AdrParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/AdrValue-generated.h b/tdeabc/vcard/include/generated/AdrValue-generated.h
deleted file mode 100644
index 9882d1186..000000000
--- a/tdeabc/vcard/include/generated/AdrValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-AdrValue();
-AdrValue(const AdrValue&);
-AdrValue(const TQCString&);
-AdrValue & operator = (AdrValue&);
-AdrValue & operator = (const TQCString&);
-bool operator ==(AdrValue&);
-bool operator !=(AdrValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {AdrValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~AdrValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "AdrValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/AgentParam-generated.h b/tdeabc/vcard/include/generated/AgentParam-generated.h
deleted file mode 100644
index 07b87d106..000000000
--- a/tdeabc/vcard/include/generated/AgentParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-AgentParam();
-AgentParam(const AgentParam&);
-AgentParam(const TQCString&);
-AgentParam & operator = (AgentParam&);
-AgentParam & operator = (const TQCString&);
-bool operator ==(AgentParam&);
-bool operator !=(AgentParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {AgentParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~AgentParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "AgentParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/AgentValue-generated.h b/tdeabc/vcard/include/generated/AgentValue-generated.h
deleted file mode 100644
index e2866bb8f..000000000
--- a/tdeabc/vcard/include/generated/AgentValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-AgentValue();
-AgentValue(const AgentValue&);
-AgentValue(const TQCString&);
-AgentValue & operator = (AgentValue&);
-AgentValue & operator = (const TQCString&);
-bool operator ==(AgentValue&);
-bool operator !=(AgentValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {AgentValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~AgentValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "AgentValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ClassValue-generated.h b/tdeabc/vcard/include/generated/ClassValue-generated.h
deleted file mode 100644
index e10c65568..000000000
--- a/tdeabc/vcard/include/generated/ClassValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-ClassValue();
-ClassValue(const ClassValue&);
-ClassValue(const TQCString&);
-ClassValue & operator = (ClassValue&);
-ClassValue & operator = (const TQCString&);
-bool operator ==(ClassValue&);
-bool operator !=(ClassValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {ClassValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~ClassValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "ClassValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ContentLine-generated.h b/tdeabc/vcard/include/generated/ContentLine-generated.h
deleted file mode 100644
index ad2ac7649..000000000
--- a/tdeabc/vcard/include/generated/ContentLine-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-ContentLine();
-ContentLine(const ContentLine&);
-ContentLine(const TQCString&);
-ContentLine & operator = (ContentLine&);
-ContentLine & operator = (const TQCString&);
-bool operator ==(ContentLine&);
-bool operator !=(ContentLine& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {ContentLine a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~ContentLine();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "ContentLine"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/DateParam-generated.h b/tdeabc/vcard/include/generated/DateParam-generated.h
deleted file mode 100644
index 75e7ad72d..000000000
--- a/tdeabc/vcard/include/generated/DateParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-DateParam();
-DateParam(const DateParam&);
-DateParam(const TQCString&);
-DateParam & operator = (DateParam&);
-DateParam & operator = (const TQCString&);
-bool operator ==(DateParam&);
-bool operator !=(DateParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {DateParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~DateParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "DateParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/DateValue-generated.h b/tdeabc/vcard/include/generated/DateValue-generated.h
deleted file mode 100644
index cf0eb40d8..000000000
--- a/tdeabc/vcard/include/generated/DateValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-DateValue();
-DateValue(const DateValue&);
-DateValue(const TQCString&);
-DateValue & operator = (DateValue&);
-DateValue & operator = (const TQCString&);
-bool operator ==(DateValue&);
-bool operator !=(DateValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {DateValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~DateValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "DateValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/EmailParam-generated.h b/tdeabc/vcard/include/generated/EmailParam-generated.h
deleted file mode 100644
index 46ae1f80f..000000000
--- a/tdeabc/vcard/include/generated/EmailParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-EmailParam();
-EmailParam(const EmailParam&);
-EmailParam(const TQCString&);
-EmailParam & operator = (EmailParam&);
-EmailParam & operator = (const TQCString&);
-bool operator ==(EmailParam&);
-bool operator !=(EmailParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {EmailParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~EmailParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "EmailParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/FloatValue-generated.h b/tdeabc/vcard/include/generated/FloatValue-generated.h
deleted file mode 100644
index 155f52ae1..000000000
--- a/tdeabc/vcard/include/generated/FloatValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-FloatValue();
-FloatValue(const FloatValue&);
-FloatValue(const TQCString&);
-FloatValue & operator = (FloatValue&);
-FloatValue & operator = (const TQCString&);
-bool operator ==(FloatValue&);
-bool operator !=(FloatValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {FloatValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~FloatValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "FloatValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/GeoValue-generated.h b/tdeabc/vcard/include/generated/GeoValue-generated.h
deleted file mode 100644
index b525e8c21..000000000
--- a/tdeabc/vcard/include/generated/GeoValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-GeoValue();
-GeoValue(const GeoValue&);
-GeoValue(const TQCString&);
-GeoValue & operator = (GeoValue&);
-GeoValue & operator = (const TQCString&);
-bool operator ==(GeoValue&);
-bool operator !=(GeoValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {GeoValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~GeoValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "GeoValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/Group-generated.h b/tdeabc/vcard/include/generated/Group-generated.h
deleted file mode 100644
index 38e1c2a3a..000000000
--- a/tdeabc/vcard/include/generated/Group-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-Group();
-Group(const Group&);
-Group(const TQCString&);
-Group & operator = (Group&);
-Group & operator = (const TQCString&);
-bool operator ==(Group&);
-bool operator !=(Group& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {Group a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~Group();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "Group"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ImageParam-generated.h b/tdeabc/vcard/include/generated/ImageParam-generated.h
deleted file mode 100644
index 78a5a97cf..000000000
--- a/tdeabc/vcard/include/generated/ImageParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-ImageParam();
-ImageParam(const ImageParam&);
-ImageParam(const TQCString&);
-ImageParam & operator = (ImageParam&);
-ImageParam & operator = (const TQCString&);
-bool operator ==(ImageParam&);
-bool operator !=(ImageParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {ImageParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~ImageParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "ImageParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ImageValue-generated.h b/tdeabc/vcard/include/generated/ImageValue-generated.h
deleted file mode 100644
index 882081fbc..000000000
--- a/tdeabc/vcard/include/generated/ImageValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-ImageValue();
-ImageValue(const ImageValue&);
-ImageValue(const TQCString&);
-ImageValue & operator = (ImageValue&);
-ImageValue & operator = (const TQCString&);
-bool operator ==(ImageValue&);
-bool operator !=(ImageValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {ImageValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~ImageValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "ImageValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ImgParam-generated.h b/tdeabc/vcard/include/generated/ImgParam-generated.h
deleted file mode 100644
index 04132c857..000000000
--- a/tdeabc/vcard/include/generated/ImgParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-ImgParam();
-ImgParam(const ImgParam&);
-ImgParam(const TQCString&);
-ImgParam & operator = (ImgParam&);
-ImgParam & operator = (const TQCString&);
-bool operator ==(ImgParam&);
-bool operator !=(ImgParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {ImgParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~ImgParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-virtual const char * className() const { return "ImgParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ImgValue-generated.h b/tdeabc/vcard/include/generated/ImgValue-generated.h
deleted file mode 100644
index 0774de9bf..000000000
--- a/tdeabc/vcard/include/generated/ImgValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-ImgValue();
-ImgValue(const ImgValue&);
-ImgValue(const TQCString&);
-ImgValue & operator = (ImgValue&);
-ImgValue & operator = (const TQCString&);
-bool operator ==(ImgValue&);
-bool operator !=(ImgValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {ImgValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~ImgValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-virtual const char * className() const { return "ImgValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/LangValue-generated.h b/tdeabc/vcard/include/generated/LangValue-generated.h
deleted file mode 100644
index c4930c59e..000000000
--- a/tdeabc/vcard/include/generated/LangValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-LangValue();
-LangValue(const LangValue&);
-LangValue(const TQCString&);
-LangValue & operator = (LangValue&);
-LangValue & operator = (const TQCString&);
-bool operator ==(LangValue&);
-bool operator !=(LangValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {LangValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~LangValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "LangValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/NValue-generated.h b/tdeabc/vcard/include/generated/NValue-generated.h
deleted file mode 100644
index d78715ec0..000000000
--- a/tdeabc/vcard/include/generated/NValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-NValue();
-NValue(const NValue&);
-NValue(const TQCString&);
-NValue & operator = (NValue&);
-NValue & operator = (const TQCString&);
-bool operator ==(NValue&);
-bool operator !=(NValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {NValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~NValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "NValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/Name-generated.h b/tdeabc/vcard/include/generated/Name-generated.h
deleted file mode 100644
index 17d56e680..000000000
--- a/tdeabc/vcard/include/generated/Name-generated.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-V_Name();
-V_Name(const V_Name&);
-V_Name(const TQCString&);
-V_Name & operator = (V_Name&);
-V_Name & operator = (const TQCString&);
-bool operator ==(V_Name&);
-bool operator !=(V_Name& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {V_Name a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~V_Name();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/OrgValue-generated.h b/tdeabc/vcard/include/generated/OrgValue-generated.h
deleted file mode 100644
index 661ecf5a3..000000000
--- a/tdeabc/vcard/include/generated/OrgValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-OrgValue();
-OrgValue(const OrgValue&);
-OrgValue(const TQCString&);
-OrgValue & operator = (OrgValue&);
-OrgValue & operator = (const TQCString&);
-bool operator ==(OrgValue&);
-bool operator !=(OrgValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {OrgValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~OrgValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "OrgValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/Param-generated.h b/tdeabc/vcard/include/generated/Param-generated.h
deleted file mode 100644
index bf63e7166..000000000
--- a/tdeabc/vcard/include/generated/Param-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-Param();
-Param(const Param&);
-Param(const TQCString&);
-Param & operator = (Param&);
-Param & operator = (const TQCString&);
-bool operator ==(Param&);
-bool operator !=(Param& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {Param a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~Param();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "Param"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ParamName-generated.h b/tdeabc/vcard/include/generated/ParamName-generated.h
deleted file mode 100644
index 60b1e12d5..000000000
--- a/tdeabc/vcard/include/generated/ParamName-generated.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-V_ParamName();
-V_ParamName(const V_ParamName&);
-V_ParamName(const TQCString&);
-V_ParamName & operator = (V_ParamName&);
-V_ParamName & operator = (const TQCString&);
-bool operator ==(V_ParamName&);
-bool operator !=(V_ParamName& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {V_ParamName a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~V_ParamName();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/ParamValue-generated.h b/tdeabc/vcard/include/generated/ParamValue-generated.h
deleted file mode 100644
index f31a166c6..000000000
--- a/tdeabc/vcard/include/generated/ParamValue-generated.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-V_ParamValue();
-V_ParamValue(const V_ParamValue&);
-V_ParamValue(const TQCString&);
-V_ParamValue & operator = (V_ParamValue&);
-V_ParamValue & operator = (const TQCString&);
-bool operator ==(V_ParamValue&);
-bool operator !=(V_ParamValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {V_ParamValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~V_ParamValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h b/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
deleted file mode 100644
index f0eb6b4f4..000000000
--- a/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-PhoneNumberValue();
-PhoneNumberValue(const PhoneNumberValue&);
-PhoneNumberValue(const TQCString&);
-PhoneNumberValue & operator = (PhoneNumberValue&);
-PhoneNumberValue & operator = (const TQCString&);
-bool operator ==(PhoneNumberValue&);
-bool operator !=(PhoneNumberValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {PhoneNumberValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~PhoneNumberValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "PhoneNumberValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/SoundValue-generated.h b/tdeabc/vcard/include/generated/SoundValue-generated.h
deleted file mode 100644
index 64081be0b..000000000
--- a/tdeabc/vcard/include/generated/SoundValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-SoundValue();
-SoundValue(const SoundValue&);
-SoundValue(const TQCString&);
-SoundValue & operator = (SoundValue&);
-SoundValue & operator = (const TQCString&);
-bool operator ==(SoundValue&);
-bool operator !=(SoundValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {SoundValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~SoundValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "SoundValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/SourceParam-generated.h b/tdeabc/vcard/include/generated/SourceParam-generated.h
deleted file mode 100644
index e3b13bca1..000000000
--- a/tdeabc/vcard/include/generated/SourceParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-SourceParam();
-SourceParam(const SourceParam&);
-SourceParam(const TQCString&);
-SourceParam & operator = (SourceParam&);
-SourceParam & operator = (const TQCString&);
-bool operator ==(SourceParam&);
-bool operator !=(SourceParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {SourceParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~SourceParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "SourceParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TelParam-generated.h b/tdeabc/vcard/include/generated/TelParam-generated.h
deleted file mode 100644
index 9f8f24270..000000000
--- a/tdeabc/vcard/include/generated/TelParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TelParam();
-TelParam(const TelParam&);
-TelParam(const TQCString&);
-TelParam & operator = (TelParam&);
-TelParam & operator = (const TQCString&);
-bool operator ==(TelParam&);
-bool operator !=(TelParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TelParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TelParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TelParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TelValue-generated.h b/tdeabc/vcard/include/generated/TelValue-generated.h
deleted file mode 100644
index 600da7727..000000000
--- a/tdeabc/vcard/include/generated/TelValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TelValue();
-TelValue(const TelValue&);
-TelValue(const TQCString&);
-TelValue & operator = (TelValue&);
-TelValue & operator = (const TQCString&);
-bool operator ==(TelValue&);
-bool operator !=(TelValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TelValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TelValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TelValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TextBinParam-generated.h b/tdeabc/vcard/include/generated/TextBinParam-generated.h
deleted file mode 100644
index 37dc56e55..000000000
--- a/tdeabc/vcard/include/generated/TextBinParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TextBinParam();
-TextBinParam(const TextBinParam&);
-TextBinParam(const TQCString&);
-TextBinParam & operator = (TextBinParam&);
-TextBinParam & operator = (const TQCString&);
-bool operator ==(TextBinParam&);
-bool operator !=(TextBinParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TextBinParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TextBinParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TextBinParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TextBinValue-generated.h b/tdeabc/vcard/include/generated/TextBinValue-generated.h
deleted file mode 100644
index 4c9580421..000000000
--- a/tdeabc/vcard/include/generated/TextBinValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TextBinValue();
-TextBinValue(const TextBinValue&);
-TextBinValue(const TQCString&);
-TextBinValue & operator = (TextBinValue&);
-TextBinValue & operator = (const TQCString&);
-bool operator ==(TextBinValue&);
-bool operator !=(TextBinValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TextBinValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TextBinValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TextBinValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TextListValue-generated.h b/tdeabc/vcard/include/generated/TextListValue-generated.h
deleted file mode 100644
index 8babb0d9f..000000000
--- a/tdeabc/vcard/include/generated/TextListValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TextListValue();
-TextListValue(const TextListValue&);
-TextListValue(const TQCString&);
-TextListValue & operator = (TextListValue&);
-TextListValue & operator = (const TQCString&);
-bool operator ==(TextListValue&);
-bool operator !=(TextListValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TextListValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TextListValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TextListValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TextNSParam-generated.h b/tdeabc/vcard/include/generated/TextNSParam-generated.h
deleted file mode 100644
index bd8e74b07..000000000
--- a/tdeabc/vcard/include/generated/TextNSParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TextNSParam();
-TextNSParam(const TextNSParam&);
-TextNSParam(const TQCString&);
-TextNSParam & operator = (TextNSParam&);
-TextNSParam & operator = (const TQCString&);
-bool operator ==(TextNSParam&);
-bool operator !=(TextNSParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TextNSParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TextNSParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TextNSParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TextParam-generated.h b/tdeabc/vcard/include/generated/TextParam-generated.h
deleted file mode 100644
index 54ae611a5..000000000
--- a/tdeabc/vcard/include/generated/TextParam-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TextParam();
-TextParam(const TextParam&);
-TextParam(const TQCString&);
-TextParam & operator = (TextParam&);
-TextParam & operator = (const TQCString&);
-bool operator ==(TextParam&);
-bool operator !=(TextParam& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TextParam a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TextParam();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TextParam"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/TextValue-generated.h b/tdeabc/vcard/include/generated/TextValue-generated.h
deleted file mode 100644
index 5b56b54a7..000000000
--- a/tdeabc/vcard/include/generated/TextValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-TextValue();
-TextValue(const TextValue&);
-TextValue(const TQCString&);
-TextValue & operator = (TextValue&);
-TextValue & operator = (const TQCString&);
-bool operator ==(TextValue&);
-bool operator !=(TextValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {TextValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~TextValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "TextValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/URIValue-generated.h b/tdeabc/vcard/include/generated/URIValue-generated.h
deleted file mode 100644
index 5a691e6d6..000000000
--- a/tdeabc/vcard/include/generated/URIValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-URIValue();
-URIValue(const URIValue&);
-URIValue(const TQCString&);
-URIValue & operator = (URIValue&);
-URIValue & operator = (const TQCString&);
-bool operator ==(URIValue&);
-bool operator !=(URIValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {URIValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~URIValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "URIValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/UTCValue-generated.h b/tdeabc/vcard/include/generated/UTCValue-generated.h
deleted file mode 100644
index 0c6edfb46..000000000
--- a/tdeabc/vcard/include/generated/UTCValue-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-UTCValue();
-UTCValue(const UTCValue&);
-UTCValue(const TQCString&);
-UTCValue & operator = (UTCValue&);
-UTCValue & operator = (const TQCString&);
-bool operator ==(UTCValue&);
-bool operator !=(UTCValue& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {UTCValue a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~UTCValue();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "UTCValue"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/VCard-generated.h b/tdeabc/vcard/include/generated/VCard-generated.h
deleted file mode 100644
index 4f36d11da..000000000
--- a/tdeabc/vcard/include/generated/VCard-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-VCard();
-VCard(const VCard&);
-VCard(const TQCString&);
-VCard & operator = (VCard&);
-VCard & operator = (const TQCString&);
-bool operator ==(VCard&);
-bool operator !=(VCard& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {VCard a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~VCard();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "VCard"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/VCardEntity-generated.h b/tdeabc/vcard/include/generated/VCardEntity-generated.h
deleted file mode 100644
index 4e973e62a..000000000
--- a/tdeabc/vcard/include/generated/VCardEntity-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-VCardEntity();
-VCardEntity(const VCardEntity&);
-VCardEntity(const TQCString&);
-VCardEntity & operator = (VCardEntity&);
-VCardEntity & operator = (const TQCString&);
-bool operator ==(VCardEntity&);
-bool operator !=(VCardEntity& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {VCardEntity a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~VCardEntity();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "VCardEntity"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/Value-generated.h b/tdeabc/vcard/include/generated/Value-generated.h
deleted file mode 100644
index 935d137b6..000000000
--- a/tdeabc/vcard/include/generated/Value-generated.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// XXX Automatically generated. DO NOT EDIT! XXX //
-
-public:
-Value();
-Value(const Value&);
-Value(const TQCString&);
-Value & operator = (Value&);
-Value & operator = (const TQCString&);
-bool operator ==(Value&);
-bool operator !=(Value& x) {return !(*this==x);}
-bool operator ==(const TQCString& s) {Value a(s);return(*this==a);} 
-bool operator != (const TQCString& s) {return !(*this == s);}
-
-virtual ~Value();
-void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
-
-void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
-
-void _parse();
-void _assemble();
-const char * className() const { return "Value"; }
-
-// End of automatically generated code           //
diff --git a/tdeabc/vcard/include/generated/generate b/tdeabc/vcard/include/generated/generate
deleted file mode 100755
index 926dbf136..000000000
--- a/tdeabc/vcard/include/generated/generate
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cat headerBodies | awk -f generateHeaders.awk
diff --git a/tdeabc/vcard/include/generated/generateHeaders.awk b/tdeabc/vcard/include/generated/generateHeaders.awk
deleted file mode 100755
index 471db11b4..000000000
--- a/tdeabc/vcard/include/generated/generateHeaders.awk
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/awk -f
-
-{
-	outfile = $1 "-generated.h"
-	name = $1
-	
-	OFS=""
-	
-	print "// XXX Automatically generated. DO NOT EDIT! XXX //\n" > outfile
-	print "// WARNING! All changes made in this file will be lost!\n" > outfile
-
-	if ($2 == "v") { pre = "virtual " } else { pre = "" }
-	
-	print "public:" >> outfile
-	print name "();" >> outfile
-	print name "(const " name "&);" >> outfile
-	print name "(const QCString&);" >> outfile
-	print pre name " & operator = (" name "&);" >> outfile
-	print pre name " & operator = (const QCString&);" >> outfile
-	print pre "bool operator ==(" name "&);" >> outfile
-	print pre "bool operator !=(" name "& x) {return !(*this==x);}" \
-			>> outfile
-	print pre "bool operator ==(const QCString& s) {" name " a(s);" \
-			"return(*this==a);} " >> outfile
-	print pre "bool operator != (const QCString& s) {return !(*this == s);}\n" \
-			>> outfile
-	print "virtual ~" name "();" >> outfile
-	print pre "void parse() " \
-			"{if(!parsed_) _parse();parsed_=true;assembled_=false;}\n" \
-			>> outfile
-	print pre "void assemble() " \
-			"{if(assembled_) return;parse();_assemble();assembled_=true;}\n" \
-			>> outfile
-	print pre "void _parse();" >> outfile
-	print pre "void _assemble();" >> outfile
-	print pre "const char * className() const { return \"" name "\"; }" \
-		>> outfile
-	
-	print "\n// End of automatically generated code           //" >> outfile
-}
-
diff --git a/tdeabc/vcard/include/generated/headerBodies b/tdeabc/vcard/include/generated/headerBodies
deleted file mode 100644
index 5e77b2b5e..000000000
--- a/tdeabc/vcard/include/generated/headerBodies
+++ /dev/null
@@ -1,34 +0,0 @@
-AdrParam Param
-AdrValue Value
-AgentParam Param
-ContentLine Entity
-DateParam Param
-DateValue Value
-EmailParam Param
-GeoValue Value
-Group Entity
-ImageParam Param
-ImageValue Value
-LangValue Value
-NValue Value
-Param Entity
-PhoneNumberValue Value
-SourceParam Param
-TelParam Param
-TextParam Param
-TextNSParam Param
-TextValue Value
-TextBinParam Param
-URIValue Value
-VCard Entity
-VCardEntity Entity
-Value Entity
-SoundValue Value
-AgentValue Value
-TelValue Value
-TextBinValue Value
-OrgValue Value
-UTCValue Value
-ClassValue Value
-FloatValue Value
-TextListValue Value
diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
index 3a0883edc..4f2ea6809 100644
--- a/tdeabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -331,8 +331,8 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v
 
   addTextValue( v, EntityCategories, addressee.categories().join(",") );
 
-  addDateValue( v, EntityBirthday, TQT_TQDATE_OBJECT(addressee.birthday().date()) );
-  addDateTimeValue( v, EntityRevision, TQT_TQDATETIME_OBJECT(addressee.revision()) );
+  addDateValue( v, EntityBirthday, addressee.birthday().date() );
+  addDateTimeValue( v, EntityRevision, addressee.revision() );
   addGeoValue( v, addressee.geo() );
   addUTCValue( v, addressee.timeZone() );
 
diff --git a/tdeabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt
index 692b7829f..e141d1f47 100644
--- a/tdeabc/vcardparser/CMakeLists.txt
+++ b/tdeabc/vcardparser/CMakeLists.txt
@@ -73,12 +73,6 @@ tde_add_check_executable( testread2
   LINK ${TDEABC_TESTS_LINK}
 )
 
-if( CMAKE_VERSION VERSION_LESS "2.8.4" )
-  if( NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/tests" )
-    execute_process( COMMAND ln -s "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${CMAKE_CURRENT_BINARY_DIR}/tests" )
-  endif( )
-endif()
-
 add_test( NAME tdeabc/vcardparser/testread2 COMMAND testread2 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 # testread tests
diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
index c1e793e77..71246497f 100644
--- a/tdeabc/vcardtool.cpp
+++ b/tdeabc/vcardtool.cpp
@@ -139,7 +139,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
     card.addLine( createAgent( version, (*addrIt).agent() ) );
 
     // BDAY
-    card.addLine( VCardLine( "BDAY", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).birthday()) ) ) );
+    card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) );
 
     // CATEGORIES
     if ( version == VCard::v3_0 ) {
@@ -262,7 +262,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
       card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) );
 
     // REV
-    card.addLine( VCardLine( "REV", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).revision()) ) ) );
+    card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) );
 
     // ROLE
     VCardLine roleLine( "ROLE", TQString((*addrIt).role()) );
diff --git a/tdecert/CMakeLists.txt b/tdecert/CMakeLists.txt
index 75f354c99..3c616fde9 100644
--- a/tdecert/CMakeLists.txt
+++ b/tdecert/CMakeLists.txt
@@ -44,7 +44,7 @@ install( FILES tdecertpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdecertpart )
 set( target libtdecertpart )
 
 set( ${target}_SRCS
-  tdecertpart.cc
+  tdecertpart.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index a98232be6..ebd06ce23 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir
 
 kde_module_LTLIBRARIES = libtdecertpart.la
 
-libtdecertpart_la_SOURCES	= tdecertpart.cc
+libtdecertpart_la_SOURCES	= tdecertpart.cpp
 
 libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
 libtdecertpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cpp
index 02afc9b75..adeabc4cb 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cpp
@@ -169,7 +169,7 @@ _baseGrid->addMultiCellWidget(_sideList, 0, 13, 0, 1);
 
 _importAll = new TQPushButton(i18n("Import &All"), _frame);
 _baseGrid->addMultiCellWidget(_importAll, 14, 14, 0, 1);
-connect(_importAll, TQT_SIGNAL(clicked()), TQT_SLOT(slotImportAll()));
+connect(_importAll, TQ_SIGNAL(clicked()), TQ_SLOT(slotImportAll()));
 
 
 
@@ -184,7 +184,7 @@ grid->addMultiCellWidget(new TQLabel(i18n("TDE Secure Certificate Import"), _pkc
 grid->addWidget(new TQLabel(i18n("Chain:"), _pkcsFrame), 1, 0);
 _p12_chain = new KComboBox(_pkcsFrame);
 grid->addMultiCellWidget(_p12_chain, 1, 1, 1, 4);
-connect(_p12_chain, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChain(int)));
+connect(_p12_chain, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChain(int)));
 
 grid->addWidget(new TQLabel(i18n("Subject:"), _pkcsFrame), 2, 0);
 grid->addWidget(new TQLabel(i18n("Issued by:"), _pkcsFrame), 2, 3);
@@ -373,10 +373,10 @@ _baseGrid->addMultiCellWidget(_launch, 14, 14, 4, 5);
 _baseGrid->addWidget(_import, 14, 6);
 _baseGrid->addWidget(_save, 14, 7);
 _baseGrid->addWidget(_done, 14, 8);
-connect(_launch, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunch()));
-connect(_import, TQT_SIGNAL(clicked()), TQT_SLOT(slotImport()));
-connect(_save, TQT_SIGNAL(clicked()), TQT_SLOT(slotSave()));
-connect(_done, TQT_SIGNAL(clicked()), TQT_SLOT(slotDone()));
+connect(_launch, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunch()));
+connect(_import, TQ_SIGNAL(clicked()), TQ_SLOT(slotImport()));
+connect(_save, TQ_SIGNAL(clicked()), TQ_SLOT(slotSave()));
+connect(_done, TQ_SIGNAL(clicked()), TQ_SLOT(slotDone()));
 _import->setEnabled(false);
 _save->setEnabled(false);
 
@@ -386,8 +386,8 @@ _baseGrid->addMultiCellWidget(_pkcsFrame, 0, 12, 2, 8);
 _baseGrid->addMultiCellWidget(_x509Frame, 0, 12, 2, 8);
 _baseGrid->addMultiCellWidget(_blankFrame, 0, 12, 2, 8);
 
-connect(_sideList, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-		this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+connect(_sideList, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+		this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 setReadWrite(true);
 }
 
@@ -629,7 +629,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
 
 	// Set the valid period
 	TQPalette cspl = _ca_validFrom->palette();
-	if (TQDateTime::currentDateTime(Qt::UTC) < c->getQDTNotBefore()) {
+	if (TQDateTime::currentDateTime(TQt::UTC) < c->getQDTNotBefore()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -638,7 +638,7 @@ void KCertPart::displayCACert(KSSLCertificate *c) {
 	_ca_validFrom->setText(c->getNotBefore());
 
 	cspl = _ca_validUntil->palette();
-	if (TQDateTime::currentDateTime(Qt::UTC) > c->getQDTNotAfter()) {
+	if (TQDateTime::currentDateTime(TQt::UTC) > c->getQDTNotAfter()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -670,7 +670,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
 
 	// Set the valid period
 	TQPalette cspl = _p12_validFrom->palette();
-	if (TQDateTime::currentDateTime(Qt::UTC) < c->getQDTNotBefore()) {
+	if (TQDateTime::currentDateTime(TQt::UTC) < c->getQDTNotBefore()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -679,7 +679,7 @@ void KCertPart::displayPKCS12Cert(KSSLCertificate *c) {
 	_p12_validFrom->setText(c->getNotBefore());
 
 	cspl = _p12_validUntil->palette();
-	if (TQDateTime::currentDateTime(Qt::UTC) > c->getQDTNotAfter()) {
+	if (TQDateTime::currentDateTime(TQt::UTC) > c->getQDTNotAfter()) {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
 	} else {
 		cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
diff --git a/tdecert/tdecertpart.h b/tdecert/tdecertpart.h
index 45edb168c..5d363f78d 100644
--- a/tdecert/tdecertpart.h
+++ b/tdecert/tdecertpart.h
@@ -66,7 +66,7 @@ class KPKCS12Item : public TDEListViewItem {
 
 
 class KCertPart : public KParts::ReadWritePart {
-Q_OBJECT
+TQ_OBJECT
 public:
   KCertPart(TQWidget *parentWidget, const char *widgetName,
             TQObject *parent = 0L, const char *name = 0L,
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index b2de8533a..b62c9df23 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -170,8 +170,8 @@ void KCMShell::waitForExit()
 {
     kdDebug(780) << k_funcinfo << endl;
 
-    connect(dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)),
-            TQT_SLOT( appExit(const TQCString&) ));
+    connect(dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)),
+            TQ_SLOT( appExit(const TQCString&) ));
     exec();
 }
 
@@ -191,7 +191,7 @@ static void setIcon(TQWidget *w, const TQString &iconName)
     TQPixmap icon = DesktopIcon(iconName);
     TQPixmap miniIcon = SmallIcon(iconName);
     w->setIcon( icon ); //standard X11
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     KWin::setIcons(w->winId(), icon, miniIcon );
 #endif
 }
diff --git a/tdecmshell/main.h b/tdecmshell/main.h
index 01f7d84c4..6f1ee1bda 100644
--- a/tdecmshell/main.h
+++ b/tdecmshell/main.h
@@ -32,7 +32,7 @@
  */
 class KCMShell : public TDEApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -81,7 +81,7 @@ private:
  */
 class KCMShellMultiDialog : public KCMultiDialog, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index a0b32e71a..939a70e80 100644
--- a/tdeconf_update/tdeconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -201,7 +201,7 @@ KonfUpdate::log()
       }
    }
    
-   (*m_textStream) << TQDateTime::currentDateTime().toString( Qt::ISODate ) << " ";
+   (*m_textStream) << TQDateTime::currentDateTime().toString( TQt::ISODate ) << " ";
    
    return *m_textStream;
 }
diff --git a/tdecore/CMakeL10n.txt b/tdecore/CMakeL10n.txt
index 88e69c56f..40fa1531b 100644
--- a/tdecore/CMakeL10n.txt
+++ b/tdecore/CMakeL10n.txt
@@ -1,3 +1,71 @@
+##### update all_languages.desktop ##############
+
+message( STATUS "Update all_languages.desktop according to the entry.desktop files from tde-i18n" )
+
+# read the current list of language codes and names
+unset( _languages_code )
+unset( _languages_name )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/all_languages.desktop _langs_current )
+string( REGEX REPLACE "[^\n]" "" _langs_current_len "${_langs_current}" )
+string( LENGTH "+${_langs_current_len}" _langs_current_len )
+set( _langs_current_pos 0 )
+while( _langs_current_pos LESS ${_langs_current_len} )
+  string( REGEX REPLACE "^([^\n]*)\n(.*)" "\\1" _lang_row "${_langs_current}" )
+  string( REGEX REPLACE "^([^\n]*)\n(.*)" "\\2" _langs_current "${_langs_current}" )
+  math( EXPR _langs_current_pos "${_langs_current_pos}+1" )
+  if( "${_lang_row}" MATCHES "^\\[.*\\]$" )
+    string( REGEX REPLACE "^\\[(.*)\\]$" "\\1" _lang_code ${_lang_row} )
+  endif()
+  if( (NOT "${_lang_code}" STREQUAL "") AND
+      ("${_lang_row}" MATCHES "^ *Name *=") )
+    string( REGEX REPLACE "^ *Name *= *" "" _lang_name "${_lang_row}" )
+    list( APPEND _languages_code ${_lang_code} )
+    list( APPEND _languages_name ${_lang_name} )
+    unset( _lang_code )
+  endif()
+endwhile()
+
+# merge with languages from tde-i18n entry.desktop files
+file( GLOB _languages_dirs
+      RELATIVE ${CMAKE_SOURCE_DIR}/../tde-i18n
+      ${CMAKE_SOURCE_DIR}/../tde-i18n/tde-i18n-*
+)
+foreach( _lang_dir IN LISTS _languages_dirs )
+  if( EXISTS ${CMAKE_SOURCE_DIR}/../tde-i18n/${_lang_dir}/messages/entry.desktop )
+    string( REPLACE "tde-i18n-" "" _lang_code ${_lang_dir} )
+    file( READ ${CMAKE_SOURCE_DIR}/../tde-i18n/${_lang_dir}/messages/entry.desktop _lang_name )
+    string( REGEX REPLACE "(^|.*\n) *Name *= *([^\n]*).*" "\\2" _lang_name "${_lang_name}" )
+    if( NOT "${_lang_name}" STREQUAL "" )
+      list( FIND _languages_code "${_lang_code}" _lang_index )
+      if( "${_lang_index}" GREATER -1 )
+        list( REMOVE_AT _languages_code ${_lang_index} )
+        list( REMOVE_AT _languages_name ${_lang_index} )
+      endif()
+      list( APPEND _languages_code ${_lang_code} )
+      list( APPEND _languages_name ${_lang_name} )
+    endif()
+  endif()
+endforeach()
+
+# create new all_languages.desktop
+unset( _languages )
+foreach( _lang_code IN LISTS _languages_code )
+  list( FIND _languages_code "${_lang_code}" _lang_index )
+  list( GET _languages_name ${_lang_index} _lang_name )
+  list( APPEND _languages "${_lang_code}: ${_lang_name}" )
+endforeach()
+if( _languages )
+  unset( _all_languages )
+  list( SORT _languages )
+  foreach( _lang IN LISTS _languages )
+    string( REGEX REPLACE "^([^:]*): (.*)" "\\1" _lang_code ${_lang} )
+    string( REGEX REPLACE "^([^:]*): (.*)" "\\2" _lang_name ${_lang} )
+    set( _all_languages "${_all_languages}[${_lang_code}]\nName=${_lang_name}\n" )
+  endforeach()
+  file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/all_languages.desktop "${_all_languages}" )
+endif()
+
+
 ##### create translation templates ##############
 
 tde_l10n_create_template(
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index eed7dee58..c794a8039 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -17,7 +17,6 @@ add_subdirectory( tests )
 if( WITH_TDEHWLIB )
   add_subdirectory( tdehw )
   set( TDEHW_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tdehw )
-  set( TDEHW_LIB tdehw-static )
 endif( WITH_TDEHWLIB )
 
 if( WITH_LIBART )
@@ -140,9 +139,9 @@ set( ${target}_SRCS
 
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
-  VERSION 14.0.0
-  EMBED tdecorenetwork-static ${TDEHW_LIB}
-  LINK DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES}
+  VERSION 14.1.0
+  EMBED tdecorenetwork-static
+  LINK DCOP-shared tdefx-shared ICE SM ${ZLIB_LIBRARIES} ${RESOLV_LIBRARIES}
   LINK_PRIVATE ltdlc-static ${KDESVGICONS} ${XCOMPOSITE_LIBRARIES}
     ${LIBIDN_LIBRARIES} ${LIBBFD_LIBRARIES} ${LIB_UTIL} ${GAMIN_LIBRARIES}
     ${Backtrace_LIBRARY}
diff --git a/tdecore/DESIGN.iconloading b/tdecore/DESIGN.iconloading
index a675a8922..1a90f43ef 100644
--- a/tdecore/DESIGN.iconloading
+++ b/tdecore/DESIGN.iconloading
@@ -42,7 +42,7 @@ That way the application's pixmap always remain valid.
 Some example code to get the idea:
 
 Server can publish an icon (test.png) like this:
-   QImage i("test.png");
+   TQImage i("test.png");
    QPixmap p;
    p.convertFromImage(i);
    tqWarning("Handle = %08x", p.handle());
diff --git a/tdecore/DESIGN.tdeconfig b/tdecore/DESIGN.tdeconfig
index a1fb48dbd..ef8c40546 100644
--- a/tdecore/DESIGN.tdeconfig
+++ b/tdecore/DESIGN.tdeconfig
@@ -93,7 +93,7 @@ default so that it doesn't change when the default changes?
 KDE3.0 Changes
 ==============
 
-*) writeEntry now returns void instead of QString.
+*) writeEntry now returns void instead of TQString.
 *) deleteEntry functions added
 
 
diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk
index ae4f72d47..8ef01e8fe 100644
--- a/tdecore/README.kiosk
+++ b/tdecore/README.kiosk
@@ -1,25 +1,25 @@
 In KDE3 a kiosk-framework has been introduced.
 
-One of the driving forces behind KDE is to put the user in control and
-give him or her a large amount of possibilities to adjust KDE to his or her 
+One of the driving forces behind TDE is to put the user in control and
+give them a large amount of possibilities to adjust TDE to their
 liking. However, in some situations it is required to reduce the possibilities
-of KDE, e.g. because the system is to be used for one or more specific 
+of TDE, e.g. because the system is to be used for one or more specific 
 dedicated tasks only.
 
 The kiosk-framework provides an easy way to disable certain features within
-KDE to create a more controlled environment.
+TDE to create a more controlled environment.
 
-KDE's kiosk-framework builds on KDE's configuration framework and adds a
+TDE's kiosk-framework builds on TDE's configuration framework and adds a
 simple application API that applications can query to get authorisation
 for certain operations.
 
-The KDE kiosk-framework should be used IN ADDITION to the standard UNIX
+The TDE kiosk-framework should be used IN ADDITION to the standard UNIX
 security measures. 
 
 The configuration framework in KDE3
 ===================================
 
-Since the very beginning KDE makes use of file-hierarchy to store resources
+Since the very beginning TDE makes use of file-hierarchy to store resources
 for its applications. Resources range from icons, wallpapers, fonts to 
 sounds, menu-descriptions and configuration files. 
 
@@ -550,16 +550,16 @@ Some remarks:
   matches "/srv" and not "/srv/www".
 
 
-KDE3 Resource Restrictions
+TDE Resource Restrictions
 ==========================
-Most KDE applications make use of additional resource files that are typically
-located in directories under $TDEDIR/share. By default KDE allows users to
+Most TDE applications make use of additional resource files that are typically
+located in directories under $TDEDIR/share. By default TDE allows users to
 override any of these resources by placing files in the same location 
 under $TDEHOME/share. For example, Konsole stores profiles under 
 $TDEDIR/share/apps/konsole and users can add additional profiles by 
 installing files in $TDEHOME/share/apps/konsole.
 
-KDE3 Resource Restrictions make it possible to restrict the lookup of files
+TDE Resource Restrictions make it possible to restrict the lookup of files
 to directories outside of $TDEHOME only.
 
 The following resources are defined:
@@ -642,14 +642,14 @@ The following syntax is also supported:
 Name[$ei]=${USER}
 
 
-KDE3 Kiosk Application API
+TDE Kiosk Application API
 ==========================
 
 Three new methods have been added to TDEApplication:
 
-- bool authorize(QString action); // Generic actions
-- bool authorizeTDEAction(QString action); // For TDEActions exclusively
-- bool authorizeURLAction(QString, referringURL, destinationURL) // URL Handling
+- bool authorize(TQString action); // Generic actions
+- bool authorizeTDEAction(TQString action); // For TDEActions exclusively
+- bool authorizeURLAction(TQString, referringURL, destinationURL) // URL Handling
 
 Automatic Logout
 ================
diff --git a/tdecore/all_languages.desktop b/tdecore/all_languages.desktop
index 1b698b0a0..82430b199 100644
--- a/tdecore/all_languages.desktop
+++ b/tdecore/all_languages.desktop
@@ -63,19 +63,21 @@ Name=Greek
 [en]
 Name=English
 [en_GB]
-Name=British English
+Name=English (British)
 [en_US]
-Name=American English
+Name=English (American)
 [eo]
 Name=Esperanto
 [es]
 Name=Spanish
+[es_AR]
+Name=Spanish (Argentina)
 [et]
 Name=Estonian
 [eu]
 Name=Basque
 [fa]
-Name=Farsi (Persian)
+Name=Persian
 [fi]
 Name=Finnish
 [fj]
@@ -87,7 +89,7 @@ Name=French
 [fy]
 Name=Frisian
 [ga]
-Name=Irish Gaelic
+Name=Irish
 [gd]
 Name=Gaelic
 [gl]
@@ -229,7 +231,7 @@ Name=Oriya
 [os]
 Name=Ossetian
 [pa]
-Name=Panjabi
+Name=Punjabi
 [pi]
 Name=Pali
 [pl]
@@ -239,7 +241,7 @@ Name=Pushto
 [pt]
 Name=Portuguese
 [pt_BR]
-Name=Brazilian Portuguese
+Name=Portuguese (Brazil)
 [qu]
 Name=Quechua
 [rn]
@@ -347,10 +349,10 @@ Name=Zhuang
 [zh]
 Name=Chinese
 [zh_CN]
-Name=Chinese Simplified
+Name=Chinese (Simplified)
 [zh_HK]
 Name=Chinese (Hong Kong)
 [zh_TW]
-Name=Chinese Traditional
+Name=Chinese (Traditional)
 [zu]
 Name=Zulu
diff --git a/tdecore/fixx11h.h b/tdecore/fixx11h.h
index e572335a1..eb6266444 100644
--- a/tdecore/fixx11h.h
+++ b/tdecore/fixx11h.h
@@ -16,7 +16,7 @@
  symbols may now refer to different variables
  (e.g. if X11 #defined NoButton, after this file
  is included NoButton would no longer be X11's
- NoButton, but Qt::NoButton instead). At this time,
+ NoButton, but TQt::NoButton instead). At this time,
  there's no conflict known that could cause problems.
 
  The original X11 symbols are still accessible
diff --git a/tdecore/generate_keys.sh b/tdecore/generate_keys.sh
index d0fea1cdd..61987b57e 100755
--- a/tdecore/generate_keys.sh
+++ b/tdecore/generate_keys.sh
@@ -18,7 +18,7 @@ sed -n '/enum Key/!d
 | sed -n 's/\s*Key_/{ "/
 		s/,.*$/ },/
 		s/ =/",/
-		s/Key_/Qt::Key_/
+		s/Key_/TQt::Key_/
 		$s/.*/& }/
 		p' \
 > kckey_a
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index 88b904a55..bd1ca41c2 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -25,10 +25,6 @@
 #include <tqiodevice.h>
 #include "tdelibs_export.h"
 
-#ifdef Q_MOC_RUN
-#define USE_QT4
-#endif // Q_MOC_RUN
-
 class KAsyncIOPrivate;
 /**
  * Asynchronous I/O Support
@@ -39,14 +35,9 @@ class KAsyncIOPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short Asynchronous I/O support
  */
-class TDECORE_EXPORT KAsyncIO:
-#ifdef USE_QT4
-#else // USE_QT4
-public TQObject,
-#endif // USE_QT4
-public TQIODevice
+class TDECORE_EXPORT KAsyncIO: public TQObject, public TQIODevice
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 protected:
   KAsyncIO()			// cannot be accessed externally
diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h
index 327713e6d..ce26a1e9a 100644
--- a/tdecore/kaudioplayer.h
+++ b/tdecore/kaudioplayer.h
@@ -48,13 +48,13 @@ class KAudioPlayerPrivate;
  *
  * \code
  *   KAudioPlayer player("/var/share/foo.wav");
- *   connect(&button, TQT_SIGNAL(clicked()), &player, TQT_SLOT(play()));
+ *   connect(&button, TQ_SIGNAL(clicked()), &player, TQ_SLOT(play()));
  * \endcode
  *
  */
 //REVISED: hausmann
 class TDECORE_EXPORT KAudioPlayer : public TQObject {
-Q_OBJECT
+TQ_OBJECT
 public:
 	/**
 	 * Constructor.
diff --git a/tdecore/kbufferedio.cpp b/tdecore/kbufferedio.cpp
index 7a080ec68..d1ba6dcf2 100644
--- a/tdecore/kbufferedio.cpp
+++ b/tdecore/kbufferedio.cpp
@@ -111,22 +111,12 @@ bool TDEBufferedIO::setBufferSize(int rsize, int wsize /* = -2 */)
   return true;
 }
 
-#ifdef USE_QT3
 int TDEBufferedIO::bytesAvailable() const
-#endif // USE_QT3
-#ifdef USE_QT4
-qint64 TDEBufferedIO::bytesAvailable() const
-#endif // USE_QT4
 {
   return readBufferSize();
 }
 
-#ifdef USE_QT3
 int TDEBufferedIO::bytesToWrite() const
-#endif // USE_QT3
-#ifdef USE_QT4
-qint64 TDEBufferedIO::bytesToWrite() const
-#endif // USE_QT4
 {
   return writeBufferSize();
 }
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index f00ab52b6..f51b46a60 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -55,7 +55,7 @@ class TDEBufferedIOPrivate;
  */
 class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 protected:
@@ -118,12 +118,7 @@ public:
    * Returns the number of bytes available for reading in the read buffer
    * @return the number of bytes available for reading
    */
-#ifdef USE_QT3
   virtual int bytesAvailable() const;
-#endif // USE_QT3
-#ifdef USE_QT4
-  virtual qint64 bytesAvailable() const;
-#endif // USE_QT4
 
   /**
    * Waits for more data to be available and returns the amount of available data then.
@@ -137,12 +132,7 @@ public:
    * Returns the number of bytes yet to write, still in the write buffer
    * @return the number of unwritten bytes in the write buffer
    */
-#ifdef USE_QT3
   virtual int bytesToWrite() const;
-#endif // USE_QT3
-#ifdef USE_QT4
-  virtual qint64 bytesToWrite() const;
-#endif // USE_QT4
 
   /**
    * Checks whether there is enough data in the buffer to read a line
diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp
index 9d4d14661..d4f53fc39 100644
--- a/tdecore/kcalendarsystemgregorian.cpp
+++ b/tdecore/kcalendarsystemgregorian.cpp
@@ -58,7 +58,7 @@ int KCalendarSystemGregorian::weeksInYear(int year) const
   // If the last day of the year is in the first week, we have to check the
   // week before
   if ( temp.weekNumber() == 1 )
-    temp = TQT_TQDATE_OBJECT(temp.addDays(-7));
+    temp = temp.addDays(-7);
 
   return temp.weekNumber();
 }
@@ -221,17 +221,17 @@ bool KCalendarSystemGregorian::setYMD(TQDate & date, int y, int m, int d) const
 
 TQDate KCalendarSystemGregorian::addYears(const TQDate & date, int nyears) const
 {
-  return TQT_TQDATE_OBJECT(date.addYears(nyears));
+  return date.addYears(nyears);
 }
 
 TQDate KCalendarSystemGregorian::addMonths(const TQDate & date, int nmonths) const
 {
-  return TQT_TQDATE_OBJECT(date.addMonths(nmonths));
+  return date.addMonths(nmonths);
 }
 
 TQDate KCalendarSystemGregorian::addDays(const TQDate & date, int ndays) const
 {
-  return TQT_TQDATE_OBJECT(date.addDays(ndays));
+  return date.addDays(ndays);
 }
 
 TQString KCalendarSystemGregorian::weekDayName(int col, bool shortName) const
diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp
index 2f0aa111a..e0737c5b3 100644
--- a/tdecore/kcalendarsystemhebrew.cpp
+++ b/tdecore/kcalendarsystemhebrew.cpp
@@ -306,7 +306,7 @@ int KCalendarSystemHebrew::weeksInYear(int year) const
   int nWeekNumber = weekNumber(temp);
   if(nWeekNumber == 1)  // last week belongs to next year
   {
-    temp = TQT_TQDATE_OBJECT(temp.addDays(-7));
+    temp = temp.addDays(-7);
     nWeekNumber = weekNumber(temp);
   }
 
@@ -574,7 +574,7 @@ int KCalendarSystemHebrew::weekDayOfPray() const
 // Ok
 TQDate KCalendarSystemHebrew::addDays( const TQDate & date, int ndays ) const
 {
-  return TQT_TQDATE_OBJECT(date.addDays( ndays ));
+  return date.addDays( ndays );
 }
 
 // Ok
diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp
index cc66805e0..ef94b590f 100644
--- a/tdecore/kcalendarsystemhijri.cpp
+++ b/tdecore/kcalendarsystemhijri.cpp
@@ -539,7 +539,7 @@ int KCalendarSystemHijri::weekDayOfPray() const
 
 TQDate KCalendarSystemHijri::addDays( const TQDate & date, int ndays ) const
 {
-  return TQT_TQDATE_OBJECT(date.addDays( ndays ));
+  return date.addDays( ndays );
 }
 
 TQDate KCalendarSystemHijri::addMonths( const TQDate & date, int nmonths ) const
diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp
index 631693e45..3c71ca442 100644
--- a/tdecore/kcalendarsystemjalali.cpp
+++ b/tdecore/kcalendarsystemjalali.cpp
@@ -304,7 +304,7 @@ TQDate KCalendarSystemJalali::addMonths( const TQDate & date, int nmonths ) cons
 
 TQDate KCalendarSystemJalali::addDays( const TQDate & date, int ndays ) const
 {
-  return TQT_TQDATE_OBJECT(date.addDays( ndays ));
+  return date.addDays( ndays );
 }
 
 int KCalendarSystemJalali::monthsInYear( const TQDate & date ) const
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index 3483039a7..47053223f 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -372,13 +372,13 @@ TQChar KCharsets::fromEntity(const TQString &str)
     TQChar res = TQChar::null;
 
     int pos = 0;
-    if(str[pos] == (QChar)'&') pos++;
+    if(str[pos] == (TQChar)'&') pos++;
 
     // Check for '&#000' or '&#x0000' sequence
-    if (str[pos] == (QChar)'#' && str.length()-pos > 1) {
+    if (str[pos] == (TQChar)'#' && str.length()-pos > 1) {
         bool ok;
         pos++;
-        if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') {
+        if (str[pos] == (TQChar)'x' || str[pos] == (TQChar)'X') {
             pos++;
             // '&#x0000', hexadeciaml character reference
             TQString tmp(str.unicode()+pos, str.length()-pos);
@@ -412,7 +412,7 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len)
     {
         TQString tmp = str.left(len);
         TQChar res = fromEntity(tmp);
-        if( res != (QChar)TQChar::null ) return res;
+        if( res != (TQChar)TQChar::null ) return res;
         len--;
     }
     return TQChar::null;
@@ -437,13 +437,13 @@ TQString KCharsets::resolveEntities( const TQString &input )
     for ( ; p < end; ++p ) {
         const TQChar ch = *p;
 
-        if ( ch == (QChar)'&' ) {
+        if ( ch == (TQChar)'&' ) {
             ampersand = p;
             scanForSemicolon = true;
             continue;
         }
 
-        if ( ch != (QChar)';' || scanForSemicolon == false )
+        if ( ch != (TQChar)';' || scanForSemicolon == false )
             continue;
 
         assert( ampersand );
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index 306591e67..93ed7f86a 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -89,7 +89,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent )
     }
     alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false );
     autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true );
-    connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot()));
+    connect( &autoCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( autoCheckSlot()));
 }
 
 bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e)
@@ -99,11 +99,11 @@ bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e)
 
     switch ( e->type() ) { // just simplify debuggin
     case TQEvent::Accel:
-        if ( key && (TQT_TQKEYEVENT(e)->key() == key) ) {
+        if ( key && (static_cast<TQKeyEvent*>(e)->key() == key) ) {
     	    block = true;
 	    checkAccelerators( false );
 	    block = false;
-	    TQT_TQKEYEVENT(e)->accept();
+	    static_cast<TQKeyEvent*>(e)->accept();
 	    return true;
 	}
         break;
@@ -153,11 +153,11 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic)
     TQCheckBox* disableAutoCheck = NULL;
     if( automatic )  {
         disableAutoCheck = new TQCheckBox( i18n( "&Disable automatic checking" ), drklash );
-        connect(disableAutoCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableCheck(bool)));
+        connect(disableAutoCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableCheck(bool)));
     }
     TQPushButton* btnClose = new TQPushButton( i18n( "&Close" ), drklash );
     btnClose->setDefault( true );
-    connect( btnClose, TQT_SIGNAL( clicked() ), drklash, TQT_SLOT( close() ) );
+    connect( btnClose, TQ_SIGNAL( clicked() ), drklash, TQ_SLOT( close() ) );
     if (disableAutoCheck)
         disableAutoCheck->setFocus();
     else
@@ -173,7 +173,7 @@ void KCheckAccelerators::slotDisableCheck(bool on)
 
 void KCheckAccelerators::checkAccelerators( bool automatic )
 {
-    TQWidget* actWin = TQT_TQWIDGET(tqApp->activeWindow());
+    TQWidget* actWin = tqApp->activeWindow();
     if ( !actWin )
         return;
 
diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h
index 00adf4fd1..d16286c26 100644
--- a/tdecore/kcheckaccelerators.h
+++ b/tdecore/kcheckaccelerators.h
@@ -65,7 +65,7 @@ class TQTextView;
 */
 class TDECORE_EXPORT KCheckAccelerators : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Creates a KCheckAccelerators instance for the given object.
diff --git a/tdecore/kckey.cpp b/tdecore/kckey.cpp
index 0feea1d49..95232f0d7 100644
--- a/tdecore/kckey.cpp
+++ b/tdecore/kckey.cpp
@@ -76,7 +76,7 @@ const KKeys kde_KKEYS[NB_KEYS] = {
 	{ "Direction_L", 0x1059 },
 	{ "Direction_R", 0x1060 },
 	{ "Space", 0x20 }, // translated
-	{ "Any", Qt::Key_Space },
+	{ "Any", TQt::Key_Space },
 	{ "Exclam", 0x21 }, // translated
 	{ "QuoteDbl", 0x22 },
 	{ "NumberSign", 0x23 }, // translated
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 8ab23cccc..3aa6b9fa7 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -97,7 +97,7 @@ bool TDEClipboardSynchronizer::s_blocked = false;
 TDEClipboardSynchronizer * TDEClipboardSynchronizer::self()
 {
     if ( !s_self )
-        s_self = new TDEClipboardSynchronizer( TQT_TQOBJECT(kapp), "KDE Clipboard" );
+        s_self = new TDEClipboardSynchronizer( kapp, "KDE Clipboard" );
 
     return s_self;
 }
@@ -126,11 +126,11 @@ void TDEClipboardSynchronizer::setupSignals()
     TQClipboard *clip = TQApplication::clipboard();
     disconnect( clip, NULL, this, NULL );
     if( s_sync )
-        connect( clip, TQT_SIGNAL( selectionChanged() ),
-                 TQT_SLOT( slotSelectionChanged() ));
+        connect( clip, TQ_SIGNAL( selectionChanged() ),
+                 TQ_SLOT( slotSelectionChanged() ));
     if( s_reverse_sync )
-        connect( clip, TQT_SIGNAL( dataChanged() ),
-                 TQT_SLOT( slotClipboardChanged() ));
+        connect( clip, TQ_SIGNAL( dataChanged() ),
+                 TQ_SLOT( slotClipboardChanged() ));
 }
 
 void TDEClipboardSynchronizer::slotSelectionChanged()
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index 8ed8dcc91..df45027f1 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -35,7 +35,7 @@
  */
 class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /** Systray widget for manipulating the clipboard. */
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index 2bce648fb..80f61d8ad 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -135,7 +135,7 @@ class TDECORE_EXPORT TDECompletion : public TQObject
     TQ_PROPERTY( CompOrder order READ order WRITE setOrder )
     TQ_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase )
     TQ_PROPERTY( TQStringList items READ items WRITE setItems )
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -873,7 +873,7 @@ public:
      * the key-binding simply simply @p sum up the values of the
      * modifier and the actual key.  For example, to use CTRL+E as
      * a key binding for one of the items, you would simply supply
-     * @p "Qt::CtrlButton + Qt::Key_E" as the second argument to this
+     * @p "TQt::CtrlButton + TQt::Key_E" as the second argument to this
      * function.
      *
      * @param item the feature whose key-binding needs to be set:
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 6fb5e8ff7..163b10d36 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -53,7 +53,7 @@
 
 #include <../tdeinit/tdelauncher_cmds.h>
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <X11/Xlib.h>
 #endif
 
@@ -160,14 +160,14 @@ TDECrash::defaultCrashHandler (int sig)
           // argument 0 has to be drkonqi
           argv[i++] = "drkonqi";
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
           // start up on the correct display
           argv[i++] = "-display";
           if ( tqt_xdisplay() )
             argv[i++] = XDisplayString(tqt_xdisplay());
           else
             argv[i++] = getenv("DISPLAY");
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
           // start up on the correct display
           argv[i++] = "-display";
           argv[i++] = getenv("QWS_DISPLAY");
@@ -351,9 +351,9 @@ static char *getDisplay()
 /*
  don't test for a value from tqglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
- on the commandline (which in tqglobal.h however triggers Q_WS_QWS,
+ on the commandline (which in tqglobal.h however triggers TQ_WS_QWS,
  but we don't want to include that here) (Simon)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
  */
 #if !defined(QWS)
    display = getenv("DISPLAY");
diff --git a/tdecore/kdcoppropertyproxy.cpp b/tdecore/kdcoppropertyproxy.cpp
index 714e445bc..babf888fd 100644
--- a/tdecore/kdcoppropertyproxy.cpp
+++ b/tdecore/kdcoppropertyproxy.cpp
@@ -121,6 +121,22 @@ TQValueList<TQCString> KDCOPPropertyProxy::functions( TQObject *object )
   return res;
 }
 
+#define MARSHAL( type ) \
+  case TQVariant::type: \
+  { \
+    reply << prop.to##type(); \
+    break; \
+  }
+
+#define DEMARSHAL( type, val ) \
+  case TQVariant::type: \
+  { \
+    val v; \
+    stream >> v; \
+    prop = TQVariant( v ); \
+    break; \
+  }
+
 bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQByteArray &data,
                                                  TQCString &replyType, TQByteArray &replyData,
                                                  TQObject *object )
@@ -184,15 +200,6 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
     if ( type == TQVariant::Invalid )
       return false;
 
-#define DEMARSHAL( type, val ) \
-  case TQVariant::type: \
-    { \
-      val v; \
-      stream >> v; \
-      prop = TQVariant( v ); \
-    } \
-    break;
-
     typedef TQValueList<TQVariant> ListType;
     typedef TQStringVariantMap MapType;
 
@@ -251,11 +258,6 @@ bool KDCOPPropertyProxy::processPropertyRequest( const TQCString &fun, const TQB
     replyType = prop.typeName();
     TQDataStream reply( replyData, IO_WriteOnly );
 
-#define MARSHAL( type ) \
-  case TQVariant::type: \
-    reply << prop.to##type(); \
-    break;
-
     switch ( prop.type() )
     {
       MARSHAL( Cursor )
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 14623fa4f..24c87f524 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -3,346 +3,353 @@
 # Applications of the kdenonbeta module (or similar) should not define any own area but use area 0.
 # When you add KDebug areas, email kde-devel@kde.org with the appropriate descriptions.
 #
-#Format : number<tab>description
-
-125        tdecore (TDEAccel)
-126        tdecore (KURL)
-127        tdeio (KProtocolInfo)
-128        tdecore (KRegExp)
-129        tdecore (TDEAction)
-130        tdeio (KPasswdServer)
-131        tdecore (TDEAcceleratorManager)
-150        tdecore (KLibLoader)
-160        tdecore (KNotifyClient)
-170        tdecore (KNetwork socket)
-171        tdecore (KSocks)
-172        tdecore (TDEStartupInfo)
-173        tdecore (TDELocale)
-174        tdecore (KProcIO)
-175        tdecore (TDEProcess)
-176        tdecore (KWin)
-177        tdecore (TDEConfigSkeleton)
-178        tdecore (TDEConfigDialogManager)
-179        tdecore (KNetwork resolver)
-180        tdecore (tdelibs)
-200        tdeui (TDEMainWindow)
-220        tdeui (TDEToolBar)
-230        tdeui (KCommand)
-240        tdeui (tdelibs)
-250        tdefile (tdelibs)
-264        tdecore (TDEIconLoader)
-265        tdecore (TDEIconEffect)
-270        tdeui (KRootPixmap)
-280        tdeui (TDESharedPixmap)
-281        tdeui (TDECModule)
-282        tdeui (KDockWidget)
-290        tdeui (KPixmapIO)
-291        tdeui (TDEAboutDialog)
-292        tdeui (KComboBox)
-293        tdeui (KLineEdit)
-294        tdeui (KEdit)
-295        tdeui (KMenuBar)
-296        tdeui (TDEPopupMenu)
-298        tdeui (KDatePicker)
-399        kimgio
-400        artskde
-500        tdeprint
-700        tdeutils (KSettings::Dialog)
-701        tdeutils (KSettings::Dispatcher)
-702        tdeutils (KPluginSelector)
-703        tdeutils (KPluginInfo)
-704        tdeutils (KSettings::ComponentsDialog)
-710        tdeutils (KCMultiDialog)
-711        tdeutils (TDECModuleProxy)
-712        tdeutils (TDECModuleInfo)
-713        tdeutils (TDECModuleContainer)
-750        tdespell (tdelibs)
-760        tdemdi
-780        tdecmshell (tdelibs)
-790        tdeimproxy (tdelibs)
-800        kabapi (tdelibs)
-900        tdesu (tdelibs)
-912        ksmartcard (tdelibs)
-
-
-1000        tdeparts
-1001        tdeparts (mainwindow)
-1002        tdeparts (factory)
+#Format : number<separator>description
+
+125          tdecore (TDEAccel)
+126          tdecore (KURL)
+127          tdeio   (KProtocolInfo)
+128          tdecore (KRegExp)
+129          tdecore (TDEAction)
+130          tdeio   (KPasswdServer)
+131          tdecore (TDEAcceleratorManager)
+150          tdecore (KLibLoader)
+160          tdecore (KNotifyClient)
+170          tdecore (KNetwork socket)
+171          tdecore (KSocks)
+172          tdecore (TDEStartupInfo)
+173          tdecore (TDELocale)
+174          tdecore (KProcIO)
+175          tdecore (TDEProcess)
+176          tdecore (KWin)
+177          tdecore (TDEConfigSkeleton)
+178          tdecore (TDEConfigDialogManager)
+179          tdecore (KNetwork resolver)
+180          tdecore (tdelibs)
+200          tdeui   (TDEMainWindow)
+220          tdeui   (TDEToolBar)
+230          tdeui   (KCommand)
+240          tdeui   (tdelibs)
+250          tdefile (tdelibs)
+264          tdecore (TDEIconLoader)
+265          tdecore (TDEIconEffect)
+270          tdeui   (KRootPixmap)
+280          tdeui   (TDESharedPixmap)
+281          tdeui   (TDECModule)
+282          tdeui   (KDockWidget)
+290          tdeui   (KPixmapIO)
+291          tdeui   (TDEAboutDialog)
+292          tdeui   (KComboBox)
+293          tdeui   (KLineEdit)
+294          tdeui   (KEdit)
+295          tdeui   (KMenuBar)
+296          tdeui   (TDEPopupMenu)
+298          tdeui   (KDatePicker)
+399          kimgio
+400          artskde
+500          tdeprint
+700          tdeutils (KSettings::Dialog)
+701          tdeutils (KSettings::Dispatcher)
+702          tdeutils (KPluginSelector)
+703          tdeutils (KPluginInfo)
+704          tdeutils (KSettings::ComponentsDialog)
+710          tdeutils (KCMultiDialog)
+711          tdeutils (TDECModuleProxy)
+712          tdeutils (TDECModuleInfo)
+713          tdeutils (TDECModuleContainer)
+750          tdespell (tdelibs)
+760          tdemdi
+780          tdecmshell (tdelibs)
+790          tdeimproxy (tdelibs)
+800          kabapi     (tdelibs)
+900          tdesu      (tdelibs)
+912          ksmartcard (tdelibs)
+
+
+1000         tdeparts
+1001         tdeparts (mainwindow)
+1002         tdeparts (factory)
 
 # tdebase
-1201        konqtree
-1202        konqueror
-1203        libkonq
-1204        kdesktop
-1205        tdesud
-1206        tdesu
-1207        kdesktop (Minicli)
-1208        kcontrol
-1210        kicker
-1211        konsole
-1212        twin
-1213        kappfinder
-1214        kdesktop (icons)
-1215        ksysguard
-1216        twin (client errors)
-1217        khotkeys
-1218        ksmserver
-1219        media tdeioslave
-1220        remote tdeioslave
-
-1400        khelpcenter (tdebase)
-1401        kcmhelpcenter
-1402        khc_indexbuilder
-
-1420        kikbd
-1421        ki18b_keys (tdecmodule)
-
-1430        nspluginviewer (Qt/Xt)
-1431        nspluginviewer (plugin)
-1432        nspluginviewer (part)
-1433        nspluginscan
+1201         konqtree
+1202         konqueror
+1203         libkonq
+1204         kdesktop
+1205         tdesud
+1206         tdesu
+1207         kdesktop (Minicli)
+1208         kcontrol
+1210         kicker
+1211         konsole
+1212         twin
+1213         kappfinder
+1214         kdesktop (icons)
+1215         ksysguard
+1216         twin (client errors)
+1217         khotkeys
+1218         ksmserver
+1219         media tdeioslave
+1220         remote tdeioslave
+
+1400         khelpcenter (tdebase)
+1401         kcmhelpcenter
+1402         khc_indexbuilder
+
+1420         kikbd
+1421         ki18b_keys (tdecmodule)
+
+1430         nspluginviewer (Qt/Xt)
+1431         nspluginviewer (plugin)
+1432         nspluginviewer (part)
+1433         nspluginscan
 
 # tdeutils
-1501        khexedit (tdeutils)
-1511        tdessh (tdeutils)
-1512        tdepasswd (tdebase)
-1601        ark (tdeutils)
-1901        kfind
-1902        kfind (KfindWindow::updateResults)
-1903        kfind (KfindTabDialog::createQuery)
-2000        kfind
-2001        kregexpeditor
-2002        kfloppy
-2003        ksim
-2100	    kgpg
-2200	    kdf
-2300        tdewallet
-
-# 2500-2999 Reserved for private use
+1501         khexedit  (tdeutils)
+1511         tdessh    (tdeutils)
+1512         tdepasswd (tdebase)
+1601         ark       (tdeutils)
+1901         kfind
+1902         kfind (KfindWindow::updateResults)
+1903         kfind (KfindTabDialog::createQuery)
+2000         kfind
+2001         kregexpeditor
+2002         kfloppy
+2003         ksim
+2100         kgpg
+2200         kdf
+2300         tdewallet
+
+# 2500-2999  Reserved for private use
 
 # tdeadmin
-3000        ksysv
-3100    ksysv (model)
+3000         ksysv
+3100         ksysv (model)
 
 # tdegraphics
-4300        kdvi (tdegraphics)
-4400        kpaint (tdegraphics)
-4500        kghostview (tdegraphics)
-4600        kview
-4610        kviewviewer
-4620        kviewcanvas
-4630        kview_plugin
-4640        tdeiconedit
+4300         kdvi       (tdegraphics)
+4400         kpaint     (tdegraphics)
+4500         kghostview (tdegraphics)
+4600         kview
+4610         kviewviewer
+4620         kviewcanvas
+4630         kview_plugin
+4640         tdeiconedit
 
 # tdenetwork
-5001        kget
-5002        kppp
-5003        knode
-5004        kdict
-5005        knewsticker
-5006        kmail
-5007        kpf
-5008        ksirc
-5009        filesharing
-5050        libkmime
-5051        libkmime (Codecs)
-5052        libkmime (Plugin Loader)
-5100        libtdenetwork
-5150        libkleopatra
+5001         kget
+5002         kppp
+5003         knode
+5004         kdict
+5005         knewsticker
+5006         kmail
+5007         kpf
+5008         ksirc
+5009         filesharing
+5050         libkmime
+5051         libkmime (Codecs)
+5052         libkmime (Plugin Loader)
+5100         libtdenetwork
+5150         libkleopatra
 
 
 # tdepim
-5200        kitchensync
-5201        kitchensync (Konnector)
-5202        kitchensync (OpieKonnector)
-5203        kitchensync (PhoneKonnector)
-5204        kitchensync (AgendaKonnector)
-5205	    kitchensync (CasioKonnector)
-5210        kitchensync (KitchenSyncApp)
-5220        kitchensync (ManipulatorParts)
-5221        kitchensync (overviewpart)
-5222        kitchensync (organizerpart)
-5223        kitchensync (fileviewpart)
-5224        kitchensync Desktop
-5225        kitchensync (QtopiaKonnector)
-5226        kitchensync Categories
-5227 	    kitchensync Todo
-5228	    kitchensync AddressBook
-5229	    kitchensync Datebook
-5230	    kitchensync SyncEntry
-5231	    kitchensync SyncUI
-5250        kitchensync (Syncing Algorithm)
-5300        libtdepim
-5310        kprefs
-5400        calendarsystem
-5500        knotes
-5510        kpilot
-5511        kpilotdaemon
-5512        kpilotconduit
-5600        kontact (core)
-5601        kontact (interfaces)
-5602        kontact (plugins)
-5650        tderesources
-5700        tdeabc
-5710        tdeabc/vcard
-5720        kaddressbook
-5800        libkcal
-5850        korganizer
-5855        korganizer (verbose)
-5890        korgac
-5891        korgac (check)
-5900        kalarmd
-5901        kalarmd (check)
-5950        kalarm
-5960        kandy
-5970        karm
+5200         kitchensync
+5201         kitchensync (Konnector)
+5202         kitchensync (OpieKonnector)
+5203         kitchensync (PhoneKonnector)
+5204         kitchensync (AgendaKonnector)
+5205         kitchensync (CasioKonnector)
+5210         kitchensync (KitchenSyncApp)
+5220         kitchensync (ManipulatorParts)
+5221         kitchensync (overviewpart)
+5222         kitchensync (organizerpart)
+5223         kitchensync (fileviewpart)
+5224         kitchensync Desktop
+5225         kitchensync (QtopiaKonnector)
+5226         kitchensync Categories
+5227         kitchensync Todo
+5228         kitchensync AddressBook
+5229         kitchensync Datebook
+5230         kitchensync SyncEntry
+5231         kitchensync SyncUI
+5250         kitchensync (Syncing Algorithm)
+5300         libtdepim
+5310         kprefs
+5400         calendarsystem
+5500         knotes
+5510         kpilot
+5511         kpilotdaemon
+5512         kpilotconduit
+5600         kontact (core)
+5601         kontact (interfaces)
+5602         kontact (plugins)
+5650         tderesources
+5700         tdeabc
+5710         tdeabc/vcard
+5720         kaddressbook
+5800         libkcal
+5850         korganizer
+5855         korganizer (verbose)
+5890         korgac
+5891         korgac (check)
+5900         kalarmd
+5901         kalarmd (check)
+5950         kalarm
+5960         kandy
+5970         karm
 
 # libtdehtml
-6000        tdehtml
-6005        tdehtml (encoding)
-6010        tdehtml (dom)
-6020        tdehtml (xml)
-6030        tdehtml (html)
-6031        tdehtml (frames & objects)
-6035        tdehtml (parser)
-6036        tdehtml (tokenizer)
-6040        tdehtml (render)
-6041        tdehtml (bidi)
-6045        tdehtml (rendering tree)
-6050        tdehtml (part)
-6060        tdehtml (cache)
-6061        tdehtml (cache-expiredates)
-6070        tdehtml (jscript)
-6080        tdehtml (css)
-6090        tdehtml (memory)
-6100        kjas
-6200        tdehtml (caret)
-6201        tdehtml (caret table)
-6210        tdehtml (editor)
+6000         tdehtml
+6005         tdehtml (encoding)
+6010         tdehtml (dom)
+6020         tdehtml (xml)
+6030         tdehtml (html)
+6031         tdehtml (frames & objects)
+6035         tdehtml (parser)
+6036         tdehtml (tokenizer)
+6040         tdehtml (render)
+6041         tdehtml (bidi)
+6045         tdehtml (rendering tree)
+6050         tdehtml (part)
+6060         tdehtml (cache)
+6061         tdehtml (cache-expiredates)
+6070         tdehtml (jscript)
+6080         tdehtml (css)
+6090         tdehtml (memory)
+6100         kjas
+6200         tdehtml (caret)
+6201         tdehtml (caret table)
+6210         tdehtml (editor)
 
 # libtdeio
-7000        tdeio
-7001        tdeio (KDirWatch)
-7002        tdeio (Slave)
-7003        tdeio (KDirLister)
-7004        tdeio (KDirListerCache)
-7005        tdeio (Filter)
-7006        tdeio (Scheduler)
-7007        tdeio (TDEIOJob)
-7009        tdeio (KMimeType)
-7010        tdeio (KRun)
-7011        tdeio (KSycoca)
-7012        tdeio (KService*)
-7013        tdeio (KPing)
-7014        tdeio (TDETrader)
-7015        tdeio (KAutoMount)
-7016        tdeio (TDELauncher)
-7017        tdeio (TDEIOConnection)
-7018        tdeio (KMimeMagic)
-7019        tdeio (tdeioslave)
-7020        kded
-7021        tdebuildsycoca
-7022        kurifilter
-7023        kurifilter (plugins)
-7024        tdeio (UIServer)
-7025        kpac
-7026        tdeio (KShred)
-7027        tdeio (TCPSlaveBase)
-7028        tdeio (Observer)
-7029        kssl
-7030        tdeio (KEMailSettings)
-7031        KImageIO
-7032        tdeio (KURLCompletion)
-7033        KFileMetaInfo
-7034        KFileMetainfo (plugins)
-7040        KZip
-7041        KTar
-7042        KAr
-7043        tdeio (bookmarks)
-
-# 71xx      are for tdeioslaves
-7101        tdeio_file
-7102        tdeio_ftp
-7103        tdeio_http
-7104        kcookiejar
-7105        tdeio_pop3
-7106        tdeio_smb
-7107        tdeio_man
-7108        tdeio_info
-7109        tdeio_tar
-7110        tdeio_gzip
-7111        tdeio_sql
-7112        tdeio_smtp
-7113        tdeio_http_debug
-7114        tdeio_nntp
-7115        tdeio_thumbnail
-7116        tdeio_imap
-7117        tdeio_audiocd
-7118        tdeio_bzip2
-7119        tdeio_help
-7120        tdeio_sftp
-7121        tdeio_nfs
-7122        tdeio_sieve
-7123        tdeio_kamera
-7124        tdeio_cgi
-7125        tdeio_ldap
-7126        tdeio_devices
-7127        tdeio_fish
-7128        tdeio_svn
-7131        tdeio_xz
+7000         tdeio
+7001         tdeio (KDirWatch)
+7002         tdeio (Slave)
+7003         tdeio (KDirLister)
+7004         tdeio (KDirListerCache)
+7005         tdeio (Filter)
+7006         tdeio (Scheduler)
+7007         tdeio (TDEIOJob)
+7009         tdeio (KMimeType)
+7010         tdeio (KRun)
+7011         tdeio (KSycoca)
+7012         tdeio (KService*)
+7013         tdeio (KPing)
+7014         tdeio (TDETrader)
+7015         tdeio (KAutoMount)
+7016         tdeio (TDELauncher)
+7017         tdeio (TDEIOConnection)
+7018         tdeio (KMimeMagic)
+7019         tdeio (tdeioslave)
+7020         kded
+7021         tdebuildsycoca
+7022         kurifilter
+7023         kurifilter (plugins)
+7024         tdeio (UIServer)
+7025         kpac
+7026         tdeio (KShred)
+7027         tdeio (TCPSlaveBase)
+7028         tdeio (Observer)
+7029         kssl
+7030         tdeio (KEMailSettings)
+7031         KImageIO
+7032         tdeio (KURLCompletion)
+7033         KFileMetaInfo
+7034         KFileMetainfo (plugins)
+7040         KZip
+7041         KTar
+7042         KAr
+7043         tdeio (bookmarks)
+
+# 71xx       are for tdeioslaves
+7101         tdeio_file
+7102         tdeio_ftp
+7103         tdeio_http
+7104         kcookiejar
+7105         tdeio_pop3
+7106         tdeio_smb
+7107         tdeio_man
+7108         tdeio_info
+7109         tdeio_tar
+7110         tdeio_gzip
+7111         tdeio_sql
+7112         tdeio_smtp
+7113         tdeio_http_debug
+7114         tdeio_nntp
+7115         tdeio_thumbnail
+7116         tdeio_imap
+7117         tdeio_audiocd
+7118         tdeio_bzip2
+7119         tdeio_help
+7120         tdeio_sftp
+7121         tdeio_nfs
+7122         tdeio_sieve
+7123         tdeio_kamera
+7124         tdeio_cgi
+7125         tdeio_ldap
+7126         tdeio_devices
+7127         tdeio_fish
+7128         tdeio_svn
+7129         tdeio_appinfo
+7130         tdeio_apt
+7131         tdeio_xz
+7132         tdeio_ftps
+7133         tdeio_gopher
+7134         tdeio_locate
+7135         tdeio_sword
+7136         tdeio_umountwrapper
 
 # tdesdk
-8100        kompare
-8101        kompare (libs)
-8102        kompare (shell)
-8103        kompare (part)
-8104        kompare (list view)
-8105        kompare (nav view)
-8106        kompare (connect widget)
-8107        kbabel
-8108        kbabel (search)
-8109        catalogmanager
-8050        cervisia
-8051        cervisia (cvsservice)
+8100         kompare
+8101         kompare (libs)
+8102         kompare (shell)
+8103         kompare (part)
+8104         kompare (list view)
+8105         kompare (nav view)
+8106         kompare (connect widget)
+8107         kbabel
+8108         kbabel  (search)
+8109         catalogmanager
+8050         cervisia
+8051         cervisia (cvsservice)
 
 # tdevelop
-9000        tdevelop (core)
-9001        tdevelop (grep view)
-9002        tdevelop (doc tree view)
-9003        tdevelop (class view)
-9004        tdevelop (output views)
-9005        tdevelop (class store)
-9006        tdevelop (cvs interface)
-9007        tdevelop (cpp support)
-9008        tdevelop (gcc options)
-9009        tdevelop (astyle)
-9010        tdevelop (appwizard)
-9011        tdevelop (python scripting)
-9012        tdevelop (debugger)
-9013        tdevelop (java support)
-9014        tdevelop (python support)
-9015        tdevelop (script project)
-9016        tdevelop (perl support)
-9017        tdevelop (file view)
-9018        tdevelop (php support)
-9019        tdevelop (fortran support)
-9020        tdevelop (auto project)
-9021        tdevelop (pgi options)
-9022        tdevelop (ctags)
-9023        tdevelop (regexptest)
-9024        tdevelop (trollproject)
-9025        tdevelop (customproject)
-9026        tdevelop (doxygen)
-9027        tdevelop (cvs)
-9028        tdevelop (abbrev)
-9029        tdevelop (filter)
-9030        tdevelop (texttools)
-9031        tdevelop (history)
-9032        qeditor
-9033        tdevelop (diff frontend)
-9034        tdevelop (filecreate part)
-9035        tdevelop (konsole part)
-9036        tdevelop (subversion part)
+9000         tdevelop (core)
+9001         tdevelop (grep view)
+9002         tdevelop (doc tree view)
+9003         tdevelop (class view)
+9004         tdevelop (output views)
+9005         tdevelop (class store)
+9006         tdevelop (cvs interface)
+9007         tdevelop (cpp support)
+9008         tdevelop (gcc options)
+9009         tdevelop (astyle)
+9010         tdevelop (appwizard)
+9011         tdevelop (python scripting)
+9012         tdevelop (debugger)
+9013         tdevelop (java support)
+9014         tdevelop (python support)
+9015         tdevelop (script project)
+9016         tdevelop (perl support)
+9017         tdevelop (file view)
+9018         tdevelop (php support)
+9019         tdevelop (fortran support)
+9020         tdevelop (auto project)
+9021         tdevelop (pgi options)
+9022         tdevelop (ctags)
+9023         tdevelop (regexptest)
+9024         tdevelop (trollproject)
+9025         tdevelop (customproject)
+9026         tdevelop (doxygen)
+9027         tdevelop (cvs)
+9028         tdevelop (abbrev)
+9029         tdevelop (filter)
+9030         tdevelop (texttools)
+9031         tdevelop (history)
+9032         qeditor
+9033         tdevelop (diff frontend)
+9034         tdevelop (filecreate part)
+9035         tdevelop (konsole part)
+9036         tdevelop (subversion part)
 
 # toys and games
 10000        amor
@@ -367,59 +374,59 @@
 
 
 # Kate/Kant/KWrite
-13000   Kate
-13001   Kate (App)
-13002   Kate (View Manager)
-13010   Kate (XML/Syntax)
-13020   Kate (Document)
-13025   Kate (Commands)
-13030   Kate (View)
-13033   Kate (Renderer)
-13035   Kate (Code Completion)
-13040   Kate (Plugins)
-13050   Kate (Scripting)
-13051	Kate (KJS Scripts)
+13000        Kate
+13001        Kate (App)
+13002        Kate (View Manager)
+13010        Kate (XML/Syntax)
+13020        Kate (Document)
+13025        Kate (Commands)
+13030        Kate (View)
+13033        Kate (Renderer)
+13035        Kate (Code Completion)
+13040        Kate (Plugins)
+13050        Kate (Scripting)
+13051        Kate (KJS Scripts)
 
 # Kopete
-14000       kopete
-14010       libkopete
-14100       kopete (gadu)
-14101       kopete (gadu - raw protocol)
-14110       kopete (icq)
-14111       kopete (icq - raw protocol)
-14120       kopete (irc)
-14121       kopete (irc - raw protocol)
-14130       kopete (jabber)
-14131       kopete (jabber - raw protocol)
-14140       kopete (msn)
-14141       kopete (msn - raw protocol)
-14150       kopete (oscar)
-14151       kopete (oscar - raw protocol)
-14152       kopete (oscar/aim)
-14153       kopete (oscar/icq)
-14160       kopete (sms)
-14161       kopete (sms - raw protocol)
-14170       kopete (winpopup)
-14171       kopete (winpopup - raw protocol)
-14180       kopete (yahoo)
-14181       kopete (yahoo - raw protocol)
-14190       kopete (groupwise)
-14191       kopete (libgroupwise)
-14192       kopete (libgroupwise - raw)
-14200       kopete (meanwhile)
-14300       kopete (autoaway)
-14301       kopete (connectionstatus)
-14302       kopete (contactnotes)
-14303       kopete (cryptography)
-14304       kopete (importer)
-14305       kopete (motionautoaway)
-14306       kopete (msginfo)
-14307       kopete (nowlistening)
-14308       kopete (translator)
-14309       kopete (webpresence)
-14310       kopete (history)
-14311       kopete (skype)
-14312       kopete (smpppdcs)
+14000        kopete
+14010        libkopete
+14100        kopete (gadu)
+14101        kopete (gadu - raw protocol)
+14110        kopete (icq)
+14111        kopete (icq - raw protocol)
+14120        kopete (irc)
+14121        kopete (irc - raw protocol)
+14130        kopete (jabber)
+14131        kopete (jabber - raw protocol)
+14140        kopete (msn)
+14141        kopete (msn - raw protocol)
+14150        kopete (oscar)
+14151        kopete (oscar - raw protocol)
+14152        kopete (oscar/aim)
+14153        kopete (oscar/icq)
+14160        kopete (sms)
+14161        kopete (sms - raw protocol)
+14170        kopete (winpopup)
+14171        kopete (winpopup - raw protocol)
+14180        kopete (yahoo)
+14181        kopete (yahoo - raw protocol)
+14190        kopete (groupwise)
+14191        kopete (libgroupwise)
+14192        kopete (libgroupwise - raw)
+14200        kopete (meanwhile)
+14300        kopete (autoaway)
+14301        kopete (connectionstatus)
+14302        kopete (contactnotes)
+14303        kopete (cryptography)
+14304        kopete (importer)
+14305        kopete (motionautoaway)
+14306        kopete (msginfo)
+14307        kopete (nowlistening)
+14308        kopete (translator)
+14309        kopete (webpresence)
+14310        kopete (history)
+14311        kopete (skype)
+14312        kopete (smpppdcs)
 
 # KDB
 20000        KDB (core)
@@ -429,15 +436,15 @@
 20012        KDB (plugin)
 
 #tdefilereplace
-23000 	     TDEFileReplace (tdefilereplacepart)
+23000        TDEFileReplace (tdefilereplacepart)
 
 #klinkstatus
 23100        KLinkStatus
 
 # Quanta
 24000        Quanta
-24001	     Quanta (parser)
-24002	     Quanta (debugger)
+24001        Quanta (parser)
+24002        Quanta (debugger)
 
 # kafka
 25000        Kafka (kafkapp)
@@ -448,25 +455,25 @@
 25005        Kafka (kafkadom)
 
 # KSVG
-26000	KSVG
-26001	KSVG - Parser
-26002	KSVG - Rendering
-26003	KSVG - KPart
-26004	KSVG - Ecma
-26005	KSVG - Canvas
-
-26500  KDOM XInclude
-26550  KDOM XPointer
-26560  KDOM XPath
-26600  KDOM Catalog
-26650  KDOM kxmllint
+26000        KSVG
+26001        KSVG - Parser
+26002        KSVG - Rendering
+26003        KSVG - KPart
+26004        KSVG - Ecma
+26005        KSVG - Canvas
+
+26500        KDOM XInclude
+26550        KDOM XPointer
+26560        KDOM XPath
+26600        KDOM Catalog
+26650        KDOM kxmllint
 
 # XSLT on top of KDOM
-27000  KXSLT
+27000        KXSLT
 
 # libkscan / kooka
-28000   Kooka
-29000   libkscan
+28000        Kooka
+29000        libkscan
 
 # 30001-40000 are for KOffice
 30001        koffice (lib koml)
@@ -522,7 +529,7 @@
 39001        kformula
 40000        kformula
 41000        chalk (tiles)
-41001        chalk (core) 
+41001        chalk (core)
 41002        chalk (registry)
 41003        chalk (tools)
 41004        chalk (color management system)
@@ -542,43 +549,43 @@
 44021        Kexi (plugins)
 
 # kdeextragear
-50001	kfortune
+50001        kfortune
 
 # KIPI - KDE Imaging Plugin Interface
-51000   KIPI (general)
-51001   KIPI (loading)
+51000        KIPI (general)
+51001        KIPI (loading)
 
 # tdemultimedia
-60001	kreatecd
-60002	kaudiocreator
-60005	krec
-60010   libkcddb
-65432   juk
-66666	noatun
-67000	kscd
-67100	kmix
-67200	tdemid
+60001        kreatecd
+60002        kaudiocreator
+60005        krec
+60010        libkcddb
+65432        juk
+66666        noatun
+67000        kscd
+67100        kmix
+67200        tdemid
 
 # tdebindings
-70001	dcoppython
-80001	kjsembed
+70001        dcoppython
+80001        kjsembed
 
 # tdeaddons
-90000	vimpart
-90010	noatun-plugins (dub)
-90020	noatun-plugins (lyrics)
-90100	konq-plugins (fsview)
-90110	konq-plugins (webarchiver)
-90120	konq-plugins (validators)
-90130	konq-plugins (uachanger)
-90140	konq-plugins (sidebar - newsticker)
-90150	konq-plugins (minitools)
-90160	konq-plugins (kuick)
-90170	konq-plugins (kimgalleryplugin)
-90180	konq-plugins (domtreeviewer)
-90190	konq-plugins (dirfilter)
-90200	kicker-applets (mediacontrol)
-90210   konq-plugins (rellinks)
+90000        vimpart
+90010        noatun-plugins (dub)
+90020        noatun-plugins (lyrics)
+90100        konq-plugins (fsview)
+90110        konq-plugins (webarchiver)
+90120        konq-plugins (validators)
+90130        konq-plugins (uachanger)
+90140        konq-plugins (sidebar - newsticker)
+90150        konq-plugins (minitools)
+90160        konq-plugins (kuick)
+90170        konq-plugins (kimgalleryplugin)
+90180        konq-plugins (domtreeviewer)
+90190        konq-plugins (dirfilter)
+90200        kicker-applets (mediacontrol)
+90210        konq-plugins (rellinks)
 
 
 # kdenonbeta
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 9cc32225c..22843da4e 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -295,18 +295,20 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
       return;
   }
 
-  const int BUFSIZE = 4096;
-  char buf[BUFSIZE];
-  if ( !kDebug_data->aAreaName.isEmpty() ) {
-      strlcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] [").ascii(), BUFSIZE );
-      strlcat( buf, kDebug_data->aAreaName.data(), BUFSIZE );
-      strlcat( buf, "] ", BUFSIZE );
-      strlcat( buf, data, BUFSIZE );
-  }
-  else {
-      strlcpy( buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii(), BUFSIZE );
-      strlcat( buf, data, BUFSIZE );
+  const int BUF_SIZE = 4096;
+  const int BUF_PID_SIZE = 20;
+  char buf[BUF_SIZE];
+  char buf_pid[BUF_PID_SIZE];
+  strlcpy(buf, TQDateTime::currentDateTime().toString("[yyyy/MM/dd hh:mm:ss.zzz] ").ascii(), BUF_SIZE);
+  if (!kDebug_data->aAreaName.isEmpty())
+  {
+    strlcat( buf, "[", BUF_SIZE );
+    strlcat( buf, kDebug_data->aAreaName.data(), BUF_SIZE );
+    strlcat( buf, "] ", BUF_SIZE );
   }
+  snprintf(buf_pid, BUF_PID_SIZE, "[%d] ", getpid());
+  strlcat(buf, buf_pid, BUF_SIZE);
+  strlcat(buf, data, BUF_SIZE);
 
   // Output
   switch( nOutput )
@@ -331,7 +333,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
           break;
       }
       TQFile aOutputFile( kDebug_data->config->readPathEntry(aKey, "kdebug.dbg") );
-      aOutputFile.open( (TQIODevice_OpenModeFlag)((int)IO_WriteOnly | (int)IO_Append | (int)IO_Raw) );
+      aOutputFile.open( IO_WriteOnly | IO_Append | IO_Raw );
       aOutputFile.writeBlock( buf, strlen( buf ) );
       aOutputFile.close();
       break;
@@ -341,7 +343,7 @@ static void kDebugBackend( unsigned short nLevel, unsigned int nArea, const char
       // Since we are in tdecore here, we cannot use KMsgBox and use
       // TQMessageBox instead
       if ( !kDebug_data->aAreaName.isEmpty() )
-          aCaption += TQString("(%1)").arg( QString(kDebug_data->aAreaName) );
+          aCaption += TQString("(%1)").arg( TQString(kDebug_data->aAreaName) );
       TQMessageBox::warning( 0L, aCaption, data, i18n("&OK") );
       break;
   }
@@ -430,7 +432,7 @@ kdbgstream& kdbgstream::operator<< (TQChar ch)
     output += "\\x" + TQString::number( ch.unicode(), 16 ).rightJustify(2, '0');
   else {
     output += ch;
-    if (ch == QChar('\n')) flush();
+    if (ch == TQChar('\n')) flush();
   }
   return *this;
 }
@@ -469,7 +471,7 @@ kdbgstream& kdbgstream::operator<< (const TQWidget* widget)
       return *this;
     }
   output += string;
-  if (output.at(output.length() -1 ) == QChar('\n'))
+  if (output.at(output.length() -1 ) == TQChar('\n'))
     {
       flush();
     }
@@ -757,7 +759,13 @@ TQString formatBacktrace(void *addr) {
 	// NOTE: if somebody would compile for some non-linux-glibc platform
 	//       check if dladdr function is avalible there
 	Dl_info info;
-	dladdr(func.addr, &info); // obtain information about the function.
+
+	// obtain information about the function.
+#ifdef Q_OS_SOLARIS
+	dladdr((void *)func.addr, &info);
+#else
+	dladdr(func.addr, &info);
+#endif /* Solaris */
 
 	func.fileName = info.dli_fname;
 	func.base = info.dli_fbase;
@@ -814,7 +822,7 @@ TQString kdBacktrace(int levels)
 
 		if (levels) { 
 			for (int i = 0; i < levels; ++i) {
-				rv += QString().sprintf("#%-2d ", i);
+				rv += TQString().sprintf("#%-2d ", i);
 				rv += formatBacktrace(trace[i]);
 				rv += '\n';
 			}
diff --git a/tdecore/kdemacros.h.cmake b/tdecore/kdemacros.h.cmake
index 083cc8c8d..683538f9d 100644
--- a/tdecore/kdemacros.h.cmake
+++ b/tdecore/kdemacros.h.cmake
@@ -41,7 +41,7 @@
 #ifdef __KDE_HAVE_GCC_VISIBILITY
 #define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
 #define KDE_EXPORT __attribute__ ((visibility("default")))
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 #define KDE_NO_EXPORT
 #define KDE_EXPORT __declspec(dllexport)
 #else
@@ -54,7 +54,7 @@
  * cope with symbol visibility.
  */
 #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \
+  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
   TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
diff --git a/tdecore/kdemacros.h.in b/tdecore/kdemacros.h.in
index 9566c386b..d72efe36c 100644
--- a/tdecore/kdemacros.h.in
+++ b/tdecore/kdemacros.h.in
@@ -40,7 +40,7 @@
 #ifdef __KDE_HAVE_GCC_VISIBILITY
 #define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
 #define KDE_EXPORT __attribute__ ((visibility("default")))
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 #define KDE_NO_EXPORT
 #define KDE_EXPORT __declspec(dllexport)
 #else
@@ -53,7 +53,7 @@
  * cope with symbol visibility.
  */
 #define KDE_Q_EXPORT_PLUGIN(PLUGIN) \
-  TQ_EXTERN_C KDE_EXPORT const char* tqt_ucm_query_verification_data(); \
+  TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \
   TQ_EXTERN_C KDE_EXPORT TQUnknownInterface* ucm_instantiate(); \
   TQ_EXPORT_PLUGIN(PLUGIN)
 
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index cfdc5488c..12cf85225 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -33,7 +33,7 @@ class KDesktopFilePrivate;
  */
 class TDECORE_EXPORT KDesktopFile : public TDEConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index b9a6efb10..f78464287 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -222,12 +222,7 @@ KExtendedSocket::~KExtendedSocket()
   delete d;
 }
 
-#ifdef USE_QT3
 void KExtendedSocket::reset()
-#endif // USE_QT3
-#ifdef USE_QT4
-bool KExtendedSocket::reset()
-#endif // USE_QT4
 {
   closeNow();
   release();
@@ -644,7 +639,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
   if (d->qsnIn == NULL)
     {
       d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read);
-      TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead()));
+      TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead()));
       d->qsnIn->setEnabled(true);
     }
 
@@ -692,7 +687,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
       if (d->qsnOut == NULL)
 	{
 	  d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write);
-	  TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite()));
+	  TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite()));
 	  // if the class is being created now, there's nothing to write yet
 	  // so socketActivityWrite() will get called once and disable
 	  // the notifier
@@ -707,7 +702,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
   if (d->emitWrite && d->qsnOut == NULL)
     {
       d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write);
-      TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite()));
+      TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite()));
     }
 
   return true;
@@ -788,8 +783,8 @@ int KExtendedSocket::startAsyncLookup()
       d->resRemote.setFlags(flags);
       d->resRemote.setFamily(familyMask);
       d->resRemote.setSocketType(socktype);
-      TQObject::connect(&d->resRemote, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(dnsResultsReady()));
+      TQObject::connect(&d->resRemote, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(dnsResultsReady()));
 
       if (!d->resRemote.start())
 	{
@@ -805,8 +800,8 @@ int KExtendedSocket::startAsyncLookup()
       d->resLocal.setFlags(flags);
       d->resLocal.setFamily(familyMask);
       d->resLocal.setSocketType(socktype);
-      TQObject::connect(&d->resLocal, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(dnsResultsReady()));
+      TQObject::connect(&d->resLocal, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(dnsResultsReady()));
 
       if (!d->resLocal.start())
 	{
@@ -901,7 +896,7 @@ int KExtendedSocket::listen(int N)
     {
       d->status = listening;
       d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read);
-      TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead()));
+      TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead()));
     }
   return retval == -1 ? -1 : 0;
 }
@@ -1223,7 +1218,7 @@ int KExtendedSocket::startAsyncConnect()
   // signal lookupFinished to do connection
   if (d->status < lookupDone)
     {
-      TQObject::connect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot()));
+      TQObject::connect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot()));
       if (d->status < lookupInProgress)
 	return startAsyncLookup();
       else
@@ -1233,7 +1228,7 @@ int KExtendedSocket::startAsyncConnect()
   // here we have d->status >= lookupDone and <= connecting
   // we can do our connection
   d->status = connecting;
-  TQGuardedPtr<TQObject> p = TQT_TQOBJECT(this);
+  TQGuardedPtr<TQObject> p = this;
   connectionEvent();
   if (!p) 
     return -1; // We have been deleted.
@@ -1262,7 +1257,7 @@ void KExtendedSocket::cancelAsyncConnect()
   d->status = lookupDone;
 }
 
-bool KExtendedSocket::open(TQ_OpenMode mode)
+bool KExtendedSocket::open(int mode)
 {
   if (mode != IO_Raw | IO_ReadWrite)
     return false;		// invalid open mode
@@ -1436,7 +1431,7 @@ void KExtendedSocket::flush()
 }
 
 
-TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
 {
   cleanError();
   if (d->status < connected || d->flags & passiveSocket)
@@ -1481,7 +1476,7 @@ TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KExtendedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len)
 {
   cleanError();
   if (d->status < connected || d->status >= closing || d->flags & passiveSocket)
@@ -1557,12 +1552,7 @@ int KExtendedSocket::unreadBlock(const char *, uint)
   return -1;
 }
 
-#ifdef USE_QT3
 int KExtendedSocket::bytesAvailable() const
-#endif // USE_QT3
-#ifdef USE_QT4
-qint64 KExtendedSocket::bytesAvailable() const
-#endif // USE_QT4
 {
   if (d->status < connected || d->flags & passiveSocket)
     return -2;
@@ -1606,7 +1596,7 @@ int KExtendedSocket::getch()
 {
   unsigned char c;
   int retval;
-  retval = tqreadBlock((char*)&c, sizeof(c));
+  retval = readBlock((char*)&c, sizeof(c));
 
   if (retval < 0)
     return retval;
@@ -1616,7 +1606,7 @@ int KExtendedSocket::getch()
 int KExtendedSocket::putch(int ch)
 {
   unsigned char c = (char)ch;
-  return tqwriteBlock((char*)&c, sizeof(c));
+  return writeBlock((char*)&c, sizeof(c));
 }
 
 // sets the emission of the readyRead signal
@@ -1919,9 +1909,9 @@ void KExtendedSocket::connectionEvent()
 	  // error here is either EWOULDBLOCK or EINPROGRESS
 	  // so, it is a good condition
 	  d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read);
-	  TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead()));
+	  TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead()));
 	  d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write);
-	  TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite()));
+	  TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite()));
 
 	  // ok, let the Qt event loop do the selecting for us
 	  return;
@@ -1979,7 +1969,7 @@ void KExtendedSocket::dnsResultsReady()
 
 void KExtendedSocket::startAsyncConnectSlot()
 {
-  TQObject::disconnect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot()));
+  TQObject::disconnect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot()));
 
   if (d->status == lookupDone)
     startAsyncConnect();
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index fad502c04..095cc7a43 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -22,10 +22,6 @@
 
 #include "tdelibs_export.h"
 
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
 #ifdef Q_OS_UNIX
 
 #include <sys/time.h>
@@ -44,10 +40,10 @@ class KAddressInfo;		/* our abstraction of it */
 class TQSocketNotifier;
 
 /*
- * This is extending QIODevice's error codes
+ * This is extending TQIODevice's error codes
  *
  * According to tqiodevice.h, the last error is IO_UnspecifiedError
- * These errors will never occur in functions declared in QIODevice
+ * These errors will never occur in functions declared in TQIODevice
  * (except open, but you shouldn't call open)
  */
 #define IO_ListenError		(IO_UnspecifiedError+1)
@@ -67,7 +63,7 @@ class KExtendedSocketPrivate;
  * only difference is that the passiveSocket flag must be passed either to
  * the constructor or to setSocketFlags(). If passiveSocket is used, the class will
  * enable functions listen() and accept() and related signals, and will
- * also disable tqreadBlock() and tqwriteBlock().
+ * also disable readBlock() and writeBlock().
  *
  * To create a Unix socket, one would pass flag unixSocket to the constructor
  * or setSocketFlags(). The hostname and service/port can be set to whatever is
@@ -92,9 +88,9 @@ class KExtendedSocketPrivate;
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  * @short an extended socket
  */
-class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice
+class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public TQIODevice
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -211,12 +207,7 @@ public:
    * freeing any related resources still being kept.
    * @since 3.1
    */
-#ifdef USE_QT3
   void reset();
-#endif // USE_QT3
-#ifdef USE_QT4
-  bool reset();
-#endif // USE_QT4
 
   /*
    * --- status, flags and internal variables --- *
@@ -627,7 +618,7 @@ public:
    * @return true if successful, false when an error occurred or the most was
    *         not correct
    */
-  virtual bool open(TQ_OpenMode mode = (TQ_OpenMode)(IO_Raw | IO_ReadWrite));
+  virtual bool open(int mode = (int)(IO_Raw | IO_ReadWrite));
 
   /**
    * Closes the socket. If we have data still in the write buffer yet to be
@@ -677,7 +668,7 @@ public:
    * ready to receive data, it will block, unless this is a non-blocking socket.
    *
    * This function does not touch the read buffer. You can empty it by calling
-   * tqreadBlock() with a null destination buffer.
+   * readBlock() with a null destination buffer.
    */
   virtual void flush();
 
@@ -685,12 +676,7 @@ public:
    * Returns length of this socket. This call is not supported on sockets.
    * @return the length of this socket, or 0 if unsupported
    */
-#ifdef USE_QT3
   virtual inline TQ_ULONG size() const
-#endif // USE_QT3
-#ifdef USE_QT4
-  virtual inline qint64 size() const
-#endif // USE_QT4
   { return 0; }
 
   /**
@@ -745,7 +731,7 @@ public:
    * This function returns 0, if the function detected end-of-file condition
    * (socket was closed)
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
 
   /**
    * Writes a block of data to the socket.
@@ -770,7 +756,7 @@ public:
    * The return value might be less than @p len if the output buffers cannot
    * accommodate that many bytes and -1 in the case of an errro.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
 
   /**
    * Peeks at a block of data from the socket.
@@ -805,12 +791,7 @@ public:
    * @return The number of available bytes, or -1 on error or -2 if this call is invalid
    * in the current state.
    */
-#ifdef USE_QT3
   virtual int bytesAvailable() const;
-#endif // USE_QT3
-#ifdef USE_QT4
-  virtual qint64 bytesAvailable() const;
-#endif // USE_QT4
 
   /**
    * Waits @p msec milliseconds for more data to be available (use 0 to
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index e229e73fd..e6722b8dd 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -190,8 +190,8 @@ protected:
                                   const char *className, const TQStringList &args )
     {
         KGenericFactoryBase<Product>::initializeMessageCatalogue();
-        return TQT_TQOBJECT((KDEPrivate::ConcreteFactory<Product, ParentType>
-            ::create( 0, 0, parent, name, className, args )));
+        return (KDEPrivate::ConcreteFactory<Product, ParentType>
+            ::create( 0, 0, parent, name, className, args ));
     }
 };
 
diff --git a/tdecore/kgenericfactory.tcc b/tdecore/kgenericfactory.tcc
index e7ba1c730..dda6ec487 100644
--- a/tdecore/kgenericfactory.tcc
+++ b/tdecore/kgenericfactory.tcc
@@ -150,7 +150,7 @@ namespace KDEPrivate
                                        const TQStringList &args, Type2Type<TQWidget> )
         {
 
-            WidgetParentType *p = dynamic_cast<WidgetParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) );
+            WidgetParentType *p = dynamic_cast<WidgetParentType *>( parent );
             if ( parent && !p ) 
                 return 0;
             return new Product( p, name, args );
@@ -160,7 +160,7 @@ namespace KDEPrivate
                                        TQObject *parent, const char *name,
                                        const TQStringList &args, Type2Type<TQObject> )
         { 
-            ParentType *p = dynamic_cast<ParentType *>( static_cast<TQT_BASE_OBJECT_NAME*>(parent) );
+            ParentType *p = dynamic_cast<ParentType *>( parent );
             if ( parent && !p )
                 return 0;
             return new Product( p, name, args ); 
@@ -179,9 +179,9 @@ namespace KDEPrivate
                                         const char *className, 
                                         const TQStringList &args )
         {
-            return static_cast<TQObject*>(static_cast<QObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName,
-                                                                 parent, name, className, 
-                                                                 args )));
+            return static_cast<TQObject*>(ConcreteFactory<Product, ParentType>::create( parentWidget, widgetName,
+                parent, name, className,
+                args ));
         }
  
     };
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index 746721e40..5da0093a2 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -18,11 +18,11 @@
 */
 
 #include "kglobalaccel.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include "kglobalaccel_x11.h"
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 #include "kglobalaccel_win.h"
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
 #include "kglobalaccel_mac.h"
 #else
 #include "kglobalaccel_emb.h"
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index a8ed8a955..22dedd513 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -44,13 +44,13 @@ class TDEGlobalAccelPrivate;
 */
 class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	/**
 	 * Creates a new TDEGlobalAccel object with the given pParent and
 	 * psName.
-	 * @param pParent the parent of the QObject
-	 * @param psName the name of the QObject
+	 * @param pParent the parent of the TQObject
+	 * @param psName the name of the TQObject
 	 */
 	TDEGlobalAccel( TQObject* pParent, const char* psName = 0 );
 	virtual ~TDEGlobalAccel();
@@ -76,7 +76,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	 * insert( "Do Something", i18n("Do Something"),
 	 *   i18n("This action allows you to do something really great with this program to "
 	 *        "the currently open document."),
-	 *   ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQT_SLOT(slotDoSomething()) );
+	 *   ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) );
 	 *\endcode
 	 *
 	 * @param sAction The internal name of the action.
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 09c216b99..7b49ecfe4 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include <tqwindowdefs.h>
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 
 #include "kglobalaccel_win.h"
 #include "kglobalaccel.h"
@@ -161,7 +161,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE
 
         bool failed = false;
         if( bGrab ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         	failed = handler.error( true ); // sync now
 #endif
         	// If grab failed, then ungrab any grabs that could possibly succeed
@@ -283,9 +283,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
                 if( !recursion_block ) {
                         recursion_block = true;
 		        TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) );
-		        connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) );
+		        connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) );
 		        pMenu->exec( TQPoint( 0, 0 ) );
-		        disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+		        disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 		        delete pMenu;
                         recursion_block = false;
                 }
@@ -342,4 +342,4 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction )
 
 #include "kglobalaccel_win.moc"
 
-#endif // !Q_WS_WIN
+#endif // !TQ_WS_WIN
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h
index e60fed8ee..45943b071 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/kglobalaccel_win.h
@@ -33,7 +33,7 @@
 class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 {
 	friend class TDEGlobalAccel;
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEGlobalAccelPrivate();
 	virtual ~TDEGlobalAccelPrivate();
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 4ee2770ba..d76b8cdac 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -20,7 +20,7 @@
 #include "config.h"
 
 #include <tqwindowdefs.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include "kglobalaccel_x11.h"
 #include "kglobalaccel.h"
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kkeynative.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <kxerrorhandler.h>
 #endif
 
@@ -90,7 +90,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
         all_accels->append( this );
 	m_sConfigGroup = "Global Shortcuts";
 	kapp->installX11EventFilter( this );
-	connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int)));
+	connect(kapp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int)));
 }
 
 TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate()
@@ -197,7 +197,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE
 		return false;
 	}
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         KXErrorHandler handler( XGrabErrorHandler );
 #endif
 	// We'll have to grab 8 key modifier combinations in order to cover all
@@ -227,7 +227,7 @@ bool TDEGlobalAccelPrivate::grabKey( const KKeyServer::Key& key, bool bGrab, TDE
 
         bool failed = false;
         if( bGrab ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         	failed = handler.error( true ); // sync now
 #endif
         	// If grab failed, then ungrab any grabs that could possibly succeed
@@ -313,9 +313,9 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
                 if( !recursion_block ) {
                         recursion_block = true;
 		        TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) );
-		        connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) );
+		        connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) );
 		        pMenu->exec( TQPoint( 0, 0 ) );
-		        disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+		        disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 		        delete pMenu;
                         recursion_block = false;
                 }
@@ -392,9 +392,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
                 if( !recursion_block ) {
                         recursion_block = true;
 		        TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) );
-		        connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) );
+		        connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) );
 		        pMenu->exec( TQPoint( 0, 0 ) );
-		        disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+		        disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 		        delete pMenu;
                         recursion_block = false;
                 }
@@ -423,16 +423,16 @@ void TDEGlobalAccelPrivate::activate( TDEAccelAction* pAction, const KKeySequenc
                 int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     TQUObject o[2];
-                    static_TQUType_int.set(o+1,n);
+                    static_QUType_int.set(o+1,n);
                     const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o );
                 }
 	} else if( rexPassInfo.search( pAction->methodSlotPtr() ) ) {
                 int slot_id = pAction->objSlotPtr()->metaObject()->findSlot( normalizeSignalSlot( pAction->methodSlotPtr() ).data() + 1, true );
                 if( slot_id >= 0 ) {
                     TQUObject o[4];
-                    static_TQUType_TQString.set(o+1,pAction->name());
-                    static_TQUType_TQString.set(o+2,pAction->label());
-                    static_TQUType_ptr.set(o+3,&seq);
+                    static_QUType_TQString.set(o+1,pAction->name());
+                    static_QUType_TQString.set(o+2,pAction->label());
+                    static_QUType_ptr.set(o+3,&seq);
                     const_cast< TQObject* >( pAction->objSlotPtr())->tqt_invoke( slot_id, o );
                 }
 	} else {
@@ -451,4 +451,4 @@ void TDEGlobalAccelPrivate::slotActivated( int iAction )
 
 #include "kglobalaccel_x11.moc"
 
-#endif // !Q_WS_X11
+#endif // !TQ_WS_X11
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h
index b22363926..1502d89cb 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/kglobalaccel_x11.h
@@ -33,7 +33,7 @@
 class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 {
 	friend class TDEGlobalAccel;
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEGlobalAccelPrivate();
 	virtual ~TDEGlobalAccelPrivate();
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index f5b38b75a..a5cb4bcae 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -35,7 +35,7 @@
 #include <kicontheme.h>
 #include "kiconeffect.h"
 
-#if defined(Q_WS_WIN) || defined(Q_WS_MACX)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX)
 static bool tqt_use_xrender=true;
 static bool tqt_has_xft=true;
 #else
@@ -287,7 +287,7 @@ void TDEIconEffect::toGray(TQImage &img, float value)
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
     unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits()
-	    : (unsigned int *) img.tqcolorTable();
+	    : (unsigned int *) img.colorTable();
     int rval, gval, bval, val, alpha, i;
     for (i=0; i<pixels; i++)
     {
@@ -309,7 +309,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value)
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
     unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits()
-	    : (unsigned int *) img.tqcolorTable();
+	    : (unsigned int *) img.colorTable();
     int rval, gval, bval, val, alpha, i;
     float rcol = col.red(), gcol = col.green(), bcol = col.blue();
     for (i=0; i<pixels; i++)
@@ -348,7 +348,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value)
 void TDEIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) {
    int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors();
    unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits()
-         : (unsigned int *) img.tqcolorTable();
+         : (unsigned int *) img.colorTable();
    int rval, gval, bval, alpha, i;
    int rw = white.red(), gw = white.green(), bw = white.blue();
    int rb = black.red(), gb = black.green(), bb = black.blue();
@@ -400,7 +400,7 @@ void TDEIconEffect::deSaturate(TQImage &img, float value)
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
     unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits()
-	    : (unsigned int *) img.tqcolorTable();
+	    : (unsigned int *) img.colorTable();
     TQColor color;
     int h, s, v, i;
     for (i=0; i<pixels; i++)
@@ -418,7 +418,7 @@ void TDEIconEffect::toGamma(TQImage &img, float value)
     int pixels = (img.depth() > 8) ? img.width()*img.height()
 	    : img.numColors();
     unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits()
-	    : (unsigned int *) img.tqcolorTable();
+	    : (unsigned int *) img.colorTable();
     TQColor color;
     int i, rval, gval, bval;
     float gamma;
@@ -462,7 +462,7 @@ void TDEIconEffect::semiTransparent(TQImage &img)
 	else
 	  for (y=0; y<height; y++)
 	  {
-	    QRgb *line = (QRgb *) img.scanLine(y);
+	    TQRgb *line = (TQRgb *) img.scanLine(y);
 	    for (x=(y%2); x<width; x+=2)
 		line[x] &= 0x00ffffff;
 	  }
@@ -530,8 +530,8 @@ void TDEIconEffect::semiTransparent(TQPixmap &pix)
 
     for (int y=0; y<img.height(); y++)
     {
-	QRgb *line = (QRgb *) img.scanLine(y);
-	QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
+	TQRgb *line = (TQRgb *) img.scanLine(y);
+	TQRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa;
 	for (int x=0; x<(img.width()+31)/32; x++)
 	    line[x] &= pattern;
     }
@@ -557,11 +557,11 @@ TQImage TDEIconEffect::doublePixels(TQImage src) const
     int x, y;
     if (src.depth() == 32)
     {
-	QRgb *l1, *l2;
+	TQRgb *l1, *l2;
 	for (y=0; y<h; y++)
 	{
-	    l1 = (QRgb *) src.scanLine(y);
-	    l2 = (QRgb *) dst.scanLine(y*2);
+	    l1 = (TQRgb *) src.scanLine(y);
+	    l2 = (TQRgb *) dst.scanLine(y*2);
 	    for (x=0; x<w; x++)
 	    {
 		l2[x*2] = l2[x*2+1] = l1[x];
@@ -669,14 +669,14 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay)
 
     if (src.depth() == 32)
     {
-	QRgb *oline, *sline;
+	TQRgb *oline, *sline;
 	int r1, g1, b1, a1;
 	int r2, g2, b2, a2;
 
 	for (i=0; i<src.height(); i++)
 	{
-	    oline = (QRgb *) overlay.scanLine(i);
-	    sline = (QRgb *) src.scanLine(i);
+	    oline = (TQRgb *) overlay.scanLine(i);
+	    sline = (TQRgb *) src.scanLine(i);
 
 	    for (j=0; j<src.width(); j++)
 	    {
@@ -743,7 +743,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect)
     TQPainter p(widget);
 
     // Use NotROP to avoid having to repaint the pixmap each time.
-    p.setPen(TQPen(Qt::black, 2, Qt::DotLine));
+    p.setPen(TQPen(TQt::black, 2, TQt::DotLine));
     p.setRasterOp(TQt::NotROP);
 
     // The spacing between the rects we draw.
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index 8665b9ce2..f6e267a86 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -157,7 +157,7 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs)
 
     if (kapp) {
         kapp->addKipcEventMask(KIPC::IconChanged);
-        TQObject::connect(kapp, TQT_SIGNAL(updateIconLoaders()), d, TQT_SLOT(reconfigure()));
+        TQObject::connect(kapp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure()));
     }
 
     init( _appname, _dirs );
@@ -812,7 +812,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
 	        *img = img->convertDepth(32);
             for (int y = 0; y < img->height(); y++)
             {
-		QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y));
+		TQRgb *line = reinterpret_cast<TQRgb *>(img->scanLine(y));
                 for (int x = 0; x < img->width();  x++)
                     line[x] = (line[x] & 0x00ffffff) | (TQMIN(0x80, tqAlpha(line[x])) << 24);
 	    }
@@ -851,8 +851,8 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in
              line < favIcon.height();
              ++line )
         {
-            QRgb* fpos = reinterpret_cast< QRgb* >( favIcon.scanLine( line ));
-            QRgb* ipos = reinterpret_cast< QRgb* >( img->scanLine( line + y )) + x;
+            TQRgb* fpos = reinterpret_cast< TQRgb* >( favIcon.scanLine( line ));
+            TQRgb* ipos = reinterpret_cast< TQRgb* >( img->scanLine( line + y )) + x;
             for( int i = 0;
                  i < favIcon.width();
                  ++i, ++fpos, ++ipos )
diff --git a/tdecore/kiconloader_p.h b/tdecore/kiconloader_p.h
index 1e5d5f75c..dacf40ade 100644
--- a/tdecore/kiconloader_p.h
+++ b/tdecore/kiconloader_p.h
@@ -35,7 +35,7 @@ public:
 
 class TDEIconLoaderPrivate : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStringList mThemesInTree;
     TDEIconGroup *mpGroups;
diff --git a/tdecore/kidna.cpp b/tdecore/kidna.cpp
index ca41fecdf..e8df061ec 100644
--- a/tdecore/kidna.cpp
+++ b/tdecore/kidna.cpp
@@ -21,18 +21,18 @@
 
 #include "kidna.h"
 
-#ifndef Q_WS_WIN //TODO kresolver not ported
+#ifndef TQ_WS_WIN //TODO kresolver not ported
 #include "kresolver.h"
 #endif
 #include <kdebug.h>
 
-#ifndef Q_WS_WIN //TODO knetwork not ported
+#ifndef TQ_WS_WIN //TODO knetwork not ported
 using namespace KNetwork;
 #endif
 
 TQCString KIDNA::toAsciiCString(const TQString &idna)
 {
-#ifndef Q_WS_WIN //TODO kresolver not ported
+#ifndef TQ_WS_WIN //TODO kresolver not ported
 	return KResolver::domainToAscii(idna);
 #else
 	return TQCString();
@@ -41,7 +41,7 @@ TQCString KIDNA::toAsciiCString(const TQString &idna)
 
 TQString KIDNA::toAscii(const TQString &idna)
 {
-  if (idna.length() && (idna[0] == (QChar)'.'))
+  if (idna.length() && (idna[0] == (TQChar)'.'))
   {
      TQString host = TQString::fromLatin1(toAsciiCString(idna.mid(1)));
      if (host.isEmpty())
@@ -53,8 +53,8 @@ TQString KIDNA::toAscii(const TQString &idna)
 
 TQString KIDNA::toUnicode(const TQString &idna)
 {
-#ifndef Q_WS_WIN //TODO kresolver not ported
-  if (idna.length() && (idna[0] == (QChar)'.'))
+#ifndef TQ_WS_WIN //TODO kresolver not ported
+  if (idna.length() && (idna[0] == (TQChar)'.'))
      return idna[0] + KResolver::domainToUnicode(idna.mid(1));
   return KResolver::domainToUnicode(idna);
 #else
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index cbdf86783..8ae747948 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -25,6 +25,8 @@
 #include "kcharsets.h"
 #include "kiconloader.h"
 #ifdef __TDE_HAVE_TDEHWLIB
+#include "klibloader.h"
+#include "tdeversion.h"
 #include "tdehardwaredevices.h"
 #include "tdenetworkconnections.h"
 #endif
@@ -285,22 +287,42 @@ TDEIconLoader *TDEInstance::iconLoader() const
 #ifdef __TDE_HAVE_TDEHWLIB
 TDEHardwareDevices *TDEInstance::hardwareDevices() const
 {
-    DEBUG_CHECK_ALIVE
-    if( _hardwaredevices == 0 ) {
-	_hardwaredevices = new TDEHardwareDevices( );
-    }
+	DEBUG_CHECK_ALIVE
+	if (_hardwaredevices == 0)
+	{
+		TQString libName = TQString("libtdehw.so.%1").arg(TDE_VERSION_MAJOR);
+		KLibrary *lib = KLibLoader::self()->library(libName.latin1());
+		if (lib)
+		{
+			TDEHardwareDevices* (*create)() = (TDEHardwareDevices* (*)())lib->symbol("create_tdeHardwareDevices");
+			if (create)
+			{
+				_hardwaredevices = create();
+			}
+		}
+	}
 
-    return _hardwaredevices;
+	return _hardwaredevices;
 }
 
 TDEGlobalNetworkManager *TDEInstance::networkManager() const
 {
-    DEBUG_CHECK_ALIVE
-    if( _networkmanager == 0 ) {
-        _networkmanager = new TDEGlobalNetworkManager( );
-    }
+	DEBUG_CHECK_ALIVE
+	if (_networkmanager == 0)
+	{
+		TQString libName = TQString("libtdehw.so.%1").arg(TDE_VERSION_MAJOR);
+		KLibrary *lib = KLibLoader::self()->library(libName.latin1());
+		if (lib)
+		{
+			TDEGlobalNetworkManager* (*create)() = (TDEGlobalNetworkManager* (*)())lib->symbol("create_tdeGlobalNetworkManager");
+			if (create)
+			{
+				_networkmanager = create();
+			}
+		}
+	}
 
-    return _networkmanager;
+	return _networkmanager;
 }
 #endif
 
diff --git a/tdecore/kipc.cpp b/tdecore/kipc.cpp
index e6ec7cc4e..8e6da23e2 100644
--- a/tdecore/kipc.cpp
+++ b/tdecore/kipc.cpp
@@ -30,7 +30,7 @@
 #include <tqevent.h>
 #include <tqwindowdefs.h>
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <kxerrorhandler.h>
@@ -39,7 +39,7 @@
 #include <kipc.h>
 
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 static long getSimpleProperty(Window w, Atom a)
 {
     Atom real_type;
@@ -59,7 +59,7 @@ static long getSimpleProperty(Window w, Atom a)
 
 void KIPC::sendMessage(Message msg, WId w, int data)
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     static Atom a = 0;
     if (a == 0)
 	a = XInternAtom(tqt_xdisplay(), "KIPC_COMM_ATOM", False);
@@ -88,7 +88,7 @@ void KIPC::sendMessage(Message msg, WId w, int data)
 
 void KIPC::sendMessageAll(Message msg, int data)
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     unsigned int i, nrootwins;
     Window dw1, dw2, *rootwins = 0;
     Display *dpy = tqt_xdisplay();
diff --git a/tdecore/kkeynative.h b/tdecore/kkeynative.h
index e2774417d..5ff83ccbc 100644
--- a/tdecore/kkeynative.h
+++ b/tdecore/kkeynative.h
@@ -25,7 +25,7 @@
 
 #include <tdeshortcut.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 typedef union _XEvent XEvent;
 #endif
 
@@ -45,7 +45,7 @@ class TDECORE_EXPORT KKeyNative
 	 */
 	KKeyNative();
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	/**
 	 * Extracts a new native key from the given xevent.
 	 * @param xevent the XEvent that contains the key
@@ -76,7 +76,7 @@ class TDECORE_EXPORT KKeyNative
 	 */
 	void clear();
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	/**
 	 * Initializes the native key by extracting the information
 	 * from the given xevent.
@@ -111,7 +111,7 @@ class TDECORE_EXPORT KKeyNative
 	/**
 	 * Returns the qt key code.
 	 * @return the qt key code or 0 if there is no key set.
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 
 	int keyCodeQt() const;
@@ -205,7 +205,7 @@ class TDECORE_EXPORT KKeyNative
 	 */
 	static bool keyboardHasWinKey();
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	/**
 	 * Returns the equivalent X modifier mask of the given modifier flag.
 	 * @param modFlag the mod flags to test
diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp
index d5ecb24da..8ab457a26 100644
--- a/tdecore/kkeynative_x11.cpp
+++ b/tdecore/kkeynative_x11.cpp
@@ -23,7 +23,7 @@
 #include <tqnamespace.h>
 #include <tqwindowdefs.h>
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32
 
 #include "kkeynative.h"
 #include "kkeyserver_x11.h"
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define XK_MISCELLANY
 #define XK_XKB_KEYS
 #include <X11/X.h>
@@ -56,7 +56,7 @@ static KKeyNative* gx_pkey = 0;
 KKeyNative::KKeyNative()                           { clear(); }
 KKeyNative::KKeyNative( const KKey& key )          { init( key ); }
 KKeyNative::KKeyNative( const KKeyNative& key )    { init( key ); }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 KKeyNative::KKeyNative( const XEvent* pEvent )     { init( pEvent ); }
 #endif
 
@@ -77,7 +77,7 @@ void KKeyNative::clear()
 	m_sym = 0;
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 bool KKeyNative::init( const XEvent* pEvent )
 {
 	KeySym keySym;
@@ -91,11 +91,11 @@ bool KKeyNative::init( const XEvent* pEvent )
 
 bool KKeyNative::init( const KKey& key )
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	m_sym = key.sym();
 	m_code = m_sym; //key.keyCodeQt();
 	m_mod = key.m_mod;
-#elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX)
+#elif !defined(TQ_WS_WIN) && !defined(TQ_WS_MACX)
 	// Get any extra mods required by the sym.
 	//  E.g., XK_Plus requires SHIFT on the en layout.
 	m_sym = key.sym();
@@ -167,7 +167,7 @@ KKeyNative& KKeyNative::null()
 
 KKey KKeyNative::key() const
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	return KKey( m_sym, m_mod );
 #else
 	uint modSpec;
@@ -192,7 +192,7 @@ int KKeyNative::keyCodeQt() const
 
 bool KKeyNative::keyboardHasWinKey()           { return KKeyServer::keyboardHasWinKey(); }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 uint KKeyNative::modX( KKey::ModFlag modFlag ) { return KKeyServer::modX( modFlag ); }
 uint KKeyNative::accelModMaskX()               { return KKeyServer::accelModMaskX(); }
 uint KKeyNative::modXNumLock()                 { return KKeyServer::modXNumLock(); }
@@ -201,4 +201,4 @@ uint KKeyNative::modXScrollLock()              { return KKeyServer::modXScrollLo
 uint KKeyNative::modXModeSwitch()              { return KKeyServer::modXModeSwitch(); }
 #endif
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index bb46338f4..77ca61763 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -25,7 +25,7 @@
 #include <tqnamespace.h>
 #include <tqwindowdefs.h>
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32
+#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32
 
 #include "kkeyserver_x11.h"
 #include "kkeynative.h"
@@ -36,7 +36,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 # define XK_MISCELLANY
 # define XK_XKB_KEYS
 # include <X11/X.h>
@@ -48,14 +48,14 @@
 #else
 # include <kckey.h>
 # define X11_ONLY(arg)
-# define XK_ISO_Left_Tab Qt::Key_Backtab
-# define XK_BackSpace Qt::Key_Backspace
-# define XK_Sys_Req Qt::Key_SysReq
-# define XK_Caps_Lock Qt::Key_CapsLock
-# define XK_Num_Lock Qt::Key_NumLock
-# define XK_Scroll_Lock Qt::Key_ScrollLock
-# define XK_Prior Qt::Key_Prior
-# define XK_Next Qt::Key_Next
+# define XK_ISO_Left_Tab TQt::Key_Backtab
+# define XK_BackSpace TQt::Key_Backspace
+# define XK_Sys_Req TQt::Key_SysReq
+# define XK_Caps_Lock TQt::Key_CapsLock
+# define XK_Num_Lock TQt::Key_NumLock
+# define XK_Scroll_Lock TQt::Key_ScrollLock
+# define XK_Prior TQt::Key_Prior
+# define XK_Next TQt::Key_Next
 #endif
 
 namespace KKeyServer
@@ -78,7 +78,7 @@ struct ModInfo
 {
 	KKey::ModFlag mod;
 	int modQt;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	uint modX;
 #endif
 	const char* psName;
@@ -108,9 +108,9 @@ struct TransKey {
 
 static ModInfo g_rgModInfo[KKey::MOD_FLAG_COUNT] =
 {
-	{ KKey::SHIFT, Qt::SHIFT,   X11_ONLY(ShiftMask)   I18N_NOOP("Shift"), TQString() },
-	{ KKey::CTRL,  Qt::CTRL,    X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() },
-	{ KKey::ALT,   Qt::ALT,     X11_ONLY(Mod1Mask)    I18N_NOOP("Alt"), TQString() },
+	{ KKey::SHIFT, TQt::SHIFT,   X11_ONLY(ShiftMask)   I18N_NOOP("Shift"), TQString() },
+	{ KKey::CTRL,  TQt::CTRL,    X11_ONLY(ControlMask) I18N_NOOP("Ctrl"), TQString() },
+	{ KKey::ALT,   TQt::ALT,     X11_ONLY(Mod1Mask)    I18N_NOOP("Alt"), TQString() },
 	{ KKey::WIN,   KKey::QtWIN, X11_ONLY(Mod4Mask)    I18N_NOOP("Win"), TQString() }
 };
 
@@ -140,7 +140,7 @@ static const SymName g_rgSymNames[] = {
 	{ 0, 0 }
 };
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static SymVariation g_rgSymVariation[] =
 {
 	{ '/', XK_KP_Divide, false },
@@ -156,85 +156,85 @@ static SymVariation g_rgSymVariation[] =
 // These are the X equivalents to the Qt keycodes 0x1000 - 0x1026
 static const TransKey g_rgQtToSymX[] =
 {
-	{ Qt::Key_Escape,     XK_Escape },
-	{ Qt::Key_Tab,        XK_Tab },
-	{ Qt::Key_Backtab,    XK_ISO_Left_Tab },
-	{ Qt::Key_Backspace,  XK_BackSpace },
-	{ Qt::Key_Return,     XK_Return },
-	{ Qt::Key_Enter,      XK_KP_Enter },
-	{ Qt::Key_Insert,     XK_Insert },
-	{ Qt::Key_Delete,     XK_Delete },
-	{ Qt::Key_Pause,      XK_Pause },
+	{ TQt::Key_Escape,     XK_Escape },
+	{ TQt::Key_Tab,        XK_Tab },
+	{ TQt::Key_Backtab,    XK_ISO_Left_Tab },
+	{ TQt::Key_Backspace,  XK_BackSpace },
+	{ TQt::Key_Return,     XK_Return },
+	{ TQt::Key_Enter,      XK_KP_Enter },
+	{ TQt::Key_Insert,     XK_Insert },
+	{ TQt::Key_Delete,     XK_Delete },
+	{ TQt::Key_Pause,      XK_Pause },
 #ifdef sun
-	{ Qt::Key_Print,      XK_F22 },
+	{ TQt::Key_Print,      XK_F22 },
 #else
-	{ Qt::Key_Print,      XK_Print },
+	{ TQt::Key_Print,      XK_Print },
 #endif
-	{ Qt::Key_SysReq,     XK_Sys_Req },
-	{ Qt::Key_Home,       XK_Home },
-	{ Qt::Key_End,        XK_End },
-	{ Qt::Key_Left,       XK_Left },
-	{ Qt::Key_Up,         XK_Up },
-	{ Qt::Key_Right,      XK_Right },
-	{ Qt::Key_Down,       XK_Down },
+	{ TQt::Key_SysReq,     XK_Sys_Req },
+	{ TQt::Key_Home,       XK_Home },
+	{ TQt::Key_End,        XK_End },
+	{ TQt::Key_Left,       XK_Left },
+	{ TQt::Key_Up,         XK_Up },
+	{ TQt::Key_Right,      XK_Right },
+	{ TQt::Key_Down,       XK_Down },
 	{ TQt::Key_Prior,      XK_Prior },
 	{ TQt::Key_Next,       XK_Next },
-	//{ Qt::Key_Shift,      0 },
-	//{ Qt::Key_Control,    0 },
-	//{ Qt::Key_Meta,       0 },
-	//{ Qt::Key_Alt,        0 },
-	{ Qt::Key_CapsLock,   XK_Caps_Lock },
-	{ Qt::Key_NumLock,    XK_Num_Lock },
-	{ Qt::Key_ScrollLock, XK_Scroll_Lock },
-	{ Qt::Key_F1,         XK_F1 },
-	{ Qt::Key_F2,         XK_F2 },
-	{ Qt::Key_F3,         XK_F3 },
-	{ Qt::Key_F4,         XK_F4 },
-	{ Qt::Key_F5,         XK_F5 },
-	{ Qt::Key_F6,         XK_F6 },
-	{ Qt::Key_F7,         XK_F7 },
-	{ Qt::Key_F8,         XK_F8 },
-	{ Qt::Key_F9,         XK_F9 },
-	{ Qt::Key_F10,        XK_F10 },
-	{ Qt::Key_F11,        XK_F11 },
-	{ Qt::Key_F12,        XK_F12 },
-	{ Qt::Key_F13,        XK_F13 },
-	{ Qt::Key_F14,        XK_F14 },
-	{ Qt::Key_F15,        XK_F15 },
-	{ Qt::Key_F16,        XK_F16 },
-	{ Qt::Key_F17,        XK_F17 },
-	{ Qt::Key_F18,        XK_F18 },
-	{ Qt::Key_F19,        XK_F19 },
-	{ Qt::Key_F20,        XK_F20 },
-	{ Qt::Key_F21,        XK_F21 },
-	{ Qt::Key_F22,        XK_F22 },
-	{ Qt::Key_F23,        XK_F23 },
-	{ Qt::Key_F24,        XK_F24 },
-	{ Qt::Key_F25,        XK_F25 },
-	{ Qt::Key_F26,        XK_F26 },
-	{ Qt::Key_F27,        XK_F27 },
-	{ Qt::Key_F28,        XK_F28 },
-	{ Qt::Key_F29,        XK_F29 },
-	{ Qt::Key_F30,        XK_F30 },
-	{ Qt::Key_F31,        XK_F31 },
-	{ Qt::Key_F32,        XK_F32 },
-	{ Qt::Key_F33,        XK_F33 },
-	{ Qt::Key_F34,        XK_F34 },
-	{ Qt::Key_F35,        XK_F35 },
-	{ Qt::Key_Super_L,    XK_Super_L },
-	{ Qt::Key_Super_R,    XK_Super_R },
-	{ Qt::Key_Menu,       XK_Menu },
-	{ Qt::Key_Hyper_L,    XK_Hyper_L },
-	{ Qt::Key_Hyper_R,    XK_Hyper_R },
-	{ Qt::Key_Help,       XK_Help },
-	//{ Qt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11
-	//{ Qt::Key_Direction_R, XK_Direction_R },
+	//{ TQt::Key_Shift,      0 },
+	//{ TQt::Key_Control,    0 },
+	//{ TQt::Key_Meta,       0 },
+	//{ TQt::Key_Alt,        0 },
+	{ TQt::Key_CapsLock,   XK_Caps_Lock },
+	{ TQt::Key_NumLock,    XK_Num_Lock },
+	{ TQt::Key_ScrollLock, XK_Scroll_Lock },
+	{ TQt::Key_F1,         XK_F1 },
+	{ TQt::Key_F2,         XK_F2 },
+	{ TQt::Key_F3,         XK_F3 },
+	{ TQt::Key_F4,         XK_F4 },
+	{ TQt::Key_F5,         XK_F5 },
+	{ TQt::Key_F6,         XK_F6 },
+	{ TQt::Key_F7,         XK_F7 },
+	{ TQt::Key_F8,         XK_F8 },
+	{ TQt::Key_F9,         XK_F9 },
+	{ TQt::Key_F10,        XK_F10 },
+	{ TQt::Key_F11,        XK_F11 },
+	{ TQt::Key_F12,        XK_F12 },
+	{ TQt::Key_F13,        XK_F13 },
+	{ TQt::Key_F14,        XK_F14 },
+	{ TQt::Key_F15,        XK_F15 },
+	{ TQt::Key_F16,        XK_F16 },
+	{ TQt::Key_F17,        XK_F17 },
+	{ TQt::Key_F18,        XK_F18 },
+	{ TQt::Key_F19,        XK_F19 },
+	{ TQt::Key_F20,        XK_F20 },
+	{ TQt::Key_F21,        XK_F21 },
+	{ TQt::Key_F22,        XK_F22 },
+	{ TQt::Key_F23,        XK_F23 },
+	{ TQt::Key_F24,        XK_F24 },
+	{ TQt::Key_F25,        XK_F25 },
+	{ TQt::Key_F26,        XK_F26 },
+	{ TQt::Key_F27,        XK_F27 },
+	{ TQt::Key_F28,        XK_F28 },
+	{ TQt::Key_F29,        XK_F29 },
+	{ TQt::Key_F30,        XK_F30 },
+	{ TQt::Key_F31,        XK_F31 },
+	{ TQt::Key_F32,        XK_F32 },
+	{ TQt::Key_F33,        XK_F33 },
+	{ TQt::Key_F34,        XK_F34 },
+	{ TQt::Key_F35,        XK_F35 },
+	{ TQt::Key_Super_L,    XK_Super_L },
+	{ TQt::Key_Super_R,    XK_Super_R },
+	{ TQt::Key_Menu,       XK_Menu },
+	{ TQt::Key_Hyper_L,    XK_Hyper_L },
+	{ TQt::Key_Hyper_R,    XK_Hyper_R },
+	{ TQt::Key_Help,       XK_Help },
+	//{ TQt::Key_Direction_L, XK_Direction_L }, These keys don't exist in X11
+	//{ TQt::Key_Direction_R, XK_Direction_R },
 
 	{ '/',                XK_KP_Divide },
 	{ '*',                XK_KP_Multiply },
 	{ '-',                XK_KP_Subtract },
 	{ '+',                XK_KP_Add },
-	{ Qt::Key_Return,     XK_KP_Enter }
+	{ TQt::Key_Return,     XK_KP_Enter }
 #if TQT_VERSION >= 0x030100
 
 // the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
@@ -285,56 +285,56 @@ static const TransKey g_rgQtToSymX[] =
 #define XF86XK_KbdBrightnessDown	0x1008FF06  /* Keyboards may be lit     */
 // end of XF86keysyms.h
         ,
-	{ Qt::Key_Standby,    XF86XK_Standby },
-	{ Qt::Key_VolumeDown, XF86XK_AudioLowerVolume },
-	{ Qt::Key_VolumeMute, XF86XK_AudioMute },
-	{ Qt::Key_VolumeUp,   XF86XK_AudioRaiseVolume },
-	{ Qt::Key_MediaPlay,  XF86XK_AudioPlay },
-	{ Qt::Key_MediaStop,  XF86XK_AudioStop },
+	{ TQt::Key_Standby,    XF86XK_Standby },
+	{ TQt::Key_VolumeDown, XF86XK_AudioLowerVolume },
+	{ TQt::Key_VolumeMute, XF86XK_AudioMute },
+	{ TQt::Key_VolumeUp,   XF86XK_AudioRaiseVolume },
+	{ TQt::Key_MediaPlay,  XF86XK_AudioPlay },
+	{ TQt::Key_MediaStop,  XF86XK_AudioStop },
 	{ TQt::Key_MediaPrev,  XF86XK_AudioPrev },
-	{ Qt::Key_MediaNext,  XF86XK_AudioNext },
-	{ Qt::Key_HomePage,   XF86XK_HomePage },
-	{ Qt::Key_LaunchMail, XF86XK_Mail },
-	{ Qt::Key_Search,     XF86XK_Search },
-	{ Qt::Key_MediaRecord, XF86XK_AudioRecord },
-	{ Qt::Key_LaunchMedia, XF86XK_AudioMedia },
-	{ Qt::Key_Launch1,    XF86XK_Calculator },
-	{ Qt::Key_Back,       XF86XK_Back },
-	{ Qt::Key_Forward,    XF86XK_Forward },
-	{ Qt::Key_Stop,       XF86XK_Stop },
-	{ Qt::Key_Refresh,    XF86XK_Refresh },
-	{ Qt::Key_Favorites,  XF86XK_Favorites },
-	{ Qt::Key_Launch0,    XF86XK_MyComputer },
-	{ Qt::Key_OpenUrl,    XF86XK_OpenURL },
-	{ Qt::Key_Launch2,    XF86XK_Launch0 },
-	{ Qt::Key_Launch3,    XF86XK_Launch1 },
-	{ Qt::Key_Launch4,    XF86XK_Launch2 },
-	{ Qt::Key_Launch5,    XF86XK_Launch3 },
-	{ Qt::Key_Launch6,    XF86XK_Launch4 },
-	{ Qt::Key_Launch7,    XF86XK_Launch5 },
-	{ Qt::Key_Launch8,    XF86XK_Launch6 },
-	{ Qt::Key_Launch9,    XF86XK_Launch7 },
-	{ Qt::Key_LaunchA,    XF86XK_Launch8 },
-	{ Qt::Key_LaunchB,    XF86XK_Launch9 },
-	{ Qt::Key_LaunchC,    XF86XK_LaunchA },
-	{ Qt::Key_LaunchD,    XF86XK_LaunchB },
-	{ Qt::Key_LaunchE,    XF86XK_LaunchC },
-	{ Qt::Key_LaunchF,    XF86XK_LaunchD },
-	{ Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp },
-	{ Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown },
-	{ Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff },
-	{ Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp },
-	{ Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown },
+	{ TQt::Key_MediaNext,  XF86XK_AudioNext },
+	{ TQt::Key_HomePage,   XF86XK_HomePage },
+	{ TQt::Key_LaunchMail, XF86XK_Mail },
+	{ TQt::Key_Search,     XF86XK_Search },
+	{ TQt::Key_MediaRecord, XF86XK_AudioRecord },
+	{ TQt::Key_LaunchMedia, XF86XK_AudioMedia },
+	{ TQt::Key_Launch1,    XF86XK_Calculator },
+	{ TQt::Key_Back,       XF86XK_Back },
+	{ TQt::Key_Forward,    XF86XK_Forward },
+	{ TQt::Key_Stop,       XF86XK_Stop },
+	{ TQt::Key_Refresh,    XF86XK_Refresh },
+	{ TQt::Key_Favorites,  XF86XK_Favorites },
+	{ TQt::Key_Launch0,    XF86XK_MyComputer },
+	{ TQt::Key_OpenUrl,    XF86XK_OpenURL },
+	{ TQt::Key_Launch2,    XF86XK_Launch0 },
+	{ TQt::Key_Launch3,    XF86XK_Launch1 },
+	{ TQt::Key_Launch4,    XF86XK_Launch2 },
+	{ TQt::Key_Launch5,    XF86XK_Launch3 },
+	{ TQt::Key_Launch6,    XF86XK_Launch4 },
+	{ TQt::Key_Launch7,    XF86XK_Launch5 },
+	{ TQt::Key_Launch8,    XF86XK_Launch6 },
+	{ TQt::Key_Launch9,    XF86XK_Launch7 },
+	{ TQt::Key_LaunchA,    XF86XK_Launch8 },
+	{ TQt::Key_LaunchB,    XF86XK_Launch9 },
+	{ TQt::Key_LaunchC,    XF86XK_LaunchA },
+	{ TQt::Key_LaunchD,    XF86XK_LaunchB },
+	{ TQt::Key_LaunchE,    XF86XK_LaunchC },
+	{ TQt::Key_LaunchF,    XF86XK_LaunchD },
+	{ TQt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp },
+	{ TQt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown },
+	{ TQt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff },
+	{ TQt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp },
+	{ TQt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown },
 #endif
 };
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 
 //---------------------------------------------------------------------
 // Initialization
 //---------------------------------------------------------------------
 static bool g_bInitializedMods, g_bInitializedVariations, g_bInitializedKKeyLabels;
 static bool g_bMacLabels;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static uint g_modXNumLock, g_modXScrollLock, g_modXModeSwitch; 
 
 bool initializeMods()
@@ -386,7 +386,7 @@ static void initializeVariations()
 		g_rgSymVariation[i].bActive = (XKeysymToKeycode( tqt_xdisplay(), g_rgSymVariation[i].symVariation ) != 0);
 	g_bInitializedVariations = true;
 }
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 
 static void intializeKKeyLabels()
 {
@@ -416,15 +416,15 @@ bool Sym::initQt( int keyQt )
 {
 	int symQt = keyQt & 0xffff;
 
-	if( (keyQt & Qt::UNICODE_ACCEL) || symQt < 0x1000 ) {
+	if( (keyQt & TQt::UNICODE_ACCEL) || symQt < 0x1000 ) {
 		m_sym = TQChar(symQt).lower().unicode();
 		return true;
 	}
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	m_sym = symQt;
 	return true;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
 	for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ ) {
 		if( g_rgQtToSymX[i].keySymQt == symQt ) {
 			m_sym = g_rgQtToSymX[i].keySymX;
@@ -433,11 +433,11 @@ bool Sym::initQt( int keyQt )
 	}
 
 	m_sym = 0;
-	if( symQt != Qt::Key_Shift && symQt != Qt::Key_Control && symQt != Qt::Key_Alt &&
-	    symQt != Qt::Key_Meta && symQt != Qt::Key_Direction_L && symQt != Qt::Key_Direction_R )
+	if( symQt != TQt::Key_Shift && symQt != TQt::Key_Control && symQt != TQt::Key_Alt &&
+	    symQt != TQt::Key_Meta && symQt != TQt::Key_Direction_L && symQt != TQt::Key_Direction_R )
 		kdDebug(125) << "Sym::initQt( " << TQString::number(keyQt,16) << " ): failed to convert key." << endl;
 	return false;
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
         m_sym = symQt;
         return true;
 #endif
@@ -459,7 +459,7 @@ bool Sym::init( const TQString& s )
 		}
 	}
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	// search for name in KKeys array
 	for ( KKeys const *pKey  = kde_KKEYS; pKey->code != 0xffff; pKey++) {
 		if( tqstricmp( s.latin1(), pKey->name ) == 0 ) {
@@ -468,7 +468,7 @@ bool Sym::init( const TQString& s )
 		}
 	}
 	m_sym = 0;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
 	// search X list: 's' as is, all lower, first letter in caps
 	m_sym = XStringToKeysym( s.latin1() );
 	if( !m_sym ) {
@@ -490,12 +490,12 @@ int Sym::qt() const
 			return TQChar(m_sym).upper();
 		return m_sym;
 	}
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	if( m_sym < 0x3000 )
 		return m_sym;
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
 	if( m_sym < 0x3000 )
-		return m_sym | Qt::UNICODE_ACCEL;
+		return m_sym | TQt::UNICODE_ACCEL;
 
 	for( uint i = 0; i < sizeof(g_rgQtToSymX)/sizeof(TransKey); i++ )
 		if( g_rgQtToSymX[i].keySymX == m_sym )
@@ -511,7 +511,7 @@ TQString Sym::toString( bool bUserSpace ) const
 	}
 
 	// If it's a unicode character,
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	else if( m_sym < 0x1000 ) {
 #else
 	else if( m_sym < 0x3000 ) {
@@ -533,9 +533,9 @@ TQString Sym::toString( bool bUserSpace ) const
 	}
 
 	TQString s;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 	s = TQKeySequence( m_sym );
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
 	// Get X-name
 	s = XKeysymToString( m_sym );
 #endif
@@ -549,7 +549,7 @@ TQString Sym::toString() const         { return toString( true ); }
 uint Sym::getModsRequired() const
 {
 	uint mod = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	// FIXME: This might not be true on all keyboard layouts!
 	if( m_sym == XK_Sys_Req ) return KKey::ALT;
 	if( m_sym == XK_Break ) return KKey::CTRL;
@@ -580,7 +580,7 @@ uint Sym::getModsRequired() const
 
 uint Sym::getSymVariation() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	if( !g_bInitializedVariations )
 		initializeVariations();
 	for( int i = 0; g_rgSymVariation[i].sym != 0; i++ )
@@ -603,7 +603,7 @@ void Sym::capitalizeKeyname( TQString& s )
 // Public functions
 //---------------------------------------------------------------------
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 uint modX( KKey::ModFlag mod )
 {
 	if( mod == KKey::WIN && !g_bInitializedMods )
@@ -632,7 +632,7 @@ uint accelModMaskX()
 		initializeMods();
 	return ShiftMask | ControlMask | Mod1Mask | g_rgModInfo[3].modX;
 }
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 
 bool keyQtToSym( int keyQt, uint& keySym )
 {
@@ -648,10 +648,10 @@ bool keyQtToMod( int keyQt, uint& mod )
 {
 	mod = 0;
 
-	if( keyQt & Qt::SHIFT )    mod |= KKey::SHIFT;
-	if( keyQt & Qt::CTRL )     mod |= KKey::CTRL;
-	if( keyQt & Qt::ALT )      mod |= KKey::ALT;
-	if( keyQt & Qt::META ) mod |= KKey::WIN;
+	if( keyQt & TQt::SHIFT )    mod |= KKey::SHIFT;
+	if( keyQt & TQt::CTRL )     mod |= KKey::CTRL;
+	if( keyQt & TQt::ALT )      mod |= KKey::ALT;
+	if( keyQt & TQt::META ) mod |= KKey::WIN;
 
 	return true;
 }
@@ -678,7 +678,7 @@ bool modToModQt( uint mod, int& modQt )
 	return true;
 }
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 //wrapped
 bool modXToModQt( uint modX, int& modQt )
 {
@@ -688,9 +688,9 @@ bool modXToModQt( uint modX, int& modQt )
 TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s )
 {
 	int modQt = 0;
-	if (s & Qt::ShiftButton) modQt |= KKey::SHIFT;
-	if (s & Qt::ControlButton) modQt |= KKey::CTRL;
-	if (s & Qt::AltButton) modQt |= KKey::ALT;
+	if (s & TQt::ShiftButton) modQt |= KKey::SHIFT;
+	if (s & TQt::ControlButton) modQt |= KKey::CTRL;
+	if (s & TQt::AltButton) modQt |= KKey::ALT;
 	return modQt;
 }
 
@@ -699,7 +699,7 @@ bool keyboardHasWinKey() {
   return true;
 }
 
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
 
 bool modXToModQt(uint modX, int& modQt)
 {
@@ -715,7 +715,7 @@ bool modXToMod( uint , uint& )
 {
     return false;
 }
-#elif defined(Q_WS_X11)
+#elif defined(TQ_WS_X11)
 
 bool modToModX( uint mod, uint& modX )
 {
@@ -785,7 +785,7 @@ bool codeXToSym( uchar codeX, uint modX, uint& sym )
 	sym = (uint) keySym;
 	return true;
 }
-#endif //!Q_WS_WIN
+#endif //!TQ_WS_WIN
 
 static TQString modToString( uint mod, bool bUserSpace )
 {
@@ -841,7 +841,7 @@ uint stringUserToMod( const TQString& mod )
 	if( keySymQt < 0x1000 ) {
 		// For reasons unbeknownst to me, Qt converts 'a-z' to 'A-Z'.
 		// So convert it back to lowercase if SHIFT isn't held down.
-		if( keySymQt >= Qt::Key_A && keySymQt <= Qt::Key_Z && !(keyCombQt & Qt::SHIFT) )
+		if( keySymQt >= TQt::Key_A && keySymQt <= TQt::Key_Z && !(keyCombQt & TQt::SHIFT) )
 			keySymQt = tolower( keySymQt );
 		keySymX = keySymQt;
 	}
@@ -954,7 +954,7 @@ KKey Key::key() const
 	if( m_code == CODE_FOR_QT )
 		return KKey( keyCodeQt() );
 	else {
-#if defined(Q_WS_WIN) || defined(Q_WS_MACX)
+#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX)
 		return KKey();
 #else
 		uint mod;
@@ -1043,7 +1043,7 @@ void Variations::init( const KKey& key, bool bQt )
 // Ctrl+Pause => Ctrl+Break
 void KKey::simplify()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	if( m_sym == XK_Sys_Req ) {
 		m_sym = XK_Print;
 		m_mod |= ALT;
@@ -1066,5 +1066,5 @@ void KKey::simplify()
 #endif
 }
 
-#endif //Q_WS_X11 || Q_WS_WIN
+#endif //TQ_WS_X11 || TQ_WS_WIN
 
diff --git a/tdecore/kkeyserver_x11.h b/tdecore/kkeyserver_x11.h
index 90330911b..7632984e7 100644
--- a/tdecore/kkeyserver_x11.h
+++ b/tdecore/kkeyserver_x11.h
@@ -71,7 +71,7 @@ namespace KKeyServer
 		 * Initializes the symbol with the given Qt key code.
 		 * @param keyQt the qt key code
 		 * @return true if successful, false otherwise
-		 * @see Qt::Key
+		 * @see TQt::Key
 		 */
 		bool initQt( int keyQt );
 
@@ -153,7 +153,7 @@ namespace KKeyServer
 		 * @param key the key to get the data from
 		 * @param bQt true to take the Qt keycode, false
 		 *            for the native key code
-		 * @see Qt::Key
+		 * @see TQt::Key
 		 * @see KKeyNative
 		 */
 		bool init( const KKey& key, bool bQt );
@@ -162,7 +162,7 @@ namespace KKeyServer
 		 * Checks whether the key code is a native code.
 		 * @return true if native code of the window system,
 		 *         false if it is a Qt keycode
-		 * @see Qt::Key
+		 * @see TQt::Key
 		 * @see KKeyNative
 		 */
 		bool isNative() const { return m_code != CODE_FOR_QT; }
@@ -351,7 +351,7 @@ namespace KKeyServer
 	 * @param keyQt the qt key code
 	 * @param sym if successful, the symbol will be written here
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 * @see Sym
 	 */
 	TDECORE_EXPORT bool keyQtToSym( int keyQt, uint& sym );
@@ -362,7 +362,7 @@ namespace KKeyServer
 	 * @param keyQt the qt key code
 	 * @param mod if successful, the modifiers will be written here
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	TDECORE_EXPORT bool keyQtToMod( int keyQt, uint& mod );
 
@@ -371,7 +371,7 @@ namespace KKeyServer
 	 * @param sym the symbol
 	 * @param keyQt if successful, the qt key code will be written here
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 * @see Sym
 	 */
 	TDECORE_EXPORT bool symToKeyQt( uint sym, int& keyQt );
@@ -383,7 +383,7 @@ namespace KKeyServer
 	 * @param modQt the mask of Qt key code modifiers will be written here,
 	 *        if successful
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 * @see KKey
 	 */
 	TDECORE_EXPORT bool modToModQt( uint mod, int& modQt );
@@ -406,7 +406,7 @@ namespace KKeyServer
 	 * @param modQt the mask of Qt key code modifiers will be written here
 	 *        if successful
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	//wrapped for win32
 	TDECORE_EXPORT bool modXToModQt( uint modX, int& modQt );
@@ -414,7 +414,7 @@ namespace KKeyServer
 	/**
 	 * Converts the Qt-compatible button state to x11 modifier. 
 	 */
-	TDECORE_EXPORT int qtButtonStateToMod( TQ_ButtonState s );
+	TDECORE_EXPORT int qtButtonStateToMod( TQt::ButtonState s );
 
 	/**
 	 * Converts the mask of ORed X11 modifiers to
@@ -435,7 +435,7 @@ namespace KKeyServer
 	 * @param modX the mask of ORed X11 modifiers
 	 * @param symX if successful, the X11 symbol will be written here
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 * @see Sym
 	 */
 	TDECORE_EXPORT bool codeXToSym( uchar codeX, uint modX, uint& symX );
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 87a75cebd..68dc72668 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -121,8 +121,8 @@ KLibrary::~KLibrary()
 	    for ( ; it.current() ; ++it )
 		{
 		    kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl;
-		    disconnect( it.current(), TQT_SIGNAL( destroyed() ),
-				this, TQT_SLOT( slotObjectDestroyed() ) );
+		    disconnect( it.current(), TQ_SIGNAL( destroyed() ),
+				this, TQ_SLOT( slotObjectDestroyed() ) );
 		}
 	    m_objs.setAutoDelete(true);
 	    m_objs.clear();
@@ -172,8 +172,8 @@ KLibFactory* KLibrary::factory()
         return 0;
     }
 
-    connect( m_factory, TQT_SIGNAL( objectCreated( TQObject * ) ),
-             this, TQT_SLOT( slotObjectCreated( TQObject * ) ) );
+    connect( m_factory, TQ_SIGNAL( objectCreated( TQObject * ) ),
+             this, TQ_SLOT( slotObjectCreated( TQObject * ) ) );
 
     return m_factory;
 }
@@ -214,15 +214,15 @@ void KLibrary::slotObjectCreated( TQObject *obj )
   if ( m_objs.containsRef( obj ) )
       return; // we know this object already
 
-  connect( obj, TQT_SIGNAL( destroyed() ),
-           this, TQT_SLOT( slotObjectDestroyed() ) );
+  connect( obj, TQ_SIGNAL( destroyed() ),
+           this, TQ_SLOT( slotObjectDestroyed() ) );
 
   m_objs.append( obj );
 }
 
 void KLibrary::slotObjectDestroyed()
 {
-  m_objs.removeRef( TQT_TQOBJECT_CONST(sender()) );
+  m_objs.removeRef( sender() );
 
   if ( m_objs.count() == 0 )
   {
@@ -232,8 +232,8 @@ void KLibrary::slotObjectDestroyed()
     if ( !m_timer )
     {
       m_timer = new TQTimer( this, "klibrary_shutdown_timer" );
-      connect( m_timer, TQT_SIGNAL( timeout() ),
-               this, TQT_SLOT( slotTimeout() ) );
+      connect( m_timer, TQ_SIGNAL( timeout() ),
+               this, TQ_SLOT( slotTimeout() ) );
     }
 
     // as long as it's not stable make the timeout short, for debugging
@@ -447,8 +447,8 @@ KLibrary* KLibLoader::library( const char *name )
     }
     m_libs.insert( name, wrap );
 
-    connect( wrap->lib, TQT_SIGNAL( destroyed() ),
-             this, TQT_SLOT( slotLibraryDestroyed() ) );
+    connect( wrap->lib, TQ_SIGNAL( destroyed() ),
+             this, TQ_SLOT( slotLibraryDestroyed() ) );
 
     return wrap->lib;
 }
@@ -470,8 +470,8 @@ void KLibLoader::unloadLibrary( const char *libname )
 
   m_libs.remove( libname );
 
-  disconnect( wrap->lib, TQT_SIGNAL( destroyed() ),
-              this, TQT_SLOT( slotLibraryDestroyed() ) );
+  disconnect( wrap->lib, TQ_SIGNAL( destroyed() ),
+              this, TQ_SLOT( slotLibraryDestroyed() ) );
   close_pending( wrap );
 }
 
@@ -511,8 +511,8 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
   for (; it.current(); ++it) {
     wrap = it.current();
     if (wrap->lib) {
-      disconnect( wrap->lib, TQT_SIGNAL( destroyed() ),
-                  this, TQT_SLOT( slotLibraryDestroyed() ) );
+      disconnect( wrap->lib, TQ_SIGNAL( destroyed() ),
+                  this, TQ_SLOT( slotLibraryDestroyed() ) );
       KLibrary* to_delete = wrap->lib;
       wrap->lib = 0L; // unset first, because KLibrary dtor can cause
       delete to_delete; // recursive call to close_pending()
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index d9e632184..82b268c16 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -52,7 +52,7 @@ class TDECORE_EXPORT KLibrary : public TQObject
     friend class KLibLoader;
     friend class TQAsciiDict<KLibrary>;
 
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Don't create KLibrary objects on your own. Instead use KLibLoader.
@@ -143,7 +143,7 @@ class TDECORE_EXPORT KLibLoader : public TQObject
 {
     friend class KLibrary;
 
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * You should NEVER destruct an instance of KLibLoader
@@ -322,7 +322,7 @@ private:
  * The KLibFactory is used to create the components, the library has to offer.
  * The factory of KSpread for example will create instances of KSpreadDoc,
  * while the Konqueror factory will create KonqView widgets.
- * All objects created by the factory must be derived from TQObject, since QObject
+ * All objects created by the factory must be derived from TQObject, since TQObject
  * offers type safe casting.
  *
  * KLibFactory is an abstract class. Reimplement the
@@ -332,7 +332,7 @@ private:
  */
 class TDECORE_EXPORT KLibFactory : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Create a new factory.
@@ -349,7 +349,7 @@ public:
      * It is valid behavior to create different kinds of objects
      * depending on the requested @p classname. For example a koffice
      * library may usually return a pointer to KoDocument.  But
-     * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget,
+     * if asked for a "TQWidget", it could create a wrapper widget,
      * that encapsulates the Koffice specific features.
      *
      * create() automatically emits a signal objectCreated to tell
@@ -363,7 +363,7 @@ public:
      * @param args a list of arguments
      */
 
-     TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() );
+     TQObject* create( TQObject* parent = 0, const char* name = 0, const char* classname = "TQObject", const TQStringList &args = TQStringList() );
 
 signals:
     /**
@@ -382,7 +382,7 @@ protected:
      * It is valid behavior to create different kinds of objects
      * depending on the requested @p className. For example a koffice
      * library may usually return a pointer to KoDocument.  But
-     * if asked for a TQWIDGET_OBJECT_NAME_STRING, it could create a wrapper widget,
+     * if asked for a "TQWidget", it could create a wrapper widget,
      * that encapsulates the Koffice specific features.
      *
      * This function is called by #create()
@@ -392,7 +392,7 @@ protected:
      * @param args a list of arguments
      */
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                                   const char* className = TQOBJECT_OBJECT_NAME_STRING,
+                                   const char* className = "TQObject",
                                    const TQStringList &args = TQStringList() ) = 0;
 
 
diff --git a/tdecore/kmacroexpander.cpp b/tdecore/kmacroexpander.cpp
index 9cfddcc63..a2ece0a40 100644
--- a/tdecore/kmacroexpander.cpp
+++ b/tdecore/kmacroexpander.cpp
@@ -55,7 +55,7 @@ void KMacroExpanderBase::expandMacros( TQString &str )
     TQString rsts;
 
     for (pos = 0; pos < str.length(); ) {
-        if (ec != (QChar)0) {
+        if (ec != (TQChar)0) {
             if (str.unicode()[pos] != ec)
                 goto nohit;
             if (!(len = expandEscapedMacro( str, pos, rst )))
@@ -110,7 +110,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
 
     while (pos < str.length()) {
         TQChar cc( str.unicode()[pos] );
-        if (ec != (QChar)0) {
+        if (ec != (TQChar)0) {
             if (cc != ec)
                 goto nohit;
             if (!(len = expandEscapedMacro( str, pos, rst )))
@@ -160,20 +160,20 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             continue;
       nohit:
         if (state.current == singlequote) {
-            if (cc == (QChar)'\'')
+            if (cc == (TQChar)'\'')
                 state = sstack.pop();
-        } else if (cc == (QChar)'\\') {
+        } else if (cc == (TQChar)'\\') {
             // always swallow the char -> prevent anomalies due to expansion
             pos += 2;
             continue;
         } else if (state.current == dollarquote) {
-            if (cc == (QChar)'\'')
+            if (cc == (TQChar)'\'')
                 state = sstack.pop();
-        } else if (cc == (QChar)'$') {
+        } else if (cc == (TQChar)'$') {
             cc = str[++pos];
-            if (cc == (QChar)'(') {
+            if (cc == (TQChar)'(') {
                 sstack.push( state );
-                if (str[pos + 1] == (QChar)'(') {
+                if (str[pos + 1] == (TQChar)'(') {
                     Save sav = { str, pos + 2 };
                     ostack.push( sav );
                     state.current = math;
@@ -183,21 +183,21 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                     state.current = paren;
                     state.dquote = false;
                 }
-            } else if (cc == (QChar)'{') {
+            } else if (cc == (TQChar)'{') {
                 sstack.push( state );
                 state.current = subst;
             } else if (!state.dquote) {
-                if (cc == (QChar)'\'') {
+                if (cc == (TQChar)'\'') {
                     sstack.push( state );
                     state.current = dollarquote;
-                } else if (cc == (QChar)'"') {
+                } else if (cc == (TQChar)'"') {
                     sstack.push( state );
                     state.current = doublequote;
                     state.dquote = true;
                 }
             }
             // always swallow the char -> prevent anomalies due to expansion
-        } else if (cc == (QChar)'`') {
+        } else if (cc == (TQChar)'`') {
             str.replace( pos, 1, "$( " ); // add space -> avoid creating $((
             pos2 = pos += 3;
             for (;;) {
@@ -206,12 +206,12 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                     return false;
                 }
                 cc = str.unicode()[pos2];
-                if (cc == (QChar)'`')
+                if (cc == (TQChar)'`')
                     break;
-                if (cc == (QChar)'\\') {
+                if (cc == (TQChar)'\\') {
                     cc = str[++pos2];
-                    if (cc == (QChar)'$' || cc == (QChar)'`' || cc == (QChar)'\\' ||
-                        (cc == (QChar)'"' && state.dquote))
+                    if (cc == (TQChar)'$' || cc == (TQChar)'`' || cc == (TQChar)'\\' ||
+                        (cc == (TQChar)'"' && state.dquote))
                     {
                         str.remove( pos2 - 1, 1 );
                         continue;
@@ -225,25 +225,25 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
             state.dquote = false;
             continue;
         } else if (state.current == doublequote) {
-            if (cc == (QChar)'"')
+            if (cc == (TQChar)'"')
                 state = sstack.pop();
-        } else if (cc == (QChar)'\'') {
+        } else if (cc == (TQChar)'\'') {
             if (!state.dquote) {
                 sstack.push( state );
                 state.current = singlequote;
             }
-        } else if (cc == (QChar)'"') {
+        } else if (cc == (TQChar)'"') {
             if (!state.dquote) {
                 sstack.push( state );
                 state.current = doublequote;
                 state.dquote = true;
             }
         } else if (state.current == subst) {
-            if (cc == (QChar)'}')
+            if (cc == (TQChar)'}')
                 state = sstack.pop();
-        } else if (cc == (QChar)')') {
+        } else if (cc == (TQChar)')') {
             if (state.current == math) {
-                if (str[pos + 1] == (QChar)')') {
+                if (str[pos + 1] == (TQChar)')') {
                     state = sstack.pop();
                     pos += 2;
                 } else {
@@ -261,15 +261,15 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos )
                 state = sstack.pop();
             else
                 break;
-        } else if (cc == (QChar)'}') {
+        } else if (cc == (TQChar)'}') {
             if (state.current == KMacroExpander::group)
                 state = sstack.pop();
             else
                 break;
-        } else if (cc == (QChar)'(') {
+        } else if (cc == (TQChar)'(') {
             sstack.push( state );
             state.current = paren;
-        } else if (cc == (QChar)'{') {
+        } else if (cc == (TQChar)'{') {
             sstack.push( state );
             state.current = KMacroExpander::group;
         }
@@ -407,9 +407,9 @@ KMacroMapExpander<TQString,VT>::expandEscapedMacro( const TQString &str, uint po
         return 2;
     }
     uint sl, rsl, rpos;
-    if (str[pos + 1] == (QChar)'{') {
+    if (str[pos + 1] == (TQChar)'{') {
         rpos = pos + 2;
-        for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++)
+        for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++)
             if (rpos + sl >= str.length())
                 return 0;
         rsl = sl + 3;
@@ -473,9 +473,9 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
         return 2;
     }
     uint sl, rsl, rpos;
-    if (str[pos + 1] == (QChar)'{') {
+    if (str[pos + 1] == (TQChar)'{') {
         rpos = pos + 2;
-        for (sl = 0; str[rpos + sl] != (QChar)'}'; sl++)
+        for (sl = 0; str[rpos + sl] != (TQChar)'}'; sl++)
             if (rpos + sl >= str.length())
                 return 0;
         rsl = sl + 3;
@@ -494,7 +494,7 @@ KWordMacroExpander::expandEscapedMacro( const TQString &str, uint pos, TQStringL
 ////////////
 
 template<class KT,class VT>
-inline QString
+inline TQString
 TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
 {
     TQString str( ostr );
@@ -504,7 +504,7 @@ TexpandMacros( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
 }
 
 template<class KT,class VT>
-inline QString
+inline TQString
 TexpandMacrosShellQuote( const TQString &ostr, const TQMap<KT,VT> &map, TQChar c )
 {
     TQString str( ostr );
diff --git a/tdecore/kmanagerselection.cpp b/tdecore/kmanagerselection.cpp
index 2e019f73e..bfae6406a 100644
--- a/tdecore/kmanagerselection.cpp
+++ b/tdecore/kmanagerselection.cpp
@@ -41,7 +41,7 @@ DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <tqobject.h>
-#ifdef Q_WS_X11 // FIXME(E)
+#ifdef TQ_WS_X11 // FIXME(E)
 
 #include "kmanagerselection.h"
 
@@ -52,7 +52,7 @@ DEALINGS IN THE SOFTWARE.
 #include <X11/Xatom.h>
 
 class TDESelectionOwnerPrivate
-    : public QWidget
+    : public TQWidget
     {
     public:
         TDESelectionOwnerPrivate( TDESelectionOwner* owner );
@@ -65,7 +65,7 @@ class TDESelectionOwnerPrivate
 TDESelectionOwnerPrivate::TDESelectionOwnerPrivate( TDESelectionOwner* owner_P )
     :   owner( owner_P )
     {
-    kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+    kapp->installX11EventFilter( this );
     }
     
 bool TDESelectionOwnerPrivate::x11Event( XEvent* ev_P )
@@ -367,7 +367,7 @@ Atom TDESelectionOwner::xa_timestamp = None;
 
 
 class TDESelectionWatcherPrivate
-    : public QWidget
+    : public TQWidget
     {
     public:
         TDESelectionWatcherPrivate( TDESelectionWatcher* watcher );
@@ -380,7 +380,7 @@ class TDESelectionWatcherPrivate
 TDESelectionWatcherPrivate::TDESelectionWatcherPrivate( TDESelectionWatcher* watcher_P )
     :   watcher( watcher_P )
     {
-    kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+    kapp->installX11EventFilter( this );
     }
     
 bool TDESelectionWatcherPrivate::x11Event( XEvent* ev_P )
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index de294187d..59cc35c56 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -28,11 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqobject.h>
 #include <tdelibs_export.h>
 
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
-#ifdef Q_WS_X11 // FIXME(E)
+#ifdef TQ_WS_X11 // FIXME(E)
 
 #include <X11/Xlib.h>
 
@@ -50,7 +46,7 @@ class TDESelectionOwnerPrivate;
 class TDECORE_EXPORT TDESelectionOwner
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * This constructor initializes the object, but doesn't perform any
@@ -173,7 +169,7 @@ class TDESelectionWatcherPrivate;
 class TDECORE_EXPORT TDESelectionWatcher
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * This constructor initializes the object, but doesn't perform any
diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp
index a9be89e76..e78fc7335 100644
--- a/tdecore/kmountpoint.cpp
+++ b/tdecore/kmountpoint.cpp
@@ -33,6 +33,7 @@
 #include <volmgt.h>
 #endif
 #ifdef HAVE_SYS_MNTTAB_H
+#include <stdio.h>
 #include <sys/mnttab.h>
 #endif
 #ifdef HAVE_MNTENT_H
@@ -333,7 +334,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded)
     }
 
     free( mntctl_buffer );
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
     //TODO?
 #else
    STRUCT_SETMNTENT mnttab;
diff --git a/tdecore/knotifyclient.cpp b/tdecore/knotifyclient.cpp
index b1989fbf6..1eb4b42fb 100644
--- a/tdecore/knotifyclient.cpp
+++ b/tdecore/knotifyclient.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ -77,7 +77,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
   if (!kapp) return 0;
 
   // ensure tray icon is shown and positioned before sending event to notification daemon
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   XFlush(tqt_xdisplay());
 #endif
 
@@ -97,7 +97,7 @@ static int sendNotifyEvent(const TQString &message, const TQString &text,
   int uniqueId = kMax( 1, kapp->random() ); // must not be 0 -- means failure!
 
   // knotify daemon needs toplevel window
-  TQWidget* widget = TQT_TQWIDGET(TQWidget::find( (WId)winId ));
+  TQWidget* widget = TQWidget::find( (WId)winId );
   if( widget )
     winId = (int)widget->topLevelWidget()->winId();
 
diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp
index 76ad0b167..720778d4e 100644
--- a/tdecore/kprocctrl.cpp
+++ b/tdecore/kprocctrl.cpp
@@ -71,8 +71,8 @@ TDEProcessController::TDEProcessController()
 
   notifier = new TQSocketNotifier( fd[0], TQSocketNotifier::Read );
   notifier->setEnabled( true );
-  TQObject::connect( notifier, TQT_SIGNAL(activated(int)),
-                    TQT_SLOT(slotDoHousekeeping()));
+  TQObject::connect( notifier, TQ_SIGNAL(activated(int)),
+                    TQ_SLOT(slotDoHousekeeping()));
 }
 
 TDEProcessController::~TDEProcessController()
diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h
index 1cb6cc302..ac5700753 100644
--- a/tdecore/kprocctrl.h
+++ b/tdecore/kprocctrl.h
@@ -38,7 +38,7 @@ class TQSocketNotifier;
  */
 class TDECORE_EXPORT TDEProcessController : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp
index b899c637f..85e7620a4 100644
--- a/tdecore/kprocess.cpp
+++ b/tdecore/kprocess.cpp
@@ -959,15 +959,15 @@ int TDEProcess::commSetupDoneP()
     innot =  new TQSocketNotifier(in[1], TQSocketNotifier::Write, this);
     TQ_CHECK_PTR(innot);
     innot->setEnabled(false); // will be enabled when data has to be sent
-    TQObject::connect(innot, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotSendData(int)));
+    TQObject::connect(innot, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotSendData(int)));
   }
 
   if (communication & Stdout) {
     outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this);
     TQ_CHECK_PTR(outnot);
-    TQObject::connect(outnot, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotChildOutput(int)));
+    TQObject::connect(outnot, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotChildOutput(int)));
     if (communication & NoRead)
         suspend();
   }
@@ -975,8 +975,8 @@ int TDEProcess::commSetupDoneP()
   if (communication & Stderr) {
     errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this );
     TQ_CHECK_PTR(errnot);
-    TQObject::connect(errnot, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotChildError(int)));
+    TQObject::connect(errnot, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotChildError(int)));
   }
 
   return 1;
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index ae4a25af6..3e6250486 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -96,8 +96,8 @@ class KPty;
  *
  *   *proc << "my_executable";
  *   *proc << "These" << "are" << "the" << "command" << "line" << "args";
- *   TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
- *                         pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *)));
+ *   TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ *                         pointer_to_my_object, TQ_SLOT(my_objects_slot(TDEProcess *)));
  *   proc->start();
  * \endcode
  *
@@ -129,7 +129,7 @@ class KPty;
  **/
 class TDECORE_EXPORT TDEProcess : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -903,7 +903,7 @@ class KShellProcessPrivate;
 */
 class TDECORE_EXPORT KShellProcess: public TDEProcess
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp
index 7157662df..aac14a09e 100644
--- a/tdecore/kprocio.cpp
+++ b/tdecore/kprocio.cpp
@@ -67,14 +67,14 @@ KProcIO::resetAll ()
   rbi=0;
   readsignalon=writeready=true;
 
-  disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
-	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
+  disconnect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
 
-  disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
-	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
+  disconnect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
 
-  disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
-	   this, TQT_SLOT (sent (TDEProcess *)));
+  disconnect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQ_SLOT (sent (TDEProcess *)));
 
   outbuffer.clear();
 
@@ -87,17 +87,17 @@ void KProcIO::setComm (Communication comm)
 
 bool KProcIO::start (RunMode runmode, bool includeStderr)
 {
-  connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
-	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
+  connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
   
   if (includeStderr)
   {
-     connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
-              this, TQT_SLOT (received (TDEProcess *, char *, int)));
+     connect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+              this, TQ_SLOT (received (TDEProcess *, char *, int)));
   }
 
-  connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
-	   this, TQT_SLOT (sent (TDEProcess *)));
+  connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQ_SLOT (sent (TDEProcess *)));
            
   return TDEProcess::start (runmode, d->comm);
 }
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index 4e42ee533..e58e0972c 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -49,7 +49,7 @@ class TQTextCodec;
 
 class TDECORE_EXPORT KProcIO : public TDEProcess
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/kqiodevicegzip_p.cpp b/tdecore/kqiodevicegzip_p.cpp
index 0dcabed74..9ad82a653 100644
--- a/tdecore/kqiodevicegzip_p.cpp
+++ b/tdecore/kqiodevicegzip_p.cpp
@@ -37,7 +37,7 @@ KQIODeviceGZip::~KQIODeviceGZip(void)
         close();
 }
 
-bool KQIODeviceGZip::open(TQ_OpenMode mode)
+bool KQIODeviceGZip::open(int mode)
 {
     if (m_gzfile)
         close(); // One file is already open, so close it first.
@@ -78,11 +78,7 @@ void KQIODeviceGZip::flush(void)
     }
 }
 
-#ifdef USE_QT4
-qint64 KQIODeviceGZip::size(void) const
-#else // USE_QT4
 TQIODevice::Offset KQIODeviceGZip::size(void) const
-#endif // USE_QT4
 {
     return 0; // You cannot determine size!
 }
@@ -115,7 +111,7 @@ bool KQIODeviceGZip::reset(void)
     return (gzrewind(m_gzfile)>=0);
 }
 
-TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
+TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
 {
     TQ_LONG result=0;
     if (m_gzfile)
@@ -126,7 +122,7 @@ TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
     return result;
 }
 
-TQT_TQIO_LONG KQIODeviceGZip::tqwriteBlock( const char *data, TQT_TQIO_ULONG len )
+TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len )
 {
     TQ_ULONG result=0;
     if (m_gzfile)
diff --git a/tdecore/kqiodevicegzip_p.h b/tdecore/kqiodevicegzip_p.h
index 0581602c1..182b26141 100644
--- a/tdecore/kqiodevicegzip_p.h
+++ b/tdecore/kqiodevicegzip_p.h
@@ -38,22 +38,18 @@ public:
     KQIODeviceGZip(const TQString& filename);
     ~KQIODeviceGZip(void);
 
-    bool open(TQ_OpenMode mode);
+    bool open(int mode);
     void close(void);
     void flush(void);
 
-#ifdef USE_QT4
-    qint64 size(void) const;
-#else // USE_QT4
     Offset size(void) const;
-#endif // USE_QT4
     Offset  at(void) const;
     bool at(Offset pos);
     bool atEnd(void) const;
     bool reset (void);
 
-    TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen );
-    TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len );
+    TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+    TQ_LONG writeBlock( const char *data, TQ_ULONG len );
 
     int getch(void);
     int putch(int ch);
diff --git a/tdecore/krfcdate.cpp b/tdecore/krfcdate.cpp
index d9a374d0c..327736b40 100644
--- a/tdecore/krfcdate.cpp
+++ b/tdecore/krfcdate.cpp
@@ -394,7 +394,7 @@ KRFCDate::parseDateISO8601( const TQString& input_ )
   mday   = l[2].toUInt();
 
   // Z suffix means UTC.
-  if ((QChar)'Z' == timeString.at(timeString.length() - 1)) {
+  if ((TQChar)'Z' == timeString.at(timeString.length() - 1)) {
     timeString.remove(timeString.length() - 1, 1);
   }
 
diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp
index c717a1823..72fd5ae78 100644
--- a/tdecore/krootprop.cpp
+++ b/tdecore/krootprop.cpp
@@ -20,7 +20,7 @@
 #include <tqwidget.h>
 
 #include "config.h"
-#ifdef Q_WS_X11 // not needed anyway :-)
+#ifdef TQ_WS_X11 // not needed anyway :-)
 
 #include "krootprop.h"
 #include "tdeglobal.h"
diff --git a/tdecore/ksavefile.cpp b/tdecore/ksavefile.cpp
index 4ad96c0f2..d9b8867af 100644
--- a/tdecore/ksavefile.cpp
+++ b/tdecore/ksavefile.cpp
@@ -171,7 +171,7 @@ bool KSaveFile::backupFile( const TQString& qFilename, const TQString& backupDir
        else
 	   nameOnly = cFilename.mid(slash + 1);
        cBackup = TQFile::encodeName(backupDir);
-       if ( backupDir[backupDir.length()-1] != (QChar)'/' )
+       if ( backupDir[backupDir.length()-1] != (TQChar)'/' )
            cBackup += '/';
        cBackup += nameOnly;
    }
diff --git a/tdecore/kshell.cpp b/tdecore/kshell.cpp
index 7e4eda947..155ecdb1c 100644
--- a/tdecore/kshell.cpp
+++ b/tdecore/kshell.cpp
@@ -75,17 +75,17 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             c = args.unicode()[pos++];
         } while (c.isSpace());
         TQString cret;
-        if ((flags & TildeExpand) && c == (QChar)'~') {
+        if ((flags & TildeExpand) && c == (TQChar)'~') {
             uint opos = pos;
             for (; ; pos++) {
                 if (pos >= args.length())
                     break;
                 c = args.unicode()[pos];
-                if (c == (QChar)'/' || c.isSpace())
+                if (c == (TQChar)'/' || c.isSpace())
                     break;
                 if (isQuoteMeta( c )) {
                     pos = opos;
-                    c = (QChar)'~';
+                    c = (TQChar)'~';
                     goto notilde;
                 }
                 if ((flags & AbortOnMeta) && isMeta( c ))
@@ -94,7 +94,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
             TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() );
             if (ccret.isEmpty()) {
                 pos = opos;
-                c = (QChar)'~';
+                c = (TQChar)'~';
                 goto notilde;
             }
             if (pos >= args.length()) {
@@ -111,67 +111,67 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
         }
         // before the notilde label, as a tilde does not match anyway
         if (firstword) {
-            if (c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z')) {
+            if (c == (TQChar)'_' || (c >= (TQChar)'A' && c <= (TQChar)'Z') || (c >= (TQChar)'a' && c <= (TQChar)'z')) {
                 uint pos2 = pos;
                 TQChar cc;
                 do
                   cc = args[pos2++];
-                while (cc == (QChar)'_' || (cc >= (QChar)'A' && cc <= (QChar)'Z') ||
-                       (cc >= (QChar)'a' && cc <= (QChar)'z') || (cc >= (QChar)'0' && cc <= (QChar)'9'));
-                if (cc == (QChar)'=')
+                while (cc == (TQChar)'_' || (cc >= (TQChar)'A' && cc <= (TQChar)'Z') ||
+                       (cc >= (TQChar)'a' && cc <= (TQChar)'z') || (cc >= (TQChar)'0' && cc <= (TQChar)'9'));
+                if (cc == (TQChar)'=')
                     goto metaerr;
             }
         }
       notilde:
         do {
-            if (c == (QChar)'\'') {
+            if (c == (TQChar)'\'') {
                 uint spos = pos;
                 do {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
-                } while (c != (QChar)'\'');
+                } while (c != (TQChar)'\'');
                 cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string();
-            } else if (c == (QChar)'"') {
+            } else if (c == (TQChar)'"') {
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
-                    if (c == (QChar)'"')
+                    if (c == (TQChar)'"')
                         break;
-                    if (c == (QChar)'\\') {
+                    if (c == (TQChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
                         c = args.unicode()[pos++];
-                        if (c != (QChar)'"' && c != (QChar)'\\' &&
-                            !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')))
-                            cret += (QChar)'\\';
-                    } else if ((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))
+                        if (c != (TQChar)'"' && c != (TQChar)'\\' &&
+                            !((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`')))
+                            cret += (TQChar)'\\';
+                    } else if ((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`'))
                         goto metaerr;
                     cret += c;
                 }
-            } else if (c == (QChar)'$' && args[pos] == (QChar)'\'') {
+            } else if (c == (TQChar)'$' && args[pos] == (TQChar)'\'') {
                 pos++;
                 for (;;) {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
-                    if (c == (QChar)'\'')
+                    if (c == (TQChar)'\'')
                         break;
-                    if (c == (QChar)'\\') {
+                    if (c == (TQChar)'\\') {
                         if (pos >= args.length())
                             goto quoteerr;
                         c = args.unicode()[pos++];
                         switch (c) {
-                        case 'a': cret += (QChar)'\a'; break;
-                        case 'b': cret += (QChar)'\b'; break;
-                        case 'e': cret += (QChar)'\033'; break;
-                        case 'f': cret += (QChar)'\f'; break;
-                        case 'n': cret += (QChar)'\n'; break;
-                        case 'r': cret += (QChar)'\r'; break;
-                        case 't': cret += (QChar)'\t'; break;
-                        case '\\': cret += (QChar)'\\'; break;
-                        case '\'': cret += (QChar)'\''; break;
+                        case 'a': cret += (TQChar)'\a'; break;
+                        case 'b': cret += (TQChar)'\b'; break;
+                        case 'e': cret += (TQChar)'\033'; break;
+                        case 'f': cret += (TQChar)'\f'; break;
+                        case 'n': cret += (TQChar)'\n'; break;
+                        case 'r': cret += (TQChar)'\r'; break;
+                        case 't': cret += (TQChar)'\t'; break;
+                        case '\\': cret += (TQChar)'\\'; break;
+                        case '\'': cret += (TQChar)'\''; break;
                         case 'c': cret += args[pos++] & 31; break;
                         case 'x':
                           {
@@ -189,11 +189,11 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                             break;
                           }
                         default:
-                            if (c >= (QChar)'0' && c <= (QChar)'7') {
+                            if (c >= (TQChar)'0' && c <= (TQChar)'7') {
                                 int hv = c - '0';
                                 for (int i = 0; i < 2; i++) {
                                     c = args[pos];
-                                    if (c < (QChar)'0' || c > (QChar)'7')
+                                    if (c < (TQChar)'0' || c > (TQChar)'7')
                                         break;
                                     hv = hv * 8 + (c - '0');
                                     pos++;
@@ -209,7 +209,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err )
                         cret += c;
                 }
             } else {
-                if (c == (QChar)'\\') {
+                if (c == (TQChar)'\\') {
                     if (pos >= args.length())
                         goto quoteerr;
                     c = args.unicode()[pos++];
@@ -354,7 +354,7 @@ TQString KShell::joinArgsDQ( const TQStringList &args )
 
 TQString KShell::tildeExpand( const TQString &fname )
 {
-    if (fname[0] == (QChar)'~') {
+    if (fname[0] == (TQChar)'~') {
         int pos = fname.find( '/' );
         if (pos < 0)
             return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() );
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index 541117500..0ef703208 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -40,7 +40,7 @@ class KSimpleConfigPrivate;
  */
 class TDECORE_EXPORT KSimpleConfig : public TDEConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index 3861b52d2..7d9cfa70c 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -52,11 +52,17 @@
 // debug
 #include <sys/ioctl.h>
 
+#ifdef Q_OS_SOLARIS
+#include <sys/filio.h> /* FIONREAD is defined here */
+#endif /* solaris */
+
 #ifdef HAVE_INOTIFY
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/syscall.h>
+#ifdef Q_OS_LINUX
 #include <linux/types.h>
+#endif /* Linux */
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
 #include <sys/inotify.h>
@@ -207,7 +213,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
   : rescan_timer(0, "KSimpleDirWatchPrivate::rescan_timer")
 {
   timer = new TQTimer(this, "KSimpleDirWatchPrivate::timer");
-  connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan()));
+  connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan()));
   freq = 3600000; // 1 hour as upper bound
   statEntries = 0;
   delayRemove = false;
@@ -221,7 +227,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
 
   // used for FAM and DNOTIFY
   rescan_all = false;
-  connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan()));
+  connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan()));
 
 #ifdef HAVE_FAM
   // It's possible that FAM server can't be started
@@ -230,8 +236,8 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
     use_fam=true;
     sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc),
 			      TQSocketNotifier::Read, this);
-    connect( sn, TQT_SIGNAL(activated(int)),
- 	     this, TQT_SLOT(famEventReceived()) );
+    connect( sn, TQ_SIGNAL(activated(int)),
+ 	     this, TQ_SLOT(famEventReceived()) );
   }
   else {
     kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl;
@@ -267,7 +273,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
     fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC);
 
     mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this );
-    connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) );
+    connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) );
   }
 #endif
 
@@ -301,7 +307,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
     fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL));
     fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL));
     mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this);
-    connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated()));
+    connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated()));
     // Install the signal handler only once
     if ( dnotify_signal == 0 )
     {
@@ -1212,7 +1218,7 @@ void KSimpleDirWatchPrivate::emitEvent(Entry* e, int event, const TQString &file
     else
 #ifdef Q_OS_UNIX
       path += "/" + fileName;
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
       //current drive is passed instead of /
       path += TQDir::currentDirPath().left(2) + "/" + fileName;
 #endif
@@ -1366,7 +1372,7 @@ void KSimpleDirWatchPrivate::slotRescan()
   if ( timerRunning )
     timer->start(freq);
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed()));
 }
 
 bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename )
@@ -1415,7 +1421,7 @@ void KSimpleDirWatchPrivate::famEventReceived()
       checkFAMEvent(&fe);
   }
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed()));
 }
 
 void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe)
@@ -1501,10 +1507,14 @@ void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe)
             removeEntry(0,e->path,sub_entry); // <e> can be invalid here!!
             sub_entry->m_status = Normal;
             if (!useFAM(sub_entry))
+            {
 #ifdef HAVE_INOTIFY
               if (!useINotify(sub_entry ))
 #endif
+              {
                 useStat(sub_entry);
+              }
+            }
           }
           break;
         }
diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h
index dd6ccf2ec..41934aa26 100644
--- a/tdecore/ksimpledirwatch.h
+++ b/tdecore/ksimpledirwatch.h
@@ -65,7 +65,7 @@ class KSimpleDirWatchPrivate;
   */
 class TDEIO_EXPORT KSimpleDirWatch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
     
   public:
    /**
diff --git a/tdecore/ksimpledirwatch_p.h b/tdecore/ksimpledirwatch_p.h
index cf1288064..7c6986d1a 100644
--- a/tdecore/ksimpledirwatch_p.h
+++ b/tdecore/ksimpledirwatch_p.h
@@ -23,7 +23,7 @@
  */
 class KSimpleDirWatchPrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   enum entryStatus { Normal = 0, NonExistent };
diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp
index 3f4886b8a..8de28f476 100644
--- a/tdecore/ksock.cpp
+++ b/tdecore/ksock.cpp
@@ -140,7 +140,7 @@ void TDESocket::enableRead( bool _state )
 	  if ( !d->readNotifier  )
 		{
 		  d->readNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Read );
-		  TQObject::connect( d->readNotifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRead(int) ) );
+		  TQObject::connect( d->readNotifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRead(int) ) );
 		}
 	  else
 	    d->readNotifier->setEnabled( true );
@@ -156,8 +156,8 @@ void TDESocket::enableWrite( bool _state )
 	  if ( !d->writeNotifier )
 		{
 		  d->writeNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Write );
-		  TQObject::connect( d->writeNotifier, TQT_SIGNAL( activated(int) ), this,
-							TQT_SLOT( slotWrite(int) ) );
+		  TQObject::connect( d->writeNotifier, TQ_SIGNAL( activated(int) ), this,
+							TQ_SLOT( slotWrite(int) ) );
 		}
 	  else
 	    d->writeNotifier->setEnabled( true );
@@ -357,7 +357,7 @@ bool TDEServerSocket::bindAndListen(bool suppressFailureMessages)
 
   sock = d->ks->fd();
 
-  connect( d->ks->readNotifier(), TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) );
+  connect( d->ks->readNotifier(), TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) );
   return true;
 }
 
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 31ca099e6..e56b0efbb 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -22,10 +22,6 @@
 
 #include "tdelibs_export.h"
 
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
 #ifdef Q_OS_UNIX
 
 #include <tqobject.h>
@@ -90,7 +86,7 @@ class TDEServerSocketPrivate;
  */
 class TDECORE_EXPORT TDESocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a TDESocket with the provided file descriptor.
@@ -253,7 +249,7 @@ private:
 */
 class TDECORE_EXPORT TDEServerSocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructor.
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index d3eb62d0d..f523fd980 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -45,7 +45,7 @@ class TDESocketAddressPrivate;
  */
 class TDECORE_EXPORT TDESocketAddress: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   /**
    * Creates an empty class
@@ -232,7 +232,7 @@ class KInetSocketAddressPrivate;
  */
 class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Default constructor. Does nothing
@@ -583,7 +583,7 @@ class KUnixSocketAddressPrivate;
  */
 class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Default constructor
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp
index 888ca5bc2..b7d41d136 100644
--- a/tdecore/kstandarddirs.cpp
+++ b/tdecore/kstandarddirs.cpp
@@ -143,7 +143,7 @@ bool TDEStandardDirs::isRestrictedResource(const char *type, const TQString& rel
 void TDEStandardDirs::applyDataRestrictions(const TQString &relPath) const
 {
    TQString key;
-   int i = relPath.find(QChar('/'));
+   int i = relPath.find(TQChar('/'));
    if (i != -1)
       key = "data_"+relPath.left(i);
    else
@@ -188,8 +188,8 @@ void TDEStandardDirs::addPrefix( const TQString& _dir, bool priority )
 	return;
 
     TQString dir = _dir;
-    if (dir.at(dir.length() - 1) != QChar('/'))
-	dir += QChar('/');
+    if (dir.at(dir.length() - 1) != TQChar('/'))
+	dir += TQChar('/');
 
     if (!prefixes.contains(dir)) {
         priorityAdd(prefixes, dir, priority);
@@ -208,8 +208,8 @@ void TDEStandardDirs::addXdgConfigPrefix( const TQString& _dir, bool priority )
 	return;
 
     TQString dir = _dir;
-    if (dir.at(dir.length() - 1) != QChar('/'))
-	dir += QChar('/');
+    if (dir.at(dir.length() - 1) != TQChar('/'))
+	dir += TQChar('/');
 
     if (!d->xdgconf_prefixes.contains(dir)) {
         priorityAdd(d->xdgconf_prefixes, dir, priority);
@@ -228,8 +228,8 @@ void TDEStandardDirs::addXdgDataPrefix( const TQString& _dir, bool priority )
 	return;
 
     TQString dir = _dir;
-    if (dir.at(dir.length() - 1) != QChar('/'))
-	dir += QChar('/');
+    if (dir.at(dir.length() - 1) != TQChar('/'))
+	dir += TQChar('/');
 
     if (!d->xdgdata_prefixes.contains(dir)) {
 	priorityAdd(d->xdgdata_prefixes, dir, priority);
@@ -270,8 +270,8 @@ bool TDEStandardDirs::addResourceType( const char *type,
 	relatives.insert(type, rels);
     }
     TQString copy = relativename;
-    if (copy.at(copy.length() - 1) != QChar('/'))
-	copy += QChar('/');
+    if (copy.at(copy.length() - 1) != TQChar('/'))
+	copy += TQChar('/');
     if (!rels->contains(copy)) {
         if (priority)
 	    rels->prepend(copy);
@@ -300,8 +300,8 @@ bool TDEStandardDirs::addResourceDir( const char *type,
 	absolutes.insert(type, paths);
     }
     TQString copy = absdir;
-    if (copy.at(copy.length() - 1) != QChar('/'))
-      copy += QChar('/');
+    if (copy.at(copy.length() - 1) != TQChar('/'))
+      copy += TQChar('/');
 
     if (!paths->contains(copy)) {
         if (priority)
@@ -388,7 +388,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type,
             if (reldir.endsWith("/"))
                list.append(reldir);
             else
-               list.append(reldir+QChar('/'));
+               list.append(reldir+TQChar('/'));
         }
         return list;
     }
@@ -403,7 +403,7 @@ TQStringList TDEStandardDirs::findDirs( const char *type,
          it != candidates.end(); ++it) {
         testdir.setPath(*it + reldir);
         if (testdir.exists())
-            list.append(testdir.absPath() + QChar('/'));
+            list.append(testdir.absPath() + TQChar('/'));
     }
 
     return list;
@@ -427,14 +427,14 @@ TQString TDEStandardDirs::findResourceDir( const char *type,
     for (TQStringList::ConstIterator it = candidates.begin();
       it != candidates.end(); ++it) {
       if (exists(*it + filename)) {
-#ifdef Q_WS_WIN //this ensures we're using installed .la files
+#ifdef TQ_WS_WIN //this ensures we're using installed .la files
           if ((*it).isEmpty() && filename.right(3)==".la") {
 #ifndef NDEBUG
               fprintf(stderr, "TDEStandardDirs::findResourceDir() found .la in cwd: skipping. (fname=%s)\n", filename.ascii());
 #endif
               continue;
           }
-#endif //Q_WS_WIN
+#endif //TQ_WS_WIN
           return *it;
       }
     }
@@ -451,7 +451,7 @@ bool TDEStandardDirs::exists(const TQString &fullPath)
 {
     KDE_struct_stat buff;
     if ((access(TQFile::encodeName(fullPath), R_OK) == 0) && (KDE_stat( TQFile::encodeName(fullPath), &buff ) == 0)) {
-	if (fullPath.at(fullPath.length() - 1) != QChar('/')) {
+	if (fullPath.at(fullPath.length() - 1) != TQChar('/')) {
 	    if (S_ISREG( buff.st_mode ))
 		return true;
 	}
@@ -480,10 +480,10 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
     if (!dp)
       return;
 
-#ifdef Q_WS_WIN
-    assert(path.at(path.length() - 1) == QChar('/') || path.at(path.length() - 1) == QChar('\\'));
+#ifdef TQ_WS_WIN
+    assert(path.at(path.length() - 1) == TQChar('/') || path.at(path.length() - 1) == TQChar('\\'));
 #else
-    assert(path.at(path.length() - 1) == QChar('/'));
+    assert(path.at(path.length() - 1) == TQChar('/'));
 #endif
 
     struct dirent *ep;
@@ -508,7 +508,7 @@ static void lookupDirectory(const TQString& path, const TQString &relPart,
       }
       if ( recursive ) {
 	if ( S_ISDIR( buff.st_mode )) {
-	  lookupDirectory(pathfn + QChar('/'), relPart + fn + QChar('/'), regexp, list, relList, recursive, unique);
+	  lookupDirectory(pathfn + TQChar('/'), relPart + fn + TQChar('/'), regexp, list, relList, recursive, unique);
 	}
         if (!regexp.exactMatch(fn))
 	  continue; // No match
@@ -560,7 +560,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
     if (relpath.length())
     {
-       int slash = relpath.find(QChar('/'));
+       int slash = relpath.find(TQChar('/'));
        if (slash < 0)
 	   rest = relpath.left(relpath.length() - 1);
        else {
@@ -571,10 +571,10 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 
     if (prefix.isEmpty()) //for sanity
       return;
-#ifdef Q_WS_WIN
-    assert(prefix.at(prefix.length() - 1) == QChar('/') || prefix.at(prefix.length() - 1) == QChar('\\'));
+#ifdef TQ_WS_WIN
+    assert(prefix.at(prefix.length() - 1) == TQChar('/') || prefix.at(prefix.length() - 1) == TQChar('\\'));
 #else
-    assert(prefix.at(prefix.length() - 1) == QChar('/'));
+    assert(prefix.at(prefix.length() - 1) == TQChar('/'));
 #endif
     KDE_struct_stat buff;
 
@@ -594,7 +594,7 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 	while( ( ep = readdir( dp ) ) != 0L )
 	    {
 		TQString fn( TQFile::decodeName(ep->d_name));
-		if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == QChar('~'))
+		if (fn == _dot || fn == _dotdot || fn.at(fn.length() - 1) == TQChar('~'))
 		    continue;
 
 		if ( !pathExp.exactMatch(fn) )
@@ -606,15 +606,15 @@ static void lookupPrefix(const TQString& prefix, const TQString& relpath,
 		    continue; // Couldn't stat (e.g. no permissions)
 		}
 		if ( S_ISDIR( buff.st_mode ))
-		    lookupPrefix(fn + QChar('/'), rest, rfn + QChar('/'), regexp, list, relList, recursive, unique);
+		    lookupPrefix(fn + TQChar('/'), rest, rfn + TQChar('/'), regexp, list, relList, recursive, unique);
 	    }
 
 	closedir( dp );
     } else {
         // Don't stat, if the dir doesn't exist we will find out
         // when we try to open it.
-        lookupPrefix(prefix + path + QChar('/'), rest,
-                     relPart + path + QChar('/'), regexp, list,
+        lookupPrefix(prefix + path + TQChar('/'), rest,
+                     relPart + path + TQChar('/'), regexp, list,
                      relList, recursive, unique);
     }
 }
@@ -754,7 +754,7 @@ void TDEStandardDirs::createSpecialResource(const char *type)
          }
       }
    }
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
    if (relink)
    {
       if (!makeDir(dir, 0700))
@@ -789,7 +789,7 @@ void TDEStandardDirs::createSpecialResource(const char *type)
       }
    }
 #endif
-   addResourceDir(type, dir+QChar('/'));
+   addResourceDir(type, dir+TQChar('/'));
 }
 
 TQStringList TDEStandardDirs::resourceDirs(const char *type) const
@@ -904,9 +904,9 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr )
     {
 	p = tokens[ i ];
 
-        if ( p[ 0 ] == QChar('~') )
+        if ( p[ 0 ] == TQChar('~') )
         {
-            int len = p.find( QChar('/') );
+            int len = p.find( TQChar('/') );
             if ( len == -1 )
                 len = p.length();
             if ( len == 1 )
@@ -932,7 +932,7 @@ TQStringList TDEStandardDirs::systemPaths( const TQString& pstr )
 TQString TDEStandardDirs::findExe( const TQString& appname,
 				const TQString& pstr, bool ignore)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     TQString real_appname = appname + ".exe";
 #else
     TQString real_appname = appname;
@@ -981,7 +981,7 @@ TQString TDEStandardDirs::findExe( const TQString& appname,
 int TDEStandardDirs::findAllExe( TQStringList& list, const TQString& appname,
 			const TQString& pstr, bool ignore )
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     TQString real_appname = appname + ".exe";
 #else
     TQString real_appname = appname;
@@ -1183,8 +1183,8 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
     uint len = target.length();
 
     // append trailing slash if missing
-    if (dir.at(len - 1) != QChar('/'))
-        target += QChar('/');
+    if (dir.at(len - 1) != TQChar('/'))
+        target += TQChar('/');
 
     TQString base("");
     uint i = 1;
@@ -1192,7 +1192,7 @@ bool TDEStandardDirs::makeDir(const TQString& dir, int mode)
     while( i < len )
     {
         KDE_struct_stat st;
-        int pos = target.find(QChar('/'), i);
+        int pos = target.find(TQChar('/'), i);
         base += target.mid(i - 1, pos - i + 1);
         TQCString baseEncoded = TQFile::encodeName(base);
         // bail out if we encountered a problem
@@ -1259,7 +1259,7 @@ TQString TDEStandardDirs::kfsstnd_defaultprefix()
    TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self();
    if (!s->defaultprefix.isEmpty())
       return s->defaultprefix;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
    s->defaultprefix = readEnvPath("TDEDIR");
    if (s->defaultprefix.isEmpty()) {
       s->defaultprefix = TQFile::decodeName("c:\\kde");
@@ -1279,7 +1279,7 @@ TQString TDEStandardDirs::kfsstnd_defaultbindir()
    TDEStandardDirsSingleton* s = TDEStandardDirsSingleton::self();
    if (!s->defaultbindir.isEmpty())
       return s->defaultbindir;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
    s->defaultbindir = kfsstnd_defaultprefix() + TQString::fromLatin1("/bin");
 #else //UNIX
    s->defaultbindir = __TDE_BINDIR;
@@ -1340,15 +1340,15 @@ void TDEStandardDirs::addKDEDefaults()
     }
     if (!localKdeDir.isEmpty())
     {
-       if (localKdeDir[localKdeDir.length()-1] != QChar('/'))
-          localKdeDir += QChar('/');
+       if (localKdeDir[localKdeDir.length()-1] != TQChar('/'))
+          localKdeDir += TQChar('/');
     }
     else
     {
        localKdeDir =  TQDir::homeDirPath() + "/.trinity/";
     }
 
-    if (localKdeDir != QString("-/"))
+    if (localKdeDir != TQString("-/"))
     {
         localKdeDir = KShell::tildeExpand(localKdeDir);
         addPrefix(localKdeDir);
@@ -1374,7 +1374,7 @@ void TDEStandardDirs::addKDEDefaults()
     {
 	xdgdirList.clear();
         xdgdirList.append("/etc/xdg");
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
         xdgdirList.append(kfsstnd_defaultprefix() + "/etc/xdg");
 #else
         xdgdirList.append(KDESYSCONFDIR "/xdg");
@@ -1384,8 +1384,8 @@ void TDEStandardDirs::addKDEDefaults()
     TQString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
     if (!localXdgDir.isEmpty())
     {
-       if (localXdgDir[localXdgDir.length()-1] != QChar('/'))
-          localXdgDir += QChar('/');
+       if (localXdgDir[localXdgDir.length()-1] != TQChar('/'))
+          localXdgDir += TQChar('/');
     }
     else
     {
@@ -1416,8 +1416,8 @@ void TDEStandardDirs::addKDEDefaults()
            it != tdedirList.end(); ++it)
         {
            TQString dir = *it;
-           if (dir[dir.length()-1] != QChar('/'))
-             dir += QChar('/');
+           if (dir[dir.length()-1] != TQChar('/'))
+             dir += TQChar('/');
            xdgdirList.append(dir+"share/");
         }
 
@@ -1428,8 +1428,8 @@ void TDEStandardDirs::addKDEDefaults()
     localXdgDir = readEnvPath("XDG_DATA_HOME");
     if (!localXdgDir.isEmpty())
     {
-       if (localXdgDir[localXdgDir.length()-1] != QChar('/'))
-          localXdgDir += QChar('/');
+       if (localXdgDir[localXdgDir.length()-1] != TQChar('/'))
+          localXdgDir += TQChar('/');
     }
     else
     {
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index 5f73c6f7e..e6fef9350 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -419,8 +419,8 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
       return false;
 
    // Patterns like "Makefile*"
-   if ( pattern[ pattern_len - 1 ] == (QChar)'*' && len + 1 >= pattern_len ) {
-      if ( pattern[ 0 ] == (QChar)'*' )
+   if ( pattern[ pattern_len - 1 ] == (TQChar)'*' && len + 1 >= pattern_len ) {
+      if ( pattern[ 0 ] == (TQChar)'*' )
       {
          return filename.find(pattern.mid(1, pattern_len - 2)) != -1;
       }
@@ -434,7 +434,7 @@ bool KStringHandler::matchFileName( const TQString& filename, const TQString& pa
    }
 
    // Patterns like "*~", "*.extension"
-   if ( pattern[ 0 ] == (QChar)'*' && len + 1 >= pattern_len )
+   if ( pattern[ 0 ] == (TQChar)'*' && len + 1 >= pattern_len )
    {
      const TQChar *c1 = pattern.unicode() + pattern_len - 1;
      const TQChar *c2 = filename.unicode() + len - 1;
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index 3436cdabb..999446b7c 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -245,7 +245,7 @@ TQDateTime KTimezone::convert(const KTimezone *newZone, const TQDateTime &dateTi
     ::setenv("TZ", newZone->name().utf8(), 1);
     tzset();
     TQDateTime remoteTime;
-    remoteTime.setTime_t(utc, Qt::LocalTime);
+    remoteTime.setTime_t(utc, TQt::LocalTime);
 
     // Now restore things
     if (!originalZone)
@@ -280,7 +280,7 @@ TQString KTimezone::name() const
     return m_name;
 }
 
-int KTimezone::offset(Qt::TimeSpec basisSpec) const
+int KTimezone::offset(TQt::TimeSpec basisSpec) const
 {
     char *originalZone = ::getenv("TZ");
 
@@ -290,7 +290,7 @@ int KTimezone::offset(Qt::TimeSpec basisSpec) const
     // Set the timezone and find out what time it is there compared to the basis.
     ::setenv("TZ", m_name.utf8(), 1);
     tzset();
-    TQDateTime remoteTime = TQDateTime::currentDateTime(Qt::LocalTime);
+    TQDateTime remoteTime = TQDateTime::currentDateTime(TQt::LocalTime);
     int offset = remoteTime.secsTo(basisTime);
 
     // Now restore things
@@ -507,7 +507,7 @@ const KTimezone *KTimezones::local()
         // Compute the MD5 sum of /etc/localtime.
         KMD5 context("");
         context.reset();
-        context.update(TQT_TQIODEVICE_OBJECT(f));
+        context.update(f);
         TQIODevice::Offset referenceSize = f.size();
         TQString referenceMd5Sum = context.hexDigest();
         f.close();
@@ -526,7 +526,7 @@ const KTimezone *KTimezones::local()
                     {
                         // Only do the heavy lifting for file sizes which match.
                         context.reset();
-                        context.update(TQT_TQIODEVICE_OBJECT(f));
+                        context.update(f);
                         candidateMd5Sum = context.hexDigest();
                     }
                     f.close();
@@ -605,7 +605,7 @@ const KTimezone *KTimezones::local()
         for (ZoneMap::Iterator it = m_zones->begin(); it != m_zones->end(); ++it)
         {
             KTimezone *zone = it.data();
-            int candidateOffset = QABS(zone->offset(Qt::LocalTime));
+            int candidateOffset = TQABS(zone->offset(TQt::LocalTime));
             if (zone->parse(matcher) && matcher.test() && (candidateOffset < bestOffset))
             {
                 // kdError() << "local=" << zone->name() << endl;
diff --git a/tdecore/ktimezones.h b/tdecore/ktimezones.h
index 339cbf5bf..bcb1e7a99 100644
--- a/tdecore/ktimezones.h
+++ b/tdecore/ktimezones.h
@@ -156,7 +156,7 @@ public:
      *
      * @return offset in seconds.
      */
-    int offset(Qt::TimeSpec basisSpec = Qt::UTC) const;
+    int offset(TQt::TimeSpec basisSpec = TQt::UTC) const;
 
     /**
      * Returns the offset of the given timezone to UTC at the given
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 12c9c1297..8966063d1 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -38,7 +38,7 @@
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <twin.h> 
 #include <tdestartupinfo.h> 
 #endif
@@ -47,12 +47,12 @@
 #include "kdebug.h"
 #include "kuniqueapplication.h"
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <netwm.h> 
 #include <X11/Xlib.h> 
 #define DISPLAY "DISPLAY"
 #else
-#  ifdef Q_WS_QWS
+#  ifdef TQ_WS_QWS
 #    define DISPLAY "QWS_DISPLAY"
 #  else
 #    define DISPLAY "DISPLAY"
@@ -96,7 +96,7 @@ KUniqueApplication::start()
     return true;
   s_uniqueTestDone = true;
   addCmdLineOptions(); // Make sure to add cmd line options
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   s_nofork = true;
 #else
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs("kuniqueapp");
@@ -118,7 +118,7 @@ KUniqueApplication::start()
      // Check to make sure that we're actually able to register with the DCOP
      // server.
 
-#ifndef Q_WS_WIN //TODO
+#ifndef TQ_WS_WIN //TODO
      if(dcopClient()->registerAs(appName, false).isEmpty()) {
         startKdeinit();
         if(dcopClient()->registerAs(appName, false).isEmpty()) {
@@ -184,7 +184,7 @@ KUniqueApplication::start()
            ::write(fd[1], &result, 1);
            ::close(fd[1]);
 #if 0
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
            // say we're up and running ( probably no new window will appear )
            TDEStartupInfoId id;
            if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
@@ -209,7 +209,7 @@ KUniqueApplication::start()
      }
 
      {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
          TDEStartupInfoId id;
          if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
              id.initId( kapp->startupId());
@@ -272,7 +272,7 @@ KUniqueApplication::start()
      }
 
      TQCString new_asn_id;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
      TDEStartupInfoId id;
      if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
          id.initId( kapp->startupId());
@@ -324,18 +324,18 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
 
   if (s_nofork) {
     // Can't call newInstance directly from the constructor since it's virtual...
-    TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) );
   }
   else {
     // Force to handle DCOP requests (newInstance call)
-    TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed()));
   }
 }
 
 
-#ifdef Q_WS_X11
-KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
-		Qt::HANDLE colormap, bool allowStyles, bool configUnique)
+#ifdef TQ_WS_X11
+KUniqueApplication::KUniqueApplication(Display *display, TQt::HANDLE visual,
+		TQt::HANDLE colormap, bool allowStyles, bool configUnique)
   : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
     DCOPObject(TDECmdLineArgs::about->appName())
 {
@@ -345,11 +345,11 @@ KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
 
   if (s_nofork) {
     // Can't call newInstance directly from the constructor since it's virtual...
-    TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) );
   }
   else {
     // Force to handle DCOP requests (newInstance call)
-    TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed()));
   }
 }
 #endif
@@ -380,14 +380,14 @@ void KUniqueApplication::newInstanceNoFork()
   if (dcopClient()->isSuspended())
   {
     // Try again later.
-    TQTimer::singleShot( 200, this, TQT_SLOT(newInstanceNoFork()) );
+    TQTimer::singleShot( 200, this, TQ_SLOT(newInstanceNoFork()) );
     return;
   }
   
   s_handleAutoStarted = false;
   newInstance();
   d->firstInstance = false;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   // KDE4 remove
   // A hack to make startup notification stop for apps which override newInstance()
   // and reuse an already existing window there, but use KWin::activateWindow()
@@ -421,7 +421,7 @@ KUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data)
   d->requestList.append(request);
   if (!d->processingRequest)
   {
-     TQTimer::singleShot(0, this, TQT_SLOT(processDelayed()));
+     TQTimer::singleShot(0, this, TQ_SLOT(processDelayed()));
   }
 }
 
@@ -431,7 +431,7 @@ KUniqueApplication::processDelayed()
   if (dcopClient()->isSuspended())
   {
     // Try again later.
-    TQTimer::singleShot( 200, this, TQT_SLOT(processDelayed()));
+    TQTimer::singleShot( 200, this, TQ_SLOT(processDelayed()));
     return;
   }
   d->processingRequest = true;
@@ -453,7 +453,7 @@ KUniqueApplication::processDelayed()
        s_handleAutoStarted = false;
        int exitCode = newInstance();
        d->firstInstance = false;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
        if( s_handleAutoStarted )
            TDEStartupInfo::handleAutoAppStartedSending(); // KDE4 remove?
 #endif
@@ -481,7 +481,7 @@ int KUniqueApplication::newInstance()
     if ( mainWidget() )
     {
       mainWidget()->show();
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     // This is the line that handles window activation if necessary,
     // and what's important, it does it properly. If you reimplement newInstance(),
     // and don't call the inherited one, use this (but NOT when newInstance()
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index 3b7bd8d6e..6368b53ac 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -47,7 +47,7 @@ class KUniqueApplicationPrivate;
  */
 class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor. Takes command line arguments from TDECmdLineArgs
@@ -68,7 +68,7 @@ public:
 		      bool GUIenabled=true,
 		      bool configUnique=false);
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   /**
    * Constructor. Takes command line arguments from TDECmdLineArgs
    *
@@ -90,8 +90,8 @@ public:
    * @since KDE 3.3
    */
   KUniqueApplication( Display *display,
-		      Qt::HANDLE visual=0,
-		      Qt::HANDLE colormap=0,
+		      TQt::HANDLE visual=0,
+		      TQt::HANDLE colormap=0,
 		      bool allowStyles=true,
 		      bool configUnique=false);
 #endif
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 290355552..8122bb4bf 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -47,7 +47,7 @@
 #include <tqtextcodec.h>
 #include <tqmutex.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 # define KURL_ROOTDIR_PATH "C:/"
 #else
 # define KURL_ROOTDIR_PATH "/"
@@ -386,7 +386,7 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de
     orig_pos = pos;
   }
 
-#ifdef Q_WS_WIN // prepend drive letter if exists (js)
+#ifdef TQ_WS_WIN // prepend drive letter if exists (js)
   if (orig_pos >= 2 && isalpha(path[0].latin1()) && path[1]==':') {
     result.prepend(TQString(path[0])+":");
   }
@@ -670,7 +670,7 @@ void KURL::parse( const TQString& _url, int encoding_hint )
 
     // Node 1: Accept alpha or slash
     TQChar x = buf[pos++];
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     /* win32: accept <letter>: or <letter>:/ or <letter>:\ */
     const bool alpha = isalpha((int)x);
     if (alpha && len<2)
@@ -791,7 +791,7 @@ void KURL::parseURL( const TQString& _url, int encoding_hint )
 
   // Node 1: Accept alpha or slash
   TQChar x = buf[pos++];
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   /* win32: accept <letter>: or <letter>:/ or <letter>:\ */
   const bool alpha = isalpha((int)x);
   if (alpha && len<2)
@@ -1608,7 +1608,7 @@ TQString KURL::prettyURL( int _trailing ) const
   }
   else
   {
-     u += trailingSlash( _trailing, lazy_encode( m_strPath ) );
+     u += trailingSlash( _trailing, lazy_encode( m_strPath, false ) );
   }
 
   if (!m_strQuery_encoded.isNull())
@@ -1628,7 +1628,7 @@ TQString KURL::prettyURL( int _trailing, AdjustementFlags _flags) const
   TQString u = prettyURL(_trailing);
   if (_flags & StripFileProtocol && u.startsWith("file://")) {
     u.remove(0, 7);
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return TQDir::convertSeparators(u);
 #endif
   }
@@ -2378,21 +2378,17 @@ int KURL::uriMode() const
 
 KURL::URIMode KURL::uriModeForProtocol(const TQString& protocol)
 {
+	KURL::URIMode mode = Auto;
 #ifndef KDE_QT_ONLY
-    KURL::URIMode mode = Auto;
-    if (protocol == fileProt)
-        return URL;
-    if (TDEGlobal::_instance)
-        mode = KProtocolInfo::uriParseMode(protocol);
-    if (mode == Auto ) {
-#else
-        KURL::URIMode mode = Auto;
+	if (protocol == fileProt)
+		return URL;
+	if (TDEGlobal::_instance)
+		mode = KProtocolInfo::uriParseMode(protocol);
 #endif
-	if ( protocol == "ed2k" || protocol == "sig2dat" || protocol == "slsk" || protocol == "data" ) mode = RawURI;
-	else if ( protocol == "mailto" ) mode = Mailto;
-	else mode = URL;
-#ifndef KDE_QT_ONLY
-    }
-#endif
-    return mode;
+	if (mode == Auto ) {
+		if ( protocol == "ed2k" || protocol == "sig2dat" || protocol == "slsk" || protocol == "data" ) mode = RawURI;
+		else if ( protocol == "mailto" ) mode = Mailto;
+		else mode = URL;
+	}
+	return mode;
 }
diff --git a/tdecore/kurl.h b/tdecore/kurl.h
index 740c8a0df..283fc57f5 100644
--- a/tdecore/kurl.h
+++ b/tdecore/kurl.h
@@ -128,7 +128,7 @@ class TDECORE_EXPORT KURL
 {
 public:
   /**
-   * Flags to choose how file: URLs are treated when creating their QString
+   * Flags to choose how file: URLs are treated when creating their TQString
    * representation with prettyURL(int,AdjustementFlags)
    *
    * However it is recommended to use pathOrURL() instead of this variant of prettyURL()
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index 07e669dfd..51346cf66 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -150,7 +150,7 @@ bool KURLDrag::decode( const TQMimeSource *e, KURL::List &uris, TQMap<TQString,T
     return false; // Couldn't decode the URLs
 }
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
 bool KURLDrag::decode( TQStringList const &e, KURL::List &uris )
 {
 	TQStringList::ConstIterator end(e.end());
diff --git a/tdecore/kurldrag.h b/tdecore/kurldrag.h
index ccaf86e1a..2c2cd911a 100644
--- a/tdecore/kurldrag.h
+++ b/tdecore/kurldrag.h
@@ -52,7 +52,7 @@ public:
    * @param urls the list of URLs
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the QObject
+   * @param name the name of the TQObject
    */
   KURLDrag( const KURL::List &urls, TQWidget* dragSource = 0, const char * name = 0 );
   /**
@@ -62,7 +62,7 @@ public:
    * @param metaData a map containing meta data
    * @param dragSource the parent of the TQObject. Should be set when doing drag-n-drop,
    * but should be 0 when copying to the clipboard
-   * @param name the name of the QObject
+   * @param name the name of the TQObject
    * @see metaData()
    */
   KURLDrag( const KURL::List &urls, const TQMap<TQString, TQString>& metaData,
@@ -133,7 +133,7 @@ public:
    */
   static KURL stringToUrl(const TQCString &s);
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
   /**
    * Convenience method that decodes the contents of @p e
    * into a list of KURLs for Qt versions without a MIME clipboard.
diff --git a/tdecore/kxerrorhandler.cpp b/tdecore/kxerrorhandler.cpp
index 3a8524bed..ce9197bf6 100644
--- a/tdecore/kxerrorhandler.cpp
+++ b/tdecore/kxerrorhandler.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqwidget.h>
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
 
 #include "kxerrorhandler.h"
 #include <assert.h>
diff --git a/tdecore/kxmessages.cpp b/tdecore/kxmessages.cpp
index 116c74d1c..b5f18ab04 100644
--- a/tdecore/kxmessages.cpp
+++ b/tdecore/kxmessages.cpp
@@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
 
 #include <tdeapplication.h>
 
-#ifdef Q_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E
+#ifdef TQ_WS_X11 // FIXME(E): Figure out what parts we can/should emulate in QT/E
 
 #include <X11/Xlib.h>
 #include <kdebug.h>
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index 5caec19fc..d3787f6bb 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -30,11 +30,7 @@ DEALINGS IN THE SOFTWARE.
 #include <tqmap.h>
 #include <tdelibs_export.h>
 
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 
 class TQString;
@@ -52,7 +48,7 @@ class KXMessagesPrivate;
 class TDECORE_EXPORT KXMessages
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	/**
 	 * Creates an instance which will receive X messages.
diff --git a/tdecore/libintl.cpp b/tdecore/libintl.cpp
index 5d2f6a086..c7b8c7ee6 100644
--- a/tdecore/libintl.cpp
+++ b/tdecore/libintl.cpp
@@ -260,8 +260,8 @@ hash_string (const char *str_param)
   while (*str != '\0')
     {
       hval <<= 4;
-      hval += (unsigned long) *str++;
-      g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4));
+      hval += (unsigned char) *str++;
+      g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
       if (g != 0)
 	{
 	  hval ^= g >> (HASHWORDBITS - 8);
diff --git a/tdecore/libqt-mt.nmcheck b/tdecore/libqt-mt.nmcheck
index e18ee438f..d5962f37a 100644
--- a/tdecore/libqt-mt.nmcheck
+++ b/tdecore/libqt-mt.nmcheck
@@ -4,7 +4,7 @@
 Q*::*
 qt_*
 
-# these should preferably go in some namespace in Qt4
+# these should preferably go in some namespace
 tqDebug
 tqFatal
 tqWarning
diff --git a/tdecore/malloc/malloc.c b/tdecore/malloc/malloc.c
index 8f9fbb79b..0c02ee307 100644
--- a/tdecore/malloc/malloc.c
+++ b/tdecore/malloc/malloc.c
@@ -16,7 +16,6 @@ int kde_malloc_is_used = 0;
 #define USE_MALLOC_LOCK
 #define INLINE __inline__
 /*#define INLINE*/
-#define USE_MEMCPY 0
 #define MMAP_CLEARS 1
 
 /*
@@ -193,8 +192,6 @@ int kde_malloc_is_used = 0;
 
     __STD_C                    derived from C compiler defines
     WIN32                      NOT defined
-    HAVE_MEMCPY                defined
-    USE_MEMCPY                 1 if HAVE_MEMCPY is defined
     HAVE_MMAP                  defined as 1 
     MMAP_CLEARS                1
     HAVE_MREMAP                0 unless linux defined
@@ -563,34 +560,6 @@ extern "C" {
 #endif /* USE_DL_PREFIX */
 
 
-/*
-  HAVE_MEMCPY should be defined if you are not otherwise using
-  ANSI STD C, but still have memcpy and memset in your C library
-  and want to use them in calloc and realloc. Otherwise simple
-  macro versions are defined below.
-
-  USE_MEMCPY should be defined as 1 if you actually want to
-  have memset and memcpy called. People report that the macro
-  versions are faster than libc versions on some systems.
-  
-  Even if USE_MEMCPY is set to 1, loops to copy/clear small chunks
-  (of <= 36 bytes) are manually unrolled in realloc and calloc.
-*/
-
-/* If it's available it's defined in config.h.  */
-/* #define HAVE_MEMCPY */
-
-#ifndef USE_MEMCPY
-#ifdef HAVE_MEMCPY
-#define USE_MEMCPY 1
-#else
-#define USE_MEMCPY 0
-#endif
-#endif
-
-
-#if (__STD_C || defined(HAVE_MEMCPY))
-
 #ifdef WIN32
 /* On Win32 memset and memcpy are already declared in windows.h */
 #else
@@ -602,7 +571,6 @@ Void_t* memset();
 Void_t* memcpy();
 #endif
 #endif
-#endif
 
 /*
   MALLOC_FAILURE_ACTION is the action to take before "return 0" when
@@ -1747,64 +1715,6 @@ int public_mALLOPt(int p, int v) {
 
 #endif
 
-
-
-/* ------------- Optional versions of memcopy ---------------- */
-
-
-#if USE_MEMCPY
-
-/* 
-  Note: memcpy is ONLY invoked with non-overlapping regions,
-  so the (usually slower) memmove is not needed.
-*/
-
-#define MALLOC_COPY(dest, src, nbytes)  memcpy(dest, src, nbytes)
-#define MALLOC_ZERO(dest, nbytes)       memset(dest, 0,   nbytes)
-
-#else /* !USE_MEMCPY */
-
-/* Use Duff's device for good zeroing/copying performance. */
-
-#define MALLOC_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp);                           \
-  unsigned long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T);                     \
-  long mcn;                                                                   \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mzp++ = 0;                                             \
-    case 7:           *mzp++ = 0;                                             \
-    case 6:           *mzp++ = 0;                                             \
-    case 5:           *mzp++ = 0;                                             \
-    case 4:           *mzp++ = 0;                                             \
-    case 3:           *mzp++ = 0;                                             \
-    case 2:           *mzp++ = 0;                                             \
-    case 1:           *mzp++ = 0; if(mcn <= 0) break; mcn--; }                \
-  }                                                                           \
-} while(0)
-
-#define MALLOC_COPY(dest,src,nbytes)                                          \
-do {                                                                          \
-  INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src;                            \
-  INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest;                           \
-  unsigned long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T);                     \
-  long mcn;                                                                   \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mcdst++ = *mcsrc++;                                    \
-    case 7:           *mcdst++ = *mcsrc++;                                    \
-    case 6:           *mcdst++ = *mcsrc++;                                    \
-    case 5:           *mcdst++ = *mcsrc++;                                    \
-    case 4:           *mcdst++ = *mcsrc++;                                    \
-    case 3:           *mcdst++ = *mcsrc++;                                    \
-    case 2:           *mcdst++ = *mcsrc++;                                    \
-    case 1:           *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; }       \
-  }                                                                           \
-} while(0)
-
-#endif
-
 /* ------------------ MMAP support ------------------  */
 
 
@@ -4006,9 +3916,9 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
           ncopies = copysize / sizeof(INTERNAL_SIZE_T);
           assert(ncopies >= 3);
           
-          if (ncopies > 9)
-            MALLOC_COPY(d, s, copysize);
-          
+          if (ncopies > 9) {
+            memcpy(d, s, copysize);
+          }
           else {
             *(d+0) = *(s+0);
             *(d+1) = *(s+1);
@@ -4106,7 +4016,7 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
       /* Must alloc, copy, free. */
       newmem = mALLOc(nb - MALLOC_ALIGN_MASK);
       if (newmem != 0) {
-        MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ);
+        memcpy(newmem, oldmem, oldsize - 2*SIZE_SZ);
         fREe(oldmem);
       }
     }
@@ -4264,9 +4174,9 @@ Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size;
       nclears = clearsize / sizeof(INTERNAL_SIZE_T);
       assert(nclears >= 3);
 
-      if (nclears > 9)
-        MALLOC_ZERO(d, clearsize);
-
+      if (nclears > 9) {
+        memset(d, 0, clearsize);
+      }
       else {
         *(d+0) = 0;
         *(d+1) = 0;
@@ -4290,7 +4200,7 @@ Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size;
     {
       d = (INTERNAL_SIZE_T*)mem;
       clearsize = chunksize(p) - 2 * SIZE_SZ;
-      MALLOC_ZERO(d, clearsize);
+      memset(d, 0, clearsize);
     }
 #endif
   }
@@ -4396,7 +4306,7 @@ static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_
   remainder_size = chunksize(p);
 
   if (opts & 0x2) {       /* optionally clear the elements */
-    MALLOC_ZERO(mem, remainder_size - SIZE_SZ - array_size);
+    memset(mem, 0, remainder_size - SIZE_SZ - array_size);
   }
 
   /* If not provided, allocate the pointer array as final part of chunk */
diff --git a/tdecore/netwm.cpp b/tdecore/netwm.cpp
index c1e876eeb..1e0670333 100644
--- a/tdecore/netwm.cpp
+++ b/tdecore/netwm.cpp
@@ -27,7 +27,7 @@
 
 #include <tqwidget.h>
 #include <tqapplication.h>
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
 
 #include "netwm.h"
 
@@ -1602,7 +1602,7 @@ void NETRootInfo::updateSupportedProperties( Atom atom )
 }
 
 void NETRootInfo::setActiveWindow(Window window) {
-    setActiveWindow( window, FromUnknown, GET_QT_X_USER_TIME(), None );
+    setActiveWindow( window, FromUnknown, get_tqt_x_user_time(), None );
 }
 
 void NETRootInfo::setActiveWindow(Window window, NET::RequestSource src,
@@ -1811,7 +1811,7 @@ void NETRootInfo::moveResizeWindowRequest(Window window, int flags, int x, int y
 
 void NETRootInfo::restackRequest(Window window, Window above, int detail)
 {
-    restackRequest( window, FromTool, above, detail, GET_QT_X_USER_TIME() );
+    restackRequest( window, FromTool, above, detail, get_tqt_x_user_time() );
 }
 
 void NETRootInfo::restackRequest(Window window, RequestSource src, Window above, int detail, Time timestamp )
diff --git a/tdecore/netwm.h b/tdecore/netwm.h
index ca8ed5139..8baef6ea3 100644
--- a/tdecore/netwm.h
+++ b/tdecore/netwm.h
@@ -29,7 +29,7 @@
 
 #include "tdelibs_export.h"
 #include <tqwidget.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index aaac54b03..08f899c8a 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -93,12 +93,7 @@ void TDEBufferedSocket::close()
     }
 }
 
-#ifdef USE_QT3
 TQ_LONG TDEBufferedSocket::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 TDEBufferedSocket::bytesAvailable() const
-#endif
 {
   if (!d->input)
     return KStreamSocket::bytesAvailable();
@@ -118,7 +113,7 @@ TQ_LONG TDEBufferedSocket::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
 {
   if (d->input)
     {
@@ -131,13 +126,13 @@ TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
       resetError();
       return d->input->consumeBuffer(data, maxlen);
     }
-  return KStreamSocket::tqreadBlock(data, maxlen);
+  return KStreamSocket::readBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG TDEBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
+TQ_LONG TDEBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   from = peerAddress();
-  return tqreadBlock(data, maxlen);
+  return readBlock(data, maxlen);
 }
 
 TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
@@ -162,7 +157,7 @@ TQ_LONG TDEBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre
   return peekBlock(data, maxlen);
 }
 
-TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
 {
   if (state() != Connected)
     {
@@ -189,14 +184,14 @@ TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
       return d->output->feedBuffer(data, len);
     }
 
-  return KStreamSocket::tqwriteBlock(data, len);
+  return KStreamSocket::writeBlock(data, len);
 }
 
-TQT_TQIO_LONG TDEBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
+TQ_LONG TDEBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen,
 				   const TDESocketAddress&)
 {
   // ignore the third parameter
-  return tqwriteBlock(data, maxlen);
+  return writeBlock(data, maxlen);
 }
 
 void TDEBufferedSocket::enableRead(bool enable)
@@ -213,7 +208,7 @@ void TDEBufferedSocket::enableRead(bool enable)
   if (enable && state() != Connected && d->input && !d->input->isEmpty())
     // this means the buffer is still dirty
     // allow the signal to be emitted
-    TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity()));
 }
 
 void TDEBufferedSocket::enableWrite(bool enable)
@@ -284,12 +279,7 @@ TDEIOBufferBase* TDEBufferedSocket::outputBuffer()
   return d->output;
 }
 
-#ifdef USE_QT3
 TQ_ULONG TDEBufferedSocket::bytesToWrite() const
-#endif
-#ifdef USE_QT4
-qint64 TDEBufferedSocket::bytesToWrite() const
-#endif
 {
   if (!d->output)
     return 0;
@@ -368,7 +358,7 @@ void TDEBufferedSocket::slotReadActivity()
 	{
 	  // buffer isn't empty
 	  // keep emitting signals till it is
-	  TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity()));
+	  TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity()));
 	  emit readyRead();
 	}
     }
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index bd172330b..641d35cd1 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -57,7 +57,7 @@ class TDEBufferedSocketPrivate;
  */
 class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**
@@ -99,12 +99,7 @@ public:
   /**
    * Make use of the buffers.
    */
-#ifdef USE_QT3
   virtual TQ_LONG bytesAvailable() const;
-#endif
-#ifdef USE_QT4
-  virtual qint64 bytesAvailable() const;
-#endif
 
   /**
    * Make use of buffers.
@@ -114,7 +109,7 @@ public:
   /**
    * Reads data from the socket. Make use of buffers.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
 
   /**
    * @overload
@@ -122,7 +117,7 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data from the socket.
@@ -140,7 +135,7 @@ public:
   /**
    * Writes data to the socket.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
 
   /**
    * @overload
@@ -148,7 +143,7 @@ public:
    *
    * The @p to parameter is discarded.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Catch changes.
@@ -183,12 +178,7 @@ public:
   /**
    * Returns the length of the output buffer.
    */
-#ifdef USE_QT3
   virtual TQ_ULONG bytesToWrite() const;
-#endif
-#ifdef USE_QT4
-  virtual qint64 bytesToWrite() const;
-#endif
 
   /**
    * Closes the socket and discards any output data that had been buffered
@@ -208,8 +198,6 @@ public:
    */
   TQCString readLine();
 
-  // KDE4: make virtual, add timeout to match the Qt4 signature
-  //       and move to another class up the hierarchy
   /**
    * Blocks until the connection is either established, or completely
    * failed.
@@ -255,12 +243,7 @@ public:
    * which required a call to reset() in order to be able to connect again
    * using the same device. This is not necessary in TDEBufferedSocket any more.
    */
-#ifdef USE_QT3
   inline void reset()
-#endif
-#ifdef USE_QT4
-  inline bool reset()
-#endif
   { closeNow(); }
 };
 
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index eaf669bb9..25eb34d8e 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -48,16 +48,8 @@ public:
 };
 
 KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name)  :
-#ifdef USE_QT4
-#else // USE_QT4
-    TQObject(parent, name),
-#endif // USE_QT4
-    d(new KClientSocketBasePrivate)
-{
-#ifdef USE_QT4
-  setParent(parent);
-  setObjectName(name);
-#endif // USE_QT4
+    TQObject(parent, name), d(new KClientSocketBasePrivate)
+{
   d->state = Idle;
   d->enableRead = true;
   d->enableWrite = false;
@@ -152,10 +144,10 @@ bool KClientSocketBase::lookup()
 
       // don't restart the lookups if they had succeeded and
       // the input values weren't changed
-      TQObject::connect(&d->peerResolver, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(lookupFinishedSlot()));
-      TQObject::connect(&d->localResolver, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(lookupFinishedSlot()));
+      TQObject::connect(&d->peerResolver, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(lookupFinishedSlot()));
+      TQObject::connect(&d->localResolver, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(lookupFinishedSlot()));
 
       if (d->localResolver.status() <= 0)
 	d->localResolver.start();
@@ -172,7 +164,7 @@ bool KClientSocketBase::lookup()
 	  if (blocking())
 	    lookupFinishedSlot();
 	  else
-	    TQTimer::singleShot(0, this, TQT_SLOT(lookupFinishedSlot()));
+	    TQTimer::singleShot(0, this, TQ_SLOT(lookupFinishedSlot()));
 	}
       else
 	{
@@ -286,12 +278,7 @@ void KClientSocketBase::close()
 }
 
 // This function is unlike all the others because it is const
-#ifdef USE_QT3
 TQ_LONG KClientSocketBase::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 KClientSocketBase::bytesAvailable() const
-#endif
 {
   return socketDevice()->bytesAvailable();
 }
@@ -311,10 +298,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen);
+  TQ_LONG retval = socketDevice()->readBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -323,10 +310,10 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
+TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from);
+  TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -359,10 +346,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqwriteBlock(data, len);
+  TQ_LONG retval = socketDevice()->writeBlock(data, len);
   if (retval == -1)
     {
       copyError();
@@ -371,10 +358,10 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
+TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to);
+  TQ_LONG retval = socketDevice()->writeBlock(data, len, to);
   if (retval == -1)
     {
       copyError();
@@ -440,8 +427,8 @@ void KClientSocketBase::lookupFinishedSlot()
   if (d->peerResolver.isRunning() || d->localResolver.isRunning() || state() != HostLookup)
     return;
 
-  TQObject::disconnect(&d->peerResolver, 0L, this, TQT_SLOT(lookupFinishedSlot()));
-  TQObject::disconnect(&d->localResolver, 0L, this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::disconnect(&d->peerResolver, 0L, this, TQ_SLOT(lookupFinishedSlot()));
+  TQObject::disconnect(&d->localResolver, 0L, this, TQ_SLOT(lookupFinishedSlot()));
   if (d->peerResolver.status() < 0 || d->localResolver.status() < 0)
     {
       setState(Idle);		// backtrack
@@ -466,7 +453,7 @@ void KClientSocketBase::stateChanging(SocketState newState)
       if (n)
 	{
 	  n->setEnabled(d->enableRead);
-	  TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity()));
+	  TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity()));
 	}
       else
 	return;
@@ -475,7 +462,7 @@ void KClientSocketBase::stateChanging(SocketState newState)
       if (n)
 	{
 	  n->setEnabled(d->enableWrite);
-	  TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity()));
+	  TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity()));
 	}
       else
 	return;
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 65c852ddb..a6f9eaf92 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -32,10 +32,6 @@
 #include "kresolver.h"
 #include <tdelibs_export.h>
 
-#ifdef Q_MOC_RUN
-#define USE_QT4
-#endif // Q_MOC_RUN
-
 namespace KNetwork {
 
 class KClientSocketBasePrivate;
@@ -50,14 +46,9 @@ class KClientSocketBasePrivate;
  *
  * @author Thiago Macieira <thiago.macieira@kdemail.net>
  */
-class TDECORE_EXPORT KClientSocketBase :
-#ifdef USE_QT4
-#else // USE_QT4
-public TQObject,
-#endif // USE_QT4
-public KActiveSocketBase
+class TDECORE_EXPORT KClientSocketBase : public TQObject, public KActiveSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -281,7 +272,7 @@ public:
    *
    * You should not call this function; instead, use @ref connect
    */
-  virtual inline bool open(TQ_OpenMode)
+  virtual inline bool open(int)
   { return connect(); }
 
   /**
@@ -302,12 +293,7 @@ public:
    * Returns the number of bytes available on this socket.
    * Reimplemented from TDESocketBase.
    */
-#ifdef USE_QT3
   virtual TQ_LONG bytesAvailable() const;
-#endif
-#ifdef USE_QT4
-  virtual qint64 bytesAvailable() const;
-#endif
 
   /**
    * Waits for more data. Reimplemented from TDESocketBase.
@@ -317,13 +303,13 @@ public:
   /**
    * Reads data from a socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
 
   /**
    * @overload
    * Reads data from a socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data from the socket. Reimplemented from TDESocketBase.
@@ -339,13 +325,13 @@ public:
   /**
    * Writes data to the socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
 
   /**
    * @overload
    * Writes data to the socket. Reimplemented from TDESocketBase.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Returns the local socket address. Reimplemented from TDESocketBase.
diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp
index 41d9cc7e9..5fa631560 100644
--- a/tdecore/network/kdatagramsocket.cpp
+++ b/tdecore/network/kdatagramsocket.cpp
@@ -52,11 +52,11 @@ KDatagramSocket::KDatagramSocket(TQObject* parent, const char *name)
 
   localResolver().setFlags(KResolver::Passive);
 
-  //  TQObject::connect(localResolver(), TQT_SIGNAL(finished(KResolverResults)),
-  //		   this, TQT_SLOT(lookupFinishedLocal()));
-  TQObject::connect(&peerResolver(), TQT_SIGNAL(finished(KResolverResults)),
-  		   this, TQT_SLOT(lookupFinishedPeer()));
-  TQObject::connect(this, TQT_SIGNAL(hostFound()), this, TQT_SLOT(lookupFinishedLocal()));
+  //  TQObject::connect(localResolver(), TQ_SIGNAL(finished(KResolverResults)),
+  //		   this, TQ_SLOT(lookupFinishedLocal()));
+  TQObject::connect(&peerResolver(), TQ_SIGNAL(finished(KResolverResults)),
+  		   this, TQ_SLOT(lookupFinishedPeer()));
+  TQObject::connect(this, TQ_SIGNAL(hostFound()), this, TQ_SLOT(lookupFinishedLocal()));
 }
 
 KDatagramSocket::~KDatagramSocket()
@@ -156,7 +156,7 @@ KDatagramPacket KDatagramSocket::receive()
   TDESocketAddress address;
   
   // now do the reading
-  size = tqreadBlock(data.data(), size, address);
+  size = readBlock(data.data(), size, address);
   if (size < 0)
     // error has been set
     return KDatagramPacket();
@@ -167,10 +167,10 @@ KDatagramPacket KDatagramSocket::receive()
 
 TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
 {
-  return tqwriteBlock(packet.data(), packet.size(), packet.address());
+  return writeBlock(packet.data(), packet.size(), packet.address());
 }
 
-TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
+TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   if (to.family() != AF_UNSPEC)
     {
@@ -179,7 +179,7 @@ TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const TDES
 	// error handling will happen below
 	socketDevice()->create(to.family(), SOCK_DGRAM, 0);
     }
-  return KClientSocketBase::tqwriteBlock(data, len, to);
+  return KClientSocketBase::writeBlock(data, len, to);
 }
 
 void KDatagramSocket::lookupFinishedLocal()
@@ -265,7 +265,7 @@ void KDatagramSocket::setupSignals()
   if (n)
     {
       n->setEnabled(emitsReadyRead());
-      TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity()));
+      TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity()));
     }
   else
     return;
@@ -274,7 +274,7 @@ void KDatagramSocket::setupSignals()
   if (n)
     {
       n->setEnabled(emitsReadyWrite());
-      TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity()));
+      TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity()));
     }
   else
     return;
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index ae88fda29..b99938e8b 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -179,7 +179,7 @@ class KDatagramSocketPrivate;
  */
 class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -223,7 +223,7 @@ public:
    *
    * Connecting means only to designate the given address as the default
    * destination address for datagrams sent without destination addresses
-   * ( tqwriteBlock(const char *, TQ_ULONG) ).
+   * ( writeBlock(const char *, TQ_ULONG) ).
    *
    * @note Calling connect will not cause the socket to be bound. You have
    *       to call @ref bind explicitly.
@@ -241,7 +241,7 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KClientSocketBase.
    */
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Receives one datagram from the stream. The reading process is guaranteed
diff --git a/tdecore/network/khttpproxysocketdevice.cpp b/tdecore/network/khttpproxysocketdevice.cpp
index a5fad9cbe..980fa39d5 100644
--- a/tdecore/network/khttpproxysocketdevice.cpp
+++ b/tdecore/network/khttpproxysocketdevice.cpp
@@ -182,7 +182,7 @@ bool KHttpProxySocketDevice::parseServerReply()
   if (!d->request.isEmpty())
     {
       // send request
-      TQ_LONG written = tqwriteBlock(d->request, d->request.length());
+      TQ_LONG written = writeBlock(d->request, d->request.length());
       if (written < 0)
 	{
 	  tqDebug("KHttpProxySocketDevice: would block writing request!");
@@ -230,7 +230,7 @@ bool KHttpProxySocketDevice::parseServerReply()
 	{
 	  // no, headers not yet finished...
 	  // consume data from socket
-	  tqreadBlock(buf.data(), avail);
+	  readBlock(buf.data(), avail);
 	  d->reply += buf.data();
 	  setError(IO_ConnectError, InProgress);
 	  return true;
@@ -241,7 +241,7 @@ bool KHttpProxySocketDevice::parseServerReply()
       d->reply += fullHeaders.mid(d->reply.length(), index + 4);
 
       // consume from socket
-      tqreadBlock(buf.data(), index + 4);
+      readBlock(buf.data(), index + 4);
     }
   else
     {
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 953ee7265..f80b9209e 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -550,7 +550,7 @@ void KResolver::emitFinished()
   emit finished(d->results);
 
   if (p && d->deleteWhenDone)
-    deleteLater();		// in QObject
+    deleteLater();		// in TQObject
 }
 
 TQString KResolver::errorString(int errorcode, int syserror)
@@ -591,7 +591,7 @@ KResolverResults
 KResolver::resolve(const TQString& host, const TQString& service, int flags,
 		  int families)
 {
-  KResolver qres(host, service, TQT_TQOBJECT(tqApp), "synchronous KResolver");
+  KResolver qres(host, service, tqApp, "synchronous KResolver");
   qres.setFlags(flags);
   qres.setFamily(families);
   qres.start();
@@ -603,8 +603,8 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot,
 			     const TQString& host, const TQString& service,
 			     int flags, int families)
 {
-  KResolver* qres = new KResolver(host, service, TQT_TQOBJECT(tqApp), "asynchronous KResolver");
-  TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot);
+  KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver");
+  TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), userObj, userSlot);
   qres->setFlags(flags);
   qres->setFamily(families);
   qres->d->deleteWhenDone = true; // this is the only difference from the example code
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index dbcf0d102..51e605704 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -294,7 +294,7 @@ class KResolverPrivate;
  */
 class TDECORE_EXPORT KResolver: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
@@ -759,7 +759,7 @@ public:
    *
    * \code
    *   KResolver* qres = new KResolver(host, service);
-   *   TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)),
+   *   TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)),
    *			  userObj, userSlot);
    *   qres->setFlags(flags);
    *   qres->setFamily(families);
@@ -768,7 +768,7 @@ public:
    *
    * You should use it like this in your code:
    * \code
-   *   KResolver::resolveAsync(myObj, TQT_SLOT(mySlot(KResolverResults)), host, service);
+   *   KResolver::resolveAsync(myObj, TQ_SLOT(mySlot(KResolverResults)), host, service);
    * \endcode
    *
    * @param userObj		the object whose slot @p userSlot we will connect
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index 701e074ad..c10c64e97 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -199,7 +199,7 @@ namespace
 # elif defined(HAVE_GETHOSTBYNAME_R) && (!defined(AF_INET6) || !defined(HAVE_GETHOSTBYNAME2))
 #  define USE_GETHOSTBYNAME_R
 # elif defined(HAVE_GETHOSTBYNAME2)
-#  define USE_GETHOSTBYNAME2)
+#  define USE_GETHOSTBYNAME2
 # else
 #  define USE_GETHOSTBYNAME
 # endif
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 47a99e3ac..41dc38e90 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -49,7 +49,7 @@ class KReverseResolverPrivate;
  */
 class TDECORE_EXPORT KReverseResolver: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index 94532de19..0cfba8fa5 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -61,15 +61,15 @@ public:
 TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name)
   : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
-  TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
-		   this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), 
+		   this, TQ_SLOT(lookupFinishedSlot()));
 }
 
 TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name)
   : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
-  TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
-		   this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), 
+		   this, TQ_SLOT(lookupFinishedSlot()));
   d->resolver.setServiceName(service);
 }
 
@@ -77,8 +77,8 @@ TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service,
 			     TQObject* parent, const char* name)
   : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
-  TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
-		   this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), 
+		   this, TQ_SLOT(lookupFinishedSlot()));
   setAddress(node, service);
 }
 
@@ -403,8 +403,8 @@ bool TDEServerSocket::doListen()
     }
   
   // set up ready accept signal
-  TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)),
-		   this, TQT_SIGNAL(readyAccept()));
+  TQObject::connect(socketDevice()->readNotifier(), TQ_SIGNAL(activated(int)),
+		   this, TQ_SIGNAL(readyAccept()));
   d->state = TDEServerSocketPrivate::Listening;
   return true;
 }
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index beb43aeb7..637dc92d0 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -50,8 +50,8 @@ class TDEServerSocketPrivate;
  * \code
  *   TQString service = "http";
  *   TDEServerSocket *ss = new TDEServerSocket(service);
- *   connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
- *   connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+ *   connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
+ *   connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
  *   ss->listen();
  * \endcode
  * 
@@ -84,8 +84,8 @@ class TDEServerSocketPrivate;
  *   if( !found ) {
  *     // Couldn't connect to any port.
  *   } else {
- *     connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
- *     connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+ *     connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
+ *     connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
  *     ss->listen();
  *   }
  * \endcode
@@ -106,7 +106,7 @@ class TDEServerSocketPrivate;
  */
 class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**
diff --git a/tdecore/network/ksockssocketdevice.cpp b/tdecore/network/ksockssocketdevice.cpp
index b7171999c..c4ac6b4dc 100644
--- a/tdecore/network/ksockssocketdevice.cpp
+++ b/tdecore/network/ksockssocketdevice.cpp
@@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketA
   return 0;
 }
 
-TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
+TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddr
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len)
+TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len)
 {
-  return tqwriteBlock(data, len, TDESocketAddress());
+  return writeBlock(data, len, TDESocketAddress());
 }
 
-TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
+TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
diff --git a/tdecore/network/ksockssocketdevice.h b/tdecore/network/ksockssocketdevice.h
index c899ce58f..760038143 100644
--- a/tdecore/network/ksockssocketdevice.h
+++ b/tdecore/network/ksockssocketdevice.h
@@ -83,8 +83,8 @@ public:
   /**
    * Overrides reading.
    */
-  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Overrides peeking.
@@ -95,8 +95,8 @@ public:
   /**
    * Overrides writing.
    */
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len);
-  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Overrides getting socket address.
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index 8f918977e..568e0d22b 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -226,7 +226,7 @@ bool KSrvResolverWorker::postprocess()
 void KSrvResolverWorker::customEvent(TQCustomEvent*)
 {
   dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv);
-  TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady()));
+  TQObject::connect(dns, TQ_SIGNAL(resultsReady()), this, TQ_SLOT(dnsResultsReady()));
 }
 
 void KSrvResolverWorker::dnsResultsReady()
diff --git a/tdecore/network/ksrvresolverworker_p.h b/tdecore/network/ksrvresolverworker_p.h
index 5080c4a59..efb4c45f9 100644
--- a/tdecore/network/ksrvresolverworker_p.h
+++ b/tdecore/network/ksrvresolverworker_p.h
@@ -41,7 +41,7 @@ namespace KNetwork
     class KSrvResolverWorker: public TQObject,
 			      public KNetwork::KResolverWorkerBase
     {
-      Q_OBJECT
+      TQ_OBJECT
       
 
     public:
diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp
index c323a212e..a36f8cc78 100644
--- a/tdecore/network/kstreamsocket.cpp
+++ b/tdecore/network/kstreamsocket.cpp
@@ -61,7 +61,7 @@ KStreamSocket::KStreamSocket(const TQString& node, const TQString& service,
 
   setSocketOptions(socketOptions() & ~Blocking);
 
-  TQObject::connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutSlot()));
+  TQObject::connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutSlot()));
 }
 
 KStreamSocket::~KStreamSocket()
@@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service)
       // connection hasn't started yet
       if (!blocking())
 	{
-	  QObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot()));
+	  TQObject::connect(this, TQ_SIGNAL(hostFound()), TQ_SLOT(hostFoundSlot()));
 	  return lookup();
 	}
 
@@ -196,10 +196,10 @@ bool KStreamSocket::connect(const KResolverEntry& entry)
 
 void KStreamSocket::hostFoundSlot()
 {
-  QObject::disconnect(this, TQT_SLOT(hostFoundSlot()));
+  TQObject::disconnect(this, TQ_SLOT(hostFoundSlot()));
   if (timeout() > 0)
     d->timer.start(timeout(), true);
-  TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent()));
+  TQTimer::singleShot(0, this, TQ_SLOT(connectionEvent()));
 }
 
 void KStreamSocket::connectionEvent()
@@ -267,13 +267,13 @@ void KStreamSocket::connectionEvent()
 	  if (socketDevice()->error() == InProgress)
 	    {
 	      TQSocketNotifier *n = socketDevice()->readNotifier();
-	      TQObject::connect(n, TQT_SIGNAL(activated(int)),
-			       this, TQT_SLOT(connectionEvent()));
+	      TQObject::connect(n, TQ_SIGNAL(activated(int)),
+			       this, TQ_SLOT(connectionEvent()));
 	      n->setEnabled(true);
 
 	      n = socketDevice()->writeNotifier();
-	      TQObject::connect(n, TQT_SIGNAL(activated(int)),
-			       this, TQT_SLOT(connectionEvent()));
+	      TQObject::connect(n, TQ_SIGNAL(activated(int)),
+			       this, TQ_SLOT(connectionEvent()));
 	      n->setEnabled(true);
 
 	      return;		// wait for activity
@@ -350,8 +350,8 @@ bool KStreamSocket::bindLocallyFor(const KResolverEntry& peer)
 
 void KStreamSocket::connectionSucceeded(const KResolverEntry& peer)
 {
-  TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQT_SLOT(connectionEvent()));
-  TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQT_SLOT(connectionEvent()));
+  TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQ_SLOT(connectionEvent()));
+  TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQ_SLOT(connectionEvent()));
 
   resetError();
   setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async);
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 94396b38d..a7557d585 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -70,14 +70,14 @@ class KStreamSocketPrivate;
  *    : socket(hostname, port)
  *  {
  *    // connect signals to our slots
- *    TQObject::connect(&socket, TQT_SIGNAL(connected(const KResolverEntry&)),
- *                     this, TQT_SLOT(slotSocketConnected()));
- *    TQObject::connect(&socket, TQT_SIGNAL(gotError(int)),
- *                     this, TQT_SLOT(slotSocketError(int)));
- *    TQObject::connect(&socket, TQT_SIGNAL(readyRead()),
- *                     this, TQT_SLOT(slotSocketReadyToRead()));
- *    TQObject::connect(&socket, TQT_SIGNAL(readyWrite()),
- *                     this, TQT_SLOT(slotSocketReadyToWrite()));
+ *    TQObject::connect(&socket, TQ_SIGNAL(connected(const KResolverEntry&)),
+ *                     this, TQ_SLOT(slotSocketConnected()));
+ *    TQObject::connect(&socket, TQ_SIGNAL(gotError(int)),
+ *                     this, TQ_SLOT(slotSocketError(int)));
+ *    TQObject::connect(&socket, TQ_SIGNAL(readyRead()),
+ *                     this, TQ_SLOT(slotSocketReadyToRead()));
+ *    TQObject::connect(&socket, TQ_SIGNAL(readyWrite()),
+ *                     this, TQ_SLOT(slotSocketReadyToWrite()));
  *
  *    // set non-blocking mode in order to work asynchronously
  *    socket.setBlocking(false);
@@ -96,7 +96,7 @@ class KStreamSocketPrivate;
  */
 class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp
index 86d85c29c..36adaa631 100644
--- a/tdecore/network/tdesocketaddress.cpp
+++ b/tdecore/network/tdesocketaddress.cpp
@@ -191,17 +191,19 @@ TQString KIpAddress::toString() const
   char buf[sizeof "1111:2222:3333:4444:5555:6666:255.255.255.255" + 2];
   buf[0] = '\0';
   switch (m_version)
-    {
+  {
     case 4:
       inet_ntop(AF_INET, m_data, buf, sizeof(buf) - 1);
       return TQString::fromLatin1(buf);
 
     case 6:
+    {
 #ifdef AF_INET6
       inet_ntop(AF_INET6, m_data, buf, sizeof(buf) - 1);
 #endif
       return TQString::fromLatin1(buf);
     }
+  }
 
   return TQString::null;
 }
@@ -294,11 +296,15 @@ public:
       switch (addr.generic->sa_family)
 	{
 	case AF_INET:
+	{
 	  return;		// nothing to do here
+	}
 #ifdef AF_INET6
 	case AF_INET6:
+	{
 	  oldport = addr.in6->sin6_port;
 	  break;
+	}
 #endif
 	}
 
@@ -319,12 +325,16 @@ public:
       switch (addr.generic->sa_family)
 	{
 	case AF_INET:
+	{
 	  oldport = addr.in->sin_port;
 	  break;
+	}
 
 #ifdef AF_INET6
 	case AF_INET6:
+	{
 	  return;		// nothing to do here
+	}
 #endif
 	}
 
@@ -517,12 +527,15 @@ bool TDESocketAddress::operator ==(const TDESocketAddress& other) const
   switch (d->addr.generic->sa_family)
     {
     case AF_INET:
+    {
       Q_ASSERT(d->reallen == SOCKADDR_IN_LEN);
       Q_ASSERT(other.d->reallen == SOCKADDR_IN_LEN);
       return memcmp(d->addr.in, other.d->addr.in, SOCKADDR_IN_LEN) == 0;
+    }
 
 #ifdef AF_INET6
     case AF_INET6:
+    {
       Q_ASSERT(d->reallen >= MIN_SOCKADDR_IN6_LEN);
       Q_ASSERT(other.d->reallen >= MIN_SOCKADDR_IN6_LEN);
 
@@ -540,6 +553,7 @@ bool TDESocketAddress::operator ==(const TDESocketAddress& other) const
 # endif
 
 	return memcmp(d->addr.in6, other.d->addr.in6, d->reallen) == 0;
+    }
 #endif
 
     case AF_UNIX:
@@ -566,10 +580,11 @@ TQString TDESocketAddress::nodeName() const
 
   switch (d->addr.generic->sa_family)
     {
-    case AF_INET:
 #ifdef AF_INET6
     case AF_INET6:
-
+#endif
+    case AF_INET:
+#ifdef AF_INET6
       TQString scopeid("%");
       if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id)
 	scopeid += TQString::number(d->addr.in6->sin6_scope_id);
@@ -592,10 +607,10 @@ TQString TDESocketAddress::serviceName() const
 
   switch (d->addr.generic->sa_family)
     {
-    case AF_INET:
 #ifdef AF_INET6
     case AF_INET6:
 #endif
+    case AF_INET:
       return TQString::number(d->ref.port());
 
     case AF_UNIX:
@@ -652,11 +667,15 @@ int TDESocketAddress::ianaFamily(int af)
   switch (af)
     {
     case AF_INET:
+    {
       return 1;
+    }
 
 #ifdef AF_INET6
     case AF_INET6:
+    {
       return 2;
+    }
 #endif
 
     default:
@@ -669,11 +688,15 @@ int TDESocketAddress::fromIanaFamily(int iana)
   switch (iana)
     {
     case 1:
+    {
       return AF_INET;
+    }
 
 #ifdef AF_INET6
     case 2:
+    {
       return AF_INET6;
+    }
 #endif
 
     default:
@@ -743,11 +766,15 @@ int KInetSocketAddress::ipVersion() const
   switch (d->addr.generic->sa_family)
     {
     case AF_INET:
+    {
       return 4;
+    }
 
 #ifdef AF_INET6
     case AF_INET6:
+    {
       return 6;
+    }
 #endif
     }
 
@@ -762,10 +789,14 @@ KIpAddress KInetSocketAddress::ipAddress() const
   switch (d->addr.generic->sa_family)
     {
     case AF_INET:
+    {
       return KIpAddress(&d->addr.in->sin_addr, 4);
+    }
 #ifdef AF_INET6
     case AF_INET6:
+    {
       return KIpAddress(&d->addr.in6->sin6_addr, 6);
+    }
 #endif
     }
 
@@ -803,11 +834,15 @@ TQ_UINT16 KInetSocketAddress::port() const
   switch (d->addr.generic->sa_family)
     {
     case AF_INET:
+    {
       return ntohs(d->addr.in->sin_port);
+    }
 
 #ifdef AF_INET6
     case AF_INET6:
+    {
       return ntohs(d->addr.in6->sin6_port);
+    }
 #endif
     }
 
@@ -822,13 +857,17 @@ KInetSocketAddress& KInetSocketAddress::setPort(TQ_UINT16 port)
   switch (d->addr.generic->sa_family)
     {
     case AF_INET:
+    {
       d->addr.in->sin_port = htons(port);
       break;
+    }
       
 #ifdef AF_INET6
     case AF_INET6:
+    {
       d->addr.in6->sin6_port = htons(port);
       break;
+    }
 #endif
       
     default:
diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp
index 7379eb74a..0b2ef90d7 100644
--- a/tdecore/network/tdesocketbase.cpp
+++ b/tdecore/network/tdesocketbase.cpp
@@ -291,7 +291,7 @@ KActiveSocketBase::~KActiveSocketBase()
 int KActiveSocketBase::getch()
 {
   unsigned char c;
-  if (tqreadBlock((char*)&c, 1) != 1)
+  if (readBlock((char*)&c, 1) != 1)
     return -1;
 
   return c;
@@ -300,7 +300,7 @@ int KActiveSocketBase::getch()
 int KActiveSocketBase::putch(int ch)
 {
   unsigned char c = (unsigned char)ch;
-  if (tqwriteBlock((char*)&c, 1) != 1)
+  if (writeBlock((char*)&c, 1) != 1)
     return -1;
 
   return c;
diff --git a/tdecore/network/tdesocketbase.h b/tdecore/network/tdesocketbase.h
index 706900117..d2a213300 100644
--- a/tdecore/network/tdesocketbase.h
+++ b/tdecore/network/tdesocketbase.h
@@ -63,10 +63,10 @@
 #include <tdelibs_export.h>
 
 /*
- * This is extending QIODevice's error codes
+ * This is extending TQIODevice's error codes
  *
  * According to tqiodevice.h, the last error is IO_UnspecifiedError
- * These errors will never occur in functions declared in QIODevice
+ * These errors will never occur in functions declared in TQIODevice
  * (except open, but you shouldn't call open)
  */
 #define IO_ListenError		(IO_UnspecifiedError+1)
@@ -504,11 +504,7 @@ public:
    * This call is not supported on sockets. Reimplemented from TQIODevice.
    * This will always return 0.
    */
-#ifdef USE_QT4
-  virtual qint64 size() const
-#else // USE_QT4
   virtual Offset size() const
-#endif // USE_QT4
   { return 0; }
 
   /**
@@ -536,12 +532,7 @@ public:
    * Returns the number of bytes available for reading without
    * blocking.
    */
-#ifdef USE_QT3
   virtual TQ_LONG bytesAvailable() const = 0;
-#endif
-#ifdef USE_QT4
-  virtual qint64 bytesAvailable() const = 0;
-#endif
 
   /**
    * Waits up to @p msecs for more data to be available on this socket.
@@ -562,7 +553,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::readBlock for
    * more information.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG len) = 0;
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0;
 
   /** @overload
    * Receives data and the source address.
@@ -575,7 +566,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes read
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from) = 0;
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from) = 0;
 
   /**
    * Peeks the data in the socket.
@@ -610,7 +601,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::writeBlock for
    * more information.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len) = 0;
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0;
 
   /** @overload
    * Writes the given data to the destination address.
@@ -623,7 +614,7 @@ public:
    * @param to			the address to send to
    * @returns the number of bytes actually sent
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to) = 0;
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to) = 0;
 
   /**
    * Reads one character from the socket.
diff --git a/tdecore/network/tdesocketbuffer.cpp b/tdecore/network/tdesocketbuffer.cpp
index 49bdbe31e..36e64e0f0 100644
--- a/tdecore/network/tdesocketbuffer.cpp
+++ b/tdecore/network/tdesocketbuffer.cpp
@@ -274,7 +274,7 @@ TQ_LONG TDESocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 	}
 
       // now try to write those bytes
-      TQ_LONG wrote = dev->tqwriteBlock(buf, count);
+      TQ_LONG wrote = dev->writeBlock(buf, count);
 
       if (wrote == -1)
 	// error?
@@ -315,7 +315,7 @@ TQ_LONG TDESocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
 
   // now do the reading
   TQByteArray a(len);
-  len = dev->tqreadBlock(a.data(), len);
+  len = dev->readBlock(a.data(), len);
 
   if (len == -1)
     // error?
diff --git a/tdecore/network/tdesocketdevice.cpp b/tdecore/network/tdesocketdevice.cpp
index 6f3ec755b..b5aef0943 100644
--- a/tdecore/network/tdesocketdevice.cpp
+++ b/tdecore/network/tdesocketdevice.cpp
@@ -171,7 +171,7 @@ bool TDESocketDevice::setSocketOptions(int opts)
   return true;			// all went well
 }
 
-bool TDESocketDevice::open(TQ_OpenMode)
+bool TDESocketDevice::open(int)
 {
   resetError();
   return false;
@@ -364,12 +364,7 @@ bool TDESocketDevice::disconnect()
   return true;			// all is well
 }
 
-#ifdef USE_QT3
 TQ_LONG TDESocketDevice::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 TDESocketDevice::bytesAvailable() const
-#endif
 {
   if (m_sockfd == -1)
     return -1;			// there's nothing to read in a closed socket
@@ -419,7 +414,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, TDESocketAddr
   return 0;
 }
 
-TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -440,7 +435,7 @@ TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG TDESocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress &from)
+TQ_LONG TDESocketDevice::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -503,12 +498,12 @@ TQ_LONG TDESocketDevice::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddress
   return retval;
 }
 
-TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len)
 {
-  return tqwriteBlock(data, len, TDESocketAddress());
+  return writeBlock(data, len, TDESocketAddress());
 }
 
-TQT_TQIO_LONG TDESocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
+TQ_LONG TDESocketDevice::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
diff --git a/tdecore/network/tdesocketdevice.h b/tdecore/network/tdesocketdevice.h
index e5477c0c6..2196e9d3f 100644
--- a/tdecore/network/tdesocketdevice.h
+++ b/tdecore/network/tdesocketdevice.h
@@ -142,7 +142,7 @@ public:
   /**
    * Reimplementation from TQIODevice. You should not call this function in sockets.
    */
-  virtual bool open(TQ_OpenMode mode);
+  virtual bool open(int mode);
 
   /**
    * Closes the socket. Reimplemented from TQIODevice.
@@ -198,12 +198,7 @@ public:
   /**
    * Returns the number of bytes available for reading without blocking.
    */
-#ifdef USE_QT3
   virtual TQ_LONG bytesAvailable() const;
-#endif
-#ifdef USE_QT4
-  virtual qint64 bytesAvailable() const;
-#endif
 
   /**
    * Waits up to @p msecs for more data to be available on this socket.
@@ -216,12 +211,12 @@ public:
   /**
    * Reads data from this socket.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
 
   /**
    * Reads data and the source address from this socket.
    */
-  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from);
+  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from);
 
   /**
    * Peeks data in the socket.
@@ -236,12 +231,12 @@ public:
   /**
    * Writes data to the socket.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
 
   /**
    * Writes the given data to the given destination address.
    */
-  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to);
+  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to);
 
   /**
    * Returns this socket's local address.
diff --git a/tdecore/svgicons/ksvgiconengine.cpp b/tdecore/svgicons/ksvgiconengine.cpp
index 3e68624c6..79f34d806 100644
--- a/tdecore/svgicons/ksvgiconengine.cpp
+++ b/tdecore/svgicons/ksvgiconengine.cpp
@@ -202,11 +202,7 @@ public:
 		TQWMatrix matrix = m_engine->painter()->parseTransform(transform);
 
 		TQWMatrix *current = m_engine->painter()->worldMatrix();
-#ifdef USE_QT4
-printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n");
-#else // USE_QT4
 		*current = matrix * *current;
-#endif // USE_QT4
 	}
 
 	void parseCommonAttributes(TQDomNode &node)
@@ -445,7 +441,7 @@ printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for n
 			{
 				// Scale, if needed
 				if(image.width() != (int) w || image.height() != (int) h)
-					image = image.smoothScale((int) w, (int) h, TQ_ScaleFree);
+					image = image.smoothScale((int) w, (int) h, TQImage::ScaleFree);
 
 				m_engine->painter()->drawImage(x, y, image);
 			}
diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp
index 122c8432d..7c2859656 100644
--- a/tdecore/svgicons/ksvgiconpainter.cpp
+++ b/tdecore/svgicons/ksvgiconpainter.cpp
@@ -57,7 +57,7 @@ public:
 
 		m_clipSVP = 0;
 
-		m_fillColor = Qt::black;
+		m_fillColor = TQt::black;
 
 		m_useFill = true;
 		m_useStroke = false;
@@ -1743,17 +1743,34 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 	double curx = 0.0, cury = 0.0, contrlx = 0.0, contrly = 0.0, xc, yc;
 	unsigned int lastCommand = 0;
 
-	TQString _d = value.replace(",", " ");
-	_d = _d.simplifyWhiteSpace();
-	const char *ptr = _d.latin1();
-	const char *end = _d.latin1() + _d.length() + 1;
+	TQCString _d = value.replace(",", " ").simplifyWhiteSpace().latin1();
+	const char *ptr = _d.data();
+	const char *end = _d.data() + _d.length();
 
 	double tox, toy, x1, y1, x2, y2, rx, ry, angle;
 	bool largeArc, sweep;
-	char command = *(ptr++);
+	char command = *ptr;
 
 	while(ptr < end)
 	{
+
+		if(*ptr == '+' || *ptr == '-' || *ptr == '.' || (*ptr >= '0' && *ptr <= '9'))
+		{
+			// there are still coords in this command
+			if(command == 'M')
+			{
+				command = 'L';
+			}
+			else if(command == 'm')
+			{
+				command = 'l';
+			}
+		}
+		else
+		{
+			command = *(ptr++);
+		}
+
 		if(*ptr == ' ')
 			ptr++;
 
@@ -2179,10 +2196,19 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				ptr = getCoord(ptr, rx);
 				ptr = getCoord(ptr, ry);
 				ptr = getCoord(ptr, angle);
-				ptr = getCoord(ptr, tox);
-				largeArc = tox == 1;
-				ptr = getCoord(ptr, tox);
-				sweep = tox == 1;
+				// 'largeArc' and 'sweep' are single digit flags. Some non conforming svg files do not
+				// separate those fields with separators, so we can't use getCoord() here.
+				// See TDE/tde issue #46 on TGW
+				largeArc = ((*ptr++) != '0');
+				while (*ptr == ' ')
+				{
+					ptr++;
+				}
+				sweep = ((*ptr++) != '0');
+				while (*ptr == ' ')
+				{
+					ptr++;
+				}
 				ptr = getCoord(ptr, tox);
 				ptr = getCoord(ptr, toy);
 
@@ -2198,10 +2224,19 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				ptr = getCoord(ptr, rx);
 				ptr = getCoord(ptr, ry);
 				ptr = getCoord(ptr, angle);
-				ptr = getCoord(ptr, tox);
-				largeArc = tox == 1;
-				ptr = getCoord(ptr, tox);
-				sweep = tox == 1;
+				// 'largeArc' and 'sweep' are single digit flags. Some non conforming svg files do not
+				// separate those fields with separators, so we can't use getCoord() here.
+				// See TDE/tde issue #46 on TGW
+				largeArc = ((*ptr++) != '0');
+				while (*ptr == ' ')
+				{
+					ptr++;
+				}
+				sweep = ((*ptr++) != '0');
+				while (*ptr == ' ')
+				{
+					ptr++;
+				}
 				ptr = getCoord(ptr, tox);
 				ptr = getCoord(ptr, toy);
 
@@ -2215,23 +2250,6 @@ void KSVGIconPainter::drawPath(const TQString &data, bool filled)
 				break;
 		}
 
-		if(*ptr == '+' || *ptr == '-' || *ptr == '.' || (*ptr >= '0' && *ptr <= '9'))
-		{
-			// there are still coords in this command
-			if(command == 'M')
-			{
-				command = 'L';
-			}
-			else if(command == 'm')
-			{
-				command = 'l';
-			}
-		}
-		else
-		{
-			command = *(ptr++);
-		}
-
 		// Detect reflection points
 		if(lastCommand != 'C' && lastCommand != 'c' &&
 			lastCommand != 'S' && lastCommand != 's' &&
diff --git a/tdecore/tdeaboutdata.cpp b/tdecore/tdeaboutdata.cpp
index 3a147842a..48f41645d 100644
--- a/tdecore/tdeaboutdata.cpp
+++ b/tdecore/tdeaboutdata.cpp
@@ -446,6 +446,10 @@ TDEAboutData::license() const
        l = "QPL v1.0";
        f = locate("data", "LICENSES/QPL_V1.0");
        break;
+    case License_MIT:
+       l = "MIT";
+       f = locate("data", "LICENSES/MIT");
+       break;
     case License_Custom:
        if (mLicenseText && *mLicenseText)
           return( i18n(mLicenseText) );
diff --git a/tdecore/tdeaboutdata.h b/tdecore/tdeaboutdata.h
index 06f193f75..071da368b 100644
--- a/tdecore/tdeaboutdata.h
+++ b/tdecore/tdeaboutdata.h
@@ -199,7 +199,8 @@ class TDECORE_EXPORT TDEAboutData
       License_QPL = 5,
       License_QPL_V1_0 = 5,
       License_GPL_V3 = 6,
-      License_LGPL_V3 = 7
+      License_LGPL_V3 = 7,
+      License_MIT = 8
     };
 
   public:
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index 5430c2529..5d098e4d4 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -34,7 +34,7 @@
 
 #include "tdeaccelprivate.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #	include <X11/Xlib.h>
 #	ifdef KeyPress // needed for --enable-final
 		// defined by X11 headers
@@ -49,7 +49,7 @@
 //---------------------------------------------------------------------
 //
 // In TDEAccelEventHandler::x11Event we do our own X11 keyboard event handling
-// This allows us to map the Win key to Qt::MetaButton, Qt does not know about
+// This allows us to map the Win key to TQt::MetaButton, Qt does not know about
 // the Win key.
 //
 // TDEAccelEventHandler::x11Event will generate an AccelOverride event. The
@@ -95,7 +95,7 @@ class TDEAccelEventHandler : public TQWidget
  private:
 	TDEAccelEventHandler();
 
-#	ifdef Q_WS_X11
+#	ifdef TQ_WS_X11
 	bool x11Event( XEvent* pEvent );
 #	endif
 
@@ -109,13 +109,13 @@ bool TDEAccelEventHandler::g_bAccelActivated = false;
 TDEAccelEventHandler::TDEAccelEventHandler()
     : TQWidget( 0, "TDEAccelEventHandler" )
 {
-#	ifdef Q_WS_X11
+#	ifdef TQ_WS_X11
 	if ( kapp )
-		kapp->installX11EventFilter( TQT_TQWIDGET(this) );
+		kapp->installX11EventFilter( this );
 #	endif
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 bool	tqt_try_modal( TQWidget *, XEvent * );
 
 bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
@@ -157,7 +157,7 @@ bool TDEAccelEventHandler::x11Event( XEvent* pEvent )
 
 	return false;
 }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 //---------------------------------------------------------------------
 // TDEAccelPrivate
@@ -170,9 +170,9 @@ TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch )
 	m_pAccel = pParent;
 	m_pWatch = pWatch;
 	m_bAutoUpdate = true;
-	connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) );
+	connect( (TQAccel*)m_pAccel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyPressed(int)) );
 
-#ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working
+#ifdef TQ_WS_X11 //only makes sense if TDEAccelEventHandler is working
 	if( m_pWatch )
 		m_pWatch->installEventFilter( this );
 #endif
@@ -237,10 +237,10 @@ bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key&
 	m_mapIDToKey[nID] = keyQt;
 
 	if( action.objSlotPtr() && action.methodSlotPtr() ) {
-#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 		((TQAccel*)m_pAccel)->connectItem( nID, action.objSlotPtr(), action.methodSlotPtr() );
 #else
-		((TQAccel*)m_pAccel)->connectItem( nID, this, TQT_SLOT(slotKeyPressed(int)));
+		((TQAccel*)m_pAccel)->connectItem( nID, this, TQ_SLOT(slotKeyPressed(int)));
 #endif
 		if( !action.isEnabled() )
 			((TQAccel*)m_pAccel)->setItemEnabled( nID, false );
@@ -318,9 +318,9 @@ void TDEAccelPrivate::slotKeyPressed( int id )
 			int iAction = pMenu->idAt(1);
 			slotMenuActivated( iAction );
 		} else {
-			connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) );
+			connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) );
 			pMenu->exec( m_pWatch->mapToGlobal( TQPoint( 0, 0 ) ) );
-			disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) );
+			disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) );
 		}
 		delete pMenu;
 	}
@@ -334,11 +334,11 @@ void TDEAccelPrivate::slotMenuActivated( int iAction )
 {
 	kdDebug(125) << "TDEAccelPrivate::slotMenuActivated( " << iAction << " )" << endl;
 	TDEAccelAction* pAction = actions().actionPtr( iAction );
-#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 	if( pAction ) {
-		connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+		connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 		emit menuItemActivated();
-		disconnect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+		disconnect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 	}
 #else
 	emitActivatedSignal( pAction );
@@ -362,12 +362,12 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 					TDEAccelAction* pAction = m_mapIDToAction[nID];
 					if( !pAction->isEnabled() )
 						continue;
-#ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifdef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 					TQGuardedPtr<TDEAccelPrivate> me = this;
-					connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+					connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 					emit menuItemActivated();
 					if (me) {
-						disconnect( me, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+						disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 					}
 #else
 					emitActivatedSignal( pAction );
@@ -384,25 +384,25 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 	return false;
 }
 
-#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction )
 {
 	if( pAction ) {
 		TQGuardedPtr<TDEAccelPrivate> me = this;
 		TQRegExp reg( "([ ]*TDEAccelAction.*)" );
 		if( reg.search( pAction->methodSlotPtr()) >= 0 ) {
-			connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
+			connect( this, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)),
 				pAction->objSlotPtr(), pAction->methodSlotPtr() );
 			emit menuItemActivated( pAction );
 			if (me)
-				disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
+				disconnect( me, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)),
 					pAction->objSlotPtr(), pAction->methodSlotPtr() );
 		} else {
-			connect( this, TQT_SIGNAL(menuItemActivated()),
+			connect( this, TQ_SIGNAL(menuItemActivated()),
 				pAction->objSlotPtr(), pAction->methodSlotPtr() );
 			emit menuItemActivated();
 			if (me)
-				disconnect( me, TQT_SIGNAL(menuItemActivated()),
+				disconnect( me, TQ_SIGNAL(menuItemActivated()),
 					pAction->objSlotPtr(), pAction->methodSlotPtr() );
 
 		}
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 2d205885c..dd0c03aad 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -74,9 +74,9 @@ class TDEAccelPrivate;
  * // Insert an action "Scroll Up" which is associated with the "Up" key:
  * pAccel->insert( "Scroll Up", i18n("Scroll up"),
  *                       i18n("Scroll up the current document by one line."),
- *                       Qt::Key_Up, this, TQT_SLOT(slotScrollUp()) );
+ *                       TQt::Key_Up, this, TQ_SLOT(slotScrollUp()) );
  * // Insert an standard acclerator action.
- * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) );
+ * pAccel->insert( TDEStdAccel::Print, this, TQ_SLOT(slotPrint()) );
  *
  * // Update the shortcuts by read any user-defined settings from the
  * // application's config file.
@@ -92,14 +92,14 @@ class TDEAccelPrivate;
 
 class TDECORE_EXPORT TDEAccel : public TQAccel
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	/**
 	 * Creates a new TDEAccel that watches @p pParent, which is also
-	 * the QObject's parent.
+	 * the TQObject's parent.
 	 *
 	 * @param pParent the parent and widget to watch for key strokes
-	 * @param psName the name of the QObject
+	 * @param psName the name of the TQObject
 	 */
 	TDEAccel( TQWidget* pParent, const char* psName = 0 );
 
@@ -107,8 +107,8 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 * Creates a new TDEAccel that watches @p watch.
 	 *
 	 * @param watch the widget to watch for key strokes
-	 * @param parent the parent of the QObject
-	 * @param psName the name of the QObject
+	 * @param parent the parent of the TQObject
+	 * @param psName the name of the TQObject
 	 */
 	TDEAccel( TQWidget* watch, TQObject* parent, const char* psName = 0 );
 	virtual ~TDEAccel();
@@ -159,7 +159,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 * insert( "Do Something", i18n("Do Something"),
 	 *   i18n("This action allows you to do something really great with this program to "
 	 *        "the currently open document."),
-	 *   ALT+Key_D, this, TQT_SLOT(slotDoSomething()) );
+	 *   ALT+Key_D, this, TQ_SLOT(slotDoSomething()) );
 	 *\endcode
 	 *
 	 * @param sAction The internal name of the action.
@@ -191,7 +191,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 *
 	 * Usage:
 	 * \code
-	 * insert( i18n("Do Something"), ALT+Key_D, this, TQT_SLOT(slotDoSomething()) );
+	 * insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT(slotDoSomething()) );
 	 * \endcode
 	 *
 	 * @param psAction The name AND label of the action.
diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp
index 41864d47c..a3fc23e3e 100644
--- a/tdecore/tdeaccelbase.cpp
+++ b/tdecore/tdeaccelbase.cpp
@@ -246,7 +246,7 @@ connect new key sequences
 }
 */
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 struct TDEAccelBase::X
 {
 	uint iAction, iSeq, iVari;
@@ -269,7 +269,7 @@ struct TDEAccelBase::X
 	bool operator >( const X& x )  { return compare( x ) > 0; }
 	bool operator <=( const X& x ) { return compare( x ) <= 0; }
 };
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 
 /*
 #1 Ctrl+A
@@ -315,7 +315,7 @@ struct TDEAccelBase::X
 
 bool TDEAccelBase::updateConnections()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	kdDebug(125) << "TDEAccelBase::updateConnections()  this = " << this << endl;
 	// Retrieve the list of keys to be connected, sorted by priority.
 	//  (key, variation, seq)
@@ -414,11 +414,11 @@ bool TDEAccelBase::updateConnections()
 			<< (((*it).pAction) ? (*it).pAction->name() : TQString::null) << "'" << endl;
 	}
 #endif
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 	return true;
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 // Construct a list of keys to be connected, sorted highest priority first.
 void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
 {
@@ -455,7 +455,7 @@ void TDEAccelBase::createKeyList( TQValueVector<struct X>& rgKeys )
 	// sort by priority: iVariation[of first key], iSequence, iAction
 	qHeapSort( rgKeys.begin(), rgKeys.end() );
 }
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 
 bool TDEAccelBase::insertConnection( TDEAccelAction* pAction )
 {
diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h
index ecd0ce358..7a2955b66 100644
--- a/tdecore/tdeaccelbase.h
+++ b/tdecore/tdeaccelbase.h
@@ -79,11 +79,11 @@ class TQWidget;
  * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
  * // Insert an action "Scroll Down" which is not associated with any key:
  * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0);
- * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) );
+ * a->connectItem( "Scroll up", myWindow, TQ_SLOT( scrollUp() ) );
  * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it
  *	// is done automatially with the
  *	// connect below!
- * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
+ * a->connectItem(TDEStdAccel::Print, myWindow, TQ_SLOT( printDoc() ) );
  *
  * a->readSettings();
  *\endcode
@@ -93,12 +93,12 @@ class TQWidget;
  *
  * \code
  * int id;
- * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc()));
+ * id = popup->insertItem("&Print",this, TQ_SLOT(printDoc()));
  * a->changeMenuAccel(popup, id, TDEStdAccel::Print );
  * \endcode
  *
  * If you want a somewhat "exotic" name for your standard print action, like
- *   id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
+ *   id = popup->insertItem(i18n("Print &Document"),this, TQ_SLOT(printDoc()));
  * it might be a good idea to insert the standard action before as
  *          a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") )
  * as well, so that the user can easily find the corresponding function.
@@ -107,7 +107,7 @@ class TQWidget;
  * in a menu could be done with
  *
  * \code
- *    id = popup->insertItem(i18n"Scroll &up",this, TQT_SLOT(scrollUp()));
+ *    id = popup->insertItem(i18n"Scroll &up",this, TQ_SLOT(scrollUp()));
  *    a->changeMenuAccel(popup, id, "Scroll Up" );
  * \endcode
  *
diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
index 4618dab17..ea0b034fd 100644
--- a/tdecore/tdeaccelmanager.cpp
+++ b/tdecore/tdeaccelmanager.cpp
@@ -262,10 +262,10 @@ void TDEAcceleratorManagerPrivate::calculateAccelerators(Item *item, TQString &u
 
 void TDEAcceleratorManagerPrivate::traverseChildren(TQWidget *widget, Item *item)
 {
-  TQObjectList *childList = widget->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
+  TQObjectList *childList = widget->queryList("TQWidget", 0, false, false);
   for ( TQObject *it = childList->first(); it; it = childList->next() )
   {
-    TQWidget *w = TQT_TQWIDGET(it);
+    TQWidget *w = static_cast<TQWidget*>(it);
 
     if ( !w->isVisibleTo( widget ) || ( w->isTopLevel() && dynamic_cast<TQPopupMenu*>(w) == NULL ) )
         continue;
@@ -329,8 +329,8 @@ void TDEAcceleratorManagerPrivate::manageWidget(TQWidget *w, Item *item)
       if ( !label->buddy() )
           label = 0;
       else {
-          if ( label->textFormat() == Qt::RichText ||
-               ( label->textFormat() == Qt::AutoText &&
+          if ( label->textFormat() == TQt::RichText ||
+               ( label->textFormat() == TQt::AutoText &&
                  TQStyleSheet::mightBeRichText( label->text() ) ) )
               label = 0;
       }
@@ -734,7 +734,7 @@ TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup)
   : TQObject(popup), m_popup(popup), m_count(-1)
 {
     aboutToShow(); // do one check and then connect to show
-    connect(popup, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShow()));
+    connect(popup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow()));
 }
 
 
@@ -840,13 +840,13 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
   : TQObject(stack), m_stack(stack)
 {
     aboutToShow(stack->visibleWidget()); // do one check and then connect to show
-    connect(stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SLOT(aboutToShow(TQWidget *)));
+    connect(stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SLOT(aboutToShow(TQWidget *)));
 }
 
 bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
 {
     if ( e->type() == TQEvent::Show && tqApp->activeWindow() ) {
-        TDEAcceleratorManager::manage( TQT_TQWIDGET(tqApp->activeWindow()) );
+        TDEAcceleratorManager::manage( tqApp->activeWindow() );
         watched->removeEventFilter( this );
     }
     return false;
diff --git a/tdecore/tdeaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h
index d9227e8da..fe071c982 100644
--- a/tdecore/tdeaccelmanager_private.h
+++ b/tdecore/tdeaccelmanager_private.h
@@ -133,7 +133,7 @@ class TQPopupMenu;
 
 class TDEPopupAccelManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -166,7 +166,7 @@ private:
 
 class QWidgetStackAccelManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdecore/tdeaccelprivate.h b/tdecore/tdeaccelprivate.h
index c91e01f42..8e6672615 100644
--- a/tdecore/tdeaccelprivate.h
+++ b/tdecore/tdeaccelprivate.h
@@ -11,7 +11,7 @@ class TDEAccelAction;
  */
 class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEAccel* m_pAccel;
 	TQWidget* m_pWatch;
@@ -38,7 +38,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
 	void menuItemActivated(TDEAccelAction*);
 
  private:
-#ifndef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
+#ifndef TQ_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 	void emitActivatedSignal(TDEAccelAction*);
 #endif
 
@@ -47,7 +47,7 @@ class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
 	void slotShowMenu();
 	void slotMenuActivated( int iAction );
 	
-	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from QObject
+	bool eventFilter( TQObject* pWatched, TQEvent* pEvent ); // virtual method from TQObject
 };
 
 #endif // !__TDEACCELPRIVATE_H
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 6dcafa2d5..326388614 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -95,7 +95,7 @@
 #include <kmdcodec.h>
 #include <kglobalaccel.h>
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <tdestartupinfo.h>
 #endif
 
@@ -110,7 +110,7 @@
 #include <grp.h>
 #include <sys/types.h>
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
 #include "twin.h"
 #endif
 
@@ -123,8 +123,8 @@
 #include <errno.h>
 #include <string.h>
 #include <netdb.h>
-#if defined Q_WS_X11
-//#ifndef Q_WS_QWS //FIXME(E): NetWM should talk to QWS...
+#if defined TQ_WS_X11
+//#ifndef TQ_WS_QWS //FIXME(E): NetWM should talk to QWS...
 #include <netwm.h>
 #endif
 
@@ -134,7 +134,7 @@
 #include <paths.h>
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #ifdef COMPOSITE
 #include <X11/extensions/Xrender.h>
@@ -149,7 +149,7 @@
 
 #include <pwd.h>
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
 #include <KDE-ICE/ICElib.h>
 #else
 typedef void* IceIOErrorHandler;
@@ -160,22 +160,22 @@ typedef void* IceIOErrorHandler;
 #define Button3Mask (1<<10)
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define DISPLAY "DISPLAY"
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
 #define DISPLAY "QWS_DISPLAY"
 #endif
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <kipc.h>
 #endif
 
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
 #include <Carbon/Carbon.h>
 #include <tqimage.h>
 #endif
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <sys/ioctl.h>
 #ifdef __linux__
 #include <linux/vt.h>
@@ -197,12 +197,12 @@ bool TDEApplication::loadedByKdeinit = false;
 DCOPClient *TDEApplication::s_DCOPClient = 0L;
 bool TDEApplication::s_dcopClientNeedsPostInit = false;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static Atom atom_DesktopWindow;
 static Atom atom_NetSupported;
 #endif
 
-#if defined(Q_WS_X11) && defined(COMPOSITE)
+#if defined(TQ_WS_X11) && defined(COMPOSITE)
 static int composite_event, composite_error, composite_opcode;
 static bool x11_composite_error_generated;
 static int x11_error(Display *dpy, XErrorEvent *ev) {
@@ -221,7 +221,7 @@ TDECORE_EXPORT bool tqt_qclipboard_bailout_hack = false;
 
 template class TQPtrList<KSessionManaged>;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 extern "C" {
 static int kde_xio_errhandler( Display * dpy )
 {
@@ -245,13 +245,13 @@ static void kde_ice_ioerrorhandler( IceConn conn )
 }
 #endif
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 void TDEApplication_init_windows(bool GUIenabled);
 
 class QAssistantClient;
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 // --------------------------------------------------------------------------------------
 // Get the VT number X is running on
 // (code taken from GDM, daemon/getvt.c, GPLv2+)
@@ -310,7 +310,7 @@ int get_x_vtnum(Display *dpy)
 	return num;
 }
 // --------------------------------------------------------------------------------------
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 /*
   Private data to make keeping binary compatibility easier
@@ -328,10 +328,10 @@ public:
 	app_started_timer( NULL ),
 	m_KAppDCOPInterface( 0L ),
 	session_save( false )
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	,oldXErrorHandler( NULL )
 	,oldXIOErrorHandler( NULL )
-#elif defined Q_WS_WIN
+#elif defined TQ_WS_WIN
 	,qassistantclient( 0 )
 #endif
   {
@@ -339,7 +339,7 @@ public:
 
   ~TDEApplicationPrivate()
   {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
      delete qassistantclient;
 #endif
   }
@@ -362,10 +362,10 @@ public:
   TQTimer* app_started_timer;
   KAppDCOPInterface *m_KAppDCOPInterface;
   bool session_save;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   int (*oldXErrorHandler)(Display*,XErrorEvent*);
   int (*oldXIOErrorHandler)(Display*);
-#elif defined Q_WS_WIN
+#elif defined TQ_WS_WIN
   QAssistantClient* qassistantclient;
 #endif
 
@@ -522,7 +522,7 @@ void TDEApplication::installX11EventFilter( TQWidget* filter )
         return;
     if (!x11Filter)
         x11Filter = new TQPtrList<TQWidget>;
-    connect ( filter, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( x11FilterDestroyed() ) );
+    connect ( filter, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( x11FilterDestroyed() ) );
     x11Filter->append( filter );
 }
 
@@ -557,7 +557,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
        // Indicate that the accelerator has been overridden.
        if (t == TQEvent::AccelOverride)
        {
-          TQT_TQKEYEVENT(event)->accept();
+          static_cast<TQKeyEvent*>(event)->accept();
           return true;
        }
        else
@@ -567,11 +567,11 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
     if ((t == TQEvent::AccelOverride) || (t == TQEvent::KeyPress))
     {
        static const TDEShortcut& _selectAll = TDEStdAccel::selectAll();
-       TQLineEdit *edit = ::tqqt_cast<TQLineEdit *>(receiver);
+       TQLineEdit *edit = ::tqt_cast<TQLineEdit *>(receiver);
        if (edit)
        {
           // We have a keypress for a lineedit...
-          TQKeyEvent *kevent = TQT_TQKEYEVENT(event);
+          TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event);
           KKey key(kevent);
           if (_selectAll.contains(key))
           {
@@ -586,7 +586,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
              }
           }
           // Ctrl-U deletes from start of line.
-          if (key == KKey(Qt::CTRL + Qt::Key_U))
+          if (key == KKey(TQt::CTRL + TQt::Key_U))
           {
              if (t == TQEvent::KeyPress)
              {
@@ -605,11 +605,11 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
 
           }
        }
-       TQTextEdit *medit = ::tqqt_cast<TQTextEdit *>(receiver);
+       TQTextEdit *medit = ::tqt_cast<TQTextEdit *>(receiver);
        if (medit)
        {
           // We have a keypress for a multilineedit...
-          TQKeyEvent *kevent = TQT_TQKEYEVENT(event);
+          TQKeyEvent *kevent = static_cast<TQKeyEvent*>(event);
           if (_selectAll.contains(KKey(kevent)))
           {
              if (t == TQEvent::KeyPress)
@@ -626,9 +626,9 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
     }
     if( t == TQEvent::Show && receiver->isWidgetType())
     {
-        TQWidget* w = TQT_TQWIDGET( receiver );
-#if defined Q_WS_X11
-        if( w->isTopLevel() && !startupId().isEmpty() && !TQT_TQSHOWEVENT(event)->spontaneous()) // TODO better done using window group leader?
+        TQWidget* w = static_cast<TQWidget*>( receiver );
+#if defined TQ_WS_X11
+        if( w->isTopLevel() && !startupId().isEmpty() && !static_cast<TQShowEvent*>(event)->spontaneous()) // TODO better done using window group leader?
             TDEStartupInfo::setWindowStartupId( w->winId(), startupId());
 #endif
         if( w->isTopLevel() && !w->testWFlags( WX11BypassWM ) && !w->isPopup() && !event->spontaneous())
@@ -636,7 +636,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
             if( d->app_started_timer == NULL )
             {
                 d->app_started_timer = new TQTimer( this, "app_started_timer" );
-                connect( d->app_started_timer, TQT_SIGNAL( timeout()), TQT_SLOT( checkAppStartedSlot()));
+                connect( d->app_started_timer, TQ_SIGNAL( timeout()), TQ_SLOT( checkAppStartedSlot()));
             }
             if( !d->app_started_timer->isActive())
                 d->app_started_timer->start( 0, true );
@@ -651,7 +651,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
             if( !ic->isNull())
             {
                 w->setIcon( *ic );
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
                 KWin::setIcons( w->winId(), *ic, miniIcon());
 #endif
             }
@@ -662,7 +662,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
 
 void TDEApplication::checkAppStartedSlot()
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     TDEStartupInfo::handleAutoAppStartedSending();
 #endif
 }
@@ -689,7 +689,7 @@ TQString TDEApplication::sessionConfigName() const
     return TQString("session/%1_%2_%3").arg(name()).arg(sessionId()).arg(sessKey);
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static SmcConn mySmcConnection = 0;
 static SmcConn tmpSmcConnection = 0;
 #else
@@ -701,7 +701,7 @@ static TQTime* smModificationTime = 0;
 TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
                             bool allowStyles, bool GUIenabled, bool SMenabled ) :
   TQApplication( argc, argv, GUIenabled, SMenabled ), TDEInstance(rAppName),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   display(0L),
   argb_visual(false),
 #endif
@@ -729,7 +729,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
 TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName,
                             bool allowStyles, bool GUIenabled ) :
   TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   display(0L),
   argb_visual(false),
 #endif
@@ -752,10 +752,9 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
 }
 
 TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) :
-//  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
   TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled, SMenabled ),	// We need to be able to run command line apps
   TDEInstance( TDECmdLineArgs::about),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   display(0L),
   argb_visual(false),
 #endif
@@ -779,10 +778,9 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenable
 // FOR BINARY COMPATIBILITY ONLY
 // REMOVE WHEN PRACTICAL!
 TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
-//  TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), TRUE ),	// Qt4 requires that there always be a GUI
   TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(), GUIenabled ),	// We need to be able to run command line apps
   TDEInstance( TDECmdLineArgs::about),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   display(0L),
   argb_visual(false),
 #endif
@@ -802,7 +800,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 getX11RGBAVisual(dpy), getX11RGBAColormap(dpy) ),
@@ -819,7 +817,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles ) :
+TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 disable_argb?visual:getX11RGBAVisual(dpy), disable_argb?colormap:getX11RGBAColormap(dpy) ),
   TDEInstance( TDECmdLineArgs::about), display(0L), d (new TDEApplicationPrivate)
@@ -836,7 +834,7 @@ TDEApplication::TDEApplication( Display *dpy, bool disable_argb, Qt::HANDLE visu
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
+TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
 		            bool allowStyles ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
@@ -855,7 +853,7 @@ TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colo
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-TDEApplication::TDEApplication( Display *dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
+TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
 		            bool allowStyles, TDEInstance * _instance ) :
   TQApplication( dpy, *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 visual?visual:getX11RGBAVisual(dpy), colormap?colormap:getX11RGBAColormap(dpy) ),
@@ -879,7 +877,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance*
   TQApplication( *TDECmdLineArgs::tqt_argc(), *TDECmdLineArgs::tqt_argv(),
                 GUIenabled ),
   TDEInstance( _instance ),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   display(0L),
 #endif
   argb_visual(false),
@@ -899,7 +897,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance*
     d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const TQCString& rAppName,
                            bool allowStyles, bool GUIenabled ) :
   TQApplication( display ), TDEInstance(rAppName),
@@ -930,7 +928,7 @@ int TDEApplication::xioErrhandler( Display* dpy )
     if(kapp)
     {
         emit shutDown();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         d->oldXIOErrorHandler( dpy );
 #else
         Q_UNUSED(dpy);
@@ -942,7 +940,7 @@ int TDEApplication::xioErrhandler( Display* dpy )
 
 int TDEApplication::xErrhandler( Display* dpy, void* err_ )
 { // no idea how to make forward decl. for XErrorEvent
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     XErrorEvent* err = static_cast< XErrorEvent* >( err_ );
     if(kapp)
     {
@@ -957,7 +955,7 @@ void TDEApplication::iceIOErrorHandler( _IceConn *conn )
 {
     emit shutDown();
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( d->oldIceIOErrorHandler != NULL )
       (*d->oldIceIOErrorHandler)( conn );
 #endif
@@ -1002,7 +1000,7 @@ void TDEApplication::init(bool GUIenabled)
   KApp = this;
 
 
-#ifdef Q_WS_X11 //FIXME(E)
+#ifdef TQ_WS_X11 //FIXME(E)
   // create all required atoms in _one_ roundtrip to the X server
   if ( GUIenabled ) {
       const int max = 20;
@@ -1033,7 +1031,7 @@ void TDEApplication::init(bool GUIenabled)
   smw = 0;
 
   // Initial KIPC event mask.
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   kipcEventMask = (1 << KIPC::StyleChanged) | (1 << KIPC::PaletteChanged) |
                   (1 << KIPC::FontChanged) | (1 << KIPC::BackgroundChanged) |
                   (1 << KIPC::ToolbarStyleChanged) | (1 << KIPC::SettingsChanged) |
@@ -1050,7 +1048,7 @@ void TDEApplication::init(bool GUIenabled)
   //   kdialog itself.
   // * Don't warn if we run with a read-only $HOME
   TQCString readOnly = getenv("TDE_HOME_READONLY");
-  if (readOnly.isEmpty() && (tqstrcmp(name(), "kdialog") != 0))
+  if (readOnly.isEmpty() && (qstrcmp(name(), "kdialog") != 0))
   {
     TDEConfigGroupSaver saver(config, "KDE Action Restrictions");
     if (config->readBoolEntry("warn_unwritable_config",true))
@@ -1059,7 +1057,7 @@ void TDEApplication::init(bool GUIenabled)
 
   if (GUIenabled)
   {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     // this is important since we fork() to launch the help (Matthias)
     fcntl(ConnectionNumber(tqt_xdisplay()), F_SETFD, FD_CLOEXEC);
     // set up the fancy (=robust and error ignoring ) KDE xio error handlers (Matthias)
@@ -1067,9 +1065,9 @@ void TDEApplication::init(bool GUIenabled)
     d->oldXIOErrorHandler = XSetIOErrorHandler( kde_xio_errhandler );
 #endif
 
-    connect( this, TQT_SIGNAL( aboutToQuit() ), this, TQT_SIGNAL( shutDown() ) );
+    connect( this, TQ_SIGNAL( aboutToQuit() ), this, TQ_SIGNAL( shutDown() ) );
 
-#ifdef Q_WS_X11 //FIXME(E)
+#ifdef TQ_WS_X11 //FIXME(E)
     display = desktop()->x11Display();
 #endif
 
@@ -1101,10 +1099,10 @@ void TDEApplication::init(bool GUIenabled)
         TQMimeSourceFactory::addFactory( oldDefaultFactory );
     }
 
-    d->checkAccelerators = new KCheckAccelerators( TQT_TQOBJECT(this) );
+    d->checkAccelerators = new KCheckAccelerators( this );
   }
 
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
   if (GUIenabled) {
       TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon( TDECmdLineArgs::appName(),
               TDEIcon::NoGroup, TDEIcon::SizeLarge, TDEIcon::DefaultState, 0L, false );
@@ -1134,7 +1132,7 @@ void TDEApplication::init(bool GUIenabled)
   // save and restore the RTL setting, as installTranslator calls qt_detectRTLLanguage,
   // which makes it impossible to use the -reverse cmdline switch with KDE apps
   bool rtl = reverseLayout();
-  installTranslator(new KDETranslator(TQT_TQOBJECT(this)));
+  installTranslator(new KDETranslator(this));
   setReverseLayout( rtl );
   if (i18n( "_: Dear Translator! Translate this string to the string 'LTR' in "
 	 "left-to-right languages (as english) or to 'RTL' in right-to-left "
@@ -1147,7 +1145,7 @@ void TDEApplication::init(bool GUIenabled)
   pSessionConfig = 0L;
   bSessionManagement = true;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   // register a communication window for desktop changes (Matthias)
   if (GUIenabled && kde_have_kipc )
   {
@@ -1158,7 +1156,7 @@ void TDEApplication::init(bool GUIenabled)
 		    32, PropModeReplace, (unsigned char *)&data, 1);
   }
   d->oldIceIOErrorHandler = IceSetIOErrorHandler( kde_ice_ioerrorhandler );
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
   TDEApplication_init_windows(GUIenabled);
 #else
   // FIXME(E): Implement for Qt Embedded
@@ -1198,10 +1196,10 @@ DCOPClient *TDEApplication::dcopClient()
     s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
   }
   if( kapp ) {
-    connect(s_DCOPClient, TQT_SIGNAL(attachFailed(const TQString &)),
-            kapp, TQT_SLOT(dcopFailure(const TQString &)));
-    connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ),
-            kapp, TQT_SLOT(dcopBlockUserInput(bool)) );
+    connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)),
+            kapp, TQ_SLOT(dcopFailure(const TQString &)));
+    connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ),
+            kapp, TQ_SLOT(dcopBlockUserInput(bool)) );
   }
   else
     s_dcopClientNeedsPostInit = true;
@@ -1215,8 +1213,8 @@ void TDEApplication::dcopClientPostInit()
   if( s_dcopClientNeedsPostInit )
     {
     s_dcopClientNeedsPostInit = false;
-    connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ),
-            TQT_SLOT(dcopBlockUserInput(bool)) );
+    connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ),
+            TQ_SLOT(dcopBlockUserInput(bool)) );
     s_DCOPClient->bindToApp(); // Make sure we get events from the DCOPClient.
     }
 }
@@ -1288,7 +1286,7 @@ void TDEApplication::disableSessionManagement() {
 
 void TDEApplication::enableSessionManagement() {
   bSessionManagement = true;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   // Session management support in Qt/TDE is awfully broken.
   // If konqueror disables session management right after its startup,
   // and enables it later (preloading stuff), it won't be properly
@@ -1313,7 +1311,7 @@ void TDEApplication::enableSessionManagement() {
 bool TDEApplication::requestShutDown(
     ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQApplication::syncX();
     /*  use ksmserver's dcop interface if necessary  */
     if ( confirm == ShutdownConfirmYes ||
@@ -1375,7 +1373,7 @@ bool TDEApplication::requestShutDown(
 
 void TDEApplication::propagateSessionManager()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver"));
     TQCString display = ::getenv(DISPLAY);
     // strip the screen number from the display
@@ -1389,7 +1387,7 @@ void TDEApplication::propagateSessionManager()
     bool check = smEnv.isEmpty();
     if ( !check && smModificationTime ) {
          TQFileInfo info( fName );
-         TQTime current = TQT_TQTIME_OBJECT(info.lastModified().time());
+         TQTime current = info.lastModified().time();
          check = current > *smModificationTime;
     }
     if ( check ) {
@@ -1398,7 +1396,7 @@ void TDEApplication::propagateSessionManager()
         if ( !f.open( IO_ReadOnly ) )
             return;
         TQFileInfo info ( f );
-        smModificationTime = new TQTime( TQT_TQTIME_OBJECT(info.lastModified().time()) );
+        smModificationTime = new TQTime( info.lastModified().time() );
         TQTextStream t(&f);
         t.setEncoding( TQTextStream::Latin1 );
         TQString s = t.readLine();
@@ -1484,7 +1482,7 @@ static void checkRestartVersion( TQSessionManager& sm )
 void TDEApplication::saveState( TQSessionManager& sm )
 {
     d->session_save = true;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     static bool firstTime = true;
     mySmcConnection = (SmcConn) sm.handle();
 
@@ -1570,7 +1568,7 @@ bool TDEApplication::sessionSaving() const
 
 void TDEApplication::startKdeinit()
 {
-#ifndef Q_WS_WIN //TODO
+#ifndef TQ_WS_WIN //TODO
   TDEInstance inst( "starttdeinitlock" );
   TDELockFile lock( locateLocal( "tmp", "starttdeinitlock", &inst ));
   if( lock.lock( TDELockFile::LockNoBlock ) != TDELockFile::LockOK ) {
@@ -1586,7 +1584,7 @@ void TDEApplication::startKdeinit()
   if (srv.isEmpty())
      return;
   if (kapp && (Tty != kapp->type()))
-    setOverrideCursor( tqwaitCursor );
+    setOverrideCursor( TQt::waitCursor );
   my_system(TQFile::encodeName(srv)+" --suicide"+" --new-startup");
   if (kapp && (Tty != kapp->type()))
     restoreOverrideCursor();
@@ -1604,7 +1602,7 @@ void TDEApplication::dcopFailure(const TQString &msg)
   }
   if (failureCount == 2)
   {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
      TDEGlobal::config()->setGroup("General");
      if (TDEGlobal::config()->readBoolEntry("ignoreDCOPFailures", false))
          return;
@@ -1637,7 +1635,7 @@ void TDEApplication::dcopFailure(const TQString &msg)
 static const TDECmdLineOptions qt_options[] =
 {
   //FIXME: Check if other options are specific to Qt/X11
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    { "display <displayname>", I18N_NOOP("Use the X-server display 'displayname'"), 0},
 #else
    { "display <displayname>", I18N_NOOP("Use the QWS display 'displayname'"), 0},
@@ -1658,13 +1656,13 @@ static const TDECmdLineOptions qt_options[] =
    { "button <color>", I18N_NOOP("sets the default button color"), 0},
    { "name <name>", I18N_NOOP("sets the application name"), 0},
    { "title <title>", I18N_NOOP("sets the application title (caption)"), 0},
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    { "visual TrueColor", I18N_NOOP("forces the application to use a TrueColor visual on\nan 8-bit display"), 0},
    { "inputstyle <inputstyle>", I18N_NOOP("sets XIM (X Input Method) input style. Possible\nvalues are onthespot, overthespot, offthespot and\nroot"), 0 },
    { "im <XIM server>", I18N_NOOP("set XIM server"),0},
    { "noxim", I18N_NOOP("disable XIM"), 0 },
 #endif
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
    { "qws", I18N_NOOP("forces the application to run as QWS Server"), 0},
 #endif
    { "reverse", I18N_NOOP("mirrors the whole layout of widgets"), 0},
@@ -1781,7 +1779,7 @@ void TDEApplication::parseCommandLine( )
         TDECrash::setApplicationName(TQString(args->appName()));
     }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( args->isSet( "waitforwm" ) ) {
         Atom type;
         (void) desktop(); // trigger desktop creation, we need PropertyNotify events for the root window
@@ -1876,7 +1874,7 @@ TDEApplication::~TDEApplication()
 
   TDEProcessController::deref();
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   if ( d->oldXErrorHandler != NULL )
       XSetErrorHandler( d->oldXErrorHandler );
   if ( d->oldXIOErrorHandler != NULL )
@@ -1888,7 +1886,7 @@ TDEApplication::~TDEApplication()
   delete d;
   KApp = 0;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   mySmcConnection = 0;
   delete smModificationTime;
   smModificationTime = 0;
@@ -1904,7 +1902,7 @@ TDEApplication::~TDEApplication()
 }
 
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 class KAppX11HackWidget: public TQWidget
 {
 public:
@@ -1912,7 +1910,7 @@ public:
 };
 #endif
 
-#if defined(Q_WS_X11) && defined(COMPOSITE)
+#if defined(TQ_WS_X11) && defined(COMPOSITE)
 bool TDEApplication::isCompositionManagerAvailable() {
 	bool have_manager = false;
 
@@ -2034,23 +2032,23 @@ Display* TDEApplication::openX11RGBADisplay() {
 	return dpy;
 }
 
-Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
+TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
 	getX11RGBAInformation(dpy);
 	if (TDEApplication::isCompositionManagerAvailable() == true) {
 		return argb_x11_visual;
 	}
 	else {
-		return (Qt::HANDLE)NULL;
+		return (TQt::HANDLE)NULL;
 	}
 }
 
-Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
+TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
 	getX11RGBAInformation(dpy);
 	if (TDEApplication::isCompositionManagerAvailable() == true) {
 		return argb_x11_colormap;
 	}
 	else {
-		return (Qt::HANDLE)NULL;
+		return (TQt::HANDLE)NULL;
 	}
 }
 
@@ -2091,8 +2089,8 @@ void TDEApplication::getX11RGBAInformation(Display *dpy) {
 	}
 	
 	if( argb_visual ) {
-		argb_x11_visual = Qt::HANDLE( visual );
-		argb_x11_colormap = Qt::HANDLE( colormap );
+		argb_x11_visual = TQt::HANDLE( visual );
+		argb_x11_colormap = TQt::HANDLE( colormap );
 		argb_visual = true;
 		return;
 	}
@@ -2146,11 +2144,11 @@ Display* TDEApplication::openX11RGBADisplay() {
 	return 0;
 }
 
-Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
+TQt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
 	return 0;
 }
 
-Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
+TQt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
 	return 0;
 }
 
@@ -2166,7 +2164,7 @@ void TDEApplication::dcopBlockUserInput( bool b )
     kapp_block_user_input = b;
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 bool TDEApplication::x11EventFilter( XEvent *_event )
 {
     if ( kapp_block_user_input ) {
@@ -2263,11 +2261,11 @@ bool TDEApplication::x11EventFilter( XEvent *_event )
     }
     return false;
 }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 void TDEApplication::updateUserTimestamp( unsigned long time )
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     Display *display = tqt_xdisplay();
     if (!display) {
         return;
@@ -2283,16 +2281,16 @@ void TDEApplication::updateUserTimestamp( unsigned long time )
         time = ev.xproperty.time;
         XDestroyWindow( display, w );
     }
-    if( GET_QT_X_USER_TIME() == 0
-        || NET::timestampCompare( time, GET_QT_X_USER_TIME() ) > 0 ) // check time > tqt_x_user_time
-        SET_QT_X_USER_TIME(time);
+    if( get_tqt_x_user_time() == 0
+        || NET::timestampCompare( time, get_tqt_x_user_time() ) > 0 ) // check time > tqt_x_user_time
+        set_tqt_x_user_time(time);
 #endif
 }
 
 unsigned long TDEApplication::userTimestamp() const
 {
-#if defined Q_WS_X11
-    return GET_QT_X_USER_TIME();
+#if defined TQ_WS_X11
+    return get_tqt_x_user_time();
 #else
     return 0;
 #endif
@@ -2300,16 +2298,16 @@ unsigned long TDEApplication::userTimestamp() const
 
 void TDEApplication::updateRemoteUserTimestamp( const TQCString& dcopId, unsigned long time )
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     if( time == 0 )
-        time = GET_QT_X_USER_TIME();
+        time = get_tqt_x_user_time();
     DCOPRef( dcopId, "MainApplication-Interface" ).call( "updateUserTimestamp", time );
 #endif
 }
 
 void TDEApplication::invokeEditSlot( const char *slot )
 {
-  TQObject *object = TQT_TQOBJECT(focusWidget());
+  TQObject *object = focusWidget();
   if( !object )
     return;
 
@@ -2443,13 +2441,13 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
     TQColor trinity4VisitedLink( 82, 24, 139 );
 
     TQColor background = config->readColorEntry( "background", &trinity4Background );
-    TQColor foreground = config->readColorEntry( "foreground", tqblackptr );
+    TQColor foreground = config->readColorEntry( "foreground", &TQt::black );
     TQColor button = config->readColorEntry( "buttonBackground", &trinity4Button );
-    TQColor buttonText = config->readColorEntry( "buttonForeground", tqblackptr );
+    TQColor buttonText = config->readColorEntry( "buttonForeground", &TQt::black );
     TQColor highlight = config->readColorEntry( "selectBackground", &trinity4Blue );
-    TQColor highlightedText = config->readColorEntry( "selectForeground", tqwhiteptr );
-    TQColor base = config->readColorEntry( "windowBackground", tqwhiteptr );
-    TQColor baseText = config->readColorEntry( "windowForeground", tqblackptr );
+    TQColor highlightedText = config->readColorEntry( "selectForeground", &TQt::white );
+    TQColor base = config->readColorEntry( "windowBackground", &TQt::white );
+    TQColor baseText = config->readColorEntry( "windowForeground", &TQt::black );
     TQColor link = config->readColorEntry( "linkColor", &trinity4Link );
     TQColor visitedLink = config->readColorEntry( "visitedLinkColor", &trinity4VisitedLink );
 
@@ -2464,12 +2462,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
     if (v > 128)
 	// dark bg, light fg - need a darker disabled fg
 	disfg = disfg.dark(lowlightVal);
-    else if (disfg != Qt::black)
+    else if (disfg != TQt::black)
 	// light bg, dark fg - need a lighter disabled fg - but only if !black
 	disfg = disfg.light(highlightVal);
     else
 	// black fg - use darkgray disabled fg
-	disfg = Qt::darkGray;
+	disfg = TQt::darkGray;
 
 
     TQColorGroup disabledgrp(disfg, background,
@@ -2502,12 +2500,12 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
     if (v > 128)
 	// dark button, light buttonText - need a darker disabled buttonText
 	disbtntext = disbtntext.dark(lowlightVal);
-    else if (disbtntext != Qt::black)
+    else if (disbtntext != TQt::black)
 	// light buttonText, dark button - need a lighter disabled buttonText - but only if !black
 	disbtntext = disbtntext.light(highlightVal);
     else
 	// black button - use darkgray disabled buttonText
-	disbtntext = Qt::darkGray;
+	disbtntext = TQt::darkGray;
 
     disabledgrp.setColor(TQColorGroup::ButtonText, disbtntext);
     disabledgrp.setColor(TQColorGroup::Midlight, background.light(110));
@@ -2521,7 +2519,7 @@ TQPalette TDEApplication::createApplicationPalette( TDEConfig *config, int contr
 
 void TDEApplication::tdedisplaySetPalette()
 {
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
     //Can I have this on other platforms, please!? --Sam
     {
         TDEConfig *config = TDEGlobal::config();
@@ -2540,8 +2538,8 @@ void TDEApplication::tdedisplaySetPalette()
 void TDEApplication::tdedisplaySetFont()
 {
     TQApplication::setFont(TDEGlobalSettings::generalFont(), true);
-    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQMENUBAR_OBJECT_NAME_STRING);
-    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, TQPOPUPMENU_OBJECT_NAME_STRING);
+    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQMenuBar");
+    TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TQPopupMenu");
     TQApplication::setFont(TDEGlobalSettings::menuFont(), true, "TDEPopupTitle");
 
     // "patch" standard TQStyleSheet to follow our fonts
@@ -2593,15 +2591,15 @@ void TDEApplication::propagateSettings(SettingsCategory arg)
     TQApplication::setWheelScrollLines(num);
 
     bool b = config->readBoolEntry("EffectAnimateMenu", false);
-    TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, b);
+    TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, b);
     b = config->readBoolEntry("EffectFadeMenu", false);
-    TQApplication::setEffectEnabled( Qt::UI_FadeMenu, b);
+    TQApplication::setEffectEnabled( TQt::UI_FadeMenu, b);
     b = config->readBoolEntry("EffectAnimateCombo", false);
-    TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, b);
+    TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, b);
     b = config->readBoolEntry("EffectAnimateTooltip", false);
-    TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, b);
+    TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, b);
     b = config->readBoolEntry("EffectFadeTooltip", false);
-    TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, b);
+    TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, b);
     b = !config->readBoolEntry("EffectNoTooltip", false);
     TQToolTip::setGloballyEnabled( b );
 
@@ -2644,8 +2642,8 @@ void TDEApplication::installKDEPropertyMap()
     kdeMap->insert( "KIntSpinBox", "value" );
     kdeMap->insert( "KDoubleNumInput", "value" );
     // Temp til fixed in QT then enable ifdef with the correct version num
-    kdeMap->insert( TQGROUPBOX_OBJECT_NAME_STRING, "checked" );
-    kdeMap->insert( TQTABWIDGET_OBJECT_NAME_STRING, "currentPage" );
+    kdeMap->insert( "TQGroupBox", "checked" );
+    kdeMap->insert( "TQTabWidget", "currentPage" );
     TQSqlPropertyMap::installDefaultMap( kdeMap );
 #endif
 }
@@ -2656,7 +2654,7 @@ void TDEApplication::invokeHelp( const TQString& anchor,
     return invokeHelp( anchor, _appname, "" );
 }
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
 // for win32 we're using simple help tools like Qt Assistant,
 // see kapplication_win.cpp
 void TDEApplication::invokeHelp( const TQString& anchor,
@@ -2789,7 +2787,7 @@ void TDEApplication::invokeMailer(const TQString &to, const TQString &cc, const
     return invokeMailer(to,cc,bcc,subject,body,messageFile,attachURLs,"");
 }
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
 // on win32, for invoking browser we're using win32 API
 // see kapplication_win.cpp
 
@@ -3002,7 +3000,7 @@ void TDEApplication::invokeBrowser( const TQString &url )
     return invokeBrowser( url, "" );
 }
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
 // on win32, for invoking browser we're using win32 API
 // see kapplication_win.cpp
 void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startup_id )
@@ -3023,27 +3021,27 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu
 
 void TDEApplication::cut()
 {
-  invokeEditSlot( TQT_SLOT( cut() ) );
+  invokeEditSlot( TQ_SLOT( cut() ) );
 }
 
 void TDEApplication::copy()
 {
-  invokeEditSlot( TQT_SLOT( copy() ) );
+  invokeEditSlot( TQ_SLOT( copy() ) );
 }
 
 void TDEApplication::paste()
 {
-  invokeEditSlot( TQT_SLOT( paste() ) );
+  invokeEditSlot( TQ_SLOT( paste() ) );
 }
 
 void TDEApplication::clear()
 {
-  invokeEditSlot( TQT_SLOT( clear() ) );
+  invokeEditSlot( TQ_SLOT( clear() ) );
 }
 
 void TDEApplication::selectAll()
 {
-  invokeEditSlot( TQT_SLOT( selectAll() ) );
+  invokeEditSlot( TQ_SLOT( selectAll() ) );
 }
 
 void TDEApplication::broadcastKeyCode(unsigned int keyCode)
@@ -3096,7 +3094,7 @@ startServiceInternal( const TQCString &function,
    TQByteArray replyData;
    TQCString _launcher = TDEApplication::launcher();
    TQValueList<TQCString> envs;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    if (tqt_xdisplay()) {
        TQCString dpystring(XDisplayString(tqt_xdisplay()));
        envs.append( TQCString("DISPLAY=") + dpystring );
@@ -3106,7 +3104,7 @@ startServiceInternal( const TQCString &function,
    }
 #endif
    stream << envs;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
    // make sure there is id, so that user timestamp exists
    stream << ( startup_id.isEmpty() ? TDEStartupInfo::createNewStartupId() : startup_id );
 #endif
@@ -3345,8 +3343,8 @@ void TDEApplication::setTopWidget( TQWidget *topWidget )
 
     // set the specified icons
     topWidget->setIcon( icon() ); //standard X11
-#if defined Q_WS_X11
-//#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded
+#if defined TQ_WS_X11
+//#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded
     KWin::setIcons(topWidget->winId(), icon(), miniIcon() ); // NET_WM hints for KWin
 
     // set the app startup notification window property
@@ -3363,7 +3361,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id )
 {
     if( startup_id == d->startup_id )
         return;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     TDEStartupInfo::handleAutoAppStartedSending(); // finish old startup notification if needed
 #endif
     if( startup_id.isEmpty())
@@ -3371,7 +3369,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id )
     else
         {
         d->startup_id = startup_id;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
         TDEStartupInfoId id;
         id.initId( startup_id );
         long timestamp = id.timestamp();
@@ -3385,7 +3383,7 @@ void TDEApplication::setStartupId( const TQCString& startup_id )
 // not to propagate it to processes started from this app
 void TDEApplication::read_app_startup_id()
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     TDEStartupInfoId id = TDEStartupInfo::currentStartupIdEnv();
     TDEStartupInfo::resetStartupEnv();
     d->startup_id = id.id();
@@ -3593,7 +3591,7 @@ bool TDEApplication::authorizeURLAction(const TQString &action, const KURL &_bas
 
 uint TDEApplication::keyboardModifiers()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     Window root;
     Window child;
     int root_x, root_y, win_x, win_y;
@@ -3612,13 +3610,13 @@ uint TDEApplication::keyboardModifiers()
 uint TDEApplication::mouseState()
 {
     uint mousestate;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     Window root;
     Window child;
     int root_x, root_y, win_x, win_y;
     XQueryPointer( tqt_xdisplay(), tqt_xrootwin(), &root, &child,
                    &root_x, &root_y, &win_x, &win_y, &mousestate );
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
     const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON);
     if (GetAsyncKeyState(VK_LBUTTON))
         mousestate |= (mousebtn_swapped ? Button3Mask : Button1Mask);
@@ -3626,7 +3624,7 @@ uint TDEApplication::mouseState()
         mousestate |= Button2Mask;
     if (GetAsyncKeyState(VK_RBUTTON))
         mousestate |= (mousebtn_swapped ? Button1Mask : Button3Mask);
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
     mousestate = GetCurrentEventButtonState();
 #else
     //TODO: other platforms
@@ -3634,10 +3632,10 @@ uint TDEApplication::mouseState()
     return mousestate & 0xff00;
 }
 
-TQ_ButtonState TDEApplication::keyboardMouseState()
+TQt::ButtonState TDEApplication::keyboardMouseState()
 {
     int ret = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     Window root;
     Window child;
     int root_x, root_y, win_x, win_y;
@@ -3646,52 +3644,52 @@ TQ_ButtonState TDEApplication::keyboardMouseState()
                    &root_x, &root_y, &win_x, &win_y, &state );
     // transform the same way like Qt's qt_x11_translateButtonState()
     if( state & Button1Mask )
-        ret |= TQ_LeftButton;
+        ret |= LeftButton;
     if( state & Button2Mask )
-        ret |= TQ_MidButton;
+        ret |= MidButton;
     if( state & Button3Mask )
-        ret |= TQ_RightButton;
+        ret |= RightButton;
     if( state & ShiftMask )
-        ret |= TQ_ShiftButton;
+        ret |= ShiftButton;
     if( state & ControlMask )
-        ret |= TQ_ControlButton;
+        ret |= ControlButton;
     if( state & KKeyNative::modX( KKey::ALT ))
-        ret |= TQ_AltButton;
+        ret |= AltButton;
     if( state & KKeyNative::modX( KKey::WIN ))
-        ret |= TQ_MetaButton;
-#elif defined(Q_WS_WIN)
+        ret |= MetaButton;
+#elif defined(TQ_WS_WIN)
     const bool mousebtn_swapped = GetSystemMetrics(SM_SWAPBUTTON);
     if (GetAsyncKeyState(VK_LBUTTON))
         ret |= (mousebtn_swapped ? RightButton : LeftButton);
     if (GetAsyncKeyState(VK_MBUTTON))
-        ret |= TQ_MidButton;
+        ret |= MidButton;
     if (GetAsyncKeyState(VK_RBUTTON))
-        ret |= (mousebtn_swapped ? TQ_LeftButton : TQ_RightButton);
+        ret |= (mousebtn_swapped ? LeftButton : RightButton);
     if (GetAsyncKeyState(VK_SHIFT))
-        ret |= TQ_ShiftButton;
+        ret |= ShiftButton;
     if (GetAsyncKeyState(VK_CONTROL))
-        ret |= TQ_ControlButton;
+        ret |= ControlButton;
     if (GetAsyncKeyState(VK_MENU))
-        ret |= TQ_AltButton;
+        ret |= AltButton;
     if (GetAsyncKeyState(VK_LWIN) || GetAsyncKeyState(VK_RWIN))
-        ret |= TQ_MetaButton;
+        ret |= MetaButton;
 #else
     //TODO: other platforms
 #endif
     return static_cast< ButtonState >( ret );
 }
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 int TDEApplication::currentX11VT()
 {
 	return get_x_vtnum(TQPaintDevice::x11AppDisplay());
 }
-#else // Q_WS_X11
+#else // TQ_WS_X11
 int TDEApplication::currentX11VT()
 {
 	return -1;
 }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 void TDEApplication::installSigpipeHandler()
 {
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 1b4fbe097..1c1563026 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -33,7 +33,7 @@ class DCOPObject;
 #include <tqtglobaldefines.h>
 
 typedef unsigned long Atom;
-#if !defined(Q_WS_X11)
+#if !defined(TQ_WS_X11)
 typedef void Display;
 #endif
 
@@ -96,7 +96,7 @@ class TDEApplicationPrivate;
 class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance
 {
 
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /** Position of the caption (presumably in the application window's
   *   title bar). This enum appears to be unused.
@@ -140,7 +140,7 @@ public:
 #endif // TDEAPPLICATION_BINARY_COMPAT_HACK
 #endif // Q_QDOC
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   /**
    * Constructor. Parses command-line arguments. Use this constructor when you
    * you want ARGB support to be automatically detected and enabled.
@@ -187,7 +187,7 @@ public:
    * 
    * @see RGBADisplay()
    */
-  TDEApplication(Display *display, bool disable_argb, Qt::HANDLE visual, Qt::HANDLE colormap, bool allowStyles);
+  TDEApplication(Display *display, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles);
 
   /**
    * Constructor. Parses command-line arguments. Use this constructor when you
@@ -212,7 +212,7 @@ public:
    *
    * @since KDE 3.3
    */
-  TDEApplication(Display *display, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0,
+  TDEApplication(Display *display, TQt::HANDLE visual = 0, TQt::HANDLE colormap = 0,
                bool allowStyles=true);
 
   /**
@@ -621,7 +621,7 @@ public slots:
    * If the widget with focus provides a cut() slot, call that slot.  Thus for a
    * simple application cut can be implemented as:
    * \code
-   * KStdAction::cut( kapp, TQT_SLOT( cut() ), actionCollection() );
+   * KStdAction::cut( kapp, TQ_SLOT( cut() ), actionCollection() );
    * \endcode
    */
   void cut();
@@ -630,7 +630,7 @@ public slots:
    * If the widget with focus provides a copy() slot, call that slot.  Thus for a
    * simple application copy can be implemented as:
    * \code
-   * KStdAction::copy( kapp, TQT_SLOT( copy() ), actionCollection() );
+   * KStdAction::copy( kapp, TQ_SLOT( copy() ), actionCollection() );
    * \endcode
    */
   void copy();
@@ -639,7 +639,7 @@ public slots:
    * If the widget with focus provides a paste() slot, call that slot.  Thus for a
    * simple application copy can be implemented as:
    * \code
-   * KStdAction::paste( kapp, TQT_SLOT( paste() ), actionCollection() );
+   * KStdAction::paste( kapp, TQ_SLOT( paste() ), actionCollection() );
    * \endcode
    */
   void paste();
@@ -648,7 +648,7 @@ public slots:
    * If the widget with focus provides a clear() slot, call that slot.  Thus for a
    * simple application clear() can be implemented as:
    * \code
-   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
+   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQ_SLOT( clear() ), actionCollection(), "clear" );
    * \endcode
    *
    * Note that for some widgets, this may not provide the intended bahavior.  For
@@ -660,7 +660,7 @@ public slots:
    *
    * \code
    * class MyListView : public TDEListView {
-   *   Q_OBJECT
+   *   TQ_OBJECT
    * public:
    *   MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : TDEListView( parent, name, f ) {}
    *   virtual ~MyListView() {}
@@ -675,7 +675,7 @@ public slots:
    * If the widget with focus provides a selectAll() slot, call that slot.  Thus for a
    * simple application select all can be implemented as:
    * \code
-   * KStdAction::selectAll( kapp, TQT_SLOT( selectAll() ), actionCollection() );
+   * KStdAction::selectAll( kapp, TQ_SLOT( selectAll() ), actionCollection() );
    * \endcode
    */
   void selectAll();
@@ -935,7 +935,7 @@ public:
    */
   TQString checkRecoverFile( const TQString& pFilename, bool& bRecover ) const;
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
   /**
    * @internal
    * Get the X11 display
@@ -984,14 +984,14 @@ public:
    *
    * @return A pointer to the X11 display visual
    */
-   Qt::HANDLE getX11RGBAVisual(Display *dpy);
+   TQt::HANDLE getX11RGBAVisual(Display *dpy);
 
   /**
    * Returns the X11 display colormap
    *
    * @return An X11 display colormap object
    */
-   Qt::HANDLE getX11RGBAColormap(Display *dpy);
+   TQt::HANDLE getX11RGBAColormap(Display *dpy);
 
   /**
    * Returns whether or not X11 composition is available
@@ -1262,11 +1262,11 @@ protected:
    */
   TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance* _instance );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   /**
    * @internal Used by KUniqueApplication
    */
-  TDEApplication( Display *display, Qt::HANDLE visual, Qt::HANDLE colormap,
+  TDEApplication( Display *display, TQt::HANDLE visual, TQt::HANDLE colormap,
 		  bool allowStyles, TDEInstance* _instance );
 
   /**
@@ -1287,7 +1287,7 @@ protected:
    * This method is used internally to determine which edit slots are implemented
    * by the widget that has the focus, and to invoke those slots if available.
    *
-   * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() )
+   * @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT( cut() )
    *
    * This method can be used in TDEApplication subclasses to implement application wide
    * edit actions not supported by the TDEApplication class.  For example (in your subclass):
@@ -1295,7 +1295,7 @@ protected:
    * \code
    * void MyApplication::deselect()
    * {
-   *   invokeEditSlot( TQT_SLOT( deselect() ) );
+   *   invokeEditSlot( TQ_SLOT( deselect() ) );
    * }
    * \endcode
    *
@@ -1303,7 +1303,7 @@ protected:
    * focused widget if it provides this slot.  You can combine this with TDEAction with:
    *
    * \code
-   * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQT_SLOT( cut() ), actionCollection() );
+   * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQ_SLOT( cut() ), actionCollection() );
    * \endcode
    *
    * @see cut()
@@ -1352,9 +1352,9 @@ private:
   void initUrlActionRestrictions();
 
   bool argb_visual;
-#if defined(Q_WS_X11)
-  Qt::HANDLE argb_x11_visual;
-  Qt::HANDLE argb_x11_colormap;
+#if defined(TQ_WS_X11)
+  TQt::HANDLE argb_x11_visual;
+  TQt::HANDLE argb_x11_colormap;
 #endif
 
 public:
@@ -1452,7 +1452,7 @@ signals:
    * connect to this to monitor global font changes, especially if you are
    * using explicit fonts.
    *
-   * Note: If you derive from a QWidget-based class, a faster method is to
+   * Note: If you derive from a TQWidget-based class, a faster method is to
    *       reimplement TQWidget::fontChange(). This is the preferred way
    *       to get informed about font updates.
    */
diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
index 0b9e2693f..548fee4dc 100644
--- a/tdecore/tdecmdlineargs.cpp
+++ b/tdecore/tdecmdlineargs.cpp
@@ -43,13 +43,13 @@
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define DISPLAY "DISPLAY"
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
 #define DISPLAY "QWS_DISPLAY"
 #endif
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include <win32_utils.h>
 #endif
 
@@ -184,7 +184,7 @@ TDECmdLineArgs::init(int _argc, char **_argv, const TDEAboutData *_about, bool n
    parsed = false;
    mCwd = mCwdd.setObject(mCwd, new char [PATH_MAX+1], true);
    (void) getcwd(mCwd, PATH_MAX);
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
    win32_slashify(mCwd, PATH_MAX);
 #endif
    if (!noKApp)
@@ -926,7 +926,7 @@ TDECmdLineArgs::usage(const char *id)
             name = name.mid(1);
             if ((name[0] == '[') && (name[name.length()-1] == ']'))
          name = name.mid(1, name.length()-2);
-            printQ(optionFormatString.arg(QString(name), -25)
+            printQ(optionFormatString.arg(TQString(name), -25)
      .arg(description));
          }
          else
@@ -950,12 +950,12 @@ TDECmdLineArgs::usage(const char *id)
                opt = opt + name;
                if (!option->def)
                {
-                  printQ(optionFormatString.arg(QString(opt), -25)
+                  printQ(optionFormatString.arg(TQString(opt), -25)
                          .arg(description));
                }
                else
                {
-                  printQ(optionFormatStringDef.arg(QString(opt), -25)
+                  printQ(optionFormatStringDef.arg(TQString(opt), -25)
                          .arg(description).arg(option->def));
                }
                opt = "";
@@ -1099,7 +1099,7 @@ TDECmdLineArgs::setOption(const TQCString &opt, const char *value)
       addArgument(arg);
       addArgument(value);
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       // Hack coming up!
       if (arg == "-display")
       {
diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h
index 2ae0549de..0c23525af 100644
--- a/tdecore/tdeconfig.h
+++ b/tdecore/tdeconfig.h
@@ -42,7 +42,7 @@ class TDEConfigPrivate;
 */
 class TDECORE_EXPORT TDEConfig : public TDEConfigBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdecore/tdeconfig_compiler/README.dox b/tdecore/tdeconfig_compiler/README.dox
index 1b4926e96..b79a086cf 100644
--- a/tdecore/tdeconfig_compiler/README.dox
+++ b/tdecore/tdeconfig_compiler/README.dox
@@ -213,8 +213,8 @@ color_3=#ffff00
 \endverbatim
 
 The configuration options will be accessible to the application via
-a QColor color(int ColorIndex) and a 
-void setColor(int ColorIndex, const QColor &v) function.
+a TQColor color(int ColorIndex) and a 
+void setColor(int ColorIndex, const TQColor &v) function.
 
 Example 2:
 \verbatim
@@ -239,8 +239,8 @@ sound_Crash=crash.wav
 sound_Missile=missile.wav
 
 The configuration options will be accessible to the application via
-a QString sound(int SoundEvent) and a 
-void setSound(int SoundEvent, const QString &v) function.
+a TQString sound(int SoundEvent) and a 
+void setSound(int SoundEvent, const TQString &v) function.
 
 - Parameterized groups
 
diff --git a/tdecore/tdeconfig_compiler/example/example.kcfg b/tdecore/tdeconfig_compiler/example/example.kcfg
index 076bfb644..346e652bb 100644
--- a/tdecore/tdeconfig_compiler/example/example.kcfg
+++ b/tdecore/tdeconfig_compiler/example/example.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="MyPath" type="Path">
       <label>This is a path</label>
-      <default code="true">QDir::homeDirPath()+QString::fromLatin1(".hidden_file")</default>
+      <default code="true">QDir::homeDirPath()+TQString::fromLatin1(".hidden_file")</default>
     </entry>
     <entry name="MyPaths" type="PathList">
       <label>This is a list of paths</label>
diff --git a/tdecore/tdeconfig_compiler/example/general_base.ui b/tdecore/tdeconfig_compiler/example/general_base.ui
index 9b41370c7..9f9d8fbb1 100644
--- a/tdecore/tdeconfig_compiler/example/general_base.ui
+++ b/tdecore/tdeconfig_compiler/example/general_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>GeneralBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>GeneralBase</cstring>
     </property>
diff --git a/tdecore/tdeconfig_compiler/example/myoptions_base.ui b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
index 3c0c2e6cb..62f0356c5 100644
--- a/tdecore/tdeconfig_compiler/example/myoptions_base.ui
+++ b/tdecore/tdeconfig_compiler/example/myoptions_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>MyOptionsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>MyOptionsBase</cstring>
     </property>
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index 3dd450061..a3e8e2c8f 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -353,7 +353,7 @@ bool TDEConfigINIBackEnd::parseConfigFiles()
     TQStringList tdercs = TDEGlobal::dirs()->
       findAllResources("config", TQString::fromLatin1("kdeglobals"));
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     TQString etc_tderc = TQFile::decodeName( TQCString(getenv("WINDIR")) + "\\tderc" );
 #else
     TQString etc_tderc = TQString::fromLatin1("/etc/tderc");
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index f4b2722fa..39e491279 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -435,7 +435,7 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
       case TQVariant::DateTime:
           return TQVariant( readDateTimeEntry( pKey, &tmp.asDateTime() ) );
       case TQVariant::Date:
-          return TQVariant(TQT_TQDATE_OBJECT(readDateTimeEntry( pKey, &tmp.asDateTime() ).date()));
+          return TQVariant(readDateTimeEntry( pKey, &tmp.asDateTime() ).date());
 
       case TQVariant::Pixmap:
       case TQVariant::Image:
@@ -451,35 +451,13 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
       case TQVariant::Cursor:
       case TQVariant::SizePolicy:
       case TQVariant::Time:
-#ifdef USE_QT3
       case TQVariant::ByteArray:
-#endif // USE_QT3
       case TQVariant::BitArray:
       case TQVariant::KeySequence:
       case TQVariant::Pen:
-#ifdef USE_QT4
-      case TQVariant::Char:
-      case TQVariant::Url:
-      case TQVariant::Locale:
-      case TQVariant::RectF:
-      case TQVariant::SizeF:
-      case TQVariant::Line:
-      case TQVariant::LineF:
-      case TQVariant::PointF:
-      case TQVariant::RegExp:
-      case TQVariant::Hash:
-      case TQVariant::TextLength:
-      case QVariant::TextFormat:
-      case TQVariant::Matrix:
-      case TQVariant::Transform:
-      case TQVariant::Matrix4x4:
-      case TQVariant::Vector2D:
-      case TQVariant::Vector3D:
-      case TQVariant::Vector4D:
-      case TQVariant::Quaternion:
-      case TQVariant::UserType:
-#endif // USE_QT4
+      {
           break;
+      }
   }
 
   Q_ASSERT( 0 );
@@ -981,7 +959,7 @@ TQColor TDEConfigBase::readColorEntry( const char *pKey,
   TQString aValue = readEntry( pKey );
   if( !aValue.isEmpty() )
     {
-      if ( aValue.at(0) == (QChar)'#' )
+      if ( aValue.at(0) == (TQChar)'#' )
         {
           aRetColor.setNamedColor(aValue);
         }
@@ -1122,7 +1100,7 @@ void TDEConfigBase::writePathEntry( const TQString& pKey, const TQString & path,
 
 static bool cleanHomeDirPath( TQString &path, const TQString &homeDir )
 {
-#ifdef Q_WS_WIN //safer
+#ifdef TQ_WS_WIN //safer
    if (!TQDir::convertSeparators(path).startsWith(TQDir::convertSeparators(homeDir)))
         return false;
 #else
@@ -1376,35 +1354,13 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQVariant &prop,
     case TQVariant::Cursor:
     case TQVariant::SizePolicy:
     case TQVariant::Time:
-#ifdef USE_QT3
     case TQVariant::ByteArray:
-#endif // USE_QT3
     case TQVariant::BitArray:
     case TQVariant::KeySequence:
     case TQVariant::Pen:
-#ifdef USE_QT4
-    case TQVariant::Char:
-    case TQVariant::Url:
-    case TQVariant::Locale:
-    case TQVariant::RectF:
-    case TQVariant::SizeF:
-    case TQVariant::Line:
-    case TQVariant::LineF:
-    case TQVariant::PointF:
-    case TQVariant::RegExp:
-    case TQVariant::Hash:
-    case TQVariant::TextLength:
-    case QVariant::TextFormat:
-    case TQVariant::Matrix:
-    case TQVariant::Transform:
-    case TQVariant::Matrix4x4:
-    case TQVariant::Vector2D:
-    case TQVariant::Vector3D:
-    case TQVariant::Vector4D:
-    case TQVariant::Quaternion:
-    case TQVariant::UserType:
-#endif // USE_QT4
+      {
         break;
+      }
     }
 
   Q_ASSERT( 0 );
@@ -1445,7 +1401,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStrList &list,
         }
       str_list += sep;
     }
-  if( str_list.at(str_list.length() - 1) == (QChar)sep )
+  if( str_list.at(str_list.length() - 1) == (TQChar)sep )
     str_list.truncate( str_list.length() -1 );
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS );
 }
@@ -1489,7 +1445,7 @@ void TDEConfigBase::writeEntry ( const char *pKey, const TQStringList &list,
         }
       str_list += sep;
     }
-  if( str_list.at(str_list.length() - 1) == (QChar)sep )
+  if( str_list.at(str_list.length() - 1) == (TQChar)sep )
     str_list.truncate( str_list.length() -1 );
   writeEntry( pKey, str_list, bPersistent, bGlobal, bNLS, bExpand );
 }
@@ -1753,8 +1709,8 @@ void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
   TQStrList list;
   TQCString tempstr;
 
-  TQTime time = TQT_TQTIME_OBJECT(rDateTime.time());
-  TQDate date = TQT_TQDATE_OBJECT(rDateTime.date());
+  TQTime time = rDateTime.time();
+  TQDate date = rDateTime.date();
 
   list.insert( 0, tempstr.setNum( date.year() ) );
   list.insert( 1, tempstr.setNum( date.month() ) );
diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h
index a891409e7..79e53dcc6 100644
--- a/tdecore/tdeconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -69,7 +69,7 @@ class TDEConfigGroup;
  */
 class TDECORE_EXPORT TDEConfigBase : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend class TDEConfigBackEnd;
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index 9578c05c1..7b23f43b8 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -69,52 +69,52 @@ void TDEConfigDialogManager::init(bool trackChanges)
   if(trackChanges)
   {
     // QT
-    changedMap.insert(TQBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQCHECKBOX_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQPUSHBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQRADIOBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQButton", TQ_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQCheckBox", TQ_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQPushButton", TQ_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQRadioButton", TQ_SIGNAL(stateChanged(int)));
     // We can only store one thing, so you can't have
     // a ButtonGroup that is checkable.
-    changedMap.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, TQT_SIGNAL(clicked(int)));
-    changedMap.insert(TQGROUPBOX_OBJECT_NAME_STRING, TQT_SIGNAL(toggled(bool)));
-    changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(activated (int)));
+    changedMap.insert("TQButtonGroup", TQ_SIGNAL(clicked(int)));
+    changedMap.insert("TQGroupBox", TQ_SIGNAL(toggled(bool)));
+    changedMap.insert("TQComboBox", TQ_SIGNAL(activated (int)));
     //qsqlproperty map doesn't store the text, but the value!
-    //changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert(TQDATEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDate &)));
-    changedMap.insert(TQDATETIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDateTime &)));
-    changedMap.insert(TQDIAL_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert(TQLINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert(TQSLIDER_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert(TQSPINBOX_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert(TQTIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQTime &)));
-    changedMap.insert(TQTEXTEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged()));
-    changedMap.insert(TQTEXTBROWSER_OBJECT_NAME_STRING, TQT_SIGNAL(sourceChanged(const TQString &)));
-    changedMap.insert(TQMULTILINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged()));
-    changedMap.insert(TQLISTBOX_OBJECT_NAME_STRING, TQT_SIGNAL(selectionChanged()));
-    changedMap.insert(TQTABWIDGET_OBJECT_NAME_STRING, TQT_SIGNAL(currentChanged(TQWidget *)));
+    //changedMap.insert("TQComboBox", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert("TQDateEdit", TQ_SIGNAL(valueChanged(const TQDate &)));
+    changedMap.insert("TQDateTimeEdit", TQ_SIGNAL(valueChanged(const TQDateTime &)));
+    changedMap.insert("TQDial", TQ_SIGNAL(valueChanged (int)));
+    changedMap.insert("TQLineEdit", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert("TQSlider", TQ_SIGNAL(valueChanged(int)));
+    changedMap.insert("TQSpinBox", TQ_SIGNAL(valueChanged(int)));
+    changedMap.insert("TQTimeEdit", TQ_SIGNAL(valueChanged(const TQTime &)));
+    changedMap.insert("TQTextEdit", TQ_SIGNAL(textChanged()));
+    changedMap.insert("TQTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &)));
+    changedMap.insert("TQMultiLineEdit", TQ_SIGNAL(textChanged()));
+    changedMap.insert("TQListBox", TQ_SIGNAL(selectionChanged()));
+    changedMap.insert("TQTabWidget", TQ_SIGNAL(currentChanged(TQWidget *)));
 
     // KDE
-    changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int)));
-    changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int)));
-    changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &)));
-    changedMap.insert( "TDEFontChooser",  TQT_SIGNAL(fontSelected(const TQFont &)));
-    changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int)));
-
-    changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &)));
-    changedMap.insert( "KDatePicker", TQT_SIGNAL(dateSelected (TQDate)));
-    changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate)));
-    changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &)));
-    changedMap.insert( "KEditListBox", TQT_SIGNAL(changed()));
-    changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged()));
-    changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert( "KTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &)));
-    changedMap.insert( "KTextEdit", TQT_SIGNAL(textChanged()));
-    changedMap.insert( "KURLRequester",  TQT_SIGNAL(textChanged (const TQString& )));
-    changedMap.insert( "KIntNumInput", TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert( "KIntSpinBox", TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double)));
+    changedMap.insert( "KComboBox", TQ_SIGNAL(activated (int)));
+    changedMap.insert( "TDEFontCombo", TQ_SIGNAL(activated (int)));
+    changedMap.insert( "TDEFontRequester", TQ_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( "TDEFontChooser",  TQ_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( "KHistoryCombo", TQ_SIGNAL(activated (int)));
+
+    changedMap.insert( "KColorButton", TQ_SIGNAL(changed(const TQColor &)));
+    changedMap.insert( "KDatePicker", TQ_SIGNAL(dateSelected (TQDate)));
+    changedMap.insert( "KDateWidget", TQ_SIGNAL(changed (TQDate)));
+    changedMap.insert( "KDateTimeWidget", TQ_SIGNAL(valueChanged (const TQDateTime &)));
+    changedMap.insert( "KEditListBox", TQ_SIGNAL(changed()));
+    changedMap.insert( "TDEListBox", TQ_SIGNAL(selectionChanged()));
+    changedMap.insert( "KLineEdit", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert( "KPasswordEdit", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert( "KRestrictedLine", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert( "KTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &)));
+    changedMap.insert( "KTextEdit", TQ_SIGNAL(textChanged()));
+    changedMap.insert( "KURLRequester",  TQ_SIGNAL(textChanged (const TQString& )));
+    changedMap.insert( "KIntNumInput", TQ_SIGNAL(valueChanged (int)));
+    changedMap.insert( "KIntSpinBox", TQ_SIGNAL(valueChanged (int)));
+    changedMap.insert( "KDoubleNumInput", TQ_SIGNAL(valueChanged (double)));
   }
 
   // Go through all of the children of the widgets and find all known widgets
@@ -187,8 +187,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
         {
 		   // If the class name of the widget wasn't in the monitored widgets map, then look for 
 		   // it again using the super class name. This fixes a problem with using QtRuby/Korundum 
-		   // widgets with TDEConfigXT where 'Qt::Widget' wasn't being seen a the real deal, even 
-		   // though it was a 'QWidget'.
+		   // widgets with TDEConfigXT where 'TQt::Widget' wasn't being seen a the real deal, even 
+		   // though it was a 'TQWidget'.
           changedIt = changedMap.find(childWidget->metaObject()->superClassName());
         }
 
@@ -199,7 +199,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
         else
         {
           connect(childWidget, *changedIt,
-                  this, TQT_SIGNAL(widgetModified()));
+                  this, TQ_SIGNAL(widgetModified()));
 
           TQGroupBox *gb = dynamic_cast<TQGroupBox *>(childWidget);
           if (!gb)
@@ -209,8 +209,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
 
           TQComboBox *cb = dynamic_cast<TQComboBox *>(childWidget);
           if (cb && cb->editable())
-            connect(cb, TQT_SIGNAL(textChanged(const TQString &)),
-                    this, TQT_SIGNAL(widgetModified()));
+            connect(cb, TQ_SIGNAL(textChanged(const TQString &)),
+                    this, TQ_SIGNAL(widgetModified()));
         }
       }
       else
@@ -218,7 +218,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
         kdWarning(178) << "A widget named '" << widgetName << "' was found but there is no setting named '" << configId << "'" << endl;
       }
     }
-    else if (childWidget->inherits(TQLABEL_OBJECT_NAME_STRING))
+    else if (childWidget->inherits("TQLabel"))
     {
       TQLabel *label = static_cast<TQLabel *>(childWidget);
       TQWidget *buddy = label->buddy();
@@ -238,8 +238,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
       TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
       if (changedIt != changedMap.end())
       {
-        if ((!d->insideGroupBox || !childWidget->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) && 
-            !childWidget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
+        if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) && 
+            !childWidget->inherits("TQGroupBox"))
           kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl;
       }        
     }
@@ -291,7 +291,7 @@ void TDEConfigDialogManager::updateWidgets()
   blockSignals(bSignalsBlocked);
 
   if (changed)
-    TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified()));
+    TQTimer::singleShot(0, this, TQ_SIGNAL(widgetModified()));
 }
 
 void TDEConfigDialogManager::updateWidgetsDefault()
diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h
index ecb3640ea..d3d9644a6 100644
--- a/tdecore/tdeconfigdialogmanager.h
+++ b/tdecore/tdeconfigdialogmanager.h
@@ -77,7 +77,7 @@ class TQSqlPropertyMap;
  */
 class TDECORE_EXPORT TDEConfigDialogManager : public TQObject {
 
-Q_OBJECT
+TQ_OBJECT
 
 signals:
   /**
diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp
index 8ef5f59db..09f496034 100644
--- a/tdecore/tdeglobal.cpp
+++ b/tdecore/tdeglobal.cpp
@@ -139,7 +139,7 @@ void TDEGlobal::setActiveInstance(TDEInstance *i)
 }
 
 /**
- * Create a static QString
+ * Create a static TQString
  *
  * To be used inside functions(!) like:
  * static const TQString &myString = TDEGlobal::staticQString("myText");
@@ -157,7 +157,7 @@ public:
 };
 
 /**
- * Create a static QString
+ * Create a static TQString
  *
  * To be used inside functions(!) like:
  * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text"));
diff --git a/tdecore/tdeglobalsettings.cpp b/tdecore/tdeglobalsettings.cpp
index 79cd4586a..97ef4394c 100644
--- a/tdecore/tdeglobalsettings.cpp
+++ b/tdecore/tdeglobalsettings.cpp
@@ -29,11 +29,11 @@
 
 #include <kipc.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include <windows.h>
 #include "qt_windows.h"
 #include <win32_utils.h>
-static QRgb qt_colorref2qrgb(COLORREF col)
+static TQRgb qt_colorref2qrgb(COLORREF col)
 {
     return tqRgb(GetRValue(col),GetGValue(col),GetBValue(col));
 }
@@ -54,7 +54,7 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 #include <tqtextstream.h>
 #include <tqfile.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #endif
 
@@ -315,7 +315,7 @@ TQColor TDEGlobalSettings::toolBarHighlightColor()
 
 TQColor TDEGlobalSettings::inactiveTitleColor()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION));
 #else
     if (!_inactiveBackground)
@@ -327,7 +327,7 @@ TQColor TDEGlobalSettings::inactiveTitleColor()
 
 TQColor TDEGlobalSettings::inactiveTextColor()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT));
 #else
     if (!_inactiveForeground)
@@ -339,7 +339,7 @@ TQColor TDEGlobalSettings::inactiveTextColor()
 
 TQColor TDEGlobalSettings::activeTitleColor()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION));
 #else
     initColors();
@@ -352,11 +352,11 @@ TQColor TDEGlobalSettings::activeTitleColor()
 
 TQColor TDEGlobalSettings::activeTextColor()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return qt_colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT));
 #else
     TDEConfigGroup g( TDEGlobal::config(), "WM" );
-    return g.readColorEntry( "activeForeground", tqwhiteptr );
+    return g.readColorEntry( "activeForeground", &TQt::white );
 #endif
 }
 
@@ -377,7 +377,7 @@ TQColor TDEGlobalSettings::buttonBackground()
 TQColor TDEGlobalSettings::buttonTextColor()
 {
     TDEConfigGroup g( TDEGlobal::config(), "General" );
-    return g.readColorEntry( "buttonForeground", tqblackptr );
+    return g.readColorEntry( "buttonForeground", &TQt::black );
 }
 
 // IMPORTANT:
@@ -386,7 +386,7 @@ TQColor TDEGlobalSettings::buttonTextColor()
 TQColor TDEGlobalSettings::baseColor()
 {
     TDEConfigGroup g( TDEGlobal::config(), "General" );
-    return g.readColorEntry( "windowBackground", tqwhiteptr );
+    return g.readColorEntry( "windowBackground", &TQt::white );
 }
 
 // IMPORTANT:
@@ -395,7 +395,7 @@ TQColor TDEGlobalSettings::baseColor()
 TQColor TDEGlobalSettings::textColor()
 {
     TDEConfigGroup g( TDEGlobal::config(), "General" );
-    return g.readColorEntry( "windowForeground", tqblackptr );
+    return g.readColorEntry( "windowForeground", &TQt::black );
 }
 
 // IMPORTANT:
@@ -404,7 +404,7 @@ TQColor TDEGlobalSettings::textColor()
 TQColor TDEGlobalSettings::highlightedTextColor()
 {
     TDEConfigGroup g( TDEGlobal::config(), "General" );
-    return g.readColorEntry( "selectForeground", tqwhiteptr );
+    return g.readColorEntry( "selectForeground", &TQt::white );
 }
 
 // IMPORTANT:
@@ -429,7 +429,7 @@ TQColor TDEGlobalSettings::alternateBackgroundColor()
 
 TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base)
 {
-    if (base == Qt::white)
+    if (base == TQt::white)
         return TQColor(238,246,255);
     else
     {
@@ -437,7 +437,7 @@ TQColor TDEGlobalSettings::calculateAlternateBackgroundColor(const TQColor& base
         base.hsv( &h, &s, &v );
         if (v > 128)
             return base.dark(106);
-        else if (base != Qt::black)
+        else if (base != TQt::black)
             return base.light(110);
 
         return TQColor(32,32,32);
@@ -788,7 +788,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
         s_mouseSettings = new KMouseSettings;
         KMouseSettings & s = *s_mouseSettings; // for convenience
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
         TDEConfigGroup g( TDEGlobal::config(), "Mouse" );
         TQString setting = g.readEntry("MouseButtonMapping");
         if (setting == "RightHanded")
@@ -797,7 +797,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
             s.handed = KMouseSettings::LeftHanded;
         else
         {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             // get settings from X server
             // This is a simplified version of the code in input/mouse.cpp
             // Keep in sync !
@@ -822,9 +822,9 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
         // FIXME(E): Implement in Qt Embedded
 #endif
         }
-#endif //Q_WS_WIN
+#endif //TQ_WS_WIN
     }
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     //not cached
     s_mouseSettings->handed = (GetSystemMetrics(SM_SWAPBUTTON) ? KMouseSettings::LeftHanded : KMouseSettings::RightHanded);
 #endif
@@ -833,7 +833,7 @@ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
 
 void TDEGlobalSettings::rereadMouseSettings()
 {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     delete s_mouseSettings;
     s_mouseSettings = 0L;
 #endif
@@ -841,7 +841,7 @@ void TDEGlobalSettings::rereadMouseSettings()
 
 bool TDEGlobalSettings::isMultiHead()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return GetSystemMetrics(SM_CMONITORS) > 1;
 #else
     TQCString multiHead = getenv("TDE_MULTIHEAD");
diff --git a/tdecore/tdeglobalsettings.h b/tdecore/tdeglobalsettings.h
index 74b0d77a8..7a359b60e 100644
--- a/tdecore/tdeglobalsettings.h
+++ b/tdecore/tdeglobalsettings.h
@@ -238,7 +238,7 @@ class TDECORE_EXPORT TDEGlobalSettings
      * Use TDEIO::trash() to trash files, "trash:/" to list the trash contents.
      */
     static TQString trashPath() { initPaths(); return *s_trashPath; }
-    // KDE4: if you want to remove the above, move it to kdesktop/init.cc, which needs
+    // KDE4: if you want to remove the above, move it to kdesktop/init.cpp, which needs
     // to know the old location of the trash
 
     /**
diff --git a/tdecore/tdehw/CMakeLists.txt b/tdecore/tdehw/CMakeLists.txt
index 737d0557c..1951b0d16 100644
--- a/tdecore/tdehw/CMakeLists.txt
+++ b/tdecore/tdehw/CMakeLists.txt
@@ -17,7 +17,7 @@ if( NOT DBUS_SYSTEM_BUS )
   set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
 endif()
 
-if( WITH_TDEHWLIB_DAEMONS OR WITH_HAL OR WITH_DEVKITPOWER OR WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
+if( WITH_TDEHWLIB_DAEMONS OR WITH_DEVKITPOWER OR WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR
     WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT )
   list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} )
   list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} )
@@ -28,10 +28,6 @@ if( WITH_TDEHWLIB_DAEMONS )
   add_definitions( -DWITH_TDEHWLIB_DAEMONS )
 endif( )
 
-if( WITH_HAL )
-  add_definitions( -DWITH_HAL )
-endif( )
-
 if( WITH_DEVKITPOWER )
   add_definitions( -DWITH_DEVKITPOWER )
 endif( )
@@ -124,7 +120,9 @@ set( ${target}_SRCS
   disksHelper.cpp
 )
 
-tde_add_library( ${target} STATIC_PIC AUTOMOC
+tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK udev ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES}
+  VERSION 14.1.0
+  LINK_PRIVATE udev tdecore-shared ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} ${TDEHW_CUSTOM_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdecore/tdehw/disksHelper.cpp b/tdecore/tdehw/disksHelper.cpp
index 4eb3709ca..c47bc5e04 100644
--- a/tdecore/tdehw/disksHelper.cpp
+++ b/tdecore/tdehw/disksHelper.cpp
@@ -64,8 +64,41 @@ TQStringVariantMap udisksEjectDrive(TDEStorageDevice *sdevice) {
 				return result;
 			}
 			else {
-				result["result"] = true;
-				return result;
+				// Eject was successful. Check if the media can be powered off and do so in case
+				TQT_DBusProxy driveInformation("org.freedesktop.UDisks", blockDeviceString,
+						"org.freedesktop.DBus.Properties", dbusConn);
+				params.clear();
+				params << TQT_DBusData::fromString("org.freedesktop.UDisks.Drive") << TQT_DBusData::fromString("DriveCanDetach");
+				TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error);
+				if (error.isValid()) {
+					// Error!
+					result["errStr"] = error.name() + ": " + error.message();
+					return result;
+				}
+
+				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
+					bool canPowerOff = reply[0].toVariant().value.toBool();
+					if (!canPowerOff) {
+						// This drive does not support power off. Just return since the eject operation has finished.
+						result["result"] = true;
+						return result;
+					}
+
+					// Power off the drive!
+					params.clear();
+					TQT_DBusDataMap<TQString> options(TQT_DBusData::Variant);
+					params << TQT_DBusData::fromStringKeyMap(options);
+					TQT_DBusMessage reply = driveControl.sendWithReply("DriveDetach", params, &error);
+					if (error.isValid()) {
+						// Error!
+						result["errStr"] = error.name() + ": " + error.message();
+						return result;
+					}
+					else {
+						result["result"] = true;
+						return result;
+					}
+				}
 			}
 		}
 	}
@@ -193,7 +226,7 @@ TQStringVariantMap udisks2EjectDrive(TDEStorageDevice *sdevice) {
 				TQT_DBusProxy driveInformation("org.freedesktop.UDisks2", driveObjectPath,
 								"org.freedesktop.DBus.Properties", dbusConn);
 				// can eject?
-				TQValueList<TQT_DBusData> params;
+				params.clear();
 				params << TQT_DBusData::fromString("org.freedesktop.UDisks2.Drive") << TQT_DBusData::fromString("Ejectable");
 				TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error);
 				if (error.isValid()) {
@@ -211,7 +244,7 @@ TQStringVariantMap udisks2EjectDrive(TDEStorageDevice *sdevice) {
 
 					// Eject the drive!
 					TQT_DBusProxy driveControl("org.freedesktop.UDisks2", driveObjectPath, "org.freedesktop.UDisks2.Drive", dbusConn);
-					TQValueList<TQT_DBusData> params;
+					params.clear();
 					TQT_DBusDataMap<TQString> options(TQT_DBusData::Variant);
 					params << TQT_DBusData::fromStringKeyMap(options);
 					TQT_DBusMessage reply = driveControl.sendWithReply("Eject", params, &error);
@@ -221,8 +254,39 @@ TQStringVariantMap udisks2EjectDrive(TDEStorageDevice *sdevice) {
 						return result;
 					}
 					else {
-						result["result"] = true;
-						return result;
+						// Eject was successful. Check if the media can be powered off and do so in case
+						params.clear();
+						params << TQT_DBusData::fromString("org.freedesktop.UDisks2.Drive") << TQT_DBusData::fromString("CanPowerOff");
+						TQT_DBusMessage reply = driveInformation.sendWithReply("Get", params, &error);
+						if (error.isValid()) {
+							// Error!
+							result["errStr"] = error.name() + ": " + error.message();
+							return result;
+						}
+
+						if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
+							bool canPowerOff = reply[0].toVariant().value.toBool();
+							if (!canPowerOff) {
+								// This drive does not support power off. Just return since the eject operation has finished.
+								result["result"] = true;
+								return result;
+							}
+
+							// Power off the drive!
+							params.clear();
+							TQT_DBusDataMap<TQString> options(TQT_DBusData::Variant);
+							params << TQT_DBusData::fromStringKeyMap(options);
+							TQT_DBusMessage reply = driveControl.sendWithReply("PowerOff", params, &error);
+							if (error.isValid()) {
+								// Error!
+								result["errStr"] = error.name() + ": " + error.message();
+								return result;
+							}
+							else {
+								result["result"] = true;
+								return result;
+							}
+						}
 					}
 				}
 			}
diff --git a/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf b/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf
index c50a5144d..e3c4b549d 100644
--- a/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf
+++ b/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf
@@ -16,14 +16,6 @@
 
     <allow send_destination="org.trinitydesktop.hardwarecontrol"
            send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.Brightness"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.CPUGovernor"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.InputEvents"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.Power"
-           send_interface="org.freedesktop.DBus.Properties"/>
 
     <allow send_destination="org.trinitydesktop.hardwarecontrol"
            send_interface="org.trinitydesktop.hardwarecontrol"/>
@@ -44,14 +36,6 @@
 
     <allow send_destination="org.trinitydesktop.hardwarecontrol"
            send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.Brightness"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.CPUGovernor"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.InputEvents"
-           send_interface="org.freedesktop.DBus.Properties"/>
-    <allow send_destination="org.trinitydesktop.hardwarecontrol.Power"
-           send_interface="org.freedesktop.DBus.Properties"/>
 
     <allow send_destination="org.trinitydesktop.hardwarecontrol"
            send_interface="org.trinitydesktop.hardwarecontrol"/>
@@ -70,5 +54,9 @@
     <deny own="org.trinitydesktop.hardwarecontrol"/>
 
     <deny send_destination="org.trinitydesktop.hardwarecontrol"/>
+
+    <!-- Allow to read input switches -->
+    <allow send_destination="org.trinitydesktop.hardwarecontrol"
+           send_interface="org.trinitydesktop.hardwarecontrol.InputEvents"/>
   </policy>
 </busconfig>
diff --git a/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids b/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids
index bf4a3ce01..274e042f9 100644
--- a/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids
+++ b/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids
@@ -1,6 +1,6 @@
 # The information provided in this PNP ID to friendly name mapping table was obtained from
 # multiple public sources, as well as this authoritative publicly accessible file:
-# ftp://ftpmicrosoftcom/developr/drg/plug-and-play/devidstxt
+# https://stuff.mit.edu/afs/sipb/contrib/doc/specs/protocol/pnp/devids.txt
 # 
 # This file is provided soley in the interest of cross platform compatibility
 # It only contains information on certain generic core system devices that cannot be looked up via another method
@@ -17,140 +17,332 @@
 # 
 # The two digit code yy appears to be a PCI device type code followed by a subtype code and should be parsed as such
 
-PNP0802	Microsoft® Sound System-compatible device
-
-PNP0000	AT Interrupt Controller
-PNP0001	EISA Interrupt Controller
-PNP0002	MCA Interrupt Controller
-PNP0003	APIC
-PNP0004	Cyrix SLiC MP Interrupt Controller
-
-PNP0100	AT Timer
-PNP0101	EISA Timer
-PNP0102	MCA Timer
-PNP0103	High Precision Event Timer
-
-PNP0200	AT DMA Controller
-PNP0201	EISA DMA Controller
-PNP0202	MCA DMA Controller
-
-PNP0300	IBM PC/XT keyboard controller (83-key)
-PNP0301	IBM PC/AT keyboard controller (86-key)
-PNP0302	IBM PC/XT keyboard controller (84-key)
-PNP0303	IBM Enhanced (101/102-key, PS/2 mouse support)
-PNP0304	Olivetti Keyboard (83-key)
-PNP0305	Olivetti Keyboard (102-key)
-PNP0306	Olivetti Keyboard (86-key)
-PNP0307	Microsoft® Windows(R) Keyboard
-PNP0308	General Input Device Emulation Interface (GIDEI) legacy
-PNP0309	Olivetti Keyboard (A101/102 key)
-PNP030A	AT&T 302 keyboard
-PNP030B	Reserved by Microsoft®
-PNP0320	Japanese 106-key keyboard A01
-PNP0321	Japanese 101-key keyboard
-PNP0322	Japanese AX keyboard
-PNP0323	Japanese 106-key keyboard 002/003
-PNP0324	Japanese 106-key keyboard 001
-PNP0325	Japanese Toshiba Desktop keyboard
-PNP0326	Japanese Toshiba Laptop keyboard
-PNP0327	Japanese Toshiba Notebook keyboard
-PNP0340	Korean 84-key keyboard
-PNP0341	Korean 86-key keyboard
-PNP0342	Korean Enhanced keyboard
-PNP0343	Korean Enhanced keyboard 101b
-PNP0343	Korean Enhanced keyboard 101c
-PNP0344	Korean Enhanced keyboard 103
-
-PNP0400	Standard LPT Printer Port
-PNP0401	ECP Printer Port
-
-PNP0500	Standard PC Serial Port
-PNP0501	16550A-compatible Serial Port
-PNP0502	Multiport Serial Device (non-intelligent 16550)
-PNP0510	Generic IRDA-compatible Device
-PNP0511	Generic IRDA-compatible Device
-
-PNP0600	Generic ESDI/IDE/ATA Compatible Hard Disk Controller
-PNP0603	Generic IDE supporting Microsoft® Device Bay Specification
-PNP0700	PC Standard Floppy Disk Controller
-PNP0701	Microsoft® Device Bay Compatible Floppy Controller
-
-PNP0802	Microsoft® Sound System compatible device
-
-PNP0900	VGA Compatible Display Controller
-PNP09FF	Plug and Play Monitor (VESA DDC)
-
-PNP0A00	ISA Root Bus
-PNP0A01	EISA Root Bus
-PNP0A02	MCA Root Bus
-PNP0A03	PCI Root Bus
-PNP0A04	VESA/VL Bus
-PNP0A05	Generic ACPI Root Bus
-PNP0A06	Generic ACPI Extended-IO Root Bus (EIO Root Bus)
-PNP0A08	PCI Express Root Bus
-
-PNP0800	AT-style Speaker
-PNP0B00	AT Real-Time Clock
-PNP0C00	Plug and Play BIOS
-PNP0C01	System Board
-PNP0C02	Plug and Play Motherboard Register Resource
-PNP0C03	Plug and Play BIOS Event Notification Interrupt
-PNP0C04	Math Coprocessor
-PNP0C05	APM BIOS
-PNP0C06	Early Plug and Play BIOS
-PNP0C07	Early Plug and Play BIOS
-PNP0C08	ACPI System Board
-PNP0C09	ACPI Embedded Controller
-PNP0C0A	ACPI Control Method Battery
-PNP0C0B	ACPI Fan
-PNP0C0C	ACPI Power Button
-PNP0C0D	ACPI Lid Switch
-PNP0C0E	ACPI Sleep Button
-PNP0C0F	PCI Interrupt Link
-PNP0C10	ACPI System Indicator
-PNP0C11	ACPI Thermal Zone
-PNP0C12	Device Bay Controller
-PNP0C13	Plug and Play BIOS
-
-PNP0E00	Intel 82365-Compatible PCMCIA Controller
-PNP0E01	Cirrus Logic CL-PD6720 PCMCIA Controller
-PNP0E02	VLSI VL82C146 PCMCIA Controller
-PNP0E03	Intel 82365-compatible CardBus controller
-
-PNP0F00	Microsoft® Bus Mouse
-PNP0F01	Microsoft® Serial Mouse
-PNP0F02	Microsoft® InPort Mouse
-PNP0F03	Microsoft® PS/2-style Mouse
-PNP0F04	Mouse Systems Mouse
-PNP0F05	Mouse Systems 3-Button Mouse
-PNP0F06	Genius Mouse
-PNP0F07	Genius Mouse
-PNP0F08	Logitech Serial Mouse
-PNP0F09	Microsoft® BallPoint Serial Mouse
-PNP0F0A	Microsoft® Plug and Play Mouse
-PNP0F0B	Microsoft® Plug and Play BallPoint Mouse
-PNP0F0C	Microsoft®-compatible Serial Mouse
-PNP0F0D	Microsoft®-compatible InPort-compatible Mouse
-PNP0F0E	Microsoft®-compatible PS/2-style Mouse
-PNP0F0F	Microsoft®-compatible Serial BallPoint-compatible Mouse
-PNP0F10	Texas Instruments QuickPort Mouse
-PNP0F11	Microsoft®-compatible Bus Mouse
-PNP0F12	Logitech PS/2-style Mouse
-PNP0F13	PS/2 Port for PS/2-style Mice
-PNP0F14	Microsoft® Kids Mouse
-PNP0F15	Logitech bus mouse
-PNP0F16	Logitech SWIFT device
-PNP0F17	Logitech-compatible serial mouse
-PNP0F18	Logitech-compatible bus mouse
-PNP0F19	Logitech-compatible PS/2-style Mouse
-PNP0F1A	Logitech-compatible SWIFT Device
-PNP0F1B	HP Omnibook Mouse
-PNP0F1C	Compaq LTE Trackball PS/2-style Mouse
-PNP0F1D	Compaq LTE Trackball Serial Mouse
-PNP0F1E	Microsoft® Kids Trackball Mouse
-PNP0F1F	Reserved by Microsoft® Input Device Group
-PNP0F20	Reserved by Microsoft® Input Device Group
-PNP0F21	Reserved by Microsoft® Input Device Group
-PNP0F22	Reserved by Microsoft® Input Device Group
-PNP0F23	Reserved by Microsoft® Input Device Group
-PNP0FFF	Reserved by Microsoft® Systems
\ No newline at end of file
+PNP0000         AT Interrupt Controller
+PNP0001         EISA Interrupt Controller
+PNP0002         MCA Interrupt Controller
+PNP0003         APIC
+PNP0004         Cyrix SLiC MP interrupt controller
+
+PNP0100         AT Timer
+PNP0101         EISA Timer
+PNP0102         MCA Timer
+
+PNP0200         AT DMA Controller
+PNP0201         EISA DMA Controller
+PNP0202         MCA DMA Controller
+
+PNP0300         IBM PC/XT keyboard controller (83-key)
+PNP0301         IBM PC/AT keyboard controller (86-key)
+PNP0302         IBM PC/XT keyboard controller (84-key)
+PNP0303         IBM Enhanced (101/102-key, PS/2 mouse support)
+PNP0304         Olivetti Keyboard (83-key)
+PNP0305         Olivetti Keyboard (102-key)
+PNP0306         Olivetti Keyboard (86-key)
+PNP0307         Microsoft Windows(R) Keyboard
+PNP0308         General Input Device Emulation Interface (GIDEI) legacy
+PNP0309         Olivetti Keyboard (A101/102 key)
+PNP030A         AT&T 302 keyboard
+PNP030B         Reserved by Microsoft
+PNP0320         Japanese 106-key keyboard A01
+PNP0321         Japanese 101-key keyboard
+PNP0322         Japanese AX keyboard
+PNP0323         Japanese 106-key keyboard 002/003
+PNP0324         Japanese 106-key keyboard 001
+PNP0325         Japanese Toshiba Desktop keyboard
+PNP0326         Japanese Toshiba Laptop keyboard
+PNP0327         Japanese Toshiba Notebook keyboard
+PNP0340         Korean 84-key keyboard
+PNP0341         Korean 86-key keyboard
+PNP0342         Korean Enhanced keyboard
+PNP0343         Korean Enhanced keyboard 101b
+PNP0343         Korean Enhanced keyboard 101c
+PNP0344         Korean Enhanced keyboard 103
+
+PNP0400         Standard LPT printer port
+PNP0401         ECP printer port
+
+PNP0500         Standard PC COM port
+PNP0501         16550A-compatible COM port
+PNP0502         Multiport serial device (non-intelligent 16550)
+PNP0510         Generic IRDA-compatible device
+PNP0511         Generic IRDA-compatible device
+
+PNP0600         Generic ESDI/IDE/ATA compatible hard disk controller
+PNP0601         Plus Hardcard II
+PNP0602         Plus Hardcard IIXL/EZ
+PNP0603         Generic IDE supporting Microsoft Device Bay Specification
+PNP0700         PC standard floppy disk controller
+PNP0701         Standard floppy controller supporting MS Device Bay Spec
+
+PNP0802         Microsoft Sound System compatible device (obsolete, use PNPB0xx instead)
+PNP0900         VGA Compatible
+PNP0901         Video Seven VRAM/VRAM II/1024i
+PNP0902         8514/A Compatible
+PNP0903         Trident VGA
+PNP0904         Cirrus Logic Laptop VGA
+PNP0905         Cirrus Logic VGA
+PNP0906         Tseng ET4000
+PNP0907         Western Digital VGA
+PNP0908         Western Digital Laptop VGA
+PNP0909         S3 Inc. 911/924
+PNP090A         ATI Ultra Pro/Plus (Mach 32)
+PNP090B         ATI Ultra (Mach 8)
+PNP090C         XGA Compatible
+PNP090D         ATI VGA Wonder
+PNP090E         Weitek P9000 Graphics Adapter
+PNP090F         Oak Technology VGA
+PNP0910         Compaq QVision
+PNP0911         XGA/2
+PNP0912         Tseng Labs W32/W32i/W32p
+PNP0913         S3 Inc. 801/928/964
+PNP0914         Cirrus Logic 5429/5434 (memory mapped)
+PNP0915         Compaq Advanced VGA (AVGA)
+PNP0916         ATI Ultra Pro Turbo (Mach64)
+PNP0917         Reserved by Microsoft
+PNP0918         Matrox MGA
+PNP0919         Compaq QVision 2000
+PNP091A         Tseng W128
+PNP0930         Chips & Technologies Super VGA
+PNP0931         Chips & Technologies Accelerator
+PNP0940         NCR 77c22e Super VGA
+PNP0941         NCR 77c32blt
+PNP09FF         Plug and Play Monitors (VESA DDC)
+
+PNP0A00         ISA Bus
+PNP0A01         EISA Bus
+PNP0A02         MCA Bus
+PNP0A03         PCI Bus
+PNP0A04         VESA/VL Bus
+PNP0A05         Generic ACPI Bus
+PNP0A06         Generic ACPI Extended-IO Bus (EIO bus)
+
+PNP0800         AT-style speaker sound
+PNP0B00         AT Real-Time Clock
+PNP0C00         Plug and Play BIOS (only created by the root enumerator)
+PNP0C01         System Board
+PNP0C02         General ID for reserving resources required by Plug and Play motherboard registers. (Not specific to a particular device.)
+PNP0C03         Plug and Play BIOS Event Notification Interrupt
+PNP0C04         Math Coprocessor
+PNP0C05         APM BIOS (Version independent)
+PNP0C06         Reserved for identification of early Plug and Play BIOS implementation.
+PNP0C07         Reserved for identification of early Plug and Play BIOS implementation.
+PNP0C08         ACPI system board hardware
+PNP0C09         ACPI Embedded Controller
+PNP0C0A         ACPI Control Method Battery
+PNP0C0B         ACPI Fan
+PNP0C0C         ACPI power button device
+PNP0C0D         ACPI lid device
+PNP0C0E         ACPI sleep button device
+PNP0C0F         PCI interrupt link device
+PNP0C10         ACPI system indicator device
+PNP0C11         ACPI thermal zone
+PNP0C12         Device Bay Controller
+PNP0C13         Plug and Play BIOS (used when ACPI mode cannot be used)
+
+PNP0E00         Intel 82365-Compatible PCMCIA Controller
+PNP0E01         Cirrus Logic CL-PD6720 PCMCIA Controller
+PNP0E02         VLSI VL82C146 PCMCIA Controller
+PNP0E03         Intel 82365-compatible CardBus controller
+
+PNP0F00         Microsoft Bus Mouse
+PNP0F01         Microsoft Serial Mouse
+PNP0F02         Microsoft InPort Mouse
+PNP0F03         Microsoft PS/2-style Mouse
+PNP0F04         Mouse Systems Mouse
+PNP0F05         Mouse Systems 3-Button Mouse (COM2)
+PNP0F06         Genius Mouse (COM1)
+PNP0F07         Genius Mouse (COM2)
+PNP0F08         Logitech Serial Mouse
+PNP0F09         Microsoft BallPoint Serial Mouse
+PNP0F0A         Microsoft Plug and Play Mouse
+PNP0F0B         Microsoft Plug and Play BallPoint Mouse
+PNP0F0C         Microsoft-compatible Serial Mouse
+PNP0F0D         Microsoft-compatible InPort-compatible Mouse
+PNP0F0E         Microsoft-compatible PS/2-style Mouse
+PNP0F0F         Microsoft-compatible Serial BallPoint-compatible Mouse
+PNP0F10         Texas Instruments QuickPort Mouse
+PNP0F11         Microsoft-compatible Bus Mouse
+PNP0F12         Logitech PS/2-style Mouse
+PNP0F13         PS/2 Port for PS/2-style Mice
+PNP0F14         Microsoft Kids Mouse
+PNP0F15         Logitech bus mouse
+PNP0F16         Logitech SWIFT device
+PNP0F17         Logitech-compatible serial mouse
+PNP0F18         Logitech-compatible bus mouse
+PNP0F19         Logitech-compatible PS/2-style Mouse
+PNP0F1A         Logitech-compatible SWIFT Device
+PNP0F1B         HP Omnibook Mouse
+PNP0F1C         Compaq LTE Trackball PS/2-style Mouse
+PNP0F1D         Compaq LTE Trackball Serial Mouse
+PNP0F1E         Microsoft Kids Trackball Mouse
+PNP0F1F         Reserved by Microsoft Input Device Group
+PNP0F20         Reserved by Microsoft Input Device Group
+PNP0F21         Reserved by Microsoft Input Device Group
+PNP0F22         Reserved by Microsoft Input Device Group
+PNP0F23         Reserved by Microsoft Input Device Group
+PNP0FFF         Reserved by Microsoft Systems
+
+PNP8001         Novell/Anthem NE3200
+PNP8004         Compaq NE3200
+PNP8006         Intel EtherExpress/32
+PNP8008         HP EtherTwist EISA LAN Adapter/32 (HP27248A)
+PNP8065         Ungermann-Bass NIUps or NIUps/EOTP
+PNP8072         DEC (DE211) EtherWorks MC/TP
+PNP8073         DEC (DE212) EtherWorks MC/TP_BNC
+PNP8078         DCA 10 Mb MCA
+PNP8074         HP MC LAN Adapter/16 TP (PC27246)
+PNP80c9         IBM Token Ring
+PNP80ca         IBM Token Ring II
+PNP80cb         IBM Token Ring II/Short
+PNP80cc         IBM Token Ring 4/16Mbs
+PNP80d3         Novell/Anthem NE1000
+PNP80d4         Novell/Anthem NE2000
+PNP80d5         NE1000 Compatible
+PNP80d6         NE2000 Compatible
+PNP80d7         Novell/Anthem NE1500T
+PNP80d8         Novell/Anthem NE2100
+PNP80dd         SMC ARCNETPC
+PNP80de         SMC ARCNET PC100, PC200
+PNP80df         SMC ARCNET PC110, PC210, PC250
+PNP80e0         SMC ARCNET PC130/E
+PNP80e1         SMC ARCNET PC120, PC220, PC260
+PNP80e2         SMC ARCNET PC270/E
+PNP80e5         SMC ARCNET PC600W, PC650W
+PNP80e7         DEC DEPCA
+PNP80e8         DEC (DE100) EtherWorks LC
+PNP80e9         DEC (DE200) EtherWorks Turbo
+PNP80ea         DEC (DE101) EtherWorks LC/TP
+PNP80eb         DEC (DE201) EtherWorks Turbo/TP
+PNP80ec         DEC (DE202) EtherWorks Turbo/TP_BNC
+PNP80ed         DEC (DE102) EtherWorks LC/TP_BNC
+PNP80ee         DEC EE101 (Built-In)
+PNP80ef         DECpc 433 WS (Built-In)
+PNP80f1         3Com EtherLink Plus
+PNP80f3         3Com EtherLink II or IITP (8 or 16-bit)
+PNP80f4         3Com TokenLink
+PNP80f6         3Com EtherLink 16
+PNP80f7         3Com EtherLink III
+PNP80f8         3Com Generic Etherlink Plug and Play Device
+PNP80fb         Thomas Conrad TC6045
+PNP80fc         Thomas Conrad TC6042
+PNP80fd         Thomas Conrad TC6142
+PNP80fe         Thomas Conrad TC6145
+PNP80ff         Thomas Conrad TC6242
+PNP8100         Thomas Conrad TC6245
+PNP8105         DCA 10 MB
+PNP8106         DCA 10 MB Fiber Optic
+PNP8107         DCA 10 MB Twisted Pair
+PNP8113         Racal NI6510
+PNP811C         Ungermann-Bass NIUpc
+PNP8120         Ungermann-Bass NIUpc/EOTP
+PNP8123         SMC StarCard PLUS (WD/8003S)
+PNP8124         SMC StarCard PLUS With On Board Hub (WD/8003SH)
+PNP8125         SMC EtherCard PLUS (WD/8003E)
+PNP8126         SMC EtherCard PLUS With Boot ROM Socket (WD/8003EBT)
+PNP8127         SMC EtherCard PLUS With Boot ROM Socket (WD/8003EB)
+PNP8128         SMC EtherCard PLUS TP (WD/8003WT)
+PNP812a         SMC EtherCard PLUS 16 With Boot ROM Socket (WD/8013EBT)
+PNP812d         Intel EtherExpress 16 or 16TP
+PNP812f         Intel TokenExpress 16/4
+PNP8130         Intel TokenExpress MCA 16/4
+PNP8132         Intel EtherExpress 16 (MCA)
+PNP8137         Artisoft AE-1
+PNP8138         Artisoft AE-2 or AE-3
+PNP8141         Amplicard AC 210/XT
+PNP8142         Amplicard AC 210/AT
+PNP814b         Everex SpeedLink /PC16 (EV2027)
+PNP8155         HP PC LAN Adapter/8 TP (HP27245)
+PNP8156         HP PC LAN Adapter/16 TP (HP27247A)
+PNP8157         HP PC LAN Adapter/8 TL (HP27250)
+PNP8158         HP PC LAN Adapter/16 TP Plus (HP27247B)
+PNP8159         HP PC LAN Adapter/16 TL Plus (HP27252)
+PNP815f         National Semiconductor Ethernode *16AT
+PNP8160         National Semiconductor AT/LANTIC EtherNODE 16-AT3
+PNP816a         NCR Token-Ring 4 Mbs ISA
+PNP816d         NCR Token-Ring 16/4 Mbs ISA
+PNP8191         Olicom 16/4 Token-Ring Adapter
+PNP81c3         SMC EtherCard PLUS Elite (WD/8003EP)
+PNP81c4         SMC EtherCard PLUS 10T (WD/8003W)
+PNP81c5         SMC EtherCard PLUS Elite 16 (WD/8013EP)
+PNP81c6         SMC EtherCard PLUS Elite 16T (WD/8013W)
+PNP81c7         SMC EtherCard PLUS Elite 16 Combo (WD/8013EW or 8013EWC)
+PNP81c8         SMC EtherElite Ultra 16
+PNP81e4         Pure Data PDI9025-32 (Token Ring)
+PNP81e6         Pure Data PDI508+ (ArcNet)
+PNP81e7         Pure Data PDI516+ (ArcNet)
+PNP81eb         Proteon Token Ring (P1390)
+PNP81ec         Proteon Token Ring (P1392)
+PNP81ed         Proteon ISA Token Ring (1340)
+PNP81ee         Proteon ISA Token Ring (1342)
+PNP81ef         Proteon ISA Token Ring (1346)
+PNP81f0         Proteon ISA Token Ring (1347)
+PNP81ff         Cabletron E2000 Series DNI
+PNP8200         Cabletron E2100 Series DNI
+PNP8209         Zenith Data Systems Z-Note
+PNP820a         Zenith Data Systems NE2000-Compatible
+PNP8213         Xircom Pocket Ethernet II
+PNP8214         Xircom Pocket Ethernet I
+PNP821d         RadiSys EXM-10
+PNP8227         SMC 3000 Series
+PNP8228         SMC 91C2 controller
+PNP8231         Advanced Micro Devices AM2100/AM1500T
+PNP8263         Tulip NCC-16
+PNP8277         Exos 105
+PNP828A         Intel '595 based Ethernet
+PNP828B         TI2000-style Token Ring
+PNP828C         AMD PCNet Family cards
+PNP828D         AMD PCNet32 (VL version)
+PNP8294         IrDA Infrared NDIS driver (Microsoft-supplied)
+PNP82bd         IBM PCMCIA-NIC
+PNP82C2         Xircom CE10
+PNP82C3         Xircom CEM2
+PNP8321         DEC Ethernet (All Types)
+PNP8323         SMC EtherCard (All Types except 8013/A)
+PNP8324         ARCNET Compatible
+PNP8326         Thomas Conrad (All Arcnet Types)
+PNP8327         IBM Token Ring (All Types)
+PNP8385         Remote Network Access Driver
+PNP8387         RNA Point-to-point Protocol Driver
+PNP8388         Reserved for Microsoft Networking components
+PNP8389         Peer IrLAN infrared driver (Microsoft-supplied)
+PNP8390         Generic network adapter
+
+PNPA002         Future Domain 16-700 compatible controller
+PNPA003         Panasonic proprietary CD-ROM adapter (SBPro/SB16)
+PNPA01B         Trantor 128 SCSI Controller
+PNPA01D         Trantor T160 SCSI Controller
+PNPA01E         Trantor T338 Parallel SCSI controller
+PNPA01F         Trantor T348 Parallel SCSI controller
+PNPA020         Trantor Media Vision SCSI controller
+PNPA022         Always IN-2000 SCSI controller
+PNPA02B         Sony proprietary CD-ROM controller
+PNPA02D         Trantor T13b 8-bit SCSI controller
+PNPA02F         Trantor T358 Parallel SCSI controller
+PNPA030         Mitsumi LU-005 Single Speed CD-ROM controller + drive
+PNPA031         Mitsumi FX-001 Single Speed CD-ROM controller + drive
+PNPA032         Mitsumi FX-001 Double Speed CD-ROM controller + drive
+
+PNPB000         Sound Blaster 1.5 sound device
+PNPB001         Sound Blaster 2.0 sound device
+PNPB002         Sound Blaster Pro sound device
+PNPB003         Sound Blaster 16 sound device
+PNPB004         Thunderboard-compatible sound device
+PNPB005         Adlib-compatible FM synthesizer device
+PNPB006         MPU401 compatible
+PNPB007         Microsoft Windows Sound System-compatible sound device
+PNPB008         Compaq Business Audio
+PNPB009         Plug and Play Microsoft Windows Sound System Device
+PNPB00A         MediaVision Pro Audio Spectrum (Trantor SCSI enabled, Thunder Chip Disabled)
+PNPB00B         MediaVision Pro Audio 3D
+PNPB00C         MusicQuest MQX-32M
+PNPB00D         MediaVision Pro Audio Spectrum Basic (No Trantor SCSI, Thunder Chip Enabled)
+PNPB00E         MediaVision Pro Audio Spectrum (Trantor SCSI enabled, Thunder Chip Enabled)
+PNPB00F         MediaVision Jazz-16 chipset (OEM Versions)
+PNPB010         Auravision VxP500 chipset - Orchid Videola
+PNPB018         MediaVision Pro Audio Spectrum 8-bit
+PNPB019         MediaVision Pro Audio Spectrum Basic (no Trantor SCSI, Thunder chip Disabled)
+PNPB020         Yamaha OPL3-compatible FM synthesizer device
+PNPB02F         Joystick/Game port
+
+PNPC000         Compaq 14400 Modem (TBD)
+PNPC001         Compaq 2400/9600 Modem (TBD)
diff --git a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
index c420c5e75..db3beef98 100644
--- a/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
+++ b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt
@@ -32,13 +32,6 @@ function( add_dbus_xml option basename classname namespace xmlfile )
   add_custom_command( OUTPUT ${basename}.cpp ${basename}.h
     COMMAND ${DBUSXML2QT3_EXECUTABLE} -${option} ${basename} ${classname} -N ${namespace} ${INTROSPECTIONPATH}/${xmlfile} 2>/dev/null
     DEPENDS ${INTROSPECTIONPATH}/${xmlfile} )
-  if( "${option}" STREQUAL "p" )
-    add_custom_command( OUTPUT ${basename}.moc
-      COMMAND ${TMOC_EXECUTABLE} ${basename}.h -o ${basename}.moc
-      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.h )
-    set_property( SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${basename}.cpp APPEND
-      PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${basename}.moc )
-  endif( )
 endfunction( )
 
 add_dbus_xml( p networkmanagerproxy NetworkManagerProxy DBus nm-manager.xml )
@@ -61,7 +54,7 @@ add_dbus_xml( p connectionsettings ConnectionSettingsInterface DBus nm-settings-
 
 # build the library
 
-tde_add_library( tdenm_dbus STATIC_PIC
+tde_add_library( tdenm_dbus STATIC_PIC AUTOMOC
   SOURCES
     networkmanagerproxy.cpp networkmanagerpppproxy.cpp
     deviceproxy.cpp bluetoothproxy.cpp olpcmeshproxy.cpp ethernetproxy.cpp
diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
index 3e8ef6daa..754fd31b8 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
@@ -1259,23 +1259,23 @@ TDENetworkConnectionManager_BackendNM::TDENetworkConnectionManager_BackendNM(TDE
 	}
 
 	// Connect global signals
-	connect(d->m_networkManagerProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessGlobalStateChanged(TQ_UINT32)));
+	connect(d->m_networkManagerProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessGlobalStateChanged(TQ_UINT32)));
 
 	// Connect VPN signals
 	if (d->m_vpnProxy) {
-		connect(d->m_vpnProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessVPNStateChanged(TQ_UINT32)));
-		connect(d->m_vpnProxy, SIGNAL(LoginBanner(const TQString&)), d, SLOT(internalProcessVPNLoginBanner(const TQString&)));
-		connect(d->m_vpnProxy, SIGNAL(Failure(TQ_UINT32)), d, SLOT(internalProcessVPNFailure(TQ_UINT32)));
+		connect(d->m_vpnProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNStateChanged(TQ_UINT32)));
+		connect(d->m_vpnProxy, TQ_SIGNAL(LoginBanner(const TQString&)), d, TQ_SLOT(internalProcessVPNLoginBanner(const TQString&)));
+		connect(d->m_vpnProxy, TQ_SIGNAL(Failure(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNFailure(TQ_UINT32)));
 	}
 
 	// Connect local signals
 	if (d->m_networkDeviceProxy) {
-		connect(d->m_networkDeviceProxy, SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)));
+		connect(d->m_networkDeviceProxy, TQ_SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, TQ_SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)));
 	}
 	if (d->m_wiFiDeviceProxy) {
-		connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&)));
-		connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&)));
-		connect(d->m_wiFiDeviceProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
+		connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&)));
+		connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&)));
+		connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, TQ_SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
 	}
 
 	// Create public lists
@@ -1510,7 +1510,7 @@ void TDENetworkConnectionManager_BackendNMPrivate::internalProcessWiFiAccessPoin
 			// Set up monitoring object
 			DBus::AccessPointProxy* apProxy = new DBus::AccessPointProxy(NM_DBUS_SERVICE, dbuspath);
 			apProxy->setConnection(TQT_DBusConnection::systemBus());
-			connect(apProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
+			connect(apProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, TQ_SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
 			m_accessPointProxyList[dbuspath] = (apProxy);
 
 			// Notify client applications
@@ -1599,7 +1599,7 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B
 	// Obtain connection settings from the path specified
 	DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath);
 	connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-	connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+	connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
 	int asyncCallID;
 	ret = connectionSettings.GetSettingsAsync(asyncCallID, error);
 	if (ret && error.isValid()) {
@@ -1928,8 +1928,8 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() {
 				// Obtain connection settings from the path specified
 				DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it));
 				connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-				connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
-				connect(&connectionSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError)));
+				connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+				connect(&connectionSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError)));
 				int asyncCallID;
 				ret = connectionSettings.GetSettingsAsync(asyncCallID, error);
 				if (ret && error.isValid()) {
@@ -3055,7 +3055,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri
 		// Obtain connection secrets from the path specified
 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-		connect(&connectionSettings, SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+		connect(&connectionSettings, TQ_SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
 		int asyncCallID;
 		ret = connectionSettings.GetSecretsAsync(asyncCallID, group, error);
 		if (ret && error.isValid()) {
@@ -3260,7 +3260,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
 		// Obtain connection settings from the path specified
 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-		connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+		connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
 		int asyncCallID;
 		ret = connectionSettings.GetSettingsAsync(asyncCallID, error);
 		if (ret && error.isValid()) {
@@ -4492,7 +4492,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
 		// Save connection settings to the path specified
 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-		connect(&connectionSettings, SIGNAL(UpdateAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int)));
+		connect(&connectionSettings, TQ_SIGNAL(UpdateAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int)));
 		int asyncCallID;
 		ret = connectionSettings.UpdateAsync(asyncCallID, connectionSettingsMap, error);
 		if (ret && error.isValid()) {
@@ -4526,8 +4526,8 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
 		printf("[network-manager comm debug] Creating new connection\n"); fflush(stdout);
 #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS
 		// Create new connection
-		connect(d->m_networkManagerSettings, SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
-		connect(d->m_networkManagerSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
+		connect(d->m_networkManagerSettings, TQ_SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
+		connect(d->m_networkManagerSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
 		int asyncCallID;
 		ret = d->m_networkManagerSettings->AddConnectionAsync(asyncCallID, connectionSettingsMap, error);
 		if (ret && error.isValid()) {
@@ -4580,7 +4580,7 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) {
 			// Obtain connection secrets from the path specified
 			DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 			connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-			connect(&connectionSettings, SIGNAL(DeleteAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int)));
+			connect(&connectionSettings, TQ_SIGNAL(DeleteAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int)));
 			int asyncCallID;
 			ret = connectionSettings.DeleteAsync(asyncCallID, error);
 			if (ret && error.isValid()) {
@@ -4804,8 +4804,8 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
 			return checkConnectionStatus(uuid);
 #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS
 #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING
-			connect(d->m_networkManagerProxy, SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
-			connect(d->m_networkManagerProxy, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
+			connect(d->m_networkManagerProxy, TQ_SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
+			connect(d->m_networkManagerProxy, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
 #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING
 			int asyncCallID;
 			ret = d->m_networkManagerProxy->ActivateConnectionAsync(asyncCallID, existingConnection, TQT_DBusObjectPath(d->m_dbusDeviceString.ascii()), TQT_DBusObjectPath("/"), error);
@@ -5000,7 +5000,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
 			return checkConnectionStatus(uuid);
 #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS
 #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING
-			connect(d->m_networkManagerProxy, SIGNAL(DeactivateConnectionAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int)));
+			connect(d->m_networkManagerProxy, TQ_SIGNAL(DeactivateConnectionAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int)));
 #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING
 			int asyncCallID;
 			ret = d->m_networkManagerProxy->DeactivateConnectionAsync(asyncCallID, existingConnection, error);
@@ -5441,7 +5441,7 @@ TDENetworkConnectionManager_BackendNMPrivate::TDENetworkConnectionManager_Backen
 	// Set up global signal handler
 	m_dbusSignalConnection = new TQT_DBusConnection(TQT_DBusConnection::systemBus());
 	m_dbusSignalReceiver = new TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(this);
-	m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQT_SLOT(dbusSignal(const TQT_DBusMessage&)));
+	m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQ_SLOT(dbusSignal(const TQT_DBusMessage&)));
 }
 
 TDENetworkConnectionManager_BackendNMPrivate::~TDENetworkConnectionManager_BackendNMPrivate() {
diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h
index f14e4992e..8af99e846 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h
@@ -211,7 +211,7 @@ class TDENetworkConnectionManager_BackendNMPrivate;
 
 class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TDENetworkConnectionManager_BackendNM(TDENetworkDevice* networkDevice);
diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
index 61ce31329..43cafda25 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
@@ -71,7 +71,7 @@ class TDENetworkConnectionManager_BackendNMPrivate;
 
 class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(TDENetworkConnectionManager_BackendNMPrivate*);
@@ -86,7 +86,7 @@ class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject
 
 class TDENetworkConnectionManager_BackendNMPrivate : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TDENetworkConnectionManager_BackendNMPrivate(TDENetworkConnectionManager_BackendNM*);
diff --git a/tdecore/tdehw/tdecpudevice.cpp b/tdecore/tdehw/tdecpudevice.cpp
index 40b9ad6e2..6715000a0 100644
--- a/tdecore/tdehw/tdecpudevice.cpp
+++ b/tdecore/tdehw/tdecpudevice.cpp
@@ -30,13 +30,13 @@
 #include "config.h"
 
 // uPower
-#if defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_HAL)
+#if defined(WITH_TDEHWLIB_DAEMONS)
  	#include <tqdbusdata.h>
  	#include <tqdbusmessage.h>
  	#include <tqdbusproxy.h>
  	#include <tqdbusvariant.h>
  	#include <tqdbusconnection.h>
-#endif // defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_HAL)
+#endif
 
 
 TDECPUDevice::TDECPUDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) {
@@ -151,23 +151,6 @@ bool TDECPUDevice::canSetGovernor() {
 	}
 #endif // WITH_TDEHWLIB_DAEMONS
 
-#ifdef WITH_HAL
-	{
-		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
-		if (dbusConn.isConnected()) {
-			TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
-						"org.freedesktop.Hal",
-						"/org/freedesktop/Hal/devices/computer",
-						"org.freedesktop.Hal.Device.CPUFreq",
-						"GetCPUFreqGovernor");
-			TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
-			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-				return true;
-			}
-		}
-	}
-#endif // WITH_HAL
-
 	return false;
 }
 
@@ -201,24 +184,6 @@ void TDECPUDevice::setGovernor(TQString gv) {
 	}
 #endif // WITH_TDEHWLIB_DAEMONS
 
-#ifdef WITH_HAL
-	if ( !setGovernorDone ) {
-		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
-		if (dbusConn.isConnected()) {
-			TQT_DBusProxy cpuFreqControl("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.CPUFreq", dbusConn);
-			if (cpuFreqControl.canSend()) {
-				// set CPU governor
-				TQValueList<TQT_DBusData> params;
-				params << TQT_DBusData::fromString(gv.lower());
-				TQT_DBusMessage reply = cpuFreqControl.sendWithReply("SetCPUFreqGovernor", params);
-				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-					setGovernorDone = true;
-				}
-			}
-		}
-	}
-#endif // WITH_HAL
-
 	// Force update of the device information object
 	if ( setGovernorDone ) {
 		TDEGlobal::hardwareDevices()->processModifiedCPUs();
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp
index c593d2ab6..4d9eeaab3 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.cpp
+++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp
@@ -509,9 +509,9 @@ void TDECryptographicCardDevice::enableCardMonitoring(bool enable) {
 
 		m_watcherObject->cardDevice = this;
 		m_watcherObject->moveToThread(m_watcherThread);
-		TQObject::connect(m_watcherObject, SIGNAL(statusChanged(TQString,TQString)), this, SLOT(cardStatusChanged(TQString,TQString)));
-		TQObject::connect(m_watcherObject, SIGNAL(pinRequested(TQString)), this, SLOT(workerRequestedPin(TQString)));
-		TQTimer::singleShot(0, m_watcherObject, SLOT(run()));
+		TQObject::connect(m_watcherObject, TQ_SIGNAL(statusChanged(TQString,TQString)), this, TQ_SLOT(cardStatusChanged(TQString,TQString)));
+		TQObject::connect(m_watcherObject, TQ_SIGNAL(pinRequested(TQString)), this, TQ_SLOT(workerRequestedPin(TQString)));
+		TQTimer::singleShot(0, m_watcherObject, TQ_SLOT(run()));
 
 		m_watcherThread->start();
 	}
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.h b/tdecore/tdehw/tdecryptographiccarddevice.h
index 0907322d7..8b3bd211a 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.h
+++ b/tdecore/tdehw/tdecryptographiccarddevice.h
@@ -38,7 +38,7 @@ typedef TQValueListIterator<X509*> X509CertificatePtrListIterator;
 
 class TDECORE_EXPORT TDECryptographicCardDevice : public TDEGenericDevice
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tdeeventdevice.cpp b/tdecore/tdehw/tdeeventdevice.cpp
index ac92599ae..3223e80e7 100644
--- a/tdecore/tdehw/tdeeventdevice.cpp
+++ b/tdecore/tdehw/tdeeventdevice.cpp
@@ -120,9 +120,11 @@ void TDEEventDevice::internalReadProvidedSwitches() {
 		if (BIT_IS_SET(switches, SW_RFKILL_ALL)) {
 			supportedSwitches = supportedSwitches | TDESwitchType::RFKill;
 		}
+#		if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL
 		if (BIT_IS_SET(switches, SW_RADIO)) {
 			supportedSwitches = supportedSwitches | TDESwitchType::Radio;
 		}
+#		endif
 		if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) {
 			supportedSwitches = supportedSwitches | TDESwitchType::MicrophoneInsert;
 		}
@@ -229,9 +231,11 @@ void TDEEventDevice::internalReadActiveSwitches() {
 		if (BIT_IS_SET(switches, SW_RFKILL_ALL)) {
 			activeSwitches = activeSwitches | TDESwitchType::RFKill;
 		}
+#		if SW_RADIO != SW_RFKILL_ALL // SW_RADIO is a deprecated name for SW_RFKILL_ALL
 		if (BIT_IS_SET(switches, SW_RADIO)) {
 			activeSwitches = activeSwitches | TDESwitchType::Radio;
 		}
+#		endif
 		if (BIT_IS_SET(switches, SW_MICROPHONE_INSERT)) {
 			activeSwitches = activeSwitches | TDESwitchType::MicrophoneInsert;
 		}
@@ -345,7 +349,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) {
 		if (eventType() != TDEEventDeviceType::Unknown) {
 			if (m_fd >= 0) {
 				m_eventNotifier = new TQSocketNotifier(m_fd, TQSocketNotifier::Read, this);
-				connect( m_eventNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(eventReceived()) );
+				connect( m_eventNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(eventReceived()) );
 				m_monitorActive = true;
 			}
 		}
@@ -353,7 +357,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) {
 			// get initial state of switches
 			internalReadProvidedSwitches();
 			internalReadActiveSwitches();
-			connect( this, TQT_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQT_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) );
+			connect( this, TQ_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQ_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) );
 		}
 	}
 }
@@ -383,9 +387,9 @@ void TDEEventDevice::processActiveSwitches() {
 }
 
 void TDEEventDevice::connectNotify( const char* signal ) {
-	if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) {
+	if( !m_monitorActive && qstrcmp( signal, TQ_SIGNAL(switchChanged())) == 0 ) {
 		m_watchTimer = new TQTimer(this);
-		connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) );
+		connect( m_watchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processActiveSwitches()) );
 		m_watchTimer->start( 2500, false );
 		m_monitorActive = true;
 
diff --git a/tdecore/tdehw/tdeeventdevice.h b/tdecore/tdehw/tdeeventdevice.h
index 64130508c..a1f1af6a6 100644
--- a/tdecore/tdehw/tdeeventdevice.h
+++ b/tdecore/tdehw/tdeeventdevice.h
@@ -79,7 +79,7 @@ class TQSocketNotifier;
 
 class TDECORE_EXPORT TDEEventDevice : public TDEGenericDevice
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tdegenericdevice.h b/tdecore/tdehw/tdegenericdevice.h
index 91e9ac79e..53804cf96 100644
--- a/tdecore/tdehw/tdegenericdevice.h
+++ b/tdecore/tdehw/tdegenericdevice.h
@@ -30,7 +30,7 @@
 
 class TDECORE_EXPORT TDEGenericDevice : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 3f694cedc..f54b1e138 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -89,22 +89,13 @@ timespec diff(timespec start, timespec end)
 	return temp;
 }
 
-// BEGIN BLOCK
-// Copied from include/linux/genhd.h
-#define GENHD_FL_REMOVABLE                      1
-#define GENHD_FL_MEDIA_CHANGE_NOTIFY            4
-#define GENHD_FL_CD                             8
-#define GENHD_FL_UP                             16
-#define GENHD_FL_SUPPRESS_PARTITION_INFO        32
-#define GENHD_FL_EXT_DEVT                       64
-#define GENHD_FL_NATIVE_CAPACITY                128
-#define GENHD_FL_BLOCK_EVENTS_ON_EXCL_WRITE     256
-// END BLOCK
-
 // NOTE TO DEVELOPERS
 // This command will greatly help when attempting to find properties to distinguish one device from another
 // udevadm info --query=all --path=/sys/....
 
+// Some local utility functions and constants
+namespace {
+
 // This routine is courtsey of an answer on "Stack Overflow"
 // It takes an LSB-first int and makes it an MSB-first int (or vice versa)
 unsigned int reverse_bits(unsigned int x)
@@ -116,9 +107,29 @@ unsigned int reverse_bits(unsigned int x)
 	return((x >> 16) | (x << 16));
 }
 
+// Read the content of a file that supposed to contain a single line
+TQString readLineFile(TQString fname) {
+	TQFile file( fname );
+	if ( file.open( IO_ReadOnly ) ) {
+		TQTextStream stream( &file );
+		return stream.readLine();
+	} else {
+		return TQString::null;
+	}
+}
+
+} // namespace
+
 // Helper function implemented in tdestoragedevice.cpp
 TQString decodeHexEncoding(TQString str);
 
+extern "C" {
+	KDE_EXPORT TDEHardwareDevices* create_tdeHardwareDevices()
+	{
+		return new TDEHardwareDevices();
+	}
+}
+
 TDEHardwareDevices::TDEHardwareDevices() {
 	// Initialize members
 	pci_id_map = 0;
@@ -144,7 +155,7 @@ TDEHardwareDevices::TDEHardwareDevices() {
 		int udevmonitorfd = udev_monitor_get_fd(m_udevMonitorStruct);
 		if (udevmonitorfd >= 0) {
 			m_devScanNotifier = new TQSocketNotifier(udevmonitorfd, TQSocketNotifier::Read, this);
-			connect( m_devScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHotPluggedHardware()) );
+			connect( m_devScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHotPluggedHardware()) );
 		}
 
 		// Read in the current mount table
@@ -166,7 +177,7 @@ TDEHardwareDevices::TDEHardwareDevices() {
 		m_procMountsFd = open("/proc/mounts", O_RDONLY, 0);
 		if (m_procMountsFd >= 0) {
 			m_mountScanNotifier = new TQSocketNotifier(m_procMountsFd, TQSocketNotifier::Exception, this);
-			connect( m_mountScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processModifiedMounts()) );
+			connect( m_mountScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processModifiedMounts()) );
 		}
 
 		// Read in the current cpu information
@@ -188,22 +199,22 @@ TDEHardwareDevices::TDEHardwareDevices() {
 		// Monitor for changed cpu information
 		// Watched directories are set up during the initial CPU scan
 		m_cpuWatch = new KSimpleDirWatch(this);
-		connect( m_cpuWatch, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(processModifiedCPUs()) );
+		connect( m_cpuWatch, TQ_SIGNAL(dirty(const TQString &)), this, TQ_SLOT(processModifiedCPUs()) );
 #else
 		m_cpuWatchTimer = new TQTimer(this);
-		connect( m_cpuWatchTimer, SIGNAL(timeout()), this, SLOT(processModifiedCPUs()) );
+		connect( m_cpuWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processModifiedCPUs()) );
 #endif
 
 		// Some devices do not receive update signals from udev
 		// These devices must be polled, and a good polling interval is 1 second
 		m_deviceWatchTimer = new TQTimer(this);
-		connect( m_deviceWatchTimer, SIGNAL(timeout()), this, SLOT(processStatelessDevices()) );
+		connect( m_deviceWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processStatelessDevices()) );
 
 		// Special case for battery and power supply polling (longer delay, 5 seconds)
 		m_batteryWatchTimer = new TQTimer(this);
-		connect( m_batteryWatchTimer, SIGNAL(timeout()), this, SLOT(processBatteryDevices()) );
+		connect( m_batteryWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processBatteryDevices()) );
 
-		// Update internal device information
+		// Update internal device information.
 		queryHardwareInformation();
 	}
 }
@@ -274,18 +285,21 @@ void TDEHardwareDevices::setBatteryUpdatesEnabled(bool enable) {
 	}
 }
 
-void TDEHardwareDevices::rescanDeviceInformation(TDEGenericDevice* hwdevice) {
-	rescanDeviceInformation(hwdevice, true);
-}
-
-void TDEHardwareDevices::rescanDeviceInformation(TDEGenericDevice* hwdevice, bool regenerateDeviceTree) {
-	struct udev_device *dev;
-	dev = udev_device_new_from_syspath(m_udevStruct, hwdevice->systemPath().ascii());
-	updateExistingDeviceInformation(hwdevice);
+void TDEHardwareDevices::rescanDeviceInformation(TDEGenericDevice* hwdevice, udev_device* dev, bool regenerateDeviceTree) {
+	bool toUnref = false;
+	if (!dev)
+	{
+		dev = udev_device_new_from_syspath(m_udevStruct, hwdevice->systemPath().ascii());
+		toUnref = true;
+	}
+	updateExistingDeviceInformation(hwdevice, dev);
 	if (regenerateDeviceTree) {
 		updateParentDeviceInformation(hwdevice);	// Update parent/child tables for this device
 	}
-	udev_device_unref(dev);
+	if (toUnref)
+	{
+		udev_device_unref(dev);
+	}
 }
 
 TDEGenericDevice* TDEHardwareDevices::findBySystemPath(TQString syspath) {
@@ -382,8 +396,7 @@ void TDEHardwareDevices::processHotPluggedHardware() {
 			TDEGenericDevice *device = classifyUnknownDevice(dev);
 
 			// Make sure this device is not a duplicate
-			TDEGenericDevice *hwdevice;
-			for (hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) {
+			for (TDEGenericDevice *hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) {
 				if (hwdevice->systemPath() == device->systemPath()) {
 					delete device;
 					device = 0;
@@ -395,7 +408,18 @@ void TDEHardwareDevices::processHotPluggedHardware() {
 				m_deviceList.append(device);
 				updateParentDeviceInformation(device);	// Update parent/child tables for this device
 				emit hardwareAdded(device);
-				emit hardwareEvent(TDEHardwareEvent::HardwareAdded, device->uniqueID());
+				if (device->type() == TDEGenericDeviceType::Disk) {
+					// Make sure slave status is also updated
+					TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(device);
+					TQStringList slavedevices = sdevice->slaveDevices();
+					for (TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit) {
+						TDEGenericDevice* slavedevice = findBySystemPath(*slaveit);
+						if (slavedevice && slavedevice->type() == TDEGenericDeviceType::Disk) {
+							rescanDeviceInformation(slavedevice);
+							emit hardwareUpdated(slavedevice);
+						}
+					}
+				}
 			}
 		}
 		else if (actionevent == "remove") {
@@ -405,34 +429,25 @@ void TDEHardwareDevices::processHotPluggedHardware() {
 			TDEGenericDevice *hwdevice;
 			for (hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) {
 				if (hwdevice->systemPath() == systempath) {
-					// Temporarily disable auto-deletion to ensure object validity when calling the Removed events below
-					m_deviceList.setAutoDelete(false);
-
-					// If the device is a storage device and has a slave, update it as well
+					// Make sure slave status is also updated
 					if (hwdevice->type() == TDEGenericDeviceType::Disk) {
 						TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
 						TQStringList slavedevices = sdevice->slaveDevices();
-						m_deviceList.remove(hwdevice);
-						for ( TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit ) {
+						for (TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit) {
 							TDEGenericDevice* slavedevice = findBySystemPath(*slaveit);
-							if (slavedevice) {
+							if (slavedevice && slavedevice->type() == TDEGenericDeviceType::Disk) {
 								rescanDeviceInformation(slavedevice);
 								emit hardwareUpdated(slavedevice);
-								emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, slavedevice->uniqueID());
 							}
 						}
 					}
-					else {
-						m_deviceList.remove(hwdevice);
-					}
-
-					emit hardwareRemoved(hwdevice);
-					emit hardwareEvent(TDEHardwareEvent::HardwareRemoved, hwdevice->uniqueID());
-
-					// Reenable auto-deletion and delete the removed device object
-					m_deviceList.setAutoDelete(true);
-					delete hwdevice;
 
+					rescanDeviceInformation(hwdevice, dev);
+				  if (m_deviceList.find(hwdevice) != -1 && m_deviceList.take())
+					{
+						emit hardwareRemoved(hwdevice);
+						delete hwdevice;
+					}
 					break;
 				}
 			}
@@ -445,10 +460,8 @@ void TDEHardwareDevices::processHotPluggedHardware() {
 			for (hwdevice = m_deviceList.first(); hwdevice; hwdevice = m_deviceList.next()) {
 				if (hwdevice->systemPath() == systempath) {
 					if (!hwdevice->blacklistedForUpdate()) {
-						classifyUnknownDevice(dev, hwdevice, false);
-						updateParentDeviceInformation(hwdevice);	// Update parent/child tables for this device
+						rescanDeviceInformation(hwdevice, dev);
 						emit hardwareUpdated(hwdevice);
-						emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
 					}
 				}
 				else if ((hwdevice->type() == TDEGenericDeviceType::Monitor)
@@ -460,7 +473,6 @@ void TDEHardwareDevices::processHotPluggedHardware() {
 						udev_device_unref(slavedev);
 						updateParentDeviceInformation(hwdevice);	// Update parent/child tables for this device
 						emit hardwareUpdated(hwdevice);
-						emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
 					}
 				}
 			}
@@ -856,7 +868,6 @@ void TDEHardwareDevices::processModifiedCPUs() {
 			if (hwdevice) {
 				// Signal new information available
 				emit hardwareUpdated(hwdevice);
-				emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
 			}
 		}
 	}
@@ -883,10 +894,11 @@ void TDEHardwareDevices::processStatelessDevices() {
 	// We can't use m_deviceList directly as m_deviceList can only have one iterator active against it at any given time
 	TDEGenericHardwareList devList = listAllPhysicalDevices();
 	for ( hwdevice = devList.first(); hwdevice; hwdevice = devList.next() ) {
-		if ((hwdevice->type() == TDEGenericDeviceType::RootSystem) || (hwdevice->type() == TDEGenericDeviceType::Network) || (hwdevice->type() == TDEGenericDeviceType::OtherSensor) || (hwdevice->type() == TDEGenericDeviceType::Event) || (hwdevice->type() == TDEGenericDeviceType::Battery) || (hwdevice->type() == TDEGenericDeviceType::PowerSupply)) {
-			rescanDeviceInformation(hwdevice, false);
+		if ((hwdevice->type() == TDEGenericDeviceType::RootSystem) || (hwdevice->type() == TDEGenericDeviceType::Network) ||
+				(hwdevice->type() == TDEGenericDeviceType::OtherSensor) || (hwdevice->type() == TDEGenericDeviceType::Event) ||
+				(hwdevice->type() == TDEGenericDeviceType::Battery) || (hwdevice->type() == TDEGenericDeviceType::PowerSupply)) {
+			rescanDeviceInformation(hwdevice, NULL, false);
 			emit hardwareUpdated(hwdevice);
-			emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
 #ifdef STATELESSPROFILING
 			clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &time2);
 			printf("TDEHardwareDevices::processStatelessDevices() : '%s' finished at %u [%u]\n", (hwdevice->name()).ascii(), time2.tv_nsec, diff(time1,time2).tv_nsec);
@@ -909,17 +921,15 @@ void TDEHardwareDevices::processBatteryDevices() {
 	TDEGenericHardwareList devList = listAllPhysicalDevices();
 	for ( hwdevice = devList.first(); hwdevice; hwdevice = devList.next() ) {
 		if (hwdevice->type() == TDEGenericDeviceType::Battery) {
-			rescanDeviceInformation(hwdevice, false);
+			rescanDeviceInformation(hwdevice, NULL, false);
 			emit hardwareUpdated(hwdevice);
-			emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
 		}
 		else if (hwdevice->type() == TDEGenericDeviceType::PowerSupply) {
 			TDEMainsPowerDevice *pdevice = dynamic_cast<TDEMainsPowerDevice*>(hwdevice);
 			int previousOnlineState = pdevice->online();
-			rescanDeviceInformation(hwdevice, false);
+			rescanDeviceInformation(hwdevice, NULL, false);
 			if (pdevice->online() != previousOnlineState) {
 				emit hardwareUpdated(hwdevice);
-				emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
 			}
 		}
 	}
@@ -933,7 +943,6 @@ void TDEHardwareDevices::processEventDeviceKeyPressed(unsigned int keycode, TDEE
 void TDEHardwareDevices::processModifiedMounts() {
 	// Detect what changed between the old mount table and the new one,
 	// and emit appropriate events
-
 	TQMap<TQString, bool> deletedEntries = m_mountTable;
 
 	// Read in the new mount table
@@ -959,52 +968,28 @@ void TDEHardwareDevices::processModifiedMounts() {
 		}
 	}
 
+	// Added devices
 	TQMap<TQString, bool>::Iterator it;
 	for ( it = addedEntries.begin(); it != addedEntries.end(); ++it ) {
-		TQStringList mountInfo = TQStringList::split(" ", it.key(), true);
 		// Try to find a device that matches the altered node
+		TQStringList mountInfo = TQStringList::split(" ", it.key(), true);
 		TDEGenericDevice* hwdevice = findByDeviceNode(*mountInfo.at(0));
-		if (hwdevice) {
+		if (hwdevice && hwdevice->type() == TDEGenericDeviceType::Disk) {
+			rescanDeviceInformation(hwdevice);
 			emit hardwareUpdated(hwdevice);
-			emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
-			// If the device is a storage device and has a slave, update it as well
-			if (hwdevice->type() == TDEGenericDeviceType::Disk) {
-				TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-				TQStringList slavedevices = sdevice->slaveDevices();
-				for ( TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit ) {
-					TDEGenericDevice* slavedevice = findBySystemPath(*slaveit);
-					if (slavedevice) {
-						emit hardwareUpdated(slavedevice);
-						emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, slavedevice->uniqueID());
-					}
-				}
-			}
 		}
 	}
+
+	// Removed devices
 	for ( it = deletedEntries.begin(); it != deletedEntries.end(); ++it ) {
-		TQStringList mountInfo = TQStringList::split(" ", it.key(), true);
 		// Try to find a device that matches the altered node
+		TQStringList mountInfo = TQStringList::split(" ", it.key(), true);
 		TDEGenericDevice* hwdevice = findByDeviceNode(*mountInfo.at(0));
-		if (hwdevice) {
+		if (hwdevice && hwdevice->type() == TDEGenericDeviceType::Disk) {
+			rescanDeviceInformation(hwdevice);
 			emit hardwareUpdated(hwdevice);
-			emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, hwdevice->uniqueID());
-			// If the device is a storage device and has a slave, update it as well
-			if (hwdevice->type() == TDEGenericDeviceType::Disk) {
-				TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-				TQStringList slavedevices = sdevice->slaveDevices();
-				for ( TQStringList::Iterator slaveit = slavedevices.begin(); slaveit != slavedevices.end(); ++slaveit ) {
-					TDEGenericDevice* slavedevice = findBySystemPath(*slaveit);
-					if (slavedevice) {
-						emit hardwareUpdated(slavedevice);
-						emit hardwareEvent(TDEHardwareEvent::HardwareUpdated, slavedevice->uniqueID());
-					}
-				}
-			}
 		}
 	}
-
-	emit mountTableModified();
-	emit hardwareEvent(TDEHardwareEvent::MountTableModified, TQString());
 }
 
 TDEDiskDeviceType::TDEDiskDeviceType classifyDiskType(udev_device* dev, const TQString devicenode, const TQString devicebus, const TQString disktypestring, const TQString systempath, const TQString devicevendor, const TQString devicemodel, const TQString filesystemtype, const TQString devicedriver) {
@@ -2175,7 +2160,8 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
 		if (devicesubsystem == "nd") {
 			if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::RAM);
 		}
-		if (devicesubsystem == "ptp") {
+		if (devicesubsystem == "ptp"
+			|| (devicesubsystem == "rtc")) {
 			if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Timekeeping);
 		}
 		if (devicesubsystem == "leds") {
@@ -2209,8 +2195,7 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
 		if (devicesubsystem == "mmc") {
 			if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Platform);
 		}
-		if ((devicesubsystem == "event_source")
-			|| (devicesubsystem == "rtc")) {
+		if (devicesubsystem == "event_source") {
 			if (!device) device = new TDEGenericDevice(TDEGenericDeviceType::Mainboard);
 		}
 		if (devicesubsystem == "bsg") {
@@ -2475,12 +2460,6 @@ TDEGenericDevice* TDEHardwareDevices::classifyUnknownDevice(udev_device* dev, TD
 		udev_device_unref(dev);
 	}
 
-	// Get the device mapped name if present
-	TDEStorageDevice *sdevice = dynamic_cast<TDEStorageDevice*>(device);
-	if (sdevice) {
-		sdevice->updateMappedName();
-	}
-
 	return device;
 }
 
@@ -2536,36 +2515,6 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 			sdevice->internalSetFileSystemName("pictbridge");
 		}
 		else {
-			bool removable = false;
-			bool hotpluggable = false;
-
-			// We can get the removable flag, but we have no idea if the device has the ability to notify on media insertion/removal
-			// If there is no such notification possible, then we should not set the removable flag
-			// udev can be such an amazing pain at times
-			// It exports a /capabilities node with no info on what the bits actually mean
-			// This information is very poorly documented as a set of #defines in include/linux/genhd.h
-			// We are specifically interested in GENHD_FL_REMOVABLE and GENHD_FL_MEDIA_CHANGE_NOTIFY
-			// The "removable" flag should also really be renamed to "hotpluggable", as that is far more precise...
-			TQString capabilitynodename = systempath;
-			capabilitynodename.append("/capability");
-			TQFile capabilityfile( capabilitynodename );
-			unsigned int capabilities = 0;
-			if ( capabilityfile.open( IO_ReadOnly ) ) {
-				TQTextStream stream( &capabilityfile );
-				TQString capabilitystring;
-				capabilitystring = stream.readLine();
-				capabilities = capabilitystring.toUInt();
-				capabilityfile.close();
-			}
-			if (capabilities & GENHD_FL_REMOVABLE) {
-				// FIXME
-				// For added fun this is not always true; i.e. GENHD_FL_REMOVABLE can be set when the device cannot be hotplugged (floppy drives).
-				hotpluggable = true;
-			}
-			if (capabilities & GENHD_FL_MEDIA_CHANGE_NOTIFY) {
-				removable = true;
-			}
-
 			// See if any other devices are exclusively using this device, such as the Device Mapper
 			TQStringList holdingDeviceNodes;
 			TQString holdersnodename = udev_device_get_syspath(dev);
@@ -2758,24 +2707,20 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 				}
 			}
 
-			if (removable) {
+			if (readLineFile( systempath + "/removable" ).toUInt()) {
 				diskstatus = diskstatus | TDEDiskDeviceStatus::Removable;
 			}
-			if (hotpluggable) {
-				diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable;
-			}
 			// Force removable flag for flash disks
 			// udev reports disks as non-removable for card readers on PCI controllers
-			if (((disktype & TDEDiskDeviceType::CompactFlash)
+			else if ((disktype & TDEDiskDeviceType::CompactFlash)
 			     || (disktype & TDEDiskDeviceType::MemoryStick)
 			     || (disktype & TDEDiskDeviceType::SmartMedia)
-			     || (disktype & TDEDiskDeviceType::SDMMC))
-			    && !(diskstatus & TDEDiskDeviceStatus::Removable)
-			    && !(diskstatus & TDEDiskDeviceStatus::Hotpluggable)) {
-				diskstatus = diskstatus | TDEDiskDeviceStatus::Hotpluggable;
+			     || (disktype & TDEDiskDeviceType::SDMMC)) {
+				diskstatus = diskstatus | TDEDiskDeviceStatus::Removable;
 			}
 
-			if ((filesystemtype.upper() != "CRYPTO_LUKS") && (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP") && (!filesystemtype.isEmpty())) {
+			if ((!filesystemtype.isEmpty()) && (filesystemtype.upper() != "CRYPTO_LUKS") &&
+			    (filesystemtype.upper() != "CRYPTO") && (filesystemtype.upper() != "SWAP")) {
 				diskstatus = diskstatus | TDEDiskDeviceStatus::ContainsFilesystem;
 			}
 			else {
@@ -2789,7 +2734,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 				// type string too. For example for LUKS disk, ID_TYPE is null and DEVTYPE is "disk"
 				diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable;
 			}
-			if (removable) {
+			if ( diskstatus & TDEDiskDeviceStatus::Removable ) {
 				if (sdevice->mediaInserted()) {
 					diskstatus = diskstatus | TDEDiskDeviceStatus::Inserted;
 				}
@@ -2802,11 +2747,12 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 				diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable;
 			}
 			// Partition tables cannot be mounted
-			if ((TQString(udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")) != "")
-			    && ((TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")).isEmpty())
-				|| (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0x5")
-				|| (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0xf")
-				|| (TQString(udev_device_get_property_value(dev, "ID_FS_USAGE")).upper() == "RAID"))) {
+			if ((!TQString(udev_device_get_property_value(dev, "ID_PART_TABLE_TYPE")).isEmpty()) &&
+			    ((TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")).isEmpty() &&
+			    !(diskstatus & TDEDiskDeviceStatus::ContainsFilesystem)) ||
+			    (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0x5") ||
+			    (TQString(udev_device_get_property_value(dev, "ID_PART_ENTRY_TYPE")) == "0xf") ||
+			    (TQString(udev_device_get_property_value(dev, "ID_FS_USAGE")).upper() == "RAID"))) {
 				diskstatus = diskstatus & ~TDEDiskDeviceStatus::Mountable;
 			}
 			// If certain disk types do not report the presence of a filesystem, they are likely not mountable
@@ -2879,6 +2825,8 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 			}
 
 			sdevice->internalSetDiskLabel(disklabel);
+			sdevice->internalUpdateMountPath();
+			sdevice->internalUpdateMappedName();
 		}
 	}
 
@@ -2976,7 +2924,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 										ndevice->internalSetIpV6Netmask(address);
 									}
 								}
-								s = getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+								s = ifa->ifa_ifu.ifu_broadaddr ? getnameinfo(ifa->ifa_ifu.ifu_broadaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME;
 								if (s == 0) {
 									TQString address(host);
 									if (family == AF_INET) {
@@ -2987,7 +2935,7 @@ void TDEHardwareDevices::updateExistingDeviceInformation(TDEGenericDevice *devic
 										ndevice->internalSetIpV6Broadcast(address);
 									}
 								}
-								s = getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+								s = ifa->ifa_ifu.ifu_dstaddr ? getnameinfo(ifa->ifa_ifu.ifu_dstaddr, (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) : EAI_NONAME;
 								if (s == 0) {
 									TQString address(host);
 									if (family == AF_INET) {
@@ -3680,8 +3628,6 @@ bool TDEHardwareDevices::queryHardwareInformation() {
 	// Update parent/child tables for all devices
 	updateParentDeviceInformation();
 
-	emit hardwareEvent(TDEHardwareEvent::HardwareListModified, TQString());
-
 	return true;
 }
 
@@ -3791,7 +3737,7 @@ TQString TDEHardwareDevices::findPCIDeviceName(TQString vendorid, TQString model
 	if (!pci_id_map) {
 		pci_id_map = new TDEDeviceIDMap;
 
-		TQString database_filename = "/usr/share/pci.ids";
+		TQString database_filename = "/usr/share/hwdata/pci.ids";
 		if (!TQFile::exists(database_filename)) {
 			database_filename = "/usr/share/misc/pci.ids";
 		}
@@ -3901,7 +3847,7 @@ TQString TDEHardwareDevices::findUSBDeviceName(TQString vendorid, TQString model
 	if (!usb_id_map) {
 		usb_id_map = new TDEDeviceIDMap;
 
-		TQString database_filename = "/usr/share/usb.ids";
+		TQString database_filename = "/usr/share/hwdata/usb.ids";
 		if (!TQFile::exists(database_filename)) {
 			database_filename = "/usr/share/misc/usb.ids";
 		}
diff --git a/tdecore/tdehw/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h
index 6d9b63ea6..4e4259dfc 100644
--- a/tdecore/tdehw/tdehardwaredevices.h
+++ b/tdecore/tdehw/tdehardwaredevices.h
@@ -81,7 +81,7 @@ typedef TQDict<TDECPUDevice> TDECPUDeviceCache;
 
 class TDECORE_EXPORT TDEHardwareDevices : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:	
 		/**
@@ -207,19 +207,13 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject
 		/**
 		*  Rescan a hardware device to look for changes
 		*  WARNING: This method can be very expensive.  Use with caution!
-		*  @param hwdevice TDEGenericDevice* with the device to rescan
-		*/
-		void rescanDeviceInformation(TDEGenericDevice* hwdevice);
-
-		/**
-		*  Rescan a hardware device to look for changes
-		*  WARNING: This method can be very expensive.  Use with caution!
 		*  The computational expense can be reduced somewhat if the device tree structure
 		*  has not changed by calling this method with regenerateDeviceTree = false.
 		*  @param hwdevice TDEGenericDevice* with the device to rescan
+		*  @param dev udev_device* with the udev device to rescan
 		*  @param regenerateDeviceTree true to update parent/child links in device tree
 		*/
-		void rescanDeviceInformation(TDEGenericDevice* hwdevice, bool regenerateDeviceTree);
+		void rescanDeviceInformation(TDEGenericDevice* hwdevice, udev_device* dev = NULL, bool regenerateDeviceTree = true);
 
 		/**
 		*  Enable or disable automatic state updates of triggerless hardware devices
@@ -238,7 +232,7 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject
 		*  @param enable a bool specifiying whether or not automatic updates should be enabled
 		*/
 		void setBatteryUpdatesEnabled(bool enable);
-		
+
 		/**
 		*  Convert a byte count to human readable form
 		*  @param bytes a double containing the number of bytes
@@ -250,8 +244,6 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject
 		void hardwareAdded(TDEGenericDevice*);
 		void hardwareRemoved(TDEGenericDevice*);
 		void hardwareUpdated(TDEGenericDevice*);
-		void mountTableModified();
-		void hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString uuid);
 
 		/**
 		* @param keycode the code of the key that was pressed/released
diff --git a/tdecore/tdehw/tdehwcommontypes.h b/tdecore/tdehw/tdehwcommontypes.h
index bc4eaeecf..e26de1996 100644
--- a/tdecore/tdehw/tdehwcommontypes.h
+++ b/tdecore/tdehw/tdehwcommontypes.h
@@ -91,16 +91,4 @@ enum TDEDisplayPowerLevel {
 };
 };
 
-namespace TDEHardwareEvent {
-enum TDEHardwareEvent {
-	HardwareListModified,
-	MountTableModified,
-	HardwareAdded,
-	HardwareRemoved,
-	HardwareUpdated,
-	Other,
-	Last = Other
-};
-};
-
 #endif // _TDEHWCOMMON_H
diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp
index 2961c8737..b2ae276a8 100644
--- a/tdecore/tdehw/tdenetworkconnections.cpp
+++ b/tdecore/tdehw/tdenetworkconnections.cpp
@@ -40,6 +40,13 @@
 /* TDENetworkSearchDomain                                                                         */
 /*================================================================================================*/
 
+extern "C" {
+	KDE_EXPORT TDEGlobalNetworkManager* create_tdeGlobalNetworkManager()
+	{
+		return new TDEGlobalNetworkManager();
+	}
+}
+
 TDENetworkSearchDomain::TDENetworkSearchDomain() {
 	m_isIPV6 = false;
 }
@@ -700,7 +707,7 @@ TDEWiFiConnection::~TDEWiFiConnection() {
 
 TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) {
 	m_emissionTimer = new TQTimer();
-	connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals()));
+	connect(m_emissionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitQueuedSignals()));
 	if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
 }
 
@@ -955,9 +962,9 @@ TDEGlobalNetworkManager::TDEGlobalNetworkManager() : m_internalConnectionManager
 	m_internalConnectionManager = new TDENetworkConnectionManager_BackendNM(NULL);
 #endif // WITH_NETWORK_MANAGER_BACKEND
 	if (m_internalConnectionManager) {
-		connect(m_internalConnectionManager, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
-		connect(m_internalConnectionManager, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
-		connect(m_internalConnectionManager, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)));
+		connect(m_internalConnectionManager, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
+		connect(m_internalConnectionManager, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
+		connect(m_internalConnectionManager, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)));
 	}
 }
 
@@ -1097,9 +1104,14 @@ TDENetworkWiFiAPInfo* TDEGlobalNetworkManager::findAccessPointByBSSID(TDEMACAddr
 		TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(*it);
 		if (dev) {
 			TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-			TDENetworkWiFiAPInfo* candidate = deviceConnMan->findAccessPointByBSSID(bssid);
-			if (candidate) {
-				ret = candidate;
+			if (deviceConnMan)
+			{
+				TDENetworkWiFiAPInfo* candidate = deviceConnMan->findAccessPointByBSSID(bssid);
+				if (candidate)
+				{
+					ret = candidate;
+					break;
+				}
 			}
 		}
 	}
diff --git a/tdecore/tdehw/tdenetworkconnections.h b/tdecore/tdehw/tdenetworkconnections.h
index 806c162a8..aa44e8edb 100644
--- a/tdecore/tdehw/tdenetworkconnections.h
+++ b/tdecore/tdehw/tdenetworkconnections.h
@@ -1015,7 +1015,7 @@ class TQTimer;
 
 class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
@@ -1364,7 +1364,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
 
 class TDECORE_EXPORT TDEGlobalNetworkManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp
index 741751581..4fe075831 100644
--- a/tdecore/tdehw/tderootsystemdevice.cpp
+++ b/tdecore/tdehw/tderootsystemdevice.cpp
@@ -32,13 +32,13 @@
 
 #include "config.h"
 
-#if defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_HAL) || defined(WITH_CONSOLEKIT)
+#if defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_CONSOLEKIT)
 	#include <tqdbusdata.h>
 	#include <tqdbusmessage.h>
 	#include <tqdbusproxy.h>
 	#include <tqdbusvariant.h>
 	#include <tqdbusconnection.h>
-#endif // defined(WITH_TDEHWLIB_DAEMONS) || defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) || defined(WITH_HAL) || defined(WITH_CONSOLEKIT)
+#endif
 
 TDERootSystemDevice::TDERootSystemDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn) {
 	m_hibernationSpace = -1;
@@ -247,32 +247,6 @@ bool TDERootSystemDevice::canSuspend() {
 	}
 #endif// WITH_DEVKITPOWER
 
-#ifdef WITH_HAL
-	{
-		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
-		if (dbusConn.isConnected()) {
-			TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn);
-			if (halProperties.canSend()) {
-				// can suspend?
-				TQValueList<TQT_DBusData> params;
-				TQT_DBusMessage reply;
-				params.clear();
-				params << TQT_DBusData::fromString("power_management.can_suspend");
-				reply = halProperties.sendWithReply("GetPropertyBoolean", params);
-				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-					return reply[0].toBool();
-				}
-				params.clear();
-				params << TQT_DBusData::fromString("power_management.can_suspend_to_ram");
-				reply = halProperties.sendWithReply("GetPropertyBoolean", params);
-				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-					return reply[0].toBool();
-				}
-			}
-		}
-	}
-#endif // WITH_HAL
-
 #ifdef WITH_TDEHWLIB_DAEMONS
 	{
 		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
@@ -362,32 +336,6 @@ bool TDERootSystemDevice::canHibernate() {
 	}
 #endif// WITH_DEVKITPOWER
 
-#ifdef WITH_HAL
-	{
-		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
-		if (dbusConn.isConnected()) {
-			TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn);
-			if (halProperties.canSend()) {
-				// can hibernate?
-				TQValueList<TQT_DBusData> params;
-				TQT_DBusMessage reply;
-				params.clear();
-				params << TQT_DBusData::fromString("power_management.can_hibernate");
-				reply = halProperties.sendWithReply("GetPropertyBoolean", params);
-				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-					return reply[0].toBool();
-				}
-				params.clear();
-				params << TQT_DBusData::fromString("power_management.can_suspend_to_disk");
-				reply = halProperties.sendWithReply("GetPropertyBoolean", params);
-				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-					return reply[0].toBool();
-				}
-			}
-		}
-	}
-#endif // WITH_HAL
-
 #ifdef WITH_TDEHWLIB_DAEMONS
 	{
 		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
@@ -444,26 +392,6 @@ bool TDERootSystemDevice::canHybridSuspend() {
 	// No support "hybrid suspend" in org.freedesktop.UPower
 	// No support "hybrid suspend" in org.freedesktop.DeviceKit.Power
 
-#ifdef WITH_HAL
-	{
-		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
-		if (dbusConn.isConnected()) {
-			TQT_DBusProxy halProperties("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device", dbusConn);
-			if (halProperties.canSend()) {
-				// can hybrid suspend?
-				TQValueList<TQT_DBusData> params;
-				TQT_DBusMessage reply;
-				params.clear();
-				params << TQT_DBusData::fromString("power_management.can_suspend_hybrid");
-				reply = halProperties.sendWithReply("GetPropertyBoolean", params);
-				if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
-					return reply[0].toBool();
-				}
-			}
-		}
-	}
-#endif // WITH_HAL
-
 #ifdef WITH_TDEHWLIB_DAEMONS
 	{
 		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
@@ -794,53 +722,6 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState
 		}
 #endif // WITH_DEVKITPOWER
 
-#ifdef WITH_HAL
-		{
-		  // No support for "freeze" in org.freedesktop.Hal
-			TQT_DBusConnection dbusConn;
-			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
-			if ( dbusConn.isConnected() ) {
-				if (ps == TDESystemPowerState::Suspend) {
-					TQT_DBusProxy halPowerManagement(
-							"org.freedesktop.Hal",
-							"/org/freedesktop/Hal/devices/computer",
-							"org.freedesktop.Hal.Device.SystemPowerManagement",
-							dbusConn);
-					TQValueList<TQT_DBusData> params;
-					params << TQT_DBusData::fromInt32(0);
-					TQT_DBusMessage reply = halPowerManagement.sendWithReply("Suspend", params);
-					if (reply.type() == TQT_DBusMessage::ReplyMessage) {
-						return true;
-					}
-				}
-				else if (ps == TDESystemPowerState::Hibernate) {
-					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
-								"org.freedesktop.Hal",
-								"/org/freedesktop/Hal/devices/computer",
-								"org.freedesktop.Hal.Device.SystemPowerManagement",
-								"Hibernate");
-					TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
-					if (reply.type() == TQT_DBusMessage::ReplyMessage) {
-						return true;
-					}
-				}
-				else if (ps == TDESystemPowerState::HybridSuspend) {
-					TQT_DBusProxy halPowerManagement(
-							"org.freedesktop.Hal",
-							"/org/freedesktop/Hal/devices/computer",
-							"org.freedesktop.Hal.Device.SystemPowerManagement",
-							dbusConn);
-					TQValueList<TQT_DBusData> params;
-					params << TQT_DBusData::fromInt32(0);
-					TQT_DBusMessage reply = halPowerManagement.sendWithReply("SuspendHybrid", params);
-					if (reply.type() == TQT_DBusMessage::ReplyMessage) {
-						return true;
-					}
-				}
-			}
-		}
-#endif // WITH_HAL
-
 #ifdef WITH_TDEHWLIB_DAEMONS
 		{
 			TQT_DBusConnection dbusConn;
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index 60ea51912..df5f90ab7 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -43,11 +43,9 @@
 #if defined(WITH_CRYPTSETUP)
 	#ifdef CRYPTSETUP_OLD_API
 		#define class cryptsetup_class
-		#define CRYPT_SLOT_INVALID INVALID
-		#define CRYPT_SLOT_INACTIVE INACTIVE
-		#define CRYPT_SLOT_ACTIVE ACTIVE
-		#define CRYPT_SLOT_BUSY BUSY
-		#define CRYPT_SLOT_ACTIVE_LAST ACTIVE
+		#define CRYPT_SLOT_INACTIVE SLOT_INACTIVE
+		#define CRYPT_SLOT_ACTIVE SLOT_ACTIVE
+		#define CRYPT_SLOT_ACTIVE_LAST SLOT_ACTIVE_LAST
 		#include <libcryptsetup.h>
 		#undef class
 	#else
@@ -73,7 +71,7 @@ TQString TDEStorageDevice::mappedName() {
 	return m_mappedName;
 }
 
-void TDEStorageDevice::updateMappedName() {
+void TDEStorageDevice::internalUpdateMappedName() {
 	// Get the device mapped name if present
 	m_mappedName = TQString::null;
 	TQString dmnodename = systemPath();
@@ -331,20 +329,19 @@ TQStringVariantMap TDEStorageDevice::ejectDrive() {
 	TQStringVariantMap result;
 	TQStringVariantMap ejectResult;
 
+	// If the device is mounted, try unmounting it first
+	if (!mountPath().isEmpty()) {
+		unmountDevice();
+	}
+
 #ifdef WITH_UDISKS2
 	if (!(TDEGlobal::dirs()->findExe("udisksctl").isEmpty())) {
 		ejectResult = udisks2EjectDrive(this);
 		if (ejectResult["result"].toBool()) {
-			// Update internal mount data
-			TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-			TDEGlobal::hardwareDevices()->processModifiedMounts();
 			result["result"] = true;
 			return result;
 		}
 		else {
-			// Update internal mount data
-			TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-			TDEGlobal::hardwareDevices()->processModifiedMounts();
 			result["errStr"] = ejectResult["errStr"];
 			result["result"] = false;
 			return result;
@@ -355,16 +352,10 @@ TQStringVariantMap TDEStorageDevice::ejectDrive() {
 	if (!(TDEGlobal::dirs()->findExe("udisks").isEmpty())) {
 		ejectResult = udisksEjectDrive(this);
 		if (ejectResult["result"].toBool()) {
-			// Update internal mount data
-			TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-			TDEGlobal::hardwareDevices()->processModifiedMounts();
 			result["result"] = true;
 			return result;
 		}
 		else {
-			// Update internal mount data
-			TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-			TDEGlobal::hardwareDevices()->processModifiedMounts();
 			result["errStr"] = ejectResult["errStr"];
 			result["result"] = false;
 			return result;
@@ -382,9 +373,6 @@ TQStringVariantMap TDEStorageDevice::ejectDrive() {
 			eject_output = ts.read();
 			int retcode = pclose(exepipe);
 			if (retcode == 0) {
-				// Update internal mount data
-				TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-				TDEGlobal::hardwareDevices()->processModifiedMounts();
 				result["result"] = true;
 				return result;
 			}
@@ -395,9 +383,6 @@ TQStringVariantMap TDEStorageDevice::ejectDrive() {
 		}
 	}
 
-	// Update internal mount data
-	TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-	TDEGlobal::hardwareDevices()->processModifiedMounts();
 	result["result"] = false;
 	return result;
 }
@@ -519,7 +504,7 @@ TQString TDEStorageDevice::friendlyName() {
 	TQString label = diskLabel();
 	if (label.isNull()) {
 		if (deviceSize() > 0) {
-			if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
+			if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
 				label = i18n("%1 Removable Device").arg(deviceFriendlySize());
 			}
 			else {
@@ -576,7 +561,7 @@ TQString TDEStorageDevice::friendlyDeviceType() {
 
 	if (isDiskOfType(TDEDiskDeviceType::HDD)) {
 		ret = i18n("Hard Disk Drive");
-		if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
+		if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
 			ret = i18n("Removable Storage");
 		}
 		if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) {
@@ -647,7 +632,7 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) {
 
 	if (isDiskOfType(TDEDiskDeviceType::HDD)) {
 		ret = DesktopIcon("drive-harddisk" + mountString, size);
-		if (checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
+		if (checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
 			ret = DesktopIcon("media-flash-usb" + mountString, size);
 		}
 		if (isDiskOfType(TDEDiskDeviceType::CompactFlash)) {
@@ -697,7 +682,13 @@ TQString TDEStorageDevice::deviceFriendlySize() {
 	return TDEHardwareDevices::bytesToFriendlySizeString(deviceSize());
 }
 
-TQString TDEStorageDevice::mountPath() {
+TQString TDEStorageDevice::mountPath()
+{
+	return m_mountPath;
+}
+
+void TDEStorageDevice::internalUpdateMountPath()
+{
 	// See if this device node is mounted
 	// This requires parsing /proc/mounts, looking for deviceNode()
 
@@ -705,8 +696,10 @@ TQString TDEStorageDevice::mountPath() {
 	// It likes to advertise mounts as /dev/mapper/<something>,
 	// where <something> is listed in <system path>/dm/name
 
-	// First, ensure that all device information (mainly holders/slaves) is accurate
-	TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
+	// Assumed all device information (mainly holders/slaves) is accurate
+	// prior to the call
+
+	m_mountPath = TQString::null;
 
 	TQStringList lines;
 	TQFile file( "/proc/mounts" );
@@ -719,29 +712,15 @@ TQString TDEStorageDevice::mountPath() {
 			TQString testNode = *mountInfo.at(0);
 			// Check for match
 			if ((testNode == deviceNode()) || (testNode == mappedName()) || (testNode == ("/dev/disk/by-uuid/" + diskUUID()))) {
-				TQString ret = *mountInfo.at(1);
-				ret.replace("\\040", " ");
-				return ret;
+				m_mountPath = *mountInfo.at(1);
+				m_mountPath.replace("\\040", " ");
+				file.close();
+				return;
 			}
 			lines += line;
 		}
 		file.close();
 	}
-
-	// While this device is not directly mounted, it could concievably be mounted via the Device Mapper
-	// If so, try to retrieve the mount path...
-	TQStringList slaveDeviceList = holdingDevices();
-	for ( TQStringList::Iterator slavedevit = slaveDeviceList.begin(); slavedevit != slaveDeviceList.end(); ++slavedevit ) {
-		// Try to locate this device path in the TDE device tree
-		TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
-		TDEGenericDevice *hwdevice = hwdevices->findBySystemPath(*slavedevit);
-		if ((hwdevice) && (hwdevice->type() == TDEGenericDeviceType::Disk)) {
-			TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice);
-			return sdevice->mountPath();
-		}
-	}
-
-	return TQString::null;
 }
 
 TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOptions mountOptions) {
@@ -825,7 +804,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
 	mountResult = udisks2MountDrive(devNode, fileSystemType, optionString);
 	if (mountResult["result"].toBool()) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["mountPath"] = mountPath();
 		result["result"] = true;
@@ -833,7 +811,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
 	}
 	else if (mountResult["retcode"].toInt() == -1) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["errStr"] = mountResult["errStr"];
 		result["result"] = false;
@@ -847,7 +824,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
 	mountResult = udisksMountDrive(devNode, fileSystemType, udisksOptions);
 	if (mountResult["result"].toBool()) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["mountPath"] = mountPath();
 		result["result"] = true;
@@ -855,7 +831,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
 	}
 	else if (mountResult["retcode"].toInt() == -1) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["errStr"] = mountResult["errStr"];
 		result["result"] = false;
@@ -945,7 +920,6 @@ TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM
 	}
 
 	// Update internal mount data
-	TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 	TDEGlobal::hardwareDevices()->processModifiedMounts();
 	result["mountPath"] = mountPath();
 	result["result"] = !mountPath().isEmpty();
@@ -956,13 +930,13 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() {
 	TQStringVariantMap result;
 
 	// Check if device is already unmounted
-	TQString mountpoint = mountPath();
-	if (mountpoint.isEmpty()) {
+	TQString mountpath = mountPath();
+	if (mountpath.isEmpty()) {
 		result["result"] = true;
 		return result;
 	}
 
-	mountpoint.replace("'", "'\\''");
+	mountpath.replace("'", "'\\''");
 	TQString devNode = deviceNode();
 	TQString command = TQString::null;
 	TQStringVariantMap unmountResult;
@@ -972,14 +946,12 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() {
 	unmountResult = udisks2UnmountDrive(devNode, TQString::null);
 	if (unmountResult["result"].toBool()) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["result"] = true;
 		return result;
 	}
 	else if (unmountResult["retcode"].toInt() == -1) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["errStr"] = unmountResult["errStr"];
 		result["result"] = false;
@@ -993,14 +965,12 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() {
 	unmountResult = udisksUnmountDrive(devNode, TQStringList());
 	if (unmountResult["result"].toBool()) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["result"] = true;
 		return result;
 	}
 	else if (unmountResult["retcode"].toInt() == -1) {
 		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["errStr"] = unmountResult["errStr"];
 		result["result"] = false;
@@ -1012,13 +982,13 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() {
 	// The UDISKS v1 DBUS service was either not available or was unusable
 	// Use 'udevil' command, if available
 	if (!TDEGlobal::dirs()->findExe("udevil").isEmpty()) {
-		command = TQString("udevil umount '%1' 2>&1").arg(mountpoint);
+		command = TQString("udevil umount '%1' 2>&1").arg(mountpath);
 	}
 #endif
 
 	// If no other method was found, use 'pmount' command if available
 	if(command.isEmpty() && !TDEGlobal::dirs()->findExe("pumount").isEmpty()) {
-		command = TQString("pumount '%1' 2>&1").arg(mountpoint);
+		command = TQString("pumount '%1' 2>&1").arg(mountpath);
 	}
 
 	if(command.isEmpty()) {
@@ -1035,7 +1005,6 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() {
 		int retcode = pclose(exepipe);
 		if (retcode == 0) {
 			// Update internal mount data
-			TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 			TDEGlobal::hardwareDevices()->processModifiedMounts();
 			result["result"] = true;
 			return result;
@@ -1047,7 +1016,6 @@ TQStringVariantMap TDEStorageDevice::unmountDevice() {
 	}
 
 	// Update internal mount data
-	TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
 	TDEGlobal::hardwareDevices()->processModifiedMounts();
 	result["result"] = false;
 	return result;
@@ -1057,14 +1025,6 @@ TQStringVariantMap TDEStorageDevice::unlockDevice(const TQString &passphrase)
 {
 	TQStringVariantMap result;
 
-	// Check if device is already mounted
-	TQString mountpath = mountPath();
-	if (!mountpath.isEmpty()) {
-		result["unlockedDevice"] = mountpath;
-		result["result"] = true;
-		return result;
-	}
-
 	TQString devNode = deviceNode();
 	devNode.replace("'", "'\\''");
 
@@ -1074,17 +1034,11 @@ TQStringVariantMap TDEStorageDevice::unlockDevice(const TQString &passphrase)
 	// Try to use UDISKS v2 via DBUS, if available
 	unlockResult = udisks2UnlockDrive(devNode, passphrase);
 	if (unlockResult["result"].toBool()) {
-		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["unlockedDevice"] = unlockResult["unlockedDevice"];
 		result["result"] = true;
 		return result;
 	}
 	else if (unlockResult["retcode"].toInt() == -1) {
-		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["errStr"] = unlockResult["errStr"];
 		result["result"] = false;
 		return result;
@@ -1115,9 +1069,6 @@ TQStringVariantMap TDEStorageDevice::unlockDevice(const TQString &passphrase)
 			delete ts;
 			int retcode = pclose(exepipe);
 			if (retcode == 0) {
-				// Update internal mount data
-				TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-				TDEGlobal::hardwareDevices()->processModifiedMounts();
 				result["result"] = true;
 			}
 			else {
@@ -1139,14 +1090,6 @@ TQStringVariantMap TDEStorageDevice::lockDevice()
 {
 	TQStringVariantMap result;
 
-	// Check if device is mounted
-	TQString mountpath = mountPath();
-	if (!mountpath.isEmpty()) {
-		result["errStr"] = i18n("The device is currently mounted and cannot be locked.");
-		result["result"] = false;
-		return result;
-	}
-
 	TQString devNode = deviceNode();
 	devNode.replace("'", "'\\''");
 
@@ -1156,16 +1099,10 @@ TQStringVariantMap TDEStorageDevice::lockDevice()
 	// Try to use UDISKS v2 via DBUS, if available
 	lockResult = udisks2LockDrive(devNode);
 	if (lockResult["result"].toBool()) {
-		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["result"] = true;
 		return result;
 	}
 	else if (lockResult["retcode"].toInt() == -1) {
-		// Update internal mount data
-		TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-		TDEGlobal::hardwareDevices()->processModifiedMounts();
 		result["errStr"] = lockResult["errStr"];
 		result["result"] = false;
 		return result;
@@ -1182,9 +1119,6 @@ TQStringVariantMap TDEStorageDevice::lockDevice()
 			delete ts;
 			int retcode = pclose(exepipe);
 			if (retcode == 0) {
-				// Update internal mount data
-				TDEGlobal::hardwareDevices()->rescanDeviceInformation(this);
-				TDEGlobal::hardwareDevices()->processModifiedMounts();
 				result["result"] = true;
 			}
 			else {
@@ -1202,57 +1136,4 @@ TQStringVariantMap TDEStorageDevice::lockDevice()
 	return result;
 }
 
-TQString TDEStorageDevice::determineFileSystemType(TQString path) {
-	TQStringList mountTable;
-	TQString prevPath = path;
-	dev_t prevDev = 0;
-	int pos;
-	struct stat directory_info;
-	if (path.startsWith("/")) {
-		stat(path.local8Bit(), &directory_info);
-		prevDev = directory_info.st_dev;
-		// Walk the directory tree up to the root, checking for any change in st_dev
-		// If a change is found, the previous value of path is the mount point itself
-		while (path != "/") {
-			pos = path.findRev("/", -1, true);
-			if (pos < 0) {
-				break;
-			}
-			path = path.mid(0, pos);
-			if (path == "") {
-				path = "/";
-			}
-			stat(path.local8Bit(), &directory_info);
-			if (directory_info.st_dev != prevDev) {
-				break;
-			}
-			prevPath = path;
-			prevDev = directory_info.st_dev;
-		}
-	}
-
-	// Read in mount table
-	mountTable.clear();
-	TQFile file( "/proc/mounts" );
-	if ( file.open( IO_ReadOnly ) ) {
-		TQTextStream stream( &file );
-		while ( !stream.atEnd() ) {
-			mountTable.append(stream.readLine());
-		}
-		file.close();
-	}
-
-	// Parse mount table
-	TQStringList::Iterator it;
-	for ( it = mountTable.begin(); it != mountTable.end(); ++it ) {
-		TQStringList mountInfo = TQStringList::split(" ", (*it), true);
-		if ((*mountInfo.at(1)) == prevPath) {
-			return (*mountInfo.at(2));
-		}
-	}
-
-	// Unknown file system type
-	return TQString::null;
-}
-
 #include "tdestoragedevice.moc"
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h
index 61ef6daad..891b31573 100644
--- a/tdecore/tdehw/tdestoragedevice.h
+++ b/tdecore/tdehw/tdestoragedevice.h
@@ -22,6 +22,7 @@
 
 #include "tdegenericdevice.h"
 #include "tqvariant.h"
+#include "kdemacros.h"
 
 struct crypt_device;
 
@@ -107,7 +108,7 @@ enum TDEDiskDeviceStatus {
 	UsedByDevice       = 0x00000010,
 	UsesDevice         = 0x00000020,
 	ContainsFilesystem = 0x00000040,
-	Hotpluggable       = 0x00000080,
+	// Do not use 0x00000080, it was `Hotpluggable` up to the R14.1.x series
 	Hidden             = 0x00000100,
 	Other              = 0x80000000
 };
@@ -199,11 +200,6 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
 		TQString mappedName();
 
 		/**
-		* Find and store the alternative mapped name of a mapped device
-		*/
-		void updateMappedName();
-
-		/**
 		 * @return an OR-ed combination of TDEDiskDeviceType::TDEDiskDeviceType type flags
 		 */
 		TDEDiskDeviceType::TDEDiskDeviceType diskType();
@@ -350,13 +346,6 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
 		TQStringVariantMap ejectDrive();
 
 		/**
-		 * @param path Full path to arbitrary file or directory
-		 * @return TQString with type of file system containing the given file,
-		 * or TQString::null if file system type unknown
-		 */
-		static TQString determineFileSystemType(TQString path);
-
-		/**
 		 * Set the unlock password to use in subsequent LUKS operations
 		 * @see cryptClearOperationsUnlockPassword
 		 *
@@ -501,6 +490,16 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
 		 */
 		void internalGetLUKSKeySlotStatus();
 
+		/**
+		* Find and store the alternative mapped name of a mapped device
+		*/
+		void internalUpdateMappedName();
+
+		/**
+		* Find and store the mount point of the device, if any
+		*/
+		void internalUpdateMountPath();
+
 	private:
 		TQString m_mappedName;  // Alternative name for a mapped device
 		TDEDiskDeviceType::TDEDiskDeviceType m_diskType;
diff --git a/tdecore/tdelibs_export.h b/tdecore/tdelibs_export.h
index 7d2ab7db2..9697c6bb4 100644
--- a/tdecore/tdelibs_export.h
+++ b/tdecore/tdelibs_export.h
@@ -26,7 +26,7 @@
 /* needed, because e.g. Q_OS_UNIX is so frequently used */
 #include <tqglobal.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include <tdelibs_export_win.h>
 
 #else /* Q_OS_UNIX */
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 91e0865bf..3c6dc0cc8 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -42,7 +42,7 @@
 #include "kcalendarsystemfactory.h"
 #include "tdelocale.h"
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include <windows.h>
 #endif
 
@@ -72,7 +72,7 @@ public:
   KCalendarSystem * calendar;
   bool utf8FileEncoding;
   TQString appName;
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   char win32SystemEncoding[3+7]; //"cp " + lang ID
 #endif
   bool useMainCatalogue;
@@ -1218,34 +1218,34 @@ static void _inc_by_one(TQString &str, int position)
       switch(last_char)
 	{
 	case '0':
-	  str[i] = (QChar)'1';
+	  str[i] = (TQChar)'1';
 	  break;
 	case '1':
-	  str[i] = (QChar)'2';
+	  str[i] = (TQChar)'2';
 	  break;
 	case '2':
-	  str[i] = (QChar)'3';
+	  str[i] = (TQChar)'3';
 	  break;
 	case '3':
-	  str[i] = (QChar)'4';
+	  str[i] = (TQChar)'4';
 	  break;
 	case '4':
-	  str[i] = (QChar)'5';
+	  str[i] = (TQChar)'5';
 	  break;
 	case '5':
-	  str[i] = (QChar)'6';
+	  str[i] = (TQChar)'6';
 	  break;
 	case '6':
-	  str[i] = (QChar)'7';
+	  str[i] = (TQChar)'7';
 	  break;
 	case '7':
-	  str[i] = (QChar)'8';
+	  str[i] = (TQChar)'8';
 	  break;
 	case '8':
-	  str[i] = (QChar)'9';
+	  str[i] = (TQChar)'9';
 	  break;
 	case '9':
-	  str[i] = (QChar)'0';
+	  str[i] = (TQChar)'0';
 	  if (i == 0) str.prepend('1');
 	  continue;
 	case '.':
@@ -1310,8 +1310,8 @@ TQString TDELocale::formatNumber(const TQString &numStr, bool round,
 
   
   // Skip the sign (for now)
-  bool neg = (tmpString[0] == (QChar)'-');
-  if (neg  ||  tmpString[0] == (QChar)'+') tmpString.remove(0, 1);
+  bool neg = (tmpString[0] == (TQChar)'-');
+  if (neg  ||  tmpString[0] == (TQChar)'+') tmpString.remove(0, 1);
 
   // Split off exponential part (including 'e'-symbol)
   TQString mantString = tmpString.section('e', 0, 0,
@@ -1472,7 +1472,7 @@ double TDELocale::readNumber(const TQString &_str, bool * ok) const
   }
 
   TQString tot;
-  if (neg) tot = (QChar)'-';
+  if (neg) tot = (TQChar)'-';
 
   tot += major + '.' + minor + exponentialPart;
 
@@ -1502,7 +1502,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const
   // (with a special case for parenthesis)
   if (negativeMonetarySignPosition() == ParensAround)
     {
-      if (str[0] == (QChar)'(' && str[str.length()-1] == (QChar)')')
+      if (str[0] == (TQChar)'(' && str[str.length()-1] == (TQChar)')')
         {
 	  neg = true;
 	  str.remove(str.length()-1,1);
@@ -1569,7 +1569,7 @@ double TDELocale::readMoney(const TQString &_str, bool * ok) const
   }
 
   TQString tot;
-  if (neg) tot = (QChar)'-';
+  if (neg) tot = (TQChar)'-';
   tot += major + '.' + minior;
   return tot.toDouble(ok);
 }
@@ -1626,7 +1626,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
 
     TQChar c = fmt.at(fmtpos++);
 
-    if (c != (QChar)'%') {
+    if (c != (TQChar)'%') {
       if (c.isSpace() && str.at(strpos).isSpace())
         strpos++;
       else if (c != str.at(strpos++))
@@ -1648,7 +1648,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
           error = true;
 	  j = 1;
 	  while (error && (j < 8)) {
-	    TQString s = calendar()->weekDayName(j, c == (QChar)'a').lower();
+	    TQString s = calendar()->weekDayName(j, c == (TQChar)'a').lower();
 	    int len = s.length();
 	    if (str.mid(strpos, len) == s)
             {
@@ -1665,7 +1665,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
 	  if (d->nounDeclension && d->dateMonthNamePossessive) {
 	    j = 1;
 	    while (error && (j < 13)) {
-	      TQString s = calendar()->monthNamePossessive(j, year, c == (QChar)'b').lower();
+	      TQString s = calendar()->monthNamePossessive(j, year, c == (TQChar)'b').lower();
 	      int len = s.length();
 	      if (str.mid(strpos, len) == s) {
 	        month = j;
@@ -1677,7 +1677,7 @@ TQDate TDELocale::readDate(const TQString &intstr, const TQString &fmt, bool* ok
 	  }
 	  j = 1;
 	  while (error && (j < 13)) {
-	    TQString s = calendar()->monthName(j, year, c == (QChar)'b').lower();
+	    TQString s = calendar()->monthName(j, year, c == (TQChar)'b').lower();
 	    int len = s.length();
 	    if (str.mid(strpos, len) == s) {
 	      month = j;
@@ -1766,7 +1766,7 @@ TQTime TDELocale::readTime(const TQString &intstr, ReadTimeFlags flags, bool *ok
 
       TQChar c = Format.at(Formatpos++);
 
-      if (c != (QChar)'%')
+      if (c != (TQChar)'%')
 	{
 	  if (c.isSpace())
 	    strpos++;
@@ -1885,7 +1885,7 @@ TQString TDELocale::formatTime(const TQTime &pTime, bool includeSecs, bool isDur
 	  switch ( TQChar(rst.at( format_index )).unicode() )
 	    {
 	    case '%':
-	      buffer[index++] = (QChar)'%';
+	      buffer[index++] = (TQChar)'%';
 	      break;
 	    case 'H':
 	      put_it_in( buffer, index, pTime.hour() );
@@ -1969,8 +1969,8 @@ TQString TDELocale::formatDateTime(const TQDateTime &pDateTime,
 				bool includeSeconds) const
 {
   return translate("concatenation of dates and time", "%1 %2")
-    .arg( formatDate( TQT_TQDATE_OBJECT(pDateTime.date()), shortFormat ) )
-    .arg( formatTime( TQT_TQTIME_OBJECT(pDateTime.time()), includeSeconds ) );
+    .arg( formatDate( pDateTime.date(), shortFormat ) )
+    .arg( formatTime( pDateTime.time(), includeSeconds ) );
 }
 
 TQString i18n(const char* text)
@@ -2083,22 +2083,12 @@ void TDELocale::initFileNameEncoding(TDEConfig *)
   // which, on Unix platforms, use the locale's codec.
 }
 
-#ifdef USE_QT3
 TQCString TDELocale::encodeFileNameUTF8( const TQString & fileName )
-#endif // USE_QT3
-#ifdef USE_QT4
-QByteArray TDELocale::encodeFileNameUTF8( const QString & fileName )
-#endif // USE_QT4
 {
   return TQString(fileName).utf8();
 }
 
-#ifdef USE_QT3
 TQString TDELocale::decodeFileNameUTF8( const TQCString & localFileName )
-#endif // USE_QT3
-#ifdef USE_QT4
-QString TDELocale::decodeFileNameUTF8( const QByteArray & localFileName )
-#endif // USE_QT4
 {
   return TQString::fromUtf8(localFileName);
 }
@@ -2274,7 +2264,7 @@ TQString TDELocale::defaultCountry()
 
 const char * TDELocale::encoding() const
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   if (0==qstrcmp("System", codecForEncoding()->name()))
   {
     //win32 returns "System" codec name here but KDE apps expect a real name:
diff --git a/tdecore/tdelocale.h b/tdecore/tdelocale.h
index b52a32157..19525535c 100644
--- a/tdecore/tdelocale.h
+++ b/tdecore/tdelocale.h
@@ -1220,22 +1220,12 @@ private:
   /**
    * @internal A TQFile filename encoding function (TQFile::encodeFn).
    */
-#ifdef USE_QT3
   static TQCString encodeFileNameUTF8( const TQString & fileName );
-#endif // USE_QT3
-#ifdef USE_QT4
-  static QByteArray encodeFileNameUTF8( const QString & fileName );
-#endif // USE_QT4
 
   /**
    * @internal TQFile filename decoding function (TQFile::decodeFn).
    */
-#ifdef USE_QT3
   static TQString decodeFileNameUTF8( const TQCString & localFileName );
-#endif // USE_QT3
-#ifdef USE_QT4
-  static QString decodeFileNameUTF8( const QByteArray & localFileName );
-#endif // USE_QT4
 
   /**
    * @internal Changes the file name of the catalog to the correct
diff --git a/tdecore/tdemultipledrag.h b/tdecore/tdemultipledrag.h
index bfc408019..631959bc0 100644
--- a/tdecore/tdemultipledrag.h
+++ b/tdecore/tdemultipledrag.h
@@ -53,7 +53,7 @@ class KMultipleDragPrivate;
  */
 class TDECORE_EXPORT KMultipleDrag : public TQDragObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp
index 86b532f9c..e3c82ce7e 100644
--- a/tdecore/tdeshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -89,10 +89,10 @@ bool KKey::init( const TQKeySequence& key )
 bool KKey::init( const TQKeyEvent* pEvent )
 {
 	int keyQt = pEvent->key();
-	if( pEvent->state() & TQt::ShiftButton )   keyQt |= Qt::SHIFT;
-	if( pEvent->state() & TQt::ControlButton ) keyQt |= Qt::CTRL;
-	if( pEvent->state() & TQt::AltButton )     keyQt |= Qt::ALT;
-	if( pEvent->state() & TQt::MetaButton )     keyQt |= Qt::META;
+	if( pEvent->state() & TQt::ShiftButton )   keyQt |= TQt::SHIFT;
+	if( pEvent->state() & TQt::ControlButton ) keyQt |= TQt::CTRL;
+	if( pEvent->state() & TQt::AltButton )     keyQt |= TQt::ALT;
+	if( pEvent->state() & TQt::MetaButton )     keyQt |= TQt::META;
 	return init( keyQt );
 }
 
diff --git a/tdecore/tdeshortcut.h b/tdecore/tdeshortcut.h
index 09f7fce05..69fb3c82c 100644
--- a/tdecore/tdeshortcut.h
+++ b/tdecore/tdeshortcut.h
@@ -45,7 +45,7 @@ class TDECORE_EXPORT KKey
 	 * @see ModFlag
 	 */
 	enum { MOD_FLAG_COUNT = 4 };
-	enum { QtWIN = (Qt::META) };
+	enum { QtWIN = (TQt::META) };
 	/**
 	 * Flags to represent the modifiers. You can combine modifiers
 	 * by ORing them.
@@ -68,7 +68,7 @@ class TDECORE_EXPORT KKey
 	/**
 	 * Creates a new key for the given Qt key code.
 	 * @param keyQt the qt keycode
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	KKey( int keyQt );
 
@@ -115,7 +115,7 @@ class TDECORE_EXPORT KKey
 	 * Initializes the key with the given Qt key code.
 	 * @param keyQt the qt keycode
 	 * @return true if successful, false otherwise
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	bool init( int keyQt );
 
@@ -217,7 +217,7 @@ class TDECORE_EXPORT KKey
 	/**
 	 * Returns the qt key code.
 	 * @return the qt key code or 0 if there is no key set.
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	int keyCodeQt() const;
 
@@ -469,7 +469,7 @@ class TDECORE_EXPORT KKeySequence
 	 */
 	bool operator < ( const KKeySequence& seq ) const
 		{ return compare( seq ) < 0; }
-	// TODO: consider adding Qt::SequenceMatch matches(...) methods for TQKeySequence equivalence
+	// TODO: consider adding TQt::SequenceMatch matches(...) methods for TQKeySequence equivalence
 
 	/**
 	 * Converts this key sequence to a TQKeySequence.
@@ -480,7 +480,7 @@ class TDECORE_EXPORT KKeySequence
 	/**
 	 * Returns the qt key code of the first key.
 	 * @return the qt key code of the first key
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 * @see KKey::keyCodeQt()
 	 */
 	int keyCodeQt() const;
@@ -528,7 +528,7 @@ class TDECORE_EXPORT KKeySequence
 * the below code binds the escape key to the close action.
 *
 * \code
-*  TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
+*  TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() );
 *  TDEShortcut closeShortcut = closeAction->shortcut();
 *  closeShortcut.append( KKey(Key_Escape));
 *  closeAction->setShortcut(closeShortcut);
@@ -561,7 +561,7 @@ class TDECORE_EXPORT TDEShortcut
 	 * Creates a new shortcut with the given Qt key code
 	 * as the only key sequence.
 	 * @param keyQt the qt keycode
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	TDEShortcut( int keyQt );
 
@@ -622,7 +622,7 @@ class TDECORE_EXPORT TDEShortcut
 	 * Initializes the shortcut with the given Qt key code
 	 * as the only key sequence.
 	 * @param keyQt the qt keycode
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 */
 	bool init( int keyQt );
 
@@ -686,7 +686,7 @@ class TDECORE_EXPORT TDEShortcut
 	 * Returns the key code of the first key sequence, or
 	 * null if there is no first key sequence.
 	 * @return the key code of the first sequence's first key
-	 * @see Qt::Key
+	 * @see TQt::Key
 	 * @see KKeySequence::keyCodeQt()
 	 */
 	int keyCodeQt() const;
diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index c035c0df9..bf381bf78 100644
--- a/tdecore/tdeshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -84,14 +84,14 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
 	KKey key( pEvent );
 	
 	switch( pEvent->key() ) {
-	 case TQ_Key_Shift:
-	 case TQ_Key_Control:
-	 case TQ_Key_Alt:
-	 case TQ_Key_Meta:
-	 case TQ_Key_Super_L:
-	 case TQ_Key_Super_R:
-	 case TQ_Key_Hyper_L:
-	 case TQ_Key_Hyper_R:
+	 case Key_Shift:
+	 case Key_Control:
+	 case Key_Alt:
+	 case Key_Meta:
+	 case Key_Super_L:
+	 case Key_Super_R:
+	 case Key_Hyper_L:
+	 case Key_Hyper_R:
 		break;
 	 default:
 		int iItem = searchForKey( key );
@@ -104,8 +104,8 @@ void TDEShortcutMenu::keyPressEvent( TQKeyEvent* pEvent )
 		if( iItem == -1 ) {
 			// Let Up and Down keys navigate menu,
 			// And permit Enter, Return to select the item.
-			if( pEvent->key() == Qt::Key_Up    || pEvent->key() == Qt::Key_Down ||
-			    pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return )
+			if( pEvent->key() == TQt::Key_Up    || pEvent->key() == TQt::Key_Down ||
+			    pEvent->key() == TQt::Key_Enter || pEvent->key() == TQt::Key_Return )
 				TQPopupMenu::keyPressEvent( pEvent );
 			else
 				close();
diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h
index ece721942..0387bdbae 100644
--- a/tdecore/tdeshortcutmenu.h
+++ b/tdecore/tdeshortcutmenu.h
@@ -34,7 +34,7 @@ class TDEAccelActions;
  */
 class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq );
 
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 77b979edb..22f2b0bc6 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -33,8 +33,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqwidget.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
-//#ifdef Q_WS_X11 // FIXME(E): Re-implement in a less X11 specific way
+#ifdef TQ_WS_X11
+//#ifdef TQ_WS_X11 // FIXME(E): Re-implement in a less X11 specific way
 #include <tqglobal.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -46,13 +46,13 @@ DEALINGS IN THE SOFTWARE.
 #include <sys/time.h>
 #include <stdlib.h>
 #include <tqtimer.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <netwm.h>
 #endif
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <signal.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twinmodule.h>
 #include <kxmessages.h>
 #include <twin.h>
@@ -93,7 +93,7 @@ struct TDEStartupInfoPrivate
         TQMap< TDEStartupInfoId, TDEStartupInfo::Data > silent_startups;
         // contains ASN's that had change: but no new: yet
         TQMap< TDEStartupInfoId, TDEStartupInfo::Data > uninited_startups;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         KWinModule* wm_module;
         KXMessages msgs;
 #endif
@@ -101,7 +101,7 @@ struct TDEStartupInfoPrivate
 	int flags;
 	TDEStartupInfoPrivate( int flags_P )
     	    :
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	    msgs( NET_STARTUP_MSG, NULL, false ),
 #endif
 	      flags( flags_P ) {}
@@ -130,19 +130,19 @@ void TDEStartupInfo::init( int flags_P )
         return;
 
     d = new TDEStartupInfoPrivate( flags_P );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( !( d->flags & DisableKWinModule ))
         {
         d->wm_module = new KWinModule( this );
-        connect( d->wm_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( slot_window_added( WId )));
-        connect( d->wm_module, TQT_SIGNAL( systemTrayWindowAdded( WId )), TQT_SLOT( slot_window_added( WId )));
+        connect( d->wm_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( slot_window_added( WId )));
+        connect( d->wm_module, TQ_SIGNAL( systemTrayWindowAdded( WId )), TQ_SLOT( slot_window_added( WId )));
         }
     else
         d->wm_module = NULL;
-    connect( &d->msgs, TQT_SIGNAL( gotMessage( const TQString& )), TQT_SLOT( got_message( const TQString& )));
+    connect( &d->msgs, TQ_SIGNAL( gotMessage( const TQString& )), TQ_SLOT( got_message( const TQString& )));
 #endif
     d->cleanup = new TQTimer( this, "cleanup" );
-    connect( d->cleanup, TQT_SIGNAL( timeout()), TQT_SLOT( startups_cleanup()));
+    connect( d->cleanup, TQ_SIGNAL( timeout()), TQ_SLOT( startups_cleanup()));
     }
 
 TDEStartupInfo::~TDEStartupInfo()
@@ -505,7 +505,7 @@ void TDEStartupInfo::appStarted( const TQCString& startup_id )
         TDEStartupInfo::sendFinish( id );
     else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay()
         {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         Display* disp = XOpenDisplay( NULL );
         if( disp != NULL )
             {
@@ -612,7 +612,7 @@ TDEStartupInfo::startup_t TDEStartupInfo::check_startup_internal( WId w_P, TDESt
             }
         return find_id( id, id_O, data_O ) ? Match : NoMatch;
         }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(),  w_P, tqt_xrootwin(),
         NET::WMWindowType | NET::WMPid | NET::WMState );
     pid_t pid = info.pid();
@@ -729,7 +729,7 @@ bool TDEStartupInfo::find_wclass( TQCString res_name, TQCString res_class,
     return false;
     }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static Atom net_startup_atom = None;
 
 static TQCString read_startup_id_property( WId w_P )
@@ -755,7 +755,7 @@ static TQCString read_startup_id_property( WId w_P )
 
 TQCString TDEStartupInfo::windowStartupId( WId w_P )
     {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( net_startup_atom == None )
         net_startup_atom = XInternAtom( tqt_xdisplay(), NET_STARTUP_WINDOW, False );
     if( utf8_string_atom == None )
@@ -777,7 +777,7 @@ TQCString TDEStartupInfo::windowStartupId( WId w_P )
 
 void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P )
     {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( id_P.isNull())
         return;
     if( net_startup_atom == None )
@@ -791,7 +791,7 @@ void TDEStartupInfo::setWindowStartupId( WId w_P, const TQCString& id_P )
 
 TQCString TDEStartupInfo::get_window_hostname( WId w_P )
     {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     XTextProperty tp;
     char** hh;
     int cnt;
@@ -815,7 +815,7 @@ void TDEStartupInfo::setTimeout( unsigned int secs_P )
     {
     timeout = secs_P;
  // schedule removing entries that are older than the new timeout
-    TQTimer::singleShot( 0, this, TQT_SLOT( startups_cleanup_no_age()));
+    TQTimer::singleShot( 0, this, TQ_SLOT( startups_cleanup_no_age()));
     }
 
 void TDEStartupInfo::startups_cleanup_no_age()
@@ -930,7 +930,7 @@ TQCString TDEStartupInfo::createNewStartupId()
     if (!gethostname( hostname, 255 ))
 	hostname[sizeof(hostname)-1] = '\0';
     TQCString id = TQString(TQString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
-        .arg( tm.tv_usec ).arg( getpid()).arg( GET_QT_X_USER_TIME() )).utf8();
+        .arg( tm.tv_usec ).arg( getpid()).arg( get_tqt_x_user_time() )).utf8();
     kdDebug( 172 ) << "[tdecore-tdestartupinfo] creating: " << id << ":" << tqAppName() << endl;
     return id;
     }
@@ -1130,9 +1130,9 @@ TQString TDEStartupInfoData::to_text() const
         ret += TQString::fromLatin1( " DESKTOP=%1" )
             .arg( d->desktop == NET::OnAllDesktops ? NET::OnAllDesktops : d->desktop - 1 ); // spec counts from 0
     if( !d->wmclass.isEmpty())
-        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( QString(d->wmclass) );
+        ret += TQString::fromLatin1( " WMCLASS=\"%1\"" ).arg( TQString(d->wmclass) );
     if( !d->hostname.isEmpty())
-        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( QString(d->hostname) );
+        ret += TQString::fromLatin1( " HOSTNAME=%1" ).arg( TQString(d->hostname) );
     for( TQValueList< pid_t >::ConstIterator it = d->pids.begin();
          it != d->pids.end();
          ++it )
@@ -1456,7 +1456,7 @@ static
 TQString get_str( const TQString& item_P )
     {
     unsigned int pos = item_P.find( '=' );
-    if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (QChar)'\"' )
+    if( item_P.length() > pos + 2 && item_P[ pos + 1 ] == (TQChar)'\"' )
         {
         int pos2 = item_P.left( pos + 2 ).find( '\"' );
         if( pos2 < 0 )
@@ -1512,8 +1512,8 @@ static TQString escape_str( const TQString& str_P )
 	 pos < str_P.length();
 	 ++pos )
 	{
-	if( str_P[ pos ] == (QChar)'\\'
-	    || str_P[ pos ] == (QChar)'"' )
+	if( str_P[ pos ] == (TQChar)'\\'
+	    || str_P[ pos ] == (TQChar)'"' )
 	    ret += '\\';
 	ret += str_P[ pos ];
 	}
diff --git a/tdecore/tdestartupinfo.h b/tdecore/tdestartupinfo.h
index 9fa57cd4b..dcbe599d1 100644
--- a/tdecore/tdestartupinfo.h
+++ b/tdecore/tdestartupinfo.h
@@ -28,11 +28,7 @@ DEALINGS IN THE SOFTWARE.
 #include <sys/types.h>
 #include <tqobject.h>
 
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
-#ifdef Q_WS_X11 // FIXME(E): Redo in a less X11-specific way
+#ifdef TQ_WS_X11 // FIXME(E): Redo in a less X11-specific way
 
 #include <tqcstring.h>
 #include <tqstring.h>
@@ -67,7 +63,7 @@ class TDEStartupInfoPrivate;
 class TDECORE_EXPORT TDEStartupInfo
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         /**
@@ -692,6 +688,6 @@ class TDECORE_EXPORT TDEStartupInfoData
         TDEStartupInfoDataPrivate* d;
     };
 
-#endif //Q_WS_X11
+#endif //TQ_WS_X11
 
 #endif
diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp
index ba3e64ca5..b26948fd0 100644
--- a/tdecore/tdestdaccel.cpp
+++ b/tdecore/tdestdaccel.cpp
@@ -50,59 +50,59 @@ struct TDEStdAccelInfo
 static TDEStdAccelInfo g_infoStdAccel[] =
 {
 	{AccelNone,            "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, TDEShortcut(), false },
-	{ Open,                I18N_NOOP("Open"), 0,     Qt::CTRL+Qt::Key_O, 0, 0, 0, TDEShortcut(), false },
-	{ New,                 I18N_NOOP("New"), 0,      Qt::CTRL+Qt::Key_N, 0, 0, 0, TDEShortcut(), false },
-	{ Close,               I18N_NOOP("Close"), 0,    Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, TDEShortcut(), false },
-	{ Save,                I18N_NOOP("Save"), 0,     Qt::CTRL+Qt::Key_S, 0, 0, 0, TDEShortcut(), false },
-	{ Print,               I18N_NOOP("Print"), 0,    Qt::CTRL+Qt::Key_P, 0, 0, 0, TDEShortcut(), false },
-	{ Quit,                I18N_NOOP("Quit"), 0,     Qt::CTRL+Qt::Key_Q, 0, 0, 0, TDEShortcut(), false },
+	{ Open,                I18N_NOOP("Open"), 0,     TQt::CTRL+TQt::Key_O, 0, 0, 0, TDEShortcut(), false },
+	{ New,                 I18N_NOOP("New"), 0,      TQt::CTRL+TQt::Key_N, 0, 0, 0, TDEShortcut(), false },
+	{ Close,               I18N_NOOP("Close"), 0,    TQt::CTRL+TQt::Key_W, TQt::CTRL+TQt::Key_Escape, 0, TQt::CTRL+TQt::Key_W, TDEShortcut(), false },
+	{ Save,                I18N_NOOP("Save"), 0,     TQt::CTRL+TQt::Key_S, 0, 0, 0, TDEShortcut(), false },
+	{ Print,               I18N_NOOP("Print"), 0,    TQt::CTRL+TQt::Key_P, 0, 0, 0, TDEShortcut(), false },
+	{ Quit,                I18N_NOOP("Quit"), 0,     TQt::CTRL+TQt::Key_Q, 0, 0, 0, TDEShortcut(), false },
 	{AccelNone,            "Group:Edit", I18N_NOOP("Edit"), 0, 0, 0, 0, TDEShortcut(), false },
-	{ Undo,                I18N_NOOP("Undo"), 0,     Qt::CTRL+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false },
-	{ Redo,                I18N_NOOP("Redo"), 0,     Qt::CTRL+Qt::SHIFT+Qt::Key_Z, 0, 0, 0, TDEShortcut(), false },
-	{ Cut,                 I18N_NOOP("Cut"), 0,      Qt::CTRL+Qt::Key_X, 0, Qt::SHIFT+Qt::Key_Delete, 0, TDEShortcut(), false },
-	{ Copy,                I18N_NOOP("Copy"), 0,     Qt::CTRL+Qt::Key_C, 0, Qt::CTRL+Qt::Key_Insert, 0, TDEShortcut(), false },
-	{ Paste,               I18N_NOOP("Paste"), 0,    Qt::CTRL+Qt::Key_V, 0, Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false },
-	{ PasteSelection,      I18N_NOOP("Paste Selection"), 0, 0, 0, Qt::CTRL+Qt::SHIFT+Qt::Key_Insert, 0, TDEShortcut(), false },
-	{ SelectAll,           "SelectAll", I18N_NOOP("Select All"), Qt::CTRL+Qt::Key_A, 0, 0, 0, TDEShortcut(), false },
-	{ Deselect,            I18N_NOOP("Deselect"), 0, Qt::CTRL+Qt::SHIFT+Qt::Key_A, 0, 0, 0, TDEShortcut(), false },
-	{ DeleteWordBack,      "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), Qt::CTRL+Qt::Key_Backspace, 0, 0, 0, TDEShortcut(), false },
-	{ DeleteWordForward,   "DeleteWordForward", I18N_NOOP("Delete Word Forward"), Qt::CTRL+Qt::Key_Delete, 0,  0, 0, TDEShortcut(), false },
-	{ Find,                I18N_NOOP("Find"), 0,     Qt::CTRL+Qt::Key_F, 0, 0, 0, TDEShortcut(), false },
-	{ FindNext,            "FindNext", I18N_NOOP("Find Next"), Qt::Key_F3, 0, 0, 0, TDEShortcut(), false },
-	{ FindPrev,            "FindPrev", I18N_NOOP("Find Prev"), Qt::SHIFT+Qt::Key_F3, 0, 0, 0, TDEShortcut(), false },
-	{ Replace,             I18N_NOOP("Replace"), 0,  Qt::CTRL+Qt::Key_R, 0, 0, 0, TDEShortcut(), false },
+	{ Undo,                I18N_NOOP("Undo"), 0,     TQt::CTRL+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false },
+	{ Redo,                I18N_NOOP("Redo"), 0,     TQt::CTRL+TQt::SHIFT+TQt::Key_Z, 0, 0, 0, TDEShortcut(), false },
+	{ Cut,                 I18N_NOOP("Cut"), 0,      TQt::CTRL+TQt::Key_X, 0, TQt::SHIFT+TQt::Key_Delete, 0, TDEShortcut(), false },
+	{ Copy,                I18N_NOOP("Copy"), 0,     TQt::CTRL+TQt::Key_C, 0, TQt::CTRL+TQt::Key_Insert, 0, TDEShortcut(), false },
+	{ Paste,               I18N_NOOP("Paste"), 0,    TQt::CTRL+TQt::Key_V, 0, TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false },
+	{ PasteSelection,      I18N_NOOP("Paste Selection"), 0, 0, 0, TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, 0, TDEShortcut(), false },
+	{ SelectAll,           "SelectAll", I18N_NOOP("Select All"), TQt::CTRL+TQt::Key_A, 0, 0, 0, TDEShortcut(), false },
+	{ Deselect,            I18N_NOOP("Deselect"), 0, TQt::CTRL+TQt::SHIFT+TQt::Key_A, 0, 0, 0, TDEShortcut(), false },
+	{ DeleteWordBack,      "DeleteWordBack", I18N_NOOP("Delete Word Backwards"), TQt::CTRL+TQt::Key_Backspace, 0, 0, 0, TDEShortcut(), false },
+	{ DeleteWordForward,   "DeleteWordForward", I18N_NOOP("Delete Word Forward"), TQt::CTRL+TQt::Key_Delete, 0,  0, 0, TDEShortcut(), false },
+	{ Find,                I18N_NOOP("Find"), 0,     TQt::CTRL+TQt::Key_F, 0, 0, 0, TDEShortcut(), false },
+	{ FindNext,            "FindNext", I18N_NOOP("Find Next"), TQt::Key_F3, 0, 0, 0, TDEShortcut(), false },
+	{ FindPrev,            "FindPrev", I18N_NOOP("Find Prev"), TQt::SHIFT+TQt::Key_F3, 0, 0, 0, TDEShortcut(), false },
+	{ Replace,             I18N_NOOP("Replace"), 0,  TQt::CTRL+TQt::Key_R, 0, 0, 0, TDEShortcut(), false },
 	{AccelNone,            "Group:Navigation", I18N_NOOP("Navigation"), 0, 0, 0, 0, TDEShortcut(), false },
-	{ Home,                I18N_NOOP2("Opposite to End","Home"), 0,     Qt::CTRL+Qt::Key_Home, 0, Qt::Key_HomePage, 0, TDEShortcut(), false },
-	{ End,                 I18N_NOOP("End"), 0,      Qt::CTRL+Qt::Key_End, 0, 0, 0, TDEShortcut(), false },
-	{ BeginningOfLine,     "BeginningOfLine", I18N_NOOP("Beginning of Line"), Qt::Key_Home, 0, 0, 0, TDEShortcut(), false},
-	{ EndOfLine,           "EndOfLine", I18N_NOOP("End of Line"), Qt::Key_End, 0, 0, 0, TDEShortcut(), false},
+	{ Home,                I18N_NOOP2("Opposite to End","Home"), 0,     TQt::CTRL+TQt::Key_Home, 0, TQt::Key_HomePage, 0, TDEShortcut(), false },
+	{ End,                 I18N_NOOP("End"), 0,      TQt::CTRL+TQt::Key_End, 0, 0, 0, TDEShortcut(), false },
+	{ BeginningOfLine,     "BeginningOfLine", I18N_NOOP("Beginning of Line"), TQt::Key_Home, 0, 0, 0, TDEShortcut(), false},
+	{ EndOfLine,           "EndOfLine", I18N_NOOP("End of Line"), TQt::Key_End, 0, 0, 0, TDEShortcut(), false},
 	{ Prior,               I18N_NOOP("Prior"), 0,    TQt::Key_Prior, 0, 0, 0, TDEShortcut(), false },
 	{ Next,                I18N_NOOP2("Opposite to Prior","Next"), 0,     TQt::Key_Next, 0, 0, 0, TDEShortcut(), false },
-	{ GotoLine,            "GotoLine", I18N_NOOP("Go to Line"), Qt::CTRL+Qt::Key_G, 0, 0, 0, TDEShortcut(), false },
-	{ AddBookmark,         "AddBookmark", I18N_NOOP("Add Bookmark"), Qt::CTRL+Qt::Key_B, 0, 0, 0, TDEShortcut(), false },
-	{ ZoomIn,              "ZoomIn", I18N_NOOP("Zoom In"), Qt::CTRL+Qt::Key_Plus, 0, 0, 0, TDEShortcut(), false },
-	{ ZoomOut,             "ZoomOut", I18N_NOOP("Zoom Out"), Qt::CTRL+Qt::Key_Minus, 0, 0, 0, TDEShortcut(), false },
-	{ Up,                  I18N_NOOP("Up"), 0,       Qt::ALT+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
-	{ Back,                I18N_NOOP("Back"), 0,     Qt::ALT+Qt::Key_Left, 0, Qt::Key_Back, 0, TDEShortcut(), false },
-	{ Forward,             I18N_NOOP("Forward"), 0,  Qt::ALT+Qt::Key_Right, 0, Qt::Key_Forward, 0, TDEShortcut(), false },
-	{ Reload,              I18N_NOOP("Reload"), 0,   Qt::Key_F5, 0, Qt::Key_Refresh, 0, TDEShortcut(), false },
-	{ PopupMenuContext,    "PopupMenuContext", I18N_NOOP("Popup Menu Context"), Qt::Key_Menu, 0, 0, 0, TDEShortcut(), false },
-	{ ShowMenubar,         "ShowMenubar", I18N_NOOP("Show Menu Bar"), Qt::CTRL+Qt::Key_M, 0, 0, 0, TDEShortcut(), false },
-	{ BackwardWord,        "BackwardWord", I18N_NOOP("Backward Word"), Qt::CTRL+Qt::Key_Left, 0, 0, 0, TDEShortcut(), false },
-	{ ForwardWord,         "ForwardWord", I18N_NOOP("Forward Word"), Qt::CTRL+Qt::Key_Right, 0, 0, 0, TDEShortcut(), false },
-	{ TabNext,             I18N_NOOP("Activate Next Tab"), 0,  Qt::CTRL+Qt::Key_Period, 0, Qt::CTRL+Qt::Key_BracketRight, 0, TDEShortcut(), false },
-	{ TabPrev,             I18N_NOOP("Activate Previous Tab"), 0,   Qt::CTRL+Qt::Key_Comma, 0, Qt::CTRL+Qt::Key_BracketLeft, 0, TDEShortcut(), false },
-	{ FullScreen,          "FullScreen", I18N_NOOP("Full Screen Mode"), Qt::CTRL+Qt::SHIFT+Qt::Key_F, 0, 0, 0, TDEShortcut(), false },
+	{ GotoLine,            "GotoLine", I18N_NOOP("Go to Line"), TQt::CTRL+TQt::Key_G, 0, 0, 0, TDEShortcut(), false },
+	{ AddBookmark,         "AddBookmark", I18N_NOOP("Add Bookmark"), TQt::CTRL+TQt::Key_B, 0, 0, 0, TDEShortcut(), false },
+	{ ZoomIn,              "ZoomIn", I18N_NOOP("Zoom In"), TQt::CTRL+TQt::Key_Plus, 0, 0, 0, TDEShortcut(), false },
+	{ ZoomOut,             "ZoomOut", I18N_NOOP("Zoom Out"), TQt::CTRL+TQt::Key_Minus, 0, 0, 0, TDEShortcut(), false },
+	{ Up,                  I18N_NOOP("Up"), 0,       TQt::ALT+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+	{ Back,                I18N_NOOP("Back"), 0,     TQt::ALT+TQt::Key_Left, 0, TQt::Key_Back, 0, TDEShortcut(), false },
+	{ Forward,             I18N_NOOP("Forward"), 0,  TQt::ALT+TQt::Key_Right, 0, TQt::Key_Forward, 0, TDEShortcut(), false },
+	{ Reload,              I18N_NOOP("Reload"), 0,   TQt::Key_F5, 0, TQt::Key_Refresh, 0, TDEShortcut(), false },
+	{ PopupMenuContext,    "PopupMenuContext", I18N_NOOP("Popup Menu Context"), TQt::Key_Menu, 0, 0, 0, TDEShortcut(), false },
+	{ ShowMenubar,         "ShowMenubar", I18N_NOOP("Show Menu Bar"), TQt::CTRL+TQt::Key_M, 0, 0, 0, TDEShortcut(), false },
+	{ BackwardWord,        "BackwardWord", I18N_NOOP("Backward Word"), TQt::CTRL+TQt::Key_Left, 0, 0, 0, TDEShortcut(), false },
+	{ ForwardWord,         "ForwardWord", I18N_NOOP("Forward Word"), TQt::CTRL+TQt::Key_Right, 0, 0, 0, TDEShortcut(), false },
+	{ TabNext,             I18N_NOOP("Activate Next Tab"), 0,  TQt::CTRL+TQt::Key_Period, 0, TQt::CTRL+TQt::Key_BracketRight, 0, TDEShortcut(), false },
+	{ TabPrev,             I18N_NOOP("Activate Previous Tab"), 0,   TQt::CTRL+TQt::Key_Comma, 0, TQt::CTRL+TQt::Key_BracketLeft, 0, TDEShortcut(), false },
+	{ FullScreen,          "FullScreen", I18N_NOOP("Full Screen Mode"), TQt::CTRL+TQt::SHIFT+TQt::Key_F, 0, 0, 0, TDEShortcut(), false },
 	{AccelNone,            "Group:Help", I18N_NOOP("Help"), 0, 0, 0, 0, TDEShortcut(), false },
-	{ Help,                I18N_NOOP("Help"), 0,     Qt::Key_F1, 0, 0, 0, TDEShortcut(), false },
-	{ WhatsThis,           "WhatsThis", I18N_NOOP("What's This"), Qt::SHIFT+Qt::Key_F1, 0, 0, 0, TDEShortcut(), false },
+	{ Help,                I18N_NOOP("Help"), 0,     TQt::Key_F1, 0, 0, 0, TDEShortcut(), false },
+	{ WhatsThis,           "WhatsThis", I18N_NOOP("What's This"), TQt::SHIFT+TQt::Key_F1, 0, 0, 0, TDEShortcut(), false },
 	{AccelNone,            "Group:TextCompletion", I18N_NOOP("Text Completion"), 0, 0, 0, 0, TDEShortcut(), false },
-	{ TextCompletion,      "TextCompletion", I18N_NOOP("Text Completion"), Qt::CTRL+Qt::Key_E, 0, 0, 0, TDEShortcut(), false },
-	{ PrevCompletion,      "PrevCompletion", I18N_NOOP("Previous Completion Match"), Qt::CTRL+Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
-	{ NextCompletion,      "NextCompletion", I18N_NOOP("Next Completion Match"), Qt::CTRL+Qt::Key_Down, 0, 0, 0, TDEShortcut(), false },
-	{ SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), Qt::CTRL+Qt::Key_T, 0, 0, 0, TDEShortcut(), false },
-	{ RotateUp,            "RotateUp", I18N_NOOP("Previous Item in List"), Qt::Key_Up, 0, 0, 0, TDEShortcut(), false },
-	{ RotateDown,          "RotateDown", I18N_NOOP("Next Item in List"), Qt::Key_Down, 0, 0, 0, TDEShortcut(), false },
+	{ TextCompletion,      "TextCompletion", I18N_NOOP("Text Completion"), TQt::CTRL+TQt::Key_E, 0, 0, 0, TDEShortcut(), false },
+	{ PrevCompletion,      "PrevCompletion", I18N_NOOP("Previous Completion Match"), TQt::CTRL+TQt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+	{ NextCompletion,      "NextCompletion", I18N_NOOP("Next Completion Match"), TQt::CTRL+TQt::Key_Down, 0, 0, 0, TDEShortcut(), false },
+	{ SubstringCompletion, "SubstringCompletion", I18N_NOOP("Substring Completion"), TQt::CTRL+TQt::Key_T, 0, 0, 0, TDEShortcut(), false },
+	{ RotateUp,            "RotateUp", I18N_NOOP("Previous Item in List"), TQt::Key_Up, 0, 0, 0, TDEShortcut(), false },
+	{ RotateDown,          "RotateDown", I18N_NOOP("Next Item in List"), TQt::Key_Down, 0, 0, 0, TDEShortcut(), false },
 	{ AccelNone,           0, 0, 0, 0, 0, 0, TDEShortcut(), false }
 };
 
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index a11175117..b39ca239e 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -42,7 +42,7 @@
 #include <sys/mman.h>
 #endif
 
-#ifdef Q_OS_SOLARIS
+#if defined(Q_OS_SOLARIS) && !defined(__dilos__)
 extern "C" 
 {
 	extern int madvise(caddr_t, size_t, int); 
@@ -228,7 +228,7 @@ KSycoca::~KSycoca()
 
 void KSycoca::closeDatabase()
 {
-   QIODevice *device = 0;
+   TQIODevice *device = 0;
    if (m_str)
       device = m_str->device();
 #ifdef HAVE_MMAP
@@ -246,7 +246,7 @@ void KSycoca::closeDatabase()
    delete m_str;
    m_str = 0;
    delete device;
-   if (TQT_TQIODEVICE(d->database) != device)
+   if (d->database != device)
       delete d->database;
    if (m_barray) delete m_barray;
    m_barray = 0;
diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h
index f8e2274e0..a96bd9d9f 100644
--- a/tdecore/tdesycoca.h
+++ b/tdecore/tdesycoca.h
@@ -43,7 +43,7 @@ class KSycocaFactoryList;
  */
 class TDECORE_EXPORT KSycoca : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
 protected:
diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h
index b784e7901..1cfc9f564 100644
--- a/tdecore/tdeversion.h
+++ b/tdecore/tdeversion.h
@@ -32,9 +32,9 @@
     A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL.
     A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL.
 */
-#define TDE_VERSION_STRING "R14.1.0 [DEVELOPMENT]"
+#define TDE_VERSION_STRING "R14.2.0~[DEVELOPMENT]"
 #define TDE_VERSION_MAJOR 14
-#define TDE_VERSION_MINOR 1
+#define TDE_VERSION_MINOR 2
 #define TDE_VERSION_RELEASE 0
 #define TDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 
diff --git a/tdecore/tests/kdebugtest.cpp b/tdecore/tests/kdebugtest.cpp
index 4052d5dcf..9f07b3437 100644
--- a/tdecore/tests/kdebugtest.cpp
+++ b/tdecore/tests/kdebugtest.cpp
@@ -6,7 +6,7 @@
 #include <tqpen.h>
 #include <tqvariant.h>
 
-class TestWidget : public QWidget
+class TestWidget : public TQWidget
 {
 
 public:
@@ -64,7 +64,7 @@ public:
 
     TQVariant v( 0.12345 );
     kdDebug() << "Variant: " << v << endl;
-    v = TQPen( Qt::red );
+    v = TQPen( TQt::red );
     kdDebug() << "Variant: " << v << endl;
 
     TQByteArray data( 6 );
diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp
index d1a678ac9..72101d8b1 100644
--- a/tdecore/tests/kipctest.cpp
+++ b/tdecore/tests/kipctest.cpp
@@ -8,12 +8,12 @@
 MyObject::MyObject()
     : TQObject(0L, "testobj")
 {
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged()));
-    connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged()));
-    connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
-    connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
-    connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged()));
-    connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int)));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged()));
+    connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged()));
+    connect(kapp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged()));
+    connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+    connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged()));
+    connect(kapp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int)));
 }
 
 int main(int argc, char **argv)
diff --git a/tdecore/tests/kipctest.h b/tdecore/tests/kipctest.h
index 17122fbd8..d4c3d538d 100644
--- a/tdecore/tests/kipctest.h
+++ b/tdecore/tests/kipctest.h
@@ -5,17 +5,17 @@
 
 class MyObject: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MyObject();
 
 public slots:
-    void slotPaletteChanged() { printf("SIGNAL: Palette changed\n"); }
-    void slotStyleChanged() { printf("SIGNAL: Style changed\n"); }
-    void slotFontChanged() { printf("SIGNAL: Font changed\n"); }
-    void slotBackgroundChanged(int i) { printf("SIGNAL: Background %d changed\n", i); }
-    void slotAppearanceChanged() { printf("SIGNAL: Appearance changed\n"); }
-    void slotMessage(int id, int arg) { printf("SIGNAL: user message: %d,%d\n", id, arg); }
+    void slotPaletteChanged() { printf("TQ_SIGNAL: Palette changed\n"); }
+    void slotStyleChanged() { printf("TQ_SIGNAL: Style changed\n"); }
+    void slotFontChanged() { printf("TQ_SIGNAL: Font changed\n"); }
+    void slotBackgroundChanged(int i) { printf("TQ_SIGNAL: Background %d changed\n", i); }
+    void slotAppearanceChanged() { printf("TQ_SIGNAL: Appearance changed\n"); }
+    void slotMessage(int id, int arg) { printf("TQ_SIGNAL: user message: %d,%d\n", id, arg); }
 };
 
 #endif
diff --git a/tdecore/tests/klocaletest.h b/tdecore/tests/klocaletest.h
index 6634b6107..433807b78 100644
--- a/tdecore/tests/klocaletest.h
+++ b/tdecore/tests/klocaletest.h
@@ -11,7 +11,7 @@ class TQLabel;
     */
 class Test : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**@name methods */
diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp
index d8d86d988..b7908ec6e 100644
--- a/tdecore/tests/kprocesstest.cpp
+++ b/tdecore/tests/kprocesstest.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
  //
 
  p1 << "kghostview";
- TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)),  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p1, TQ_SIGNAL(processExited(TDEProcess *)),  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
  
  printf("starting kghostview blocking (close to continue)\n");
  p1.start(TDEProcess::Block);
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
  printf("Starting konsole with /bin/tcsh as shell (close to continue)\n");
  p2 << "konsole" << "-e" << "/bin/tcsh";
  p2.setWorkingDirectory("/tmp");
- TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)),  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p2, TQ_SIGNAL(processExited(TDEProcess *)),  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
  p2.start(TDEProcess::Block);
 
  //
@@ -70,13 +70,13 @@ int main(int argc, char *argv[])
  //
 
  p3 << "ls" << "-l";
- TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), 
-		  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p3, TQ_SIGNAL(processExited(TDEProcess *)), 
+		  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
 
- TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
- TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p3, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p3, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
 
  p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
  
@@ -93,16 +93,16 @@ int main(int argc, char *argv[])
  //
 
  p4 << "sort";
- TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), 
-		  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p4, TQ_SIGNAL(processExited(TDEProcess *)), 
+		  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
 
- TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
- TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p4, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p4, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
 
- TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-		  &dummy, TQT_SLOT(outputDone(TDEProcess *)));
+ TQObject::connect(&p4, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+		  &dummy, TQ_SLOT(outputDone(TDEProcess *)));
 
  p4.start(TDEProcess::NotifyOnExit, TDEProcess::All);
  printf("after p4.start");
diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/kprocesstest.h
index 5817af438..4bd4ab71e 100644
--- a/tdecore/tests/kprocesstest.h
+++ b/tdecore/tests/kprocesstest.h
@@ -17,7 +17,7 @@
 
 class Dummy : public TQObject
 {
- Q_OBJECT
+ TQ_OBJECT
 
  public slots:
    void printMessage(TDEProcess *proc)
diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp
index f7e895345..e7165092c 100644
--- a/tdecore/tests/kprociotest.cpp
+++ b/tdecore/tests/kprociotest.cpp
@@ -41,8 +41,8 @@ int main(int argc, char *argv[])
  
  p << "rev";
  
- p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*)));
- p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*)));
+ p.connect(&p, TQ_SIGNAL(processExited(TDEProcess*)), &dummy, TQ_SLOT(printMessage(TDEProcess*)));
+ p.connect(&p, TQ_SIGNAL(readReady(KProcIO*)), &dummy, TQ_SLOT(gotOutput(KProcIO*)));
 
  bool b;
 
diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/kprociotest.h
index fd60bb87b..78b5ad926 100644
--- a/tdecore/tests/kprociotest.h
+++ b/tdecore/tests/kprociotest.h
@@ -17,7 +17,7 @@
 
 class Dummy : public TQObject
 {
- Q_OBJECT
+ TQ_OBJECT
 
  public slots:
    void printMessage(TDEProcess *proc)
diff --git a/tdecore/tests/ktimezonestest.cpp b/tdecore/tests/ktimezonestest.cpp
index d00626cdf..a42c5a395 100644
--- a/tdecore/tests/ktimezonestest.cpp
+++ b/tdecore/tests/ktimezonestest.cpp
@@ -22,8 +22,8 @@ int main(int argc, char *argv[])
      // Find some offsets for Europe/London.
      const char *london = "Europe/London";
      timezone = timezones.zone(london);
-     TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", Qt::ISODate));
-     TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", Qt::ISODate));
+     TQDateTime winter(TQDateTime::fromString("2005-01-01T00:00:00", TQt::ISODate));
+     TQDateTime summer(TQDateTime::fromString("2005-06-01T00:00:00", TQt::ISODate));
      printf( "%s winter timezone offset should be 0: %d\n", london, timezone->offset(winter) );
      printf( "%s summer timezone offset should be 3600: %d\n", london, timezone->offset(summer) );
 
@@ -34,13 +34,13 @@ int main(int argc, char *argv[])
      const char *gmtBeforePst = "2005-10-30T01:00:00";
      const char *gmtAfterPst = "2005-12-01T00:00:00";
      TQString result;
-     result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, Qt::ISODate)).toString(Qt::ISODate);
+     result = timezone->convert(losAngeles, TQDateTime::fromString(bstBeforePdt, TQt::ISODate)).toString(TQt::ISODate);
      printf( "BST before PDT, %s should be 2005-03-27T15:00:00: %s\n", bstBeforePdt, result.latin1() );
-     result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, Qt::ISODate)).toString(Qt::ISODate);
+     result = timezone->convert(losAngeles, TQDateTime::fromString(bstAfterPdt, TQt::ISODate)).toString(TQt::ISODate);
      printf( "BST and PDT,    %s should be 2005-04-30T16:00:00: %s\n", bstAfterPdt, result.latin1() );
-     result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, Qt::ISODate)).toString(Qt::ISODate);
+     result = timezone->convert(losAngeles, TQDateTime::fromString(gmtBeforePst, TQt::ISODate)).toString(TQt::ISODate);
      printf( "GMT before PST, %s should be 2005-10-29T17:00:00: %s\n", gmtBeforePst, result.latin1() );
-     result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, Qt::ISODate)).toString(Qt::ISODate);
+     result = timezone->convert(losAngeles, TQDateTime::fromString(gmtAfterPst, TQt::ISODate)).toString(TQt::ISODate);
      printf( "GMT and PST,    %s should be 2005-11-30T16:00:00: %s\n", gmtAfterPst, result.latin1() );
      printf( "Latitude 89 should be valid: %svalid\n", KTimezone::isValidLatitude(89.0) ? "" : "in");
      printf( "Latitude 91 should be invalid: %svalid\n", KTimezone::isValidLatitude(91.0) ? "" : "in");
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 0f57dd97c..081fdad55 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -271,14 +271,14 @@ int main(int argc, char *argv[])
 
 #if 0
 // This URL is broken, '#' should be escaped.
-  u1 = "file:/home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#";
+  u1 = "file:/home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#";
   url1 = u1;
-  check("KURL::url()", url1.url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#");
+  check("KURL::url()", url1.url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#");
   check("KURL::hasRef()", url1.hasRef() ? "yes" : "no", "no");
   check("KURL::hasHTMLRef()", url1.hasHTMLRef() ? "yes" : "no", "no");
   check("KURL::htmlRef()", url1.htmlRef(), "");
   check("KURL::hasSubURL()", url1.hasSubURL() ? "yes" : "no", "yes");
-  check("KURL::prettyURL()", url1.upURL().url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#");
+  check("KURL::prettyURL()", url1.upURL().url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#");
 #endif
 
   u1 = "file:/home/dfaure/my%20tar%20file.tgz#gzip:/#tar:/README";
@@ -382,7 +382,7 @@ int main(int argc, char *argv[])
   check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myfile.txt");
   u2.setFileName( "myotherfile.txt" );
   check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myotherfile.txt");
-  // more tricky, renaming a directory (kpropsdlg.cc, line ~ 238)
+  // more tricky, renaming a directory (kpropsdlg.cpp, line ~ 238)
       TQString tmpurl = "file:/home/dfaure/myolddir/";
       if ( tmpurl.at(tmpurl.length() - 1) == '/')
           // It's a directory, so strip the trailing slash first
diff --git a/tdecore/tests/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp
index f5ea428c0..c785aa3b3 100644
--- a/tdecore/tests/tdeconfigtestgui.cpp
+++ b/tdecore/tests/tdeconfigtestgui.cpp
@@ -76,8 +76,8 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
 
   pAppFileEdit = new TQLineEdit( this, "appconfigedit" );
   pAppFileEdit->setGeometry( 240, 20, 160, 20 );
-  connect( pAppFileEdit, TQT_SIGNAL(returnPressed()),
-	   TQT_SLOT(appConfigEditReturnPressed()));
+  connect( pAppFileEdit, TQ_SIGNAL(returnPressed()),
+	   TQ_SLOT(appConfigEditReturnPressed()));
 
   // Label and edit for the group
   pGroupLabel = new TQLabel( this, "grouplabel" );
@@ -86,14 +86,14 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
 
   pGroupEdit = new TQLineEdit( this, "groupedit" );
   pGroupEdit->setGeometry( 120, 60, 100, 20 );
-  connect( pGroupEdit, TQT_SIGNAL(returnPressed()),
-	   TQT_SLOT(groupEditReturnPressed()));
+  connect( pGroupEdit, TQ_SIGNAL(returnPressed()),
+	   TQ_SLOT(groupEditReturnPressed()));
 
   // Edit and label for the key/value pair
   pKeyEdit = new TQLineEdit( this, "keyedit" );
   pKeyEdit->setGeometry( 20, 100, 80, 20 );
-  connect( pKeyEdit, TQT_SIGNAL( returnPressed()),
-	   TQT_SLOT(keyEditReturnPressed()));
+  connect( pKeyEdit, TQ_SIGNAL( returnPressed()),
+	   TQ_SLOT(keyEditReturnPressed()));
 
   pEqualsLabel = new TQLabel( this, "equalslabel" );
   pEqualsLabel->setGeometry( 105, 100, 20, 20 );
@@ -106,7 +106,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
   pWriteButton = new TQPushButton( this, "writebutton" );
   pWriteButton->setGeometry( 20,140, 80, 20 );
   pWriteButton->setText( "Write entry" );
-  connect( pWriteButton, TQT_SIGNAL(clicked()), TQT_SLOT( writeButtonClicked() ) );
+  connect( pWriteButton, TQ_SIGNAL(clicked()), TQ_SLOT( writeButtonClicked() ) );
 
   // Labels for the info line
   pInfoLabel1 = new TQLabel( this, "infolabel1" );
@@ -121,7 +121,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
   pQuitButton = new TQPushButton( this, "quitbutton" );
   pQuitButton->setText( "Quit" );
   pQuitButton->setGeometry( 340, 60, 60, 60 );
-  connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) );
+  connect( pQuitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
 
   // create a default TDEConfig object in order to be able to start right away
   pConfig = new TDEConfig( TQString::null );
diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h
index a7cfd1356..4c3384d90 100644
--- a/tdecore/tests/tdeconfigtestgui.h
+++ b/tdecore/tests/tdeconfigtestgui.h
@@ -41,7 +41,7 @@
 
 class TDEConfigTestView : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDEConfigTestView( TQWidget *parent=0, const char *name=0 );
   ~TDEConfigTestView();
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 308da8c5a..5486a2828 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -45,7 +45,7 @@
 #include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <tdestartupinfo.h>
 #include <kxerrorhandler.h>
 
@@ -103,7 +103,7 @@ static void twin_net_create_atoms() {
 /*
   Sends a client message to the ROOT window.
  */
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z = 0 ){
   XEvent ev;
   long mask;
@@ -124,7 +124,7 @@ static void sendClientMessageToRoot(Window w, Atom a, long x, long y = 0, long z
 /*
   Send a client message to window w
  */
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static void sendClientMessage(Window w, Atom a, long x){
   XEvent ev;
   long mask;
@@ -145,7 +145,7 @@ static void sendClientMessage(Window w, Atom a, long x){
 
 bool KWin::compositingActive()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     twin_net_create_atoms();
     return XGetSelectionOwner( tqt_xdisplay(), net_wm_cm ) != None;
 #else
@@ -153,7 +153,7 @@ bool KWin::compositingActive()
 #endif
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 namespace
 {
 class ContextWidget : public TQWidget
@@ -213,14 +213,14 @@ bool ContextWidget::x11Event( XEvent * ev)
 
 void KWin::invokeContextHelp()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     ContextWidget w;
 #endif
 }
 
 void KWin::setSystemTrayWindowFor( WId trayWin, WId forWin )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), trayWin, tqt_xrootwin(), 0 );
     if ( !forWin )
 	forWin = tqt_xrootwin();
@@ -236,30 +236,30 @@ void KWin::setSystemTrayWindowFor( WId trayWin, WId forWin )
 
 void KWin::activateWindow( WId win, long time )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), 0 );
     if( time == 0 )
-        time = GET_QT_X_USER_TIME();
+        time = get_tqt_x_user_time();
     info.setActiveWindow( win, NET::FromApplication, time,
         kapp->activeWindow() ? kapp->activeWindow()->winId() : 0 );
-#endif // Q_WS_X11 ...
+#endif // TQ_WS_X11 ...
     KUniqueApplication::setHandleAutoStarted();
 }
 
 void KWin::forceActiveWindow( WId win, long time )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), 0 );
     if( time == 0 )
-        time = GET_QT_X_TIME();
+        time = get_tqt_x_time();
     info.setActiveWindow( win, NET::FromTool, time, 0 );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
     KUniqueApplication::setHandleAutoStarted();
 }
 
 void KWin::setActiveWindow( WId win )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), 0 );
     info.setActiveWindow( win, NET::FromUnknown, 0, 0 );
 #endif
@@ -268,7 +268,7 @@ void KWin::setActiveWindow( WId win )
 
 void KWin::demandAttention( WId win, bool set )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 );
     info.setState( set ? NET::DemandsAttention : 0, NET::DemandsAttention );
 #endif
@@ -276,7 +276,7 @@ void KWin::demandAttention( WId win, bool set )
 
 void KWin::setUserTime( WId win, long time )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 );
     info.setUserTime( time );
 #endif
@@ -290,7 +290,7 @@ KWin::WindowInfo KWin::windowInfo( WId win, unsigned long properties, unsigned l
 
 WId KWin::transientFor( WId win )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KXErrorHandler handler; // ignore badwindow
     Window transient_for = None;
     if( XGetTransientForHint( tqt_xdisplay(), win, &transient_for ))
@@ -304,13 +304,13 @@ WId KWin::transientFor( WId win )
 
 void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( mainwindow != 0 )
     {
         /*
          Grmbl. See TQDialog::show(). That should get fixed in Qt somehow.
         */
-        if( tqqt_cast< TQDialog* >( subwindow ) != NULL
+        if( tqt_cast< TQDialog* >( subwindow ) != NULL
             && subwindow->parentWidget() == NULL
             && kapp->mainWidget() != NULL )
         {
@@ -326,7 +326,7 @@ void KWin::setMainWindow( TQWidget* subwindow, WId mainwindow )
 
 WId KWin::groupLeader( WId win )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KXErrorHandler handler; // ignore badwindow
     XWMHints *hints = XGetWMHints( tqt_xdisplay(), win );
     Window window_group = None;
@@ -347,7 +347,7 @@ WId KWin::groupLeader( WId win )
 KWin::Info KWin::info( WId win )
 {
     Info w;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo inf( tqt_xdisplay(), win, tqt_xrootwin(),
 		    NET::WMState |
 		    NET::WMStrut |
@@ -398,11 +398,11 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale )
 
 TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KXErrorHandler handler; // ignore badwindow
 #endif
     TQPixmap result;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( flags & NETWM ) {
         NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMIcon );
         NETIcon ni = info.icon( width, height );
@@ -514,7 +514,7 @@ TQPixmap KWin::icon( WId win, int width, int height, bool scale, int flags )
 
 void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( icon.isNull() )
 	return;
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 );
@@ -536,7 +536,7 @@ void KWin::setIcons( WId win, const TQPixmap& icon, const TQPixmap& miniIcon )
 
 void KWin::setType( WId win, NET::WindowType windowType )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 );
     info.setWindowType( windowType );
 #endif
@@ -544,7 +544,7 @@ void KWin::setType( WId win, NET::WindowType windowType )
 
 void KWin::setState( WId win, unsigned long state )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState );
     info.setState( state, state );
 #endif
@@ -552,7 +552,7 @@ void KWin::setState( WId win, unsigned long state )
 
 void KWin::clearState( WId win, unsigned long state )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMState );
     info.setState( 0, state );
 #endif
@@ -560,7 +560,7 @@ void KWin::clearState( WId win, unsigned long state )
 
 void KWin::setOpacity( WId win, uint percent )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     twin_net_create_atoms();
     if (percent > 99)
         XDeleteProperty (tqt_xdisplay(), win, kde_wm_window_opacity);
@@ -574,7 +574,7 @@ void KWin::setOpacity( WId win, uint percent )
 
 void KWin::setShadowSize( WId win, uint percent )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     twin_net_create_atoms();
     long shadowSize = long(0xFFFFFFFF/100.0*percent);
     XChangeProperty(tqt_xdisplay(), win, kde_wm_window_shadow, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &shadowSize, 1L);
@@ -583,7 +583,7 @@ void KWin::setShadowSize( WId win, uint percent )
 
 void KWin::setOnAllDesktops( WId win, bool b )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMDesktop );
     if ( b )
 	info.setDesktop( NETWinInfo::OnAllDesktops );
@@ -596,7 +596,7 @@ void KWin::setOnAllDesktops( WId win, bool b )
 
 void KWin::setOnDesktop( WId win, int desktop )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), NET::WMDesktop );
     info.setDesktop( desktop );
 #endif
@@ -606,7 +606,7 @@ void KWin::setExtendedStrut( WId win, int left_width, int left_start, int left_e
     int right_width, int right_start, int right_end, int top_width, int top_start, int top_end,
     int bottom_width, int bottom_start, int bottom_end )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 );
     NETExtendedStrut strut;
     strut.left_width = left_width;
@@ -627,7 +627,7 @@ void KWin::setExtendedStrut( WId win, int left_width, int left_start, int left_e
 
 void KWin::setStrut( WId win, int left, int right, int top, int bottom )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), win, tqt_xrootwin(), 0 );
     NETStrut strut;
     strut.left = left;
@@ -640,11 +640,11 @@ void KWin::setStrut( WId win, int left, int right, int top, int bottom )
 
 int KWin::currentDesktop()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (!tqt_xdisplay())
 #endif
       return 1;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop );
     return info.currentDesktop();
 #endif
@@ -652,11 +652,11 @@ int KWin::currentDesktop()
 
 int KWin::numberOfDesktops()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (!tqt_xdisplay())
 #endif
       return 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), NET::NumberOfDesktops );
     return info.numberOfDesktops();
 #endif
@@ -664,7 +664,7 @@ int KWin::numberOfDesktops()
 
 void KWin::setCurrentDesktop( int desktop )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop );
     info.setCurrentDesktop( desktop );
 #endif
@@ -672,7 +672,7 @@ void KWin::setCurrentDesktop( int desktop )
 
 void KWin::setCurrentDesktopViewport( int desktop, TQPoint viewport )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), NET::CurrentDesktop );
     NETPoint netview;
     netview.x = viewport.x();
@@ -683,7 +683,7 @@ void KWin::setCurrentDesktopViewport( int desktop, TQPoint viewport )
 
 void KWin::iconifyWindow( WId win, bool animation)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( !animation )
     {
         twin_net_create_atoms();
@@ -696,7 +696,7 @@ void KWin::iconifyWindow( WId win, bool animation)
 
 void KWin::deIconifyWindow( WId win, bool animation )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( !animation )
     {
         twin_net_create_atoms();
@@ -708,7 +708,7 @@ void KWin::deIconifyWindow( WId win, bool animation )
 
 void KWin::raiseWindow( WId win )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), NET::Supported );
     if( info.isSupported( NET::WM2RestackWindow ))
         info.restackRequest( win, None, Above );
@@ -719,7 +719,7 @@ void KWin::raiseWindow( WId win )
 
 void KWin::lowerWindow( WId win )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(), NET::Supported );
     if( info.isSupported( NET::WM2RestackWindow ))
         info.restackRequest( win, None, Below );
@@ -730,7 +730,7 @@ void KWin::lowerWindow( WId win )
 
 void KWin::appStarted()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TDEStartupInfo::appStarted();
 #endif
 }
@@ -739,11 +739,11 @@ class KWin::WindowInfoPrivate
 {
     public:
 	WindowInfoPrivate()
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	: info( NULL )
 #endif
 	{}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	~WindowInfoPrivate() { delete info; }
 	NETWinInfo* info;
 #endif
@@ -762,7 +762,7 @@ class KWin::WindowInfoPrivate
 // KWin::info() should be updated too if something has to be changed here
 KWin::WindowInfo::WindowInfo( WId win, unsigned long properties, unsigned long properties2 )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KXErrorHandler handler;
     d = new WindowInfoPrivate;
     d->ref = 1;
@@ -862,7 +862,7 @@ WId KWin::WindowInfo::win() const
 
 unsigned long KWin::WindowInfo::state() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMState ) == 0, 176 )
         << "Pass NET::WMState to KWin::windowInfo()" << endl;
     return d->info->state();
@@ -873,7 +873,7 @@ unsigned long KWin::WindowInfo::state() const
 
 NET::MappingState KWin::WindowInfo::mappingState() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::XAWMState ) == 0, 176 )
         << "Pass NET::XAWMState to KWin::windowInfo()" << endl;
     return d->info->mappingState();
@@ -884,7 +884,7 @@ NET::MappingState KWin::WindowInfo::mappingState() const
 
 NETExtendedStrut KWin::WindowInfo::extendedStrut() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2ExtendedStrut ) == 0, 176 )
         << "Pass NET::WM2ExtendedStrut to second argument of KWin::windowInfo()" << endl;
     NETExtendedStrut ext = d->info->extendedStrut();
@@ -922,7 +922,7 @@ NETExtendedStrut KWin::WindowInfo::extendedStrut() const
 
 NETStrut KWin::WindowInfo::strut() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMStrut ) == 0, 176 )
         << "Pass NET::WMStrut to KWin::windowInfo()" << endl;
     return d->info->strut();
@@ -934,7 +934,7 @@ NETStrut KWin::WindowInfo::strut() const
 
 NET::WindowType KWin::WindowInfo::windowType( int supported_types ) const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMWindowType ) == 0, 176 )
         << "Pass NET::WMWindowType to KWin::windowInfo()" << endl;
     return d->info->windowType( supported_types );
@@ -965,7 +965,7 @@ TQString KWin::Info::visibleNameWithState() const
 
 TQString KWin::WindowInfo::visibleName() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMVisibleName ) == 0, 176 )
         << "Pass NET::WMVisibleName to KWin::windowInfo()" << endl;
     return d->info->visibleName() && d->info->visibleName()[ 0 ] != '\0'
@@ -977,7 +977,7 @@ TQString KWin::WindowInfo::visibleName() const
 
 TQString KWin::WindowInfo::name() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMName ) == 0, 176 )
         << "Pass NET::WMName to KWin::windowInfo()" << endl;
     return d->name_;
@@ -998,7 +998,7 @@ TQString KWin::WindowInfo::visibleIconNameWithState() const
 
 TQString KWin::WindowInfo::visibleIconName() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMVisibleIconName ) == 0, 176 )
         << "Pass NET::WMVisibleIconName to KWin::windowInfo()" << endl;
     if( d->info->visibleIconName() && d->info->visibleIconName()[ 0 ] != '\0' )
@@ -1013,7 +1013,7 @@ TQString KWin::WindowInfo::visibleIconName() const
 
 TQString KWin::WindowInfo::iconName() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMIconName ) == 0, 176 )
         << "Pass NET::WMIconName to KWin::windowInfo()" << endl;
     if( d->info->iconName() && d->info->iconName()[ 0 ] != '\0' )
@@ -1026,7 +1026,7 @@ TQString KWin::WindowInfo::iconName() const
 
 bool KWin::WindowInfo::isOnCurrentDesktop() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     return isOnDesktop( KWin::currentDesktop());
 #else
     return false;
@@ -1035,7 +1035,7 @@ bool KWin::WindowInfo::isOnCurrentDesktop() const
 
 bool KWin::WindowInfo::isOnDesktop( int desktop ) const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 )
         << "Pass NET::WMDesktop to KWin::windowInfo()" << endl;
     return d->info->desktop() == desktop || d->info->desktop() == NET::OnAllDesktops;
@@ -1046,7 +1046,7 @@ bool KWin::WindowInfo::isOnDesktop( int desktop ) const
 
 bool KWin::WindowInfo::onAllDesktops() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 )
         << "Pass NET::WMDesktop to KWin::windowInfo()" << endl;
     return d->info->desktop() == NET::OnAllDesktops;
@@ -1057,7 +1057,7 @@ bool KWin::WindowInfo::onAllDesktops() const
 
 int KWin::WindowInfo::desktop() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMDesktop ) == 0, 176 )
         << "Pass NET::WMDesktop to KWin::windowInfo()" << endl;
     return d->info->desktop();
@@ -1068,7 +1068,7 @@ int KWin::WindowInfo::desktop() const
 
 TQRect KWin::WindowInfo::geometry() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMGeometry ) == 0, 176 )
         << "Pass NET::WMGeometry to KWin::windowInfo()" << endl;
     return d->geometry_;
@@ -1079,7 +1079,7 @@ TQRect KWin::WindowInfo::geometry() const
 
 TQRect KWin::WindowInfo::frameGeometry() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS ] & NET::WMKDEFrameStrut ) == 0, 176 )
         << "Pass NET::WMKDEFrameStrut to KWin::windowInfo()" << endl;
     return d->frame_geometry_;
@@ -1090,7 +1090,7 @@ TQRect KWin::WindowInfo::frameGeometry() const
 
 WId KWin::WindowInfo::transientFor() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2TransientFor ) == 0, 176 )
         << "Pass NET::WM2TransientFor to KWin::windowInfo()" << endl;
     return d->info->transientFor();
@@ -1101,7 +1101,7 @@ WId KWin::WindowInfo::transientFor() const
 
 WId KWin::WindowInfo::groupLeader() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2GroupLeader ) == 0, 176 )
         << "Pass NET::WM2GroupLeader to KWin::windowInfo()" << endl;
     return d->info->groupLeader();
@@ -1112,7 +1112,7 @@ WId KWin::WindowInfo::groupLeader() const
 
 TQCString KWin::WindowInfo::windowClassClass() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowClass ) == 0, 176 )
         << "Pass NET::WM2WindowClass to KWin::windowInfo()" << endl;
     return d->info->windowClassClass();
@@ -1123,7 +1123,7 @@ TQCString KWin::WindowInfo::windowClassClass() const
 
 TQCString KWin::WindowInfo::windowClassName() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowClass ) == 0, 176 )
         << "Pass NET::WM2WindowClass to KWin::windowInfo()" << endl;
     return d->info->windowClassName();
@@ -1134,7 +1134,7 @@ TQCString KWin::WindowInfo::windowClassName() const
 
 TQCString KWin::WindowInfo::windowRole() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2WindowRole ) == 0, 176 )
         << "Pass NET::WM2WindowRole to KWin::windowInfo()" << endl;
     return d->info->windowRole();
@@ -1145,7 +1145,7 @@ TQCString KWin::WindowInfo::windowRole() const
 
 TQCString KWin::WindowInfo::clientMachine() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2ClientMachine ) == 0, 176 )
         << "Pass NET::WM2ClientMachine to KWin::windowInfo()" << endl;
     return d->info->clientMachine();
@@ -1156,7 +1156,7 @@ TQCString KWin::WindowInfo::clientMachine() const
 
 bool KWin::WindowInfo::actionSupported( NET::Action action ) const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdWarning(( d->info->passedProperties()[ NETWinInfo::PROTOCOLS2 ] & NET::WM2AllowedActions ) == 0, 176 )
         << "Pass NET::WM2AllowedActions to KWin::windowInfo()" << endl;
     if( allowedActionsSupported())
@@ -1169,7 +1169,7 @@ bool KWin::WindowInfo::actionSupported( NET::Action action ) const
 // see NETWM spec section 7.6
 bool KWin::WindowInfo::isMinimized() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( mappingState() != NET::Iconic )
         return false;
     // NETWM 1.2 compliant WM - uses NET::Hidden for minimized windows
@@ -1186,7 +1186,7 @@ bool KWin::WindowInfo::isMinimized() const
 
 bool KWin::Info::isMinimized() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( mappingState != NET::Iconic )
         return false;
     // NETWM 1.2 compliant WM - uses NET::Hidden for minimized windows
@@ -1208,7 +1208,7 @@ bool KWin::Info::isIconified() const
 
 bool KWin::icccmCompliantMappingState()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     static enum { noidea, yes, no } wm_is_1_2_compliant = noidea;
     if( wm_is_1_2_compliant == noidea ) {
         NETRootInfo info( tqt_xdisplay(), NET::Supported );
@@ -1222,7 +1222,7 @@ bool KWin::icccmCompliantMappingState()
 
 bool KWin::allowedActionsSupported()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     static enum { noidea, yes, no } wm_supports_allowed_actions = noidea;
     if( wm_supports_allowed_actions == noidea ) {
         NETRootInfo info( tqt_xdisplay(), NET::Supported );
@@ -1236,13 +1236,13 @@ bool KWin::allowedActionsSupported()
 
 TQString KWin::readNameProperty( WId win, unsigned long atom )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     XTextProperty tp;
     char **text = NULL;
     int count;
 #endif
     TQString result;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( XGetTextProperty( tqt_xdisplay(), win, &tp, atom ) != 0 && tp.value != NULL ) 
     {
         if (!twin_UTF8_STRING)
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index a37370e58..fc1a37574 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <tqwidget.h>
-#ifdef Q_WS_X11 //FIXME
+#ifdef TQ_WS_X11 //FIXME
 #include "twinmodule.h"
 #include "twin.h"
 #include <X11/Xatom.h>
@@ -445,7 +445,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons
 
 void KWinModule::connectNotify( const char* signal )
 {
-    if( !d->strutSignalConnected && qstrcmp( signal, TQT_SIGNAL(strutChanged())) == 0 )
+    if( !d->strutSignalConnected && qstrcmp( signal, TQ_SIGNAL(strutChanged())) == 0 )
         d->strutSignalConnected = true;
     TQObject::connectNotify( signal );
 }
diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h
index 0357c1c66..356e85958 100644
--- a/tdecore/twinmodule.h
+++ b/tdecore/twinmodule.h
@@ -27,10 +27,6 @@
 #include <tqvaluelist.h>
 #include "tdelibs_export.h"
 
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
 #ifdef Q_OS_UNIX
 
 class KWinModulePrivate;
@@ -55,7 +51,7 @@ class KWinModulePrivate;
  */
 class TDECORE_EXPORT KWinModule : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -65,7 +61,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the QObject
+     * @param parent the parent for the TQObject
      * @param what The information you are interested in:
      *   INFO_DESKTOP:  currentDesktop, 
      *                  numberOfDesktops, 
@@ -93,7 +89,7 @@ public:
     /**
      * Creates a KWinModule object and connects to the window
      * manager.
-     * @param parent the parent for the QObject
+     * @param parent the parent for the TQObject
      **/
     KWinModule( TQObject* parent = 0 );
 
diff --git a/tdefile-plugins/elf/tdefile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index f87b536ed..0b3a58490 100644
--- a/tdefile-plugins/elf/tdefile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -50,54 +50,41 @@ KElfPlugin::KElfPlugin(TQObject *parent, const char *name,
 
     : KFilePlugin(parent, name, args)
 {
-    // Executables
-    KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-executable" );
-
-    KFileMimeTypeInfo::GroupInfo* group = 0L;
-    KFileMimeTypeInfo::GroupInfo* group2 = 0L;
-
-    group = addGroupInfo(info, "Technical", i18n("Embedded Metadata"));
-    group2 = addGroupInfo(info, "Icon", i18n("Embedded Icon(s)"));
-
-    KFileMimeTypeInfo::ItemInfo* item;
-
-    item = addItemInfo(group, "Name", i18n("Internal Name"), TQVariant::String);
-    item = addItemInfo(group, "Description", i18n("Description"), TQVariant::String);
-    item = addItemInfo(group, "License", i18n("License"), TQVariant::String);
-    item = addItemInfo(group, "Copyright", i18n("Copyright"), TQVariant::String);
-    item = addItemInfo(group, "Authors", i18n("Author(s)"), TQVariant::String);
-    item = addItemInfo(group, "Product", i18n("Product"), TQVariant::String);
-    item = addItemInfo(group, "Organization", i18n("Organization"), TQVariant::String);
-    item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String);
-    item = addItemInfo(group, "DateTime", i18n("Compilation Date/Time"), TQVariant::String);
-    item = addItemInfo(group, "SystemIcon", i18n("Requested Icon"), TQVariant::String);
-    item = addItemInfo(group, "SCMModule", i18n("SCM Module"), TQVariant::String);
-    item = addItemInfo(group, "SCMRevision", i18n("SCM Revision"), TQVariant::String);
-    item = addItemInfo(group, "Notes", i18n("Comments"), TQVariant::String);
-
-    item = addItemInfo(group2, "EmbeddedIcon", i18n("Icon Name(s)"), TQVariant::String);
-
-    // Shared libraries
-    info = addMimeTypeInfo( "application/x-sharedlib" );
-
-    group = addGroupInfo(info, "Technical", i18n("Embedded Metadata"));
-    group2 = addGroupInfo(info, "Icon", i18n("Embedded Icon(s)"));
-
-    item = addItemInfo(group, "Name", i18n("Internal Name"), TQVariant::String);
-    item = addItemInfo(group, "Description", i18n("Description"), TQVariant::String);
-    item = addItemInfo(group, "License", i18n("License"), TQVariant::String);
-    item = addItemInfo(group, "Copyright", i18n("Copyright"), TQVariant::String);
-    item = addItemInfo(group, "Authors", i18n("Author(s)"), TQVariant::String);
-    item = addItemInfo(group, "Product", i18n("Product"), TQVariant::String);
-    item = addItemInfo(group, "Organization", i18n("Organization"), TQVariant::String);
-    item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String);
-    item = addItemInfo(group, "DateTime", i18n("Compilation Date/Time"), TQVariant::String);
-    item = addItemInfo(group, "SystemIcon", i18n("Requested Icon"), TQVariant::String);
-    item = addItemInfo(group, "SCMModule", i18n("SCM Module"), TQVariant::String);
-    item = addItemInfo(group, "SCMRevision", i18n("SCM Revision"), TQVariant::String);
-    item = addItemInfo(group, "Notes", i18n("Comments"), TQVariant::String);
-
-    item = addItemInfo(group2, "EmbeddedIcon", i18n("Icon Name(s)"), TQVariant::String);
+    const TQCString elfMimeTypes[]= {
+        "application/x-executable",
+        "application/x-pie-executable",
+        "application/x-sharedlib"
+    };
+    const int elfMimeTypesCount = sizeof(elfMimeTypes)/sizeof(elfMimeTypes[0]);
+
+    for (int i = 0; i < elfMimeTypesCount; i++)
+    {
+        KFileMimeTypeInfo* info = addMimeTypeInfo(elfMimeTypes[i]);
+
+        KFileMimeTypeInfo::GroupInfo* group = 0L;
+        KFileMimeTypeInfo::GroupInfo* group2 = 0L;
+
+        group = addGroupInfo(info, "Technical", i18n("Embedded Metadata"));
+        group2 = addGroupInfo(info, "Icon", i18n("Embedded Icon(s)"));
+
+        KFileMimeTypeInfo::ItemInfo* item;
+
+        item = addItemInfo(group, "Name", i18n("Internal Name"), TQVariant::String);
+        item = addItemInfo(group, "Description", i18n("Description"), TQVariant::String);
+        item = addItemInfo(group, "License", i18n("License"), TQVariant::String);
+        item = addItemInfo(group, "Copyright", i18n("Copyright"), TQVariant::String);
+        item = addItemInfo(group, "Authors", i18n("Author(s)"), TQVariant::String);
+        item = addItemInfo(group, "Product", i18n("Product"), TQVariant::String);
+        item = addItemInfo(group, "Organization", i18n("Organization"), TQVariant::String);
+        item = addItemInfo(group, "Version", i18n("Version"), TQVariant::String);
+        item = addItemInfo(group, "DateTime", i18n("Compilation Date/Time"), TQVariant::String);
+        item = addItemInfo(group, "SystemIcon", i18n("Requested Icon"), TQVariant::String);
+        item = addItemInfo(group, "SCMModule", i18n("SCM Module"), TQVariant::String);
+        item = addItemInfo(group, "SCMRevision", i18n("SCM Revision"), TQVariant::String);
+        item = addItemInfo(group, "Notes", i18n("Comments"), TQVariant::String);
+
+        item = addItemInfo(group2, "EmbeddedIcon", i18n("Icon Name(s)"), TQVariant::String);
+    }
 }
 
 
@@ -110,6 +97,7 @@ bool KElfPlugin::readInfo( KFileMetaInfo& info, uint what)
 	if((handle = libr_open(const_cast<char*>(info.path().ascii()), access)) == NULL)
 	{
 		kdWarning() << "failed to open file" << info.path() << endl;
+		return false;
 	}
 
 	KFileMetaInfoGroup group = appendGroup(info, "Technical");
diff --git a/tdefile-plugins/elf/tdefile_elf.h b/tdefile-plugins/elf/tdefile_elf.h
index cd72afc87..d7898f10d 100644
--- a/tdefile-plugins/elf/tdefile_elf.h
+++ b/tdefile-plugins/elf/tdefile_elf.h
@@ -38,7 +38,7 @@ class TQStringList;
 
 class KElfPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefx/kdrawutil.cpp b/tdefx/kdrawutil.cpp
index 0610865cb..de5946087 100644
--- a/tdefx/kdrawutil.cpp
+++ b/tdefx/kdrawutil.cpp
@@ -27,13 +27,13 @@ TDEFX_EXPORT void kDrawNextButton(TQPainter *p, int x, int y, int w, int h,
     int y2 = y+h-1;
     p->fillRect(x+1, y+1, w-2, h-2,
                 fill ? *fill : g.brush(TQColorGroup::Button));
-    p->setPen(sunken ? Qt::black : g.light());
+    p->setPen(sunken ? TQt::black : g.light());
     p->drawLine(x, y, x2-1, y);
     p->drawLine(x, y, x, y2-1);
     p->setPen(sunken ? g.midlight() : g.mid());
     p->drawLine(x+1, y2-1, x2-1, y2-1);
     p->drawLine(x2-1, y+1, x2-1, y2-1);
-    p->setPen(sunken ? g.light() : Qt::black);
+    p->setPen(sunken ? g.light() : TQt::black);
     p->drawLine(x, y2, x2, y2);
     p->drawLine(x2, y, x2, y2);
     p->setPen(oldPen);
@@ -161,10 +161,10 @@ TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool
     3,1,3,2,3,3,3,4,3,0,4,1,4,2,4,3,4,4,4 };
 
     if(clear)
-        p->fillRect(x, y, w, h, TQBrush(Qt::color0, Qt::SolidPattern));
+        p->fillRect(x, y, w, h, TQBrush(TQt::color0, TQt::SolidPattern));
     
-    TQBrush fillBrush(Qt::color1, Qt::SolidPattern);
-    p->setPen(Qt::color1);
+    TQBrush fillBrush(TQt::color1, TQt::SolidPattern);
+    p->setPen(TQt::color1);
     if(w > 16 && h > 16){
         int x2 = x+w-1;
         int y2 = y+h-1;
@@ -223,7 +223,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
         blackColor, whiteColor};
 
     TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(),
-        Qt::black, Qt::white};
+        TQt::black, TQt::white};
 
     int i;
     for(i=0; i < 6; ++i){
@@ -246,7 +246,7 @@ TDEFX_EXPORT void kColorBitmaps(TQPainter *p, const TQColorGroup &g, int x, int
         blackColor, whiteColor};
 
     TQColor colors[]={g.light(), g.mid(), g.midlight(), g.dark(),
-        Qt::black, Qt::white};
+        TQt::black, TQt::white};
 
     int i;
     TQBitmap b;
diff --git a/tdefx/kdrawutil.h b/tdefx/kdrawutil.h
index 909792817..bee877e6a 100644
--- a/tdefx/kdrawutil.h
+++ b/tdefx/kdrawutil.h
@@ -125,7 +125,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
  * @c \#include @c <kdrawutil.h>
  *
  * Paints the pixels covered by a round button of the given size with
- * Qt::color1. This function is useful in TQStyle::drawControlMask().
+ * TQt::color1. This function is useful in TQStyle::drawControlMask().
  *
  * @param p      The painter to use for drawing the button.
  * @param x      The X coordinate of the button.
@@ -133,7 +133,7 @@ TDEFX_EXPORT void kRoundMaskRegion(TQRegion &r, int x, int y, int w, int h);
  * @param w      The width of the button.
  * @param h      The height of the button.
  * @param clear  Whether to clear the rectangle specified by @p (x, y, w, h) to
- *               Qt::color0 before drawing the mask.
+ *               TQt::color0 before drawing the mask.
  */
 TDEFX_EXPORT void kDrawRoundMask(TQPainter *p, int x, int y, int w, int h, bool clear=false);
 
diff --git a/tdefx/kimageeffect.cpp b/tdefx/kimageeffect.cpp
index 277e1cc7f..8968c1b43 100644
--- a/tdefx/kimageeffect.cpp
+++ b/tdefx/kimageeffect.cpp
@@ -58,7 +58,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 //======================================================================
 //
-// Utility stuff for effects ported from ImageMagick to QImage
+// Utility stuff for effects ported from ImageMagick to TQImage
 //
 //======================================================================
 #define MaxRGB 255L
@@ -664,7 +664,7 @@ TQImage& KImageEffect::intensity(TQImage &image, float percent)
     int pixels = image.depth() > 8 ? image.width()*image.height() :
                  image.numColors();
     unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() :
-                         (unsigned int *)image.tqcolorTable();
+                         (unsigned int *)image.colorTable();
 
     bool brighten = (percent >= 0);
     if(percent < 0)
@@ -858,7 +858,7 @@ TQImage& KImageEffect::channelIntensity(TQImage &image, float percent,
     int pixels = image.depth() > 8 ? image.width()*image.height() :
         image.numColors();
     unsigned int *data = image.depth() > 8 ? (unsigned int *)image.bits() :
-        (unsigned int *)image.tqcolorTable();
+        (unsigned int *)image.colorTable();
     bool brighten = (percent >= 0);
     if(percent < 0)
         percent = -percent;
@@ -958,7 +958,7 @@ TQImage& KImageEffect::modulate(TQImage &image, TQImage &modImage, bool reverse,
     if (modImage.depth()<8) modImage = modImage.convertDepth(8);
 
     unsigned int *colorTable2 = (modImage.depth()==8) ?
-				 modImage.tqcolorTable():0;
+				 modImage.colorTable():0;
     unsigned int *data1, *data2;
     unsigned char *data2b;
     unsigned int color1, color2;
@@ -1079,11 +1079,6 @@ TQImage& KImageEffect::blend(const TQColor& clr, TQImage& dst, float opacity)
     if (dst.depth() != 32)
         dst = dst.convertDepth(32);
 
-#ifdef USE_QT4
-    if (dst.format() != QImage::Format_ARGB32)
-        dst = dst.convertToFormat(QImage::Format_ARGB32);	// This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB)
-#endif
-
     int pixels = dst.width() * dst.height();
 
 #ifdef USE_SSE2_INLINE_ASM
@@ -1334,13 +1329,6 @@ TQImage& KImageEffect::blend(TQImage& src, TQImage& dst, float opacity)
     if (src.depth() != 32) src = src.convertDepth(32);
     if (dst.depth() != 32) dst = dst.convertDepth(32);
 
-#ifdef USE_QT4
-    if (src.format() != QImage::Format_ARGB32)
-        src = dst.convertToFormat(QImage::Format_ARGB32);	// This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB)
-    if (dst.format() != QImage::Format_ARGB32)
-        dst = dst.convertToFormat(QImage::Format_ARGB32);	// This is needed because Qt4 has multiple variants with a 32 bit depth, and the routines below expect one specific variant (ARGB)
-#endif
-
     int pixels = src.width() * src.height();
 
 #ifdef USE_SSE2_INLINE_ASM
@@ -1800,7 +1788,7 @@ TQImage& KImageEffect::blend(TQImage &image1, TQImage &image2,
     if (blendImage.depth()<8) blendImage = blendImage.convertDepth(8);
 
     unsigned int *colorTable3 = (blendImage.depth()==8) ?
-				 blendImage.tqcolorTable():0;
+				 blendImage.colorTable():0;
 
     unsigned int *data1 =  (unsigned int *)image1.bits();
     unsigned int *data2 =  (unsigned int *)image2.bits();
@@ -2174,7 +2162,7 @@ TQImage& KImageEffect::toGray(TQImage &img, bool fast)
         int pixels = img.depth() > 8 ? img.width()*img.height() :
             img.numColors();
         unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() :
-            (unsigned int *)img.tqcolorTable();
+            (unsigned int *)img.colorTable();
         int val, i;
         for(i=0; i < pixels; ++i){
             val = tqGray(data[i]);
@@ -2195,7 +2183,7 @@ TQImage& KImageEffect::desaturate(TQImage &img, float desat)
     int pixels = img.depth() > 8 ? img.width()*img.height() :
         img.numColors();
     unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() :
-        (unsigned int *)img.tqcolorTable();
+        (unsigned int *)img.colorTable();
     int h, s, v, i;
     TQColor clr; // keep constructor out of loop (mosfet)
     for(i=0; i < pixels; ++i){
@@ -2220,7 +2208,7 @@ TQImage& KImageEffect::contrast(TQImage &img, int c)
     int pixels = img.depth() > 8 ? img.width()*img.height() :
         img.numColors();
     unsigned int *data = img.depth() > 8 ? (unsigned int *)img.bits() :
-        (unsigned int *)img.tqcolorTable();
+        (unsigned int *)img.colorTable();
     int i, r, g, b;
     for(i=0; i < pixels; ++i){
         r = tqRed(data[i]);
@@ -2791,7 +2779,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h)
     }
     else if(depth == 1) {
         int r = src.bitOrder() == TQImage::LittleEndian;
-        memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb));
+        memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(TQRgb));
         for(int y=0; y < h; ++y){
             unsigned char *destData = dest.scanLine(y);
             unsigned char *srcData = src.scanLine(y_offset[y]);
@@ -2806,7 +2794,7 @@ TQImage KImageEffect::sample(TQImage &src, int w, int h)
         }
     }
     else{ // PseudoClass source image
-        memcpy(dest.tqcolorTable(), src.tqcolorTable(), src.numColors()*sizeof(TQRgb));
+        memcpy(dest.colorTable(), src.colorTable(), src.numColors()*sizeof(TQRgb));
         for(int y=0; y < h; ++y){
             unsigned char *destData = dest.scanLine(y);
             unsigned char *srcData = src.scanLine(y_offset[y]);
@@ -2829,10 +2817,10 @@ void KImageEffect::threshold(TQImage &img, unsigned int threshold)
     }
     else{ // PsudeoClass
         count = img.numColors();
-        data = (unsigned int *)img.tqcolorTable();
+        data = (unsigned int *)img.colorTable();
     }
     for(i=0; i < count; ++i)
-        data[i] = intensityValue(data[i]) < threshold ? QColor(Qt::black).rgb() : QColor(Qt::white).rgb();
+        data[i] = intensityValue(data[i]) < threshold ? TQColor(TQt::black).rgb() : TQColor(TQt::white).rgb();
 }
 
 void KImageEffect::hull(const int x_offset, const int y_offset,
@@ -2963,7 +2951,7 @@ TQImage KImageEffect::despeckle(TQImage &src)
     }
     else{ // PsudeoClass source image
         unsigned char *srcData;
-        unsigned int *cTable = src.tqcolorTable();
+        unsigned int *cTable = src.colorTable();
         unsigned int pixel;
         for(y=0; y < src.height(); ++y){
             srcData = (unsigned char *)src.scanLine(y);
@@ -3142,7 +3130,7 @@ TQImage KImageEffect::addNoise(TQImage &src, NoiseType noise_type)
     }
     else{ // PsudeoClass source image
         unsigned char *srcData;
-        unsigned int *cTable = src.tqcolorTable();
+        unsigned int *cTable = src.colorTable();
         unsigned int pixel;
         for(y=0; y < src.height(); ++y){
             srcData = (unsigned char *)src.scanLine(y);
@@ -3204,7 +3192,7 @@ unsigned int KImageEffect::interpolateColor(TQImage *image, double x_offset,
         }
     }
     else{
-        unsigned int *colorTable = (unsigned int *)image->tqcolorTable();
+        unsigned int *colorTable = (unsigned int *)image->colorTable();
         if((x >= 0) && (y >= 0) && (x < (image->width()-1)) && (y < (image->height()-1)))    {
             unsigned char *t;
             t = (unsigned char *)image->scanLine(y);
@@ -3304,7 +3292,7 @@ TQImage KImageEffect::implode(TQImage &src, double factor,
     else{ // PsudeoClass source image
         unsigned char *srcData;
         unsigned char idx;
-        unsigned int *cTable = src.tqcolorTable();
+        unsigned int *cTable = src.colorTable();
         for(y=0; y < src.height(); ++y){
             srcData = (unsigned char *)src.scanLine(y);
             destData = (unsigned int *)dest.scanLine(y);
@@ -3380,8 +3368,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r)
         case Rotate90:
             dest.create(img.height(), img.width(), img.depth());
             dest.setNumColors(img.numColors());
-            srcTable = (unsigned int *)img.tqcolorTable();
-            destTable = (unsigned int *)dest.tqcolorTable();
+            srcTable = (unsigned int *)img.colorTable();
+            destTable = (unsigned int *)dest.colorTable();
             for(x=0; x < img.numColors(); ++x)
                 destTable[x] = srcTable[x];
             for(y=0; y < img.height(); ++y){
@@ -3395,8 +3383,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r)
         case Rotate180:
             dest.create(img.width(), img.height(), img.depth());
             dest.setNumColors(img.numColors());
-            srcTable = (unsigned int *)img.tqcolorTable();
-            destTable = (unsigned int *)dest.tqcolorTable();
+            srcTable = (unsigned int *)img.colorTable();
+            destTable = (unsigned int *)dest.colorTable();
             for(x=0; x < img.numColors(); ++x)
                 destTable[x] = srcTable[x];
             for(y=0; y < img.height(); ++y){
@@ -3409,8 +3397,8 @@ TQImage KImageEffect::rotate(TQImage &img, RotateDirection r)
         case Rotate270:
             dest.create(img.height(), img.width(), img.depth());
             dest.setNumColors(img.numColors());
-            srcTable = (unsigned int *)img.tqcolorTable();
-            destTable = (unsigned int *)dest.tqcolorTable();
+            srcTable = (unsigned int *)img.colorTable();
+            destTable = (unsigned int *)dest.colorTable();
             for(x=0; x < img.numColors(); ++x)
                 destTable[x] = srcTable[x];
             for(y=0; y < img.height(); ++y){
@@ -3438,7 +3426,7 @@ void KImageEffect::solarize(TQImage &img, double factor)
 
     threshold = (int)(factor*(MaxRGB+1)/100.0);
     if(img.depth() < 32){
-        data = (unsigned int *)img.tqcolorTable();
+        data = (unsigned int *)img.colorTable();
         count = img.numColors();
     }
     else{
@@ -3553,7 +3541,7 @@ TQImage KImageEffect::swirl(TQImage &src, double degrees,
     }
     else{ // PsudeoClass source image
         unsigned char *p;
-        unsigned int *cTable = (unsigned int *)src.tqcolorTable();
+        unsigned int *cTable = (unsigned int *)src.colorTable();
         for(y=0; y < src.height(); y++){
             p = (unsigned char *)src.scanLine(y);
             q = (unsigned int *)dest.scanLine(y);
@@ -4566,7 +4554,7 @@ TQImage KImageEffect::shade(TQImage &src, bool color_shading, double azimuth,
     else{ // PsudeoClass source image
         unsigned char *p, *s0, *s1, *s2;
         int scanLineIdx;
-        unsigned int *cTable = (unsigned int *)src.tqcolorTable();
+        unsigned int *cTable = (unsigned int *)src.colorTable();
         for(y=0; y < src.height(); ++y){
             scanLineIdx = TQMIN(TQMAX(y-1,0),src.height()-3);
             p = (unsigned char *)src.scanLine(scanLineIdx);
@@ -4644,7 +4632,7 @@ void KImageEffect::contrastHSV(TQImage &img, bool sharpen)
     }
     else{
         count = img.numColors();
-        data = (unsigned int *)img.tqcolorTable();
+        data = (unsigned int *)img.colorTable();
     }
     for(i=0; i < count; ++i){
         c.setRgb(data[i]);
diff --git a/tdefx/kimageeffect.h b/tdefx/kimageeffect.h
index cc79533f7..3bfd10944 100644
--- a/tdefx/kimageeffect.h
+++ b/tdefx/kimageeffect.h
@@ -398,7 +398,7 @@ public:
            const TQColor &cb, int ncols=0);
 
     /**
-     * Build a hash on any given QImage
+     * Build a hash on any given TQImage
      *
      * @param image The TQImage to process
      * @param lite The hash faces the indicated lighting (cardinal poles).
diff --git a/tdefx/kpixmap.cpp b/tdefx/kpixmap.cpp
index 8cc9e384a..30a2de570 100644
--- a/tdefx/kpixmap.cpp
+++ b/tdefx/kpixmap.cpp
@@ -75,7 +75,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst )
     pv[2] = new int[sw];
 
     for ( y=0; y < src->height(); y++ ) {
-	// p = (QRgb *)src->scanLine(y);
+	// p = (TQRgb *)src->scanLine(y);
 	b = dst->scanLine(y);
 	int endian = (TQImage::systemBitOrder() == TQImage::BigEndian);
 	int x;
@@ -357,7 +357,7 @@ bool KPixmap::checkColorTable( const TQImage &image )
 	
     }
 
-    TQRgb* ctable = image.tqcolorTable();
+    TQRgb* ctable = image.colorTable();
 
     int ncols = image.numColors();
     int j;
diff --git a/tdefx/kpixmapsplitter.h b/tdefx/kpixmapsplitter.h
index 3e7a6dfa1..cf96515ce 100644
--- a/tdefx/kpixmapsplitter.h
+++ b/tdefx/kpixmapsplitter.h
@@ -42,7 +42,7 @@ class KPixmapSplitterPrivate;
  * splitter.setItemSize( TQSize( 20, 10 ));
  *
  * TQPixmap item( 20, 10 );
- * item.fill( Qt::white );
+ * item.fill( TQt::white );
  * TQRect rect = splitter.coordinates( 4 );
  * if ( !rect.isEmpty() )
  *     bitBlt( &item, TQPoint(0,0), &somePixmap, rect, CopyROP );
diff --git a/tdefx/tdestyle.cpp b/tdefx/tdestyle.cpp
index e2fadb17f..2c741fc06 100644
--- a/tdefx/tdestyle.cpp
+++ b/tdefx/tdestyle.cpp
@@ -53,7 +53,7 @@
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 # include <X11/Xlib.h>
 # ifdef HAVE_XRENDER
 #  include <X11/extensions/Xrender.h> // schroder
@@ -263,11 +263,11 @@ TQString TDEStyle::defaultStyle()
 
 void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
 		if ( d->useFilledFrameWorkaround )
 		{
-			if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) {
+			if ( TQFrame *frame = ::tqt_cast< TQFrame* >( widget ) ) {
 				TQFrame::Shape shape = frame->frameShape();
 				if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
 					widget->installEventFilter(this);
@@ -287,11 +287,11 @@ void TDEStyle::polish( const TQStyleControlElementData &ceData, ControlElementFl
 
 void TDEStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
 		if ( d->useFilledFrameWorkaround )
 		{
-			if ( TQFrame *frame = ::tqqt_cast< TQFrame* >( widget ) ) {
+			if ( TQFrame *frame = ::tqt_cast< TQFrame* >( widget ) ) {
 				TQFrame::Shape shape = frame->frameShape();
 				if (shape == TQFrame::ToolBarPanel || shape == TQFrame::MenuBarPanel)
 					widget->removeEventFilter(this);
@@ -310,7 +310,7 @@ void TDEStyle::polishPopupMenu( const TQStyleControlElementData &ceData, Control
         widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
     }
 
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
 		TQPopupMenu *p = dynamic_cast<TQPopupMenu*>(widget);
 		if (p) {
@@ -537,7 +537,7 @@ void TDEStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 			break;
 
 		default:
-			p->fillRect(r, Qt::yellow);	// Something really bad happened - highlight.
+			p->fillRect(r, TQt::yellow);	// Something really bad happened - highlight.
 			break;
 	}
 }
@@ -569,29 +569,7 @@ int TDEStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElement
 
 // -----------------------------------------------------------------------------
 
-// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times.  Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-
-//void TDEStyle::drawPrimitive( TQ_ControlElement pe,
-//							TQPainter* p,
-// 							const TQStyleControlElementData &ceData,
-// 							ControlElementFlags elementFlags,
-//							const TQRect &r,
-//							const TQColorGroup &cg,
-//							SFlags flags,
-//							const TQStyleOption& opt ) const
-//{
-//	// FIXME:
-//	// What should "widget" be in actuality?  How should I get it?  From where?
-//	// Almost certainly it should not be null!
-//	TQWidget *widget = 0;
-//	drawControl(pe, p, ceData, elementFlags, r, cg, flags, opt, widget);
-//}
-
-// #endif // USE_QT4
-
-// -----------------------------------------------------------------------------
-
-void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void TDEStyle::drawPrimitive( PrimitiveElement pe,
 							TQPainter* p,
 							const TQStyleControlElementData &ceData,
 							ControlElementFlags elementFlags,
@@ -615,13 +593,13 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
 
 		// Check if we are a normal toolbar or a hidden dockwidget.
 		if ( parent &&
-			(parent->inherits(TQTOOLBAR_OBJECT_NAME_STRING) ||		// Normal toolbar
-			(parent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) ))	// Collapsed dock
+			(parent->inherits("TQToolBar") ||		// Normal toolbar
+			(parent->inherits("TQMainWindow")) ))	// Collapsed dock
 
 			// Draw a toolbar handle
 			drawTDEStylePrimitive( KPE_ToolBarHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
 
-		else if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
+		else if (ceData.widgetObjectTypes.contains("TQDockWindowHandle"))
 
 			// Draw a dock window handle
 			drawTDEStylePrimitive( KPE_DockWindowHandle, p, ceData, elementFlags, r, cg, flags, opt, widget );
@@ -686,7 +664,7 @@ void TDEStyle::drawPrimitive( TQ_PrimitiveElement pe,
 
 
 
-void TDEStyle::drawControl( TQ_ControlElement element,
+void TDEStyle::drawControl( ControlElement element,
 						  TQPainter* p,
 						  const TQStyleControlElementData &ceData,
 						  ControlElementFlags elementFlags,
@@ -875,7 +853,7 @@ void TDEStyle::drawControl( TQ_ControlElement element,
 		// ------------------------------------------------------------------------
 		case CE_ProgressBarGroove: {
 			TQRect fr = subRect(SR_ProgressBarGroove, ceData, elementFlags, widget);
-			drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::SO_Default);
+			drawPrimitive(PE_Panel, p, ceData, elementFlags, fr, cg, Style_Sunken, TQStyleOption::Default);
 			break;
 		}
 
@@ -1025,9 +1003,9 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
 			// Check that we are not a normal toolbar or a hidden dockwidget,
 			// in which case we need to adjust the height for font size
 			if (widget
-				&& !(ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
-				&& !(ceData.parentWidgetData.widgetObjectTypes.contains(TQMAINWINDOW_OBJECT_NAME_STRING))
-				&& (ceData.widgetObjectTypes.contains(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) )
+				&& !(ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
+				&& !(ceData.parentWidgetData.widgetObjectTypes.contains("TQMainWindow"))
+				&& (ceData.widgetObjectTypes.contains("TQDockWindowHandle")) )
 					return widget->fontMetrics().lineSpacing();
 			else
 				return TQCommonStyle::pixelMetric(m, ceData, elementFlags, widget);
@@ -1086,7 +1064,7 @@ int TDEStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData
 		// SPLITTER
 		// ------------------------------------------------------------------------
 		case PM_SplitterWidth:
-			if (ceData.widgetObjectTypes.contains(TQDOCKWINDOWRESIZEHANDLE_OBJECT_NAME_STRING))
+			if (ceData.widgetObjectTypes.contains("TQDockWindowResizeHandle"))
 				return 8;	// ### why do we need 2pix extra?
 			else
 				return 6;
@@ -1131,7 +1109,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void TDEStyle::drawComplexControl( TQ_ComplexControl control,
+void TDEStyle::drawComplexControl( ComplexControl control,
 								 TQPainter* p,
 								 const TQStyleControlElementData &ceData,
 								 ControlElementFlags elementFlags,
@@ -1437,7 +1415,7 @@ void TDEStyle::drawComplexControl( TQ_ComplexControl control,
 }
 
 
-TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl TDEStyle::querySubControl( ComplexControl control,
 											const TQStyleControlElementData &ceData,
 											ControlElementFlags elementFlags,
 											const TQPoint &pos,
@@ -1455,7 +1433,7 @@ TQStyle::SubControl TDEStyle::querySubControl( TQ_ComplexControl control,
 }
 
 
-TQRect TDEStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect TDEStyle::querySubControlMetrics( ComplexControl control,
 									  const TQStyleControlElementData &ceData,
 									  ControlElementFlags elementFlags,
 									  SubControl sc,
@@ -1875,7 +1853,7 @@ TQPixmap TDEStyle::stylePixmap( StylePixmap stylepixmap,
 }
 
 
-int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+int TDEStyle::styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					   const TQStyleOption &opt, TQStyleHintReturn* shr, const TQWidget* w) const
 {
 	switch (sh)
@@ -1936,7 +1914,7 @@ int TDEStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceDat
 
 bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQObject")) {
 		TQObject* object = reinterpret_cast<TQObject*>(source);
 		if ( d->useFilledFrameWorkaround )
 		{
@@ -1949,17 +1927,17 @@ bool TDEStyle::objectEventHandler( const TQStyleControlElementData &ceData, Cont
 			// -- Karol.
 			TQFrame *frame = 0;
 			if ( event->type() == TQEvent::Paint
-					&& (frame = ::tqqt_cast<TQFrame*>(object)) )
+					&& (frame = ::tqt_cast<TQFrame*>(object)) )
 			{
 				if (frame->frameShape() != TQFrame::ToolBarPanel && frame->frameShape() != TQFrame::MenuBarPanel)
 					return false;
 
 				bool horizontal = true;
 				TQPaintEvent* pe = (TQPaintEvent*)event;
-				TQToolBar *toolbar = ::tqqt_cast< TQToolBar *>( frame );
+				TQToolBar *toolbar = ::tqt_cast< TQToolBar *>( frame );
 				TQRect r = pe->rect();
 
-				if (toolbar && toolbar->orientation() == Qt::Vertical)
+				if (toolbar && toolbar->orientation() == TQt::Vertical)
 					horizontal = false;
 
 				if (horizontal) {
@@ -2163,7 +2141,7 @@ TQImage TransparencyHandler::handleRealAlpha(TQImage img) {
 // Create a shadow of thickness 4.
 void TransparencyHandler::createShadowWindows(const TQWidget* p)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	int x2 = p->x()+p->width();
 	int y2 = p->y()+p->height();
 	TQRect shadow1(x2, p->y() + 4, 4, p->height());
@@ -2222,7 +2200,7 @@ void TransparencyHandler::createShadowWindows(const TQWidget* p)
 
 void TransparencyHandler::removeShadowWindows(const TQWidget* p)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	ShadowMap::iterator it = shadowMap().find(p);
 	if (it != shadowMap().end())
 	{
@@ -2241,7 +2219,7 @@ void TransparencyHandler::removeShadowWindows(const TQWidget* p)
 
 bool TransparencyHandler::eventFilter( TQObject* object, TQEvent* event )
 {
-#if !defined Q_WS_MAC && !defined Q_WS_WIN
+#if !defined TQ_WS_MAC && !defined TQ_WS_WIN
 	// Transparency idea was borrowed from KDE2's "MegaGradient" Style,
 	// Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org>
 
@@ -2339,8 +2317,8 @@ void TransparencyHandler::blendToPixmap(const TQColorGroup &cg, const TQWidget*
 		return;
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
-	if (::tqqt_cast<TQPopupMenu*>(p))
-		tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqqt_cast<TQPopupMenu*>(p) );
+	if (::tqt_cast<TQPopupMenu*>(p))
+		tdestyle->renderMenuBlendPixmap( blendPix, cg, ::tqt_cast<TQPopupMenu*>(p) );
 	else
 		blendPix.fill(cg.button());	// Just tint as the default behavior
 
@@ -2361,9 +2339,9 @@ void TransparencyHandler::XRenderBlendToPixmap(const TQWidget* p)
 	renderPix.resize( pix.width(), pix.height() );
 
 	// Allow styles to define the blend pixmap - allows for some interesting effects.
-	if (::tqqt_cast<TQPopupMenu*>(p))
+	if (::tqt_cast<TQPopupMenu*>(p))
 	   tdestyle->renderMenuBlendPixmap( renderPix, p->colorGroup(),
-			   ::tqqt_cast<TQPopupMenu*>(p) );
+			   ::tqt_cast<TQPopupMenu*>(p) );
 	else
 		renderPix.fill(p->colorGroup().button());	// Just tint as the default behavior
 
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h
index 505682b32..c9cd11f88 100644
--- a/tdefx/tdestyle.h
+++ b/tdefx/tdestyle.h
@@ -56,7 +56,7 @@ struct TDEStylePrivate;
  */
 class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 	public:
@@ -245,15 +245,15 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					const TQRect &r,
 					const TQColorGroup &cg,
 					SFlags flags = Style_Default,
-					const TQStyleOption& = TQStyleOption::SO_Default ) const;
+					const TQStyleOption& = TQStyleOption::Default ) const;
 
 		/**
-		 * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that 
+		 * This function is identical to Qt's TQStyle::drawPrimitive(), except that 
 		 * it adds one further parameter, 'widget', that can be used to determine 
 		 * the widget state of the TDEStylePrimitive in question.
 		 *
 		 * @see TDEStyle::TDEStylePrimitive
-		 * @see TQStyle::tqdrawPrimitive
+		 * @see TQStyle::drawPrimitive
 		 * @see TQStyle::drawComplexControl
 		 */
 		virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe,
@@ -263,7 +263,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					const TQRect &r,
 					const TQColorGroup &cg,
 					SFlags flags = Style_Default,
-					const TQStyleOption& = TQStyleOption::SO_Default,
+					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
 
@@ -287,39 +287,26 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 		void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 		void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
 
-		void drawPrimitive( TQ_PrimitiveElement pe,
+		void drawPrimitive( PrimitiveElement pe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
 					SFlags flags = Style_Default,
-					const TQStyleOption& = TQStyleOption::SO_Default ) const;
+					const TQStyleOption& = TQStyleOption::Default ) const;
 
-// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times.  Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now
-
-//		void drawPrimitive( TQ_ControlElement pe,
-//					TQPainter* p,
-// 					const TQStyleControlElementData &ceData,
-// 					ControlElementFlags elementFlags,
-//					const TQRect &r,
-//					const TQColorGroup &cg,
-//					SFlags flags = Style_Default,
-//					const TQStyleOption& = TQStyleOption::SO_Default ) const;
-
-// #endif // USE_QT4
-
-		void drawControl( TQ_ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
 					SFlags flags = Style_Default,
-					const TQStyleOption& = TQStyleOption::SO_Default,
+					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		void drawComplexControl( TQ_ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -328,21 +315,21 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 					SFlags flags = Style_Default,
 					SCFlags controls = SC_All,
 					SCFlags active = SC_None,
-					const TQStyleOption& = TQStyleOption::SO_Default,
+					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		SubControl querySubControl( TQ_ComplexControl control,
+		SubControl querySubControl( ComplexControl control,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQPoint &pos,
-					const TQStyleOption& = TQStyleOption::SO_Default,
+					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		TQRect querySubControlMetrics( TQ_ComplexControl control,
+		TQRect querySubControlMetrics( ComplexControl control,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					SubControl sc,
-					const TQStyleOption& = TQStyleOption::SO_Default,
+					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
 		int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, 
@@ -354,12 +341,12 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 		TQPixmap stylePixmap( StylePixmap stylepixmap,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
-					const TQStyleOption& = TQStyleOption::SO_Default,
+					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		int styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData,
+		int styleHint( StyleHint sh, const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
-					const TQStyleOption &opt = TQStyleOption::SO_Default,
+					const TQStyleOption &opt = TQStyleOption::Default,
 					TQStyleHintReturn* shr = 0,
 					const TQWidget* w = 0 ) const;
 
diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index aaf3074d3..624612d55 100644
--- a/tdehtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -73,8 +73,8 @@ set( target tdehtml )
 
 set( ${target}_SRCS
   tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp
-  tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp
-  tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cc
+  tdehtml_factory.cpp tdehtml_settings.cpp tdehtml_events.cpp
+  tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cpp
   tdehtml_printsettings.cpp tdehtmlimage.cpp kjserrordlg.ui
   htmlpageinfo.ui tdehtml_iface.skel
 )
@@ -93,7 +93,7 @@ tde_add_library( ${target} SHARED AUTOMOC
   LINK ${VSCRIPT} kjava-static kjs_html-static tdehtmldom-static tdehtmlcss-static
     tdehtmlhtml-static tdehtmlxml-static tdehtmlrender-static tdehtmlmisc-static
     tdeutils-shared tdeprint-shared
-  LINK_PRIVATE kjs-shared ${JPEG_LIBRARIES}
+  LINK_PRIVATE kjs-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/tdehtml/ChangeLog b/tdehtml/ChangeLog
index eb70686e1..3a157f8f5 100644
--- a/tdehtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -708,7 +708,7 @@
 	from innerHTML() and innerText()
 
 2005-05-14  Ivor Hewitt <ivor@ivor.org>
-        * tdehtml_settings.cc: Support full wildcard expressions in AdblocK
+        * tdehtml_settings.cpp: Support full wildcard expressions in AdblocK
 
 2005-05-12  Luciano Montanaro <mikelima@cirulla.net>
 	* html/html_formimpl.cpp: Make a return keypress activate form
@@ -2500,7 +2500,7 @@
 	repaint handling over here, since TableSections don't inherit RenderBox,
 	but still have a background.
 
-	* tdehtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
+	* tdehtml_settings.cpp (init)/html4.css: MediumFontSize up to 12. Form elements
 	get font-size: small instead.
 
 2004-02-24  Dirk Mueller  <mueller@kde.org>
@@ -3859,7 +3859,7 @@
 
 2003-10-04  Dirk Mueller  <mueller@kde.org>
 
-	* tdehtml_settings.cc (init): change default for JS debugger to off.
+	* tdehtml_settings.cpp (init): change default for JS debugger to off.
 
 	* html/html_elementimpl.cpp (createContextualFragment): Fix memory
 	leaks. Adjust code style. Adjust return to avoid dangling return leaks.
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 431b0b143..79ecf8a89 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -32,9 +32,9 @@ lib_LTLIBRARIES = libtdehtml.la
 kde_module_LTLIBRARIES = libtdehtmlpart.la tdehtmlimagepart.la
 
 libtdehtml_la_SOURCES = kjserrordlg.ui tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp\
-			tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp \
+			tdehtml_factory.cpp tdehtml_settings.cpp tdehtml_events.cpp \
 			tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.skel \
-			tdehtml_iface.cc tdehtml_printsettings.cpp htmlpageinfo.ui \
+			tdehtml_iface.cpp tdehtml_printsettings.cpp htmlpageinfo.ui \
 			tdehtmlimage.cpp
 
 libtdehtml_la_METASOURCES = AUTO
diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp
index 94cca8840..31f0d6be2 100644
--- a/tdehtml/css/css_valueimpl.cpp
+++ b/tdehtml/css/css_valueimpl.cpp
@@ -505,7 +505,7 @@ CSSPrimitiveValueImpl::CSSPrimitiveValueImpl( RectImpl *r)
     m_type = CSSPrimitiveValue::CSS_RECT;
 }
 
-CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(QRgb color)
+CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(TQRgb color)
 {
     m_value.rgbcolor = color;
     m_type = CSSPrimitiveValue::CSS_RGBCOLOR;
diff --git a/tdehtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h
index 9a6203c86..952c81f8c 100644
--- a/tdehtml/css/css_valueimpl.h
+++ b/tdehtml/css/css_valueimpl.h
@@ -163,7 +163,7 @@ public:
     CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type);
     CSSPrimitiveValueImpl(CounterImpl *c);
     CSSPrimitiveValueImpl( RectImpl *r);
-    CSSPrimitiveValueImpl(QRgb color);
+    CSSPrimitiveValueImpl(TQRgb color);
     CSSPrimitiveValueImpl(PairImpl *p);
 
     virtual ~CSSPrimitiveValueImpl();
@@ -206,7 +206,7 @@ public:
 	return ( m_type != CSSPrimitiveValue::CSS_RECT ? 0 : m_value.rect );
     }
 
-    QRgb getRGBColorValue () const {
+    TQRgb getRGBColorValue () const {
 	return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor );
     }
 
@@ -232,7 +232,7 @@ protected:
 	DOM::DOMStringImpl *string;
 	CounterImpl *counter;
 	RectImpl *rect;
-        QRgb rgbcolor;
+        TQRgb rgbcolor;
         PairImpl* pair;
     } m_value;
 };
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index 130fa8b61..b4b531df0 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -2053,7 +2053,7 @@ bool CSSParser::parseHSLParameters(Value* value, double* colorArray, bool parseA
     return true;
 }
 
-static bool parseColor(int unit, const TQString &name, QRgb& rgb)
+static bool parseColor(int unit, const TQString &name, TQRgb& rgb)
 {
     int len = name.length();
 
@@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
 
 CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value)
 {
-    QRgb c = tdehtml::transparentColor;
+    TQRgb c = tdehtml::transparentColor;
     if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER &&
               value->fValue >= 0. && value->fValue < 1000000. ) {
         TQString str;
diff --git a/tdehtml/css/cssparser.h b/tdehtml/css/cssparser.h
index 0e00ebc16..de735fe3e 100644
--- a/tdehtml/css/cssparser.h
+++ b/tdehtml/css/cssparser.h
@@ -148,7 +148,7 @@ namespace DOM {
         CSSPrimitiveValueImpl *parseColorFromValue(Value* val);
         CSSValueImpl* parseCounterContent(ValueList *args, bool counters);
 
-        static bool parseColor(const TQString &name, QRgb& rgb);
+        static bool parseColor(const TQString &name, TQRgb& rgb);
 
         // CSS3 Parsing Routines (for properties specific to CSS3)
         bool parseShadow(int propId, bool important);
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 40dbcb2ec..e9517584e 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -1953,7 +1953,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl
 // color mapping code
 struct colorMap {
     int css_value;
-    QRgb color;
+    TQRgb color;
 };
 
 static const colorMap cmap[] = {
diff --git a/tdehtml/css/parser.cpp b/tdehtml/css/parser.cpp
index 6fa18f17c..f664f43cd 100644
--- a/tdehtml/css/parser.cpp
+++ b/tdehtml/css/parser.cpp
@@ -996,13 +996,17 @@ while (0)
 # define YYDPRINTF(Args)			\
 do {						\
   if (yydebug)					\
+	{ \
     YYFPRINTF Args;				\
+	} \	
 } while (0)
 
 # define YYDSYMPRINT(Args)			\
 do {						\
   if (yydebug)					\
+	{ \
     yysymprint Args;				\
+	} \	
 } while (0)
 
 # define YYDSYMPRINTF(Title, Token, Value, Location)		\
diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y
index 6d8b18e9a..236b467dd 100644
--- a/tdehtml/css/parser.y
+++ b/tdehtml/css/parser.y
@@ -634,7 +634,7 @@ element_name:
     IDENT {
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
-	QString tag = qString($1);
+	TQString tag = qString($1);
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		tag = tag.lower();
@@ -699,7 +699,7 @@ attrib_id:
 	CSSParser *p = static_cast<CSSParser *>(parser);
 	DOM::DocumentImpl *doc = p->document();
 
-	QString attr = qString($1);
+	TQString attr = qString($1);
 	if ( doc ) {
 	    if (doc->isHTMLDocument())
 		attr = attr.lower();
@@ -798,7 +798,7 @@ pseudo:
     | ':' FUNCTION INTEGER ')' {
         $$ = new CSSSelector();
         $$->match = CSSSelector::PseudoClass;
-        $$->string_arg = QString::number($3);
+        $$->string_arg = TQString::number($3);
         $$->value = domString($2);
     }
     // used by :nth-* and :lang
@@ -892,7 +892,7 @@ declaration:
 
 property:
     IDENT maybe_space {
-	QString str = qString($1);
+	TQString str = qString($1);
 	$$ = getPropertyID( str.lower().latin1(), str.length() );
     }
   ;
@@ -941,7 +941,7 @@ term:
   | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
   | STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; }
   | IDENT maybe_space {
-      QString str = qString( $1 );
+      TQString str = qString( $1 );
       $$.id = getValueID( str.lower().latin1(), str.length() );
       $$.unit = CSSPrimitiveValue::CSS_IDENT;
       $$.string = $1;
diff --git a/tdehtml/dom/css_value.cpp b/tdehtml/dom/css_value.cpp
index 4e365644a..edbf15075 100644
--- a/tdehtml/dom/css_value.cpp
+++ b/tdehtml/dom/css_value.cpp
@@ -483,7 +483,7 @@ RGBColor::RGBColor(const RGBColor &other)
     m_color = other.m_color;
 }
 
-RGBColor::RGBColor(QRgb color)
+RGBColor::RGBColor(TQRgb color)
 {
     m_color = color;
 }
diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h
index e2028feac..6e3d89717 100644
--- a/tdehtml/dom/css_value.h
+++ b/tdehtml/dom/css_value.h
@@ -596,7 +596,7 @@ public:
      * @deprecated
      */
     RGBColor(const TQColor& c) { m_color = c.rgb(); }
-    RGBColor(QRgb color);
+    RGBColor(TQRgb color);
 
     RGBColor(const RGBColor &other);
     RGBColor & operator = (const RGBColor &other);
@@ -624,9 +624,9 @@ public:
     /**
      * @internal
      */
-    QRgb color() const { return m_color; }
+    TQRgb color() const { return m_color; }
 protected:
-    QRgb m_color;
+    TQRgb m_color;
 };
 
 class RectImpl;
diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h
index 3b68eafaa..79bd26385 100644
--- a/tdehtml/dom/dom2_events.h
+++ b/tdehtml/dom/dom2_events.h
@@ -624,7 +624,7 @@ public:
      * keys below represents the allowable modifier parameters for this
      * method (note: this was not documented properly in earlier versions):
      *
-     *    Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton
+     *    TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton
      *
      * Parameters:
      *
@@ -709,7 +709,7 @@ public:
      * return false.  The list of keys below represents the allowable
      * modifier parameters for this method (warning: this was not documented
      * properly in earlier versions):
-     *    Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton
+     *    TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton
      *
      * Parameters:
      *
diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index c68eb2007..88477fe03 100644
--- a/tdehtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -28,8 +28,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char
     addColumn("Renderer");
     setSorting(-1);
     part = currentpart;
-    connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &)));
-    connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *)));
+    connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &)));
+    connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *)));
     m_nodedict.setAutoDelete(true);
 }
 
diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index 4156f083a..b79938b1a 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -26,7 +26,7 @@
 
 class DOMTreeView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
     public: 
 	DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0);
 	~DOMTreeView();
diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 82c11d308..0a0a2da47 100644
--- a/tdehtml/ecma/kjs_binding.cpp
+++ b/tdehtml/ecma/kjs_binding.cpp
@@ -50,7 +50,7 @@ Value DOMObject::get(ExecState *exec, const Identifier &p) const
   }
   catch (DOM::DOMException e) {
     // ### translate code into readable string ?
-    // ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
+    // ### oh, and s/TQString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?)
     //     and where does it appear to the user ?
     Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit());
     exec->setException( err );
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 2e08f5ea8..27fb181bb 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -210,7 +210,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
     p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid());
 
     p->setPen(palette().active().text());
-    p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr);
+    p->drawText(0,height*lineno,linenoWidth,height,TQt::AlignRight,linenoStr);
 
     TQColor bgColor;
     TQColor textColor;
@@ -232,7 +232,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw,
     p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor);
     p->setPen(textColor);
     p->drawText(linenoWidth+4,height*lineno,contentsWidth()-linenoWidth-4,height,
-		Qt::AlignLeft,m_lines[lineno]);
+		TQt::AlignLeft,m_lines[lineno]);
   }
 
   int remainingTop = height*(lastLine+1);
@@ -249,7 +249,7 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0;
 TQString SourceFile::getCode()
 {
   if (interpreter) {
-    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part());
+    TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part());
     if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) {
       Decoder *decoder = part->createDecoder();
       TQByteArray data;
@@ -333,7 +333,7 @@ EvalMultiLineEdit::EvalMultiLineEdit(TQWidget *parent)
 
 void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
 {
-    if (e->key() == Qt::Key_Return) {
+    if (e->key() == TQt::Key_Return) {
         if (hasSelectedText()) {
             m_code = selectedText();
         } else {
@@ -374,7 +374,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   TQVBoxLayout *vl = new TQVBoxLayout(mainWidget,5);
 
   // frame list & code
-  TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget);
+  TQSplitter *hsplitter = new TQSplitter(TQt::Vertical,mainWidget);
   TQSplitter *vsplitter = new TQSplitter(hsplitter);
   TQFont font(TDEGlobalSettings::fixedFont());
 
@@ -384,7 +384,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   TQWidget *contextListContainer = new TQWidget(contextContainer);
   m_contextList = new TQListBox(contextListContainer);
   m_contextList->setMinimumSize(100,200);
-  connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+  connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
 
   TQHBoxLayout *clistLayout = new TQHBoxLayout(contextListContainer);
   clistLayout->addWidget(m_contextList);
@@ -400,11 +400,11 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   TQVBoxLayout *ssdvl = new TQVBoxLayout(sourceSelDisplay);
 
   m_sourceSel = new TQComboBox(toolBar());
-  connect(m_sourceSel,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSourceSelected(int)));
+  connect(m_sourceSel,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSourceSelected(int)));
 
   m_sourceDisplay = new SourceDisplay(this,sourceSelDisplay);
   ssdvl->addWidget(m_sourceDisplay);
-  connect(m_sourceDisplay,TQT_SIGNAL(lineDoubleClicked(int)),TQT_SLOT(slotToggleBreakpoint(int)));
+  connect(m_sourceDisplay,TQ_SIGNAL(lineDoubleClicked(int)),TQ_SLOT(slotToggleBreakpoint(int)));
 
   TQValueList<int> vsplitSizes;
   vsplitSizes.insert(vsplitSizes.end(),120);
@@ -419,7 +419,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   m_evalEdit = new EvalMultiLineEdit(evalContainer);
   m_evalEdit->setWordWrap(TQMultiLineEdit::NoWrap);
   m_evalEdit->setFont(font);
-  connect(m_evalEdit,TQT_SIGNAL(returnPressed()),TQT_SLOT(slotEval()));
+  connect(m_evalEdit,TQ_SIGNAL(returnPressed()),TQ_SLOT(slotEval()));
   m_evalDepth = 0;
 
   TQVBoxLayout *evalLayout = new TQVBoxLayout(evalContainer);
@@ -443,20 +443,20 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
   m_actionCollection->setInstance(this);
 
   // Venkman use F12, KDevelop F10
-  TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12)));
-  scNext.append(KKeySequence(KKey(Qt::Key_F10)));
-  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
+  TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12)));
+  scNext.append(KKeySequence(KKey(TQt::Key_F10)));
+  m_nextAction       = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQ_SLOT(slotNext()),
 				   m_actionCollection,"next");
-  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+  m_stepAction       = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQ_SLOT(slotStep()),
 				   m_actionCollection,"step");
   // Venkman use F5, Kdevelop F9
-  TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5)));
-  scCont.append(KKeySequence(KKey(Qt::Key_F9)));
-  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
+  TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5)));
+  scCont.append(KKeySequence(KKey(TQt::Key_F9)));
+  m_continueAction   = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQ_SLOT(slotContinue()),
 				   m_actionCollection,"cont");
-  m_stopAction       = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+  m_stopAction       = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQ_SLOT(slotStop()),
 				   m_actionCollection,"stop");
-  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+  m_breakAction      = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQ_SLOT(slotBreakNext()),
 				   m_actionCollection,"breaknext");
 
 
@@ -677,8 +677,8 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e)
   case TQEvent::Close:
   case TQEvent::Quit:
     while (o->parent())
-      o = TQT_TQOBJECT(o->parent());
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
+      o = o->parent();
+    if (o == this)
       return TQWidget::eventFilter(o,e);
     else
       return true;
@@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
     return true;
 
   KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part();
-  TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart*>(part);
+  TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart*>(part);
   if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled())
     return true;
 
@@ -1048,7 +1048,7 @@ void KJSDebugWin::leaveSession()
 
 void KJSDebugWin::updateContextList()
 {
-  disconnect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+  disconnect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
 
   m_contextList->clear();
   for (int i = 0; i < m_execsCount; i++)
@@ -1060,7 +1060,7 @@ void KJSDebugWin::updateContextList()
     setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine());
   }
 
-  connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int)));
+  connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int)));
 }
 
 TQString KJSDebugWin::contextStr(const Context &ctx)
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index be6b31dda..a40b20c2f 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -94,7 +94,7 @@ namespace KJS {
   };
 
   class KJSErrorDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, bool showDebug);
     virtual ~KJSErrorDialog();
@@ -111,7 +111,7 @@ namespace KJS {
   };
 
   class EvalMultiLineEdit : public TQMultiLineEdit {
-    Q_OBJECT
+    TQ_OBJECT
   public:
       EvalMultiLineEdit(TQWidget *parent);
       const TQString & code() const { return m_code; }
@@ -122,7 +122,7 @@ namespace KJS {
   };
 
   class SourceDisplay : public TQScrollView {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name = 0);
     ~SourceDisplay();
@@ -159,7 +159,7 @@ namespace KJS {
    */
   class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance
   {
-    Q_OBJECT
+    TQ_OBJECT
     friend class SourceDisplay;
   public:
     KJSDebugWin(TQWidget *parent=0, const char *name=0);
diff --git a/tdehtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp
index 1834c5931..1f73dd9fe 100644
--- a/tdehtml/ecma/kjs_dom.cpp
+++ b/tdehtml/ecma/kjs_dom.cpp
@@ -1093,7 +1093,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List
     Window* active = Window::retrieveActive(exec);
     // Complete the URL using the "active part" (running interpreter). We do this for the security
     // check and to make sure we load exactly the same url as we have verified to be safe
-    TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(active->part());
+    TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart *>(active->part());
     if (tdehtmlpart) {
       // Security: only allow documents to be loaded from the same host
       TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string();
@@ -1279,7 +1279,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c
   case DOMDOMImplementation::CreateDocument: { // DOM2
     // Initially set the URL to document of the creator... this is so that it resides in the same
     // host/domain for security checks. The URL will be updated if Document.load() is called.
-    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part());
+    TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part());
     if (part) {
       Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2]));
       KURL url = static_cast<DocumentImpl*>(part->document().handle())->URL();
diff --git a/tdehtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp
index 35016910f..825cd4107 100644
--- a/tdehtml/ecma/kjs_events.cpp
+++ b/tdehtml/ecma/kjs_events.cpp
@@ -62,7 +62,7 @@ void JSEventListener::handleEvent(DOM::Event &evt)
   if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession())
     return;
 #endif
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part());
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part());
   KJSProxy *proxy = 0L;
   if (part)
     proxy = part->jScript();
@@ -162,7 +162,7 @@ Object JSLazyEventListener::listenerObj() const
 void JSLazyEventListener::parseCode() const
 {
   if (!parsed) {
-    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part());
+    TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part());
     KJSProxy *proxy = 0L;
     if (part)
       proxy = part->jScript();
diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index 92185d7f4..204fb46e2 100644
--- a/tdehtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -387,8 +387,8 @@ void KJSCPUGuard::start(unsigned int ms, unsigned int i_ms)
 
   oldAlarmHandler = signal(SIGVTALRM, alarmHandler);
   itimerval tv = {
-      { i_ms / 1000, (i_ms % 1000) * 1000 },
-      { ms / 1000, (ms % 1000) * 1000 }
+      { static_cast<time_t>( i_ms / 1000 ), static_cast<suseconds_t>( (i_ms % 1000) * 1000 ) },
+      { static_cast<time_t>( ms / 1000 ), static_cast<suseconds_t>( (ms % 1000) * 1000 ) }
   };
   setitimer(ITIMER_VIRTUAL, &tv, &oldtv);
 }
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index b06cb970c..96d703833 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -42,7 +42,7 @@
 #include <tdeparts/browserinterface.h>
 #include <twin.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <twinmodule.h> // schroder
 #endif
 
@@ -111,7 +111,7 @@ namespace KJS {
     TQGuardedPtr<TDEHTMLPart> part;
   };
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
   class KonquerorFunc : public DOMFunction {
   public:
     KonquerorFunc(ExecState *exec, const Konqueror* k, const char* name)
@@ -160,7 +160,7 @@ Value Screen::get(ExecState *exec, const Identifier &p) const
 
 Value Screen::getValueProperty(ExecState *exec, int token) const
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
   KWinModule info(0, KWinModule::INFO_DESKTOP);
 #endif
   TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget();
@@ -177,7 +177,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
     return Number(m.depth());
   }
   case AvailLeft: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.x()-sg.x());
 #else
@@ -185,7 +185,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
 #endif
   }
   case AvailTop: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.y()-sg.y());
 #else
@@ -193,7 +193,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
 #endif
   }
   case AvailHeight: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.height());
 #else
@@ -201,7 +201,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
 #endif
   }
   case AvailWidth: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.width());
 #else
@@ -420,7 +420,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p)
   Object obj = Object::dynamicCast( retrieve( p ) );
 #ifndef NDEBUG
   // obj should never be null, except when javascript has been disabled in that part.
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(p);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(p);
   if ( part && part->jScriptEnabled() )
   {
     assert( obj.isValid() );
@@ -447,10 +447,10 @@ Window *Window::retrieveActive(ExecState *exec)
 Value Window::retrieve(KParts::ReadOnlyPart *p)
 {
   assert(p);
-  TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(p);
+  TDEHTMLPart * part = ::tqt_cast<TDEHTMLPart *>(p);
   KJSProxy *proxy = 0L;
   if (!part) {
-    part = ::tqqt_cast<TDEHTMLPart *>(p->parent());
+    part = ::tqt_cast<TDEHTMLPart *>(p->parent());
     if (part)
       proxy = part->framejScript(p);
   } else
@@ -477,7 +477,7 @@ Location *Window::location() const
 
 ObjectImp* Window::frames( ExecState* exec ) const
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (part)
     return m_frames ? m_frames :
       (const_cast<Window*>(this)->m_frames = new FrameArray(exec, part));
@@ -515,7 +515,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const
   if (Lookup::findEntry(&WindowTable, p))
     return true;
 
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
       return false;
 
@@ -584,7 +584,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
   }
 
   const HashEntry* entry = Lookup::findEntry(&WindowTable, p);
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
 
   // properties that work on all windows
   if (entry) {
@@ -848,7 +848,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
       const_cast<Window *>(this)->put(exec, "clientInformation", nav, DontDelete|ReadOnly|Internal);
       return nav;
     }
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
     case _Konqueror: {
       Value k( new Konqueror(part) );
       const_cast<Window *>(this)->put(exec, "konqueror", k, DontDelete|ReadOnly|Internal);
@@ -860,7 +860,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case OuterHeight:
     case OuterWidth:
     {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
       if (!part->widget())
         return Number(0);
       KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId());
@@ -1084,7 +1084,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v
     default:
       break;
     }
-    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+    TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
     if (part) {
     switch( entry->value ) {
     case Status: {
@@ -1221,7 +1221,7 @@ bool Window::toBoolean(ExecState *) const
 
 DOM::AbstractView Window::toAbstractView() const
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
     return DOM::AbstractView();
   return part->document().defaultView();
@@ -1231,7 +1231,7 @@ void Window::scheduleClose()
 {
   kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl;
   Q_ASSERT(winq);
-  TQTimer::singleShot( 0, winq, TQT_SLOT( timeoutClose() ) );
+  TQTimer::singleShot( 0, winq, TQ_SLOT( timeoutClose() ) );
 }
 
 void Window::closeNow()
@@ -1239,7 +1239,7 @@ void Window::closeNow()
   if (m_frame.isNull() || m_frame->m_part.isNull()) {
     kdDebug(6070) << k_funcinfo << "part is deleted already" << endl;
   } else {
-    TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+    TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
     if (!part) {
       kdDebug(6070) << "closeNow on non TDEHTML part" << endl;
     } else {
@@ -1287,7 +1287,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
    if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem.
      return true;
 
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
     return true; // not a TDEHTMLPart
 
@@ -1300,7 +1300,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
     return false;
   }
 
-  TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast<TDEHTMLPart *>(activePart);
+  TDEHTMLPart *activeTDEHTMLPart = ::tqt_cast<TDEHTMLPart *>(activePart);
   if (!activeTDEHTMLPart)
     return true; // not a TDEHTMLPart
 
@@ -1326,7 +1326,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const
 
 void Window::setListener(ExecState *exec, int eventId, Value func)
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part || !isSafeScript(exec))
     return;
   DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle());
@@ -1338,7 +1338,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func)
 
 Value Window::getListener(ExecState *exec, int eventId) const
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part || !isSafeScript(exec))
     return Undefined();
   DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle());
@@ -1356,7 +1356,7 @@ Value Window::getListener(ExecState *exec, int eventId) const
 JSEventListener *Window::getJSEventListener(const Value& val, bool html)
 {
   // This function is so hot that it's worth coding it directly with imps.
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part || val.type() != ObjectType)
     return 0;
 
@@ -1432,8 +1432,8 @@ void Window::setCurrentEvent( DOM::Event *evt )
 void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory)
 {
   Window* active = Window::retrieveActive(exec);
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
-  TDEHTMLPart *active_part = ::tqqt_cast<TDEHTMLPart *>(active->part());
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *active_part = ::tqt_cast<TDEHTMLPart *>(active->part());
   // Complete the URL using the "active part" (running interpreter)
   if (active_part && part) {
     if (url[0] == TQChar('#')) {
@@ -1469,7 +1469,7 @@ void Window::delayedGoHistory( int steps )
 
 void Window::goHistory( int steps )
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if(!part)
       // TODO history readonlypart
     return;
@@ -1487,7 +1487,7 @@ void Window::goHistory( int steps )
 
 void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if(!part)
       // TODO resizeTo readonlypart
     return;
@@ -1530,7 +1530,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
 
 Value Window::openWindow(ExecState *exec, const List& args)
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
   if (!part)
     return Undefined();
   TDEHTMLView *widget = part->view();
@@ -1543,7 +1543,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
   KURL url;
   if (!str.isEmpty())
   {
-    TDEHTMLPart* p = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part);
+    TDEHTMLPart* p = ::tqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part);
     if ( p )
       url = p->htmlDocument().completeURL(str).string();
     if ( !p ||
@@ -1601,7 +1601,7 @@ Value Window::openWindow(ExecState *exec, const List& args)
 
 Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features)
 {
-    TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part);
+    TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part);
     TDEHTMLView *widget = p->view();
     KParts::WindowArgs winargs;
 
@@ -1702,7 +1702,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
     // request window (new or existing if framename is set)
     KParts::ReadOnlyPart *newPart = 0L;
     emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart);
-    if (newPart && ::tqqt_cast<TDEHTMLPart*>(newPart)) {
+    if (newPart && ::tqt_cast<TDEHTMLPart*>(newPart)) {
       TDEHTMLPart *tdehtmlpart = static_cast<TDEHTMLPart*>(newPart);
       //tqDebug("opener set to %p (this Window's part) in new Window %p  (this Window=%p)",part,win,window);
       tdehtmlpart->setOpener(p);
@@ -1734,7 +1734,7 @@ void Window::forgetSuppressedWindows()
 
 void Window::showSuppressedWindows()
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>( m_frame->m_part );
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>( m_frame->m_part );
   KJS::Interpreter *interpreter = part->jScript()->interpreter();
   ExecState *exec = interpreter->globalExec();
 
@@ -1759,7 +1759,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
   Window *window = static_cast<Window *>(thisObj.imp());
   TQString str, str2;
 
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(window->m_frame->m_part);
   if (!part)
     return Undefined();
 
@@ -2113,7 +2113,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte
 
 bool ScheduledAction::execute(Window *window)
 {
-  TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part);
+  TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(window->m_frame->m_part);
   if (!part || !part->jScriptEnabled())
     return false;
   ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter());
@@ -2169,8 +2169,8 @@ WindowQObject::WindowQObject(Window *w)
   if ( !parent->m_frame )
       kdDebug(6070) << "WARNING: null part in " << k_funcinfo << endl;
   else
-      connect( parent->m_frame, TQT_SIGNAL( destroyed() ),
-               this, TQT_SLOT( parentDestroyed() ) );
+      connect( parent->m_frame, TQ_SIGNAL( destroyed() ),
+               this, TQ_SLOT( parentDestroyed() ) );
   pausedTime = 0;
   lastTimerId = 0;
   currentlyDispatching = false;
@@ -2304,16 +2304,16 @@ void WindowQObject::timerEvent(TQTimerEvent *)
 DateTimeMS DateTimeMS::addMSecs(int s) const
 {
   DateTimeMS c = *this;
-  c.mTime = TQT_TQTIME_OBJECT(mTime.addMSecs(s));
+  c.mTime = mTime.addMSecs(s);
   if (s > 0)
   {
     if (c.mTime < mTime)
-      c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(1));
+      c.mDate = mDate.addDays(1);
   }
   else
   {
     if (c.mTime > mTime)
-      c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(-1));
+      c.mDate = mDate.addDays(-1);
   }
   return c;
 }
@@ -2589,7 +2589,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att
     TQString str = v.toString(exec).qstring();
     switch (entry->value) {
     case Href: {
-      TDEHTMLPart* p =::tqqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part());
+      TDEHTMLPart* p =::tqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part());
       if ( p )
         url = p->htmlDocument().completeURL( str ).string();
       else
@@ -2680,7 +2680,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
             id == Location::Replace);
     break;
   case Location::Reload: {
-    TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(part);
+    TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart *>(part);
     if (tdehtmlpart)
       tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/);
     else
@@ -2865,7 +2865,7 @@ Value HistoryFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
 
 const ClassInfo Konqueror::info = { "Konqueror", 0, 0, 0 };
 
diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 3af34d87b..539131fd5 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -246,7 +246,7 @@ namespace KJS {
   };
 
   class KDE_EXPORT WindowQObject : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     WindowQObject(Window *w);
     ~WindowQObject();
@@ -288,7 +288,7 @@ namespace KJS {
     TQGuardedPtr<tdehtml::ChildFrame> m_frame;
   };
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
   class Konqueror : public ObjectImp {
     friend class KonquerorFunc;
   public:
diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp
index 410fd1992..d5937e9a0 100644
--- a/tdehtml/ecma/xmlhttprequest.cpp
+++ b/tdehtml/ecma/xmlhttprequest.cpp
@@ -420,17 +420,17 @@ void XMLHttpRequest::send(const TQString& _body)
     return;
   }
 
-  qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-		    TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  qObject->connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+		    TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
 #ifdef APPLE_CHANGES
-  qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
-		    TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
+  qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const char*, int ) ),
+		    TQ_SLOT( slotData( TDEIO::Job*, const char*, int ) ) );
 #else
-  qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-		    TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+		    TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
 #endif
-  qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
-		    TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
+  qObject->connect( job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+		    TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
 
 #ifdef APPLE_CHANGES
   KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job);
@@ -724,7 +724,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L
       }
 
       TQString method = args[0].toString(exec).qstring();
-      TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part());
+      TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part());
       if (!part)
         return Undefined();
       KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string());
diff --git a/tdehtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h
index d1b304f30..7d3934152 100644
--- a/tdehtml/ecma/xmlhttprequest.h
+++ b/tdehtml/ecma/xmlhttprequest.h
@@ -122,7 +122,7 @@ namespace KJS {
 
 
   class XMLHttpRequestQObject : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     XMLHttpRequestQObject(XMLHttpRequest *_jsObject);
diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h
index f47d28bb2..c587e0302 100644
--- a/tdehtml/html/Platform.h
+++ b/tdehtml/html/Platform.h
@@ -193,9 +193,7 @@
 
 /* for Unicode, KDE uses Qt, everything else uses ICU */
 #if PLATFORM(KDE) || PLATFORM(QT)
-#define WTF_USE_QT4_UNICODE 1
-#elif PLATFORM(SYMBIAN)
-#define WTF_USE_SYMBIAN_UNICODE 1
+#define WTF_USE_QT3_UNICODE 1
 #else
 #define WTF_USE_ICU_UNICODE 1
 #endif
diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp
index 16ca7a23b..e8150a387 100644
--- a/tdehtml/html/html_baseimpl.cpp
+++ b/tdehtml/html/html_baseimpl.cpp
@@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const
 
     RenderPart* render = static_cast<RenderPart*>( m_render );
 
-    if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+    if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) )
         return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl();
 
     return 0;
@@ -426,7 +426,7 @@ TDEHTMLPart*   HTMLFrameElementImpl::contentPart() const
 
     RenderPart* render = static_cast<RenderPart*>( m_render );
 
-    if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) )
+    if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) )
         return static_cast<TDEHTMLView*>( render->widget() )->part();
 
     return 0;
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index 52ada7a7b..c27573844 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -78,13 +78,13 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHT
     m_doAutoFill = false;
 
 /* dynamic history stuff to be fixed later (pfeiffer)
-    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )),
-             TQT_SLOT( slotHistoryChanged() ));
+    connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( removed( const TQString& )),
+             TQ_SLOT( slotHistoryChanged() ));
 */
-    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ),
-             TQT_SLOT( slotHistoryChanged() ));
-    connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()),
-             TQT_SLOT( slotHistoryChanged() ));
+    connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( inserted( const TQString& ) ),
+             TQ_SLOT( slotHistoryChanged() ));
+    connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( cleared()),
+             TQ_SLOT( slotHistoryChanged() ));
 }
 
 HTMLDocumentImpl::~HTMLDocumentImpl()
diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 92f163076..f7191f31a 100644
--- a/tdehtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -43,7 +43,7 @@ namespace DOM {
 
 class HTMLDocumentImpl : public DOM::DocumentImpl
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
     ~HTMLDocumentImpl();
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 5dc44ad04..f87260ffe 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -957,14 +957,14 @@ bool HTMLGenericFormElementImpl::isFocusable() const
 	return false;
 
     TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget();
-    return widget && widget->focusPolicy() >= TQ_TabFocus;
+    return widget && widget->focusPolicy() >= TQWidget::TabFocus;
 }
 
 class FocusHandleWidget : public TQWidget
 {
 public:
     void focusNextPrev(bool n) {
-        if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING))
+        if (!focusNextPrevChild(n) && inherits("TQTextEdit"))
             TQWidget::focusNextPrevChild(n);
     }
 };
@@ -1018,19 +1018,13 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt)
 	    // handle tabbing out, either from a single or repeated key event.
 	    if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) {
 	        TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-	        if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
+	        if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) {
 		    TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget();
-#ifdef USE_QT4
+		    TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
 		    if (widget)
                         static_cast<FocusHandleWidget *>(widget)
-			    ->focusNextPrev(k->key() == Qt::Key_Tab);
-#else // USE_QT4
-		    TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab );
-		    if (widget)
-                        static_cast<FocusHandleWidget *>(widget)
-			    ->focusNextPrev(k->key() == Qt::Key_Tab);
+			    ->focusNextPrev(k->key() == TQt::Key_Tab);
 		    TQFocusEvent::resetReason();
-#endif // USE_QT4
                     evt->setDefaultHandled();
 	        }
             }
@@ -1125,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt)
 	bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
 	if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
 	    TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-	    if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+	    if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
 		act = true;
 	}
 	if (act)
@@ -1149,7 +1143,7 @@ void HTMLButtonElementImpl::activate()
 
 void HTMLButtonElementImpl::click()
 {
-    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
 
@@ -1365,7 +1359,7 @@ void HTMLInputElementImpl::select(  )
 
 void HTMLInputElementImpl::click()
 {
-    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
     dispatchMouseEvent(&me,0, 1);
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
@@ -1807,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt)
 	    bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT);
 	    if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) {
 		TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-		if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+		if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
 		    act = true;
 	    }
 	    if (act)
@@ -1923,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt)
 	else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT ||
 	                                        evt->id() == EventImpl::KEYPRESS_EVENT ) ) {
 	    TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent();
-	    if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space))
+	    if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space))
 		act = true;
 	}
 
diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp
index f403a2385..1416ca3f4 100644
--- a/tdehtml/html/html_inlineimpl.cpp
+++ b/tdehtml/html/html_inlineimpl.cpp
@@ -132,11 +132,11 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
                     state |= TQt::MetaButton;
 
                 if ( e->button() == 0 )
-                    button = Qt::LeftButton;
+                    button = TQt::LeftButton;
                 else if ( e->button() == 1 )
-                    button = Qt::MidButton;
+                    button = TQt::MidButton;
                 else if ( e->button() == 2 )
-                    button = Qt::RightButton;
+                    button = TQt::RightButton;
             }
 	    else if ( k )
 	    {
@@ -166,7 +166,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
 
 void HTMLAnchorElementImpl::click()
 {
-    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0);
+    TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0);
     dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1);
 }
 
diff --git a/tdehtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp
index 58804bff5..5b8d4ef4b 100644
--- a/tdehtml/html/html_miscimpl.cpp
+++ b/tdehtml/html/html_miscimpl.cpp
@@ -64,7 +64,6 @@ struct CollectionCache: public NodeListImpl::Cache
     virtual void clear(DocumentImpl* doc)
     {
         Cache::clear(doc);
-        //qDeletaAll here in Qt4
         nameCache.clear();
     }
 };
diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index f2cf8c1db..8c530af61 100644
--- a/tdehtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -136,7 +136,7 @@ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch )
 void HTMLObjectBaseElementImpl::renderAlternative()
 {
     if ( m_renderAlternative ) return;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotRenderAlternative() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotRenderAlternative() ) );
 }
 
 void HTMLObjectBaseElementImpl::slotRenderAlternative()
@@ -267,7 +267,7 @@ void HTMLAppletElementImpl::attach()
 {
     TDEHTMLView* w = getDocument()->view();
 
-#ifndef Q_WS_QWS // FIXME?
+#ifndef TQ_WS_QWS // FIXME?
     DOMString codeBase = getAttribute( ATTR_CODEBASE );
     DOMString code = getAttribute( ATTR_CODE );
     if ( !codeBase.isEmpty() )
@@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const
     if ( !m_render ) return 0;
     if ( !m_render->isWidget() ) return 0;
     TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget();
-    if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) )
+    if( widget && ::tqt_cast<TDEHTMLView*>( widget ) )
         return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl();
     return 0;
 }
diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index d10e66356..2818330e0 100644
--- a/tdehtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -38,7 +38,7 @@ class DOMStringImpl;
 
 class HTMLObjectBaseElementImpl : public TQObject, public HTMLElementImpl
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTMLObjectBaseElementImpl(DocumentImpl *doc);
 
diff --git a/tdehtml/htmlpageinfo.ui b/tdehtml/htmlpageinfo.ui
index 2315771ae..7f3816b8f 100644
--- a/tdehtml/htmlpageinfo.ui
+++ b/tdehtml/htmlpageinfo.ui
@@ -286,16 +286,12 @@
     <tabstop>_headers</tabstop>
 </tabstops>
 <includes>
+    <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
     <include location="global" impldecl="in declaration">tqlabel.h</include>
-    <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="global" impldecl="in declaration">tqlistview.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tdehtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h
index bb4b20890..dd13100f7 100644
--- a/tdehtml/java/kjavaapplet.h
+++ b/tdehtml/java/kjavaapplet.h
@@ -48,7 +48,7 @@ class KJavaAppletPrivate;
 
 class KJavaApplet : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     // states describing the life cycle of an applet.
diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index b644b67ca..6d8af4667 100644
--- a/tdehtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -54,7 +54,7 @@ KJavaAppletContext::KJavaAppletContext()
 {
     d = new KJavaAppletContextPrivate;
     server = KJavaAppletServer::allocateJavaServer();
-    connect(server->javaProcess(), TQT_SIGNAL(exited(int)), this, TQT_SLOT(javaProcessExited(int)));
+    connect(server->javaProcess(), TQ_SIGNAL(exited(int)), this, TQ_SLOT(javaProcessExited(int)));
 
     id = contextCount;
     server->createContext( id, this );
diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h
index 166c00f15..2ce7585ee 100644
--- a/tdehtml/java/kjavaappletcontext.h
+++ b/tdehtml/java/kjavaappletcontext.h
@@ -42,7 +42,7 @@ class KJavaAppletContextPrivate;
 
 class KJavaAppletContext : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KJavaAppletContext();
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 23e805577..640473489 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -136,8 +136,8 @@ KJavaAppletServer::KJavaAppletServer()
     d = new KJavaAppletServerPrivate;
     process = new KJavaProcess();
 
-    connect( process, TQT_SIGNAL(received(const TQByteArray&)),
-             this,    TQT_SLOT(slotJavaRequest(const TQByteArray&)) );
+    connect( process, TQ_SIGNAL(received(const TQByteArray&)),
+             this,    TQ_SLOT(slotJavaRequest(const TQByteArray&)) );
 
     setupJava( process );
 
@@ -198,7 +198,7 @@ void KJavaAppletServer::freeJavaServer()
         if( config.readBoolEntry( "ShutdownAppletServer", true )  )
         {
             const int value = config.readNumEntry( "AppletServerTimeout", 60 );
-            TQTimer::singleShot( value*1000, self, TQT_SLOT( checkShutdown() ) );
+            TQTimer::singleShot( value*1000, self, TQ_SLOT( checkShutdown() ) );
         }
     }
 }
@@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb )
                     KSSLCertChain chain;
                     chain.setChain( certs );
                     if ( chain.isValid() )
-                        answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] );
+                        answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] );
                 }
             }
             sl.push_front( TQString(answer) );
@@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent )
 {}
 
 TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) {
-    TQGuardedPtr<TQDialog> dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog");
+    TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog");
 
     dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) );
     dialog->setModal( true );
@@ -810,10 +810,10 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
     dialog->resize( dialog->minimumSizeHint() );
     //clearWState( WState_Polished );
 
-    connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
-    connect( reject, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
-    connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
-    connect( grant, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
+    connect( no, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+    connect( reject, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+    connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
+    connect( grant, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) );
 
     dialog->exec();
     delete dialog;
@@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog()
 
 void PermissionDialog::clicked()
 {
-    m_button = TQT_TQOBJECT_CONST(sender())->name();
+    m_button = sender()->name();
     static_cast<const TQWidget*>(sender())->parentWidget()->close();
 }
 
diff --git a/tdehtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h
index 5b82e01a1..ec8a7ed01 100644
--- a/tdehtml/java/kjavaappletserver.h
+++ b/tdehtml/java/kjavaappletserver.h
@@ -39,7 +39,7 @@ class JSStackFrame;
 
 class KJavaAppletServer : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     /**
@@ -161,7 +161,7 @@ private:
 
 class PermissionDialog : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PermissionDialog( TQWidget* );
     ~PermissionDialog();
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index f80690aa9..5a00e14eb 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -79,7 +79,7 @@ public:
     void setServer (KJavaAppletServer * s);
     TQGuardedPtr <KJavaAppletServer> server;
 private:
-    typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> >
+    typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> >
             ContextMap;
     ContextMap m_contextmap;
 };
@@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *,
     setInstance (KJavaAppletViewerFactory::instance ());
     KParts::Part::setWidget (m_view);
 
-    connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded()));
-    connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&)));
-    connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &)));
-    connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &)));
+    connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded()));
+    connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&)));
+    connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &)));
+    connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &)));
 }
 
 bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
@@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) {
 
 KJavaAppletViewer::~KJavaAppletViewer () {
     m_view = 0L;
-    serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl);
+    serverMaintainer->releaseContext (parent(), baseurl);
     if (m_statusbar_icon) {
         m_statusbar->removeStatusBarItem (m_statusbar_icon);
         delete m_statusbar_icon;
@@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
     if (applet->size().width() > 0 || m_view->isVisible())
         w->showApplet ();
     else
-        TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ()));
+        TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ()));
     if (!applet->failed ())
         emit started (0L);
     return url.isValid ();
diff --git a/tdehtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h
index bb1d6e921..e00839d49 100644
--- a/tdehtml/java/kjavaappletviewer.h
+++ b/tdehtml/java/kjavaappletviewer.h
@@ -43,7 +43,7 @@ class TDEConfig;
 class CoverWidget;
 
 class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletViewerBrowserExtension (KJavaAppletViewer *parent);
     void urlChanged (const TQString & url);
@@ -57,7 +57,7 @@ public slots:
 };
 
 class KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletViewerLiveConnectExtension(KJavaAppletViewer * parent);
 
@@ -78,7 +78,7 @@ private:
 };
 
 class KJavaAppletViewer : public KParts::ReadOnlyPart {
-    Q_OBJECT
+    TQ_OBJECT
 public: 
     KJavaAppletViewer (TQWidget * wparent, const char * wname,
               TQObject * parent, const char * name, const TQStringList &args);
@@ -116,7 +116,7 @@ private:
 };
 
 class KJavaAppletViewerFactory : public KParts::Factory {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletViewerFactory ();
     virtual ~KJavaAppletViewerFactory ();
@@ -130,7 +130,7 @@ private:
 };
 
 class AppletParameterDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AppletParameterDialog (KJavaAppletWidget * parent);
 protected slots:
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index a1f5b8f11..83485019c 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -46,11 +46,11 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name )
 
     m_applet = new KJavaApplet( this );
     d        = new KJavaAppletWidgetPrivate;
-    m_kwm    = new KWinModule( TQT_TQOBJECT(this) );
+    m_kwm    = new KWinModule( this );
 
     d->tmplabel = new TQLabel( this );
     d->tmplabel->setText( KJavaAppletServer::getAppletLabel() );
-    d->tmplabel->setAlignment( Qt::AlignCenter | TQt::WordBreak );
+    d->tmplabel->setAlignment( TQt::AlignCenter | TQt::WordBreak );
     d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
     d->tmplabel->show();
 
@@ -66,8 +66,8 @@ KJavaAppletWidget::~KJavaAppletWidget()
 
 void KJavaAppletWidget::showApplet()
 {
-    connect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ),
-	         this,  TQT_SLOT( setWindow( WId ) ) );
+    connect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ),
+	         this,  TQ_SLOT( setWindow( WId ) ) );
 
     m_kwm->doNotManage( m_swallowTitle );
 
@@ -89,8 +89,8 @@ void KJavaAppletWidget::setWindow( WId w )
         d->tmplabel = 0;
 
         // disconnect from KWM events
-        disconnect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ),
-                    this,  TQT_SLOT( setWindow( WId ) ) );
+        disconnect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ),
+                    this,  TQ_SLOT( setWindow( WId ) ) );
 
 
         embed( w );
diff --git a/tdehtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h
index 872188769..4912af125 100644
--- a/tdehtml/java/kjavaappletwidget.h
+++ b/tdehtml/java/kjavaappletwidget.h
@@ -23,7 +23,7 @@
 #define KJAVAAPPLETWIDGET_H
 
 #include <tqwidget.h>
-#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded
+#ifndef TQ_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded
 #include "java/kjavaappletcontext.h"
 #include "java/kjavaapplet.h"
 #include <qxembed.h>
@@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate;
 
 class KJavaAppletWidget : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletWidget( TQWidget* parent=0, const char* name=0 );
 
diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp
index 5b1c55324..b58465d7f 100644
--- a/tdehtml/java/kjavadownloader.cpp
+++ b/tdehtml/java/kjavadownloader.cpp
@@ -81,14 +81,14 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url )
 
     d->job = TDEIO::get( *d->url, false, false );
     d->job->addMetaData("PropagateHttpHeader", "true");
-    connect( d->job,  TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
-             this,    TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
-    connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)),
-             this, TQT_SLOT(slotConnected(TDEIO::Job*)));
-    connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
-             this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
-    connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
-             this,   TQT_SLOT(slotResult(TDEIO::Job*)) );
+    connect( d->job,  TQ_SIGNAL(data( TDEIO::Job*, const TQByteArray& )),
+             this,    TQ_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) );
+    connect( d->job, TQ_SIGNAL(connected(TDEIO::Job*)),
+             this, TQ_SLOT(slotConnected(TDEIO::Job*)));
+    connect( d->job, TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString&)),
+             this, TQ_SLOT(slotMimetype(TDEIO::Job*, const TQString&)));
+    connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)),
+             this,   TQ_SLOT(slotResult(TDEIO::Job*)) );
 }
 
 KJavaDownloader::~KJavaDownloader()
@@ -215,10 +215,10 @@ void KJavaUploader::start()
     // create a suspended job
     d->job = TDEIO::put( *d->url, -1, false, false, false );
     d->job->suspend();
-    connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
-            this,   TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
-    connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)),
-            this,   TQT_SLOT(slotResult(TDEIO::Job*)) );
+    connect( d->job, TQ_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )),
+            this,   TQ_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) );
+    connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)),
+            this,   TQ_SLOT(slotResult(TDEIO::Job*)) );
     server->sendURLData( d->loaderID, CONNECTED, d->file );
     KJavaAppletServer::freeJavaServer();
 }
diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index 4e3b893e8..eb9765769 100644
--- a/tdehtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
@@ -42,7 +42,7 @@ class KJavaUploaderPrivate;
 
 class KJavaTDEIOJob : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     virtual ~KJavaTDEIOJob();
     virtual void jobCommand( int cmd ) = 0;
@@ -51,7 +51,7 @@ public:
 
 class KJavaDownloader : public KJavaTDEIOJob
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KJavaDownloader( int ID, const TQString& url );
@@ -71,7 +71,7 @@ private:
 
 class KJavaUploader : public KJavaTDEIOJob
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KJavaUploader( int ID, const TQString& url );
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 6b505c343..7f3a93e0a 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -54,12 +54,12 @@ KJavaProcess::KJavaProcess() : TDEProcess()
 
     javaProcess = this; //new TDEProcess();
 
-    connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
-             this, TQT_SLOT( slotWroteData() ) );
-    connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
-             this, TQT_SLOT( slotReceivedData(int, int&) ) );
-    connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ),
-             this, TQT_SLOT( slotExited (TDEProcess *) ) );
+    connect( javaProcess, TQ_SIGNAL( wroteStdin( TDEProcess * ) ),
+             this, TQ_SLOT( slotWroteData() ) );
+    connect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ),
+             this, TQ_SLOT( slotReceivedData(int, int&) ) );
+    connect( javaProcess, TQ_SIGNAL( processExited (TDEProcess *) ),
+             this, TQ_SLOT( slotExited (TDEProcess *) ) );
 
     d->jvmPath = "java";
     d->mainClass = "-help";
@@ -319,8 +319,8 @@ bool KJavaProcess::invokeJVM()
 void KJavaProcess::killJVM()
 {
    d->processKilled = true;
-   disconnect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
-               this, TQT_SLOT( slotReceivedData(int, int&) ) );
+   disconnect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ),
+               this, TQ_SLOT( slotReceivedData(int, int&) ) );
    javaProcess->kill();
 }
 
diff --git a/tdehtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h
index a479b8128..4e00d4080 100644
--- a/tdehtml/java/kjavaprocess.h
+++ b/tdehtml/java/kjavaprocess.h
@@ -37,9 +37,9 @@
  */
 
 class KJavaProcessPrivate;
-class KJavaProcess : public TDEProcess //QObject
+class KJavaProcess : public TDEProcess //TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     /**
@@ -110,7 +110,7 @@ public:
 
     /**
      * Sends a command to the KJAS Applet Server by building a QByteArray
-     * out of the data, and then writes it standard out.  It adds each QString
+     * out of the data, and then writes it standard out.  It adds each TQString
      * in the arg list, and then adds the data array.
      */
     void send( char cmd_code, const TQStringList& args, const TQByteArray& data );
diff --git a/tdehtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui
index da653c016..78d33aa8c 100644
--- a/tdehtml/kjserrordlg.ui
+++ b/tdehtml/kjserrordlg.ui
@@ -118,16 +118,14 @@
 <includes>
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include>
+    <include location="global" impldecl="in implementation">kactivelabel.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>init()</slot>
     <slot>addError( const TQString &amp; error )</slot>
     <slot>setURL( const TQString &amp; url )</slot>
     <slot>clear()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/tdehtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt
index 0babd6567..fbef060b7 100644
--- a/tdehtml/misc/CMakeLists.txt
+++ b/tdehtml/misc/CMakeLists.txt
@@ -38,4 +38,5 @@ set( ${target}_SRCS
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
   SOURCES ${${target}_SRCS}
+  LINK ${JPEG_LIBRARIES}
 )
diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp
index b5191c7ca..6b9e06a14 100644
--- a/tdehtml/misc/helper.cpp
+++ b/tdehtml/misc/helper.cpp
@@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal)
 // explanation available at http://en.wikipedia.org/wiki/HSL_color_space
 
 // all values are in the range of 0 to 1.0
-QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
+TQRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a)
 {
     double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s;
     double temp1 = 2.0 * l - temp2;
diff --git a/tdehtml/misc/helper.h b/tdehtml/misc/helper.h
index 10ffb8035..2433c9284 100644
--- a/tdehtml/misc/helper.h
+++ b/tdehtml/misc/helper.h
@@ -32,15 +32,15 @@ class TQPainter;
 namespace tdehtml
 {
     class RenderObject;
-     const QRgb transparentColor = 0x00000000;
-     const QRgb invertedColor    = 0x00000002;
+     const TQRgb transparentColor = 0x00000000;
+     const TQRgb invertedColor    = 0x00000002;
 
     extern TQPainter *printpainter;
     void setPrintPainter( TQPainter *printer );
     
     bool hasSufficientContrast(const TQColor &c1, const TQColor &c2);
     TQColor retrieveBackgroundColor(const RenderObject *obj);
-    QRgb tqRgbaFromHsla(double h, double s, double l, double a);
+    TQRgb tqRgbaFromHsla(double h, double s, double l, double a);
 
     //enumerator for findSelectionNode
     enum FindSelectionResult { SelectionPointBefore,
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index b8b94cd6b..aefa73192 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -157,7 +157,11 @@ bool KNSPluginInstallEngine::findPlugin()
 
     // get system infos
     // TODO/FIX : correct this to work with x86-64 machines
+#ifdef Q_OS_SOLARIS
+    struct utsname sysinfo;
+#else /* default */
     utsname sysinfo;
+#endif /* default */
     if(uname(&sysinfo))
         return false;
     TQString sysname(sysinfo.sysname);
@@ -234,8 +238,8 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info)
     // start the download job
     m_downloadJob  = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false );
     // connect signals 
-    connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
-    connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) );
+    connect(m_downloadJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long)));
+    connect(m_downloadJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDownloadResult(TDEIO::Job *)) );
     kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl;
 } 
 
@@ -280,8 +284,8 @@ void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job)
            urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) );
         }
        m_installFileJob  = TDEIO::copy(urlList , destURL, false );
-       connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
-       connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) );
+       connect(m_installFileJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long)));
+       connect(m_installFileJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)) );
     }
     kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl;
 
@@ -308,10 +312,10 @@ void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job)
        m_scanProc->addArgument( "nspluginscan" );
        m_scanProc->addArgument( "--verbose" );
 
-       connect( m_scanProc, TQT_SIGNAL(readyReadStdout()),
-               this, TQT_SLOT(readScanProcFromStdout()) );
-       connect( m_scanProc, TQT_SIGNAL(processExited()),
-               this, TQT_SLOT(endScanProc()) );
+       connect( m_scanProc, TQ_SIGNAL(readyReadStdout()),
+               this, TQ_SLOT(readScanProcFromStdout()) );
+       connect( m_scanProc, TQ_SIGNAL(processExited()),
+               this, TQ_SLOT(endScanProc()) );
        if ( !m_scanProc->start() ) {
             emit installFailed();
        }
@@ -422,7 +426,7 @@ void KNSPluginWizard::initLicencePage()
     addPage (m_licenceVBox, i18n("Plugin licence"));
 
 
-    connect(buttonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAgreementClicked(int)));
+    connect(buttonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAgreementClicked(int)));
 }
 
 void KNSPluginWizard::initInstallationProgressPage() {
@@ -482,9 +486,9 @@ void KNSPluginWizard::initPagesButtonStates()
 
 
 void KNSPluginWizard::connectSignals() {
-    connect(&m_installEngine, TQT_SIGNAL(installProgress(int)), m_installationProgressBar, TQT_SLOT(setProgress(int)) );
-    connect(&m_installEngine, TQT_SIGNAL(installCompleted()), this, TQT_SLOT(slotInstallationCompleted()) );
-     connect(&m_installEngine, TQT_SIGNAL(installFailed()), this, TQT_SLOT(slotInstallationFailed()) );
+    connect(&m_installEngine, TQ_SIGNAL(installProgress(int)), m_installationProgressBar, TQ_SLOT(setProgress(int)) );
+    connect(&m_installEngine, TQ_SIGNAL(installCompleted()), this, TQ_SLOT(slotInstallationCompleted()) );
+     connect(&m_installEngine, TQ_SIGNAL(installFailed()), this, TQ_SLOT(slotInstallationFailed()) );
      
 
 }
diff --git a/tdehtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h
index f8caedf92..a77630c19 100644
--- a/tdehtml/misc/knsplugininstaller.h
+++ b/tdehtml/misc/knsplugininstaller.h
@@ -89,7 +89,7 @@ private:
  */
 class KNSPluginInstallEngine : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /*
@@ -171,7 +171,7 @@ private slots:
  */
 class KNSPluginWizard : public KWizard
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
         
     /**
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index 7621b5e4f..50525c342 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -786,10 +786,10 @@ void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnima
         imgSource->cleanBuffer();
         delete p;
         p = new TQPixmap(m->framePixmap());
-        m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
-        m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) ));
-        m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
-        TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie()));
+        m->disconnectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) ));
+        m->disconnectStatus( this, TQ_SLOT( movieStatus( int ) ));
+        m->disconnectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) );
+        TQTimer::singleShot(0, this, TQ_SLOT( deleteMovie()));
         imgSource = 0;
     }
 }
@@ -849,9 +849,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof )
         {
             imgSource = new ImageSource( _buffer.buffer());
             m = new TQMovie( imgSource, 8192 );
-            m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) ));
-            m->connectStatus( this, TQT_SLOT( movieStatus(int)));
-            m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) );
+            m->connectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) ));
+            m->connectStatus( this, TQ_SLOT( movieStatus(int)));
+            m->connectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) );
         }
     }
 
@@ -1128,7 +1128,7 @@ Loader::Loader() : TQObject()
 {
     m_requestsPending.setAutoDelete( true );
     m_requestsLoading.setAutoDelete( true );
-    connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( servePendingRequests() ) );
+    connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( servePendingRequests() ) );
 }
 
 void Loader::load(DocLoader* dl, CachedObject *object, bool incremental)
@@ -1171,9 +1171,9 @@ void Loader::servePendingRequests()
             }
         }
 
-        connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) );
-        connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
-                 TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
+        connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished( TDEIO::Job * ) ) );
+        connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+                 TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
 
         if ( req->object->schedule() )
             TDEIO::Scheduler::scheduleJob( job );
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index c60c13a98..e340b3023 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -255,7 +255,7 @@ namespace tdehtml
      */
     class CachedImage : public TQObject, public CachedObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept);
 	virtual ~CachedImage();
@@ -317,7 +317,7 @@ namespace tdehtml
         TQPixmap* p;
 	TQPixmap* scaled;
 	TQPixmap* bg;
-        QRgb bgColor;
+        TQRgb bgColor;
         TQSize bgSize;
         mutable TQPixmap* pixPart;
 
@@ -407,7 +407,7 @@ namespace tdehtml
      */
     class Loader : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
 
     public:
 	Loader();
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index eb9762897..6f60c90e6 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -32,7 +32,7 @@
 
 #include <tqlabel.h>
 
-#ifndef Q_WS_QWS // We don't have Java in Qt Embedded
+#ifndef TQ_WS_QWS // We don't have Java in Qt Embedded
 
 #include "java/kjavaappletwidget.h"
 #include "misc/htmltags.h"
diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp
index 053e51b95..414947e1e 100644
--- a/tdehtml/rendering/render_block.cpp
+++ b/tdehtml/rendering/render_block.cpp
@@ -695,9 +695,9 @@ void RenderBlock::layoutBlock(bool relayoutChildren)
     if (scrollsOverflow() && m_layer) {
         // For overflow:scroll blocks, ensure we have both scrollbars in place always.
         if (style()->overflowX() == OSCROLL)
-            m_layer->showScrollbar( Qt::Horizontal, true );
+            m_layer->showScrollbar( TQt::Horizontal, true );
         if (style()->overflowY() == OSCROLL)
-            m_layer->showScrollbar( Qt::Vertical, true );
+            m_layer->showScrollbar( TQt::Vertical, true );
     }
 
     setContainsPageBreak(false);
diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index d804094ef..7dc07090d 100644
--- a/tdehtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -644,8 +644,8 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba
 
 void RenderBox::outlineBox(TQPainter *p, int _tx, int _ty, const char *color)
 {
-    p->setPen(TQPen(TQColor(color), 1, Qt::DotLine));
-    p->setBrush( Qt::NoBrush );
+    p->setPen(TQPen(TQColor(color), 1, TQt::DotLine));
+    p->setBrush( TQt::NoBrush );
     p->drawRect(_tx, _ty, m_width, m_height);
 }
 
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 9d302bfc8..f18ce9ae6 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -99,25 +99,25 @@ void RenderFormElement::layout()
     setNeedsLayout(false);
 }
 
-TQ_Alignment RenderFormElement::textAlignment() const
+TQt::AlignmentFlags RenderFormElement::textAlignment() const
 {
     switch (style()->textAlign()) {
         case LEFT:
         case TDEHTML_LEFT:
-            return Qt::AlignLeft;
+            return TQt::AlignLeft;
         case RIGHT:
         case TDEHTML_RIGHT:
-            return Qt::AlignRight;
+            return TQt::AlignRight;
         case CENTER:
         case TDEHTML_CENTER:
-            return Qt::AlignHCenter;
+            return TQt::AlignHCenter;
         case JUSTIFY:
             // Just fall into the auto code for justify.
         case TAAUTO:
-            return style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft;
+            return style()->direction() == RTL ? TQt::AlignRight : TQt::AlignLeft;
     }
     assert(false); // Should never be reached.
-    return Qt::AlignLeft;
+    return TQt::AlignLeft;
 }
 
 // -------------------------------------------------------------------------
@@ -146,7 +146,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
     // prevent firing toggled() signals on initialization
     b->setChecked(element->checked());
 
-    connect(b,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(slotStateChanged(int)));
+    connect(b,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(slotStateChanged(int)));
 }
 
 
@@ -192,7 +192,7 @@ RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element)
     // prevent firing toggled() signals on initialization
     b->setChecked(element->checked());
 
-    connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
+    connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
 }
 
 void RenderRadioButton::updateFromElement()
@@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth()
         raw = TQString::fromLatin1("X");
     TQFontMetrics fm = pb->fontMetrics();
     TQSize ts = fm.size( ShowPrefix, raw);
-    TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts )
+    TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts )
             .expandedTo(TQApplication::globalStrut()));
     int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) +
 		 pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2;
@@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
 {
     setMouseTracking(true);
     TDEActionCollection *ac = new TDEActionCollection(this);
-    m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
+    m_spellAction = KStdAction::spelling( this, TQ_SLOT( slotCheckSpelling() ), ac );
 }
 
 LineEditWidget::~LineEditWidget()
@@ -328,11 +328,11 @@ void LineEditWidget::slotCheckSpelling()
     }
 
     delete m_spell;
-    m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
+    m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
 
-    connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) );
-    connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
-    connect( m_spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) );
+    connect( m_spell, TQ_SIGNAL( death() ),this, TQ_SLOT( spellCheckerFinished() ) );
+    connect( m_spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
+    connect( m_spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) );
 }
 
 void LineEditWidget::spellCheckerMisspelling( const TQString &_text, const TQStringList &, unsigned int pos)
@@ -362,7 +362,7 @@ void LineEditWidget::spellCheckerFinished()
 void LineEditWidget::slotSpellCheckReady( KSpell *s )
 {
     s->check( text() );
-    connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) );
+    connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) );
 }
 
 void LineEditWidget::slotSpellCheckDone( const TQString &s )
@@ -380,8 +380,8 @@ TQPopupMenu *LineEditWidget::createPopupMenu()
         return 0L;
     }
 
-    connect( popup, TQT_SIGNAL( activated( int ) ),
-             this, TQT_SLOT( extendedMenuActivated( int ) ) );
+    connect( popup, TQ_SIGNAL( activated( int ) ),
+             this, TQ_SLOT( extendedMenuActivated( int ) ) );
 
     if (m_input->autoComplete()) {
         popup->insertSeparator();
@@ -414,7 +414,7 @@ void LineEditWidget::extendedMenuActivated( int id)
     case EditHistory:
       {
         KHistoryComboEditor dlg( compObj() ? compObj()->items() : TQStringList(), this );
-        connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) );
+        connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) );
         dlg.exec();
       }
     default:
@@ -469,8 +469,8 @@ RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element)
     : RenderFormElement(element)
 {
     LineEditWidget *edit = new LineEditWidget(element, view(), view()->viewport());
-    connect(edit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
-    connect(edit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &)));
+    connect(edit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed()));
+    connect(edit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &)));
 
     if(element->inputType() == HTMLInputElementImpl::PASSWORD)
         edit->setEchoMode( TQLineEdit::Password );
@@ -785,9 +785,9 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
     w->setMode(KFile::File | KFile::ExistingOnly);
     w->completionObject()->setDir(TDEGlobalSettings::documentPath());
 
-    connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
-    connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &)));
-    connect(w, TQT_SIGNAL(urlSelected(const TQString &)),this,TQT_SLOT(slotUrlSelected(const TQString &)));
+    connect(w->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed()));
+    connect(w->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &)));
+    connect(w, TQ_SIGNAL(urlSelected(const TQString &)),this,TQ_SLOT(slotUrlSelected(const TQString &)));
 
     setQWidget(w);
     m_haveFocus = false;
@@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth()
     int h = fm.lineSpacing();
     int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some"
     KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit();
-    TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit,
+    TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit,
                                              edit,
           TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
         .expandedTo(TQApplication::globalStrut());
@@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e)
 	return true;
     if (e->type()==TQEvent::KeyPress)
     {
-	TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+	TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 	switch(ke->key())
 	{
 	case Key_Return:
@@ -907,9 +907,9 @@ bool ComboBoxWidget::event(TQEvent *e)
 
 bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(dest)==TQT_BASE_OBJECT(listBox()) &&  e->type()==TQEvent::KeyPress)
+    if (dest==listBox() &&  e->type()==TQEvent::KeyPress)
     {
-	TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+	TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 	bool forward = false;
 	switch(ke->key())
 	{
@@ -1226,8 +1226,8 @@ TDEListBox* RenderSelect::createListBox()
     lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
     // ### looks broken
     //lb->setAutoMask(true);
-    connect( lb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) );
-//     connect( lb, TQT_SIGNAL( clicked( TQListBoxItem * ) ), this, TQT_SLOT( slotClicked() ) );
+    connect( lb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) );
+//     connect( lb, TQ_SIGNAL( clicked( TQListBoxItem * ) ), this, TQ_SLOT( slotClicked() ) );
     m_ignoreSelectEvents = false;
     lb->setMouseTracking(true);
 
@@ -1237,7 +1237,7 @@ TDEListBox* RenderSelect::createListBox()
 ComboBoxWidget *RenderSelect::createComboBox()
 {
     ComboBoxWidget *cb = new ComboBoxWidget(view()->viewport());
-    connect(cb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelected(int)));
+    connect(cb, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelected(int)));
     return cb;
 }
 
@@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
     setMouseTracking(true);
 
     TDEActionCollection *ac = new TDEActionCollection(this);
-    m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac );
-    m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac );
-    m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac );
+    m_findAction = KStdAction::find( this, TQ_SLOT( slotFind() ), ac );
+    m_findNextAction = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac );
+    m_replaceAction = KStdAction::replace( this, TQ_SLOT( slotReplace() ), ac );
 }
 
 
@@ -1387,11 +1387,11 @@ void TextAreaWidget::slotDoReplace()
 
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)),
-            this, TQT_SLOT(slotFindHighlight(const TQString &, int, int)));
-    connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext()));
-    connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)),
-            this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int)));
+    connect(m_replace, TQ_SIGNAL(highlight(const TQString &, int, int)),
+            this, TQ_SLOT(slotFindHighlight(const TQString &, int, int)));
+    connect(m_replace, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotReplaceNext()));
+    connect(m_replace, TQ_SIGNAL(replace(const TQString &, int, int, int)),
+            this, TQ_SLOT(slotReplaceText(const TQString &, int, int, int)));
 
     m_repDlg->close();
     slotReplaceNext();
@@ -1486,9 +1486,9 @@ void TextAreaWidget::slotDoFind()
 
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)),
-            this, TQT_SLOT(slotFindHighlight(const TQString &, int, int)));
-    connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext()));
+    connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)),
+            this, TQ_SLOT(slotFindHighlight(const TQString &, int, int)));
+    connect(m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext()));
 
     m_findDlg->close();
     m_find->closeFindNextDialog();
@@ -1562,7 +1562,7 @@ void TextAreaWidget::slotFind()
       KWin::activateWindow( m_findDlg->winId() );
     } else {
       m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog");
-      connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) );
+      connect( m_findDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoFind()) );
     }
     m_findDlg->show();
 }
@@ -1578,7 +1578,7 @@ void TextAreaWidget::slotReplace()
     } else {
       m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0,
                                     TQStringList(), TQStringList(), false);
-      connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) );
+      connect( m_repDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoReplace()) );
     }
     m_repDlg->show();
 }
@@ -1618,7 +1618,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element)
     edit->setCheckSpellingEnabled( settings->autoSpellCheck() );
     edit->setTabChangesFocus( ! settings->allowTabulation() );
 
-    connect(edit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged()));
+    connect(edit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged()));
 }
 
 RenderTextArea::~RenderTextArea()
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index d6124528d..9c46346a7 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -95,7 +95,7 @@ public:
 protected:
     virtual bool isRenderButton() const { return false; }
     virtual bool isEditable() const { return false; }
-    TQ_Alignment textAlignment() const;
+    TQt::AlignmentFlags textAlignment() const;
 
     TQPoint m_mousePos;
     int m_state;
@@ -106,7 +106,7 @@ protected:
 // generic class for all buttons
 class RenderButton : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderButton(DOM::HTMLGenericFormElementImpl* node);
 
@@ -126,7 +126,7 @@ protected:
 
 class RenderCheckBox : public RenderButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderCheckBox(DOM::HTMLInputElementImpl* node);
 
@@ -146,7 +146,7 @@ public slots:
 
 class RenderRadioButton : public RenderButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderRadioButton(DOM::HTMLInputElementImpl* node);
 
@@ -216,7 +216,7 @@ public:
 
 class RenderLineEdit : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderLineEdit(DOM::HTMLInputElementImpl *element);
 
@@ -253,7 +253,7 @@ private:
 
 class LineEditWidget : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LineEditWidget(DOM::HTMLInputElementImpl* input,
                    TDEHTMLView* view, TQWidget* parent);
@@ -307,7 +307,7 @@ protected:
 
 class RenderFileButton : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderFileButton(DOM::HTMLInputElementImpl *element);
 
@@ -378,7 +378,7 @@ protected:
 
 class RenderSelect : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderSelect(DOM::HTMLSelectElementImpl *element);
 
@@ -417,7 +417,7 @@ protected slots:
 // -------------------------------------------------------------------------
 class TextAreaWidget : public KTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TextAreaWidget(int wrap, TQWidget* parent);
     virtual ~TextAreaWidget();
@@ -452,7 +452,7 @@ private:
 
 class RenderTextArea : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderTextArea(DOM::HTMLTextAreaElementImpl *element);
     ~RenderTextArea();
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 68c66495a..1035f97a0 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -66,7 +66,7 @@ RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet)
 
   m_resizing = m_clientresizing= false;
 
-  m_cursor = Qt::ArrowCursor;
+  m_cursor = TQt::ArrowCursor;
 
   m_hSplit = -1;
   m_vSplit = -1;
@@ -498,13 +498,13 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
   }
 
 
-  m_cursor = Qt::ArrowCursor;
+  m_cursor = TQt::ArrowCursor;
   if(m_hSplit != -1 && m_vSplit != -1)
-      m_cursor = Qt::SizeAllCursor;
+      m_cursor = TQt::SizeAllCursor;
   else if( m_vSplit != -1 )
-      m_cursor = Qt::SizeHorCursor;
+      m_cursor = TQt::SizeHorCursor;
   else if( m_hSplit != -1 )
-      m_cursor = Qt::SizeVerCursor;
+      m_cursor = TQt::SizeVerCursor;
 
   if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT)
   {
@@ -548,8 +548,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt )
   TDEHTMLView *view = canvas()->view();
   if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) {
       TQPainter paint( view );
-      paint.setPen( Qt::gray );
-      paint.setBrush( Qt::gray );
+      paint.setPen( TQt::gray );
+      paint.setBrush( TQt::gray );
       paint.setRasterOp( TQt::XorROP );
       TQRect r(xPos(), yPos(), width(), height());
       const int rBord = 3;
@@ -634,9 +634,9 @@ void RenderPart::setWidget( TQWidget *widget )
 #endif
 
     setQWidget( widget );
-    widget->setFocusPolicy(TQ_WheelFocus);
+    widget->setFocusPolicy(TQWidget::WheelFocus);
     if(widget->inherits("TDEHTMLView"))
-        connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) );
+        connect( widget, TQ_SIGNAL( cleared() ), this, TQ_SLOT( slotViewCleared() ) );
 
     setNeedsLayoutAndMinMaxRecalc();
 
@@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame )
 
 void RenderFrame::slotViewCleared()
 {
-    if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) {
+    if(m_widget->inherits("TQScrollView")) {
 #ifdef DEBUG_LAYOUT
         kdDebug(6031) << "frame is a scrollview!" << endl;
 #endif
@@ -888,7 +888,7 @@ bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame,
     }
     // Dissociate ourselves from the current event loop (to prevent crashes
     // due to the message box staying up)
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotPartLoadingErrorNotify() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotPartLoadingErrorNotify() ) );
 #if 0
     Tokenizer *tokenizer = static_cast<DOM::DocumentImpl *>(part->document().handle())->tokenizer();
     if (tokenizer) tokenizer->setOnHold( true );
@@ -989,7 +989,7 @@ void RenderPartObject::layout( )
 
 void RenderPartObject::slotViewCleared()
 {
-  if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) {
+  if(m_widget->inherits("TQScrollView") ) {
 #ifdef DEBUG_LAYOUT
       kdDebug(6031) << "iframe is a scrollview!" << endl;
 #endif
diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 49d1e8dc1..a6e0640f3 100644
--- a/tdehtml/rendering/render_frames.h
+++ b/tdehtml/rendering/render_frames.h
@@ -61,7 +61,7 @@ public:
     bool canResize( int _x, int _y);
     void setResizing(bool e);
 
-    Qt::CursorShape cursorShape() const { return m_cursor; }
+    TQt::CursorShape cursorShape() const { return m_cursor; }
 
     bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside);
 
@@ -73,7 +73,7 @@ public:
 #endif
 
 private:
-    Qt::CursorShape m_cursor;
+    TQt::CursorShape m_cursor;
     int m_oldpos;
     int m_gridLen[2];
     int* m_gridDelta[2];
@@ -93,7 +93,7 @@ private:
 
 class RenderPart : public tdehtml::RenderWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderPart(DOM::HTMLElementImpl* node);
 
@@ -123,7 +123,7 @@ public slots:
 
 class RenderFrame : public tdehtml::RenderPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderFrame( DOM::HTMLFrameElementImpl *frame );
 
@@ -146,7 +146,7 @@ public slots:
 // I can hardly call the class RenderObject ;-)
 class RenderPartObject : public tdehtml::RenderPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderPartObject( DOM::HTMLElementImpl * );
 
diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp
index 3f8d6e8f0..cf945145f 100644
--- a/tdehtml/rendering/render_generated.cpp
+++ b/tdehtml/rendering/render_generated.cpp
@@ -358,7 +358,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
         p->drawEllipse( marker );
         return;
     case LCIRCLE:
-        p->setBrush( Qt::NoBrush );
+        p->setBrush( TQt::NoBrush );
         p->drawEllipse( marker );
         return;
     case LSQUARE:
@@ -366,7 +366,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty)
         p->drawRect( marker );
         return;
     case LBOX:
-        p->setBrush( Qt::NoBrush );
+        p->setBrush( TQt::NoBrush );
         p->drawRect( marker );
         return;
     case LDIAMOND: {
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index ad8f18bb3..bfe5781ac 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -243,10 +243,10 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) {
         static TQPixmap *loadingIcon;
         TQColor bg = tdehtml::retrieveBackgroundColor(this);
-        TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray :
-                    (hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black);
+        TQColor fg = tdehtml::hasSufficientContrast(TQt::gray, bg) ? TQt::gray :
+                    (hasSufficientContrast(TQt::white, bg) ? TQt::white : TQt::black);
 	paintInfo.p->setPen(TQPen(fg, 1));
-	paintInfo.p->setBrush( Qt::NoBrush );
+	paintInfo.p->setBrush( TQt::NoBrush );
 	paintInfo.p->drawRect(_tx, _ty, m_width, m_height);
         if (!(m_width <= 5 || m_height <= 5)) {
             if (!loadingIcon) {
@@ -289,7 +289,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     }
     else if (i && !i->isTransparent())
     {
-        paintInfo.p->setPen( Qt::black ); // used for bitmaps
+        paintInfo.p->setPen( TQt::black ); // used for bitmaps
         const TQPixmap& pix = i->pixmap();
         if ( (cWidth != intrinsicWidth() ||  cHeight != intrinsicHeight()) &&
              pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
@@ -371,7 +371,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty)
     	    paintInfo.p->setBrushOrigin(_tx, _ty - paintInfo.r.y());
             paintInfo.p->fillRect(_tx, _ty, width(), height(),
 		    TQBrush(style()->palette().active().highlight(),
-		    Qt::Dense4Pattern));
+		    TQt::Dense4Pattern));
 	}
     }
 }
diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index 15bc1b0df..5439a5310 100644
--- a/tdehtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -678,7 +678,7 @@ static void paintOutlineSegment(RenderObject *o, TQPainter *p, int tx, int ty,
     }
 
 //     kdDebug(6040) << "segment(" << x1 << "," << y1 << ") - (" << x2 << "," << y2 << ")" << endl;
-/*    p->setPen(Qt::gray);
+/*    p->setPen(TQt::gray);
     p->drawLine(x1,y1,x2,y2);*/
     switch (curBS) {
     case RenderObject::BSLeft:
diff --git a/tdehtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp
index 2b6bbf027..1da1e0b82 100644
--- a/tdehtml/rendering/render_layer.cpp
+++ b/tdehtml/rendering/render_layer.cpp
@@ -604,9 +604,9 @@ void RenderLayer::updateScrollPositionFromScrollbars()
 }
 
 void
-RenderLayer::showScrollbar(Qt::Orientation o, bool show)
+RenderLayer::showScrollbar(TQt::Orientation o, bool show)
 {
-    TQScrollBar *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar;
+    TQScrollBar *sb = (o == TQt::Horizontal) ? m_hBar : m_vBar;
 
     if (show && !sb) {
         TQScrollView* scrollView = m_object->document()->view();
@@ -616,14 +616,14 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show)
         sb->show();
         if (!m_scrollMediator)
             m_scrollMediator = new RenderScrollMediator(this);
-        m_scrollMediator->connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged()));
+        m_scrollMediator->connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged()));
     }
     else if (!show && sb) {
         delete sb;
         sb = 0;
     }
 
-    if (o == Qt::Horizontal)
+    if (o == TQt::Horizontal)
 	m_hBar = sb;
     else
 	m_vBar = sb;
@@ -749,12 +749,12 @@ void RenderLayer::checkScrollbarsAfterLayout()
                           || (hasOvf && m_object->style()->overflowY() == OAUTO && haveVerticalBar != needVerticalBar);
     if (scrollbarsChanged) {
         if (m_object->style()->overflowX() == OAUTO) {
-            showScrollbar(Qt::Horizontal, needHorizontalBar);
+            showScrollbar(TQt::Horizontal, needHorizontalBar);
             if (m_hBar) 
                 m_hBar->setEnabled(true);
         }
         if (m_object->style()->overflowY() == OAUTO) {
-            showScrollbar(Qt::Vertical, needVerticalBar);
+            showScrollbar(TQt::Vertical, needVerticalBar);
             if (m_vBar)
                 m_vBar->setEnabled(true);
         }
@@ -956,8 +956,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p,
         int ax=0;
         int ay=0;
         renderer()->absolutePosition( ax, ay );
-        p->setPen(TQPen(TQColor("yellow"), 1, Qt::DotLine));
-        p->setBrush( Qt::NoBrush );
+        p->setPen(TQPen(TQColor("yellow"), 1, TQt::DotLine));
+        p->setBrush( TQt::NoBrush );
         p->drawRect(ax, ay, width(), height());
     }
 #endif
diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index ae5ddff65..9c73eb0bb 100644
--- a/tdehtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -65,7 +65,7 @@ namespace tdehtml {
 
 class RenderScrollMediator: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderScrollMediator(RenderLayer* layer)
     :m_layer(layer) {}
@@ -80,7 +80,7 @@ private:
 // This class handles the auto-scrolling of layers with overflow: marquee.
 class Marquee: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Marquee(RenderLayer* l);
@@ -193,7 +193,7 @@ public:
     void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true);
     void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); }
     void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); }
-    void showScrollbar(Qt::Orientation, bool);
+    void showScrollbar(TQt::Orientation, bool);
     TQScrollBar* horizontalScrollbar() { return m_hBar; }
     TQScrollBar* verticalScrollbar() { return m_vBar; }
     int verticalScrollbarWidth();
diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index cc9ba4e5b..17caa26ae 100644
--- a/tdehtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -299,7 +299,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
     }
 
 #ifdef BOX_DEBUG
-    p->setPen( Qt::red );
+    p->setPen( TQt::red );
     p->drawRect( _tx + xoff, _ty + yoff, offset, offset );
 #endif
 
@@ -312,7 +312,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
         p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
         return;
     case LCIRCLE:
-        p->setBrush( Qt::NoBrush );
+        p->setBrush( TQt::NoBrush );
         p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
         return;
     case LSQUARE:
@@ -320,7 +320,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
         p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
         return;
     case LBOX:
-        p->setBrush( Qt::NoBrush );
+        p->setBrush( TQt::NoBrush );
         p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 );
         return;
     case LDIAMOND: {
@@ -342,25 +342,25 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty)
         if (!m_item.isEmpty()) {
             if(listPositionInside()) {
             	if( style()->direction() == LTR) {
-                    p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
-                    p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip,
+                    p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
+                    p->drawText(_tx + fm.width(m_item), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip,
                                 TQString::fromLatin1(". "));
                 }
             	else {
                     const TQString& punct(TQString::fromLatin1(" ."));
-                    p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
-            	    p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
+                    p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct);
+            	    p->drawText(_tx + fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
                 }
             } else {
                 if (style()->direction() == LTR) {
                     const TQString& punct(TQString::fromLatin1(". "));
-                    p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct);
-                    p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item);
+                    p->drawText(_tx-offset/2, _ty, 0, 0, TQt::AlignRight|TQt::DontClip, punct);
+                    p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, TQt::AlignRight|TQt::DontClip, m_item);
                 }
             	else {
                     const TQString& punct(TQString::fromLatin1(" ."));
-            	    p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct);
-                    p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item);
+            	    p->drawText(_tx+offset/2, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct);
+                    p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item);
                 }
 	    }
         }
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index eacbb4d16..b1a9bdffc 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -722,7 +722,7 @@ static void calc3DColor(TQColor &color, bool darken)
     int g = gb - (f0 * gb / 100);
     int b = bb - (f0 * bb / 100);
     if ((r == rb) && (g == gb) && (b == bb))
-      color = (color == Qt::black) ? DARK_GRAY : Qt::black;
+      color = (color == TQt::black) ? DARK_GRAY : TQt::black;
     else
       color.setRgb(r, g, b);
   } else {
@@ -730,7 +730,7 @@ static void calc3DColor(TQColor &color, bool darken)
     int g = kMin(gb + (f1 * (MAX_COLOR - gb) / 100), 255);
     int b = kMin(bb + (f1 * (MAX_COLOR - bb) / 100), 255);
     if ((r == rb) && (g == gb) && (b == bb))
-      color = (color == Qt::white) ? LIGHT_GRAY : Qt::white;
+      color = (color == TQt::white) ? LIGHT_GRAY : TQt::white;
     else
       color.setRgb(r, g, b);
   }
@@ -749,12 +749,12 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
         if(invalidisInvert)
         {
             p->setRasterOp(TQt::XorROP);
-            c = Qt::white;
+            c = TQt::white;
         }
         else {
             if(style == INSET || style == OUTSET || style == RIDGE || style ==
             GROOVE)
-                c = Qt::white;
+                c = TQt::white;
             else
                 c = textcolor;
         }
@@ -773,7 +773,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
     case DOTTED:
         if ( width == 1 ) {
             // workaround Qt brokenness
-            p->setPen(TQPen(c, width, Qt::SolidLine));
+            p->setPen(TQPen(c, width, TQt::SolidLine));
             switch(s) {
             case BSBottom:
             case BSTop:
@@ -788,11 +788,11 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
             break;
         }
 
-        p->setPen(TQPen(c, width, Qt::DotLine));
+        p->setPen(TQPen(c, width, TQt::DotLine));
         /* nobreak; */
     case DASHED:
         if(style == DASHED)
-            p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? Qt::DotLine : Qt::DashLine));
+            p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? TQt::DotLine : TQt::DashLine));
 
         if (width > 0)
             switch(s) {
@@ -813,7 +813,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
 
         if (adjbw1 == 0 && adjbw2 == 0)
         {
-            p->setPen(Qt::NoPen);
+            p->setPen(TQt::NoPen);
             p->setBrush(c);
             switch(s)
             {
@@ -921,7 +921,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2,
              (style == INSET && ( s == BSTop || s == BSLeft ) ) );
         /* nobreak; */
     case SOLID:
-        p->setPen(Qt::NoPen);
+        p->setPen(TQt::NoPen);
         p->setBrush(c);
         Q_ASSERT(x2>=x1);
         Q_ASSERT(y2>=y1);
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 2d991c3a2..103cad9e8 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -186,7 +186,7 @@ bool RenderWidget::event( TQEvent *e )
         repaint();
     }
     // eat all events - except if this is a frame (in which case TDEHTMLView handles it all)
-    if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
+    if ( ::tqt_cast<TDEHTMLView *>( m_widget ) )
         return TQObject::event( e );
     return true;
 }
@@ -202,21 +202,21 @@ void RenderWidget::setQWidget(TQWidget *widget)
     {
         if (m_widget) {
             m_widget->removeEventFilter(this);
-            disconnect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
+            disconnect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed()));
             m_widget->hide();
             m_widget->deleteLater(); //Might happen due to event on the widget, so be careful
             m_widget = 0;
         }
         m_widget = widget;
         if (m_widget) {
-            connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed()));
+            connect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed()));
             m_widget->installEventFilter(this);
 
-            if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget))
+            if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast<TQFrame*>(m_widget))
                 m_widget->setBackgroundMode( TQWidget::NoBackground );
 
-            if (m_widget->focusPolicy() > TQ_StrongFocus)
-                m_widget->setFocusPolicy(TQ_StrongFocus);
+            if (m_widget->focusPolicy() > TQWidget::StrongFocus)
+                m_widget->setFocusPolicy(TQWidget::StrongFocus);
             // if we've already received a layout, apply the calculated space to the
             // widget immediately, but we have to have really been full constructed (with a non-null
             // style pointer).
@@ -316,12 +316,12 @@ void RenderWidget::updateFromElement()
                 if (v > 128)
                     // dark bg, light fg - need a darker disabled fg
                     disfg = disfg.dark(lowlightVal);
-                else if (disfg != Qt::black)
+                else if (disfg != TQt::black)
                     // light bg, dark fg - need a lighter disabled fg - but only if !black
                     disfg = disfg.light(highlightVal);
                 else
                     // black fg - use darkgray disabled fg
-                    disfg = Qt::darkGray;
+                    disfg = TQt::darkGray;
                 pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg);
             }
 
@@ -330,7 +330,7 @@ void RenderWidget::updateFromElement()
         else
             m_widget->unsetPalette();
         // Border:
-        TQFrame* frame = ::tqqt_cast<TQFrame*>(m_widget);
+        TQFrame* frame = ::tqt_cast<TQFrame*>(m_widget);
         if (frame) {
             if (shouldPaintBackgroundOrBorder())
             {
@@ -532,7 +532,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx,
         TQObjectList childWidgets = widget->childrenListObject();
         TQObjectListIterator it(childWidgets);
         for (; it.current(); ++it) {
-            TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current());
+            TQWidget* const w = ::tqt_cast<TQWidget *>(it.current());
 	    if ( w && !w->isTopLevel() && !w->isHidden()) {
 	        TQRect r2 = w->geometry();
 	        blit -= r2;
@@ -613,7 +613,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty)
 bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
 {
     // no special event processing if this is a frame (in which case TDEHTMLView handles it all)
-    if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) )
+    if ( ::tqt_cast<TDEHTMLView *>( m_widget ) )
         return false;
     if ( !element() ) return true;
 
@@ -642,7 +642,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
         
         // Don't count popup as a valid reason for losing the focus
         // (example: opening the options of a select combobox shouldn't emit onblur)
-        if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup )
+        if ( static_cast<TQFocusEvent*>(e)->reason() != TQFocusEvent::Popup )
             handleFocusOut();
         break;
     case TQEvent::FocusIn:
@@ -663,7 +663,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
     case TQEvent::KeyRelease:
     // TODO this seems wrong - Qt events are not correctly translated to DOM ones,
     // like in TDEHTMLView::dispatchKeyEvent()
-        if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false))
+        if (element()->dispatchKeyEvent(static_cast<TQKeyEvent*>(e),false))
             filtered = true;
         break;
 
@@ -673,8 +673,8 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
             // currently focused. this avoids accidentally changing a select box
             // or something while wheeling a webpage.
             if (tqApp->focusWidget() != widget() &&
-                widget()->focusPolicy() <= TQ_StrongFocus)  {
-                TQT_TQWHEELEVENT(e)->ignore();
+                widget()->focusPolicy() <= TQWidget::StrongFocus)  {
+                static_cast<TQWheelEvent*>(e)->ignore();
                 TQApplication::sendEvent(view(), e);
                 filtered = true;
             }
@@ -697,22 +697,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e)
 void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
     switch(e->type()) {
     case TQEvent::MouseButtonPress:
-        mousePressEvent(TQT_TQMOUSEEVENT(e));
+        mousePressEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::MouseButtonRelease:
-        mouseReleaseEvent(TQT_TQMOUSEEVENT(e));
+        mouseReleaseEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::MouseButtonDblClick:
-        mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+        mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::MouseMove:
-        mouseMoveEvent(TQT_TQMOUSEEVENT(e));
+        mouseMoveEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::KeyPress:
-        keyPressEvent(TQT_TQKEYEVENT(e));
+        keyPressEvent(static_cast<TQKeyEvent*>(e));
         break;
     case TQEvent::KeyRelease:
-        keyReleaseEvent(TQT_TQKEYEVENT(e));
+        keyReleaseEvent(static_cast<TQKeyEvent*>(e));
         break;
     default:
         break;
@@ -722,22 +722,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) {
 void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) {
     switch(e->type()) {
     case TQEvent::MouseButtonPress:
-        viewportMousePressEvent(TQT_TQMOUSEEVENT(e));
+        viewportMousePressEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::MouseButtonRelease:
-        viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e));
+        viewportMouseReleaseEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::MouseButtonDblClick:
-        viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e));
+        viewportMouseDoubleClickEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::MouseMove:
-        viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e));
+        viewportMouseMoveEvent(static_cast<TQMouseEvent*>(e));
         break;
     case TQEvent::KeyPress:
-        keyPressEvent(TQT_TQKEYEVENT(e));
+        keyPressEvent(static_cast<TQKeyEvent*>(e));
         break;
     case TQEvent::KeyRelease:
-        keyReleaseEvent(TQT_TQKEYEVENT(e));
+        keyReleaseEvent(static_cast<TQKeyEvent*>(e));
         break;
     default:
         break;
@@ -784,13 +784,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
             }
             switch (me.button()) {
             case 0:
-                button = Qt::LeftButton;
+                button = TQt::LeftButton;
                 break;
             case 1:
-                button = Qt::MidButton;
+                button = TQt::MidButton;
                 break;
             case 2:
-                button = Qt::RightButton;
+                button = TQt::RightButton;
                 break;
             default:
                 break;
@@ -809,11 +809,11 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
 //                   << " pos=" << p << " type=" << type
 //                   << " button=" << button << " state=" << state << endl;
         TQMouseEvent e(type, p, button, state);
-        TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget);
-        if (sc && !::tqqt_cast<TQListBox*>(m_widget))
-            static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e));
+        TQScrollView * sc = ::tqt_cast<TQScrollView*>(m_widget);
+        if (sc && !::tqt_cast<TQListBox*>(m_widget))
+            static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(static_cast<TQEvent*>(&e));
         else
-            static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&e));
+            static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&e));
         ret = e.isAccepted();
         break;
     }
@@ -827,7 +827,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
         if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break;
 
         TQKeyEvent* const ke = domKeyEv.qKeyEvent();
-        static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
+        static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke));
         ret = ke->isAccepted();
         break;
     }
@@ -847,16 +847,16 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev)
         //  DOM:   Down      Press   |       Press                             |     Up
         //  Qt:    (nothing) Press   | Release(autorepeat) + Press(autorepeat) |   Release
         //
-        // Qt::KeyPress is sent for DOM keypress and not DOM keydown to allow
+        // TQt::KeyPress is sent for DOM keypress and not DOM keydown to allow
         // sites to block a key with onkeypress, #99749
 
         TQKeyEvent* const ke = domKeyEv.qKeyEvent();
         if (ke->isAutoRepeat()) {
             TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(),
                                ke->text(), ke->isAutoRepeat(), ke->count() );
-            static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv));
+            static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&releaseEv));
         }
-        static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke));
+        static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke));
         ret = ke->isAccepted();
 	break;
     }
diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 3d8a68f9c..7a5ec5353 100644
--- a/tdehtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -83,7 +83,7 @@ protected:
 
 class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget>
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderWidget(DOM::NodeImpl* node);
     virtual ~RenderWidget();
diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h
index 28b6b999d..90aef33df 100644
--- a/tdehtml/rendering/render_style.h
+++ b/tdehtml/rendering/render_style.h
@@ -1450,7 +1450,7 @@ public:
     static short initialBorderHorizontalSpacing() { return 0; }
     static short initialBorderVerticalSpacing() { return 0; }
     static ECursor initialCursor() { return CURSOR_AUTO; }
-    static TQColor initialColor() { return Qt::black; }
+    static TQColor initialColor() { return TQt::black; }
     static CachedImage* initialBackgroundImage() { return 0; }
     static CachedImage* initialListStyleImage() { return 0; }
     static unsigned short initialBorderWidth() { return 3; }
diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index 9f2cc3366..bd4002a37 100644
--- a/tdehtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -1105,13 +1105,15 @@ void RenderTableSection::addCell( RenderTableCell *cell, RenderTableRow *row )
 		    grid[cRow].height = height;
 		break;
 	    case Relative:
+		  {
 #if 0
 		// we treat this as variable. This is correct according to HTML4, as it only specifies length for the height.
 		if ( cRowHeight.type == Variable ||
 		     ( cRowHeight.type == Relative && cRowHeight.value < height.value ) )
 		     grid[cRow].height = height;
-		     break;
 #endif
+		     break;
+			}
 	    default:
 		break;
 	    }
@@ -2697,8 +2699,8 @@ int RenderTableCell::borderBottom() const
 
 static void outlineBox(TQPainter *p, int _tx, int _ty, int w, int h)
 {
-    p->setPen(TQPen(TQColor("yellow"), 3, Qt::DotLine));
-    p->setBrush( Qt::NoBrush );
+    p->setPen(TQPen(TQColor("yellow"), 3, TQt::DotLine));
+    p->setBrush( TQt::NoBrush );
     p->drawRect(_tx, _ty, w, h );
 }
 #endif
diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index 3a349844b..c2bf27af5 100644
--- a/tdehtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
                     m_reversed ? TQPainter::RTL : TQPainter::LTR);
 
         p.end();
-        TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32);
+        TQImage img = pixmap.convertToImage().convertDepth(32);
 
         int md = thickness*thickness; // max-dist^2
 
@@ -398,7 +398,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty,
             }
         }
 
-        pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::PreferDither);
+        pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::PreferDither);
     }
     // Paint next shadow effect
     if (shadow->next) paintShadow(pt, f, _tx, _ty, shadow->next);
diff --git a/tdehtml/tdehtml_caret.cpp b/tdehtml/tdehtml_caret.cpp
index 3d81997f0..71d30629b 100644
--- a/tdehtml/tdehtml_caret.cpp
+++ b/tdehtml/tdehtml_caret.cpp
@@ -1952,8 +1952,10 @@ kdDebug(6200) << "box " << box << " b " << box->inlineBox() << " isText " << box
     	&& !(*ebit)->isInlineTextBox()) {
       EditableCaretBoxIterator copy = ebit;
       --ebit;
-      if (ebit == (*_it)->preBegin()) /*adjacent = false;
-      else */ebit = copy;
+      if (ebit == (*_it)->preBegin())
+				/*adjacent = false;
+      else */
+				ebit = copy;
     }/*end if*/
 #endif
 #if 0
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index e90f5db4f..6e2b6fa17 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -111,12 +111,12 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget )
 
     if ( !m_connectedToClipboard && m_editableFormWidget )
     {
-        connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
-                 this, TQT_SLOT( updateEditActions() ) );
+        connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+                 this, TQ_SLOT( updateEditActions() ) );
 
-        if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
-            connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ),
-                     this, TQT_SLOT( updateEditActions() ) );
+        if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) )
+            connect( m_editableFormWidget, TQ_SIGNAL( selectionChanged() ),
+                     this, TQ_SLOT( updateEditActions() ) );
 
         m_connectedToClipboard = true;
     }
@@ -134,14 +134,14 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ )
 
     if ( m_connectedToClipboard )
     {
-        disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
-                    this, TQT_SLOT( updateEditActions() ) );
+        disconnect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+                    this, TQ_SLOT( updateEditActions() ) );
 
         if ( oldWidget )
         {
-            if ( oldWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || oldWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
-                disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ),
-                            this, TQT_SLOT( updateEditActions() ) );
+            if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) )
+                disconnect( oldWidget, TQ_SIGNAL( selectionChanged() ),
+                            this, TQ_SLOT( updateEditActions() ) );
         }
 
         m_connectedToClipboard = false;
@@ -153,14 +153,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p
 {
     if ( m_extensionProxy )
     {
-        disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
-                    this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
+        disconnect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ),
+                    this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
         if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) )
         {
-            disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
-                        this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
-            disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ),
-                        this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) );
+            disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ),
+                        this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) );
+            disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ),
+                        this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) );
         }
     }
 
@@ -168,14 +168,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p
 
     if ( m_extensionProxy )
     {
-        connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ),
-                 this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
+        connect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ),
+                 this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) );
         if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) )
         {
-            connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ),
-                     this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) );
-            connect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ),
-                     this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) );
+            connect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ),
+                     this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) );
+            connect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ),
+                     this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) );
         }
 
         enableAction( "cut", m_extensionProxy->isActionEnabled( "cut" ) );
@@ -200,9 +200,9 @@ void TDEHTMLPartBrowserExtension::cut()
     if ( !m_editableFormWidget )
         return;
 
-    if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+    if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
         static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->cut();
-    else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+    else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
         static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut();
 }
 
@@ -223,7 +223,7 @@ void TDEHTMLPartBrowserExtension::copy()
 
 
         TQClipboard *cb = TQApplication::clipboard();
-        disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
+        disconnect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) );
 #ifndef TQT_NO_MIMECLIPBOARD
 	TQString htmltext;
 	/*
@@ -249,13 +249,13 @@ void TDEHTMLPartBrowserExtension::copy()
 	cb->setText(text);
 #endif
 
-        connect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
+        connect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) );
     }
     else
     {
-        if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+        if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
             static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->copy();
-        else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+        else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
             static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->copy();
     }
 }
@@ -263,7 +263,7 @@ void TDEHTMLPartBrowserExtension::copy()
 void TDEHTMLPartBrowserExtension::searchProvider()
 {
     // action name is of form "previewProvider[<searchproviderprefix>:]"
-    const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 );
+    const TQString searchProviderPrefix = TQString( sender()->name() ).mid( 14 );
 
     KURIFilterData data;
     TQStringList list;
@@ -303,9 +303,9 @@ void TDEHTMLPartBrowserExtension::paste()
     if ( !m_editableFormWidget )
         return;
 
-    if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) )
+    if ( m_editableFormWidget->inherits( "TQLineEdit" ) )
         static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->paste();
-    else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) )
+    else if ( m_editableFormWidget->inherits( "TQTextEdit" ) )
         static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste();
 }
 
@@ -343,9 +343,9 @@ void TDEHTMLPartBrowserExtension::updateEditActions()
     bool hasSelection = false;
 
     if( m_editableFormWidget) {
-        if ( ::tqqt_cast<TQLineEdit*>(m_editableFormWidget))
+        if ( ::tqt_cast<TQLineEdit*>(m_editableFormWidget))
             hasSelection = static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->hasSelectedText();
-        else if(::tqqt_cast<TQTextEdit*>(m_editableFormWidget))
+        else if(::tqt_cast<TQTextEdit*>(m_editableFormWidget))
             hasSelection = static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->hasSelectedText();
     }
 
@@ -429,7 +429,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
 
   if (hasSelection)
   {
-      TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
+      TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQ_SLOT( copy() ), actionCollection(), "copy" );
       copyAction->setText(i18n("&Copy Text"));
       copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" ));
       actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) );
@@ -477,7 +477,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
 
       // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x
       new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
-                     TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
+                     TQ_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
 
       // favorite search providers
       TQStringList favoriteEngines;
@@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
             name = service->name();
 
             providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(),
-              TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
+              TQ_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
           }
         }
       }
@@ -515,13 +515,13 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
 
       if ( selectedText.contains("://") && KURL(selectedText).isValid() )
          new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0,
-         d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
+         d->m_tdehtml->browserExtension(), TQ_SLOT( openSelection() ), actionCollection(), "openSelection" );
   }
   else if ( url.isEmpty() && !isImage )
   {
       actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) );
       actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) );
-      new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+      new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ),
                    actionCollection(), "stopanimations" );
   }
 
@@ -529,14 +529,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
   {
     if (url.protocol() == "mailto")
     {
-      new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+      new TDEAction( i18n( "Copy Email Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ),
                  actionCollection(), "copylinklocation" );
     }
     else
     {
-      new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
+      new TDEAction( i18n( "&Save Link As..." ), 0, this, TQ_SLOT( slotSaveLinkAs() ),
                  actionCollection(), "savelinkas" );
-      new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+      new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ),
                  actionCollection(), "copylinklocation" );
     }
   }
@@ -546,28 +546,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
   {
     if ( tdehtml->parentPart() )
     {
-      new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ),
+      new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotFrameInWindow() ),
                                           actionCollection(), "frameinwindow" );
-      new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
+      new TDEAction( i18n( "Open in &This Window" ), 0, this, TQ_SLOT( slotFrameInTop() ),
                                           actionCollection(), "frameintop" );
-      new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
+      new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotFrameInTab() ),
                                        actionCollection(), "frameintab" );
-      new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
+      new TDEAction( i18n( "Reload Frame" ), 0, this, TQ_SLOT( slotReloadFrame() ),
                                         actionCollection(), "reloadframe" );
 
       if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
           if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
-              new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
+              new TDEAction( i18n( "Block IFrame..." ), 0, this, TQ_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
       }
 
-      new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
+      new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQ_SLOT( slotViewDocumentSource() ),
                                           actionCollection(), "viewFrameSource" );
-      new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
+      new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
       // This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either,
       // and because print frame is already in the toolbar and the menu.
       // But leave this here, so that it's easy to read it.
-      new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
-      new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+      new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQ_SLOT( print() ), actionCollection(), "printFrame" );
+      new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
 
       actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
       actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
@@ -578,7 +578,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
   } else if (isImage || !url.isEmpty()) {
     actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) );
     actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) );
-    new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+    new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ),
                  actionCollection(), "stopanimations" );
   }
 
@@ -597,35 +597,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
     }
     else
       d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() );
-    new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
+    new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveImageAs() ),
                  actionCollection(), "saveimageas" );
-    new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
+    new TDEAction( i18n( "Send Image..." ), 0, this, TQ_SLOT( slotSendImage() ),
                  actionCollection(), "sendimage" );
 
 
 #ifndef TQT_NO_MIMECLIPBOARD
-    (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
+    (new TDEAction( i18n( "Copy Image" ), 0, this, TQ_SLOT( slotCopyImage() ),
                  actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull());
 #endif
 
     if(d->m_pixmap.isNull()) {    //fallback to image location if still loading the image.  this will always be true if ifdef TQT_NO_MIMECLIPBOARD
-      new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
+      new TDEAction( i18n( "Copy Image Location" ), 0, this, TQ_SLOT( slotCopyImageLocation() ),
                    actionCollection(), "copyimagelocation" );
     }
 
     TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25);
-    new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ),
+    new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQ_SLOT( slotViewImage() ),
                  actionCollection(), "viewimage" );
 
     if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
     {
-      new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
+      new TDEAction( i18n( "Block Image..." ), 0, this, TQ_SLOT( slotBlockImage() ),
                    actionCollection(), "blockimage" );
 
       if (!d->m_imageURL.host().isEmpty() &&
           !d->m_imageURL.protocol().isEmpty())
       {
-        new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ),
+        new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQ_SLOT( slotBlockHost() ),
                      actionCollection(), "blockhost" );
       }
     }
@@ -995,7 +995,7 @@ void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction)
         m_popup->insertItem( i18n( "%1%" ).arg( fastZoomSizes[ofs + i] ) );
     }
 
-    connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) );
+    connect( m_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) );
 }
 
 TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction()
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index 7cea57956..ebdc886f9 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -40,7 +40,7 @@
  */
 class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class TDEHTMLPart;
   friend class TDEHTMLView;
 public:
@@ -114,7 +114,7 @@ private:
  */
 class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url );
   virtual ~TDEHTMLPopupGUIClient();
@@ -151,7 +151,7 @@ private:
 
 class TDEHTMLZoomFactorAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     //BCI: remove in KDE 4
     TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name );
diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h
index 3ad2aff8c..5d424282c 100644
--- a/tdehtml/tdehtml_factory.h
+++ b/tdehtml/tdehtml_factory.h
@@ -38,7 +38,7 @@ namespace DOM
 
 class KDE_EXPORT TDEHTMLFactory : public KParts::Factory
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class DOM::DocumentImpl;
   friend class TDEHTMLViewPrivate;
 public:
diff --git a/tdehtml/tdehtml_iface.cc b/tdehtml/tdehtml_iface.cpp
index 4bb4afd89..197a1020e 100644
--- a/tdehtml/tdehtml_iface.cc
+++ b/tdehtml/tdehtml_iface.cpp
@@ -150,7 +150,7 @@ void TDEHTMLPartIface::activateNode()
 {
     KParts::ReadOnlyPart* p = part->currentFrame();
     if ( p && p->widget() ) {
-        TQKeyEvent ev( TQKeyEvent::KeyPress, Qt::Key_Return, '\n', 0, "\n" );
+        TQKeyEvent ev( TQKeyEvent::KeyPress, TQt::Key_Return, '\n', 0, "\n" );
         TQApplication::sendEvent( p->widget(), &ev );
     }
 }
diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index 319dd8162..df08f97d6 100644
--- a/tdehtml/tdehtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -108,7 +108,7 @@ TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot)
   int fd = dup(m_file->handle());
   lseek(fd, 0, SEEK_SET);
   TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd);
-  recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot);
+  recvObj->connect(delivery, TQ_SIGNAL(emitData(const TQByteArray&)), recvSlot);
   delivery->recvObj = recvObj;
   return delivery;
 }
@@ -210,7 +210,7 @@ TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot)
   if (!d->deliveryActive)
   {
      d->deliveryActive = true;
-     TQTimer::singleShot(20, this, TQT_SLOT(sendData()));
+     TQTimer::singleShot(20, this, TQ_SLOT(sendData()));
   }
 }
 
@@ -265,7 +265,7 @@ TDEHTMLPageCache::sendData()
      byteArray.resetRawData(buf, n);
      d->delivery.append( delivery );
   }
-  TQTimer::singleShot(0, this, TQT_SLOT(sendData()));
+  TQTimer::singleShot(0, this, TQ_SLOT(sendData()));
 }
 
 void
diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index f648bd548..e16164771 100644
--- a/tdehtml/tdehtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -40,7 +40,7 @@ class TDEHTMLPageCachePrivate;
  */
 class TDEHTMLPageCache : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * static "constructor".
@@ -116,7 +116,7 @@ private:
 class TDEHTMLPageCacheDelivery : public TQObject
 {
    friend class TDEHTMLPageCache;
-Q_OBJECT
+TQ_OBJECT
 public:
    TDEHTMLPageCacheDelivery(int _fd)
     : fd(_fd) { }
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index b822212ac..81c228e90 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -177,7 +177,7 @@ void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString &
     script += ")";
     kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl;
 
-    TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(m_part->parent());
+    TDEHTMLPart * part = ::tqt_cast<TDEHTMLPart *>(m_part->parent());
     if (!part)
         return;
     if (!m_jscript)
@@ -251,24 +251,24 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
   d->m_bMousePressed = false;
   d->m_bRightMousePressed = false;
   d->m_bCleared = false;
-  d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
-  d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
-  d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
-  d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
-  d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
+  d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
+  d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQ_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
+  d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
+  d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQ_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
+  d->m_paSaveDocument = KStdAction::saveAs( this, TQ_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
   if ( parentPart() )
       d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes
-  d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
-  d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
+  d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+  d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQ_SLOT( slotSecurity() ), actionCollection(), "security" );
   d->m_paSecurity->setWhatsThis( i18n( "Security Settings<p>"
                                        "Shows the certificate of the displayed page. Only "
 				       "pages that have been transmitted using a secure, encrypted connection have a "
 				       "certificate.<p> "
 				       "Hint: If the image shows a closed lock, the page has been transmitted over a "
 				       "secure connection.") );
-  d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
-  d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
-  d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
+  d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQ_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
+  d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQ_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
+  d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" );
 
   d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
   d->m_paSetEncoding->setDelayed( false );
@@ -291,14 +291,14 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
   //d->m_automaticDetection->insertItem( i18n( "Unicode" ), 13 );
   d->m_automaticDetection->insertItem( i18n( "Western European" ), 14 );
 
-  connect( d->m_automaticDetection, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotAutomaticDetectionLanguage( int ) ) );
+  connect( d->m_automaticDetection, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAutomaticDetectionLanguage( int ) ) );
 
   d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 );
 
   d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) );
 
 
-  d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
+  d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQ_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
   TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
   d->m_manualDetection->setItems( encodings );
   d->m_manualDetection->setCurrentItem( -1 );
@@ -353,40 +353,40 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
   }
 
 
-  d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
+  d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQ_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
 
   if ( prof == BrowserViewGUI ) {
       d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n(
                   "Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this,
-              TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" );
+              TQ_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" );
       d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>"
                                                 "Make the font in this window bigger. "
                             "Click and hold down the mouse button for a menu with all available font sizes." ) );
       d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n(
                   "Shrink Font" ), "zoom-out", CTRL + Key_Minus, this,
-              TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" );
+              TQ_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" );
       d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>"
                                                 "Make the font in this window smaller. "
                             "Click and hold down the mouse button for a menu with all available font sizes." ) );
   }
 
-  d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" );
+  d->m_paFind = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find" );
   d->m_paFind->setWhatsThis( i18n( "Find text<p>"
 				   "Shows a dialog that allows you to find text on the displayed page." ) );
 
-  d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" );
+  d->m_paFindNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection(), "findNext" );
   d->m_paFindNext->setWhatsThis( i18n( "Find next<p>"
 				       "Find the next occurrence of the text that you "
 				       "have found using the <b>Find Text</b> function" ) );
 
-  d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" );
+  d->m_paFindPrev = KStdAction::findPrev( this, TQ_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" );
   d->m_paFindPrev->setWhatsThis( i18n( "Find previous<p>"
 				       "Find the previous occurrence of the text that you "
 				       "have found using the <b>Find Text</b> function" ) );
 
-  d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
+  d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQ_SLOT( slotFindAheadText()),
       actionCollection(), "findAheadText");
-  d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
+  d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQ_SLOT( slotFindAheadLink()),
       actionCollection(), "findAheadLink");
   d->m_paFindAheadText->setEnabled( false );
   d->m_paFindAheadLinks->setEnabled( false );
@@ -400,17 +400,17 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
       d->m_paFindAheadLinks->setShortcut( TDEShortcut());
   }
 
-  d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+  d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQ_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
   d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
 					 "Some pages have several frames. To print only a single frame, click "
 					 "on it and then use this function." ) );
 
-  d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" );
+  d->m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectAll" );
   if ( parentPart() )
       d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes
 
   d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"),
-  				Key_F7, this, TQT_SLOT(slotToggleCaretMode()),
+  				Key_F7, this, TQ_SLOT(slotToggleCaretMode()),
                                 actionCollection(), "caretMode");
   d->m_paToggleCaretMode->setChecked(isCaretMode());
   if (parentPart())
@@ -427,30 +427,30 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
   // Set the meta-refresh flag...
   d->m_metaRefreshEnabled = d->m_settings->isAutoDelayedActionsEnabled ();
 
-  connect( view, TQT_SIGNAL( zoomView( int ) ), TQT_SLOT( slotZoomView( int ) ) );
+  connect( view, TQ_SIGNAL( zoomView( int ) ), TQ_SLOT( slotZoomView( int ) ) );
 
-  connect( this, TQT_SIGNAL( completed() ),
-           this, TQT_SLOT( updateActions() ) );
-  connect( this, TQT_SIGNAL( completed( bool ) ),
-           this, TQT_SLOT( updateActions() ) );
-  connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ),
-           this, TQT_SLOT( updateActions() ) );
+  connect( this, TQ_SIGNAL( completed() ),
+           this, TQ_SLOT( updateActions() ) );
+  connect( this, TQ_SIGNAL( completed( bool ) ),
+           this, TQ_SLOT( updateActions() ) );
+  connect( this, TQ_SIGNAL( started( TDEIO::Job * ) ),
+           this, TQ_SLOT( updateActions() ) );
 
   d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) );
 
-  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
-           this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
-  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
-  connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+           this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+  connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
 
-  connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) );
+  connect ( &d->m_progressUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressUpdate() ) );
 
   findTextBegin(); //reset find variables
 
-  connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ),
-           this, TQT_SLOT( slotRedirect() ) );
+  connect( &d->m_redirectionTimer, TQ_SIGNAL( timeout() ),
+           this, TQ_SLOT( slotRedirect() ) );
 
   d->m_dcopobject = new TDEHTMLPartIface(this);
 
@@ -495,12 +495,12 @@ TDEHTMLPart::~TDEHTMLPart()
   if (!d->m_bComplete)
     closeURL();
 
-  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
-           this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
-  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
-  disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
-           this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ),
+           this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) );
+  disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
+  disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+           this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) );
 
   clear();
 
@@ -551,10 +551,10 @@ bool TDEHTMLPart::restoreURL( const KURL &url )
   m_url = url;
 
   d->m_restoreScrollPosition = true;
-  disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
-  connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+  disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
+  connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
 
-  TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &)));
+  TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQ_SLOT(slotRestoreData(const TQByteArray &)));
 
   emit started( 0L );
 
@@ -672,8 +672,8 @@ bool TDEHTMLPart::openURL( const KURL &url )
     closeURL();
 
   d->m_restoreScrollPosition = d->m_restored;
-  disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
-  connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+  disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
+  connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
 
   // initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first
   // data arrives) (Simon)
@@ -719,14 +719,14 @@ bool TDEHTMLPart::openURL( const KURL &url )
      d->m_job->setWindow(widget()->topLevelWidget());
   d->m_job->addMetaData(args.metaData());
 
-  connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
-  connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-           TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-           TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
-  connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
-           TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
+  connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
+  connect( d->m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect ( d->m_job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) );
+  connect( d->m_job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ),
+           TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) );
 
   d->m_bComplete = false;
   d->m_bLoadEventEmitted = false;
@@ -742,14 +742,14 @@ bool TDEHTMLPart::openURL( const KURL &url )
   d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host());
 
 
-  connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
-           this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( d->m_job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+           this, TQ_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) );
 
-  connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
-           this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
+  connect( d->m_job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+           this, TQ_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) );
 
-  connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) );
+  connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( slotJobDone( TDEIO::Job* ) ) );
 
   d->m_jobspeed = 0;
 
@@ -758,8 +758,8 @@ bool TDEHTMLPart::openURL( const KURL &url )
   if ( args.reload && !settings()->userStyleSheet().isEmpty() ) {
     KURL url( settings()->userStyleSheet() );
     TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQ_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) );
   }
   emit started( 0L );
 
@@ -790,7 +790,7 @@ bool TDEHTMLPart::closeURL()
   d->m_bLoadEventEmitted = true; // don't want that one either
   d->m_cachePolicy = KProtocolManager::cacheControl(); // reset cache policy
 
-  disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+  disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
 
   TDEHTMLPageCache::self()->cancelFetch(this);
   if ( d->m_doc && d->m_doc->parsing() )
@@ -1079,8 +1079,8 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() {
     d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false);
     TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors."));
     d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance()));
-    connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog()));
-    connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu()));
+    connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchJSErrorDialog()));
+    connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(jsErrorDialogContextMenu()));
   }
   if (!d->m_jsedlg) {
     d->m_jsedlg = new KJSErrorDlg;
@@ -1119,8 +1119,8 @@ void TDEHTMLPart::disableJSErrorExtension() {
 
 void TDEHTMLPart::jsErrorDialogContextMenu() {
   TDEPopupMenu *m = new TDEPopupMenu(0L);
-  m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension()));
-  m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension()));
+  m->insertItem(i18n("&Hide Errors"), this, TQ_SLOT(removeJSErrorExtension()));
+  m->insertItem(i18n("&Disable Error Reporting"), this, TQ_SLOT(disableJSErrorExtension()));
   m->popup(TQCursor::pos());
 }
 
@@ -1251,7 +1251,7 @@ bool TDEHTMLPart::javaEnabled() const
 {
   if (onlyLocalReferences()) return false;
 
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
   if( d->m_bJavaOverride )
       return d->m_bJavaForce;
   return d->m_bJavaEnabled;
@@ -1347,7 +1347,7 @@ void TDEHTMLPart::setAutoloadImages( bool enable )
     d->m_paLoadImages = 0;
   }
   else if ( !d->m_paLoadImages )
-    d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
+    d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQ_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
 
   if ( d->m_paLoadImages ) {
     TQPtrList<TDEAction> lst;
@@ -1429,8 +1429,8 @@ void TDEHTMLPart::clear()
 
   // We don't want to change between parts if we are going to delete all of them anyway
   if (partManager()) {
-    disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
-               this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+    disconnect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+               this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
   }
 
   if (d->m_frames.count())
@@ -1464,8 +1464,8 @@ void TDEHTMLPart::clear()
 
   // Listen to part changes again
   if (partManager()) {
-    connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
-             this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+    connect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+             this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
   }
 
   d->m_delayRedirect = 0;
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
   d->m_startOffset = 0;
   d->m_endOffset = 0;
 #ifndef TQT_NO_CLIPBOARD
-  connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+  connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 #endif
 
   d->m_jobPercent = 0;
@@ -1531,7 +1531,7 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec )
     d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
     d->m_statusBarIconLabel->setUseCursor( false );
     d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false );
-    connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) );
+    connect( d->m_statusBarIconLabel, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( slotSecurity() ) );
   } else if (d->m_statusBarIconLabel) {
     TQToolTip::remove(d->m_statusBarIconLabel);
   }
@@ -1844,7 +1844,7 @@ void TDEHTMLPart::slotFinished( TDEIO::Job * job )
 
     return;
   }
-  TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job);
+  TDEIO::TransferJob *tjob = ::tqt_cast<TDEIO::TransferJob*>(job);
   if (tjob && tjob->isErrorPage()) {
     tdehtml::RenderPart *renderPart = d->m_frame ? static_cast<tdehtml::RenderPart *>(d->m_frame->m_frame) : 0;
     if (renderPart) {
@@ -1953,7 +1953,7 @@ void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
 
   d->m_doc->setRestoreState(args.docState);
   d->m_doc->open();
-  connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
+  connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
 
   emit d->m_extension->enableAction( "print", true );
 
@@ -2071,8 +2071,8 @@ void TDEHTMLPart::resetFromScript()
     closeURL();
     d->m_bComplete = false;
     d->m_bLoadEventEmitted = false;
-    disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
-    connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
+    disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
+    connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
     d->m_doc->setParsing(true);
 
     emit started( 0L );
@@ -2082,7 +2082,7 @@ void TDEHTMLPart::slotFinishedParsing()
 {
   d->m_doc->setParsing(false);
   checkEmitLoadEvent();
-  disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing()));
+  disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing()));
 
   if (!d->m_view)
     return; // We are probably being destructed.
@@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText()
 
   // The lineedit of the dialog would make tdehtml lose its selection, otherwise
 #ifndef TQT_NO_CLIPBOARD
-  disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
+  disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) );
 #endif
 
   // Now show the dialog in which the user can choose options.
@@ -3026,8 +3026,8 @@ void TDEHTMLPart::findText()
   d->m_lastFindState.last_dir = -1;
 
   d->m_findDialog->show();
-  connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) );
-  connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) );
+  connect( d->m_findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFindNext()) );
+  connect( d->m_findDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFindDialogDestroyed()) );
 
   findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog );
 }
@@ -3039,17 +3039,17 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
     return;
 
 #ifndef TQT_NO_CLIPBOARD
-  connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
+  connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) );
 #endif
 
   // Create the KFind object
   delete d->m_find;
   d->m_find = new KFind( str, options, parent, findDialog );
   d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up
-  connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
-           this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
-  //connect(d->m_find, TQT_SIGNAL( findNext() ),
-  //        this, TQT_SLOT( slotFindNext() ) );
+  connect( d->m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ),
+           this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) );
+  //connect(d->m_find, TQ_SIGNAL( findNext() ),
+  //        this, TQ_SLOT( slotFindNext() ) );
 
   if ( !findDialog )
   {
@@ -3933,7 +3933,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state,
     return true;
   }
 
-  if ( button == Qt::LeftButton && ( state & ShiftButton ) )
+  if ( button == TQt::LeftButton && ( state & ShiftButton ) )
   {
     TDEIO::MetaData metaData;
     metaData["referrer"] = d->m_referrer;
@@ -3972,7 +3972,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state,
     args.metaData()["referrer"] = d->m_referrer;
 
 
-  if ( button == Qt::NoButton && (state & ShiftButton) && (state & ControlButton) )
+  if ( button == TQt::NoButton && (state & ShiftButton) && (state & ControlButton) )
   {
     emit d->m_extension->createNewWindow( cURL, args );
     return true;
@@ -4489,12 +4489,12 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &
     //CRITICAL STUFF
     if ( child->m_part )
     {
-      if (!::tqqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript)
+      if (!::tqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript)
           child->m_jscript->clear();
       partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part );
       delete (KParts::ReadOnlyPart *)child->m_part;
       if (child->m_liveconnect) {
-        disconnect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
+        disconnect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
         child->m_liveconnect = 0L;
       }
     }
@@ -4510,70 +4510,70 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL &
 
     child->m_part = part;
 
-    if (::tqqt_cast<TDEHTMLPart*>(part)) {
+    if (::tqt_cast<TDEHTMLPart*>(part)) {
       static_cast<TDEHTMLPart*>(part)->d->m_frame = child;
     } else if (child->m_frame) {
       child->m_liveconnect = KParts::LiveConnectExtension::childObject(part);
       if (child->m_liveconnect)
-        connect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
+        connect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &)));
     }
     KParts::StatusBarExtension *sb = KParts::StatusBarExtension::childObject(part);
     if (sb)
       sb->setStatusBar( d->m_statusBarExtension->statusBar() );
 
-    connect( part, TQT_SIGNAL( started( TDEIO::Job *) ),
-             this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) );
-    connect( part, TQT_SIGNAL( completed() ),
-             this, TQT_SLOT( slotChildCompleted() ) );
-    connect( part, TQT_SIGNAL( completed(bool) ),
-             this, TQT_SLOT( slotChildCompleted(bool) ) );
-    connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-                this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) );
+    connect( part, TQ_SIGNAL( started( TDEIO::Job *) ),
+             this, TQ_SLOT( slotChildStarted( TDEIO::Job *) ) );
+    connect( part, TQ_SIGNAL( completed() ),
+             this, TQ_SLOT( slotChildCompleted() ) );
+    connect( part, TQ_SIGNAL( completed(bool) ),
+             this, TQ_SLOT( slotChildCompleted(bool) ) );
+    connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+                this, TQ_SIGNAL( setStatusBarText( const TQString & ) ) );
     if ( part->inherits( "TDEHTMLPart" ) )
     {
-      connect( this, TQT_SIGNAL( completed() ),
-               part, TQT_SLOT( slotParentCompleted() ) );
-      connect( this, TQT_SIGNAL( completed(bool) ),
-               part, TQT_SLOT( slotParentCompleted() ) );
+      connect( this, TQ_SIGNAL( completed() ),
+               part, TQ_SLOT( slotParentCompleted() ) );
+      connect( this, TQ_SIGNAL( completed(bool) ),
+               part, TQ_SLOT( slotParentCompleted() ) );
       // As soon as the child's document is created, we need to set its domain
       // (but we do so only once, so it can't be simply done in the child)
-      connect( part, TQT_SIGNAL( docCreated() ),
-               this, TQT_SLOT( slotChildDocCreated() ) );
+      connect( part, TQ_SIGNAL( docCreated() ),
+               this, TQ_SLOT( slotChildDocCreated() ) );
     }
 
     child->m_extension = KParts::BrowserExtension::childObject( part );
 
     if ( child->m_extension )
     {
-      connect( child->m_extension, TQT_SIGNAL( openURLNotify() ),
-               d->m_extension, TQT_SIGNAL( openURLNotify() ) );
-
-      connect( child->m_extension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
-               this, TQT_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) );
-
-      connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
-               d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
-      connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
-               d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
-
-      connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
-               d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
-      connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
-               d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
-      connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
-               d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
-      connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-               d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
-      connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-               d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
-      connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
-               d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
-
-      connect( child->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ),
-               d->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) );
-
-      connect( child->m_extension, TQT_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ),
-               this, TQT_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) );
+      connect( child->m_extension, TQ_SIGNAL( openURLNotify() ),
+               d->m_extension, TQ_SIGNAL( openURLNotify() ) );
+
+      connect( child->m_extension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+               this, TQ_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+
+      connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+               d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+      connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+               d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
+
+      connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+               d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
+      connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+               d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+      connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+               d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+      connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+               d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+      connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+               d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+      connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+               d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+
+      connect( child->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ),
+               d->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) );
+
+      connect( child->m_extension, TQ_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ),
+               this, TQ_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) );
 
       child->m_extension->setBrowserInterface( d->m_extension->browserInterface() );
     }
@@ -4684,7 +4684,7 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha
       if ( factory->inherits( "KParts::Factory" ) )
         res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params ));
       else
-        res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className ));
+        res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className ));
 
       if ( res ) {
         serviceTypes = service->serviceTypes();
@@ -4706,10 +4706,10 @@ KParts::PartManager *TDEHTMLPart::partManager()
   {
     d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" );
     d->m_manager->setAllowNestedParts( true );
-    connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
-             this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
-    connect( d->m_manager, TQT_SIGNAL( partRemoved( KParts::Part * ) ),
-             this, TQT_SLOT( slotPartRemoved( KParts::Part * ) ) );
+    connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+             this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) );
+    connect( d->m_manager, TQ_SIGNAL( partRemoved( KParts::Part * ) ),
+             this, TQ_SLOT( slotPartRemoved( KParts::Part * ) ) );
   }
 
   return d->m_manager;
@@ -4717,7 +4717,7 @@ KParts::PartManager *TDEHTMLPart::partManager()
 
 void TDEHTMLPart::submitFormAgain()
 {
-  disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain()));
+  disconnect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain()));
   if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm)
     TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary );
 
@@ -4924,7 +4924,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB
     d->m_submitForm->target = _target;
     d->m_submitForm->submitContentType = contentType;
     d->m_submitForm->submitBoundary = boundary;
-    connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain()));
+    connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain()));
   }
   else
   {
@@ -5033,7 +5033,7 @@ void TDEHTMLPart::slotParentCompleted()
 
 void TDEHTMLPart::slotChildStarted( TDEIO::Job *job )
 {
-  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( sender() );
 
   assert( child );
 
@@ -5060,7 +5060,7 @@ void TDEHTMLPart::slotChildCompleted()
 
 void TDEHTMLPart::slotChildCompleted( bool pendingAction )
 {
-  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) );
+  tdehtml::ChildFrame *child = frame( sender() );
 
   if ( child ) {
     kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl;
@@ -5088,12 +5088,12 @@ void TDEHTMLPart::slotChildDocCreated()
     }
   }
   // So it only happens once
-  disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) );
+  disconnect( htmlFrame, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( slotChildDocCreated() ) );
 }
 
 void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args )
 {
-  tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() );
+  tdehtml::ChildFrame *child = frame( sender()->parent() );
   TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent()));
 
   // TODO: handle child target correctly! currently the script are always executed fur the parent
@@ -5302,7 +5302,7 @@ bool TDEHTMLPart::frameExists( const TQString &frameName )
 
 KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart)
 {
-  TDEHTMLPart* const kp = ::tqqt_cast<TDEHTMLPart*>(framePart);
+  TDEHTMLPart* const kp = ::tqt_cast<TDEHTMLPart*>(framePart);
   if (kp)
     return kp->jScript();
 
@@ -5320,7 +5320,7 @@ KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart)
 
 TDEHTMLPart *TDEHTMLPart::parentPart()
 {
-  return ::tqqt_cast<TDEHTMLPart *>( parent() );
+  return ::tqt_cast<TDEHTMLPart *>( parent() );
 }
 
 tdehtml::ChildFrame *TDEHTMLPart::recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url,
@@ -5733,7 +5733,7 @@ void TDEHTMLPart::setZoomFactor (int percent)
   d->m_zoomFactor = percent;
 
   if(d->m_doc) {
-      TQApplication::setOverrideCursor( tqwaitCursor );
+      TQApplication::setOverrideCursor( TQt::waitCursor );
     if (d->m_doc->styleSelector())
       d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor);
     d->m_doc->recalcStyle( NodeImpl::Force );
@@ -5839,7 +5839,7 @@ TQString TDEHTMLPart::lastModified() const
     // Done on demand to save time when this isn't needed - but can lead
     // to slightly wrong results if updating the file on disk w/o reloading.
     TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified();
-    d->m_lastModified = lastModif.toString( Qt::LocalDate );
+    d->m_lastModified = lastModif.toString( TQt::LocalDate );
   }
   //kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl;
   return d->m_lastModified;
@@ -5879,7 +5879,7 @@ void TDEHTMLPart::reparseConfiguration()
   delete d->m_settings;
   d->m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings());
 
-  TQApplication::setOverrideCursor( tqwaitCursor );
+  TQApplication::setOverrideCursor( TQt::waitCursor );
   tdehtml::CSSStyleSelector::reparseConfiguration();
   if(d->m_doc) d->m_doc->updateStyleSelector();
   TQApplication::restoreOverrideCursor();
@@ -6062,13 +6062,13 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
    else
      d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString();
 
-  if ( _mouse->button() == Qt::LeftButton ||
-       _mouse->button() == Qt::MidButton )
+  if ( _mouse->button() == TQt::LeftButton ||
+       _mouse->button() == TQt::MidButton )
   {
     d->m_bMousePressed = true;
 
 #ifndef TDEHTML_NO_SELECTION
-    if ( _mouse->button() == Qt::LeftButton )
+    if ( _mouse->button() == TQt::LeftButton )
     {
       if ( (!d->m_strSelectedURL.isNull() && !isEditable())
 	        || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) )
@@ -6116,10 +6116,10 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
 #endif
   }
 
-  if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
+  if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
   {
     d->m_bRightMousePressed = true;
-  } else if ( _mouse->button() == Qt::RightButton )
+  } else if ( _mouse->button() == TQt::RightButton )
   {
     popupMenu( d->m_strSelectedURL );
     // might be deleted, don't touch "this"
@@ -6129,7 +6129,7 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event )
 void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event )
 {
   TQMouseEvent *_mouse = event->qmouseEvent();
-  if ( _mouse->button() == Qt::LeftButton )
+  if ( _mouse->button() == TQt::LeftButton )
   {
     d->m_bMousePressed = true;
     DOM::Node innerNode = event->innerNode();
@@ -6498,7 +6498,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
 #ifndef TDEHTML_NO_SELECTION
     // selection stuff
     if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() &&
-        ( (_mouse->state() & Qt::LeftButton) != 0 )) {
+        ( (_mouse->state() & TQt::LeftButton) != 0 )) {
       extendSelectionTo(event->x(), event->y(),
                         event->absX(), event->absY(), innerNode);
 #else
@@ -6530,7 +6530,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
   d->m_bMousePressed = false;
 
   TQMouseEvent *_mouse = event->qmouseEvent();
-  if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
+  if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick )
   {
     d->m_bRightMousePressed = false;
     KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface();
@@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
     }
   }
 #ifndef TQT_NO_CLIPBOARD
-  if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
+  if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == TQt::MidButton) && (event->url().isNull())) {
     kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
                     << d->m_bOpenMiddleClick << endl;
 
@@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
 #ifndef TQT_NO_CLIPBOARD
     TQString text = selectedText();
     text.replace(TQChar(0xa0), ' ');
-    disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
+    disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
     kapp->clipboard()->setText(text,TQClipboard::Selection);
-    connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+    connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 #endif
     //kdDebug( 6000 ) << "selectedText = " << text << endl;
     emitSelectionChanged();
@@ -6681,13 +6681,13 @@ void TDEHTMLPart::slotSelectAll()
 
 void TDEHTMLPart::startAutoScroll()
 {
-   connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ));
+   connect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ));
    d->m_scrollTimer.start(100, false);
 }
 
 void TDEHTMLPart::stopAutoScroll()
 {
-   disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ));
+   disconnect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ));
    if (d->m_scrollTimer.isActive())
        d->m_scrollTimer.stop();
 }
@@ -6876,7 +6876,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
         return;
     }
 //    kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl;
-    if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( "TQFrame" ) )
     {
         TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
         if (frame->frameStyle() != TQFrame::NoFrame)
@@ -6904,7 +6904,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part )
 
     d->m_activeFrame = part;
 
-    if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) )
+    if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( "TQFrame" ) )
     {
         TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() );
         if (frame->frameStyle() != TQFrame::NoFrame)
@@ -7114,7 +7114,7 @@ void TDEHTMLPart::restoreScrollPosition()
 
   if ( m_url.hasRef() && !d->m_restoreScrollPosition && !args.reload) {
     if ( !d->m_doc || !d->m_doc->parsing() )
-      disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+      disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
     if ( !gotoAnchor(m_url.encodedHtmlRef()) )
       gotoAnchor(m_url.htmlRef());
     return;
@@ -7127,7 +7127,7 @@ void TDEHTMLPart::restoreScrollPosition()
   if (d->m_view->contentsHeight() - d->m_view->visibleHeight() >= args.yOffset
       || d->m_bComplete) {
     d->m_view->setContentsPos(args.xOffset, args.yOffset);
-    disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition()));
+    disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition()));
   }
 }
 
@@ -7165,8 +7165,8 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
     TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
     d->m_wq = new TDEHTMLWalletQueue(this);
     d->m_wq->wallet = wallet;
-    connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
-    connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
+    connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool)));
+    connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*)));
   }
   assert(form);
   d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument()));
@@ -7207,8 +7207,8 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin
     TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous);
     d->m_wq = new TDEHTMLWalletQueue(this);
     d->m_wq->wallet = wallet;
-    connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool)));
-    connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*)));
+    connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool)));
+    connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*)));
   }
   d->m_wq->savers.append(qMakePair(key, data));
 #endif // TDEHTML_NO_WALLET
@@ -7249,7 +7249,7 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) {
 
   d->m_wallet = wallet;
   d->m_bWalletOpened = true;
-  connect(d->m_wallet, TQT_SIGNAL(walletClosed()), TQT_SLOT(slotWalletClosed()));
+  connect(d->m_wallet, TQ_SIGNAL(walletClosed()), TQ_SLOT(slotWalletClosed()));
 
   if (!d->m_statusBarWalletLabel) {
     d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar());
@@ -7258,8 +7258,8 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) {
     d->m_statusBarWalletLabel->setUseCursor(false);
     d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false);
     d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance()));
-    connect(d->m_statusBarWalletLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchWalletManager()));
-    connect(d->m_statusBarWalletLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(walletMenu()));
+    connect(d->m_statusBarWalletLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchWalletManager()));
+    connect(d->m_statusBarWalletLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(walletMenu()));
   } else {
     TQToolTip::remove(d->m_statusBarWalletLabel);
   }
@@ -7317,7 +7317,7 @@ void TDEHTMLPart::walletMenu()
 {
 #ifndef TDEHTML_NO_WALLET
   TDEPopupMenu *m = new TDEPopupMenu(0L);
-  m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed()));
+  m->insertItem(i18n("&Close Wallet"), this, TQ_SLOT(slotWalletClosed()));
   m->popup(TQCursor::pos());
 #endif // TDEHTML_NO_WALLET
 }
@@ -7360,7 +7360,7 @@ void TDEHTMLPart::setDebugScript( bool enable )
   unplugActionList( "debugScriptList" );
   if ( enable ) {
     if (!d->m_paDebugScript) {
-      d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
+      d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQ_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
     }
     d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
     TQPtrList<TDEAction> lst;
@@ -7397,7 +7397,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP
         d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) );
         TQToolTip::add( d->m_statusBarPopupLabel, i18n("This page was prevented from opening a new window via JavaScript." ) );
 
-        connect(d->m_statusBarPopupLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(suppressedPopupMenu()));
+        connect(d->m_statusBarPopupLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(suppressedPopupMenu()));
         if (d->m_settings->jsPopupBlockerPassivePopup()) {
             TQPixmap px;
             px = MainBarIcon( "window_suppressed" );
@@ -7415,10 +7415,10 @@ void TDEHTMLPart::suppressedPopupMenu() {
   TDEPopupMenu *m = new TDEPopupMenu(0L);
   m->setCheckable(true);
   if ( d->m_openableSuppressedPopups )
-      m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups()));
-  m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQT_SLOT(togglePopupPassivePopup()),0,57);
+      m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQ_SLOT(showSuppressedPopups()));
+  m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQ_SLOT(togglePopupPassivePopup()),0,57);
   m->setItemChecked(57,d->m_settings->jsPopupBlockerPassivePopup());
-  m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQT_SLOT(launchJSConfigDialog()));
+  m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQ_SLOT(launchJSConfigDialog()));
   m->popup(TQCursor::pos());
 }
 
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 20cdd68c8..7d3f01312 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -182,7 +182,7 @@ namespace TDEWallet
  */
 class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class TDEHTMLView;
   friend class DOM::HTMLTitleElementImpl;
   friend class DOM::HTMLFrameElementImpl;
diff --git a/tdehtml/tdehtml_printsettings.h b/tdehtml/tdehtml_printsettings.h
index 2a92d0e3c..1e1250824 100644
--- a/tdehtml/tdehtml_printsettings.h
+++ b/tdehtml/tdehtml_printsettings.h
@@ -26,7 +26,7 @@ class TQCheckBox;
 
 class TDEHTMLPrintSettings : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0);
 	~TDEHTMLPrintSettings();
diff --git a/tdehtml/tdehtml_run.h b/tdehtml/tdehtml_run.h
index 401bc7fd6..b4e11829a 100644
--- a/tdehtml/tdehtml_run.h
+++ b/tdehtml/tdehtml_run.h
@@ -37,7 +37,7 @@ namespace tdehtml
 
 class TDEHTMLRun : public KParts::BrowserRun
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url,
             const KParts::URLArgs &args, bool hideErrorDialog );
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cpp
index 7f799e311..2e4c5dcb6 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cpp
@@ -442,7 +442,7 @@ void TDEHTMLSettings::init( TDEConfig * config, bool reset )
     d->m_fallbackAccessKeysAssignments.clear();
     for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it )
         if( (*it).length() > 2 && (*it)[ 1 ] == ':' )
-            d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
+            d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
   }
 
   // Colors
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index dc2a51c66..726f6d6c1 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -62,7 +62,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
                         TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof )
     : KParts::ReadOnlyPart( parent, name ), m_image( 0 )
 {
-    TDEHTMLPart* parentPart = ::tqqt_cast<TDEHTMLPart *>( parent );
+    TDEHTMLPart* parentPart = ::tqt_cast<TDEHTMLPart *>( parent );
     setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart );
 
     TQVBox *box = new TQVBox( parentWidget, widgetName );
@@ -70,7 +70,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
     m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof );
     m_tdehtml->setAutoloadImages( true );
     m_tdehtml->widget()->installEventFilter(this);
-    connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) );
+    connect( m_tdehtml->view(), TQ_SIGNAL( finishedLayout() ), this, TQ_SLOT( restoreScrollPosition() ) );
 
     setWidget( box );
 
@@ -103,17 +103,17 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
     // forward important signals from the tdehtml part
 
     // forward opening requests to parent frame (if existing)
-    TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent);
+    TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent);
     KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext;
-    connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
-    		be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)));
+    connect(m_tdehtml->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)),
+    		be, TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)));
 
-    connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
-             const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
+    connect( m_tdehtml->browserExtension(), TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
+             const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,
              const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) );
 
-    connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ),
-             m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) );
+    connect( m_tdehtml->browserExtension(), TQ_SIGNAL( enableAction( const char *, bool ) ),
+             m_ext, TQ_SIGNAL( enableAction( const char *, bool ) ) );
 
     m_ext->setURLDropHandlingEnabled( true );
 }
@@ -169,8 +169,8 @@ bool TDEHTMLImage::openURL( const KURL &url )
     m_tdehtml->end();
 
     /*
-    connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
-            this, TQT_SLOT( updateWindowCaption() ) );
+    connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ),
+            this, TQ_SLOT( updateWindowCaption() ) );
             */
     return true;
 }
@@ -242,7 +242,7 @@ void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job )
     else
     {
         emit completed();
-        TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) );
     }
 }
 
@@ -304,7 +304,7 @@ bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) {
       case TQEvent::Drop: {
         // find out if this part is embedded in a frame, and send the
 	// event to its outside widget
-	TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent());
+	TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent());
 	if (p)
 	    return TQApplication::sendEvent(p->widget(), e);
         // otherwise simply forward all dnd events to the part widget,
diff --git a/tdehtml/tdehtmlimage.h b/tdehtml/tdehtmlimage.h
index 8b8b5893b..6fd3fd928 100644
--- a/tdehtml/tdehtmlimage.h
+++ b/tdehtml/tdehtmlimage.h
@@ -39,7 +39,7 @@ namespace tdehtml
  */
 class TDEHTMLImageFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEHTMLImageFactory();
     virtual ~TDEHTMLImageFactory();
@@ -59,7 +59,7 @@ private:
  */
 class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof );
@@ -100,7 +100,7 @@ private:
  */
 class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 );
 
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 90be612b2..132624fdd 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -74,7 +74,7 @@ namespace tdehtml
 {
   class KDE_EXPORT ChildFrame : public TQObject
   {
-      Q_OBJECT
+      TQ_OBJECT
   public:
       enum Type { Frame, IFrame, Object };
 
@@ -129,7 +129,7 @@ static int tdehtml_part_dcop_counter = 0;
 
 class TDEHTMLWalletQueue : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) {
 #ifndef TDEHTML_NO_WALLET
@@ -146,10 +146,10 @@ class TDEHTMLWalletQueue : public TQObject
 #ifndef TDEHTML_NO_WALLET
     TDEWallet::Wallet *wallet;
 #endif // TDEHTML_NO_WALLET
-    typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
+    typedef TQPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller;
     typedef TQValueList<Caller> CallerList;
     CallerList callers;
-    TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers;
+    TQValueList<TQPair<TQString, TQMap<TQString, TQString> > > savers;
 
   signals:
     void walletOpened(TDEWallet::Wallet*);
@@ -172,7 +172,7 @@ class TDEHTMLWalletQueue : public TQObject
           }
         }
         wallet->setFolder(TDEWallet::Wallet::FormDataFolder());
-        for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
+        for (TQValueList<TQPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) {
           wallet->writeMap((*i).first, (*i).second);
         }
       }
@@ -220,7 +220,7 @@ public:
     m_jsedlg = 0;
     m_formNotification = TDEHTMLPart::NoNotification;
 
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
     m_javaContext = 0;
 #endif
     m_cacheId = 0;
@@ -298,7 +298,7 @@ public:
 #ifndef TDEHTML_NO_WALLET
     delete m_wallet;
 #endif
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
     //delete m_javaContext;
 #endif
   }
@@ -350,7 +350,7 @@ public:
   int m_dcop_counter;
   DCOPObject *m_dcopobject;
 
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
   KJavaAppletContext *m_javaContext;
 #endif
 
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index b3679c6cc..bbc45da95 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -94,7 +94,7 @@
 
 //#define DEBUG_PIXEL
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -493,13 +493,13 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
     d = new TDEHTMLViewPrivate;
     TQScrollView::setVScrollBarMode(d->vmode);
     TQScrollView::setHScrollBarMode(d->hmode);
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged()));
-    connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved()));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged()));
+    connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved()));
 
     // initialize QScrollView
     enableClipper(true);
     // hack to get unclipped painting on the viewport.
-    static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped);
+    static_cast<TDEHTMLView *>(viewport())->setWFlags(WPaintUnclipped);
 
     setResizePolicy(Manual);
     viewport()->setMouseTracking(true);
@@ -512,7 +512,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
 #endif
 
 #ifndef TDEHTML_NO_TYPE_AHEAD_FIND
-    connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout()));
+    connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(findTimeout()));
 #endif // TDEHTML_NO_TYPE_AHEAD_FIND
 
     init();
@@ -520,7 +520,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
     viewport()->show();
 #ifndef NO_SMOOTH_SCROLL_HACK
 #define timer timer2
-    connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick()));
+    connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick()));
 #undef timer
 #endif
 }
@@ -546,7 +546,7 @@ void TDEHTMLView::init()
         d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT);
     if(!d->tp) d->tp = new TQPainter();
 
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     viewport()->setFocusProxy(this);
 
     _marginWidth = -1; // undefined
@@ -579,7 +579,7 @@ void TDEHTMLView::clear()
     if ( d->cursor_icon_widget )
         d->cursor_icon_widget->hide();
     d->reset();
-    TQT_TQOBJECT(this)->killTimers();
+    this->killTimers();
     emit cleared();
 
     TQScrollView::setHScrollBarMode(d->hmode);
@@ -897,7 +897,7 @@ void TDEHTMLView::layout()
 
 void TDEHTMLView::closeChildDialogs()
 {
-    TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING);
+    TQObjectList *dlgs = queryList("TQDialog");
     for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next())
     {
         KDialogBase* dlgbase = dynamic_cast<KDialogBase *>( dlg );
@@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs()
         }
         else
         {
-            kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl;
-            TQT_TQWIDGET(dlg)->hide();
+            kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl;
+            static_cast<TQWidget*>(dlg)->hide();
         }
     }
     delete dlgs;
@@ -941,7 +941,7 @@ void TDEHTMLView::closeEvent( TQCloseEvent* ev )
 void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
 {
     if (!m_part->xmlDocImpl()) return;
-    if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton)
+    if (d->possibleTripleClick && ( _mouse->button() & TQt::MouseButtonMask ) == TQt::LeftButton)
     {
         viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too
         return;
@@ -958,7 +958,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
 
     //kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl;
 
-    if ( (_mouse->button() == Qt::MidButton) &&
+    if ( (_mouse->button() == TQt::MidButton) &&
           !m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer &&
           mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) {
         TQPoint point = mapFromGlobal( _mouse->globalPos() );
@@ -967,7 +967,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
         d->m_mouseScroll_byY = 0;
 
         d->m_mouseScrollTimer = new TQTimer( this );
-        connect( d->m_mouseScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMouseScrollTimer()) );
+        connect( d->m_mouseScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMouseScrollTimer()) );
 
         if ( !d->m_mouseScrollIndicator ) {
             TQPixmap pixmap, icon;
@@ -1095,7 +1095,7 @@ void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse )
     }
 
     d->possibleTripleClick=true;
-    TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout()));
+    TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout()));
 }
 
 void TDEHTMLView::tripleClickTimeout()
@@ -1112,11 +1112,11 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent
     TQPoint p(x-absx, y-absy);
     TQMouseEvent fw(me->type(), p, me->button(), me->state());
     TQWidget* w = r->widget();
-    TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w);
-    if (sc && !::tqqt_cast<TQListBox*>(w))
-        static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw));
+    TQScrollView* sc = ::tqt_cast<TQScrollView*>(w);
+    if (sc && !::tqt_cast<TQListBox*>(w))
+        static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(static_cast<TQEvent*>(&fw));
     else if(w)
-        static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw));
+        static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(static_cast<TQEvent*>(&fw));
 }
 
 
@@ -1168,7 +1168,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
 
     DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseMove );
     // Do not modify :hover/:active state while mouse is pressed.
-    m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & Qt::MouseButtonMask /*readonly ?*/, xm, ym, &mev );
+    m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & TQt::MouseButtonMask /*readonly ?*/, xm, ym, &mev );
 
 //     kdDebug(6000) << "mouse move: " << _mouse->pos()
 // 		  << " button " << _mouse->button()
@@ -1268,7 +1268,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
     }
 
     if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true );
 
         if (d->cursor_icon_widget) {
@@ -1341,7 +1341,7 @@ void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse )
         DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode();
         if (fn && fn != mev.innerNode.handle() &&
             fn->renderer() && fn->renderer()->isWidget() &&
-            _mouse->button() != Qt::MidButton) {
+            _mouse->button() != TQt::MidButton) {
             forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym);
         }
 
@@ -1895,27 +1895,27 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 
     TQWidget *view = viewport();
 
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(view)) {
+    if (o == view) {
 	// we need to install an event filter on all children of the viewport to
 	// be able to get correct stacking of children within the document.
 	if(e->type() == TQEvent::ChildInserted) {
-	    TQObject *c = TQT_TQOBJECT(TQT_TQCHILDEVENT(e)->child());
+	    TQObject *c = static_cast<TQChildEvent*>(e)->child();
 	    if (c->isWidgetType()) {
-		TQWidget *w = TQT_TQWIDGET(c);
+		TQWidget *w = static_cast<TQWidget*>(c);
 		// don't install the event filter on toplevels
 		if (w->parentWidget(true) == view) {
 		    if (!strcmp(w->name(), "__tdehtml")) {
 			w->installEventFilter(this);
 			w->unsetCursor();
-			if (!::tqqt_cast<TQFrame*>(w))
+			if (!::tqt_cast<TQFrame*>(w))
 			    w->setBackgroundMode( TQWidget::NoBackground );
 			static_cast<HackWidget *>(w)->setNoErase();
 			if (!w->childrenListObject().isEmpty()) {
 			    TQObjectListIterator it(w->childrenListObject());
 			    for (; it.current(); ++it) {
-				TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current());
+				TQWidget *widget = ::tqt_cast<TQWidget *>(it.current());
 				if (widget && !widget->isTopLevel()) {
-				    if (!::tqqt_cast<TQFrame*>(w))
+				    if (!::tqt_cast<TQFrame*>(w))
 				        widget->setBackgroundMode( TQWidget::NoBackground );
 				    static_cast<HackWidget *>(widget)->setNoErase();
 				    widget->installEventFilter(this);
@@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    }
 	}
     } else if (o->isWidgetType()) {
-	TQWidget *v = TQT_TQWIDGET(o);
+	TQWidget *v = static_cast<TQWidget*>(o);
         TQWidget *c = v;
 	while (v && v != view) {
             c = v;
@@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 
 	if (v && !strcmp(c->name(), "__tdehtml")) {
 	    bool block = false;
-	    TQWidget *w = TQT_TQWIDGET(o);
+	    TQWidget *w = static_cast<TQWidget*>(o);
 	    switch(e->type()) {
 	    case TQEvent::Paint:
 		if (!allowWidgetPaintEvents) {
@@ -1951,8 +1951,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 			v = v->parentWidget();
 		    }
 		    viewportToContents( x, y, x, y );
-		    TQPaintEvent *pe = TQT_TQPAINTEVENT(e);
-		    bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c);
+		    TQPaintEvent *pe = static_cast<TQPaintEvent*>(e);
+		    bool asap = !d->contentsMoving && ::tqt_cast<TQScrollView *>(c);
 
 		    // TQScrollView needs fast repaints
 		    if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() &&
@@ -1969,8 +1969,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    case TQEvent::MouseButtonPress:
 	    case TQEvent::MouseButtonRelease:
 	    case TQEvent::MouseButtonDblClick: {
-		if ( (w->parentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) {
-		    TQMouseEvent *me = TQT_TQMOUSEEVENT(e);
+		if ( (w->parentWidget() == view || ::tqt_cast<TQScrollView*>(c)) && !::tqt_cast<TQScrollBar *>(w)) {
+		    TQMouseEvent *me = static_cast<TQMouseEvent*>(e);
 		    TQPoint pt = w->mapTo( view, me->pos());
 		    TQMouseEvent me2(me->type(), pt, me->button(), me->state());
 
@@ -1988,8 +1988,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e)
 	    }
 	    case TQEvent::KeyPress:
 	    case TQEvent::KeyRelease:
-		if (w->parentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) {
-		    TQKeyEvent *ke = TQT_TQKEYEVENT(e);
+		if (w->parentWidget() == view && !::tqt_cast<TQScrollBar *>(w)) {
+		    TQKeyEvent *ke = static_cast<TQKeyEvent*>(e);
 		    if (e->type() == TQEvent::KeyPress)
 			keyPressEvent(ke);
 		    else
@@ -2283,8 +2283,8 @@ void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview,
             if( !accesskey.isNull()) {
 	        TQRect rec=en->getRect();
 	        TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose);
-	        connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) );
-	        connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint()));
+	        connect( origview, TQ_SIGNAL(hideAccessKeys()), lab, TQ_SLOT(close()) );
+	        connect( this, TQ_SIGNAL(repaintAccessKeys()), lab, TQ_SLOT(repaint()));
 	        lab->setPalette(TQToolTip::palette());
 	        lab->setLineWidth(2);
 	        lab->setFrameStyle(TQFrame::Box | TQFrame::Plain);
@@ -2409,13 +2409,9 @@ bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller )
             guard = node;
 	}
         // Set focus node on the document
-#ifdef USE_QT4
-        m_part->xmlDocImpl()->setFocusNode(node);
-#else // USE_QT4
         TQFocusEvent::setReason( TQFocusEvent::Shortcut );
         m_part->xmlDocImpl()->setFocusNode(node);
         TQFocusEvent::resetReason();
-#endif // USE_QT4
         if( node != NULL && node->hasOneRef()) // deleted, only held by guard
             return true;
         emit m_part->nodeActivated(Node(node));
@@ -2785,10 +2781,10 @@ void TDEHTMLView::print(bool quick)
     if ( !docname.isEmpty() )
         docname = KStringHandler::csqueeze(docname, 80);
     if(quick || printer->setup(this, i18n("Print %1").arg(docname))) {
-        viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs
+        viewport()->setCursor( TQt::waitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs
         // set up KPrinter
         printer->setFullPage(false);
-        printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE));
+        printer->setCreator(TQString("TDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE));
         printer->setDocName(docname);
 
         TQPainter *p = new TQPainter;
@@ -2888,15 +2884,15 @@ void TDEHTMLView::print(bool quick)
         if (printHeader)
         {
             int available_width = metrics.width() - 10 -
-                2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerLeft).width(),
-                         p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerRight).width());
+                2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerLeft).width(),
+                         p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerRight).width());
             if (available_width < 150)
                available_width = 150;
             int mid_width;
             int squeeze = 120;
             do {
                 headerMid = KStringHandler::csqueeze(docname, squeeze);
-                mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerMid).width();
+                mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerMid).width();
                 squeeze -= 10;
             } while (mid_width > available_width);
         }
@@ -2910,14 +2906,14 @@ void TDEHTMLView::print(bool quick)
             if (printHeader)
             {
                 int dy = p->fontMetrics().lineSpacing();
-                p->setPen(Qt::black);
+                p->setPen(TQt::black);
                 p->setFont(headerFont);
 
                 headerRight = TQString("#%1").arg(page);
 
-                p->drawText(0, 0, metrics.width(), dy, Qt::AlignLeft, headerLeft);
-                p->drawText(0, 0, metrics.width(), dy, Qt::AlignHCenter, headerMid);
-                p->drawText(0, 0, metrics.width(), dy, Qt::AlignRight, headerRight);
+                p->drawText(0, 0, metrics.width(), dy, TQt::AlignLeft, headerLeft);
+                p->drawText(0, 0, metrics.width(), dy, TQt::AlignHCenter, headerMid);
+                p->drawText(0, 0, metrics.width(), dy, TQt::AlignRight, headerRight);
             }
 
 
@@ -2955,7 +2951,7 @@ void TDEHTMLView::print(bool quick)
         d->paged = false;
         tdehtml::setPrintPainter( 0 );
         setMediaType( oldMediaType );
-        m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
+        m_part->xmlDocImpl()->setPaintDevice( this );
         m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor());
         m_part->xmlDocImpl()->updateStyleSelector();
         viewport()->unsetCursor();
@@ -3006,7 +3002,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
 
     root->setPagedMode(false);
     root->setStaticMode(false);
-    m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) );
+    m_part->xmlDocImpl()->setPaintDevice( this );
 }
 
 
@@ -3160,13 +3156,13 @@ bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode,
     int screenY = _mouse->globalY();
     int button = -1;
     switch (_mouse->button()) {
-	case Qt::LeftButton:
+	case TQt::LeftButton:
 	    button = 0;
 	    break;
-	case Qt::MidButton:
+	case TQt::MidButton:
 	    button = 1;
 	    break;
-	case Qt::RightButton:
+	case TQt::RightButton:
 	    button = 2;
 	    break;
 	default:
@@ -3282,12 +3278,12 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
     {
         e->accept();
     }
-    else if( (   (e->orientation() == Qt::Vertical &&
+    else if( (   (e->orientation() == TQt::Vertical &&
                    ((d->ignoreWheelEvents && !verticalScrollBar()->isVisible())
                      || e->delta() > 0 && contentsY() <= 0
                      || e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight()))
               ||
-                 (e->orientation() == Qt::Horizontal &&
+                 (e->orientation() == TQt::Horizontal &&
                     ((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible())
                      || e->delta() > 0 && contentsX() <=0
                      || e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth())))
@@ -3306,7 +3302,7 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
         TQScrollView::viewportWheelEvent( e );
 #endif
 
-        TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), Qt::NoButton, e->state() );
+        TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), TQt::NoButton, e->state() );
         emit viewportMouseMoveEvent ( tempEvent );
         delete tempEvent;
     }
@@ -4608,9 +4604,9 @@ void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e )
     if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) )
         step = pageStep;
 
-    if(e->orientation() == Qt::Horizontal)
+    if(e->orientation() == TQt::Horizontal)
         scrollBy(-((e->delta()*step)/120), 0);
-    else if(e->orientation() == Qt::Vertical)
+    else if(e->orientation() == TQt::Vertical)
         scrollBy(0,-((e->delta()*step)/120));
 
     e->accept();
diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h
index 797db99fa..6f3ad6684 100644
--- a/tdehtml/tdehtmlview.h
+++ b/tdehtml/tdehtmlview.h
@@ -77,7 +77,7 @@ class TDEHTMLViewPrivate;
  **/
 class TDEHTML_EXPORT TDEHTMLView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class DOM::HTMLDocumentImpl;
     friend class DOM::HTMLTitleElementImpl;
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index 15970bbaa..7afda5741 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -115,7 +115,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName,
     m_tempFile = 0L;
 
     m_timer = new TQTimer( this );
-    connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressInfo() ) );
+    connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressInfo() ) );
 }
 
 KMultiPart::~KMultiPart()
@@ -167,10 +167,10 @@ bool KMultiPart::openURL( const KURL &url )
 
     emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage
 
-    connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) );
-    connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             this, TQ_SLOT( slotJobFinished( TDEIO::Job * ) ) );
+    connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) );
 
     m_numberOfFrames = 0;
     m_numberOfFramesSkipped = 0;
@@ -324,8 +324,8 @@ void KMultiPart::setPart( const TQString& mimeType )
     insertChildClient( m_part );
     m_part->widget()->show();
 
-    connect( m_part, TQT_SIGNAL( completed() ),
-             this, TQT_SLOT( slotPartCompleted() ) );
+    connect( m_part, TQ_SIGNAL( completed() ),
+             this, TQ_SLOT( slotPartCompleted() ) );
 
     m_isHTMLPart = ( mimeType == "text/html" );
     KParts::BrowserExtension* childExtension = KParts::BrowserExtension::childObject( m_part );
@@ -336,62 +336,62 @@ void KMultiPart::setPart( const TQString& mimeType )
         // Forward signals from the part's browser extension
         // this is very related (but not exactly like) TDEHTMLPart::processObjectRequest
 
-        connect( childExtension, TQT_SIGNAL( openURLNotify() ),
-                 m_extension, TQT_SIGNAL( openURLNotify() ) );
+        connect( childExtension, TQ_SIGNAL( openURLNotify() ),
+                 m_extension, TQ_SIGNAL( openURLNotify() ) );
 
-        connect( childExtension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
-                 m_extension, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+        connect( childExtension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+                 m_extension, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) );
 
-        connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
-                 m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
-        connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
-                 m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
+        connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ),
+                 m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) );
+        connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ),
+                 m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) );
 
         // Keep in sync with tdehtml_part.cpp
-        connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
-                 m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
-        connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
-                 m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
-        connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
-                 m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
-        connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-                 m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
-        connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
-                 m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
-        connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
-                 m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
+        connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ),
+                 m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) );
+        connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ),
+                 m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) );
+        connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ),
+                 m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) );
+        connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+                 m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+        connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ),
+                 m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) );
+        connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ),
+                 m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) );
 
 
         if ( m_isHTMLPart )
-            connect( childExtension, TQT_SIGNAL( infoMessage( const TQString & ) ),
-                     m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) );
+            connect( childExtension, TQ_SIGNAL( infoMessage( const TQString & ) ),
+                     m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) );
         // For non-HTML we prefer to show our infoMessage ourselves.
 
         childExtension->setBrowserInterface( m_extension->browserInterface() );
 
-        connect( childExtension, TQT_SIGNAL( enableAction( const char *, bool ) ),
-                 m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) );
-        connect( childExtension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ),
-                 m_extension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ) );
-        connect( childExtension, TQT_SIGNAL( setIconURL( const KURL& ) ),
-                 m_extension, TQT_SIGNAL( setIconURL( const KURL& ) ) );
-        connect( childExtension, TQT_SIGNAL( loadingProgress( int ) ),
-                 m_extension, TQT_SIGNAL( loadingProgress( int ) ) );
+        connect( childExtension, TQ_SIGNAL( enableAction( const char *, bool ) ),
+                 m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) );
+        connect( childExtension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ),
+                 m_extension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ) );
+        connect( childExtension, TQ_SIGNAL( setIconURL( const KURL& ) ),
+                 m_extension, TQ_SIGNAL( setIconURL( const KURL& ) ) );
+        connect( childExtension, TQ_SIGNAL( loadingProgress( int ) ),
+                 m_extension, TQ_SIGNAL( loadingProgress( int ) ) );
         if ( m_isHTMLPart ) // for non-HTML we have our own
-            connect( childExtension, TQT_SIGNAL( speedProgress( int ) ),
-                     m_extension, TQT_SIGNAL( speedProgress( int ) ) );
-        connect( childExtension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ),
-                 m_extension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ) );
-        connect( childExtension, TQT_SIGNAL( selectionInfo( const TQString& ) ),
-                 m_extension, TQT_SIGNAL( selectionInfo( const TQString& ) ) );
-        connect( childExtension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ),
-                 m_extension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ) );
-        connect( childExtension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ),
-                 m_extension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ) );
-        connect( childExtension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ),
-                 m_extension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ) );
-        connect( childExtension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ),
-                 m_extension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ) );
+            connect( childExtension, TQ_SIGNAL( speedProgress( int ) ),
+                     m_extension, TQ_SIGNAL( speedProgress( int ) ) );
+        connect( childExtension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ),
+                 m_extension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ) );
+        connect( childExtension, TQ_SIGNAL( selectionInfo( const TQString& ) ),
+                 m_extension, TQ_SIGNAL( selectionInfo( const TQString& ) ) );
+        connect( childExtension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ),
+                 m_extension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ) );
+        connect( childExtension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ),
+                 m_extension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ) );
+        connect( childExtension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ),
+                 m_extension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ) );
+        connect( childExtension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ),
+                 m_extension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ) );
     }
 
     m_partIsLoading = false;
@@ -414,7 +414,7 @@ void KMultiPart::startOfData()
     if ( m_gzip )
     {
         m_filter = new HTTPFilterGZip;
-        connect( m_filter, TQT_SIGNAL( output( const TQByteArray& ) ), this, TQT_SLOT( reallySendData( const TQByteArray& ) ) );
+        connect( m_filter, TQ_SIGNAL( output( const TQByteArray& ) ), this, TQ_SLOT( reallySendData( const TQByteArray& ) ) );
     }
 
     if ( m_mimeType != m_nextMimeType )
@@ -551,7 +551,7 @@ void KMultiPart::slotJobFinished( TDEIO::Job *job )
 
         emit completed();
 
-        //TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) );
+        //TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) );
     }
     m_job = 0L;
 }
diff --git a/tdehtml/tdemultipart/tdemultipart.h b/tdehtml/tdemultipart/tdemultipart.h
index de309eef1..75b7c18a3 100644
--- a/tdehtml/tdemultipart/tdemultipart.h
+++ b/tdehtml/tdemultipart/tdemultipart.h
@@ -38,7 +38,7 @@ class KLineParser;
  */
 class KMultiPart : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KMultiPart( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name, const TQStringList& );
@@ -99,7 +99,7 @@ private:
 #if 0
 class KMultiPartBrowserExtension : public KParts::BrowserExtension
 {
-    //Q_OBJECT
+    //TQ_OBJECT
 public:
     KMultiPartBrowserExtension( KMultiPart *parent, const char *name = 0 );
 
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 62842e086..81b0b9a4e 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -118,7 +118,7 @@ PartMonitor::PartMonitor(TDEHTMLPart *_part)
 {
     m_part = _part;
     m_completed = false;
-    connect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted()));
+    connect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted()));
     m_timer_waits = 200;
     m_timeout_timer = new TQTimer(this);
 }
@@ -141,12 +141,12 @@ void PartMonitor::waitForCompletion()
 
         kapp->enter_loop();
 
-        //connect(m_timeout_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( timeout() ) );
+        //connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) );
         //m_timeout_timer->stop();
 	//m_timeout_timer->start( visual ? 100 : 2, true );
     }
 
-    TQTimer::singleShot( 0, this, TQT_SLOT( finishTimers() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) );
     kapp->enter_loop();
 }
 
@@ -161,7 +161,7 @@ void PartMonitor::finishTimers()
     --m_timer_waits;
     if ( m_timer_waits && (w && w->winq->hasTimers()) || m_part->inProgress()) {
         // wait a bit
-        TQTimer::singleShot( 10, this, TQT_SLOT(finishTimers() ) );
+        TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) );
         return;
     }
     kapp->exit_loop();
@@ -172,9 +172,9 @@ void PartMonitor::partCompleted()
     m_completed = true;
     RenderWidget::flushWidgetResizes();
     m_timeout_timer->stop();
-    connect(m_timeout_timer, TQT_SIGNAL(timeout()),this, TQT_SLOT( timeout() ) );
+    connect(m_timeout_timer, TQ_SIGNAL(timeout()),this, TQ_SLOT( timeout() ) );
     m_timeout_timer->start( visual ? 100 : 2, true );
-    disconnect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted()));
+    disconnect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted()));
 }
 
 static void signal_handler( int )
@@ -350,7 +350,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
 		char buf[1024];
 		int bytesread;
 		while (!file.atEnd()) {
-		    bytesread = file.tqreadBlock(buf,1024);
+		    bytesread = file.readBlock(buf,1024);
 		    stream.writeRawBytes(buf,bytesread);
 		}
 		file.close();
@@ -593,10 +593,10 @@ int main(int argc, char *argv[])
                                                         args->isSet("genoutput"),
                                                         !args->isSet( "html" ),
                                                         !args->isSet( "js" ));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
-		     regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
-    TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )),
-		     regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int )));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),
+		     regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &)));
+    TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )),
+		     regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int )));
 
     bool result = false;
     QCStringList tests = args->getOptionList("test");
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
             link = TQString( "<hr>%1 failures. (%2 expected failures)" )
                    .arg(regressionTest->m_failures_work )
                    .arg( regressionTest->m_failures_fail );
-            list.tqwriteBlock( link.latin1(), link.length() );
+            list.writeBlock( link.latin1(), link.length() );
             list.close();
 	}
     }
@@ -697,12 +697,12 @@ RegressionTest::RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const
     TQString s;
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><body>Follow the white rabbit";
-    f.tqwriteBlock( s.latin1(), s.length() );
+    f.writeBlock( s.latin1(), s.length() );
     f.close();
     f.setName( m_outputDir + "/index.html" );
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
-    f.tqwriteBlock( s.latin1(), s.length() );
+    f.writeBlock( s.latin1(), s.length() );
     f.close();
 
     m_paintBuffer = 0;
@@ -965,7 +965,7 @@ TQImage RegressionTest::renderToImage()
             TQPainter* tp = new TQPainter;
             tp->begin( m_paintBuffer );
             tp->translate( -px, -py );
-            tp->fillRect(px, py, 512, 128, Qt::magenta);
+            tp->fillRect(px, py, 512, 128, TQt::magenta);
             m_part->document().handle()->renderer()->layer()->paint( tp, TQRect( px, py, 512, 128 ) );
             tp->end();
             delete tp;
@@ -994,12 +994,12 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi )
 
     for ( int y = 0; y < h; ++y )
     {
-        QRgb* ls = ( QRgb* ) lhsi.scanLine( y );
-        QRgb* rs = ( QRgb* ) rhsi.scanLine( y );
+        TQRgb* ls = ( TQRgb* ) lhsi.scanLine( y );
+        TQRgb* rs = ( TQRgb* ) rhsi.scanLine( y );
         if ( memcmp( ls, rs, bytes ) ) {
             for ( int x = 0; x < w; ++x ) {
-                QRgb l = ls[x];
-                QRgb r = rs[x];
+                TQRgb l = ls[x];
+                TQRgb r = rs[x];
                 if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) &&
                      ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) &&
                      ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) )
@@ -1032,7 +1032,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
     if ( failures & PaintFailure )
         link += "P";
     link += "]<br>\n";
-    list.tqwriteBlock( link.latin1(), link.length() );
+    list.writeBlock( link.latin1(), link.length() );
     list.close();
 }
 
@@ -1056,7 +1056,7 @@ void RegressionTest::doJavascriptReport( const TQString &test )
     text.replace( '\n', "<br>\n" );
     cl += text;
     cl += "</tt></body></html>";
-    compare.tqwriteBlock( cl.latin1(), cl.length() );
+    compare.writeBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
@@ -1248,7 +1248,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
     cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
 
     cl += "</body></html>";
-    compare.tqwriteBlock( cl.latin1(), cl.length() );
+    compare.writeBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
diff --git a/tdehtml/test_regression.h b/tdehtml/test_regression.h
index b6791bd32..9092f22e2 100644
--- a/tdehtml/test_regression.h
+++ b/tdehtml/test_regression.h
@@ -38,7 +38,7 @@ class TQTimer;
  */
 class PartMonitor : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     PartMonitor(TDEHTMLPart *_part);
     ~PartMonitor();
@@ -124,7 +124,7 @@ class ScriptInterpreter;
  */
 class RegressionTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
     RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir,
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index bb8a948a7..6c3d1506e 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -56,10 +56,10 @@ int main(int argc, char *argv[])
     TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
 
     Dummy *dummy = new Dummy( doc );
-    TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
-		      dummy, TQT_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) );
+    TQObject::connect( doc->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
+		      dummy, TQ_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) );
 
-    TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) );
+    TQObject::connect( doc, TQ_SIGNAL(completed()), dummy, TQ_SLOT(handleDone()) );
 
     if (args->url(0).url().right(4).find(".xml", 0, false) == 0) {
         KParts::URLArgs ags(doc->browserExtension()->urlArgs());
@@ -105,25 +105,25 @@ int main(int argc, char *argv[])
     e.setAttribute( "name", "print" );
     toolBar.insertBefore( e, toolBar.firstChild() );
 
-    (void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
-    (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
-    TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
+    (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQ_SLOT( reload() ), doc->actionCollection(), "reload" );
+    (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQ_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
+    TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQ_SLOT( print() ), doc->actionCollection(), "print" );
     kprint->setEnabled(true);
     TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" );
     ta->setChecked(doc->isCaretMode());
-    TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
+    TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleNavigable(bool) ));
     ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
     ta->setChecked(doc->isEditable());
-    TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) ));
+    TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleEditable(bool) ));
     toplevel->guiFactory()->addClient( doc );
 
     doc->setJScriptEnabled(true);
     doc->setJavaEnabled(true);
     doc->setPluginsEnabled( true );
-    doc->setURLCursor(TQCursor(Qt::PointingHandCursor));
+    doc->setURLCursor(TQCursor(TQt::PointingHandCursor));
     a.setTopWidget(doc->widget());
-    TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)),
-		     doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &)));
+    TQWidget::connect(doc, TQ_SIGNAL(setWindowCaption(const TQString &)),
+		     doc->widget()->topLevelWidget(), TQ_SLOT(setCaption(const TQString &)));
     doc->widget()->show();
     toplevel->show();
     ((TQScrollView *)doc->widget())->viewport()->show();
diff --git a/tdehtml/testtdehtml.h b/tdehtml/testtdehtml.h
index dcb4c1583..a6ce73675 100644
--- a/tdehtml/testtdehtml.h
+++ b/tdehtml/testtdehtml.h
@@ -10,7 +10,7 @@
  */
 class Dummy : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; };
 
diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp
index e6af64184..1ee36c82d 100644
--- a/tdehtml/xml/dom2_eventsimpl.cpp
+++ b/tdehtml/xml/dom2_eventsimpl.cpp
@@ -526,52 +526,52 @@ private:
 /* Mapping between special Qt keycodes and virtual DOM codes */
 IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] =
 {
-    {KeyEventBaseImpl::DOM_VK_BACK_SPACE, Qt::Key_Backspace},
-    {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Enter},
-    {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Return},
-    {KeyEventBaseImpl::DOM_VK_NUM_LOCK,  Qt::Key_NumLock},
-    {KeyEventBaseImpl::DOM_VK_RIGHT_ALT,    Qt::Key_Alt},
-    {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, Qt::Key_Control},
-    {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT,   Qt::Key_Shift},
-    {KeyEventBaseImpl::DOM_VK_META,         Qt::Key_Meta},
-    {KeyEventBaseImpl::DOM_VK_CAPS_LOCK,    Qt::Key_CapsLock},
-    {KeyEventBaseImpl::DOM_VK_DELETE,       Qt::Key_Delete},
-    {KeyEventBaseImpl::DOM_VK_END,          Qt::Key_End},
-    {KeyEventBaseImpl::DOM_VK_ESCAPE,       Qt::Key_Escape},
-    {KeyEventBaseImpl::DOM_VK_HOME,         Qt::Key_Home},
-    {KeyEventBaseImpl::DOM_VK_PAUSE,        Qt::Key_Pause},
-    {KeyEventBaseImpl::DOM_VK_PRINTSCREEN,  Qt::Key_Print},
-    {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK,  Qt::Key_ScrollLock},
-    {KeyEventBaseImpl::DOM_VK_LEFT,         Qt::Key_Left},
-    {KeyEventBaseImpl::DOM_VK_RIGHT,        Qt::Key_Right},
-    {KeyEventBaseImpl::DOM_VK_UP,           Qt::Key_Up},
-    {KeyEventBaseImpl::DOM_VK_DOWN,         Qt::Key_Down},
+    {KeyEventBaseImpl::DOM_VK_BACK_SPACE, TQt::Key_Backspace},
+    {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Enter},
+    {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Return},
+    {KeyEventBaseImpl::DOM_VK_NUM_LOCK,  TQt::Key_NumLock},
+    {KeyEventBaseImpl::DOM_VK_RIGHT_ALT,    TQt::Key_Alt},
+    {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, TQt::Key_Control},
+    {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT,   TQt::Key_Shift},
+    {KeyEventBaseImpl::DOM_VK_META,         TQt::Key_Meta},
+    {KeyEventBaseImpl::DOM_VK_CAPS_LOCK,    TQt::Key_CapsLock},
+    {KeyEventBaseImpl::DOM_VK_DELETE,       TQt::Key_Delete},
+    {KeyEventBaseImpl::DOM_VK_END,          TQt::Key_End},
+    {KeyEventBaseImpl::DOM_VK_ESCAPE,       TQt::Key_Escape},
+    {KeyEventBaseImpl::DOM_VK_HOME,         TQt::Key_Home},
+    {KeyEventBaseImpl::DOM_VK_PAUSE,        TQt::Key_Pause},
+    {KeyEventBaseImpl::DOM_VK_PRINTSCREEN,  TQt::Key_Print},
+    {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK,  TQt::Key_ScrollLock},
+    {KeyEventBaseImpl::DOM_VK_LEFT,         TQt::Key_Left},
+    {KeyEventBaseImpl::DOM_VK_RIGHT,        TQt::Key_Right},
+    {KeyEventBaseImpl::DOM_VK_UP,           TQt::Key_Up},
+    {KeyEventBaseImpl::DOM_VK_DOWN,         TQt::Key_Down},
     {KeyEventBaseImpl::DOM_VK_PAGE_DOWN,    TQt::Key_Next},
     {KeyEventBaseImpl::DOM_VK_PAGE_UP,      TQt::Key_Prior},
-    {KeyEventBaseImpl::DOM_VK_F1,           Qt::Key_F1},
-    {KeyEventBaseImpl::DOM_VK_F2,           Qt::Key_F2},
-    {KeyEventBaseImpl::DOM_VK_F3,           Qt::Key_F3},
-    {KeyEventBaseImpl::DOM_VK_F4,           Qt::Key_F4},
-    {KeyEventBaseImpl::DOM_VK_F5,           Qt::Key_F5},
-    {KeyEventBaseImpl::DOM_VK_F6,           Qt::Key_F6},
-    {KeyEventBaseImpl::DOM_VK_F7,           Qt::Key_F7},
-    {KeyEventBaseImpl::DOM_VK_F8,           Qt::Key_F8},
-    {KeyEventBaseImpl::DOM_VK_F9,           Qt::Key_F9},
-    {KeyEventBaseImpl::DOM_VK_F10,          Qt::Key_F10},
-    {KeyEventBaseImpl::DOM_VK_F11,          Qt::Key_F11},
-    {KeyEventBaseImpl::DOM_VK_F12,          Qt::Key_F12},
-    {KeyEventBaseImpl::DOM_VK_F13,          Qt::Key_F13},
-    {KeyEventBaseImpl::DOM_VK_F14,          Qt::Key_F14},
-    {KeyEventBaseImpl::DOM_VK_F15,          Qt::Key_F15},
-    {KeyEventBaseImpl::DOM_VK_F16,          Qt::Key_F16},
-    {KeyEventBaseImpl::DOM_VK_F17,          Qt::Key_F17},
-    {KeyEventBaseImpl::DOM_VK_F18,          Qt::Key_F18},
-    {KeyEventBaseImpl::DOM_VK_F19,          Qt::Key_F19},
-    {KeyEventBaseImpl::DOM_VK_F20,          Qt::Key_F20},
-    {KeyEventBaseImpl::DOM_VK_F21,          Qt::Key_F21},
-    {KeyEventBaseImpl::DOM_VK_F22,          Qt::Key_F22},
-    {KeyEventBaseImpl::DOM_VK_F23,          Qt::Key_F23},
-    {KeyEventBaseImpl::DOM_VK_F24,          Qt::Key_F24},
+    {KeyEventBaseImpl::DOM_VK_F1,           TQt::Key_F1},
+    {KeyEventBaseImpl::DOM_VK_F2,           TQt::Key_F2},
+    {KeyEventBaseImpl::DOM_VK_F3,           TQt::Key_F3},
+    {KeyEventBaseImpl::DOM_VK_F4,           TQt::Key_F4},
+    {KeyEventBaseImpl::DOM_VK_F5,           TQt::Key_F5},
+    {KeyEventBaseImpl::DOM_VK_F6,           TQt::Key_F6},
+    {KeyEventBaseImpl::DOM_VK_F7,           TQt::Key_F7},
+    {KeyEventBaseImpl::DOM_VK_F8,           TQt::Key_F8},
+    {KeyEventBaseImpl::DOM_VK_F9,           TQt::Key_F9},
+    {KeyEventBaseImpl::DOM_VK_F10,          TQt::Key_F10},
+    {KeyEventBaseImpl::DOM_VK_F11,          TQt::Key_F11},
+    {KeyEventBaseImpl::DOM_VK_F12,          TQt::Key_F12},
+    {KeyEventBaseImpl::DOM_VK_F13,          TQt::Key_F13},
+    {KeyEventBaseImpl::DOM_VK_F14,          TQt::Key_F14},
+    {KeyEventBaseImpl::DOM_VK_F15,          TQt::Key_F15},
+    {KeyEventBaseImpl::DOM_VK_F16,          TQt::Key_F16},
+    {KeyEventBaseImpl::DOM_VK_F17,          TQt::Key_F17},
+    {KeyEventBaseImpl::DOM_VK_F18,          TQt::Key_F18},
+    {KeyEventBaseImpl::DOM_VK_F19,          TQt::Key_F19},
+    {KeyEventBaseImpl::DOM_VK_F20,          TQt::Key_F20},
+    {KeyEventBaseImpl::DOM_VK_F21,          TQt::Key_F21},
+    {KeyEventBaseImpl::DOM_VK_F22,          TQt::Key_F22},
+    {KeyEventBaseImpl::DOM_VK_F23,          TQt::Key_F23},
+    {KeyEventBaseImpl::DOM_VK_F24,          TQt::Key_F24},
     {0,                   0}
 };
 
@@ -657,8 +657,8 @@ void KeyEventBaseImpl::buildQKeyEvent() const
     }
 
     //Neuter F keys as well.
-    if (key >= Qt::Key_F1 && key <= Qt::Key_F35)
-        key = Qt::Key_ScrollLock;
+    if (key >= TQt::Key_F1 && key <= TQt::Key_F35)
+        key = TQt::Key_ScrollLock;
 
     m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress,
                         key, ascii, modifiers, text);
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index b896d05a3..245585d74 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -299,7 +299,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
     m_paintDeviceMetrics = 0;
     m_paintDevice = 0;
     m_decoderMibEnum = 0;
-    m_textColor = Qt::black;
+    m_textColor = TQt::black;
 
     m_view = v;
     m_renderArena.reset();
@@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *
 
     if ( v ) {
         m_docLoader = new DocLoader(v->part(), this );
-        setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
+        setPaintDevice( m_view );
     }
     else
         m_docLoader = new DocLoader( 0, this );
@@ -1231,7 +1231,7 @@ void DocumentImpl::attach()
     assert(!attached());
 
     if ( m_view )
-        setPaintDevice( TQT_TQPAINTDEVICE(m_view) );
+        setPaintDevice( m_view );
 
     if (!m_renderArena)
 	m_renderArena.reset(new RenderArena());
@@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners )
 
     m_tokenizer = createTokenizer();
     m_decoderMibEnum = 0;
-    connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing()));
+    connect(m_tokenizer,TQ_SIGNAL(finishedParsing()),this,TQ_SIGNAL(finishedParsing()));
     m_tokenizer->begin();
 }
 
diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index bcdc9500c..fc78a89b3 100644
--- a/tdehtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -184,7 +184,7 @@ private:
  */
 class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v);
     ~DocumentImpl();
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index 7e2e1bc5f..22b71051f 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -508,13 +508,13 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over
 
     int button = -1;
     switch (_mouse->button()) {
-        case Qt::LeftButton:
+        case TQt::LeftButton:
             button = 0;
             break;
-        case Qt::MidButton:
+        case TQt::MidButton:
             button = 1;
             break;
-        case Qt::RightButton:
+        case TQt::RightButton:
             button = 2;
             break;
         default:
@@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const
     bool      usedCache = false;
     if (m_cache->current.node) {
         //Compute distance from the requested index to the cache node
-        long cacheDist = QABS(long(index) - long(m_cache->position));
+        long cacheDist = TQABS(long(index) - long(m_cache->position));
 
         if (cacheDist < (long)index) { //Closer to the cached position
             usedCache = true;
diff --git a/tdehtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h
index c8f5ce7d8..09c746336 100644
--- a/tdehtml/xml/dom_stringimpl.h
+++ b/tdehtml/xml/dom_stringimpl.h
@@ -81,7 +81,7 @@ public:
     const TQChar &operator [] (int pos) { return s[pos]; }
     bool containsOnlyWhitespace() const;
 
-    // ignores trailing garbage, unlike QString
+    // ignores trailing garbage, unlike TQString
     int toInt(bool* ok = 0) const;
 
     tdehtml::Length* toLengthArray(int& len) const;
diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h
index f89e5eb2f..d6b4dbe02 100644
--- a/tdehtml/xml/xml_tokenizer.h
+++ b/tdehtml/xml/xml_tokenizer.h
@@ -118,7 +118,7 @@ private:
 
 class Tokenizer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     virtual void begin() = 0;
     // script output must be prepended, while new data
diff --git a/tdeinit/README.DCOP b/tdeinit/README.DCOP
index cd5ba983e..e30db80f9 100644
--- a/tdeinit/README.DCOP
+++ b/tdeinit/README.DCOP
@@ -26,9 +26,9 @@ void exec_blind(QCString name, QValueList<QCString> argList);
  * 'startup_id' is for application startup notification,
  * "" is the default, "0" for none
  */
-serviceResult start_service_by_name(QString serviceName, QStringList url,
+serviceResult start_service_by_name(TQString serviceName, QStringList url,
     QValueList<QCString> envs, QCString startup_id );
-serviceResult start_service_by_name(QString serviceName, QStringList url)
+serviceResult start_service_by_name(TQString serviceName, QStringList url)
 
 /**
  * Start a service by desktop path.
@@ -48,9 +48,9 @@ serviceResult start_service_by_name(QString serviceName, QStringList url)
  * 'startup_id' is for application startup notification,
  * "" is the default, "0" for none
  */
-serviceResult start_service_by_desktop_path(QString serviceName, QStringList url,
+serviceResult start_service_by_desktop_path(TQString serviceName, QStringList url,
     QValueList<QCString> envs, QCString startup_id );
-serviceResult start_service_by_desktop_path(QString serviceName, QStringList url)
+serviceResult start_service_by_desktop_path(TQString serviceName, QStringList url)
 
 
 /**
@@ -70,14 +70,14 @@ serviceResult start_service_by_desktop_path(QString serviceName, QStringList url
  * 'startup_id' is for application startup notification,
  * "" is the default, "0" for none
  */
-serviceResult start_service_by_desktop_name(QString serviceName, QStringList url,
+serviceResult start_service_by_desktop_name(TQString serviceName, QStringList url,
     QValueList<QCString> envs, QCString startup_id );
-serviceResult start_service_by_desktop_name(QString serviceName, QStringList url)
+serviceResult start_service_by_desktop_name(TQString serviceName, QStringList url)
 
 struct serviceResult
 {
   int result;         // 0 means success. > 0 means error
   QCString dcopName; // Contains DCOP name on success
-  QString error;     // Contains error description on failure.
+  TQString error;     // Contains error description on failure.
 }
 
diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
index 78ed1e7c4..e8c7dd2ae 100644
--- a/tdeinit/tdeinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -68,7 +68,7 @@
 #endif
 #endif
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <tdestartupinfo.h> // schroder
 #endif
 
@@ -77,8 +77,8 @@
 #include "ltdl.h"
 #include "tdelauncher_cmds.h"
 
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
 //#undef K_WS_QTONLY
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -107,8 +107,8 @@ extern "C" FcBool XftInitFtLibrary (void);
 extern char **environ;
 
 extern int lt_dlopen_flag;
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
 static int X11fd = -1;
 static Display *X11display = 0;
 static int X11_startup_notify_fd = -1;
@@ -119,12 +119,12 @@ static const TDEInstance *s_instance = 0;
 static char sock_file[MAX_SOCK_FILE];
 static char sock_file_old[MAX_SOCK_FILE];
 
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
 #define DISPLAY "DISPLAY"
-#elif defined(Q_WS_QWS)
+#elif defined(TQ_WS_QWS)
 #define DISPLAY "QWS_DISPLAY"
-#elif defined(Q_WS_MACX)
+#elif defined(TQ_WS_MACX)
 #define DISPLAY "MAC_DISPLAY"
 #elif defined(K_WS_QTONLY)
 #define DISPLAY "QT_DISPLAY"
@@ -159,8 +159,8 @@ static struct {
   bool suicide;
 } d;
 
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
 extern "C" {
 int tdeinit_xio_errhandler( Display * );
 int tdeinit_x_errhandler( Display *, XErrorEvent *err );
@@ -219,8 +219,8 @@ static void close_fds()
       close(d.wrapper_old);
       d.wrapper_old = 0;
    }
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
    if (X11fd >= 0)
    {
       close(X11fd);
@@ -279,8 +279,8 @@ static void setup_tty( const char* tty )
 static int get_current_desktop( Display* disp )
 {
     int desktop = 0; // no desktop by default
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // Only X11 supports multiple desktops
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11 // Only X11 supports multiple desktops
     Atom net_current_desktop = XInternAtom( disp, "_NET_CURRENT_DESKTOP", False );
     Atom type_ret;
     int format_ret;
@@ -317,8 +317,8 @@ const char* get_env_var( const char* var, int envc, const char* envs )
     return NULL;
 }
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded
 static void init_startup_info( TDEStartupInfoId& id, const char* bin,
     int envc, const char* envs )
 {
@@ -481,8 +481,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
      return d.fork;
   }
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
   TDEStartupInfoId startup_id;
   startup_id.initId( startup_id_str );
   if( !startup_id.none())
@@ -549,8 +549,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
         envs++;
      }
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
       if( startup_id.none())
           TDEStartupInfo::resetStartupEnv();
       else
@@ -744,8 +744,8 @@ static pid_t launch(int argc, const char *_name, const char *args,
         d.launcher_pid = d.fork;
      }
   }
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
   if( !startup_id.none())
   {
      if( d.fork && d.result == 0 ) // launched successfully
@@ -1290,7 +1290,7 @@ static void handle_launcher_request(int sock = -1)
 #ifndef NDEBUG
        fprintf(stderr,"[tdeinit] Terminating Trinity.\n");
 #endif
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
        tdeinit_xio_errhandler( 0L );
 #endif
    }
@@ -1322,7 +1322,7 @@ static void handle_requests(pid_t waitForPid)
       max_sock = d.wrapper_old;
    if (d.launcher_pid && (d.launcher[0] > max_sock))
       max_sock = d.launcher[0];
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 //#ifdef _WS_X11
    if (X11fd > max_sock)
       max_sock = X11fd;
@@ -1383,8 +1383,8 @@ static void handle_requests(pid_t waitForPid)
          FD_SET(d.wrapper_old, &rd_set);
       }
       FD_SET(d.deadpipe[0], &rd_set);
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
       if(X11fd >= 0) FD_SET(X11fd, &rd_set);
 #endif
 
@@ -1442,8 +1442,8 @@ static void handle_requests(pid_t waitForPid)
             return;
       }
 
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
       /* Look for incoming X11 events */
       if((result > 0) && (X11fd >= 0))
       {
@@ -1586,7 +1586,7 @@ int tdeinit_xio_errhandler( Display *disp )
     return 0;
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err )
 {
 #ifndef NDEBUG
@@ -1606,8 +1606,8 @@ int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err )
 }
 #endif
 
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
 // needs to be done sooner than initXconnection() because of also opening
 // another X connection for startup notification purposes
 static void setupX()
@@ -1772,7 +1772,7 @@ int main(int argc, char **argv, char **envp)
    d.lt_dlopen_flag = lt_dlopen_flag;
    lt_dlopen_flag |= LTDL_GLOBAL;
    init_signals();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    setupX();
 #endif
 
@@ -1821,8 +1821,8 @@ int main(int argc, char **argv, char **envp)
       handle_requests(pid); // Wait for tdelauncher to be ready
    }
    
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
    X11fd = initXconnection();
 #endif
 
@@ -1837,7 +1837,7 @@ int main(int argc, char **argv, char **envp)
       TQFont::initialize();
       setlocale (LC_ALL, "");
       setlocale (LC_NUMERIC, "C");
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       if (XSupportsLocale ())
       {
          // Similar to TQApplication::create_xim()
diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index 966a2ee45..c254ebaa4 100644
--- a/tdeinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
@@ -40,7 +40,7 @@
 #include <tdetempfile.h>
 #include <kurl.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <tdestartupinfo.h> // schroder
 #endif
 
@@ -52,8 +52,8 @@
 #include "tdelauncher.h"
 #include "tdelauncher_cmds.h"
 
-//#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#ifdef Q_WS_X11
+//#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+#ifdef TQ_WS_X11
 //#undef K_WS_QTONLY
 #include <X11/Xlib.h> // schroder
 #endif
@@ -69,7 +69,7 @@ template class TQPtrList<IdleSlave>;
 IdleSlave::IdleSlave(TDESocket *socket)
 {
    mConn.init(socket);
-   mConn.connect(this, TQT_SLOT(gotInput()));
+   mConn.connect(this, TQ_SLOT(gotInput()));
    mConn.send( CMD_SLAVE_STATUS );
    mPid = 0;
    mBirthDate = time(0);
@@ -164,20 +164,20 @@ IdleSlave::age(time_t now)
 
 TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
 //  : TDEApplication( false, false ), // No Styles, No GUI
-  : TDEApplication( false, true ),	// TQClipboard tries to construct a QWidget so a GUI is technically needed, even though it is not used
+  : TDEApplication( false, true ),	// TQClipboard tries to construct a TQWidget so a GUI is technically needed, even though it is not used
     DCOPObject("tdelauncher"),
     tdeinitSocket(_tdeinitSocket), mAutoStart( new_startup ),
     dontBlockReading(false), newStartup( new_startup )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    mCached_dpy = NULL;
 #endif
-   connect(&mAutoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoStart()));
+   connect(&mAutoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoStart()));
    requestList.setAutoDelete(true);
    mSlaveWaitRequest.setAutoDelete(true);
    dcopClient()->setNotifications( true );
-   connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)),
-           this, TQT_SLOT( slotAppRegistered( const TQCString &)));
+   connect(dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString &)),
+           this, TQ_SLOT( slotAppRegistered( const TQCString &)));
    dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()",
                                     objId(), "terminateTDE()", false );
 
@@ -195,14 +195,14 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup)
    domainname.unlink();
 #endif
    mPoolSocket = new TDEServerSocket(static_cast<const char*>(TQFile::encodeName(mPoolSocketName)));
-   connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)),
-           TQT_SLOT(acceptSlave(TDESocket *)));
+   connect(mPoolSocket, TQ_SIGNAL(accepted( TDESocket *)),
+           TQ_SLOT(acceptSlave(TDESocket *)));
 
-   connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout()));
+   connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout()));
 
    tdeinitNotifier = new TQSocketNotifier(tdeinitSocket, TQSocketNotifier::Read);
-   connect(tdeinitNotifier, TQT_SIGNAL( activated( int )),
-           this, TQT_SLOT( slotKDEInitData( int )));
+   connect(tdeinitNotifier, TQ_SIGNAL( activated( int )),
+           this, TQ_SLOT( slotKDEInitData( int )));
    tdeinitNotifier->setEnabled( true );
    lastRequest = 0;
    bProcessingQueue = false;
@@ -236,8 +236,8 @@ void TDELauncher::close()
       TQCString filename = TQFile::encodeName(mPoolSocketName);
       unlink(filename.data());
    }
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
    if( mCached_dpy != NULL )
        XCloseDisplay( mCached_dpy );
 #endif
@@ -746,8 +746,8 @@ TDELauncher::requestDone(TDELaunchRequest *request)
          DCOPresult.error += ":\n" + request->errorMsg;
       DCOPresult.pid = 0;
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11
       if (!request->startup_dpy.isEmpty())
       {
          Display* dpy = NULL;
@@ -811,7 +811,7 @@ TDELauncher::requestStart(TDELaunchRequest *request)
       length += (*it).length() + 1; // Envs...
    }
    length += sizeof( long ); // avoid_loops
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    bool startup_notify = !request->startup_id.isNull() && request->startup_id != "0";
    if( startup_notify )
        length += request->startup_id.length() + 1;
@@ -847,7 +847,7 @@ TDELauncher::requestStart(TDELaunchRequest *request)
    l = 0; // avoid_loops, always false here
    memcpy(p, &l, sizeof(long));
    p += sizeof(long);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    if( startup_notify )
    {
       strcpy(p, request->startup_id.data());
@@ -859,7 +859,7 @@ TDELauncher::requestStart(TDELaunchRequest *request)
       strcpy(p, request->cwd.data());
       p += strlen( p ) + 1;
    }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    request_header.cmd = startup_notify ? LAUNCHER_EXT_EXEC : LAUNCHER_EXEC_NEW;
 #else
    request_header.cmd = LAUNCHER_EXEC_NEW;
@@ -1050,8 +1050,8 @@ void
 TDELauncher::send_service_startup_info( TDELaunchRequest *request, KService::Ptr service, const TQCString& startup_id,
     const TQValueList<TQCString> &envs )
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
     request->startup_id = "0";
     if( startup_id == "0" )
         return;
@@ -1105,8 +1105,8 @@ void
 TDELauncher::cancel_service_startup_info( TDELaunchRequest* request, const TQCString& startup_id,
     const TQValueList<TQCString> &envs )
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-//#ifdef Q_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
+//#ifdef TQ_WS_X11 // TDEStartup* isn't implemented for Qt/Embedded yet
     if( request != NULL )
         request->startup_id = "0";
     if( !startup_id.isEmpty() && startup_id != "0" )
@@ -1158,7 +1158,7 @@ TDELauncher::tdeinit_exec(const TQString &app, const TQStringList &args,
       request->dcop_service_type = KService::DCOP_None;
    request->dcop_name = 0;
    request->pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    request->startup_id = startup_id;
 #endif
    request->envs = envs;
@@ -1184,7 +1184,7 @@ TDELauncher::queueRequest(TDELaunchRequest *request)
    if (!bProcessingQueue)
    {
       bProcessingQueue = true;
-      TQTimer::singleShot(0, this, TQT_SLOT( slotDequeue() ));
+      TQTimer::singleShot(0, this, TQ_SLOT( slotDequeue() ));
    }
 }
 
@@ -1318,7 +1318,7 @@ TDELauncher::requestSlave(const TQString &protocol,
     request->dcop_name = 0;
     request->dcop_service_type = KService::DCOP_None;
     request->pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     request->startup_id = "0";
 #endif
     request->status = TDELaunchRequest::Launching;
@@ -1358,9 +1358,9 @@ TDELauncher::acceptSlave(TDESocket *slaveSocket)
     IdleSlave *slave = new IdleSlave(slaveSocket);
     // Send it a SLAVE_STATUS command.
     mSlaveList.append(slave);
-    connect(slave, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSlaveGone()));
-    connect(slave, TQT_SIGNAL(statusUpdate(IdleSlave *)),
-	    this, TQT_SLOT(slotSlaveStatus(IdleSlave *)));
+    connect(slave, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSlaveGone()));
+    connect(slave, TQ_SIGNAL(statusUpdate(IdleSlave *)),
+	    this, TQ_SLOT(slotSlaveStatus(IdleSlave *)));
     if (!mTimer.isActive())
     {
        mTimer.start(1000*10);
diff --git a/tdeinit/tdelauncher.h b/tdeinit/tdelauncher.h
index 1802cd6ba..0f3a1c5c2 100644
--- a/tdeinit/tdelauncher.h
+++ b/tdeinit/tdelauncher.h
@@ -41,7 +41,7 @@
 
 class IdleSlave : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    IdleSlave(TDESocket *socket);
    bool match( const TQString &protocol, const TQString &host, bool connected);
@@ -89,7 +89,7 @@ public:
    KService::DCOPServiceType_t dcop_service_type;
    bool autoStart;
    TQString errorMsg;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    TQCString startup_id; // "" is the default, "0" for none
    TQCString startup_dpy; // Display to send startup notification to.
 #endif
@@ -107,7 +107,7 @@ struct serviceResult
 
 class TDELauncher : public TDEApplication, public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    TDELauncher(int _tdeinitSocket, bool new_startup);
@@ -193,7 +193,7 @@ protected:
    TQCString mSlaveValgrindSkin;
    bool dontBlockReading;
    bool newStartup;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    Display *mCached_dpy;
 #endif
 };
diff --git a/tdeinit/wrapper.c b/tdeinit/wrapper.c
index d22ba5080..d43222d21 100644
--- a/tdeinit/wrapper.c
+++ b/tdeinit/wrapper.c
@@ -49,9 +49,9 @@ static char *getDisplay()
 /*
  don't test for a value from tqglobal.h but instead distinguish
  Qt/X11 from Qt/Embedded by the fact that Qt/E apps have -DQWS
- on the commandline (which in tqglobal.h however triggers Q_WS_QWS,
+ on the commandline (which in tqglobal.h however triggers TQ_WS_QWS,
  but we don't want to include that here) (Simon)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
  */
 #if !defined(QWS)
    display = getenv("DISPLAY");
diff --git a/tdeio/Mainpage.dox b/tdeio/Mainpage.dox
index 057833148..493ed76fc 100644
--- a/tdeio/Mainpage.dox
+++ b/tdeio/Mainpage.dox
@@ -12,7 +12,7 @@
  * This library also implements the System Configuration Cache (KSycoca).
  *
  * KMimeType:
- * The notion of a file type, already existing in Trinity-1.x
+ * The notion of a file type, already existing in KDE-1.x
  *
  * KService:
  * To a mimetype are bound one or more applications, now called services.
diff --git a/tdeio/Makefile.am b/tdeio/Makefile.am
index 67a074f2a..b82616c8d 100644
--- a/tdeio/Makefile.am
+++ b/tdeio/Makefile.am
@@ -61,7 +61,7 @@ dummy.cpp:
 
 messages:
 	$(EXTRACTRC) `find . ../tdeioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
-	$(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/tdeio.pot
+	$(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio.pot
 	rm -f rc.cpp
 
 SUFFIXES = .magic .magic.mgc
diff --git a/tdeio/bookmarks/CMakeLists.txt b/tdeio/bookmarks/CMakeLists.txt
index c4ed8c9b2..30ab617a2 100644
--- a/tdeio/bookmarks/CMakeLists.txt
+++ b/tdeio/bookmarks/CMakeLists.txt
@@ -41,11 +41,11 @@ install( FILES
 set( target kbookmarks )
 
 set( ${target}_SRCS
-  kbookmark.cc kbookmarkbar.cc kbookmarkdrag.cc kbookmarkexporter.cc
-  kbookmarkimporter.cc kbookmarkmanager.cc kbookmarkmenu.cc
-  kbookmarkimporter_crash.cc kbookmarkimporter_opera.cc
-  kbookmarkimporter_ie.cc kbookmarkimporter_ns.cc
-  kbookmarkimporter_kde1.cc kbookmarkdombuilder.cc
+  kbookmark.cpp kbookmarkbar.cpp kbookmarkdrag.cpp kbookmarkexporter.cpp
+  kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp
+  kbookmarkimporter_crash.cpp kbookmarkimporter_opera.cpp
+  kbookmarkimporter_ie.cpp kbookmarkimporter_ns.cpp
+  kbookmarkimporter_kde1.cpp kbookmarkdombuilder.cpp
   kbookmarkmanager.skel kbookmarknotifier.skel
 )
 
diff --git a/tdeio/bookmarks/Makefile.am b/tdeio/bookmarks/Makefile.am
index e1ec3a8df..d3bf34b93 100644
--- a/tdeio/bookmarks/Makefile.am
+++ b/tdeio/bookmarks/Makefile.am
@@ -31,10 +31,10 @@ include_HEADERS = \
 	kbookmarkimporter_crash.h kbookmarkimporter_opera.h kbookmarkimporter_ie.h \
 	kbookmarkimporter_ns.h kbookmarkimporter_kde1.h kbookmarkdombuilder.h 
 libkbookmarks_la_SOURCES = \
-	kbookmark.cc kbookmarkbar.cc kbookmarkdrag.cc kbookmarkexporter.cc \
-	kbookmarkimporter.cc kbookmarkmanager.cc kbookmarkmenu.cc \
-	kbookmarkimporter_crash.cc kbookmarkimporter_opera.cc kbookmarkimporter_ie.cc \
-	kbookmarkimporter_ns.cc kbookmarkimporter_kde1.cc kbookmarkdombuilder.cc \
+	kbookmark.cpp kbookmarkbar.cpp kbookmarkdrag.cpp kbookmarkexporter.cpp \
+	kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp \
+	kbookmarkimporter_crash.cpp kbookmarkimporter_opera.cpp kbookmarkimporter_ie.cpp \
+	kbookmarkimporter_ns.cpp kbookmarkimporter_kde1.cpp kbookmarkdombuilder.cpp \
 	kbookmarkmanager.skel kbookmarknotifier.skel
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cpp
index 1e8bf8f7a..1e8bf8f7a 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cpp
diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cpp
index 0f8f910c2..ca4d5d8c0 100644
--- a/tdeio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cpp
@@ -96,8 +96,8 @@ KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr,
 
     dptr()->m_actions.setAutoDelete( true );
 
-    connect( mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-             TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
+    connect( mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+             TQ_SLOT( slotBookmarksChanged(const TQString &) ) );
 
     KBookmarkGroup toolbar = getToolbar();
     fillBookmarkBar( toolbar );
@@ -198,8 +198,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
             else
             {
                 TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
-                connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
-                        this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
+                connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+                        this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
 
                 action->setProperty( "url", bm.url().url() );
                 action->setProperty( "address", bm.address() );
@@ -227,10 +227,10 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent)
             KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(),
                                                     m_actionCollection, false, addEntriesBookmarkBar,
                                                     bm.address());
-            connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ),
-                    this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ));
-            connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ),
-                    this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ));
+            connect(menu, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ),
+                    this, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ));
+            connect(menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ),
+                    this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ));
             menu->fillBookmarkMenu();
             action->plug(m_toolBar);
             m_lstSubMenus.append( menu );
@@ -265,7 +265,7 @@ void KBookmarkBar::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/,
 
 void KBookmarkBar::slotBookmarkSelected()
 {
-    slotBookmarkSelected(TDEAction::ToolBarActivation, Qt::NoButton);
+    slotBookmarkSelected(TDEAction::ToolBarActivation, TQt::NoButton);
 }
 
 static const int const_sepId = -9999; // FIXME this is ugly,
@@ -456,7 +456,7 @@ bool KBookmarkBar::eventFilter( TQObject *o, TQEvent *e )
 
         // FIXME, see how this holds up on an empty toolbar
         _a = handleToolbarMouseButton( mev->pos(), dptr()->m_actions, m_pManager, pt );
-        if (_a && mev->button() == Qt::RightButton)
+        if (_a && mev->button() == TQt::RightButton)
         {
             dptr()->m_highlightedAddress = _a->property("address").toString();
             KBookmark bookmark = m_pManager->findByAddress( dptr()->m_highlightedAddress );
diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 2b63dff4a..7e8190d7b 100644
--- a/tdeio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
@@ -39,7 +39,7 @@ class TQPopupMenu;
  */
 class TDEIO_EXPORT KBookmarkBar : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     friend class RMB;
 public:
diff --git a/tdeio/bookmarks/kbookmarkdombuilder.cc b/tdeio/bookmarks/kbookmarkdombuilder.cpp
index 5c0882d05..2fddaa861 100644
--- a/tdeio/bookmarks/kbookmarkdombuilder.cc
+++ b/tdeio/bookmarks/kbookmarkdombuilder.cpp
@@ -36,14 +36,14 @@ KBookmarkDomBuilder::~KBookmarkDomBuilder() {
 }
 
 void KBookmarkDomBuilder::connectImporter(const TQObject *importer) {
-   connect(importer, TQT_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ),
-                     TQT_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) ));
-   connect(importer, TQT_SIGNAL( newFolder(const TQString &, bool, const TQString &) ),
-                     TQT_SLOT( newFolder(const TQString &, bool, const TQString &) ));
-   connect(importer, TQT_SIGNAL( newSeparator() ),
-                     TQT_SLOT( newSeparator() ) );
-   connect(importer, TQT_SIGNAL( endFolder() ),
-                     TQT_SLOT( endFolder() ) );
+   connect(importer, TQ_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ),
+                     TQ_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) ));
+   connect(importer, TQ_SIGNAL( newFolder(const TQString &, bool, const TQString &) ),
+                     TQ_SLOT( newFolder(const TQString &, bool, const TQString &) ));
+   connect(importer, TQ_SIGNAL( newSeparator() ),
+                     TQ_SLOT( newSeparator() ) );
+   connect(importer, TQ_SIGNAL( endFolder() ),
+                     TQ_SLOT( endFolder() ) );
 }
 
 void KBookmarkDomBuilder::newBookmark(
diff --git a/tdeio/bookmarks/kbookmarkdombuilder.h b/tdeio/bookmarks/kbookmarkdombuilder.h
index 44fe7b170..185904c09 100644
--- a/tdeio/bookmarks/kbookmarkdombuilder.h
+++ b/tdeio/bookmarks/kbookmarkdombuilder.h
@@ -28,7 +28,7 @@
  * @since 3.2
  */
 class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *);
    virtual ~KBookmarkDomBuilder();
diff --git a/tdeio/bookmarks/kbookmarkdrag.cc b/tdeio/bookmarks/kbookmarkdrag.cpp
index d5cf6cb47..d5cf6cb47 100644
--- a/tdeio/bookmarks/kbookmarkdrag.cc
+++ b/tdeio/bookmarks/kbookmarkdrag.cpp
diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cpp
index 7f4dca67f..7f4dca67f 100644
--- a/tdeio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cpp
index a83e36c78..3eb13a501 100644
--- a/tdeio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cpp
@@ -70,14 +70,14 @@ void KXBELBookmarkImporterImpl::visitLeave(const KBookmarkGroup &)
 
 void KBookmarkImporterBase::setupSignalForwards(TQObject *src, TQObject *dst)
 {
-  connect(src, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ),
-          dst, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ));
-  connect(src, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ),
-          dst, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ));
-  connect(src, TQT_SIGNAL( newSeparator() ),
-          dst, TQT_SIGNAL( newSeparator() ) );
-  connect(src, TQT_SIGNAL( endFolder() ),
-          dst, TQT_SIGNAL( endFolder() ) );
+  connect(src, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ),
+          dst, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ));
+  connect(src, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ),
+          dst, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ));
+  connect(src, TQ_SIGNAL( newSeparator() ),
+          dst, TQ_SIGNAL( newSeparator() ) );
+  connect(src, TQ_SIGNAL( endFolder() ),
+          dst, TQ_SIGNAL( endFolder() ) );
 }
 
 KBookmarkImporterBase* KBookmarkImporterBase::factory( const TQString &type )
diff --git a/tdeio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h
index fab32801a..3e7158ecd 100644
--- a/tdeio/bookmarks/kbookmarkimporter.h
+++ b/tdeio/bookmarks/kbookmarkimporter.h
@@ -34,7 +34,7 @@
  */
 class TDEIO_EXPORT KBookmarkImporterBase : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KBookmarkImporterBase() {}
     virtual ~KBookmarkImporterBase() {}
@@ -84,7 +84,7 @@ private:
  */
 class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KXBELBookmarkImporterImpl() {}
     virtual void parse();
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
index 44c591ef4..44c591ef4 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h
index 74a4b9cd8..007dcf86a 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
@@ -34,7 +34,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED TDECrashBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDECrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~TDECrashBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cpp
index 966775e89..966775e89 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h
index 532b6f1b5..d0707cefb 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.h
@@ -33,7 +33,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KIEBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~KIEBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp
index 9b59d1e33..9b59d1e33 100644
--- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cpp
index 6e27f364b..6e27f364b 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h
index 18b1e195e..4ccee6fa3 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.h
@@ -34,7 +34,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KNSBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~KNSBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cpp
index 6f95b399e..6f95b399e 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h
index 4c34776e2..1235ac642 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.h
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.h
@@ -32,7 +32,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KOperaBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~KOperaBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cpp
index d36d13151..d36d13151 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cpp
diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 5ed57280a..fa44f5329 100644
--- a/tdeio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
@@ -50,7 +50,7 @@
  */
 class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 protected:
     /**
@@ -350,9 +350,9 @@ protected:
  */
 class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
-    typedef TQValueList<QPair<TQString,TQString> > QStringPairList;
+    typedef TQValueList<TQPair<TQString,TQString> > QStringPairList;
 public slots:
     void fillBookmarksList( KExtendedBookmarkOwner::QStringPairList & list ) { emit signalFillBookmarksList( list ); };
 signals:
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cpp
index fd35736dd..070912eb5 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cpp
@@ -94,9 +94,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
   if (m_actionCollection)
   {
     m_actionCollection->setHighlightingEnabled(true);
-    disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 );
-    connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ),
-             this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) );
+    disconnect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 );
+    connect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ),
+             this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) );
   }
 
   m_bNSBookmark = m_parentAddress.isNull();
@@ -104,20 +104,20 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr,
   {
     //kdDebug(7043) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress << endl;
 
-    connect( _parentMenu, TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( slotAboutToShow() ) );
+    connect( _parentMenu, TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( slotAboutToShow() ) );
 
     if ( KBookmarkSettings::self()->m_contextmenu )
     {
       (void) _parentMenu->contextMenu();
-      connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ),
-               this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ));
+      connect( _parentMenu, TQ_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ),
+               this, TQ_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ));
     }
 
     if ( m_bIsRoot )
     {
-      connect( m_pManager, TQT_SIGNAL( changed(const TQString &, const TQString &) ),
-               TQT_SLOT( slotBookmarksChanged(const TQString &) ) );
+      connect( m_pManager, TQ_SIGNAL( changed(const TQString &, const TQString &) ),
+               TQ_SLOT( slotBookmarksChanged(const TQString &) ) );
     }
   }
 
@@ -254,12 +254,12 @@ void RMB::fillContextMenu( TQPopupMenu* contextMenu, const TQString & address, i
   // TODO rename these, but, message freeze... umm...
 
 //  if (bookmark.isGroup()) {
-    id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) );
+    id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) );
     contextMenu->setItemParameter( id, val );
 /*  }
   else
   {
-    id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) );
+    id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) );
     contextMenu->setItemParameter( id, val );
   }*/
 }
@@ -271,24 +271,24 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address,
   int id;
 
   if (bookmark.isGroup()) {
-    id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) );
+    id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQ_SLOT(slotRMBActionEditAt(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
-    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
+    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQ_SLOT(slotRMBActionRemove(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
-    id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
+    id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) );
     contextMenu->setItemParameter( id, val );
   }
   else
   {
-    id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) );
+    id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQ_SLOT(slotRMBActionCopyLocation(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
-    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) );
+    id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQ_SLOT(slotRMBActionRemove(int)) );
     contextMenu->setItemParameter( id, val );
     contextMenu->insertSeparator();
-    id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) );
+    id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) );
     contextMenu->setItemParameter( id, val );
   }
 }
@@ -487,7 +487,7 @@ void KBookmarkMenu::addAddBookmarksList()
                                           "bookmarks_list_add",
                                           0,
                                           this,
-                                          TQT_SLOT( slotAddBookmarksList() ),
+                                          TQ_SLOT( slotAddBookmarksList() ),
                                           m_actionCollection, m_bIsRoot ? "add_bookmarks_list" : 0 );
 
   paAddBookmarksList->setToolTip( i18n( "Add a folder of bookmarks for all open tabs." ) );
@@ -507,7 +507,7 @@ void KBookmarkMenu::addAddBookmark()
                                           "bookmark_add",
                                           m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(),
                                           this,
-                                          TQT_SLOT( slotAddBookmark() ),
+                                          TQ_SLOT( slotAddBookmark() ),
                                           m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 );
 
   paAddBookmarks->setToolTip( i18n( "Add a bookmark for the current document" ) );
@@ -521,7 +521,7 @@ void KBookmarkMenu::addEditBookmarks()
   if (!kapp->authorizeTDEAction("bookmarks"))
      return;
 
-  TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ),
+  TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ),
                                                              m_actionCollection, "edit_bookmarks" );
   m_paEditBookmarks->plug( m_parentMenu );
   m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) );
@@ -542,7 +542,7 @@ void KBookmarkMenu::addNewFolder()
                                        "folder-new", //"folder",
                                        0,
                                        this,
-                                       TQT_SLOT( slotNewFolder() ),
+                                       TQ_SLOT( slotNewFolder() ),
                                        m_actionCollection );
 
   paNewFolder->setToolTip( i18n( "Create a new bookmark folder in this menu" ) );
@@ -607,11 +607,11 @@ void KBookmarkMenu::fillBookmarkMenu()
           new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(),
                              m_actionCollection, false,
                              m_bAddBookmark, TQString::null );
-       connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
-                this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
+       connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
+                this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
        m_lstSubMenus.append(subMenu);
 
-       connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad()));
+       connect(actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, TQ_SLOT(slotNSLoad()));
     }
   }
 
@@ -637,8 +637,8 @@ void KBookmarkMenu::fillBookmarkMenu()
       {
         //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl;
         TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 );
-        connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
-                this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
+        connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+                this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
 
         action->setProperty( "url", bm.url().url() );
         action->setProperty( "address", bm.address() );
@@ -664,10 +664,10 @@ void KBookmarkMenu::fillBookmarkMenu()
                                                   m_bAddBookmark,
                                                   bm.address() );
 
-      connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ),
-                 this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ));
-      connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
-                this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
+      connect(subMenu, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ),
+                 this, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ));
+      connect(subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
+                this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
       m_lstSubMenus.append( subMenu );
     }
   }
@@ -756,7 +756,7 @@ void KBookmarkMenu::slotBookmarkSelected( TDEAction::ActivationReason /*reason*/
 
 void KBookmarkMenu::slotBookmarkSelected()
 {
-    slotBookmarkSelected(TDEAction::PopupMenuActivation, Qt::NoButton);
+    slotBookmarkSelected(TDEAction::PopupMenuActivation, TQt::NoButton);
 }
 
 KExtendedBookmarkOwner* KBookmarkMenu::extOwner()
@@ -767,7 +767,7 @@ KExtendedBookmarkOwner* KBookmarkMenu::extOwner()
 void KBookmarkMenu::slotNSLoad()
 {
   // only fill menu once
-  m_parentMenu->disconnect(TQT_SIGNAL(aboutToShow()));
+  m_parentMenu->disconnect(TQ_SIGNAL(aboutToShow()));
 
   // not NSImporter, but kept old name for BC reasons
   KBookmarkMenuNSImporter importer( m_pManager, this, m_actionCollection );
@@ -846,10 +846,10 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString&
   if ( editType == InsertionMode )
   {
     m_folderTree = KBookmarkFolderTree::createTree( m_mgr, m_main, name, m_address );
-    connect( m_folderTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ),
-             this,         TQT_SLOT( slotDoubleClicked(TQListViewItem*) ) );
+    connect( m_folderTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ),
+             this,         TQ_SLOT( slotDoubleClicked(TQListViewItem*) ) );
     vbox->addWidget( m_folderTree );
-    connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotUser1() ) );
+    connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotUser1() ) );
   }
 }
 
@@ -1043,12 +1043,12 @@ void KBookmarkMenuNSImporter::openBookmarks( const TQString &location, const TQS
 
 void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer)
 {
-  connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ),
-           TQT_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) );
-  connect( &importer, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ),
-           TQT_SLOT( newFolder( const TQString &, bool, const TQString & ) ) );
-  connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ) );
-  connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolder() ) );
+  connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ),
+           TQ_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) );
+  connect( &importer, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ),
+           TQ_SLOT( newFolder( const TQString &, bool, const TQString & ) ) );
+  connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ) );
+  connect( &importer, TQ_SIGNAL( endFolder() ), TQ_SLOT( endFolder() ) );
 }
 
 void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & )
@@ -1056,8 +1056,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin
   TQString _text = KStringHandler::csqueeze(text);
   _text.replace( '&', "&&" );
   TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0);
-  connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
-          m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
+  connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )),
+          m_menu, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) ));
   action->setProperty( "url", url );
   action->setToolTip( url );
   action->plug( mstack.top()->m_parentMenu );
@@ -1074,8 +1074,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt
   KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(),
                                               m_actionCollection, false,
                                               m_menu->m_bAddBookmark, TQString::null );
-  connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
-           m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
+  connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ),
+           m_menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ));
   mstack.top()->m_lstSubMenus.append( subMenu );
 
   mstack.push(subMenu);
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 807df086f..77a5c19e4 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -76,7 +76,7 @@ namespace TDEIO { class Job; }
  */
 class TDEIO_EXPORT KBookmarkMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KBookmarkMenuNSImporter;
   friend class RMB;
 public:
@@ -238,7 +238,7 @@ protected:
  */
 class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) :
      m_menu(menu), m_actionCollection(act), m_pManager(mgr) {}
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index 31fb8cd72..7439a556b 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -51,7 +51,7 @@ class KBookmarkBar;
 class TDEPopupMenu;
 
 class KImportedBookmarksActionMenu : public TDEActionMenu {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString type READ type WRITE setType )
   TQ_PROPERTY( TQString location READ location WRITE setLocation )
 public:
@@ -72,7 +72,7 @@ public:
 };
 
 class KBookmarkActionMenu : public TDEActionMenu {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
   TQ_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly )
@@ -97,7 +97,7 @@ public:
 };
 
 class KBookmarkAction : public TDEAction {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
 public:
@@ -135,7 +135,7 @@ public:
 
 class KBookmarkEditDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   typedef enum { ModifyMode, InsertionMode } BookmarkEditType;
diff --git a/tdeio/httpfilter/CMakeLists.txt b/tdeio/httpfilter/CMakeLists.txt
index b40f10fdc..70564652e 100644
--- a/tdeio/httpfilter/CMakeLists.txt
+++ b/tdeio/httpfilter/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
 set( target httpfilter )
 
 set( ${target}_SRCS
-  httpfilter.cc
+  httpfilter.cpp
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
diff --git a/tdeio/httpfilter/Makefile.am b/tdeio/httpfilter/Makefile.am
index 2da25d1b6..b80ed9d71 100644
--- a/tdeio/httpfilter/Makefile.am
+++ b/tdeio/httpfilter/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = $(all_includes)
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhttpfilter.la
-libhttpfilter_la_SOURCES = httpfilter.cc
+libhttpfilter_la_SOURCES = httpfilter.cpp
 libhttpfilter_la_LIBADD = $(LIBZ)
 libhttpfilter_la_LDFLAGS = $(all_libraries)
 
diff --git a/tdeio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cpp
index 0f6a45790..a2ed52f43 100644
--- a/tdeio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cpp
@@ -37,8 +37,8 @@ void
 HTTPFilterBase::chain(HTTPFilterBase *previous)
 {
    last = previous;
-   connect(last, TQT_SIGNAL(output(const TQByteArray &)),
-           this, TQT_SLOT(slotInput(const TQByteArray &)));
+   connect(last, TQ_SIGNAL(output(const TQByteArray &)),
+           this, TQ_SLOT(slotInput(const TQByteArray &)));
 }
 
 HTTPFilterChain::HTTPFilterChain()
@@ -55,14 +55,14 @@ HTTPFilterChain::addFilter(HTTPFilterBase *filter)
    }
    else
    {
-      disconnect(last, TQT_SIGNAL(output(const TQByteArray &)), 0, 0);
+      disconnect(last, TQ_SIGNAL(output(const TQByteArray &)), 0, 0);
       filter->chain(last);
    }
    last = filter;
-   connect(filter, TQT_SIGNAL(output(const TQByteArray &)),
-           this, TQT_SIGNAL(output(const TQByteArray &)));
-   connect(filter, TQT_SIGNAL(error(int, const TQString &)),
-           this, TQT_SIGNAL(error(int, const TQString &)));
+   connect(filter, TQ_SIGNAL(output(const TQByteArray &)),
+           this, TQ_SIGNAL(output(const TQByteArray &)));
+   connect(filter, TQ_SIGNAL(error(int, const TQString &)),
+           this, TQ_SIGNAL(error(int, const TQString &)));
 }
 
 void
diff --git a/tdeio/httpfilter/httpfilter.h b/tdeio/httpfilter/httpfilter.h
index 520a1c627..ee71a6ecd 100644
--- a/tdeio/httpfilter/httpfilter.h
+++ b/tdeio/httpfilter/httpfilter.h
@@ -35,7 +35,7 @@
 
 class HTTPFilterBase : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterBase();
     ~HTTPFilterBase();
@@ -55,7 +55,7 @@ protected:
 
 class HTTPFilterChain : public HTTPFilterBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterChain();
 
@@ -70,7 +70,7 @@ private:
 
 class HTTPFilterMD5 : public HTTPFilterBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterMD5();
 
@@ -86,7 +86,7 @@ private:
 
 class HTTPFilterGZip : public HTTPFilterBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterGZip();
     ~HTTPFilterGZip();
@@ -111,7 +111,7 @@ protected:
 
 class HTTPFilterDeflate : public HTTPFilterGZip
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterDeflate();
 };
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 075843259..8e16290a5 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -37,7 +37,7 @@
 #include <tdewallet.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
@@ -76,8 +76,8 @@ KPasswdServer::KPasswdServer(const TQCString &name)
     m_authPending.setAutoDelete(true);
     m_seqNr = 0;
     m_wallet = 0;
-    connect(this, TQT_SIGNAL(windowUnregistered(long)),
-            this, TQT_SLOT(removeAuthForWindowId(long)));
+    connect(this, TQ_SIGNAL(windowUnregistered(long)),
+            this, TQ_SLOT(removeAuthForWindowId(long)));
 }
 
 KPasswdServer::~KPasswdServer()
@@ -279,7 +279,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo
     m_authPending.append(request);
 
     if (m_authPending.count() == 1)
-       TQTimer::singleShot(0, this, TQT_SLOT(processRequest()));
+       TQTimer::singleShot(0, this, TQ_SLOT(processRequest()));
 
     return info;
 }
@@ -386,7 +386,7 @@ KPasswdServer::processRequest()
             if (hasWalletData)
                 dlg.setKeepPassword( true );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             XSetTransientForHint( tqt_xdisplay(), dlg.winId(), request->windowId);
 #endif
 
@@ -493,7 +493,7 @@ KPasswdServer::processRequest()
     }
 
     if (m_authPending.count())
-       TQTimer::singleShot(0, this, TQT_SLOT(processRequest()));
+       TQTimer::singleShot(0, this, TQ_SLOT(processRequest()));
 
 }
 
diff --git a/tdeio/kpasswdserver/kpasswdserver.h b/tdeio/kpasswdserver/kpasswdserver.h
index 71aab3859..c31e64449 100644
--- a/tdeio/kpasswdserver/kpasswdserver.h
+++ b/tdeio/kpasswdserver/kpasswdserver.h
@@ -38,7 +38,7 @@ namespace TDEWallet {
 
 class KPasswdServer : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KPasswdServer(const TQCString &);
diff --git a/tdeio/kssl/CMakeLists.txt b/tdeio/kssl/CMakeLists.txt
index a2c9f00d6..bb49a0ea6 100644
--- a/tdeio/kssl/CMakeLists.txt
+++ b/tdeio/kssl/CMakeLists.txt
@@ -42,14 +42,14 @@ install( FILES
 set( target kssl )
 
 set( ${target}_SRCS
-  kssl.cc ksslcertificatehome.cc ksslsettings.cc
-  ksslcertificate.cc ksslconnectioninfo.cc ksslcertificatefactory.cc
-  ksslcertificatecache.cc ksslpeerinfo.cc ksslinfodlg.cc
-  ksslcertdlg.cc ksslutils.cc kopenssl.cc ksslpkcs12.cc
-  ksslcertchain.cc ksslkeygen.cc ksslx509v3.cc
-  ksslsigners.cc ksslpkcs7.cc ksslpemcallback.cc
-  ksslx509map.cc ksslsession.cc keygenwizard.ui
-  keygenwizard2.ui ksmimecrypto.cc ksslcsessioncache.cc
+  kssl.cpp ksslcertificatehome.cpp ksslsettings.cpp
+  ksslcertificate.cpp ksslconnectioninfo.cpp ksslcertificatefactory.cpp
+  ksslcertificatecache.cpp ksslpeerinfo.cpp ksslinfodlg.cpp
+  ksslcertdlg.cpp ksslutils.cpp kopenssl.cpp ksslpkcs12.cpp
+  ksslcertchain.cpp ksslkeygen.cpp ksslx509v3.cpp
+  ksslsigners.cpp ksslpkcs7.cpp ksslpemcallback.cpp
+  ksslx509map.cpp ksslsession.cpp keygenwizard.ui
+  keygenwizard2.ui ksmimecrypto.cpp ksslcsessioncache.cpp
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
diff --git a/tdeio/kssl/Makefile.am b/tdeio/kssl/Makefile.am
index 5d57ab7ab..1f9038be7 100644
--- a/tdeio/kssl/Makefile.am
+++ b/tdeio/kssl/Makefile.am
@@ -40,31 +40,31 @@ noinst_HEADERS = ksslcsessioncache.h
 
 
 libkssl_la_SOURCES	= \
-			kssl.cc                   \
-			ksslcertificatehome.cc    \
-			ksslsettings.cc           \
-			ksslcertificate.cc        \
-			ksslconnectioninfo.cc     \
-			ksslcertificatefactory.cc \
-			ksslcertificatecache.cc   \
-			ksslpeerinfo.cc           \
-			ksslinfodlg.cc            \
-			ksslcertdlg.cc            \
-			ksslutils.cc              \
-			kopenssl.cc		  \
-			ksslpkcs12.cc		  \
-			ksslcertchain.cc	  \
-			ksslkeygen.cc		  \
-			ksslx509v3.cc		  \
-			ksslsigners.cc		  \
-			ksslpkcs7.cc		  \
-			ksslpemcallback.cc	  \
-			ksslx509map.cc		  \
-			ksslsession.cc		  \
+			kssl.cpp                   \
+			ksslcertificatehome.cpp    \
+			ksslsettings.cpp           \
+			ksslcertificate.cpp        \
+			ksslconnectioninfo.cpp     \
+			ksslcertificatefactory.cpp \
+			ksslcertificatecache.cpp   \
+			ksslpeerinfo.cpp           \
+			ksslinfodlg.cpp            \
+			ksslcertdlg.cpp            \
+			ksslutils.cpp              \
+			kopenssl.cpp		  \
+			ksslpkcs12.cpp		  \
+			ksslcertchain.cpp	  \
+			ksslkeygen.cpp		  \
+			ksslx509v3.cpp		  \
+			ksslsigners.cpp		  \
+			ksslpkcs7.cpp		  \
+			ksslpemcallback.cpp	  \
+			ksslx509map.cpp		  \
+			ksslsession.cpp		  \
 			keygenwizard.ui		  \
 			keygenwizard2.ui	  \
-			ksmimecrypto.cc		  \
-			ksslcsessioncache.cc
+			ksmimecrypto.cpp		  \
+			ksslcsessioncache.cpp
 
 
 SUBDIRS = kssl
diff --git a/tdeio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cpp
index a009bd7e9..96e4473a2 100644
--- a/tdeio/kssl/kopenssl.cc
+++ b/tdeio/kssl/kopenssl.cpp
@@ -33,6 +33,8 @@
 #include <unistd.h>
 #include "kopenssl.h"
 
+#define STRINGIFY(x) #x
+
 #define GET_CRYPTOLIB_SYMBOL(a) ((_cryptoLib->hasSymbol(a)) ? _cryptoLib->symbol(a) : NULL)
 #define GET_SSLLIB_SYMBOL(a) ((_sslLib->hasSymbol(a)) ? _sslLib->symbol(a) : NULL)
 
@@ -343,10 +345,18 @@ TDEConfig *cfg;
    libnamesc << "cygcrypto.dll"
 		 << "libcrypto.dll"
 		 << "";
-#else
+#else /* !OpenBSD && !CygWin */
+
+#ifdef Q_OS_SOLARIS
+
+   libpaths << "/" SYSTEM_LIBDIR KDELIBSUFF "/"
+	    << "/usr/" SYSTEM_LIBDIR KDELIBSUFF "/"
+	    << "";
+#else /* default */
+
    libpaths
-            #ifdef _AIX
-            << "/opt/freeware/lib/"
+	    #ifdef _AIX
+	    << "/opt/freeware/lib/"
 	    #endif
 	    << "/usr/" SYSTEM_LIBDIR "/"
 	    << "/usr/ssl/" SYSTEM_LIBDIR "/"
@@ -355,43 +365,52 @@ TDEConfig *cfg;
 	    << "/usr/local/ssl/" SYSTEM_LIBDIR "/"
 	    << "/opt/openssl/" SYSTEM_LIBDIR "/"
 	    << "/" SYSTEM_LIBDIR "/"
-            << "";
+	    << "";
+#endif /* default */
 
 // FIXME: #define here for the various OS types to optimize
    libnamess
 	     #ifdef hpux
-             << "libssl.sl"
-             #elif defined(_AIX)
-             << "libssl.a(libssl.so.0)"
+	     << "libssl.sl"
+	     #elif defined(_AIX)
+	     << "libssl.a(libssl.so.0)"
 	     #elif defined(__APPLE__)
 	     << "libssl.dylib"
 	     << "libssl.0.9.dylib"
-             #else
-             #ifdef SHLIB_VERSION_NUMBER
-             << "libssl.so." SHLIB_VERSION_NUMBER
-             #endif
-             << "libssl.so"
-	     << "libssl.so.0"
-             #endif
+	     #else
+	       #ifdef OPENSSL_SHLIB_VERSION
+	       << "libssl.so." STRINGIFY(OPENSSL_SHLIB_VERSION)
+	       #endif
+	       #ifdef SHLIB_VERSION_NUMBER
+	       << "libssl.so." SHLIB_VERSION_NUMBER
+	       #endif
+	       << "libssl.so"
+	       << "libssl.so.3"
+	       << "libssl.so.0"
+	     #endif
 	     ;
 
    libnamesc
-             #ifdef hpux
-             << "libcrypto.sl"
-             #elif defined(_AIX)
-             << "libcrypto.a(libcrypto.so.0)"
+	     #ifdef hpux
+	     << "libcrypto.sl"
+	     #elif defined(_AIX)
+	     << "libcrypto.a(libcrypto.so.0)"
 	     #elif defined(__APPLE__)
 	     << "libcrypto.dylib"
 	     << "libcrypto.0.9.dylib"
 	     #else
-             #ifdef SHLIB_VERSION_NUMBER
-             << "libcrypto.so." SHLIB_VERSION_NUMBER
-             #endif
-             << "libcrypto.so"
-	     << "libcrypto.so.0"
-             #endif
+	       #ifdef OPENSSL_SHLIB_VERSION
+	       << "libcrypto.so." STRINGIFY(OPENSSL_SHLIB_VERSION)
+	       #endif
+	       #ifdef SHLIB_VERSION_NUMBER
+	       << "libcrypto.so." SHLIB_VERSION_NUMBER
+	       #endif
+	       << "libcrypto.so"
+	       << "libcrypto.so.3"
+	       << "libcrypto.so.0"
+	     #endif
 	     ;
-#endif
+#endif /* __OpenBSD__ */
 
    for (TQStringList::Iterator it = libpaths.begin();
                               it != libpaths.end();
@@ -635,7 +654,8 @@ TDEConfig *cfg;
       K_SSLv3_client_method = (SSL_METHOD *(*)()) GET_SSLLIB_SYMBOL("SSLv3_client_method");
       K_TLS_client_method = (SSL_METHOD *(*)()) GET_SSLLIB_SYMBOL("TLS_client_method");
       if (!K_TLS_client_method) K_TLS_client_method = (SSL_METHOD *(*)()) GET_SSLLIB_SYMBOL("SSLv23_client_method");
-      K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) GET_SSLLIB_SYMBOL("SSL_get_peer_certificate");
+      K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) GET_SSLLIB_SYMBOL("SSL_get1_peer_certificate");
+			if (!K_SSL_get_peer_certificate) K_SSL_get_peer_certificate = (X509 *(*)(SSL *)) GET_SSLLIB_SYMBOL("SSL_get_peer_certificate");
       K_SSL_CIPHER_get_bits = (int (*)(SSL_CIPHER *,int *)) GET_SSLLIB_SYMBOL("SSL_CIPHER_get_bits");
       K_SSL_CIPHER_get_version = (char * (*)(SSL_CIPHER *)) GET_SSLLIB_SYMBOL("SSL_CIPHER_get_version");
       K_SSL_CIPHER_get_name = (const char * (*)(SSL_CIPHER *)) GET_SSLLIB_SYMBOL("SSL_CIPHER_get_name");
diff --git a/tdeio/kssl/kopenssl.h b/tdeio/kssl/kopenssl.h
index 312aef2c8..18255034c 100644
--- a/tdeio/kssl/kopenssl.h
+++ b/tdeio/kssl/kopenssl.h
@@ -27,7 +27,7 @@ class KOpenSSLProxyPrivate;
 
 #include <klibloader.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksmimecrypto.cc b/tdeio/kssl/ksmimecrypto.cpp
index 92318b9f0..92318b9f0 100644
--- a/tdeio/kssl/ksmimecrypto.cc
+++ b/tdeio/kssl/ksmimecrypto.cpp
diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cpp
index 0f34a55da..0f34a55da 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cpp
diff --git a/tdeio/kssl/kssl/LETSENCRYPT b/tdeio/kssl/kssl/LETSENCRYPT
new file mode 100644
index 000000000..ec1fe3cb3
--- /dev/null
+++ b/tdeio/kssl/kssl/LETSENCRYPT
@@ -0,0 +1,3 @@
+Lets Encrypt certificates support is provided via ISRG's X1+X2 root certificates.
+
+Read more here: https://letsencrypt.org/certificates/
diff --git a/tdeio/kssl/kssl/caroot/ca-bundle.crt b/tdeio/kssl/kssl/caroot/ca-bundle.crt
index 31409b62f..31ef23fb0 100644
--- a/tdeio/kssl/kssl/caroot/ca-bundle.crt
+++ b/tdeio/kssl/kssl/caroot/ca-bundle.crt
@@ -2971,3 +2971,1014 @@ OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
 hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
 tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
 -----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIICjTCCAXWgAwIBAgIDAQAhMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA3MTIxNjMxNTNaFw0xMjA3MTIxNjMxNTNaMEMxCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xFzAVBgNVBAMTDkNlcnR1bSBM
+ZXZlbCBJMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl73pZ9DFcn7Qy0qBZ
+K+So18cav7drUrJ8SiYOlDDVskt81+eIcL/4FelTSGjuAOvYdmm+HGYG998RPB0i
+Z+Ak67vXFJ537vRWOcu6aMjNuAwu8BOdc5eSgB0Y8X4+3LOYfugtaZa8mrEQ8Hit
+0yLE9UBcU9J+4PmkVGecmZ8jZQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAlDS4aTmgK0YgmUvt/3zN7G2/ZrtBBCtONlUvC69c7
+TmLJWJ842y2AH7ryNXXkcsn6p0ZBTrTJ2tA2y/j2PXJeXrCkK/qAJIpM0l4u0MT7
+enY5akasduHp2NXMP9vDlgMy7elU2s3nkOT79gfh5XttC+5D/x4JDNi1DMAA9hk1
+6DK4zWmDVfjkiP/G3fEndtJgNDQsyqnaQ3E3bljv3f1KJTjZUvtA2Ml6MP2hFRhg
+ZPsxuhW8QXidQYNiua1h7XUUiPiERLDLWZmfY6dxGrHXjSTx3shHNaQM0qkDs9gS
+6UK8uWJN2bf2YBnvGmzy0IQvx5wDCH7h8AdaBD6DgIG1
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIICjjCCAXagAwIBAgIDAQAiMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA3MTIxNjMyMDNaFw0xMjA3MTIxNjMyMDNaMEQxCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBM
+ZXZlbCBJSTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyMQSaN5fA94hNE46
+bMKpGUb5yIPEowReGZzGttYBQnC6oUOy+iM3md8WerzXeBKf7iIZEDW2HAp7BKhS
+4rMB6taxT07vDtkNfEKwOk6X7dODw6KY4mxnzjmjh5pf2feKKJ3MoZxi2HAz2a6J
+vHKFMq8dAlGL2GBtLvzlFp2jwkMCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAWo3wgy+/0B7UiTCu4Wn1rvGRXIUtbPNp4Bc4PP/i
+1q6pPheIe0ooCopuqnDX9maTHhZeNpnApgCUSbyw71EaOremD7HjWXASRUTylhwL
+5FdSx+D6MgF2uW9uwZ+NErkeRJYT2aRXe5FBOVIseC4g93Ay0D8Hg50MkAC5pQqW
++8GSszT94NzT7ppIaMtq53PZpUtLGiL3UBZ5vUJ5pE4lLKD7Ce+pXzZevy/MnkMG
+D1L7LgjRWL17OcMlASFETyUTajNjvxMy+oM4C22rwHRh2WQrvgw5MO+Q3UyYA1r5
+VrSaqgQ1g06ZcQt+mhzoc2swlOSwm8iis8H6orR8xmCWrA==
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIICjzCCAXegAwIBAgIDAQAjMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA3MTIxNjMyMTdaFw0xMjA3MTIxNjMyMTdaMEUxCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGTAXBgNVBAMTEENlcnR1bSBM
+ZXZlbCBJSUkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZjBbfGFmlsLjPe
+pWaDwG0LqhF11lWKabaHi1sQhK3qomHY7Em7qpL11dUQ1vsMcnnpzz/J0AEH6KDh
++yAyXV1SE/tVToLYYByZK+JGacLYIYF9aCwV8AhqyzOGurO5QX6vLboXB2WNnwmX
+hyNVKUgnUVy4ktAR2qZJIw5Bjsn/AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAIsLt3vKCZqd/gui45ovm3FSO6FLjzzq4pagPvbN
+nZ39HrhRaCpqkHDAj71L5L27U3eW2D4ILL0iUmZadbC4i3at/PUL9mjhGlajcCN8
+EF6IXGT87Tbcii735jRaaXSbEY4YhNOg9DPBoD4uJMkA8Z0Y/6lYmk4S6KUMCzzt
+t5zZBiWjdd08yFi5VGMvpE74KVOMdMa3JNVaR0XvT0Q8yXo1XKCrY9OFIxnhVgDb
+hzr9fwjKWDwu8kxhT9khAETm0BU2Buu+CTasaJdT/bBR2YEx9qcN7XyXTeDtkOO5
+QeGSqFgzquwjWEbKhf7l/e+efdRCg+ikH3O5snHB6iS+dgg=
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIICjjCCAXagAwIBAgIDAQAkMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA3MTIxNjMyMzVaFw0xMjA3MTIxNjMyMzVaMEQxCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBM
+ZXZlbCBJVjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmyb1lKqCAKE4juAy
+6lpVNUl6aJ2DuWPSiJ3BBk3/6ty6I4Lr2Dpy1b1vjVelhaFsVKEDgK2JyQlk9XMq
+LPZI2Ql166mJiPKFg77aY/W78EcQfGyjnRvVcs0tG40mAs/p84OEpFcVe/RSqDrD
+/D7R01u+Wj5xLl0PUsFplIGDbikCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAPS99JujKGVRfa50TKfieq+uK1SxjidErYaZTb3cJ
+NNfQDYn6nk4lnrnab5EUVhO/NegP2yIu3YOnZGfxFDhvVozMTKKAB5r5XKOvzsP9
+9C9578PVMLozucfUMCSwau7Z4l5uuQOHuzjzlVLCibbbf4RwfvZ7hh5sB5c0pNbw
+RQq64RXQUUEvul/W9gUeT9ISHOsASGTq+HJ5i7vNARjukEAXW/maqs9vyTWWbGVI
+1FSOnVyteymq4Xk+9YlIyNPNyacgnsMnU72XKBLDS0KJdhIWALFAZI4dSh5WZNuW
+ZguUnEmeH81lLbR+p/N3iuN8+oSo8UXik92jxeUY2tQJUA==
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIx
+EzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25h
+bCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJy
+YXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZp
+Y2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAy
+MzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsG
+A1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3Jt
+YWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYD
+VQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVA
+isamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyj
+Qo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50
+QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYt
+bRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbUR
+yEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwID
+AQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0
+cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0f
+BDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFj
+cmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1
+U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGl
+YjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75Fos
+SzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/
+t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0u
+mlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPb
+K+9A46sd33oqK8n8
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIG2jCCBcKgAwIBAgIDFc/9MA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJE
+RTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1E
+Rk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9w
+bGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNl
+cnRpZnlAcGNhLmRmbi5kZTAeFw0wMTEyMDExMjExMTZaFw0xMDAxMzExMjExMTZa
+MIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3Nu
+ZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0w
+KwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAf
+BgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMF5rhMt6zmhxK5oWPwT2FG7Up7T5DovHSD/YKPIRxsv
+DWmC4dTzByIBLnOmEflk+5KAqAYao6eY1qF0hR4WiS4DjCsn7l3zNo/4i2eF4EmG
+EksBygb4tRlTThcO7heFX+Du5qFoks+ONqa70RlwOr2l53KVwjMXBCtCLFSKRLVu
+xeh5+Smkm+FuOmwEugndM2n74Djjyf9DCOaHGZrHwVDh+Vpy5Ny4bKCSboujRxd5
+NxsStUshDVbTeS3B8TuzAJbywYWEE7erox+7WTfQr8ivSCBhrNJ36VRjAb8hiV9I
+uy2TmJYo2oPyC8a3eM3xj9Ku2IW3tS2zpfiIzt9xvFMCAwEAAaOCAwEwggL9MA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAYL+rX4SHijILELPs+g0MTRf33QMIHb
+BgNVHSMEgdMwgdCAFAYL+rX4SHijILELPs+g0MTRf33QoYGypIGvMIGsMQswCQYD
+VQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYD
+VQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRE
+Rk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0B
+CQEWEmNlcnRpZnlAcGNhLmRmbi5kZYIDFc/9MAsGA1UdDwQEAwIBBjARBglghkgB
+hvhCAQEEBAMCAAcwgaUGA1UdHwSBnTCBmjBLoEmgR4ZFaHR0cDovL3d3dy5kZm4t
+cGNhLmRlL2NlcnRpZmljYXRpb24veDUwOS9nMS9kYXRhL2NybHMvcm9vdC1jYS1j
+cmwuY3J4MEugSaBHhkVodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlv
+bi94NTA5L2cxL2RhdGEvY3Jscy9yb290LWNhLWNybC5jcmwwOAYJYIZIAYb4QgED
+BCsWKWh0dHBzOi8vd3d3LmRmbi1wY2EuZGUvY2dpL2NoZWNrLXJldi5jZ2k/MEsG
+CWCGSAGG+EIBCAQ+FjxodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlv
+bi9wb2xpY2llcy94NTA5cG9saWN5Lmh0bWwwOAYJYIZIAYb4QgENBCsWKVRoZSBE
+Rk4gVG9wLUxldmVsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MGQGA1UdIARdMFsw
+WQYLKwYBBAHZGoIsAQEwSjBIBggrBgEFBQcCARY8aHR0cDovL3d3dy5kZm4tcGNh
+LmRlL2NlcnRpZmljYXRpb24vcG9saWNpZXMveDUwOXBvbGljeS5odG1sMA0GCSqG
+SIb3DQEBBQUAA4IBAQAmbai6JMt7nkuavyvxKzLGn04Gyt0zKrp8zmERp4inktvY
+7p+vkaomYu2QYC7cHq0tlrPXQQhhetjiXGb+36aJtHDkEA0NwrJzYnHgPsvx7z0w
+ysENP4wxf97KsSWm07RY+f6/gIQF7Je7CW30Rzq7N6R0NMBs32mJgdn3ntqlFNw3
+Nbs050FEjPNq54RdawlJo85x+w+QJd7uQM4yZjHpRhvwgte9Ge1UqCUdpMsLHzeM
+KJ0B9GhwIIqOJCMiPgKjcUBrn6ehSX70POvXvjjE2+FzhPGTyTkS474d2UCAnL9q
+hPrdWXzBjOumOjhJutT1aecm9eljlshmh1cNen00
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAyygAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCQVQx
+EDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJn
+ZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVu
+c2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0MB4XDTAx
+MDIxMjExMzAzMFoXDTA5MDIxMjExMzAzMFowgZgxCzAJBgNVBAYTAkFUMRAwDgYD
+VQQIEwdBdXN0cmlhMQ8wDQYDVQQHEwZWaWVubmExQjBABgNVBAoTOUFyZ2UgRGF0
+ZW4gT2VzdGVycmVpY2hpc2NoZSBHZXNlbGxzY2hhZnQgZnVlciBEYXRlbnNjaHV0
+ejEiMCAGCSqGSIb3DQEJARYTYS1jZXJ0QGFyZ2VkYXRlbi5hdDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAwgsHqoNtmmrJ86+e1I4hOVBaL4kokqKN2IPOIL+1
+XwY8vfOOUfPEdhWpaC0ldt7VYrksgDiUccgH0FROANWK2GkfKMDzjjXHysR04uEb
+Om7Kqjqn0nproOGkFG+QvBZgs+Ws+HXNFJA6V76fU4+JXq4452LSK4Lr5YcBquu3
+NJECAwEAAaOCARkwggEVMB0GA1UdDgQWBBQ0j59zH/G31zRjgK1y2P//tSAWZjCB
+xQYDVR0jBIG9MIG6gBQ0j59zH/G31zRjgK1y2P//tSAWZqGBnqSBmzCBmDELMAkG
+A1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAG
+A1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBm
+dWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVu
+LmF0ggEAMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMBEGCWCGSAGG+EIBAQQE
+AwICBDANBgkqhkiG9w0BAQQFAAOBgQBFuJYncqMYB6gXQS3eDOI90BEHfFTKy/dV
+AV+K7QdAYikWmqgBheRdPKddJdccPy/Zl/p3ZT7GhDyC5f3wZjcuu8AJ27BNwbCA
+x54dgxgCNcyPm79nY8MRtEdEpoRGdSsFKJemz6hpXM++MWFciyrRWIIA44XB0Gv3
+US0spjsDPQ==
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYD
+VQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBT
+IFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQD
+Ew5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVz
+MB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMxCzAJBgNVBAYTAkVT
+MRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UE
+ChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcw
+FQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwu
+aXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyY
+XZhkJAk8IbPMGbWOlI6H0fg3PqHILVikgDVboXVsHUUMH2Fjal5vmwpMwci4YSM1
+gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Ehim51KODFDzT9NthFf+G4
+Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBACzzw3lY
+JN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsU
+dx+2/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14
+cJ58GNCr+Lh3B0Zx8coLY1xq+XKU1QFPoNtC
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCB
+ozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3Qt
+TmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1
+NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0
+IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYD
+VQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VS
+Rmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2
+N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCH
+iZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hARe
+YFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1
+axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6g
+yN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQD
+AgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPh
+ahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9V
+VE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEB
+BQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3Y
+IWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6Lzs
+QCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4
+ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qM
+YEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUb
+QErNaLly7HF27FSOH4UMAWr6pjisH8SE
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
+mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb 
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow 
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj 
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL 
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE 
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM 
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP 
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua 
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe 
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR 
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm 
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU 
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF 
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v 
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t 
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF 
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q 
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz 
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi 
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== 
+-----END CERTIFICATE----- 
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb 
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow 
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp 
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow 
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G 
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV 
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB 
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM 
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S 
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk 
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz 
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV 
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud 
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv 
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw 
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww 
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj 
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI 
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ 
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl 
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= 
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb 
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow 
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla 
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO 
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD 
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B 
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW 
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt 
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL 
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW 
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G 
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD 
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v 
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo 
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu 
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ 
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS 
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ 
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn 
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi 
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB 
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug 
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho 
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt 
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG 
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe 
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v 
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh 
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn 
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ 
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a 
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd 
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI 
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy 
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD 
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy 
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF 
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM 
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli 
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE 
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t 
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS 
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA== 
+-----END CERTIFICATE----- 
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB 
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug 
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho 
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw 
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG 
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD 
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu 
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN 
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ 
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK 
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq 
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW 
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB 
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT 
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js 
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr 
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB 
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft 
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj 
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH 
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv 
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 
+mfnGV/TJVTl4uix5yaaIK/QI 
+-----END CERTIFICATE----- 
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB 
+rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug 
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho 
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt 
+Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa 
+Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV 
+BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l 
+dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE 
+AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls 
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B 
+YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 
+hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l 
+L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm 
+SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM 
+1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws 
+6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud 
+DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw 
+Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 
+aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH 
+AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u 
+7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 
+xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ 
+rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim 
+eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk 
+USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ= 
+-----END CERTIFICATE----- 
+
+
+-----BEGIN CERTIFICATE----- 
+MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB 
+lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug 
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho 
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt 
+T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV 
+BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc 
+BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 
+dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC 
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP 
+HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO 
+KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo 
+5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ 
+pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb 
+kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC 
+AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E 
+FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov 
+L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV 
+HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN 
+AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw 
+NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB 
+mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU 
+4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 
+81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR 
+Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= 
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAx
+MDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG
+29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUk
+oVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk
+3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBL
+qdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIIN
+nvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuX
+ZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0H
+DjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VO
+TzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2Uv
+kVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4w
+zMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----

+MIICiTCCAfKgAwIBAgIEN4dnrDANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJi

+ZTERMA8GA1UEChMIQmVsZ2Fjb20xDDAKBgNVBAsTA01UTTEkMCIGA1UEAxMbQmVs

+Z2Fjb20gRS1UcnVzdCBQcmltYXJ5IENBMR8wHQYKCZImiZPyLGQBAxQPaW5mb0Bl

+LXRydXN0LmJlMB4XDTk4MTEwNDEzMDQzOVoXDTEwMDEyMTEzMDQzOVowdTELMAkG

+A1UEBhMCYmUxETAPBgNVBAoTCEJlbGdhY29tMQwwCgYDVQQLEwNNVE0xJDAiBgNV

+BAMTG0JlbGdhY29tIEUtVHJ1c3QgUHJpbWFyeSBDQTEfMB0GCgmSJomT8ixkAQMU

+D2luZm9AZS10cnVzdC5iZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtm5

+s9VPak3FQdB7BGFqi3GBB9pk41huJ1XCrc4XsPz6ko0I8Bxy/7LDMf7gaoeXTMxD

+V6coeTq1g12kHWrxasU+FCIdWQZv8KYxd9ywSTjmywwP/qpyNIjaKDohWu50Kxuk

+21sTFrVzX8OujNLAPj2wy/Dsi4YLwsFEGFpjqNUCAwEAAaMmMCQwDwYDVR0TBAgw

+BgEB/wIBATARBglghkgBhvhCAQEEBAMCAAcwDQYJKoZIhvcNAQEFBQADgYEAerKx

+pbF9M+nC4RvO05OMfwH9Gx1amq6rB1Ev7Ymr3VBCux//SrWknLFhKQpM6oNZSY2v

+hmnXgaxHqqRxblnvynxqblSK2qiSyfVms3lf1IsBniFjRjWTpcJfImIDcB1jI+hr

+SB0jECfY9t9HorrsgFBKbMRwpnrkdCJ/9oRiMn8=

+-----END CERTIFICATE-----

+
+
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----

+MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJE

+SzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEw

+ODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNU

+REMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A

+MIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr

+2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s

+2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItU

+GBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKj

+dGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+r

+TpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/

+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkB

+AQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBv

+c2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRl

+ciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEu

+MS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIg

+T0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1Ud

+HwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYD

+VQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2Ny

+bC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAy

+MTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZ

+J2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqG

+SIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACrom

+JkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhO

+inxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2Y

+caaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoB

+mbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQ

+YqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9

+BKNDLdr8C2LqL19iUw==

+-----END CERTIFICATE-----

+
+
+-----BEGIN CERTIFICATE----- 
+MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx 
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD 
+EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz 
+aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w 
+MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G 
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh 
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l 
+dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh 
+bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq 
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq 
+eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe 
+r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5 
+3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd 
+vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l 
+mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC 
+wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg 
+hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0 
+TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh 
+biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg 
+ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg 
+dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6 
+b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl 
+c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0 
+ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3 
+dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu 
+ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh 
+bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo 
+ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3 
+Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u 
+ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA 
+A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ 
+MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+ 
+NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR 
+VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY 
+83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3 
+macqaJVmlaut74nLYKkGEsaUR+ko 
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----

+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT

+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i

+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG

+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg

+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9

+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq

+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv

+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU

+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+

+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW

+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA

+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l

+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn

+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS

+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF

+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un

+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV

+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==

+-----END CERTIFICATE-----

+
+
+-----BEGIN CERTIFICATE-----

+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW

+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs

+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG

+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg

+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A

+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8

+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL

+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL

+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7

+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe

+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE

+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap

+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td

+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv

+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN

+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0

+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF

+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz

+4iIprn2DQKi6bA==

+-----END CERTIFICATE-----

+

+
+
+-----BEGIN CERTIFICATE-----

+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW

+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy

+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE

+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0

+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV

+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8

+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT

+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh

+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v

+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w

+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd

+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX

+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ

+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe

+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+

+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB

+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY

+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG

+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc

+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX

+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn

+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z

+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN

+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja

+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW

+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9

+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt

+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm

+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=

+-----END CERTIFICATE-----

+

+
+
+-----BEGIN CERTIFICATE-----

+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW

+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy

+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD

+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1

+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC

+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81

+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG

+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq

+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL

+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb

+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd

+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73

+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt

+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc

+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4

+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV

+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV

+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ

+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z

+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ

+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr

+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo

+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY

+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz

+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m

+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV

+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH

+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX

+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS

+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----

+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC

+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0

+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0

+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz

+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw

+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR

+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG

+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp

+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D

+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ

+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug

+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU

+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC

+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv

+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw

+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl

+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh

+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy

+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh

+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI

+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T

+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq

+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p

+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD

+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL

+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk

+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8

+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R

+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y

+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW

+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK

+SnQ2+Q==

+-----END CERTIFICATE-----

+
+
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
+CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
+ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
+QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
+NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
+ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
+QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
+qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
+fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
+Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
+Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
+54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
+MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
+ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
+YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
+A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
+rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
+pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
+lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
+YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
+7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
+YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
+xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
+unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
+Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
+ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
+gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
+jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
+W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
+RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
+MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
+BYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+
+-----BEGIN CERTIFICATE-----
+MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQsw
+CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg
+R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00
+MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBT
+ZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW
++1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9
+ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZI
+zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW
+tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1
+/q4AaOeMSQ+2b1tbFfLn
+-----END CERTIFICATE-----
+
diff --git a/tdeio/kssl/kssl/isrg-root-x1.pem b/tdeio/kssl/kssl/isrg-root-x1.pem
new file mode 100644
index 000000000..b85c8037f
--- /dev/null
+++ b/tdeio/kssl/kssl/isrg-root-x1.pem
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
+WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
+ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
+MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
+h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
+A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
+T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
+B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
+B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
+KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
+OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
+jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
+qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
+rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
+hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
+3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
+NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
+ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
+TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
+jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
+oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
+4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
+mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
+emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
diff --git a/tdeio/kssl/kssl/isrg-root-x2.pem b/tdeio/kssl/kssl/isrg-root-x2.pem
new file mode 100644
index 000000000..7d903edc9
--- /dev/null
+++ b/tdeio/kssl/kssl/isrg-root-x2.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQsw
+CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg
+R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00
+MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBT
+ZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW
++1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9
+ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZI
+zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW
+tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1
+/q4AaOeMSQ+2b1tbFfLn
+-----END CERTIFICATE-----
diff --git a/tdeio/kssl/kssl/ksslcalist b/tdeio/kssl/kssl/ksslcalist
index a0761cf4a..50ef61257 100644
--- a/tdeio/kssl/kssl/ksslcalist
+++ b/tdeio/kssl/kssl/ksslcalist
@@ -785,3 +785,225 @@ x509=MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTA
 site=true
 email=true
 code=true
+
+[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum CA]
+x509=MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+site=true
+email=true
+code=false
+
+[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level I]
+x509=MIICjTCCAXWgAwIBAgIDAQAhMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMxNTNaFw0xMjA3MTIxNjMxNTNaMEMxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xFzAVBgNVBAMTDkNlcnR1bSBMZXZlbCBJMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCl73pZ9DFcn7Qy0qBZK+So18cav7drUrJ8SiYOlDDVskt81+eIcL/4FelTSGjuAOvYdmm+HGYG998RPB0iZ+Ak67vXFJ537vRWOcu6aMjNuAwu8BOdc5eSgB0Y8X4+3LOYfugtaZa8mrEQ8Hit0yLE9UBcU9J+4PmkVGecmZ8jZQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAlDS4aTmgK0YgmUvt/3zN7G2/ZrtBBCtONlUvC69c7TmLJWJ842y2AH7ryNXXkcsn6p0ZBTrTJ2tA2y/j2PXJeXrCkK/qAJIpM0l4u0MT7enY5akasduHp2NXMP9vDlgMy7elU2s3nkOT79gfh5XttC+5D/x4JDNi1DMAA9hk16DK4zWmDVfjkiP/G3fEndtJgNDQsyqnaQ3E3bljv3f1KJTjZUvtA2Ml6MP2hFRhgZPsxuhW8QXidQYNiua1h7XUUiPiERLDLWZmfY6dxGrHXjSTx3shHNaQM0qkDs9gS6UK8uWJN2bf2YBnvGmzy0IQvx5wDCH7h8AdaBD6DgIG1
+site=true
+email=true
+code=false
+
+[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level II]
+x509=MIICjjCCAXagAwIBAgIDAQAiMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMyMDNaFw0xMjA3MTIxNjMyMDNaMEQxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBMZXZlbCBJSTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyMQSaN5fA94hNE46bMKpGUb5yIPEowReGZzGttYBQnC6oUOy+iM3md8WerzXeBKf7iIZEDW2HAp7BKhS4rMB6taxT07vDtkNfEKwOk6X7dODw6KY4mxnzjmjh5pf2feKKJ3MoZxi2HAz2a6JvHKFMq8dAlGL2GBtLvzlFp2jwkMCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAWo3wgy+/0B7UiTCu4Wn1rvGRXIUtbPNp4Bc4PP/i1q6pPheIe0ooCopuqnDX9maTHhZeNpnApgCUSbyw71EaOremD7HjWXASRUTylhwL5FdSx+D6MgF2uW9uwZ+NErkeRJYT2aRXe5FBOVIseC4g93Ay0D8Hg50MkAC5pQqW+8GSszT94NzT7ppIaMtq53PZpUtLGiL3UBZ5vUJ5pE4lLKD7Ce+pXzZevy/MnkMGD1L7LgjRWL17OcMlASFETyUTajNjvxMy+oM4C22rwHRh2WQrvgw5MO+Q3UyYA1r5VrSaqgQ1g06ZcQt+mhzoc2swlOSwm8iis8H6orR8xmCWrA==
+site=true
+email=true
+code=false
+
+[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level III]
+x509=MIICjzCCAXegAwIBAgIDAQAjMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMyMTdaFw0xMjA3MTIxNjMyMTdaMEUxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGTAXBgNVBAMTEENlcnR1bSBMZXZlbCBJSUkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZjBbfGFmlsLjPepWaDwG0LqhF11lWKabaHi1sQhK3qomHY7Em7qpL11dUQ1vsMcnnpzz/J0AEH6KDh+yAyXV1SE/tVToLYYByZK+JGacLYIYF9aCwV8AhqyzOGurO5QX6vLboXB2WNnwmXhyNVKUgnUVy4ktAR2qZJIw5Bjsn/AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIsLt3vKCZqd/gui45ovm3FSO6FLjzzq4pagPvbNnZ39HrhRaCpqkHDAj71L5L27U3eW2D4ILL0iUmZadbC4i3at/PUL9mjhGlajcCN8EF6IXGT87Tbcii735jRaaXSbEY4YhNOg9DPBoD4uJMkA8Z0Y/6lYmk4S6KUMCzztt5zZBiWjdd08yFi5VGMvpE74KVOMdMa3JNVaR0XvT0Q8yXo1XKCrY9OFIxnhVgDbhzr9fwjKWDwu8kxhT9khAETm0BU2Buu+CTasaJdT/bBR2YEx9qcN7XyXTeDtkOO5QeGSqFgzquwjWEbKhf7l/e+efdRCg+ikH3O5snHB6iS+dgg=
+site=true
+email=true
+code=false
+
+[subject=C = PL, O = Unizeto Sp. z o.o., CN = Certum Level IV]
+x509=MIICjjCCAXagAwIBAgIDAQAkMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA3MTIxNjMyMzVaFw0xMjA3MTIxNjMyMzVaMEQxCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xGDAWBgNVBAMTD0NlcnR1bSBMZXZlbCBJVjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmyb1lKqCAKE4juAy6lpVNUl6aJ2DuWPSiJ3BBk3/6ty6I4Lr2Dpy1b1vjVelhaFsVKEDgK2JyQlk9XMqLPZI2Ql166mJiPKFg77aY/W78EcQfGyjnRvVcs0tG40mAs/p84OEpFcVe/RSqDrD/D7R01u+Wj5xLl0PUsFplIGDbikCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAPS99JujKGVRfa50TKfieq+uK1SxjidErYaZTb3cJNNfQDYn6nk4lnrnab5EUVhO/NegP2yIu3YOnZGfxFDhvVozMTKKAB5r5XKOvzsP99C9578PVMLozucfUMCSwau7Z4l5uuQOHuzjzlVLCibbbf4RwfvZ7hh5sB5c0pNbwRQq64RXQUUEvul/W9gUeT9ISHOsASGTq+HJ5i7vNARjukEAXW/maqs9vyTWWbGVI1FSOnVyteymq4Xk+9YlIyNPNyacgnsMnU72XKBLDS0KJdhIWALFAZI4dSh5WZNuWZguUnEmeH81lLbR+p/N3iuN8+oSo8UXik92jxeUY2tQJUA==
+site=true
+email=true
+code=false
+
+[subject=C = BR, O = ICP-Brasil, OU = Instituto Nacional de Tecnologia da Informacao - ITI, L = Brasilia, ST = DF, CN = Autoridade Certificadora Raiz Brasileira]
+x509=MIIEuDCCA6CgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMCQlIxEzARBgNVBAoTCklDUC1CcmFzaWwxPTA7BgNVBAsTNEluc3RpdHV0byBOYWNpb25hbCBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8gLSBJVEkxETAPBgNVBAcTCEJyYXNpbGlhMQswCQYDVQQIEwJERjExMC8GA1UEAxMoQXV0b3JpZGFkZSBDZXJ0aWZpY2Fkb3JhIFJhaXogQnJhc2lsZWlyYTAeFw0wMTExMzAxMjU4MDBaFw0xMTExMzAyMzU5MDBaMIG0MQswCQYDVQQGEwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE9MDsGA1UECxM0SW5zdGl0dXRvIE5hY2lvbmFsIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbyAtIElUSTERMA8GA1UEBxMIQnJhc2lsaWExCzAJBgNVBAgTAkRGMTEwLwYDVQQDEyhBdXRvcmlkYWRlIENlcnRpZmljYWRvcmEgUmFpeiBCcmFzaWxlaXJhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwPMudwX/hvm+Uh2b/lQAcHVAisamaLkWdkwP9/S/tOKIgRrL6Oy+ZIGlOUdd6uYtk9Ma/3pUpgcfNAj0vYm5gsyjQo9emsc+x6m4VWwk9iqMZSCK5EQkAq/Ut4n7KuLE1+gdftwdIgxfUsPt4CyNrY50QV57KM2UT8x5rrmzEjr7TICGpSUAl2gVqe6xaii+bmYR1QrmWaBSAG59LrkrjrYtbRhFboUDe1DK+6T8s5L6k8c8okpbHpa9veMztDVC9sPJ60MWXh6anVKo1UcLcbURyEeNvZneVRKAAU6ouwdjDvwlsaKydFKwed0ToQ47bmUKgcm+wV3eTRk36UOnTwIDAQABo4HSMIHPME4GA1UdIARHMEUwQwYFYEwBAQAwOjA4BggrBgEFBQcCARYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0RQQ2FjcmFpei5wZGYwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDovL2FjcmFpei5pY3BicmFzaWwuZ292LmJyL0xDUmFjcmFpei5jcmwwHQYDVR0OBBYEFIr68VeEERM1kEL6V0lUaQ2kxPA3MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAZA5c1U/hgIh6OcgLAfiJgFWpvmDZWqlV30/bHFpj8iBobJSm5uDpt7TirYh1Uxe3fQaGlYjJe+9zd+izPRbBqXPVQA34EXcwk4qpWuf1hHriWfdrx8AcqSqr6CuQFwSr75FosSzlwDADa70mT7wZjAmQhnZx2xJ6wfWlT9VQfS//JYeIc7Fue2JNLd00UOSMMaiK/t79enKNHEA2fupH3vEigf5Eh4bVAN5VohrTm6MY53x7XQZZr1ME7a55lFEnSeT0umlOAjR2mAbvSM5X5oSZNrmetdzyTj2flCM8CC7MLab0kkdngRIlUBGHF1/S5nmPbK+9A46sd33oqK8n8
+site=true
+email=true
+code=false
+
+[subject=C = DE, O = Deutsches Forschungsnetz, OU = DFN-CERT GmbH, OU = DFN-PCA, CN = DFN Toplevel Certification Authority, emailAddress = certify@pca.dfn.de]
+x509=MIIG2jCCBcKgAwIBAgIDFc/9MA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZTAeFw0wMTEyMDExMjExMTZaFw0xMDAxMzExMjExMTZaMIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMF5rhMt6zmhxK5oWPwT2FG7Up7T5DovHSD/YKPIRxsvDWmC4dTzByIBLnOmEflk+5KAqAYao6eY1qF0hR4WiS4DjCsn7l3zNo/4i2eF4EmGEksBygb4tRlTThcO7heFX+Du5qFoks+ONqa70RlwOr2l53KVwjMXBCtCLFSKRLVuxeh5+Smkm+FuOmwEugndM2n74Djjyf9DCOaHGZrHwVDh+Vpy5Ny4bKCSboujRxd5NxsStUshDVbTeS3B8TuzAJbywYWEE7erox+7WTfQr8ivSCBhrNJ36VRjAb8hiV9Iuy2TmJYo2oPyC8a3eM3xj9Ku2IW3tS2zpfiIzt9xvFMCAwEAAaOCAwEwggL9MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFAYL+rX4SHijILELPs+g0MTRf33QMIHbBgNVHSMEgdMwgdCAFAYL+rX4SHijILELPs+g0MTRf33QoYGypIGvMIGsMQswCQYDVQQGEwJERTEhMB8GA1UEChMYRGV1dHNjaGVzIEZvcnNjaHVuZ3NuZXR6MRYwFAYDVQQLEw1ERk4tQ0VSVCBHbWJIMRAwDgYDVQQLEwdERk4tUENBMS0wKwYDVQQDEyRERk4gVG9wbGV2ZWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEmNlcnRpZnlAcGNhLmRmbi5kZYIDFc/9MAsGA1UdDwQEAwIBBjARBglghkgBhvhCAQEEBAMCAAcwgaUGA1UdHwSBnTCBmjBLoEmgR4ZFaHR0cDovL3d3dy5kZm4tcGNhLmRlL2NlcnRpZmljYXRpb24veDUwOS9nMS9kYXRhL2NybHMvcm9vdC1jYS1jcmwuY3J4MEugSaBHhkVodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlvbi94NTA5L2cxL2RhdGEvY3Jscy9yb290LWNhLWNybC5jcmwwOAYJYIZIAYb4QgEDBCsWKWh0dHBzOi8vd3d3LmRmbi1wY2EuZGUvY2dpL2NoZWNrLXJldi5jZ2k/MEsGCWCGSAGG+EIBCAQ+FjxodHRwOi8vd3d3LmRmbi1wY2EuZGUvY2VydGlmaWNhdGlvbi9wb2xpY2llcy94NTA5cG9saWN5Lmh0bWwwOAYJYIZIAYb4QgENBCsWKVRoZSBERk4gVG9wLUxldmVsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MGQGA1UdIARdMFswWQYLKwYBBAHZGoIsAQEwSjBIBggrBgEFBQcCARY8aHR0cDovL3d3dy5kZm4tcGNhLmRlL2NlcnRpZmljYXRpb24vcG9saWNpZXMveDUwOXBvbGljeS5odG1sMA0GCSqGSIb3DQEBBQUAA4IBAQAmbai6JMt7nkuavyvxKzLGn04Gyt0zKrp8zmERp4inktvY7p+vkaomYu2QYC7cHq0tlrPXQQhhetjiXGb+36aJtHDkEA0NwrJzYnHgPsvx7z0wysENP4wxf97KsSWm07RY+f6/gIQF7Je7CW30Rzq7N6R0NMBs32mJgdn3ntqlFNw3Nbs050FEjPNq54RdawlJo85x+w+QJd7uQM4yZjHpRhvwgte9Ge1UqCUdpMsLHzeMKJ0B9GhwIIqOJCMiPgKjcUBrn6ehSX70POvXvjjE2+FzhPGTyTkS474d2UCAnL9qhPrdWXzBjOumOjhJutT1aecm9eljlshmh1cNen00
+site=true
+email=true
+code=false
+
+[subject=C = AT, ST = Austria, L = Vienna, O = Arge Daten Oesterreichische Gesellschaft fuer Datenschutz, emailAddress = a-cert@argedaten.at]
+x509=MIIDwzCCAyygAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0MB4XDTAxMDIxMjExMzAzMFoXDTA5MDIxMjExMzAzMFowgZgxCzAJBgNVBAYTAkFUMRAwDgYDVQQIEwdBdXN0cmlhMQ8wDQYDVQQHEwZWaWVubmExQjBABgNVBAoTOUFyZ2UgRGF0ZW4gT2VzdGVycmVpY2hpc2NoZSBHZXNlbGxzY2hhZnQgZnVlciBEYXRlbnNjaHV0ejEiMCAGCSqGSIb3DQEJARYTYS1jZXJ0QGFyZ2VkYXRlbi5hdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwgsHqoNtmmrJ86+e1I4hOVBaL4kokqKN2IPOIL+1XwY8vfOOUfPEdhWpaC0ldt7VYrksgDiUccgH0FROANWK2GkfKMDzjjXHysR04uEbOm7Kqjqn0nproOGkFG+QvBZgs+Ws+HXNFJA6V76fU4+JXq4452LSK4Lr5YcBquu3NJECAwEAAaOCARkwggEVMB0GA1UdDgQWBBQ0j59zH/G31zRjgK1y2P//tSAWZjCBxQYDVR0jBIG9MIG6gBQ0j59zH/G31zRjgK1y2P//tSAWZqGBnqSBmzCBmDELMAkGA1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0ggEAMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMBEGCWCGSAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQBFuJYncqMYB6gXQS3eDOI90BEHfFTKy/dVAV+K7QdAYikWmqgBheRdPKddJdccPy/Zl/p3ZT7GhDyC5f3wZjcuu8AJ27BNwbCAx54dgxgCNcyPm79nY8MRtEdEpoRGdSsFKJemz6hpXM++MWFciyrRWIIA44XB0Gv3US0spjsDPQ==
+site=true
+email=true
+code=false
+
+[subject=C = ES, ST = BARCELONA, L = BARCELONA, O = IPS Seguridad CA, OU = Certificaciones, CN = IPS SERVIDORES, emailAddress = ips@mail.ips.es]
+x509=MIICtzCCAiACAQAwDQYJKoZIhvcNAQEEBQAwgaMxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMB4XDTk4MDEwMTIzMjEwN1oXDTA5MTIyOTIzMjEwN1owgaMxCzAJBgNVBAYTAkVTMRIwEAYDVQQIEwlCQVJDRUxPTkExEjAQBgNVBAcTCUJBUkNFTE9OQTEZMBcGA1UEChMQSVBTIFNlZ3VyaWRhZCBDQTEYMBYGA1UECxMPQ2VydGlmaWNhY2lvbmVzMRcwFQYDVQQDEw5JUFMgU0VSVklET1JFUzEeMBwGCSqGSIb3DQEJARYPaXBzQG1haWwuaXBzLmVzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsT1J0nznqjtwlxLyYXZhkJAk8IbPMGbWOlI6H0fg3PqHILVikgDVboXVsHUUMH2Fjal5vmwpMwci4YSM1gf/+rHhwLWjhOgeYlQJU3c0jt4BT18g3RXIGJBK6E2Ehim51KODFDzT9NthFf+G4Nu+z4cYgjui0OLzhPvYR3oydAQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBACzzw3lYJN7GO9HgQmm47mSzPWIBubOE3yN93ZjPEKn+ANgilgUTB1RXxafey9m4iEL2mdsUdx+2/iU94aI+A6mB0i1sR/WWRowiq8jMDQ6XXotBtDvECgZAHd1G9AHduoIuPD14cJ58GNCr+Lh3B0Zx8coLY1xq+XKU1QFPoNtC
+site=true
+email=false
+code=false
+
+[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Network Applications]
+x509=MIIEZDCCA0ygAwIBAgIQRL4Mi1AAJLQR0zYwS8AzdzANBgkqhkiG9w0BAQUFADCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwHhcNOTkwNzA5MTg0ODM5WhcNMTkwNzA5MTg1NzQ5WjCBozELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xKzApBgNVBAMTIlVUTi1VU0VSRmlyc3QtTmV0d29yayBBcHBsaWNhdGlvbnMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCz+5Gh5DZVhawGNFugmliy+LUPBXeDrjKxdpJo7CNKyXY/45y2N3kDuatpjQclthln5LAbGHNhSuh+zdMvZOOmfAz6F4CjDUeJT1FxL+78P/m4FoCHiZMlIJpDgmkkdihZNaEdwH+DBmQWICzTSaSFtMBhf1EI+GgVkYDLpdXuOzr0hAReYFmnjDRy7rh4xdE7EkpvfmUnuaRVxblvQ6TFHSyZwFKkeEwVs0CYCGtDxgGwenv1axwiP8vv/6jQOkt2FZ7S0cYu49tXGzKiuG/ohqY/cKvlcJKrRB5AUPuco2LkbG6gyN7igEL66S/ozjIEj3yNtxyjNTwV3Z7DrpelAgMBAAGjgZEwgY4wCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPqGydvguul49Uuo1hXf8NPhahQ8ME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LU5ldHdvcmtBcHBsaWNhdGlvbnMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCk8yXM0dSRgyLQzDKrm5ZONJFUICU0YV8qAhXhi6r/fWRRzwr/vH3YIWp4yy9Rb/hCHTO967V7lMPDqaAt39EpHx3+jz+7qEUqf9FuVSTiuwL7MT++6LzsQCv4AdRWOOTKRIK1YSAhZ2X28AvnNPilwpyjXEAfhZOVBt5P1CeptqX8Fs1zMT+4ZSfP1FMa8Kxun08FDAOBp4QpxFq9ZFdyrTvPNximmMatBrTcCKME1SmklpoSZ0qMYEWd8SOasACcaLWYUNPvji6SZbFIPiG+FTAqDbUMo2s/rn9X9R+WfN9v3YIwLGUbQErNaLly7HF27FSOH4UMAWr6pjisH8SE
+site=true
+email=true
+code=false
+
+[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN - DATACorp SGC]
+x509=MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowftGzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
+site=true
+email=false
+code=false
+
+[subject=C = GB, ST = Greater Manchester, L = Salford, O = Comodo CA Limited, CN = AAA Certificate Services]
+x509= MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe 3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==  
+site=true
+email=true
+code=false
+
+[subject=C = GB, ST = Greater Manchester, L = Salford, O = Comodo CA Limited, CN = Secure Certificate Services]
+x509= MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996 CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk 3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz 6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0 5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk= 
+site=true
+email=true
+code=false
+
+[subject=C = GB, ST = Greater Manchester, L = Salford, O = Comodo CA Limited, CN = Trusted Certificate Services]
+x509= MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0 aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW 1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7 kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/ HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+ xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi 
+site=true
+email=true
+code=false
+
+[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Hardware]
+x509= MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn 0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0 dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM //bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t 3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==  
+site=true
+email=false
+code=false
+
+[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN - DATACorp SGC]
+x509= MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6 E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK 4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv 2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3 mfnGV/TJVTl4uix5yaaIK/QI  
+site=true
+email=false
+code=false
+
+[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Client Authentication and Email]
+x509= MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCB rjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0BgNVBAMTLVVUTi1VU0VSRmlyc3Qt Q2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05OTA3MDkxNzI4NTBa Fw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAV BgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5l dHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UE AxMtVVROLVVTRVJGaXJzdC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWls MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3B YHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIxB8dOtINknS4p1aJkxIW9 hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8om+rWV6l L8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLm SGHGTPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM 1tZUOt4KpLoDd7NlyP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws 6wIDAQABo4G5MIG2MAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud DgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNVHR8EUTBPME2gS6BJhkdodHRw Oi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGllbnRBdXRoZW50 aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u 7mFVbwQ+zznexRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0 xtcgBEXkzYABurorbs6q15L+5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQ rfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarVNZ1yQAOJujEdxRBoUp7fooXFXAim eOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZw7JHpsIyYdfHb0gk USeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=  
+site=true
+email=true
+code=false
+
+[subject=C = US, ST = UT, L = Salt Lake City, O = The USERTRUST Network, OU = http://www.usertrust.com, CN = UTN-USERFirst-Object]
+x509= MIIEZjCCA06gAwIBAgIQRL4Mi1AAJLQR0zYt4LNfGzANBgkqhkiG9w0BAQUFADCB lTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHTAbBgNVBAMTFFVUTi1VU0VSRmlyc3Qt T2JqZWN0MB4XDTk5MDcwOTE4MzEyMFoXDTE5MDcwOTE4NDAzNlowgZUxCzAJBgNV BAYTAlVTMQswCQYDVQQIEwJVVDEXMBUGA1UEBxMOU2FsdCBMYWtlIENpdHkxHjAc BgNVBAoTFVRoZSBVU0VSVFJVU1QgTmV0d29yazEhMB8GA1UECxMYaHR0cDovL3d3 dy51c2VydHJ1c3QuY29tMR0wGwYDVQQDExRVVE4tVVNFUkZpcnN0LU9iamVjdDCC ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6qgT+jo2F4qjEAVZURnicP HxzfOpuCaDDASmEd8S8O+r5596Uj71VRloTN2+O5bj4x2AogZ8f02b+U60cEPgLO KqJdhwQJ9jCdGIqXsqoc/EHSoTbL+z2RuufZcDX65OeQw5ujm9M89RKZd7G3CeBo 5hy485RjiGpq/gt2yb70IuRnuasaXnfBhQfdDWy/7gbHd2pBnqcP1/vulBe3/IW+ pKvEHDHd17bR5PDv3xaPslKT16HUiaEHLr/hARJCHhrh2JU022R5KP+6LhHC5ehb kkj7RwvCbNqtMoNB86XlQXD9ZZBt+vpRxPm9lisZBCzTbafc8H9vg2XiaquHhnUC AwEAAaOBrzCBrDALBgNVHQ8EBAMCAcYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E FgQU2u1kdBScFDyr3ZmpvVsoTYs8ydgwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov L2NybC51c2VydHJ1c3QuY29tL1VUTi1VU0VSRmlyc3QtT2JqZWN0LmNybDApBgNV HSUEIjAgBggrBgEFBQcDAwYIKwYBBQUHAwgGCisGAQQBgjcKAwQwDQYJKoZIhvcN AQEFBQADggEBAAgfUrE3RHjb/c652pWWmKpVZIC1WkDdIaXFwfNfLEzIR1pp6ujw NTX00CXzyKakh0q9G7FzCL3Uw8q2NbtZhncxzaeAFK4T7/yxSPlrJSUtUbYsbUXB mMiKVl0+7kNOPmsnjtA6S4ULX9Ptaqd1y9Fahy85dRNacrACgZ++8A+EVCBibGnU 4U3GDZlDAQ0Slox4nb9QorFEqmrPF3rPbw/U+CRVX/A0FklmPlBGyWNxODFiuGK5 81OtbLUrohKqGU8J2l7nk8aOFAj+8DCAGKCGhU3IfdeLA/5u1fedFqySLKAj5ZyR Uh+U3xeUc8OzwcFxBSAAeL0TUh2oPs0AH8g= 
+site=false
+email=false
+code=true
+
+[subject=C = FI, O = Sonera, CN = Sonera Class1 CA]
+x509=MIIDIDCCAgigAwIBAgIBJDANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MxIENBMB4XDTAxMDQwNjEwNDkxM1oXDTIxMDQwNjEwNDkxM1owOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALWJHytPZwp5/8Ue+H887dF+2rDNbS82rDTG29lkFwhjMDMiikzujrsPDUJVyZ0upe/3p4zDq7mXy47vPxVnqIJyY1MPQYx9EJUkoVqlBvqSV536pQHydekfvFYmUk54GWVYVQNYwBSujHxVX3BbdyMGNpfzJLWaRpXk3w0LBUXl0fIdgrvGE+D+qnr9aTCU89JFhfzyMlsy3uhsXR/LpCJ0sICOXZT3BgBLqdReLjVQCfOAl/QMF6452F/NM8EcyonCIvdFEu1eEpOdY6uCLrnrQkFEy0oaAIINnvmLVz5MxxftLItyM19yejhW1ebZrgUaHXVFsculJRwSVzb9IjcCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQIR+IMi/ZTiFIwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQCLGrLJXWG04bkruVPRsoWdd44W7hE928Jj2VuXZfsSZ9gqXLar5V7DtxYvyOirHYr9qxp81V9jz9yw3Xe5qObSIjiHBxTZ/75Wtf0HDjxVyhbMp6Z3N/vbXB9OWQaHowND9Rart4S9Tu+fMTfwRvFAttEMpWT4Y14h21VOTzF2nBBhjrZTOqMRvq9tfB69ri3iDGnHhVNoomG6xT60eVR4ngrHAr5i0RGCS2UvkVrCqIexVmiUefkl98HVrhq4uz2PqYo4Ffdz0Fpg0YCw8NzVUM1O7pJIae2yIx4wzMiUyLb1O4Z/P6Yun/Y+LLWSlj7fLJOK/4GMDw9ZIRlXvVWa
+site=true
+email=true
+code=false
+
+[subject=C = FI, O = Sonera, CN = Sonera Class2 CA]
+x509=MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+site=true
+email=true
+code=false
+
+[subject=C = HU, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Expressz (Class C) Tanusitvanykiado]
+x509=MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQDEytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMrTmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNAOoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwWRMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0PAQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEWggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBOZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBBIGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVsb2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBsZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25sYXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kga2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4gSU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUgYXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQgY3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmYta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2gpO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4Fp1hBWeAyNDYpQcCNJgEjTME1A==
+site=true
+email=true
+code=false
+
+[subject=C = HU, ST = Hungary, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Kozjegyzoi (Class A) Tanusitvanykiado]
+x509=MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+site=true
+email=true
+code=false
+
+[subject=C = HU, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Uzleti (Class B) Tanusitvanykiado]
+x509=MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQDEylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8GA1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNhZ2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5ldExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xKgZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riXiK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvcQ7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXan3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKSNitjrFgBazMpUIaD8QFI
+site=true
+email=true
+code=false
+
+[subject=C = be, O = Belgacom, OU = MTM, CN = Belgacom E-Trust Primary CA, mail = info@e-trust.be]
+x509=MIICiTCCAfKgAwIBAgIEN4dnrDANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJiZTERMA8GA1UEChMIQmVsZ2Fjb20xDDAKBgNVBAsTA01UTTEkMCIGA1UEAxMbQmVsZ2Fjb20gRS1UcnVzdCBQcmltYXJ5IENBMR8wHQYKCZImiZPyLGQBAxQPaW5mb0BlLXRydXN0LmJlMB4XDTk4MTEwNDEzMDQzOVoXDTEwMDEyMTEzMDQzOVowdTELMAkGA1UEBhMCYmUxETAPBgNVBAoTCEJlbGdhY29tMQwwCgYDVQQLEwNNVE0xJDAiBgNVBAMTG0JlbGdhY29tIEUtVHJ1c3QgUHJpbWFyeSBDQTEfMB0GCgmSJomT8ixkAQMUD2luZm9AZS10cnVzdC5iZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtm5s9VPak3FQdB7BGFqi3GBB9pk41huJ1XCrc4XsPz6ko0I8Bxy/7LDMf7gaoeXTMxDV6coeTq1g12kHWrxasU+FCIdWQZv8KYxd9ywSTjmywwP/qpyNIjaKDohWu50Kxuk21sTFrVzX8OujNLAPj2wy/Dsi4YLwsFEGFpjqNUCAwEAAaMmMCQwDwYDVR0TBAgwBgEB/wIBATARBglghkgBhvhCAQEEBAMCAAcwDQYJKoZIhvcNAQEFBQADgYEAerKxpbF9M+nC4RvO05OMfwH9Gx1amq6rB1Ev7Ymr3VBCux//SrWknLFhKQpM6oNZSY2vhmnXgaxHqqRxblnvynxqblSK2qiSyfVms3lf1IsBniFjRjWTpcJfImIDcB1jI+hrSB0jECfY9t9HorrsgFBKbMRwpnrkdCJ/9oRiMn8=
+site=true
+email=true
+code=false
+
+[subject=C = US, OU = www.xrampsecurity.com, O = XRamp Security Services Inc, CN = XRamp Global Certification Authority]
+x509=MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxtqZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+site=true
+email=true
+code=false
+
+[subject=C = DK, O = TDC, CN = TDC OCES CA]
+x509=MIIFGTCCBAGgAwIBAgIEPki9xDANBgkqhkiG9w0BAQUFADAxMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTAeFw0wMzAyMTEwODM5MzBaFw0zNzAyMTEwOTA5MzBaMDExCzAJBgNVBAYTAkRLMQwwCgYDVQQKEwNUREMxFDASBgNVBAMTC1REQyBPQ0VTIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArGL2YSCyz8DGhdfjeebM7fI5kqSXLmSjhFuHnEz9pPPEXyG9VhDr2y5h7JNp46PMvZnDBfwGuMo2HP6QjklMxFaaL1a8z3sM8W9Hpg1DTeLpHTk0zY0s2RKY+ePhwUp8hjjEqcRhiNJerxomTdXkoCJHhNlktxmW/OwZ5LKXJk5KTMuPJItUGBxIYXvViGjaXbXqzRowwYCDdlCqT9HU3Tjw7xb04QxQBr/q+3pJoSgrHPb8FTKjdGqPqcNiKXEx5TukYBdedObaE+3pHx8b0bJoc8YQNHVGEBDjkAB2QMuLt0MJIf+rTpPGWOmlgtt3xDqZsXKVSQTwtyv6e1mO3QIDAQABo4ICNzCCAjMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwgewGA1UdIASB5DCB4TCB3gYIKoFQgSkBAQEwgdEwLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuY2VydGlmaWthdC5kay9yZXBvc2l0b3J5MIGdBggrBgEFBQcCAjCBkDAKFgNUREMwAwIBARqBgUNlcnRpZmlrYXRlciBmcmEgZGVubmUgQ0EgdWRzdGVkZXMgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLiBDZXJ0aWZpY2F0ZXMgZnJvbSB0aGlzIENBIGFyZSBpc3N1ZWQgdW5kZXIgT0lEIDEuMi4yMDguMTY5LjEuMS4xLjARBglghkgBhvhCAQEEBAMCAAcwgYEGA1UdHwR6MHgwSKBGoESkQjBAMQswCQYDVQQGEwJESzEMMAoGA1UEChMDVERDMRQwEgYDVQQDEwtUREMgT0NFUyBDQTENMAsGA1UEAxMEQ1JMMTAsoCqgKIYmaHR0cDovL2NybC5vY2VzLmNlcnRpZmlrYXQuZGsvb2Nlcy5jcmwwKwYDVR0QBCQwIoAPMjAwMzAyMTEwODM5MzBagQ8yMDM3MDIxMTA5MDkzMFowHwYDVR0jBBgwFoAUYLWF7FZkfhIZJ2cdUBVLc647+RIwHQYDVR0OBBYEFGC1hexWZH4SGSdnHVAVS3OuO/kSMB0GCSqGSIb2fQdBAAQQMA4bCFY2LjA6NC4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEACromJkbTc6gJ82sLMJn9iuFXehHTuJTXCRBuo7E4A9G28kNBKWKnctj7fAXmMXAnVBhOinxO5dHKjHiIzxvTkIvmI/gLDjNDfZziChmPyQE+dF10yYscA+UYyAFMP8uXBV2YcaaYb7Z8vTd/vuGTJW1v8AqtFxjhA7wHKcitJuj4YfD9IQl+mo6paH1IYnK9AOoBmbgGglGBTvH1tJFUuSN6AJqfXY3gPGS5GhKSKseCRHI53OI8xthV9RVOyAUO28bQYqbsFbS1AoLbrIyigfCbmTH1ICCoiGEKB5+U/NDXG8wuF/MEJ3Zn61SD/aSQfgY9BKNDLdr8C2LqL19iUw==
+site=true
+email=true
+code=false
+
+[subject=C = HU, L = Budapest, O = NetLock Halozatbiztonsagi Kft., OU = Tanusitvanykiadok, CN = NetLock Minositett Kozjegyzoi (Class QA) Tanusitvanykiado, emailAddress = info@netlock.hu]
+x509= MIIG0TCCBbmgAwIBAgIBezANBgkqhkiG9w0BAQUFADCByTELMAkGA1UEBhMCSFUx ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0 b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMUIwQAYDVQQD EzlOZXRMb2NrIE1pbm9zaXRldHQgS296amVneXpvaSAoQ2xhc3MgUUEpIFRhbnVz aXR2YW55a2lhZG8xHjAcBgkqhkiG9w0BCQEWD2luZm9AbmV0bG9jay5odTAeFw0w MzAzMzAwMTQ3MTFaFw0yMjEyMTUwMTQ3MTFaMIHJMQswCQYDVQQGEwJIVTERMA8G A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxQjBABgNVBAMTOU5l dExvY2sgTWlub3NpdGV0dCBLb3pqZWd5em9pIChDbGFzcyBRQSkgVGFudXNpdHZh bnlraWFkbzEeMBwGCSqGSIb3DQEJARYPaW5mb0BuZXRsb2NrLmh1MIIBIjANBgkq hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1Ilstg91IRVCacbvWy5FPSKAtt2/Goq eKvld/Bu4IwjZ9ulZJm53QE+b+8tmjwi8F3JV6BVQX/yQ15YglMxZc4e8ia6AFQe r7C8HORSjKAyr7c3sVNnaHRnUPYtLmTeriZ539+Zhqurf4XsoPuAzPS4DB6TRWO5 3Lhbm+1bOdRfYrCnjnxmOCyqsQhjF2d9zL2z8cM/z1A57dEZgxXbhxInlrfa6uWd vLrqOU+L73Sa58XQ0uqGURzk/mQIKAR5BevKxXEOC++r6uwSEaEYBTJp0QwsGj0l mT+1fMptsK6ZmfoIYOcZwvK9UdPM0wKswREMgM6r3JSda6M5UzrWhQIDAMV9o4IC wDCCArwwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwggJ1Bglg hkgBhvhCAQ0EggJmFoICYkZJR1lFTEVNISBFemVuIHRhbnVzaXR2YW55IGEgTmV0 TG9jayBLZnQuIE1pbm9zaXRldHQgU3pvbGdhbHRhdGFzaSBTemFiYWx5emF0YWJh biBsZWlydCBlbGphcmFzb2sgYWxhcGphbiBrZXN6dWx0LiBBIG1pbm9zaXRldHQg ZWxla3Ryb25pa3VzIGFsYWlyYXMgam9naGF0YXMgZXJ2ZW55ZXN1bGVzZW5laywg dmFsYW1pbnQgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYSBNaW5vc2l0ZXR0IFN6 b2xnYWx0YXRhc2kgU3phYmFseXphdGJhbiwgYXogQWx0YWxhbm9zIFN6ZXJ6b2Rl c2kgRmVsdGV0ZWxla2JlbiBlbG9pcnQgZWxsZW5vcnplc2kgZWxqYXJhcyBtZWd0 ZXRlbGUuIEEgZG9rdW1lbnR1bW9rIG1lZ3RhbGFsaGF0b2sgYSBodHRwczovL3d3 dy5uZXRsb2NrLmh1L2RvY3MvIGNpbWVuIHZhZ3kga2VyaGV0b2sgYXogaW5mb0Bu ZXRsb2NrLm5ldCBlLW1haWwgY2ltZW4uIFdBUk5JTkchIFRoZSBpc3N1YW5jZSBh bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGFyZSBzdWJqZWN0IHRvIHRo ZSBOZXRMb2NrIFF1YWxpZmllZCBDUFMgYXZhaWxhYmxlIGF0IGh0dHBzOi8vd3d3 Lm5ldGxvY2suaHUvZG9jcy8gb3IgYnkgZS1tYWlsIGF0IGluZm9AbmV0bG9jay5u ZXQwHQYDVR0OBBYEFAlqYhaSsFq7VQ7LdTI6MuWyIckoMA0GCSqGSIb3DQEBBQUA A4IBAQCRalCc23iBmz+LQuM7/KbD7kPgz/PigDVJRXYC4uMvBcXxKufAQTPGtpvQ MznNwNuhrWw3AkxYQTvyl5LGSKjN5Yo5iWH5Upfpvfb5lHTocQ68d4bDBsxafEp+ NFAwLvt/MpqNPfMgW/hqyobzMUwsWYACff44yTB1HLdV47yfuqhthCgFdbOLDcCR VCHnpgu0mfVRQdzNo0ci2ccBgcTcR08m6h/t280NmPSjnLRzMkqWmf68f8glWPhY 83ZmiVSkpj7EUFy6iRiCdUgh0k8T6GB+B3bbELVR5qq5aKrN9p2QdRLqOBrKROi3 macqaJVmlaut74nLYKkGEsaUR+ko 
+site=true
+email=true
+code=false
+
+[subject=C = US, O = "The Go Daddy Group, Inc.", OU = Go Daddy Class 2 Certification Authority]
+x509=MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQHmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/bvZ8=
+site=true
+email=true
+code=false
+
+[subject=C = US, O = "Starfield Technologies, Inc.", OU = Starfield Class 2 Certification Authority]
+x509=MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJlxy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+site=true
+email=true
+code=false
+
+[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Global CA]
+x509=MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+site=true
+email=true
+code=false
+
+[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Global CA 2]
+x509=MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz4iIprn2DQKi6bA==
+site=true
+email=true
+code=false
+
+[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Universal CA]
+x509=MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRcaanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+site=true
+email=true
+code=false
+
+[subject=C = US, O = GeoTrust Inc., CN = GeoTrust Universal CA 2]
+x509=MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+zdXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+site=true
+email=true
+code=false
+
+[subject=C = BM, O = QuoVadis Limited, OU = Root Certification Authority, CN = QuoVadis Root Certification Authority]
+x509=MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJhY3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOKSnQ2+Q==
+site=true
+email=true
+code=false
+
+[subject=C = CO, O = Sociedad Cameral de Certificaci\C3\B3n Digital - Certic\C3\A1mara S.A., CN = AC Ra\C3\ADz Certic\C3\A1mara S.A.]
+x509=MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
+site=true
+email=true
+code=false
+
+[subject=C = US, O = Internet Security Research Group, CN = ISRG Root X1]
+x509=MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZLubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+site=true
+email=true
+code=false
+
+[subject=C = US, O = Internet Security Research Group, CN = ISRG Root X2]
+x509=MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn
+site=true
+email=true
+code=false
diff --git a/tdeio/kssl/kssl/localcerts b/tdeio/kssl/kssl/localcerts
index 150763522..cb39efb99 100644
--- a/tdeio/kssl/kssl/localcerts
+++ b/tdeio/kssl/kssl/localcerts
@@ -34,3 +34,5 @@ GeoTrust_Universal_CA.pem
 GeoTrust_Universal_CA2.pem
 quovadis.pem
 ac_offline_raiz_certicamara.pem
+isrg-root-x1.pem
+isrg-root-x2.pem
diff --git a/tdeio/kssl/ksslcertchain.cc b/tdeio/kssl/ksslcertchain.cpp
index 4f14e4be1..4f14e4be1 100644
--- a/tdeio/kssl/ksslcertchain.cc
+++ b/tdeio/kssl/ksslcertchain.cpp
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cpp
index 7431d4c0a..6f0d7b5a0 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cpp
@@ -74,11 +74,11 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal)
 
    _ok = new KPushButton(i18n("Send certificate"), this);
    h->addWidget(_ok);
-   connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotSend()));
+   connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotSend()));
 
    d->p_pb_dontsend = new KPushButton(i18n("Do not send a certificate"), this);
    h->addWidget(d->p_pb_dontsend);
-   connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont()));
+   connect(d->p_pb_dontsend, TQ_SIGNAL(clicked()), TQ_SLOT(slotDont()));
 
 #ifndef TQT_NO_WIDGET_TOPEXTRA
    setCaption(i18n("TDE SSL Certificate Dialog"));
diff --git a/tdeio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h
index 8d6f3d777..d4ec4412f 100644
--- a/tdeio/kssl/ksslcertdlg.h
+++ b/tdeio/kssl/ksslcertdlg.h
@@ -41,7 +41,7 @@ class TQPushButton;
  * @short KDE X.509 Certificate Dialog
  */
 class TDEIO_EXPORT KSSLCertDlg : public KDialog {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 *  Construct a KSSL certificate dialog
diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cpp
index edf877496..774553939 100644
--- a/tdeio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cpp
@@ -1033,7 +1033,7 @@ unsigned char *p = cert;
 	// FIXME: return code!
 	d->kossl->i2d_X509(getCert(), &p);
 
-	// encode it into a QString
+	// encode it into a TQString
 	qba.duplicate((const char*)cert, certlen);
 	delete[] cert;
 #endif
diff --git a/tdeio/kssl/ksslcertificate.h b/tdeio/kssl/ksslcertificate.h
index 67f6a808d..cce931867 100644
--- a/tdeio/kssl/ksslcertificate.h
+++ b/tdeio/kssl/ksslcertificate.h
@@ -49,7 +49,7 @@ class KSSLX509V3;
 
 #include <tdelibs_export.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslcertificatecache.cc b/tdeio/kssl/ksslcertificatecache.cpp
index 2eecd66d6..226e21c71 100644
--- a/tdeio/kssl/ksslcertificatecache.cc
+++ b/tdeio/kssl/ksslcertificatecache.cpp
@@ -286,7 +286,7 @@ TQStringList KSSLCertificateCache::getHostList(KSSLCertificate& cert) {
                             "cacheGetHostList(KSSLCertificate)",
                             data, rettype, retval);
 
-     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
+     if (rc && rettype == "TQStringList") {
         TQDataStream retStream(retval, IO_ReadOnly);
         TQStringList drc;
         retStream >> drc;
@@ -347,7 +347,7 @@ TQStringList KSSLCertificateCache::getKDEKeyByEmail(const TQString &email) {
                             "getKDEKeyByEmail(TQString)",
                             data, rettype, retval);
 
-     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
+     if (rc && rettype == "TQStringList") {
         TQDataStream retStream(retval, IO_ReadOnly);
         TQStringList drc;
         retStream >> drc;
diff --git a/tdeio/kssl/ksslcertificatefactory.cc b/tdeio/kssl/ksslcertificatefactory.cpp
index 66e272ced..66e272ced 100644
--- a/tdeio/kssl/ksslcertificatefactory.cc
+++ b/tdeio/kssl/ksslcertificatefactory.cpp
diff --git a/tdeio/kssl/ksslcertificatehome.cc b/tdeio/kssl/ksslcertificatehome.cpp
index 39470c5ab..9316bd221 100644
--- a/tdeio/kssl/ksslcertificatehome.cc
+++ b/tdeio/kssl/ksslcertificatehome.cpp
@@ -44,7 +44,7 @@ return list;
 void KSSLCertificateHome::setDefaultCertificate(TQString name, TQString host, bool send, bool prompt) {
 KSimpleConfig cfg("ksslauthmap", false);
 
-#ifdef Q_WS_WIN //temporary 
+#ifdef TQ_WS_WIN //temporary 
    cfg.setGroup(host);
 #else
    cfg.setGroup(KResolver::domainToAscii(host));
@@ -156,7 +156,7 @@ KSSLPKCS12* KSSLCertificateHome::getCertificateByHost(TQString host, TQString pa
 TQString KSSLCertificateHome::getDefaultCertificateName(TQString host, KSSLAuthAction *aa) {
 KSimpleConfig cfg("ksslauthmap", false);
 
-#ifdef Q_WS_WIN //temporary 
+#ifdef TQ_WS_WIN //temporary 
    if (!cfg.hasGroup(host)) {
 #else
    if (!cfg.hasGroup(KResolver::domainToAscii(host))) {
@@ -164,7 +164,7 @@ KSimpleConfig cfg("ksslauthmap", false);
       if (aa) *aa = AuthNone;
       return TQString::null;
    } else {
-#ifdef Q_WS_WIN //temporary 
+#ifdef TQ_WS_WIN //temporary 
       cfg.setGroup(host);
 #else
       cfg.setGroup(KResolver::domainToAscii(host));
diff --git a/tdeio/kssl/ksslconnectioninfo.cc b/tdeio/kssl/ksslconnectioninfo.cpp
index ccc7fc780..ccc7fc780 100644
--- a/tdeio/kssl/ksslconnectioninfo.cc
+++ b/tdeio/kssl/ksslconnectioninfo.cpp
diff --git a/tdeio/kssl/ksslcsessioncache.cc b/tdeio/kssl/ksslcsessioncache.cpp
index d39638717..710ce8f21 100644
--- a/tdeio/kssl/ksslcsessioncache.cc
+++ b/tdeio/kssl/ksslcsessioncache.cpp
@@ -26,7 +26,7 @@
 #include <kstaticdeleter.h>
 #include <kurl.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
@@ -54,7 +54,7 @@
 
 #ifdef KSSL_HAVE_SSL
 
-typedef QPair<TQString,TQString> KSSLCSession;
+typedef TQPair<TQString,TQString> KSSLCSession;
 typedef TQPtrList<KSSLCSession> KSSLCSessions;
 
 static KSSLCSessions *sessions = 0L;
diff --git a/tdeio/kssl/kssldefs.h b/tdeio/kssl/kssldefs.h
index c33664b14..d981bf136 100644
--- a/tdeio/kssl/kssldefs.h
+++ b/tdeio/kssl/kssldefs.h
@@ -20,7 +20,7 @@
 #ifndef __kssldefs_h
 #define __kssldefs_h
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cpp
index 37e13854e..6d4683d95 100644
--- a/tdeio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cpp
@@ -107,12 +107,12 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na
 
         if (KSSL::doesSSLWork()) {
             button = new KPushButton(KGuiItem(i18n("C&ryptography Configuration..."),"configure"), this);
-            connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(launchConfig()));
+            connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(launchConfig()));
             buttonLayout->addWidget( button );
         }
 
         button = new KPushButton(KStdGuiItem::close(), this);
-        connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
+        connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(close()));
         buttonLayout->addWidget( button );
 
         button->setFocus();
@@ -188,7 +188,7 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert,
     layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0);
     d->_chain = new KComboBox(this);
     layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1);
-    connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int)));
+    connect(d->_chain, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChain(int)));
 
     d->_chain->clear();
 
@@ -285,14 +285,14 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
     d->_serialNum->setText(x->getSerialNumber());
 
     cspl = d->_validFrom->palette();
-    if (x->getQDTNotBefore() > TQDateTime::currentDateTime(Qt::UTC))
+    if (x->getQDTNotBefore() > TQDateTime::currentDateTime(TQt::UTC))
         cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
     else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
     d->_validFrom->setPalette(cspl);
     d->_validFrom->setText(x->getNotBefore());
 
     cspl = d->_validUntil->palette();
-    if (x->getQDTNotAfter() < TQDateTime::currentDateTime(Qt::UTC))
+    if (x->getQDTNotAfter() < TQDateTime::currentDateTime(TQt::UTC))
         cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
     else cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
     d->_validUntil->setPalette(cspl);
@@ -317,8 +317,8 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
         ksv = ksvl.first();
 
         if (ksv == KSSLCertificate::SelfSigned) {
-            if (x->getQDTNotAfter() > TQDateTime::currentDateTime(Qt::UTC) &&
-                    x->getQDTNotBefore() < TQDateTime::currentDateTime(Qt::UTC)) {
+            if (x->getQDTNotAfter() > TQDateTime::currentDateTime(TQt::UTC) &&
+                    x->getQDTNotBefore() < TQDateTime::currentDateTime(TQt::UTC)) {
                 if (KSSLSigners().useForSSL(*x))
                     ksv = KSSLCertificate::Ok;
             } else {
@@ -411,40 +411,40 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) {
     TQLabel *label = 0L;
     if (!(tmp = cert.getValue("O")).isEmpty()) {
         label = new TQLabel(i18n("Organization:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
     }
     if (!(tmp = cert.getValue("OU")).isEmpty()) {
         label = new TQLabel(i18n("Organizational unit:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
     }
     if (!(tmp = cert.getValue("L")).isEmpty()) {
         label = new TQLabel(i18n("Locality:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
     }
     if (!(tmp = cert.getValue("ST")).isEmpty()) {
         label = new TQLabel(i18n("Federal State","State:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
     }
     if (!(tmp = cert.getValue("C")).isEmpty()) {
         label = new TQLabel(i18n("Country:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
     }
     if (!(tmp = cert.getValue("CN")).isEmpty()) {
         label = new TQLabel(i18n("Common name:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         (new TQLabel(tmp, _frame))->setTextFormat(TQt::PlainText);
     }
     if (!(tmp = cert.getValue("Email")).isEmpty()) {
         label = new TQLabel(i18n("Email:"), _frame);
-        label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+        label->setAlignment(TQt::AlignLeft | TQt::AlignTop);
         if (mailCatcher) {
             KURLLabel *mail = new KURLLabel(tmp, tmp, _frame);
-            connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &)));
+            connect(mail, TQ_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQ_SLOT(mailClicked(const TQString &)));
         } else {
             label = new TQLabel(tmp, _frame);
             label->setTextFormat(TQt::PlainText);
diff --git a/tdeio/kssl/ksslinfodlg.h b/tdeio/kssl/ksslinfodlg.h
index c73afbba1..9f8a731c0 100644
--- a/tdeio/kssl/ksslinfodlg.h
+++ b/tdeio/kssl/ksslinfodlg.h
@@ -48,7 +48,7 @@ class KSSLCertChain;
  * @short KDE SSL Information Dialog
  */
 class TDEIO_EXPORT KSSLInfoDlg : public KDialog {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 *  Construct a KSSL Information Dialog
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cpp
index 86fe4717d..aad837d7d 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cpp
@@ -51,9 +51,9 @@ KSSLKeyGen::KSSLKeyGen(TQWidget *parent, const char *name, bool modal)
 	setHelpEnabled(page1, false);
 	setHelpEnabled(page2, false);
 	setFinishEnabled(page2, false);
-	connect(page2->_password1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged()));
-	connect(page2->_password2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged()));
-	connect(finishButton(), TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate()));
+	connect(page2->_password1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged()));
+	connect(page2->_password2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged()));
+	connect(finishButton(), TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate()));
 #else
 	// tell him he doesn't have SSL
 #endif
diff --git a/tdeio/kssl/ksslkeygen.h b/tdeio/kssl/ksslkeygen.h
index 5bb99a593..13b38071a 100644
--- a/tdeio/kssl/ksslkeygen.h
+++ b/tdeio/kssl/ksslkeygen.h
@@ -42,7 +42,7 @@ class KGWizardPage2;
  * @short KDE Key Generation Dialog
  */
 class TDEIO_EXPORT KSSLKeyGen : public KWizard {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 *  Construct a keygen dialog.
diff --git a/tdeio/kssl/ksslpeerinfo.cc b/tdeio/kssl/ksslpeerinfo.cpp
index d1c2d00fc..8e265cdb9 100644
--- a/tdeio/kssl/ksslpeerinfo.cc
+++ b/tdeio/kssl/ksslpeerinfo.cpp
@@ -30,7 +30,7 @@
 #include <ksockaddr.h>
 #include <kextsock.h>
 #include <netsupp.h>
-#ifndef Q_WS_WIN //TODO kresolver not ported
+#ifndef TQ_WS_WIN //TODO kresolver not ported
 #include "kresolver.h"
 #endif
 
@@ -62,7 +62,7 @@ void KSSLPeerInfo::setPeerHost(TQString realHost) {
 	while(d->peerHost.endsWith("."))
 		d->peerHost.truncate(d->peerHost.length()-1);
 
-#ifdef Q_WS_WIN //TODO kresolver not ported
+#ifdef TQ_WS_WIN //TODO kresolver not ported
 	d->peerHost = d->peerHost.lower();
 #else	
 	d->peerHost = TQString::fromLatin1(KNetwork::KResolver::domainToAscii(d->peerHost));
diff --git a/tdeio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cpp
index 584020c0f..584020c0f 100644
--- a/tdeio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cpp
diff --git a/tdeio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cpp
index 08bc54a0b..08bc54a0b 100644
--- a/tdeio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cpp
diff --git a/tdeio/kssl/ksslpkcs12.h b/tdeio/kssl/ksslpkcs12.h
index c9dff0d82..14eb23376 100644
--- a/tdeio/kssl/ksslpkcs12.h
+++ b/tdeio/kssl/ksslpkcs12.h
@@ -21,7 +21,7 @@
 #ifndef _KSSLPKCS12_H
 #define _KSSLPKCS12_H
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cpp
index bced75e80..bced75e80 100644
--- a/tdeio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cpp
diff --git a/tdeio/kssl/ksslpkcs7.h b/tdeio/kssl/ksslpkcs7.h
index c94b7bc7a..3a88cb647 100644
--- a/tdeio/kssl/ksslpkcs7.h
+++ b/tdeio/kssl/ksslpkcs7.h
@@ -21,7 +21,7 @@
 #ifndef _KSSLPKCS7_H
 #define _KSSLPKCS7_H
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
diff --git a/tdeio/kssl/ksslsession.cc b/tdeio/kssl/ksslsession.cpp
index 3c80233f1..7d597146a 100644
--- a/tdeio/kssl/ksslsession.cc
+++ b/tdeio/kssl/ksslsession.cpp
@@ -55,7 +55,7 @@ unsigned char *p = csess;
 		return TQString::null;
 	}
 
-	// encode it into a QString
+	// encode it into a TQString
 	qba.duplicate((const char*)csess, slen);
 	delete[] csess;
 	rc = KCodecs::base64Encode(qba);
diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cpp
index 090eaef4f..aaf17cf97 100644
--- a/tdeio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cpp
@@ -30,7 +30,6 @@
 #include <unistd.h>
 
 #include <tqfile.h>
-#include <tqsortedlist.h>
 
 #include "ksslsettings.h"
 #include <tdeglobal.h>
diff --git a/tdeio/kssl/ksslsigners.cc b/tdeio/kssl/ksslsigners.cpp
index 028ddf555..2392f4a36 100644
--- a/tdeio/kssl/ksslsigners.cc
+++ b/tdeio/kssl/ksslsigners.cpp
@@ -199,7 +199,7 @@ TQStringList KSSLSigners::list() {
                          "caList()",
                          data, rettype, retval);
 
-     if (rc && rettype == TQSTRINGLIST_OBJECT_NAME_STRING) {
+     if (rc && rettype == "TQStringList") {
         TQDataStream retStream(retval, IO_ReadOnly);
         retStream >> drc;
      }
@@ -218,7 +218,7 @@ TQString KSSLSigners::getCert(TQString subject) {
                          "caGetCert(TQString)",
                          data, rettype, retval);
 
-     if (rc && rettype == TQSTRING_OBJECT_NAME_STRING) {
+     if (rc && rettype == "TQString") {
         TQDataStream retStream(retval, IO_ReadOnly);
         retStream >> drc;
      }
diff --git a/tdeio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cpp
index 2e6e3a303..2e6e3a303 100644
--- a/tdeio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cpp
diff --git a/tdeio/kssl/ksslutils.h b/tdeio/kssl/ksslutils.h
index 58a817e83..33cec9503 100644
--- a/tdeio/kssl/ksslutils.h
+++ b/tdeio/kssl/ksslutils.h
@@ -22,7 +22,7 @@
 
 #include <kdemacros.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #include "ksslconfig_win.h"
 #else
 #include "ksslconfig.h"
@@ -45,7 +45,7 @@ class TQDateTime;
  *
  *  @param tm the OpenSSL ASN1_UTCTIME pointer
  *
- *  @return the date formatted in a QString
+ *  @return the date formatted in a TQString
  *  @see ASN1_UTCTIME_QDateTime
  */
 KDE_EXPORT TQString ASN1_UTCTIME_QString(ASN1_UTCTIME *tm);
@@ -66,7 +66,7 @@ KDE_EXPORT TQDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt);
  *
  *  @param aint the OpenSSL ASN1_INTEGER pointer
  *
- *  @return the number formatted in a QString
+ *  @return the number formatted in a TQString
  */
 KDE_EXPORT TQString ASN1_INTEGER_QString(ASN1_INTEGER *aint);
 #endif
diff --git a/tdeio/kssl/ksslx509map.cc b/tdeio/kssl/ksslx509map.cpp
index 7896fdfcf..7896fdfcf 100644
--- a/tdeio/kssl/ksslx509map.cc
+++ b/tdeio/kssl/ksslx509map.cpp
diff --git a/tdeio/kssl/ksslx509v3.cc b/tdeio/kssl/ksslx509v3.cpp
index a3310b9db..a3310b9db 100644
--- a/tdeio/kssl/ksslx509v3.cc
+++ b/tdeio/kssl/ksslx509v3.cpp
diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index e076a083e..9e3cafd19 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -53,12 +53,12 @@ namespace KPAC
         : Downloader( parent ),
           m_helper( new KProcIO )
     {
-        connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) );
-        connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) );
+        connect( m_helper, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( helperOutput() ) );
+        connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) );
         *m_helper << "kpac_dhcp_helper";
 
         if ( !m_helper->start() )
-            TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) );
+            TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) );
     }
 
     bool Discovery::initHostName()
diff --git a/tdeio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h
index 97f9cbc5c..b725fb469 100644
--- a/tdeio/misc/kpac/discovery.h
+++ b/tdeio/misc/kpac/discovery.h
@@ -31,7 +31,7 @@ namespace KPAC
 {
     class Discovery : public Downloader
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Discovery( TQObject* );
 
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index 298d660dc..30857df0c 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -44,9 +44,9 @@ namespace KPAC
         m_scriptURL = url;
 
         TDEIO::TransferJob* job = TDEIO::get( url, false, 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, 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* ) ) );
     }
 
     void Downloader::failed()
diff --git a/tdeio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h
index d64984446..d2264f8b2 100644
--- a/tdeio/misc/kpac/downloader.h
+++ b/tdeio/misc/kpac/downloader.h
@@ -31,7 +31,7 @@ namespace KPAC
 {
     class Downloader : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Downloader( TQObject* );
 
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a8f0a4062..c1140af1b 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -105,8 +105,8 @@ namespace KPAC
             default:
                 return false;
         }
-        connect( m_downloader, TQT_SIGNAL( result( bool ) ),
-                 TQT_SLOT( downloadResult( bool ) ) );
+        connect( m_downloader, TQ_SIGNAL( result( bool ) ),
+                 TQ_SLOT( downloadResult( bool ) ) );
         return true;
     }
 
@@ -130,7 +130,7 @@ namespace KPAC
         for ( RequestQueue::ConstIterator it = m_requestQueue.begin();
               it != m_requestQueue.end(); ++it )
         {
-            TQCString type = TQSTRING_OBJECT_NAME_STRING;
+            TQCString type = "TQString";
             TQByteArray data;
             TQDataStream ds( data, IO_WriteOnly );
             if ( success ) ds << handleRequest( ( *it ).url );
diff --git a/tdeio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h
index 237887c95..524ee5f43 100644
--- a/tdeio/misc/kpac/proxyscout.h
+++ b/tdeio/misc/kpac/proxyscout.h
@@ -38,7 +38,7 @@ namespace KPAC
 
     class ProxyScout : public KDEDModule
     {
-        Q_OBJECT
+        TQ_OBJECT
         K_DCOP
     public:
         ProxyScout( const TQCString& );
diff --git a/tdeio/misc/kpac/script.cpp b/tdeio/misc/kpac/script.cpp
index b1f2fee82..6891d37a7 100644
--- a/tdeio/misc/kpac/script.cpp
+++ b/tdeio/misc/kpac/script.cpp
@@ -447,11 +447,11 @@ namespace KPAC
 	  throw Error( "No such function FindProxyForURL" );
 
         KURL cleanUrl = url;
-        cleanUrl.setPass(QString());
-        cleanUrl.setUser(QString());
+        cleanUrl.setPass(TQString());
+        cleanUrl.setUser(TQString());
         if (cleanUrl.protocol().lower() == "https") {
-            cleanUrl.setPath(QString());
-            cleanUrl.setQuery(QString());
+            cleanUrl.setPath(TQString());
+            cleanUrl.setQuery(TQString());
         }
 
 	Object thisObj;
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index a376ebfac..33a87c13d 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -41,7 +41,6 @@
 #include <pwd.h>
 #include <unistd.h>
 #include <tqfile.h>
-#include <tqsortedlist.h>
 #include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
@@ -287,7 +286,7 @@ KSSLCNode *node;
 			if ( !node->permanent ) {
 				node->expires = TQDateTime::currentDateTime();
 				// FIXME: make this configurable
-					node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(5));
+					node->expires = node->expires.addSecs(5);
 			} else {
 					node->expires = node->cert->getQDTNotAfter(); // set to certs expiry date
 			}
@@ -310,7 +309,7 @@ KSSLCNode *node;
 
 	if (!permanent) {
 		n->expires = TQDateTime::currentDateTime();
-		n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(5));
+		n->expires = n->expires.addSecs(5);
 	} else {
 		if ( !n->expires.isValid() )
 			n->expires = n->cert->getQDTNotAfter(); // set to certs expiry date
diff --git a/tdeio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h
index 028a30809..a20582ce2 100644
--- a/tdeio/misc/kssld/kssld.h
+++ b/tdeio/misc/kssld/kssld.h
@@ -38,7 +38,7 @@ class KOpenSSLProxy;
 
 class KSSLD : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
 public:
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index bf3099094..d1e8ae483 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -122,8 +122,8 @@ int main(int argc, char **argv) {
     SMTP *sm = new SMTP;
     BugMailer bm(sm);
 
-    TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend()));
-    TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int)));
+    TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend()));
+    TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int)));
     sm->setServerHost(server);
     sm->setPort(25);
     sm->setSenderAddress(fromaddr);
diff --git a/tdeio/misc/tdesendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h
index 39d424bef..f06088694 100644
--- a/tdeio/misc/tdesendbugmail/main.h
+++ b/tdeio/misc/tdesendbugmail/main.h
@@ -6,7 +6,7 @@
 class SMTP;
 
 class BugMailer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BugMailer(SMTP* s) : TQObject(0, "mailer"), sm(s) {}
 
diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp
index 470f24050..ae507e76a 100644
--- a/tdeio/misc/tdesendbugmail/smtp.cpp
+++ b/tdeio/misc/tdesendbugmail/smtp.cpp
@@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout)
 
     kdDebug() << "SMTP object created" << endl;
 
-    connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick()));
-    connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut()));
-    connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut()));
+    connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick()));
+    connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut()));
+    connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut()));
 
     // some sendmail will give 'duplicate helo' error, quick fix for now
-    connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection()));
+    connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection()));
 }
 
 SMTP::~SMTP()
@@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void)
     state = INIT;
     serverState = NONE;
 
-    connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
-    connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
+    connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *)));
+    connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *)));
     //    sock->enableRead(true);
     timeOutTimer.stop();
     kdDebug() << "connected" << endl;
@@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket)
 void SMTP::socketClose(TDESocket *socket)
 {
     timeOutTimer.stop();
-    disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *)));
-    disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *)));
+    disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *)));
+    disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *)));
     socket->enableRead(false);
     kdDebug() << "connection terminated" << endl;
     connected = false;
diff --git a/tdeio/misc/tdesendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h
index acdb4a3c3..3d00b4c1a 100644
--- a/tdeio/misc/tdesendbugmail/smtp.h
+++ b/tdeio/misc/tdesendbugmail/smtp.h
@@ -37,9 +37,9 @@ int SMTPClientStatus[] = {
 
 #define SMTP_READ_BUFFER_SIZE 256
 
-class SMTP:public QObject
+class SMTP:public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SMTP(char *serverhost = 0, unsigned short int port = 0, int timeout = DEFAULT_SMTP_TIMEOUT);
     ~SMTP();
diff --git a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
index a02d5def7..8f72031e3 100644
--- a/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
+++ b/tdeio/misc/tdewalletd/kbetterthankdialogbase.ui
@@ -140,15 +140,12 @@
     <include location="global" impldecl="in declaration">kactivelabel.h</include>
     <include location="local" impldecl="in implementation">kbetterthankdialogbase.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="private">clicked()</slot>
     <slot>setLabel( const TQString &amp; label )</slot>
     <slot access="private">init()</slot>
     <slot access="protected">accept()</slot>
     <slot access="protected">reject()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactivelabel.h</includehint>
-</includehints>
 </UI>
diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp
index c431ecf69..25108bdc5 100644
--- a/tdeio/misc/tdewalletd/ktimeout.cpp
+++ b/tdeio/misc/tdewalletd/ktimeout.cpp
@@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) {
 	}
 
 	TQTimer *t = new TQTimer;
-	connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+	connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
 	t->start(timeout);
 	_timers.insert(id, t);
 }
diff --git a/tdeio/misc/tdewalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h
index 441e4ed77..0aced67ae 100644
--- a/tdeio/misc/tdewalletd/ktimeout.h
+++ b/tdeio/misc/tdewalletd/ktimeout.h
@@ -28,7 +28,7 @@
 
 // @internal
 class KTimeout : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KTimeout(int size = 29);
 		virtual ~KTimeout();
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 0aaec0f9a..5b7840fd0 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name)
 	_timeouts = new KTimeout(17);
 	_closeIdle = false;
 	_idleTime = 0;
-	connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int)));
+	connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int)));
 	reconfigure();
 	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(TDEApplication::dcopClient(),
-		TQT_SIGNAL(applicationRemoved(const TQCString&)),
+		TQ_SIGNAL(applicationRemoved(const TQCString&)),
 		this,
-		TQT_SLOT(slotAppUnregistered(const TQCString&)));
+		TQ_SLOT(slotAppUnregistered(const TQCString&)));
 	_dw = new KDirWatch(this, "TDEWallet Directory Watcher");
 	_dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet"));
 	_dw->startScan(true);
-	connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty()));
+	connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty()));
 }
 
 
@@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur
 
 	DCOPRef(appid, returnObject).send("walletOpenResult", 0);
 
-	TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+	TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
 	checkActiveDialog();
 }
 
@@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) {
 	xact->wId = wId;
 	xact->tType = TDEWalletTransaction::Open;
 	xact->modal = true; // mark dialogs as modal, the app has blocking wait
-	TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+	TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
 	checkActiveDialog();
 	return 0; // process later
 }
@@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password)
         _tryOpenBlocked.start (30 * 1000, true /*single shot*/);
         if (++_failed > 5) {
             _failed = 0;
-            TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+            TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
         }
 
         rc = -1;
@@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) {
 
 	_transactions.append(xact);
 
-	TQTimer::singleShot(0, this, TQT_SLOT(processTransactions()));
+	TQTimer::singleShot(0, this, TQ_SLOT(processTransactions()));
 	checkActiveDialog();
 }
 
@@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) {
 
 	if (rc == 0 && ++_failed > 5) {
 		_failed = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+		TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
 	} else if (rc != 0) {
 		_failed = 0;
 	}
@@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) {
 
 	if (++_failed > 5) {
 		_failed = 0;
-		TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures()));
+		TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures()));
 	}
 
 	return 0L;
diff --git a/tdeio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h
index c35ebc630..65e77771e 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.h
+++ b/tdeio/misc/tdewalletd/tdewalletd.h
@@ -40,7 +40,7 @@ class KTimeout;
 class TDEWalletTransaction;
 
 class TDEWalletD : public KDEDModule {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 	public:
 		TDEWalletD(const TQCString &name);
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index 3e034bac1..1cad5f4a0 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -534,12 +534,12 @@
     <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot access="private">passwordPageUpdate()</slot>
     <slot access="private">init()</slot>
     <slot>setAdvanced()</slot>
     <slot>setBasic()</slot>
     <slot access="private">destroy()</slot>
-</Q_SLOTS>
+</slots>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 128b77bff..b2d02615d 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray
          :KSystemTray(uis)
       {
          TDEPopupMenu* pop= contextMenu();
-         pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure()));
-         pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon()));
+         pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure()));
+         pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon()));
          setPixmap(loadIcon("document-save"));
          //actionCollection()->action("file_quit")->setEnabled(true);
-         KStdAction::quit(TQT_TQOBJECT(uis), TQT_SLOT(slotQuit()), actionCollection());
+         KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection());
       }
 };
 
@@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString
   // create dialog, but don't show it
   defaultProgress = new TDEIO::DefaultProgress( false );
   defaultProgress->setOnlyClean( true );
-  connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) );
-  connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) );
+  connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) );
+  connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) );
 
   if ( showDefault ) {
     m_showTimer.start( 500, true );
@@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name)
   //used for squeezing the text in local file name and url
   m_squeezer=new KSqueezedTextLabel(this);
   m_squeezer->hide();
-  connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int)));
+  connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int)));
 }
 
 
@@ -595,11 +595,11 @@ UIServer::UIServer()
 
   // setup toolbar
   toolBar()->insertButton("edit-delete", TOOL_CANCEL,
-                          TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
-                          TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
+                          TQ_SIGNAL(clicked()), this,
+                          TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel"));
   toolBar()->insertButton("configure", TOOL_CONFIGURE,
-                          TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
-                          TQT_SLOT(slotConfigure()), true, i18n("Settings..."));
+                          TQ_SIGNAL(clicked()), this,
+                          TQ_SLOT(slotConfigure()), true, i18n("Settings..."));
 
   toolBar()->setBarPos( TDEToolBar::Left );
 
@@ -614,18 +614,18 @@ UIServer::UIServer()
 
   setCentralWidget( listProgress );
 
-  connect( listProgress, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelection() ) );
-  connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ),
-           TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
-  connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
-           TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
+  connect( listProgress, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelection() ) );
+  connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ),
+           TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) );
+  connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)),
+           TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
 
 
   // setup animation timer
   updateTimer = new TQTimer( this );
-  connect( updateTimer, TQT_SIGNAL( timeout() ),
-           TQT_SLOT( slotUpdate() ) );
+  connect( updateTimer, TQ_SIGNAL( timeout() ),
+           TQ_SLOT( slotUpdate() ) );
   m_bUpdateNewJob=false;
 
   setCaption(i18n("Progress Dialog"));
@@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP
    if (m_contextMenu==0)
    {
       m_contextMenu=new TQPopupMenu(this);
-      m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent()));
-//      m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress()));
+      m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent()));
+//      m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress()));
       m_contextMenu->insertSeparator();
-      m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure()));
+      m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure()));
    }
    if ( item )
        item->setSelected( true );
@@ -707,9 +707,9 @@ void UIServer::slotConfigure()
    if (m_configDialog==0)
    {
       m_configDialog=new ProgressConfigDialog(0);
-//      connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig()));
-      connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig()));
-      connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig()));
+//      connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig()));
+      connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig()));
+      connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig()));
    }
    m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray);
    m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen);
@@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress )
   bool show = !m_bShowList && showProgress;
 
   ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show );
-  connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ),
-           TQT_SLOT( slotJobCanceled( ProgressItem* ) ) );
+  connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ),
+           TQ_SLOT( slotJobCanceled( ProgressItem* ) ) );
 
   if ( m_bShowList && !updateTimer->isActive() )
     updateTimer->start( 1000 );
@@ -1205,7 +1205,7 @@ void UIServer::showSSLInfoDialog(const TQString &url, const TDEIO::MetaData &met
                   meta["ssl_cipher_bits"].toInt(),
                   KSSLCertificate::KSSLValidation(meta["ssl_cert_state"].toInt()));
       kdDebug(7024) << "Showing SSL Info dialog" << endl;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       if( mainwindow != 0 )
           KWin::setMainWindow( kid, mainwindow );
 #endif
@@ -1233,7 +1233,7 @@ KSSLCertDlgRet UIServer::showSSLCertDialog(const TQString& host, const TQStringL
       kcd->setupDialog(certList);
       kcd->setHost(host);
       kdDebug(7024) << "Showing SSL certificate dialog" << endl;
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       if( mainwindow != 0 )
           KWin::setMainWindow( kcd, mainwindow );
 #endif
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index edb4531bc..8ba492da5 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -57,7 +57,7 @@ struct ListProgressColumnConfig
 */
 class TDEIO_EXPORT ListProgress : public TDEListView {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -105,7 +105,7 @@ protected:
 */
 class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ProgressItem( ListProgress* view, TQListViewItem *after, TQCString app_id, int job_id,
@@ -217,7 +217,7 @@ class UIServerSystemTray;
 class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
 
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
   UIServer();
   virtual ~UIServer();
diff --git a/tdeio/tdefile/NOTES b/tdeio/tdefile/NOTES
index c646c13cd..7d7669569 100644
--- a/tdeio/tdefile/NOTES
+++ b/tdeio/tdefile/NOTES
@@ -26,7 +26,7 @@ for more integration between tdefile and konqueror. 16/08/2000.
     of the visible icons first" algorithm, currently in KonqIconView.
 (3) KFileView, the base class for any view, knows about KFileItem, has
     signals for dropped(), popupMenu(list of actions provided by the view),
-    has a QWidget * canvas() method, xOffset() and yOffset()
+    has a TQWidget * canvas() method, xOffset() and yOffset()
 (4) KFileIconView holds a QPtrDict to look up a QIconViewItem quickly from a
     given KFileItem. This will help for e.g. deleteItems and refreshItems.
 (5) KFileListView holds a QPtrDict to find the QListViewItem for a
diff --git a/tdeio/tdefile/images.h b/tdeio/tdefile/images.h
index f544e2f0a..0e9298383 100644
--- a/tdeio/tdefile/images.h
+++ b/tdeio/tdefile/images.h
@@ -3,7 +3,7 @@
 #define _QEMBED_1804289383
 #include <tqimage.h>
 #include <tqdict.h>
-static const QRgb group_grey_data[] = {
+static const TQRgb group_grey_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x42484848,0xc39b9b9b,0xeab1b1b1,0xce9d9d9d,0x5a4d4d4d,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x563b3b3b,0xfdaeaeae,0xffcfcfcf,0xffcccccc,0xffcecece,
     0xffbababa,0x62393939,0x0,0x0,0x0,0x0,0x0,0x0,0x4525252,0x9383838,0x0,0xd0515151,0xff969696,0xff959595,
@@ -26,7 +26,7 @@ static const QRgb group_grey_data[] = {
 };
 
 /* Generated by qembed */
-static const QRgb group_data[] = {
+static const TQRgb group_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4223731d,0xc37fbb7c,0xea9bca98,0xce86b982,0x5a316e2c,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56146610,0xfd8fce8e,0xffbae4bb,0xffb7e2b7,0xffbae3ba,
     0xff9ed89d,0x62166112,0x0,0x0,0x0,0x0,0x0,0x0,0x4003ca5,0x9003171,0x0,0xd0198b17,0xff6ac468,0xff6ec665,
@@ -48,7 +48,7 @@ static const QRgb group_data[] = {
     0x0,0x0,0x0,0x0
 };
 
-static const QRgb mask_data[] = {
+static const TQRgb mask_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x11c84a00,0x1000000,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x68d14e00,0xffda6400,0x72bf4700,0x3000000,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14d04d00,0xefda6400,0xfffec300,0xf2d86300,0x24742b00,
@@ -70,7 +70,7 @@ static const QRgb mask_data[] = {
     0x2000000,0x2000000,0x2000000,0x0
 };
 
-static const QRgb others_grey_data[] = {
+static const TQRgb others_grey_data[] = {
     0x0,0x0,0x0,0xa4c4c4c,0x5d676767,0x777c7c7c,0x3d555555,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x17535353,0xd2afafaf,0xffebebeb,0xffe5e5e5,0xfec2c2c2,0x906d6d6d,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0xa09c9c9c,0xfff1f1f1,0xfff5f5f5,0xffe6e6e6,0xffd4d4d4,0xffbebebe,0x4c424242,0x117b7b7b,
@@ -92,7 +92,7 @@ static const QRgb others_grey_data[] = {
     0x542e2e2e,0x200f0f0f,0x0,0x0
 };
 
-static const QRgb others_data[] = {
+static const TQRgb others_data[] = {
     0x0,0x0,0x0,0xa804618,0x5d95643a,0x77a77c52,0x3d855126,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x17964f11,0xd2cfb190,0xfff8efdf,0xffffeccb,0xfeedce98,0x909b703f,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0xa0d29e66,0xfffff7e3,0xfffff8ec,0xffffedce,0xffffe0a9,0xfff5cd88,0x4c6f4316,0x11f72300,
@@ -114,7 +114,7 @@ static const QRgb others_data[] = {
     0x5403065a,0x2000001e,0x0,0x0
 };
 
-static const QRgb user_green_data[] = {
+static const TQRgb user_green_data[] = {
     0x0,0x0,0x0,0x0,0x5029,0x6c1c6e21,0xe332aa3b,0xf83ac841,0xf838c83f,0xda369a3b,0x5a145819,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x7e1a6c1e,0xff32da39,0xff3de341,0xff3ee045,0xff3ee042,0xff3de345,0xff27d930,0x68125817,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f013105,0xf721a328,0xff22de27,0xff23dd27,0xff26dc26,0xff26dc2a,0xff22de27,
@@ -136,7 +136,7 @@ static const QRgb user_green_data[] = {
     0x1c020604,0x0,0x0,0x0
 };
 
-static const QRgb user_grey_data[] = {
+static const TQRgb user_grey_data[] = {
     0x0,0x0,0x0,0x0,0x404040,0x6c6e6e6e,0xe3b0b0b0,0xf8cecece,0xf8cccccc,0xdaa6a6a6,0x5a575757,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x7e6b6b6b,0xffd6d6d6,0xffe6e6e6,0xffe4e4e4,0xffe4e4e4,0xffe6e6e6,0xffcccccc,0x68555555,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f282828,0xf79d9d9d,0xffcccccc,0xffcdcdcd,0xffcecece,0xffcecece,0xffcccccc,
@@ -158,7 +158,7 @@ static const QRgb user_grey_data[] = {
     0x1c070707,0x0,0x0,0x0
 };
 
-static const QRgb user_data[] = {
+static const TQRgb user_data[] = {
     0x0,0x0,0x0,0x0,0x7f,0x6c2c68af,0xe384abdb,0xf8b2ccea,0xf8aecae9,0xda7ba3d1,0x5a20508d,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x7e2a66ac,0xffb8d4f3,0xffd2e5f9,0xffd0e3f8,0xffcfe3f8,0xffd3e5f9,0xffa7c9f0,0x681d4e8c,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f02244d,0xf75c9ade,0xffa6cbf2,0xffa7ccf2,0xffa9cef2,0xffa9cdf2,0xffa6ccf2,
@@ -180,7 +180,7 @@ static const QRgb user_data[] = {
     0x1c040409,0x0,0x0,0x0
 };
 
-static const QRgb yes_data[] = {
+static const TQRgb yes_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x11049c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
@@ -202,7 +202,7 @@ static const QRgb yes_data[] = {
     0x0,0x0,0x0,0x0
 };
 
-static const QRgb yespartial_data[] = {
+static const TQRgb yespartial_data[] = {
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
     0x0,0x0,0x0,0x0,0x114e4e4e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
@@ -228,7 +228,7 @@ static struct EmbedImage {
     int width, height, depth;
     const unsigned char *data;
     int numColors;
-    const QRgb *colorTable;
+    const TQRgb *colorTable;
     bool alpha;
     const char *name;
 } embed_image_vec[] = {
@@ -256,7 +256,7 @@ static const TQImage& qembed_findImage( const TQString& name )
 			    embed_image_vec[i].width,
 			    embed_image_vec[i].height,
 			    embed_image_vec[i].depth,
-			    (QRgb*)embed_image_vec[i].colorTable,
+			    (TQRgb*)embed_image_vec[i].colorTable,
 			    embed_image_vec[i].numColors,
 			    TQImage::BigEndian );
 		if ( embed_image_vec[i].alpha )
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 8b1995005..dec306643 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -74,16 +74,16 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name )
     TQHBox *hbox = new TQHBox( parent );
     hbox->setSpacing(  KDialog::spacingHint() );
     m_listView = new KACLListView( hbox, "acl_listview" );
-    connect( m_listView, TQT_SIGNAL( selectionChanged() ),
-            this, TQT_SLOT( slotUpdateButtons() ) );
+    connect( m_listView, TQ_SIGNAL( selectionChanged() ),
+            this, TQ_SLOT( slotUpdateButtons() ) );
     TQVBox *vbox = new TQVBox( hbox );
     vbox->setSpacing(  KDialog::spacingHint() );
     m_AddBtn = new TQPushButton( i18n( "Add Entry..." ), vbox, "add_entry_button" );
-    connect( m_AddBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotAddEntry() ) );
+    connect( m_AddBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotAddEntry() ) );
     m_EditBtn = new TQPushButton( i18n( "Edit Entry..." ), vbox, "edit_entry_button" );
-    connect( m_EditBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotEditEntry() ) );
+    connect( m_EditBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotEditEntry() ) );
     m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" );
-    connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) );
+    connect( m_DelBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotRemoveEntry() ) );
     TQWidget *spacer = new TQWidget( vbox );
     spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     slotUpdateButtons();
@@ -213,7 +213,7 @@ void KACLListViewItem::paintCell( TQPainter* p, const TQColorGroup &cg,
     const bool lastNonDefault = !isDefault && below && below->isDefault;
     if ( type == KACLListView::Mask || lastUser || lastNonDefault )
     {
-        p->setPen( TQPen( Qt::gray, 0, TQPen::DotLine ) );
+        p->setPen( TQPen( TQt::gray, 0, TQPen::DotLine ) );
         if ( type == KACLListView::Mask )
             p->drawLine( 0, 0, width - 1, 0 );
         p->drawLine( 0, height() - 1, width - 1, height() - 1 );
@@ -409,10 +409,10 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem
     if ( allowDefaults ) {
         m_defaultCB = new TQCheckBox( i18n("Default for new files in this folder"), page, "defaultCB" );
         mainLayout->addWidget( m_defaultCB );
-        connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ),
-                 this, TQT_SLOT( slotUpdateAllowedUsersAndGroups() ) );
-        connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ),
-                 this, TQT_SLOT( slotUpdateAllowedTypes() ) );
+        connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ),
+                 this, TQ_SLOT( slotUpdateAllowedUsersAndGroups() ) );
+        connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ),
+                 this, TQ_SLOT( slotUpdateAllowedTypes() ) );
 
     }
 
@@ -431,8 +431,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem
     TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" );
     m_buttonGroup->insert( namedGroupType, KACLListView::NamedGroup );
 
-    connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ),
-             this, TQT_SLOT( slotSelectionChanged( int ) ) );
+    connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ),
+             this, TQ_SLOT( slotSelectionChanged( int ) ) );
 
     m_widgetStack = new TQWidgetStack( page );
     mainLayout->addWidget( m_widgetStack );
diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h
index 43f4b2fca..9cbbe1385 100644
--- a/tdeio/tdefile/kacleditwidget.h
+++ b/tdeio/tdefile/kacleditwidget.h
@@ -24,10 +24,6 @@
 #include <config.h>
 #endif
 
-#ifdef Q_MOC_RUN
-#define USE_POSIX_ACL
-#endif // Q_MOC_RUN
-
 #ifdef USE_POSIX_ACL
 
 #include <tdelistview.h>
@@ -40,7 +36,7 @@ class TQPushButton;
 
 class KACLEditWidget : TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KACLEditWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index 41e265053..dcbc10de6 100644
--- a/tdeio/tdefile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -24,10 +24,6 @@
 #include <config.h>
 #endif
 
-#ifdef Q_MOC_RUN
-#define USE_POSIX_ACL
-#endif // Q_MOC_RUN
-
 #ifdef USE_POSIX_ACL
 #include <tdelistview.h>
 #include <sys/acl.h>
@@ -49,7 +45,7 @@ class TQCheckBox;
 */
 class KACLListView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     friend class KACLListViewItem;
 public:
@@ -133,7 +129,7 @@ private:
 
 class EditACLEntryDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item,
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 4c4f0cb06..da685daa9 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -56,8 +56,8 @@ KCombiView::KCombiView( TQWidget *parent, const char *name)
     left->setAcceptDrops(false);
     left->installEventFilter( this );
     
-    connect( sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ),
-             TQT_SLOT( slotSortingChanged( TQDir::SortSpec ) ));
+    connect( sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ),
+             TQ_SLOT( slotSortingChanged( TQDir::SortSpec ) ));
 }
 
 KCombiView::~KCombiView()
@@ -358,9 +358,9 @@ bool KCombiView::eventFilter( TQObject *o, TQEvent *e )
     // only the focused view may have a selection
     if ( type == TQEvent::FocusIn )
     {
-        if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(left) )
+        if ( o == left )
             right->clearSelection();
-        else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(right->widget()) )
+        else if ( o == right->widget() )
             left->clearSelection();
     }
     
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index ad72063e3..cf1736409 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -54,7 +54,7 @@ class TQIconViewItem;
 class TDEIO_EXPORT KCombiView : public TQSplitter,
 		   public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCombiView( TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index b59108071..fd6eca83d 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -94,13 +94,13 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent)
    m_listView->addColumn(i18n("Menu"));
    m_listView->setFullWidth(true);
    m_listView->setSorting(-1);
-   KButtonBox *buttonBox = new KButtonBox(page, Qt::Vertical);
-   buttonBox->addButton(i18n("New..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewItem()));
-   d->pbRemove=buttonBox->addButton(i18n("Remove"), TQT_TQOBJECT(this), TQT_SLOT(slotRemoveItem()));
-   d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveUp()));
-   d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), TQT_TQOBJECT(this), TQT_SLOT(slotMoveDown()));
+   KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical);
+   buttonBox->addButton(i18n("New..."), this, TQ_SLOT(slotNewItem()));
+   d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQ_SLOT(slotRemoveItem()));
+   d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQ_SLOT(slotMoveUp()));
+   d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQ_SLOT(slotMoveDown()));
    buttonBox->layout();
-   connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) );
+   connect( m_listView, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( refreshButton() ) );
    refreshButton();
 }
 
diff --git a/tdeio/tdefile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h
index cb43c606f..c0f43343e 100644
--- a/tdeio/tdefile/kcustommenueditor.h
+++ b/tdeio/tdefile/kcustommenueditor.h
@@ -32,7 +32,7 @@ class TDEConfigBase;
   */
 class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Create a dialog for editing a custom menu
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 8087f206d..ab8e64d92 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -99,8 +99,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
     TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() );
     m_mainLayout = new TQVBoxLayout();
     d->speedBar = new KFileSpeedBar( page, "speedbar" );
-    connect( d->speedBar, TQT_SIGNAL( activated( const KURL& )),
-             TQT_SLOT( setCurrentURL( const KURL& )) );
+    connect( d->speedBar, TQ_SIGNAL( activated( const KURL& )),
+             TQ_SLOT( setCurrentURL( const KURL& )) );
     hlay->addWidget( d->speedBar, 0 );
     hlay->addLayout( m_mainLayout, 1 );
 
@@ -118,15 +118,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
     d->urlCombo->setCompletionObject( comp, true );
     d->urlCombo->setAutoDeleteCompletionObject( true );
     d->urlCombo->setDuplicatesEnabled( false );
-    connect( d->urlCombo, TQT_SIGNAL( textChanged( const TQString& ) ),
-             TQT_SLOT( slotComboTextChanged( const TQString& ) ));
+    connect( d->urlCombo, TQ_SIGNAL( textChanged( const TQString& ) ),
+             TQ_SLOT( slotComboTextChanged( const TQString& ) ));
 
     m_contextMenu = new TQPopupMenu( this );
-    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, TQT_TQOBJECT(this), TQT_SLOT( slotMkdir() ), TQT_TQOBJECT(this));
+    TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQ_SLOT( slotMkdir() ), this);
     newFolder->plug(m_contextMenu);
     m_contextMenu->insertSeparator();
-    m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, TQT_TQOBJECT(this),
-                                        TQT_SLOT( slotShowHiddenFoldersToggled() ), TQT_TQOBJECT(this));
+    m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this,
+                                        TQ_SLOT( slotShowHiddenFoldersToggled() ), this);
     m_showHiddenFolders->plug(m_contextMenu);
 
     d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass );
@@ -151,15 +151,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly,
     m_mainLayout->addWidget( m_treeView, 1 );
     m_mainLayout->addWidget( d->urlCombo, 0 );
 
-    connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )),
-             TQT_SLOT( slotCurrentChanged() ));
-    connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )),
-             TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & )));
+    connect( m_treeView, TQ_SIGNAL( currentChanged( TQListViewItem * )),
+             TQ_SLOT( slotCurrentChanged() ));
+    connect( m_treeView, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )),
+             TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & )));
 
-    connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )),
-             TQT_SLOT( slotURLActivated( const TQString& )));
-    connect( d->urlCombo, TQT_SIGNAL( returnPressed( const TQString& )),
-             TQT_SLOT( slotURLActivated( const TQString& )));
+    connect( d->urlCombo, TQ_SIGNAL( activated( const TQString& )),
+             TQ_SLOT( slotURLActivated( const TQString& )));
+    connect( d->urlCombo, TQ_SIGNAL( returnPressed( const TQString& )),
+             TQ_SLOT( slotURLActivated( const TQString& )));
 
     setCurrentURL( d->startURL );
 }
@@ -194,10 +194,10 @@ void KDirSelectDialog::setCurrentURL( const KURL& url )
         d->branch = createBranch( root );
     }
 
-    d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )),
-                           this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *)));
-    connect( d->branch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )),
-             TQT_SLOT( slotNextDirToList( KFileTreeViewItem * ) ));
+    d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )),
+                           this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *)));
+    connect( d->branch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )),
+             TQ_SLOT( slotNextDirToList( KFileTreeViewItem * ) ));
 
     KURL dirToList = root;
     d->dirsToList.clear();
@@ -260,8 +260,8 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item )
         openNextDir( item );
     else
     {
-        d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )),
-                               this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *)));
+        d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )),
+                               this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *)));
         view()->setCurrentItem( item );
         item->setSelected( true );
     }
diff --git a/tdeio/tdefile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h
index 400bd3232..fa71ab35f 100644
--- a/tdeio/tdefile/kdirselectdialog.h
+++ b/tdeio/tdefile/kdirselectdialog.h
@@ -38,7 +38,7 @@ class TDEToggleAction;
  */
 class TDEIO_EXPORT KDirSelectDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index b2d48b4bf..40d0b5d13 100644
--- a/tdeio/tdefile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -35,7 +35,7 @@ KDirSize::KDirSize( const KURL & directory )
 KDirSize::KDirSize( const KFileItemList & lstItems )
     : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems)
 {
-    TQTimer::singleShot( 0, this, TQT_SLOT(processList()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(processList()) );
 }
 
 void KDirSize::processList()
@@ -70,9 +70,9 @@ void KDirSize::processList()
 void KDirSize::startNextJob( const KURL & url )
 {
     TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ );
-    connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+    connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *,
                                       const TDEIO::UDSEntryList& )),
-             TQT_SLOT( slotEntries( TDEIO::Job*,
+             TQ_SLOT( slotEntries( TDEIO::Job*,
                                 const TDEIO::UDSEntryList& )));
     addSubjob( listJob );
 }
diff --git a/tdeio/tdefile/kdirsize.h b/tdeio/tdefile/kdirsize.h
index 210080950..8526eeff6 100644
--- a/tdeio/tdefile/kdirsize.h
+++ b/tdeio/tdefile/kdirsize.h
@@ -29,7 +29,7 @@
  */
 class TDEIO_EXPORT KDirSize : public TDEIO::Job
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   KDirSize( const KURL & directory );
   KDirSize( const KFileItemList & lstItems );
diff --git a/tdeio/tdefile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp
index 1552e01d2..e29060312 100644
--- a/tdeio/tdefile/kdiskfreesp.cpp
+++ b/tdeio/tdefile/kdiskfreesp.cpp
@@ -48,10 +48,10 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name)
 {
     dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc);
     dfProc->setEnvironment("LANGUAGE", "C");
-    connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
-             this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
-    connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ),
-            this, TQT_SLOT(dfDone() ) );
+    connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ),
+             this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) );
+    connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ),
+            this, TQ_SLOT(dfDone() ) );
 
     readingDFStdErrOut=false;
 }
diff --git a/tdeio/tdefile/kdiskfreesp.h b/tdeio/tdefile/kdiskfreesp.h
index 5ffa47d9a..f17a10372 100644
--- a/tdeio/tdefile/kdiskfreesp.h
+++ b/tdeio/tdefile/kdiskfreesp.h
@@ -38,7 +38,7 @@ class TDEProcess;
  * information for a given partition (mount point).
  */
 class TDEIO_EXPORT KDiskFreeSp : public TQObject
-{  Q_OBJECT
+{  TQ_OBJECT
 public:
    KDiskFreeSp( TQObject *parent=0, const char *name=0 );
    /**
diff --git a/tdeio/tdefile/kencodingfiledialog.h b/tdeio/tdefile/kencodingfiledialog.h
index b52edd629..607a19493 100644
--- a/tdeio/tdefile/kencodingfiledialog.h
+++ b/tdeio/tdefile/kencodingfiledialog.h
@@ -37,7 +37,7 @@ struct KEncodingFileDialogPrivate;
 
 class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     class Result {
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index 7acc04ad0..de3401947 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -16,6 +16,7 @@
 #include <config.h>
 
 #include <assert.h>
+#include <list>
 
 #include <kiconviewsearchline.h>
 
@@ -32,7 +33,6 @@
 #include <tqlayout.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqsortedlist.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
@@ -93,9 +93,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name)
 {
     d = new TDEIconCanvasPrivate;
     mpTimer = new TQTimer(this);
-    connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles()));
-    connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)),
-	    TQT_SLOT(slotCurrentChanged(TQIconViewItem *)));
+    connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles()));
+    connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)),
+	    TQ_SLOT(slotCurrentChanged(TQIconViewItem *)));
     setGridX(80);
     setWordWrapIconText(false);
     setShowToolTips(true);
@@ -119,7 +119,7 @@ void TDEIconCanvas::loadFiles(const TQStringList& files)
 void TDEIconCanvas::slotLoadFiles()
 {
     setResizeMode(Fixed);
-    TQApplication::setOverrideCursor(tqwaitCursor);
+    TQApplication::setOverrideCursor(TQt::waitCursor);
 
     // disable updates to not trigger paint events when adding child items
     setUpdatesEnabled( false );
@@ -267,16 +267,16 @@ void TDEIconDialog::init()
     TQVBoxLayout *top = new TQVBoxLayout(main);
     top->setSpacing( spacingHint() );
 
-    TQButtonGroup *bgroup = new TQButtonGroup(0, Qt::Vertical, i18n("Icon Source"), main);
+    TQButtonGroup *bgroup = new TQButtonGroup(0, TQt::Vertical, i18n("Icon Source"), main);
     bgroup->layout()->setSpacing(KDialog::spacingHint());
     bgroup->layout()->setMargin(KDialog::marginHint());
     top->addWidget(bgroup);
-    connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int)));
+    connect(bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotButtonClicked(int)));
     TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2);
     mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup);
     grid->addWidget(mpRb1, 1, 0);
     mpCombo = new TQComboBox(bgroup);
-    connect(mpCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContext(int)));
+    connect(mpCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContext(int)));
     grid->addWidget(mpCombo, 1, 1);
     mpRb2 = new TQRadioButton(i18n("O&ther icons:"), bgroup);
     grid->addWidget(mpRb2, 2, 0);
@@ -303,7 +303,7 @@ void TDEIconDialog::init()
 
 
     // signals and slots connections
-    connect(clearSearch, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear()));
+    connect(clearSearch, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear()));
 
     TQString wtstr = i18n("Search interactively for icon names (e.g. folder).");
     TQWhatsThis::add(searchLabel, wtstr);
@@ -311,20 +311,20 @@ void TDEIconDialog::init()
 
 
     mpCanvas = new TDEIconCanvas(main);
-    connect(mpCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons()));
-    connect(mpCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons()));
+    connect(mpCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons()));
+    connect(mpCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons()));
     mpCanvas->setMinimumSize(400, 125);
     top->addWidget(mpCanvas);
     d->searchLine->setIconView(mpCanvas);
 
     mpProgress = new KProgress(main);
     top->addWidget(mpProgress);
-    connect(mpCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int)));
-    connect(mpCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int)));
-    connect(mpCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished()));
+    connect(mpCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int)));
+    connect(mpCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int)));
+    connect(mpCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished()));
 
     // When pressing Ok or Cancel, stop loading icons
-    connect(this, TQT_SIGNAL(hidden()), mpCanvas, TQT_SLOT(stopLoading()));
+    connect(this, TQ_SIGNAL(hidden()), mpCanvas, TQ_SLOT(stopLoading()));
 
     static const char* const context_text[] = {
         I18N_NOOP( "Actions" ),
@@ -401,17 +401,16 @@ void TDEIconDialog::showIcons()
     else
 	filelist=mFileList;
 
-    TQSortedList <IconPath>iconlist;
-    iconlist.setAutoDelete(true);
+    std::list<IconPath> iconlist;
     TQStringList::Iterator it;
     for( it = filelist.begin(); it != filelist.end(); ++it )
-       iconlist.append(new IconPath(*it));
+       iconlist.push_back(IconPath(*it));
 
     iconlist.sort();
     filelist.clear();
 
-    for ( IconPath *ip=iconlist.first(); ip != 0; ip=iconlist.next() )
-       filelist.append(*ip);
+    for (const IconPath &ip : iconlist)
+       filelist.append(ip);
 
     d->searchLine->clear();
     mpCanvas->loadFiles(filelist);
@@ -679,7 +678,7 @@ void TDEIconButton::init( TDEIconLoader *loader )
 
     mpLoader = loader;
     mpDialog = 0L;
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon()));
 }
 
 TDEIconButton::~TDEIconButton()
@@ -723,7 +722,7 @@ void TDEIconButton::setIcon(const TQString& icon)
     if (!mpDialog)
     {
         mpDialog = new TDEIconDialog(mpLoader, this);
-        connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
+        connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&)));
     }
 
     if ( mbUser )
@@ -741,7 +740,7 @@ void TDEIconButton::slotChangeIcon()
     if (!mpDialog)
     {
         mpDialog = new TDEIconDialog(mpLoader, this);
-        connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&)));
+        connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&)));
     }
 
     mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser );
diff --git a/tdeio/tdefile/kicondialog.h b/tdeio/tdefile/kicondialog.h
index 7e7501eaf..1feb75dce 100644
--- a/tdeio/tdefile/kicondialog.h
+++ b/tdeio/tdefile/kicondialog.h
@@ -34,7 +34,7 @@ class TDEIconLoader;
  */
 class TDEIO_EXPORT TDEIconCanvas: public TDEIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEIconCanvas(TQWidget *parent=0L, const char *name=0L);
@@ -90,7 +90,7 @@ private:
  */
 class TDEIO_EXPORT TDEIconDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -256,7 +256,7 @@ private:
  */
 class TDEIO_EXPORT TDEIconButton: public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
     TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize)
     TQ_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize )
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index f96be72fc..140b2fded 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -43,7 +43,7 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
 
     imageLabel = new TQLabel( this );
     imageLabel->setFrameStyle( TQFrame::NoFrame );
-    imageLabel->setAlignment( Qt::AlignHCenter | Qt::AlignVCenter );
+    imageLabel->setAlignment( TQt::AlignHCenter | TQt::AlignVCenter );
     imageLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
     vb->addWidget( imageLabel );
 
@@ -53,14 +53,14 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent )
     autoPreview = new TQCheckBox( i18n("&Automatic preview"), this );
     autoPreview->setChecked( autoMode );
     hb->addWidget( autoPreview );
-    connect( autoPreview, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
+    connect( autoPreview, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) );
 
     previewButton = new KPushButton( SmallIconSet("thumbnail"), i18n("&Preview"), this );
     hb->addWidget( previewButton );
-    connect( previewButton, TQT_SIGNAL(clicked()), TQT_SLOT(showPreview()) );
+    connect( previewButton, TQ_SIGNAL(clicked()), TQ_SLOT(showPreview()) );
 
     timer = new TQTimer( this );
-    connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) );
+    connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(showPreview()) );
 
     setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() );
 }
@@ -109,14 +109,14 @@ void KImageFilePreview::showPreview( const KURL &url, bool force )
             if ( force ) // explicitly requested previews shall always be generated!
                 m_job->setIgnoreMaximumSize( true );
             
-            connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )),
-                     this, TQT_SLOT( slotResult( TDEIO::Job * )));
-            connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*,
+            connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )),
+                     this, TQ_SLOT( slotResult( TDEIO::Job * )));
+            connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*,
                                                 const TQPixmap& )),
-                     TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
+                     TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
 
-            connect( m_job, TQT_SIGNAL( failed( const KFileItem* )),
-                     this, TQT_SLOT( slotFailed( const KFileItem* ) ));
+            connect( m_job, TQ_SIGNAL( failed( const KFileItem* )),
+                     this, TQ_SLOT( slotFailed( const KFileItem* ) ));
 	}
     }
 }
diff --git a/tdeio/tdefile/kimagefilepreview.h b/tdeio/tdefile/kimagefilepreview.h
index 0604e08f0..984c1b476 100644
--- a/tdeio/tdefile/kimagefilepreview.h
+++ b/tdeio/tdefile/kimagefilepreview.h
@@ -30,7 +30,7 @@ namespace TDEIO { class Job; class PreviewJob; }
  */
 class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KImageFilePreview(TQWidget *parent);
diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index 21c75e0ce..88dff7415 100644
--- a/tdeio/tdefile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -150,7 +150,7 @@ void KFileMetaPropsPlugin::createLayout()
         if (itemList.isEmpty())
             continue;
 
-        TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, 
+        TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal, 
             TQStyleSheet::escape(mtinfo->groupInfo(*git)->translatedName()), 
             d->m_frame);
 
@@ -184,7 +184,7 @@ void KFileMetaPropsPlugin::createLayout()
             if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl;
             w = new KFileMetaInfoWidget(*iit, val, groupBox);
             d->m_editWidgets.append( w );
-            connect(w, TQT_SIGNAL(valueChanged(const TQVariant&)), this, TQT_SIGNAL(changed()));
+            connect(w, TQ_SIGNAL(valueChanged(const TQVariant&)), this, TQ_SIGNAL(changed()));
         }
 
         // and then the read only items
@@ -203,7 +203,7 @@ void KFileMetaPropsPlugin::createLayout()
 /*    d->m_add = new TQPushButton(i18n("&Add"), topframe);
     d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
                                         TQSizePolicy::Fixed));
-    connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd()));
+    connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd()));
     tmp->addWidget(d->m_add);
 
     // if nothing can be added, deactivate it
diff --git a/tdeio/tdefile/kmetaprops.h b/tdeio/tdefile/kmetaprops.h
index c842499dd..f0b37ecff 100644
--- a/tdeio/tdefile/kmetaprops.h
+++ b/tdeio/tdefile/kmetaprops.h
@@ -30,7 +30,7 @@ class KFileMetaInfoItem;
  */
 class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index 5d1aba62d..b4f4d9c7d 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -133,7 +133,7 @@ namespace KNotify
             TQHeader *header = static_cast<TQHeader*>( parentWidget() );
             int section = 0;
 
-            if ( header->orientation() == Qt::Horizontal )
+            if ( header->orientation() == TQt::Horizontal )
                 section= header->sectionAt( p.x() );
             else
                 section= header->sectionAt( p.y() );
@@ -170,8 +170,8 @@ KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal,
     if ( aboutData )
         addApplicationEvents( aboutData->appName() );
 
-    connect( this, TQT_SIGNAL( okClicked() ), m_notifyWidget, TQT_SLOT( save() ));
-    connect( this, TQT_SIGNAL( applyClicked() ), m_notifyWidget, TQT_SLOT( save() ));
+    connect( this, TQ_SIGNAL( okClicked() ), m_notifyWidget, TQ_SLOT( save() ));
+    connect( this, TQ_SIGNAL( applyClicked() ), m_notifyWidget, TQ_SLOT( save() ));
 }
 
 KNotifyDialog::~KNotifyDialog()
@@ -264,47 +264,47 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name,
     d->toolTip = new KNotifyToolTip( header );
 
     m_playButton->setIconSet( SmallIconSet( "media-playback-start" ) );
-    connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() ));
-
-    connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ),
-             TQT_SLOT( slotEventChanged( TQListViewItem * ) ));
-    connect( m_listview, TQT_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)),
-             TQT_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int )));
-
-    connect( m_playSound, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( soundToggled( bool )) );
-    connect( m_logToFile, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( loggingToggled( bool )) );
-    connect( m_execute, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( executeToggled( bool )) );
-    connect( m_messageBox, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( messageBoxChanged() ) );
-    connect( m_passivePopup, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( messageBoxChanged() ) );
-    connect( m_stderr, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( stderrToggled( bool ) ) );
-    connect( m_taskbar, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( taskbarToggled( bool ) ) );
-
-    connect( m_soundPath, TQT_SIGNAL( textChanged( const TQString& )),
-             TQT_SLOT( soundFileChanged( const TQString& )));
-    connect( m_logfilePath, TQT_SIGNAL( textChanged( const TQString& )),
-             TQT_SLOT( logfileChanged( const TQString& ) ));
-    connect( m_executePath, TQT_SIGNAL( textChanged( const TQString& )),
-             TQT_SLOT( commandlineChanged( const TQString& ) ));
-
-    connect( m_soundPath, TQT_SIGNAL( openFileDialog( KURLRequester * )),
-             TQT_SLOT( openSoundDialog( KURLRequester * )));
-    connect( m_logfilePath, TQT_SIGNAL( openFileDialog( KURLRequester * )),
-             TQT_SLOT( openLogDialog( KURLRequester * )));
-    connect( m_executePath, TQT_SIGNAL( openFileDialog( KURLRequester * )),
-             TQT_SLOT( openExecDialog( KURLRequester * )));
-
-    connect( m_extension, TQT_SIGNAL( clicked() ),
-             TQT_SLOT( toggleAdvanced()) );
-
-    connect( m_buttonEnable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() ));
-    connect( m_buttonDisable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() ));
+    connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() ));
+
+    connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ),
+             TQ_SLOT( slotEventChanged( TQListViewItem * ) ));
+    connect( m_listview, TQ_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)),
+             TQ_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int )));
+
+    connect( m_playSound, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( soundToggled( bool )) );
+    connect( m_logToFile, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( loggingToggled( bool )) );
+    connect( m_execute, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( executeToggled( bool )) );
+    connect( m_messageBox, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( messageBoxChanged() ) );
+    connect( m_passivePopup, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( messageBoxChanged() ) );
+    connect( m_stderr, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( stderrToggled( bool ) ) );
+    connect( m_taskbar, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( taskbarToggled( bool ) ) );
+
+    connect( m_soundPath, TQ_SIGNAL( textChanged( const TQString& )),
+             TQ_SLOT( soundFileChanged( const TQString& )));
+    connect( m_logfilePath, TQ_SIGNAL( textChanged( const TQString& )),
+             TQ_SLOT( logfileChanged( const TQString& ) ));
+    connect( m_executePath, TQ_SIGNAL( textChanged( const TQString& )),
+             TQ_SLOT( commandlineChanged( const TQString& ) ));
+
+    connect( m_soundPath, TQ_SIGNAL( openFileDialog( KURLRequester * )),
+             TQ_SLOT( openSoundDialog( KURLRequester * )));
+    connect( m_logfilePath, TQ_SIGNAL( openFileDialog( KURLRequester * )),
+             TQ_SLOT( openLogDialog( KURLRequester * )));
+    connect( m_executePath, TQ_SIGNAL( openFileDialog( KURLRequester * )),
+             TQ_SLOT( openExecDialog( KURLRequester * )));
+
+    connect( m_extension, TQ_SIGNAL( clicked() ),
+             TQ_SLOT( toggleAdvanced()) );
+
+    connect( m_buttonEnable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() ));
+    connect( m_buttonDisable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() ));
 
     TQString whatsThis = i18n("<qt>You may use the following macros<br>"
         "in the commandline:<br>"
@@ -851,8 +851,8 @@ Event * KNotifyWidget::currentEvent()
 void KNotifyWidget::openSoundDialog( KURLRequester *requester )
 {
     // only need to init this once
-    requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
-                           this, TQT_SLOT( openSoundDialog( KURLRequester * )));
+    requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )),
+                           this, TQ_SLOT( openSoundDialog( KURLRequester * )));
 
     KFileDialog *fileDialog = requester->fileDialog();
     fileDialog->setCaption( i18n("Select Sound File") );
@@ -887,8 +887,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester )
 void KNotifyWidget::openLogDialog( KURLRequester *requester )
 {
     // only need to init this once
-    requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
-                           this, TQT_SLOT( openLogDialog( KURLRequester * )));
+    requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )),
+                           this, TQ_SLOT( openLogDialog( KURLRequester * )));
 
     KFileDialog *fileDialog = requester->fileDialog();
     fileDialog->setCaption( i18n("Select Log File") );
@@ -900,8 +900,8 @@ void KNotifyWidget::openLogDialog( KURLRequester *requester )
 void KNotifyWidget::openExecDialog( KURLRequester *requester )
 {
     // only need to init this once
-    requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )),
-                           this, TQT_SLOT( openExecDialog( KURLRequester * )));
+    requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )),
+                           this, TQ_SLOT( openExecDialog( KURLRequester * )));
 
 
     KFileDialog *fileDialog = requester->fileDialog();
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index c8b5b21ac..fe6dcc6ba 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -51,7 +51,7 @@ namespace KNotify
  */
 class TDEIO_EXPORT KNotifyDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -188,7 +188,7 @@ namespace KNotify
      */
     class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         KNotifyWidget( TQWidget* parent = 0, const char* name = 0,
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 8124db5e5..527f53b51 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -157,10 +157,10 @@ TDEApplicationTree::TDEApplicationTree( TQWidget *parent )
     addDesktopGroup( TQString::null );
     cleanupTree();
 
-    connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ),
-            TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) );
-    connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ),
-            TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) );
+    connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ),
+            TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) );
+    connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ),
+            TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) );
 }
 
 // ----------------------------------------------------------------------
@@ -404,7 +404,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
   TQToolButton *clearButton = new TQToolButton( this );
   clearButton->setIconSet( BarIcon( "locationbar_erase" ) );
   clearButton->setFixedSize( clearButton->sizeHint() );
-  connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) );
+  connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) );
   TQToolTip::add( clearButton, i18n( "Clear input field" ) );
 
   hbox->addWidget( clearButton );
@@ -455,23 +455,23 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
     edit->comboBox()->setAutoDeleteCompletionObject( true );
   }
 
-  connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) );
-  connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) );
+  connect ( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOK()) );
+  connect ( edit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged()) );
 
   m_pTree = new TDEApplicationTree( this );
   topLayout->addWidget(m_pTree);
 
-  connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ),
-           TQT_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) );
-  connect( m_pTree, TQT_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ),
-           TQT_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) );
-  connect( m_pTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ),
-           TQT_SLOT( slotDbClick() ) );
+  connect( m_pTree, TQ_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ),
+           TQ_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) );
+  connect( m_pTree, TQ_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ),
+           TQ_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) );
+  connect( m_pTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ),
+           TQ_SLOT( slotDbClick() ) );
 
   terminal = new TQCheckBox( i18n("Run in &terminal"), this );
   if (bReadOnly)
      terminal->hide();
-  connect(terminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminalToggled(bool)));
+  connect(terminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminalToggled(bool)));
 
   topLayout->addWidget(terminal);
 
@@ -509,10 +509,10 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
 
   d->ok = b->addButton( KStdGuiItem::ok() );
   d->ok->setDefault( true );
-  connect(  d->ok, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOK() ) );
+  connect(  d->ok, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOK() ) );
 
   TQPushButton* cancel = b->addButton(  KStdGuiItem::cancel() );
-  connect(  cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) );
+  connect(  cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
 
   b->layout();
   topLayout->addWidget( b );
diff --git a/tdeio/tdefile/kopenwith.h b/tdeio/tdefile/kopenwith.h
index e0482b87a..99a047082 100644
--- a/tdeio/tdefile/kopenwith.h
+++ b/tdeio/tdefile/kopenwith.h
@@ -45,7 +45,7 @@ class KOpenWithDlgPrivate;
  */
 class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index 4f6d53107..ecdbdd6e6 100644
--- a/tdeio/tdefile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -73,7 +73,7 @@ protected:
  */
 class TDEApplicationTree : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEApplicationTree( TQWidget *parent );
 
diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index c45330893..d5288e822 100644
--- a/tdeio/tdefile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -54,7 +54,7 @@ void KPreviewPropsPlugin::createLayout()
     preview = new KFileMetaPreview(topframe);
 
     tmp->addWidget(preview) ;
-    connect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), TQT_SLOT( aboutToShowPage( TQWidget* ) ) );
+    connect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), TQ_SLOT( aboutToShowPage( TQWidget* ) ) );
 }
 
 KPreviewPropsPlugin::~KPreviewPropsPlugin()
@@ -79,10 +79,10 @@ bool KPreviewPropsPlugin::supports( KFileItemList _items )
 
 void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget )
 {
-    if ( TQT_TQOBJECT(widget) != TQT_TQOBJECT(preview->parent()) )
+    if ( widget != preview->parent() )
         return;
 
-    disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) );
+    disconnect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( aboutToShowPage( TQWidget* ) ) );
     preview->showPreview(properties->item()->url());
 }
 
diff --git a/tdeio/tdefile/kpreviewprops.h b/tdeio/tdefile/kpreviewprops.h
index d934af22a..4e7e5fbf3 100644
--- a/tdeio/tdefile/kpreviewprops.h
+++ b/tdeio/tdefile/kpreviewprops.h
@@ -31,7 +31,7 @@ class KFileMetaPreview;
  */
 class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdefile/kpreviewwidgetbase.h b/tdeio/tdefile/kpreviewwidgetbase.h
index 3597070ee..ba3fed7dd 100644
--- a/tdeio/tdefile/kpreviewwidgetbase.h
+++ b/tdeio/tdefile/kpreviewwidgetbase.h
@@ -43,7 +43,7 @@ class KURL;
  */
 class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index ae8aae85d..3796d96ad 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -135,7 +135,7 @@ extern "C" {
 
 #include "kpropertiesdialog.h"
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 # include <win32_utils.h>
 #endif
 
@@ -289,7 +289,7 @@ KPropertiesDialog::KPropertiesDialog (const KURL& _tempUrl, const KURL& _current
 bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent,
                                    const char* name, bool modal)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   TQString localPath = item->localPath();
   if (!localPath.isEmpty())
     return showWin32FilePropertyDialog(localPath);
@@ -301,7 +301,7 @@ bool KPropertiesDialog::showDialog(KFileItem* item, TQWidget* parent,
 bool KPropertiesDialog::showDialog(const KURL& _url, TQWidget* parent,
                                    const char* name, bool modal)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
   if (_url.isLocalFile())
     return showWin32FilePropertyDialog( _url.path() );
 #endif
@@ -372,8 +372,8 @@ KPropertiesDialog::~KPropertiesDialog()
 
 void KPropertiesDialog::insertPlugin (KPropsDlgPlugin* plugin)
 {
-  connect (plugin, TQT_SIGNAL (changed ()),
-           plugin, TQT_SLOT (setDirty ()));
+  connect (plugin, TQ_SIGNAL (changed ()),
+           plugin, TQ_SLOT (setDirty ()));
 
   m_pageList.append (plugin);
 }
@@ -529,7 +529,7 @@ void KPropertiesDialog::insertPages()
   {
     KPropsDlgPlugin *plugin = KParts::ComponentFactory
         ::createInstanceFromLibrary<KPropsDlgPlugin>( (*it)->library().local8Bit().data(),
-                                                      TQT_TQOBJECT(this),
+                                                      this,
                                                       (*it)->name().latin1() );
     if ( !plugin )
         continue;
@@ -754,7 +754,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
   grid->setColStretch(1, 0);
   grid->setColStretch(2, 1);
   grid->addColSpacing(1, KDialog::spacingHint());
-  vbl->addLayout(TQT_TQLAYOUT(grid));
+  vbl->addLayout(grid);
   int curRow = 0;
 
   if ( !d->bMultiple )
@@ -890,8 +890,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     }
     iconButton->setIcon(iconStr);
     iconArea = iconButton;
-    connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ),
-             this, TQT_SLOT( slotIconChanged() ) );
+    connect( iconButton, TQ_SIGNAL( iconChanged(TQString) ),
+             this, TQ_SLOT( slotIconChanged() ) );
   } else {
     TQLabel *iconLabel = new TQLabel( d->m_frame );
     int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin);
@@ -906,7 +906,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     }
     iconArea = iconLabel;
   }
-  grid->addWidget(iconArea, curRow, 0, Qt::AlignLeft);
+  grid->addWidget(iconArea, curRow, 0, TQt::AlignLeft);
 
   if (d->bMultiple || isTrash || isDevice || isMediaNode || hasRoot)
   {
@@ -935,8 +935,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
         d->m_lined->setSelection(0, lastDot);
     }
 
-    connect( d->m_lined, TQT_SIGNAL( textChanged( const TQString & ) ),
-             this, TQT_SLOT( nameFileChanged(const TQString & ) ) );
+    connect( d->m_lined, TQ_SIGNAL( textChanged( const TQString & ) ),
+             this, TQ_SLOT( nameFileChanged(const TQString & ) ) );
   }
 
   grid->addWidget(nameArea, curRow++, 2);
@@ -956,7 +956,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     box->setSpacing(20);
     l = new TQLabel(mimeComment, box );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     //TODO: wrap for win32 or mac?
     TQPushButton *button = new TQPushButton(box);
 
@@ -969,7 +969,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     else
        TQToolTip::add(button, i18n("Edit file type"));
 
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() ));
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() ));
 
     if (!kapp->authorizeTDEAction("editfiletype"))
        button->hide();
@@ -1024,14 +1024,14 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     // buttons
     m_sizeDetermineButton = new TQPushButton( i18n("Calculate"), d->m_frame );
     m_sizeStopButton = new TQPushButton( i18n("Stop"), d->m_frame );
-    connect( m_sizeDetermineButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeDetermine() ) );
-    connect( m_sizeStopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeStop() ) );
+    connect( m_sizeDetermineButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeDetermine() ) );
+    connect( m_sizeStopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeStop() ) );
     sizelay->addWidget(m_sizeDetermineButton, 0);
     sizelay->addWidget(m_sizeStopButton, 0);
     sizelay->addStretch(10); // so that the buttons don't grow horizontally
 
-    // auto-launch for local dirs only, and not for '/'
-    if ( isLocal && !hasRoot )
+    // auto-launch for local dirs only, but not for '/' or medias
+    if ( isReallyLocal && !hasRoot )
     {
       m_sizeDetermineButton->setText( i18n("Refresh") );
       slotSizeDetermine();
@@ -1110,9 +1110,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
     grid->addWidget( d->m_freeSpaceLabel, curRow++, 2 );
 
     KDiskFreeSp * job = new KDiskFreeSp;
-    connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
+    connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
              const unsigned long&, const TQString& ) ),
-             this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
+             this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
           const unsigned long&, const TQString& ) ) );
     job->readDF( mountPoint );
   }
@@ -1142,7 +1142,7 @@ void KFilePropsPlugin::setFileNameReadOnly( bool ro )
 
 void KFilePropsPlugin::slotEditFileType()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   TQString mime;
   if ( d->mimeType == KMimeType::defaultMimeType() ) {
     int pos = d->oldFileName.findRev( '.' );
@@ -1274,11 +1274,11 @@ void KFilePropsPlugin::slotSizeDetermine()
   kdDebug(250) << " URL=" << properties->item()->url().url() << endl;
   d->dirSizeJob = KDirSize::dirSizeJob( properties->items() );
   d->dirSizeUpdateTimer = new TQTimer(this);
-  connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ),
-           TQT_SLOT( slotDirSizeUpdate() ) );
+  connect( d->dirSizeUpdateTimer, TQ_SIGNAL( timeout() ),
+           TQ_SLOT( slotDirSizeUpdate() ) );
   d->dirSizeUpdateTimer->start(500);
-  connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
+  connect( d->dirSizeJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) );
   m_sizeStopButton->setEnabled(true);
   m_sizeDetermineButton->setEnabled(false);
 
@@ -1291,9 +1291,9 @@ void KFilePropsPlugin::slotSizeDetermine()
     TQString mountPoint = TDEIO::findPathMountPoint( url.path() );
 
     KDiskFreeSp * job = new KDiskFreeSp;
-    connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
+    connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
              const unsigned long&, const TQString& ) ),
-             this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
+             this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
           const unsigned long&, const TQString& ) ) );
     job->readDF( mountPoint );
   }
@@ -1336,7 +1336,7 @@ void KFilePropsPlugin::applyChanges()
 
   kdDebug(250) << "KFilePropsPlugin::applyChanges" << endl;
 
-  if (nameArea->inherits(TQLINEEDIT_OBJECT_NAME_STRING))
+  if (nameArea->inherits("TQLineEdit"))
   {
     TQString n = ((TQLineEdit *) nameArea)->text();
     // Remove trailing spaces (#4345)
@@ -1379,10 +1379,10 @@ void KFilePropsPlugin::applyChanges()
         job = TDEIO::copy( oldurl, properties->kurl() );
       }
 
-      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-               TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
-      connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
-               TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
+      connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+               TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) );
+      connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ),
+               TQ_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) );
       // wait for job
       TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
       tqt_enter_modal(&dummy);
@@ -1450,7 +1450,7 @@ void KFilePropsPlugin::slotCopyFinished( TDEIO::Job * job )
 
 void KFilePropsPlugin::applyIconChanges()
 {
-  TDEIconButton *iconButton = ::tqqt_cast<TDEIconButton *>( iconArea );
+  TDEIconButton *iconButton = ::tqt_cast<TDEIconButton *>( iconArea );
   if ( !iconButton || !d->bIconChanged )
     return;
   // handle icon changes - only local files (or pseudo-local) for now
@@ -1676,7 +1676,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   TQPushButton* pbAdvancedPerm = 0;
 
   /* Group: Access Permissions */
-  gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), d->m_frame );
+  gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), d->m_frame );
   gb->layout()->setSpacing(KDialog::spacingHint());
   gb->layout()->setMargin(KDialog::marginHint());
   box->addWidget (gb);
@@ -1698,7 +1698,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   l = d->ownerPermCombo = new TQComboBox(gb);
   lbl->setBuddy(l);
   gl->addWidget(l, 1, 1);
-  connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() ));
+  connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() ));
   TQWhatsThis::add(l, i18n("Specifies the actions that the owner is allowed to do."));
 
   lbl = new TQLabel( i18n("Gro&up:"), gb);
@@ -1706,7 +1706,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   l = d->groupPermCombo = new TQComboBox(gb);
   lbl->setBuddy(l);
   gl->addWidget(l, 2, 1);
-  connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() ));
+  connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() ));
   TQWhatsThis::add(l, i18n("Specifies the actions that the members of the group are allowed to do."));
 
   lbl = new TQLabel( i18n("O&thers:"), gb);
@@ -1714,7 +1714,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   l = d->othersPermCombo = new TQComboBox(gb);
   lbl->setBuddy(l);
   gl->addWidget(l, 3, 1);
-  connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() ));
+  connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() ));
   TQWhatsThis::add(l, i18n("Specifies the actions that all users, who are neither "
 			  "owner nor in the group, are allowed to do."));
 
@@ -1723,7 +1723,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 					 i18n("Only own&er can rename and delete folder content") :
 					 i18n("Is &executable"),
 					 gb );
-    connect( d->extraCheckbox, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) );
+    connect( d->extraCheckbox, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) );
     gl->addWidget(l, 4, 1);
     TQWhatsThis::add(l, hasDir ? i18n("Enable this option to allow only the folder's owner to "
 				     "delete or rename the contained files and folders. Other "
@@ -1733,19 +1733,19 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
 			   "sense for programs and scripts. It is required when you want to "
 			   "execute them."));
 
-    TQLayoutItem *spacer = TQT_TQLAYOUTITEM(new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
+    TQLayoutItem *spacer = new TQSpacerItem(0, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding);
     gl->addMultiCell(spacer, 5, 5, 0, 1);
 
     pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb);
-    gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, Qt::AlignRight);
-    connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() ));
+    gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight);
+    connect(pbAdvancedPerm, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowAdvancedPermissions() ));
   }
   else
     d->extraCheckbox = 0;
 
 
   /**** Group: Ownership ****/
-  gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Ownership"), d->m_frame );
+  gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Ownership"), d->m_frame );
   gb->layout()->setSpacing(KDialog::spacingHint());
   gb->layout()->setMargin(KDialog::marginHint());
   box->addWidget (gb);
@@ -1781,8 +1781,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
                                TDEGlobalSettings::CompletionNone);
     usrEdit->setText(strOwner);
     gl->addWidget(usrEdit, 1, 1);
-    connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-             this, TQT_SIGNAL( changed() ) );
+    connect( usrEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+             this, TQ_SIGNAL( changed() ) );
   }
   else
   {
@@ -1863,8 +1863,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
     grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto);
     grpEdit->setText(strGroup);
     gl->addWidget(grpEdit, 2, 1);
-    connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-             this, TQT_SIGNAL( changed() ) );
+    connect( grpEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+             this, TQ_SIGNAL( changed() ) );
   }
   else if ((groupList.count() > 1) && isMyFile && isLocal)
   {
@@ -1872,8 +1872,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
     grpCombo->insertStringList(groupList);
     grpCombo->setCurrentItem(groupList.findIndex(strGroup));
     gl->addWidget(grpCombo, 2, 1);
-    connect( grpCombo, TQT_SIGNAL( activated( int ) ),
-             this, TQT_SIGNAL( changed() ) );
+    connect( grpCombo, TQ_SIGNAL( activated( int ) ),
+             this, TQ_SIGNAL( changed() ) );
   }
   else
   {
@@ -1887,7 +1887,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr
   if ( hasDir && !isLink && !isTrash  )
   {
       d->cbRecursive = new TQCheckBox( i18n("Apply changes to all subfolders and their contents"), d->m_frame );
-      connect( d->cbRecursive, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) );
+      connect( d->cbRecursive, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) );
       box->addWidget( d->cbRecursive );
   }
 
@@ -1941,7 +1941,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
   TQVBox *mainVBox = dlg.makeVBoxMainWidget();
 
   // Group: Access Permissions
-  gb = new TQGroupBox ( 0, Qt::Vertical, i18n("Access Permissions"), mainVBox );
+  gb = new TQGroupBox ( 0, TQt::Vertical, i18n("Access Permissions"), mainVBox );
   gb->layout()->setSpacing(KDialog::spacingHint());
   gb->layout()->setMargin(KDialog::marginHint());
 
@@ -2093,16 +2093,19 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
       if ( col != 3 ) theNotSpecials.append( cb );
       cba[row][col] = cb;
       cb->setChecked(aPermissions & fperm[row][col]);
+      if ( d->canChangePermissions )
+      {
+        allDisable = false;
+      }
       if ( aPartialPermissions & fperm[row][col] )
       {
         cb->setTristate();
-        if( d->canChangePermissions ) {
-          allDisable = false;
-        }
         cb->setNoChange();
       }
       else if (d->cbRecursive && d->cbRecursive->isChecked())
-	cb->setTristate();
+      {
+        cb->setTristate();
+      }
 
       cb->setEnabled( d->canChangePermissions );
       gl->addWidget (cb, row+2, col+1);
@@ -2143,7 +2146,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
       d->fileSystemSupportsACLs = fileSystemSupportsACL( pathCString );
   }
   if ( d->fileSystemSupportsACLs  ) {
-    std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fun( &TQWidget::hide ) );
+    std::for_each( theNotSpecials.begin(), theNotSpecials.end(), std::mem_fn( &TQWidget::hide ) );
     extendedACLs = new KACLEditWidget( mainVBox );
     if ( d->extendedACL.isValid() && d->extendedACL.isExtended() )
       extendedACLs->setACL( d->extendedACL );
@@ -2550,8 +2553,8 @@ void KFilePermissionsPropsPlugin::applyChanges()
     if ( defaultACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
 
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-        TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+        TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) );
     // Wait for job
     TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
     tqt_enter_modal(&dummy);
@@ -2566,8 +2569,8 @@ void KFilePermissionsPropsPlugin::applyChanges()
     if ( defaultACLChange && d->fileSystemSupportsACLs )
       job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" );
 
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-        TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+        TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) );
     // Wait for job
     TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal));
     tqt_enter_modal(&dummy);
@@ -2638,8 +2641,8 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props )
     URLEdit->setURL( URLStr );
   }
 
-  connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
+  connect( URLEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
 
   layout->addStretch (1);
 }
@@ -2795,14 +2798,14 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl
   else
       cbAutoEmbed->setNoChange();
 
-  connect( patternEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( mimeEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( cbAutoEmbed, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
+  connect( patternEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( mimeEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( cbAutoEmbed, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
 }
 
 KBindingPropsPlugin::~KBindingPropsPlugin()
@@ -2921,8 +2924,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
   device = new TQComboBox( true, d->m_frame, "ComboBox_device" );
   device->insertStringList( devices );
   layout->addWidget(device, 0, 1);
-  connect( device, TQT_SIGNAL( activated( int ) ),
-           this, TQT_SLOT( slotActivated( int ) ) );
+  connect( device, TQ_SIGNAL( activated( int ) ),
+           this, TQ_SLOT( slotActivated( int ) ) );
 
   readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" );
   readonly->setText(  i18n("Read only") );
@@ -3015,17 +3018,17 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP
 
   unmounted->setIcon( unmountedStr );
 
-  connect( device, TQT_SIGNAL( activated( int ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( device, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( readonly, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( unmounted, TQT_SIGNAL( iconChanged( TQString ) ),
-           this, TQT_SIGNAL( changed() ) );
+  connect( device, TQ_SIGNAL( activated( int ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( device, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( readonly, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( unmounted, TQ_SIGNAL( iconChanged( TQString ) ),
+           this, TQ_SIGNAL( changed() ) );
 
-  connect( device, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SLOT( slotDeviceChanged() ) );
+  connect( device, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SLOT( slotDeviceChanged() ) );
 
   processLockouts();
 }
@@ -3062,9 +3065,9 @@ void KDevicePropsPlugin::updateInfo()
   if ( !mountpoint->text().isEmpty() )
   {
     KDiskFreeSp * job = new KDiskFreeSp;
-    connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
+    connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&,
                                            const unsigned long&, const TQString& ) ),
-             this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
+             this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&,
                                               const unsigned long&, const TQString& ) ) );
 
     job->readDF( mountpoint->text() );
@@ -3184,16 +3187,16 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
   w->pathEdit->setMode(KFile::Directory | KFile::LocalOnly);
   w->pathEdit->lineEdit()->setAcceptDrops(false);
 
-  connect( w->nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
-  connect( w->genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
-  connect( w->commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
-  connect( w->commandEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
-  connect( w->pathEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) );
+  connect( w->nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+  connect( w->genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+  connect( w->commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+  connect( w->commandEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
+  connect( w->pathEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) );
 
-  connect( w->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) );
-  connect( w->addFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFiletype() ) );
-  connect( w->delFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelFiletype() ) );
-  connect( w->advancedButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) );
+  connect( w->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) );
+  connect( w->addFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFiletype() ) );
+  connect( w->delFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelFiletype() ) );
+  connect( w->advancedButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdvanced() ) );
 
   // now populate the page
   TQString path = _props->kurl().path();
@@ -3310,10 +3313,10 @@ void KDesktopPropsPlugin::slotAddFiletype()
      mw->listView->setFullWidth(true);
      mw->listView->setMinimumSize(500,400);
 
-     connect(mw->listView, TQT_SIGNAL(selectionChanged()),
-             this, TQT_SLOT(slotSelectMimetype()));
-     connect(mw->listView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )),
-             &dlg, TQT_SLOT( slotOk()));
+     connect(mw->listView, TQ_SIGNAL(selectionChanged()),
+             this, TQ_SLOT(slotSelectMimetype()));
+     connect(mw->listView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )),
+             &dlg, TQ_SLOT( slotOk()));
 
      TQMap<TQString,TQListViewItem*> majorMap;
      TQListViewItem *majorGroup;
@@ -3574,22 +3577,22 @@ void KDesktopPropsPlugin::slotAdvanced()
     delete kcom;
   }
 
-  connect( w->terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->terminalCloseCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->terminalCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->suidCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->startupInfoCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->systrayCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( w->dcopCombo, TQT_SIGNAL( highlighted( int ) ),
-           this, TQT_SIGNAL( changed() ) );
+  connect( w->terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->terminalCloseCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->terminalCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->suidCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->startupInfoCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->systrayCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( w->dcopCombo, TQ_SIGNAL( highlighted( int ) ),
+           this, TQ_SIGNAL( changed() ) );
 
   if ( dlg.exec() == TQDialog::Accepted )
   {
@@ -3699,7 +3702,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   // The groupbox about swallowing
   TQGroupBox* tmpQGroupBox;
   tmpQGroupBox = new TQGroupBox( i18n("Panel Embedding"), d->m_frame );
-  tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
+  tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
 
   mainlayout->addWidget(tmpQGroupBox);
 
@@ -3726,7 +3729,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   // The groupbox about run in terminal
 
   tmpQGroupBox = new TQGroupBox( d->m_frame );
-  tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
+  tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
 
   mainlayout->addWidget(tmpQGroupBox);
 
@@ -3765,7 +3768,7 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
   // The groupbox about run with substituted uid.
 
   tmpQGroupBox = new TQGroupBox( d->m_frame );
-  tmpQGroupBox->setColumnLayout( 0, Qt::Horizontal );
+  tmpQGroupBox->setColumnLayout( 0, TQt::Horizontal );
 
   mainlayout->addWidget(tmpQGroupBox);
 
@@ -3848,27 +3851,27 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
     delete kcom;
   }
 
-  connect( swallowExecEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( swallowTitleEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( execEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
+  connect( swallowExecEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( swallowTitleEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( execEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
   if (d->nocloseonexitCheck)
-    connect( d->nocloseonexitCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( terminalCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( suidCheck, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-
-  connect( execBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) );
-  connect( terminalCheck, TQT_SIGNAL( clicked() ), this,  TQT_SLOT( enableCheckedEdit() ) );
-  connect( suidCheck, TQT_SIGNAL( clicked() ), this,  TQT_SLOT( enableSuidEdit() ) );
+    connect( d->nocloseonexitCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( terminalCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( suidCheck, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+
+  connect( execBrowse, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) );
+  connect( terminalCheck, TQ_SIGNAL( clicked() ), this,  TQ_SLOT( enableCheckedEdit() ) );
+  connect( suidCheck, TQ_SIGNAL( clicked() ), this,  TQ_SLOT( enableSuidEdit() ) );
 
 }
 
@@ -3985,21 +3988,21 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
   addExtensionButton->setIconSet( iconSet );
   pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
   addExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
-  connect( addExtensionButton, TQT_SIGNAL( clicked() ),
-            TQT_SLOT( slotAddExtension() ) );
+  connect( addExtensionButton, TQ_SIGNAL( clicked() ),
+            TQ_SLOT( slotAddExtension() ) );
 
   delExtensionButton = new TQPushButton( TQString::null, d->m_frame );
   iconSet = SmallIconSet( "forward" );
   delExtensionButton->setIconSet( iconSet );
   delExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
-  connect( delExtensionButton, TQT_SIGNAL( clicked() ),
-            TQT_SLOT( slotDelExtension() ) );
+  connect( delExtensionButton, TQ_SIGNAL( clicked() ),
+            TQ_SLOT( slotDelExtension() ) );
 
   TQLabel *l;
 
   TQGridLayout *grid = new TQGridLayout(2, 2);
   grid->setColStretch(1, 1);
-  toplayout->addLayout(TQT_TQLAYOUT(grid));
+  toplayout->addLayout(grid);
 
   if ( d->m_kdesktopMode )
   {
@@ -4035,7 +4038,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
   grid->setColStretch(2, 1);
   grid->setRowStretch( 0, 1 );
   grid->setRowStretch( 3, 1 );
-  toplayout->addLayout(TQT_TQLAYOUT(grid), 2);
+  toplayout->addLayout(grid, 2);
 
   extensionsList = new TQListBox( d->m_frame );
   extensionsList->setSelectionMode( TQListBox::Extended );
@@ -4089,26 +4092,26 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
 
   updateButton();
 
-  connect( extensionsList, TQT_SIGNAL( highlighted( int ) ),
-           this, TQT_SLOT( updateButton() ) );
-  connect( availableExtensionsList, TQT_SIGNAL( highlighted( int ) ),
-           this, TQT_SLOT( updateButton() ) );
+  connect( extensionsList, TQ_SIGNAL( highlighted( int ) ),
+           this, TQ_SLOT( updateButton() ) );
+  connect( availableExtensionsList, TQ_SIGNAL( highlighted( int ) ),
+           this, TQ_SLOT( updateButton() ) );
 
-  connect( addExtensionButton, TQT_SIGNAL( clicked() ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( delExtensionButton, TQT_SIGNAL( clicked() ),
-           this, TQT_SIGNAL( changed() ) );
+  connect( addExtensionButton, TQ_SIGNAL( clicked() ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( delExtensionButton, TQ_SIGNAL( clicked() ),
+           this, TQ_SIGNAL( changed() ) );
   if ( nameEdit )
-      connect( nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-               this, TQT_SIGNAL( changed() ) );
-  connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( availableExtensionsList, TQT_SIGNAL( selected( int ) ),
-           this, TQT_SIGNAL( changed() ) );
-  connect( extensionsList, TQT_SIGNAL( selected( int ) ),
-           this, TQT_SIGNAL( changed() ) );
+      connect( nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+               this, TQ_SIGNAL( changed() ) );
+  connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( availableExtensionsList, TQ_SIGNAL( selected( int ) ),
+           this, TQ_SIGNAL( changed() ) );
+  connect( extensionsList, TQ_SIGNAL( selected( int ) ),
+           this, TQ_SIGNAL( changed() ) );
 }
 
 TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin()
diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h
index 2ff0c576d..cc1f75b86 100644
--- a/tdeio/tdefile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@@ -69,7 +69,7 @@ namespace TDEIO { class Job; }
  */
 class TDEIO_EXPORT KPropertiesDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -436,7 +436,7 @@ private:
  */
 class TDEIO_EXPORT KPropsDlgPlugin : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -494,7 +494,7 @@ private:
  */
 class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -570,7 +570,7 @@ private:
  */
 class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   enum PermissionsMode {
     PermissionsOnlyFiles = 0,
@@ -656,7 +656,7 @@ private:
  */
 class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -691,7 +691,7 @@ private:
  */
 class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -721,7 +721,7 @@ private:
  */
 class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDevicePropsPlugin( KPropertiesDialog *_props );
   virtual ~KDevicePropsPlugin();
@@ -774,7 +774,7 @@ class KPropertiesDesktopBase;
  */
 class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -825,7 +825,7 @@ private:
  /// Remove in KDE4
 class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -881,7 +881,7 @@ private:
  /// Remove in KDE4
 class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 3912aced3..fa6d8ea47 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -377,7 +377,7 @@ KURLBarItem * KURLBar::insertDynamicItem(const KURL& url, const TQString& descri
     return item;
 }
 
-void KURLBar::setOrientation( Qt::Orientation orient )
+void KURLBar::setOrientation( TQt::Orientation orient )
 {
     m_listBox->setOrientation( orient );
     setSizePolicy( TQSizePolicy( isVertical() ?
@@ -388,7 +388,7 @@ void KURLBar::setOrientation( Qt::Orientation orient )
                                 TQSizePolicy::Maximum ));
 }
 
-Qt::Orientation KURLBar::orientation() const
+TQt::Orientation KURLBar::orientation() const
 {
     return m_listBox->orientation();
 }
@@ -399,7 +399,7 @@ void KURLBar::setListBox( KURLBarListBox *view )
 
     if ( !view ) {
         m_listBox = new KURLBarListBox( this, "urlbar listbox" );
-        setOrientation( Qt::Vertical );
+        setOrientation( TQt::Vertical );
     }
     else {
         m_listBox = view;
@@ -410,17 +410,17 @@ void KURLBar::setListBox( KURLBarListBox *view )
 
     m_listBox->setSelectionMode( TDEListBox::Single );
     paletteChange( palette() );
-    m_listBox->setFocusPolicy( TQ_TabFocus );
+    m_listBox->setFocusPolicy( TQWidget::TabFocus );
 
-    connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ),
-             TQT_SLOT( slotSelected( int, TQListBoxItem * )));
-    connect( m_listBox, TQT_SIGNAL( dropped( TQDropEvent * )),
-             this, TQT_SLOT( slotDropped( TQDropEvent * )));
-    connect( m_listBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *,
+    connect( m_listBox, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ),
+             TQ_SLOT( slotSelected( int, TQListBoxItem * )));
+    connect( m_listBox, TQ_SIGNAL( dropped( TQDropEvent * )),
+             this, TQ_SLOT( slotDropped( TQDropEvent * )));
+    connect( m_listBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *,
                                                       const TQPoint& )),
-             TQT_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& )));
-    connect( m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
-             TQT_SLOT( slotSelected( TQListBoxItem * ) ));
+             TQ_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& )));
+    connect( m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ),
+             TQ_SLOT( slotSelected( TQListBoxItem * ) ));
 }
 
 void KURLBar::setIconSize( int size )
@@ -455,12 +455,12 @@ void KURLBar::resizeEvent( TQResizeEvent *e )
 void KURLBar::paletteChange( const TQPalette & )
 {
     TQPalette pal = palette();
-    TQColor gray = pal.color( TQPalette::Normal, TQColorGroup::Background );
-    TQColor selectedTextColor = pal.color( TQPalette::Normal, TQColorGroup::BrightText );
-    TQColor foreground = pal.color( TQPalette::Normal, TQColorGroup::Foreground );
-    pal.setColor( TQPalette::Normal,   TQColorGroup::Base, gray );
-    pal.setColor( TQPalette::Normal,   TQColorGroup::HighlightedText, selectedTextColor );
-    pal.setColor( TQPalette::Normal,   TQColorGroup::Text, foreground );
+    TQColor gray = pal.color( TQPalette::Active, TQColorGroup::Background );
+    TQColor selectedTextColor = pal.color( TQPalette::Active, TQColorGroup::BrightText );
+    TQColor foreground = pal.color( TQPalette::Active, TQColorGroup::Foreground );
+    pal.setColor( TQPalette::Active,   TQColorGroup::Base, gray );
+    pal.setColor( TQPalette::Active,   TQColorGroup::HighlightedText, selectedTextColor );
+    pal.setColor( TQPalette::Active,   TQColorGroup::Text, foreground );
     pal.setColor( TQPalette::Inactive, TQColorGroup::Base, gray );
     pal.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, selectedTextColor );
     pal.setColor( TQPalette::Inactive, TQColorGroup::Text, foreground );
@@ -520,7 +520,7 @@ TQSize KURLBar::minimumSizeHint() const
 
 void KURLBar::slotSelected( int button, TQListBoxItem *item )
 {
-    if ( button != Qt::LeftButton )
+    if ( button != TQt::LeftButton )
         return;
 
     slotSelected( item );
@@ -877,9 +877,9 @@ void KURLBarListBox::contextMenuEvent( TQContextMenuEvent *e )
     }
 }
 
-void KURLBarListBox::setOrientation( Qt::Orientation orient )
+void KURLBarListBox::setOrientation( TQt::Orientation orient )
 {
-    if ( orient == Qt::Vertical ) {
+    if ( orient == TQt::Vertical ) {
         setColumnMode( 1 );
         setRowMode( Variable );
     }
@@ -985,7 +985,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url,
     }
     else
         m_appLocal = 0L;
-    connect(m_urlEdit->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(urlChanged(const TQString & )));
+    connect(m_urlEdit->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(urlChanged(const TQString & )));
     m_edit->setFocus();
     setMainWidget( box );
 }
diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 4939fa830..6fec32ee3 100644
--- a/tdeio/tdefile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -229,7 +229,7 @@ class KURLBarListBox;
  */
 class TDEIO_EXPORT KURLBar : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -277,7 +277,7 @@ public:
      * horizontally in one row.
      * @see orientation
      */
-    virtual void setOrientation( Qt::Orientation orient );
+    virtual void setOrientation( TQt::Orientation orient );
     /**
      * @returns the current orientation mode.
      * @see setOrientation
@@ -382,7 +382,7 @@ public:
     /**
      * @returns true if the bar is in vertical mode.
      */
-    bool isVertical() const { return orientation() == Qt::Vertical; }
+    bool isVertical() const { return orientation() == TQt::Vertical; }
 
 public slots:
     /**
@@ -492,7 +492,7 @@ class KURLBarToolTip;
  */
 class TDEIO_EXPORT KURLBarListBox : public TDEListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -510,14 +510,14 @@ public:
      * column.
      * @see orientation
      */
-    virtual void setOrientation( Qt::Orientation orient );
+    virtual void setOrientation( TQt::Orientation orient );
     /**
      * @returns the current orientation.
      * @see setOrientation
      */
-    Qt::Orientation orientation() const { return m_orientation; }
+    TQt::Orientation orientation() const { return m_orientation; }
 
-    bool isVertical() const { return m_orientation == Qt::Vertical; }
+    bool isVertical() const { return m_orientation == TQt::Vertical; }
 
 signals:
     /**
@@ -537,7 +537,7 @@ protected:
     virtual void paintEvent( TQPaintEvent* );
 
 private:
-    Qt::Orientation m_orientation;
+    TQt::Orientation m_orientation;
     KURLBarToolTip *m_toolTip;
 
 protected:
@@ -566,7 +566,7 @@ class KURLRequester;
  */
 class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index 66fe8efb8..f19dbe961 100644
--- a/tdeio/tdefile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
@@ -74,7 +74,7 @@ void KURLComboBox::init( Mode mode )
 
     opendirPix = SmallIcon(TQString::fromLatin1("folder_open"));
 
-    connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int )));
+    connect( this, TQ_SIGNAL( activated( int )), TQ_SLOT( slotActivated( int )));
 }
 
 
diff --git a/tdeio/tdefile/kurlcombobox.h b/tdeio/tdefile/kurlcombobox.h
index a1fd9182d..791d96a8e 100644
--- a/tdeio/tdefile/kurlcombobox.h
+++ b/tdeio/tdefile/kurlcombobox.h
@@ -40,7 +40,7 @@
  */
 class TDEIO_EXPORT KURLComboBox : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true)
     TQ_PROPERTY(int maxItems READ maxItems WRITE setMaxItems DESIGNABLE true)
 
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 64e25b93c..aa88c34b7 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -112,16 +112,16 @@ public:
     void connectSignals( TQObject *receiver ) {
 	TQObject *sender;
 	if ( combo )
-	    sender = TQT_TQOBJECT(combo);
+	    sender = combo;
 	else
-	    sender = TQT_TQOBJECT(edit);
-
-	connect( sender, TQT_SIGNAL( textChanged( const TQString& )),
-		 receiver, TQT_SIGNAL( textChanged( const TQString& )));
-	connect( sender, TQT_SIGNAL( returnPressed() ),
-		 receiver, TQT_SIGNAL( returnPressed() ));
-	connect( sender, TQT_SIGNAL( returnPressed( const TQString& ) ),
-		 receiver, TQT_SIGNAL( returnPressed( const TQString& ) ));
+	    sender = edit;
+
+	connect( sender, TQ_SIGNAL( textChanged( const TQString& )),
+		 receiver, TQ_SIGNAL( textChanged( const TQString& )));
+	connect( sender, TQ_SIGNAL( returnPressed() ),
+		 receiver, TQ_SIGNAL( returnPressed() ));
+	connect( sender, TQ_SIGNAL( returnPressed( const TQString& ) ),
+		 receiver, TQ_SIGNAL( returnPressed( const TQString& ) ));
     }
 
     void setCompletionObject( TDECompletion *comp ) {
@@ -212,7 +212,7 @@ void KURLRequester::init()
     myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
     TQToolTip::add(myButton, i18n("Open file dialog"));
 
-    connect( myButton, TQT_SIGNAL( pressed() ), TQT_SLOT( slotUpdateURL() ));
+    connect( myButton, TQ_SIGNAL( pressed() ), TQ_SLOT( slotUpdateURL() ));
 
     setSpacing( KDialog::spacingHint() );
 
@@ -220,14 +220,14 @@ void KURLRequester::init()
     widget->installEventFilter( this );
     setFocusProxy( widget );
 
-    d->connectSignals( TQT_TQOBJECT(this) );
-    connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() ));
+    d->connectSignals( this );
+    connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenDialog() ));
 
     myCompletion = new KURLCompletion();
     d->setCompletionObject( myCompletion );
 
     TDEAccel *accel = new TDEAccel( this );
-    accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( slotOpenDialog() ));
+    accel->insert( TDEStdAccel::Open, this, TQ_SLOT( slotOpenDialog() ));
     accel->readSettings();
 }
 
@@ -386,7 +386,7 @@ void KURLRequester::slotUpdateURL()
 
 bool KURLRequester::eventFilter( TQObject *obj, TQEvent *ev )
 {
-    if ( ( TQT_BASE_OBJECT(d->edit) == TQT_BASE_OBJECT(obj) ) || ( TQT_BASE_OBJECT(d->combo) == TQT_BASE_OBJECT(obj) ) )
+    if ( ( d->edit == obj ) || ( d->combo == obj ) )
     {
         if (( ev->type() == TQEvent::FocusIn ) || ( ev->type() == TQEvent::FocusOut ))
             // Forward focusin/focusout events to the urlrequester; needed by file form element in tdehtml
diff --git a/tdeio/tdefile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h
index 5655efa5b..6ed9e8d37 100644
--- a/tdeio/tdefile/kurlrequester.h
+++ b/tdeio/tdefile/kurlrequester.h
@@ -55,7 +55,7 @@ class TQTimer;
  */
 class TDEIO_EXPORT KURLRequester : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString url READ url WRITE setURL )
     TQ_PROPERTY( bool showLocalProtocol READ showLocalProtocol WRITE setShowLocalProtocol )
     TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
@@ -289,7 +289,7 @@ private:
  */
 class TDEIO_EXPORT KURLComboRequester : public KURLRequester
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a KURLRequester widget with a combobox.
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index 9f2ea9d46..a5ad1f07d 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -70,8 +70,8 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName)
     urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 );
     topLayout->addWidget( urlRequester_ );
     urlRequester_->setFocus();
-    connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
-             TQT_SLOT(slotTextChanged(const TQString&)) );
+    connect( urlRequester_->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)),
+             TQ_SLOT(slotTextChanged(const TQString&)) );
     bool state = !urlName.isEmpty();
     enableButtonOK( state );
     enableButton( KDialogBase::User1, state );
@@ -80,7 +80,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName)
             KFile::ExistingOnly );
 	urlRequester_->setMode( mode );
     */
-    connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotClear() ) );
+    connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotClear() ) );
 }
 
 void KURLRequesterDlg::slotTextChanged(const TQString & text)
diff --git a/tdeio/tdefile/kurlrequesterdlg.h b/tdeio/tdefile/kurlrequesterdlg.h
index ef97ececf..5fdbe8315 100644
--- a/tdeio/tdefile/kurlrequesterdlg.h
+++ b/tdeio/tdefile/kurlrequesterdlg.h
@@ -37,7 +37,7 @@ class KFileDialog;
  */
 class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp
index c7dc845cc..9bf947f20 100644
--- a/tdeio/tdefile/tdediroperator.cpp
+++ b/tdeio/tdefile/tdediroperator.cpp
@@ -124,16 +124,16 @@ KDirOperator::KDirOperator(const KURL& _url,
 
     setDirLister( new KDirLister( true ) );
 
-    connect(&myCompletion, TQT_SIGNAL(match(const TQString&)),
-            TQT_SLOT(slotCompletionMatch(const TQString&)));
+    connect(&myCompletion, TQ_SIGNAL(match(const TQString&)),
+            TQ_SLOT(slotCompletionMatch(const TQString&)));
 
     progress = new KProgress(this, "progress");
     progress->adjustSize();
     progress->move(2, height() - progress->height() -2);
 
     d->progressDelayTimer = new TQTimer( this, "progress delay timer" );
-    connect( d->progressDelayTimer, TQT_SIGNAL( timeout() ),
-	     TQT_SLOT( slotShowProgress() ));
+    connect( d->progressDelayTimer, TQ_SIGNAL( timeout() ),
+	     TQ_SLOT( slotShowProgress() ));
 
     myCompleteListDirty = false;
 
@@ -144,7 +144,7 @@ KDirOperator::KDirOperator(const KURL& _url,
     setupActions();
     setupMenu();
 
-    setFocusPolicy(TQ_WheelFocus);
+    setFocusPolicy(TQWidget::WheelFocus);
 }
 
 KDirOperator::~KDirOperator()
@@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions()
    {
       if (viewActionCollection)
       {
-         disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
-               this, TQT_SLOT( slotViewActionAdded( TDEAction * )));
-         disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
-               this, TQT_SLOT( slotViewActionRemoved( TDEAction * )));
+         disconnect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )),
+               this, TQ_SLOT( slotViewActionAdded( TDEAction * )));
+         disconnect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )),
+               this, TQ_SLOT( slotViewActionRemoved( TDEAction * )));
       }
 
       viewActionMenu->popupMenu()->clear();
@@ -237,10 +237,10 @@ void KDirOperator::insertViewDependentActions()
          }
       }
 
-      connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )),
-               TQT_SLOT( slotViewActionAdded( TDEAction * )));
-      connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )),
-               TQT_SLOT( slotViewActionRemoved( TDEAction * )));
+      connect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )),
+               TQ_SLOT( slotViewActionAdded( TDEAction * )));
+      connect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )),
+               TQ_SLOT( slotViewActionRemoved( TDEAction * )));
    }
 }
 
@@ -719,7 +719,7 @@ void KDirOperator::pathChanged()
     TQApplication::restoreOverrideCursor();
 
     // when TDEIO::Job emits finished, the slot will restore the cursor
-    TQApplication::setOverrideCursor( tqwaitCursor );
+    TQApplication::setOverrideCursor( TQt::waitCursor );
 
     if ( !isReadable( currUrl )) {
         KMessageBox::error(viewWidget(),
@@ -1050,18 +1050,18 @@ void KDirOperator::connectView(KFileView *view)
     viewActionCollection = 0L;
     KFileViewSignaler *sig = view->signaler();
 
-    connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ),
-            this, TQT_SLOT( activatedMenu(const KFileItem *, const TQPoint& )));
-    connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *) ),
-            this, TQT_SLOT( selectDir(const KFileItem*) ) );
-    connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *) ),
-            this, TQT_SLOT( selectFile(const KFileItem*) ) );
-    connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ),
-            this, TQT_SLOT( highlightFile(const KFileItem*) ));
-    connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ),
-            this, TQT_SLOT( slotViewSortingChanged( TQDir::SortSpec )));
-    connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ),
-            this, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) );
+    connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ),
+            this, TQ_SLOT( activatedMenu(const KFileItem *, const TQPoint& )));
+    connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *) ),
+            this, TQ_SLOT( selectDir(const KFileItem*) ) );
+    connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *) ),
+            this, TQ_SLOT( selectFile(const KFileItem*) ) );
+    connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ),
+            this, TQ_SLOT( highlightFile(const KFileItem*) ));
+    connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ),
+            this, TQ_SLOT( slotViewSortingChanged( TQDir::SortSpec )));
+    connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ),
+            this, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) );
 
     if ( reverseAction->isChecked() != m_fileView->isReversed() )
         slotSortReversed();
@@ -1071,7 +1071,7 @@ void KDirOperator::connectView(KFileView *view)
     m_fileView->widget()->show();
 
     if ( listDir ) {
-        TQApplication::setOverrideCursor( tqwaitCursor );
+        TQApplication::setOverrideCursor( TQt::waitCursor );
         openURL( currUrl );
     }
     else
@@ -1124,20 +1124,20 @@ void KDirOperator::setDirLister( KDirLister *lister )
     dir->setMainWindow (mainWidget);
     kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl;
 
-    connect( dir, TQT_SIGNAL( percent( int )),
-             TQT_SLOT( slotProgress( int ) ));
-    connect( dir, TQT_SIGNAL(started( const KURL& )), TQT_SLOT(slotStarted()));
-    connect( dir, TQT_SIGNAL(newItems(const KFileItemList &)),
-             TQT_SLOT(insertNewFiles(const KFileItemList &)));
-    connect( dir, TQT_SIGNAL(completed()), TQT_SLOT(slotIOFinished()));
-    connect( dir, TQT_SIGNAL(canceled()), TQT_SLOT(slotCanceled()));
-    connect( dir, TQT_SIGNAL(deleteItem(KFileItem *)),
-             TQT_SLOT(itemDeleted(KFileItem *)));
-    connect( dir, TQT_SIGNAL(redirection( const KURL& )),
-	     TQT_SLOT( slotRedirected( const KURL& )));
-    connect( dir, TQT_SIGNAL( clear() ), TQT_SLOT( slotClearView() ));
-    connect( dir, TQT_SIGNAL( refreshItems( const KFileItemList& ) ),
-             TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) );
+    connect( dir, TQ_SIGNAL( percent( int )),
+             TQ_SLOT( slotProgress( int ) ));
+    connect( dir, TQ_SIGNAL(started( const KURL& )), TQ_SLOT(slotStarted()));
+    connect( dir, TQ_SIGNAL(newItems(const KFileItemList &)),
+             TQ_SLOT(insertNewFiles(const KFileItemList &)));
+    connect( dir, TQ_SIGNAL(completed()), TQ_SLOT(slotIOFinished()));
+    connect( dir, TQ_SIGNAL(canceled()), TQ_SLOT(slotCanceled()));
+    connect( dir, TQ_SIGNAL(deleteItem(KFileItem *)),
+             TQ_SLOT(itemDeleted(KFileItem *)));
+    connect( dir, TQ_SIGNAL(redirection( const KURL& )),
+	     TQ_SLOT( slotRedirected( const KURL& )));
+    connect( dir, TQ_SIGNAL( clear() ), TQ_SLOT( slotClearView() ));
+    connect( dir, TQ_SIGNAL( refreshItems( const KFileItemList& ) ),
+             TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) );
 }
 
 void KDirOperator::insertNewFiles(const KFileItemList &newone)
@@ -1163,7 +1163,7 @@ void KDirOperator::insertNewFiles(const KFileItemList &newone)
 	++it;
     }
 
-    TQTimer::singleShot(200, this, TQT_SLOT(resetCursor()));
+    TQTimer::singleShot(200, this, TQ_SLOT(resetCursor()));
 }
 
 void KDirOperator::selectDir(const KFileItem *item)
@@ -1253,26 +1253,26 @@ void KDirOperator::slotCompletionMatch(const TQString& match)
 
 void KDirOperator::setupActions()
 {
-    myActionCollection = new TDEActionCollection( topLevelWidget(), TQT_TQOBJECT(this), "KDirOperator::myActionCollection" );
+    myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" );
 
     actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" );
-    upAction = KStdAction::up( TQT_TQOBJECT(this), TQT_SLOT( cdUp() ), myActionCollection, "up" );
+    upAction = KStdAction::up( this, TQ_SLOT( cdUp() ), myActionCollection, "up" );
     upAction->setText( i18n("Parent Folder") );
-    backAction = KStdAction::back( TQT_TQOBJECT(this), TQT_SLOT( back() ), myActionCollection, "back" );
-    forwardAction = KStdAction::forward( TQT_TQOBJECT(this), TQT_SLOT(forward()), myActionCollection, "forward" );
-    homeAction = KStdAction::home( TQT_TQOBJECT(this), TQT_SLOT( home() ), myActionCollection, "home" );
+    backAction = KStdAction::back( this, TQ_SLOT( back() ), myActionCollection, "back" );
+    forwardAction = KStdAction::forward( this, TQ_SLOT(forward()), myActionCollection, "forward" );
+    homeAction = KStdAction::home( this, TQ_SLOT( home() ), myActionCollection, "home" );
     homeAction->setText(i18n("Home Folder"));
-    reloadAction = KStdAction::redisplay( TQT_TQOBJECT(this), TQT_SLOT(rereadDir()), myActionCollection, "reload" );
+    reloadAction = KStdAction::redisplay( this, TQ_SLOT(rereadDir()), myActionCollection, "reload" );
     actionSeparator = new TDEActionSeparator( myActionCollection, "separator" );
     d->viewActionSeparator = new TDEActionSeparator( myActionCollection,
                                                    "viewActionSeparator" );
     mkdirAction = new TDEAction( i18n("New Folder..."), 0,
-                                 TQT_TQOBJECT(this), TQT_SLOT( mkdir() ), myActionCollection, "mkdir" );
+                                 this, TQ_SLOT( mkdir() ), myActionCollection, "mkdir" );
     TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" );
-    connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
-	     this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
-    new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, TQT_TQOBJECT(this),
-                  TQT_SLOT( deleteSelected() ), myActionCollection, "delete" );
+    connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ),
+	     this, TQ_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) );
+    new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this,
+                  TQ_SLOT( deleteSelected() ), myActionCollection, "delete" );
     mkdirAction->setIcon( TQString::fromLatin1("folder-new") );
     reloadAction->setText( i18n("Reload") );
     reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload ));
@@ -1281,16 +1281,16 @@ void KDirOperator::setupActions()
     // the sort menu actions
     sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu");
     byNameAction = new TDERadioAction( i18n("By Name"), 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT( slotSortByName() ),
+                                     this, TQ_SLOT( slotSortByName() ),
                                      myActionCollection, "by name" );
     byDateAction = new TDERadioAction( i18n("By Date"), 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT( slotSortByDate() ),
+                                     this, TQ_SLOT( slotSortByDate() ),
                                      myActionCollection, "by date" );
     bySizeAction = new TDERadioAction( i18n("By Size"), 0,
-                                     TQT_TQOBJECT(this), TQT_SLOT( slotSortBySize() ),
+                                     this, TQ_SLOT( slotSortBySize() ),
                                      myActionCollection, "by size" );
     reverseAction = new TDEToggleAction( i18n("Reverse"), 0,
-                                       TQT_TQOBJECT(this), TQT_SLOT( slotSortReversed() ),
+                                       this, TQ_SLOT( slotSortReversed() ),
                                        myActionCollection, "reversed" );
 
     TQString sortGroup = TQString::fromLatin1("sort");
@@ -1304,17 +1304,17 @@ void KDirOperator::setupActions()
     caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0,
                                               myActionCollection, "case insensitive" );
 
-    connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( slotToggleDirsFirst() ));
-    connect( caseInsensitiveAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( slotToggleIgnoreCase() ));
+    connect( dirsFirstAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( slotToggleDirsFirst() ));
+    connect( caseInsensitiveAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( slotToggleIgnoreCase() ));
 
 
 
     // the view menu actions
     viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" );
-    connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             TQT_SLOT( insertViewDependentActions() ));
+    connect( viewActionMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             TQ_SLOT( insertViewDependentActions() ));
 
     shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn",
                                     TDEShortcut(), myActionCollection, "short view" );
@@ -1325,31 +1325,31 @@ void KDirOperator::setupActions()
                                           myActionCollection, "show hidden" );
 //    showHiddenAction->setCheckedState( i18n("Hide Hidden Files") );
     separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(),
-                                            TQT_TQOBJECT(this),
-                                            TQT_SLOT(slotSeparateDirs()),
+                                            this,
+                                            TQ_SLOT(slotSeparateDirs()),
                                             myActionCollection, "separate dirs" );
     TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"),
                                                      "thumbnail", TDEShortcut(),
                                                      myActionCollection,
                                                      "preview" );
     previewAction->setCheckedState(i18n("Hide Preview"));
-    connect( previewAction, TQT_SIGNAL( toggled( bool )),
-             TQT_SLOT( togglePreview( bool )));
+    connect( previewAction, TQ_SIGNAL( toggled( bool )),
+             TQ_SLOT( togglePreview( bool )));
 
 
     TQString viewGroup = TQString::fromLatin1("view");
     shortAction->setExclusiveGroup( viewGroup );
     detailedAction->setExclusiveGroup( viewGroup );
 
-    connect( shortAction, TQT_SIGNAL( activated() ),
-             TQT_SLOT( slotSimpleView() ));
-    connect( detailedAction, TQT_SIGNAL( activated() ),
-             TQT_SLOT( slotDetailedView() ));
-    connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( slotToggleHidden( bool ) ));
+    connect( shortAction, TQ_SIGNAL( activated() ),
+             TQ_SLOT( slotSimpleView() ));
+    connect( detailedAction, TQ_SIGNAL( activated() ),
+             TQ_SLOT( slotDetailedView() ));
+    connect( showHiddenAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( slotToggleHidden( bool ) ));
 
-    new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), TQT_TQOBJECT(this),
-                 TQT_SLOT(slotProperties()), myActionCollection, "properties" );
+    new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this,
+                 TQ_SLOT(slotProperties()), myActionCollection, "properties" );
 }
 
 void KDirOperator::setupMenu()
@@ -1560,7 +1560,7 @@ void KDirOperator::resizeEvent( TQResizeEvent * )
     if (m_fileView)
         m_fileView->widget()->resize( size() );
 
-    if ( TQT_BASE_OBJECT(progress->parent()) == TQT_BASE_OBJECT(this) ) // might be reparented into a statusbar
+    if ( progress->parent() == this ) // might be reparented into a statusbar
 	progress->move(2, height() - progress->height() -2);
 }
 
diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h
index 915b27c88..89b1a1709 100644
--- a/tdeio/tdefile/tdediroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -72,14 +72,14 @@ namespace TDEIO {
  * \code
  *   KDirOperator *op = new KDirOperator( KURL( "file:/home/gis" ), this );
  *   // some signals you might be interested in
- *   connect(op, TQT_SIGNAL(urlEntered(const KURL&)),
- *           TQT_SLOT(urlEntered(const KURL&)));
- *   connect(op, TQT_SIGNAL(fileHighlighted(const KFileItem *)),
- *           TQT_SLOT(fileHighlighted(const KFileItem *)));
- *   connect(op, TQT_SIGNAL(fileSelected(const KFileItem *)),
- *           TQT_SLOT(fileSelected(const KFileItem *)));
- *   connect(op, TQT_SIGNAL(finishedLoading()),
- *           TQT_SLOT(slotLoadingFinished()));
+ *   connect(op, TQ_SIGNAL(urlEntered(const KURL&)),
+ *           TQ_SLOT(urlEntered(const KURL&)));
+ *   connect(op, TQ_SIGNAL(fileHighlighted(const KFileItem *)),
+ *           TQ_SLOT(fileHighlighted(const KFileItem *)));
+ *   connect(op, TQ_SIGNAL(fileSelected(const KFileItem *)),
+ *           TQ_SLOT(fileSelected(const KFileItem *)));
+ *   connect(op, TQ_SIGNAL(finishedLoading()),
+ *           TQ_SLOT(slotLoadingFinished()));
  *
  *   op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" );
  *   op->setView(KFile::Default);
@@ -95,7 +95,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT KDirOperator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
  public:
     /**
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index e13e0673b..092eba9de 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
@@ -28,7 +28,7 @@ class TDEPopupMenu;
 
 class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileBookmarkHandler( KFileDialog *dialog );
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index 724d20218..321684ac7 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -72,21 +72,21 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name)
     setAllColumnsShowFocus( true );
     setDragEnabled(true);
 
-    connect( header(), TQT_SIGNAL( clicked(int)),
-             TQT_SLOT(slotSortingChanged(int) ));
+    connect( header(), TQ_SIGNAL( clicked(int)),
+             TQ_SLOT(slotSortingChanged(int) ));
 
 
-    connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ),
-	     TQT_SLOT( slotActivate( TQListViewItem *) ) );
+    connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ),
+	     TQ_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, 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, TQT_SIGNAL(contextMenuRequested( TQListViewItem *,
+    connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *,
                                                 const TQPoint &, int )),
-	     this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& )));
+	     this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& )));
 
     KFile::SelectionMode sm = KFileView::selectionMode();
     switch ( sm ) {
@@ -107,15 +107,15 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name)
 
     // for highlighting
     if ( sm == KFile::Multi || sm == KFile::Extended )
-	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 * ) ));
 		
     // DND
-    connect( &(d->autoOpenTimer), TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoOpen() ));
+    connect( &(d->autoOpenTimer), TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoOpen() ));
 
     setSorting( sorting() );
 
@@ -253,8 +253,8 @@ void KFileDetailView::highlighted( TQListViewItem *item )
 
 void KFileDetailView::setSelectionMode( KFile::SelectionMode sm )
 {
-    disconnect( this, TQT_SIGNAL( selectionChanged() ));
-    disconnect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ));
+    disconnect( this, TQ_SIGNAL( selectionChanged() ));
+    disconnect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ));
 
     KFileView::setSelectionMode( sm );
 
@@ -275,11 +275,11 @@ void KFileDetailView::setSelectionMode( KFile::SelectionMode sm )
     }
 
     if ( sm == KFile::Multi || sm == KFile::Extended )
-        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 KFileDetailView::isSelected( const KFileItem *i ) const
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index add8cd988..f40b5b374 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -107,7 +107,7 @@ private:
  */
 class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileDetailView(TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 0362998b2..cf5d97692 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -88,7 +88,7 @@
 #include <tdefilespeedbar.h>
 #include <tdefilebookmarkhandler.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -561,8 +561,8 @@ void KFileDialog::slotOk()
             job->setWindow (topLevelWidget());
             TDEIO::Scheduler::scheduleJob( job );
             d->statJobs.append( job );
-            connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-                     TQT_SLOT( slotStatResult( TDEIO::Job *) ));
+            connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+                     TQ_SLOT( slotStatResult( TDEIO::Job *) ));
         }
         return;
     }
@@ -570,7 +570,7 @@ void KFileDialog::slotOk()
     job = TDEIO::stat(d->url,!d->url.isLocalFile());
     job->setWindow (topLevelWidget());
     d->statJobs.append( job );
-    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotStatResult(TDEIO::Job*)));
 }
 
 
@@ -770,11 +770,11 @@ void KFileDialog::setLocationText( const TQString& text )
     // setCurrentItem() will cause textChanged() being emitted,
     // so slotLocationChanged() will be called. Make sure we don't clear
     // the KDirOperator's view-selection in there
-    disconnect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
-                this, TQT_SLOT( slotLocationChanged( const TQString& ) ) );
+    disconnect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+                this, TQ_SLOT( slotLocationChanged( const TQString& ) ) );
     locationEdit->setCurrentItem( 0 );
-    connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
-             TQT_SLOT( slotLocationChanged( const TQString& )) );
+    connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+             TQ_SLOT( slotLocationChanged( const TQString& )) );
     locationEdit->setEditText( text );
 
     // don't change selection when user has clicked on an item
@@ -827,17 +827,17 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget );
     d->okButton->setDefault( true );
     d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget);
-    connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() ));
-    connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() ));
+    connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() ));
+    connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() ));
     d->customWidget = widget;
     d->autoSelectExtCheckBox = 0; // delayed loading
     d->autoSelectExtChecked = false;
     d->urlBar = 0; // delayed loading
 
-    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+    TQtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
     toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
     toolbar->setFlat(true);
-    tqInstallMsgHandler( oldHandler );
+    qInstallMsgHandler( oldHandler );
 
     d->pathCombo = new KURLComboBox( KURLComboBox::Directories, true,
                                      toolbar, "path combo" );
@@ -896,14 +896,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
 
     ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops");
     ops->setOnlyDoubleClickSelectsFiles( true );
-    connect(ops, TQT_SIGNAL(urlEntered(const KURL&)),
-            TQT_SLOT(urlEntered(const KURL&)));
-    connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)),
-            TQT_SLOT(fileHighlighted(const KFileItem *)));
-    connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)),
-            TQT_SLOT(fileSelected(const KFileItem *)));
-    connect(ops, TQT_SIGNAL(finishedLoading()),
-            TQT_SLOT(slotLoadingFinished()));
+    connect(ops, TQ_SIGNAL(urlEntered(const KURL&)),
+            TQ_SLOT(urlEntered(const KURL&)));
+    connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)),
+            TQ_SLOT(fileHighlighted(const KFileItem *)));
+    connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)),
+            TQ_SLOT(fileSelected(const KFileItem *)));
+    connect(ops, TQ_SIGNAL(finishedLoading()),
+            TQ_SLOT(slotLoadingFinished()));
 
     ops->setupMenu(KDirOperator::SortActions |
                    KDirOperator::FileActions |
@@ -928,16 +928,16 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     TDEToggleAction *showSidebarAction =
         new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
     showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel"));
-    connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( toggleSpeedbar( bool )) );
+    connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( toggleSpeedbar( bool )) );
 
     TDEToggleAction *showBookmarksAction =
             new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks");
     showBookmarksAction->setCheckedState(i18n("Hide Bookmarks"));
-    connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( toggleBookmarks( bool )) );
+    connect( showBookmarksAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( toggleBookmarks( bool )) );
 
-    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", TQT_TQOBJECT(this), "extra menu" );
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" );
     menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
                             "Various options can be accessed from this menu including: <ul>"
                             "<li>how files are sorted in the list</li>"
@@ -963,12 +963,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     menu->insert( coll->action( "separate dirs" ));
 
     menu->setDelayed( false );
-    connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
-             ops, TQT_SLOT( updateSelectionDependentActions() ));
+    connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ),
+             ops, TQ_SLOT( updateSelectionDependentActions() ));
     menu->plug( toolbar );
 
     //Insert a separator.
-    TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(Qt::Horizontal, false /*no line*/,
+    TDEToolBarSeparator* spacerWidget = new TDEToolBarSeparator(TQt::Horizontal, false /*no line*/,
                                                             toolbar);
     d->m_pathComboIndex = toolbar->insertWidget(-1, -1, spacerWidget);
     toolbar->insertWidget(PATH_COMBO, 0, d->pathCombo);
@@ -984,12 +984,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     d->pathCombo->setCompletionObject( pathCompletionObj );
     d->pathCombo->setAutoDeleteCompletionObject( true );
 
-    connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )),
-             this,  TQT_SLOT( enterURL( const KURL& ) ));
-    connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )),
-             this,  TQT_SLOT( enterURL( const TQString& ) ));
-		connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )),
-              this,  TQT_SLOT( enterURL( const TQString& ) ));
+    connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )),
+             this,  TQ_SLOT( enterURL( const KURL& ) ));
+    connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )),
+             this,  TQ_SLOT( enterURL( const TQString& ) ));
+		connect( d->pathCombo, TQ_SIGNAL( activated( const TQString& )),
+              this,  TQ_SLOT( enterURL( const TQString& ) ));
               
     TQString whatsThisText;
 
@@ -998,8 +998,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     locationEdit = new KURLComboBox(KURLComboBox::Files, true,
                                     d->mainWidget, "LocationEdit");
     locationEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
-    connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ),
-             TQT_SLOT( slotLocationChanged( const TQString& )) );
+    connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ),
+             TQ_SLOT( slotLocationChanged( const TQString& )) );
 
     updateLocationWhatsThis ();
     d->locationLabel->setBuddy(locationEdit);
@@ -1011,13 +1011,13 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     fileCompletionObj->setDir( dir );
     locationEdit->setCompletionObject( fileCompletionObj );
     locationEdit->setAutoDeleteCompletionObject( true );
-    connect( fileCompletionObj, TQT_SIGNAL( match( const TQString& ) ),
-             TQT_SLOT( fileCompletion( const TQString& )) );
+    connect( fileCompletionObj, TQ_SIGNAL( match( const TQString& ) ),
+             TQ_SLOT( fileCompletion( const TQString& )) );
 
-    connect( locationEdit, TQT_SIGNAL( returnPressed() ),
-             this, TQT_SLOT( slotOk()));
-    connect(locationEdit, TQT_SIGNAL( activated( const TQString&  )),
-            this,  TQT_SLOT( locationActivated( const TQString& ) ));
+    connect( locationEdit, TQ_SIGNAL( returnPressed() ),
+             this, TQ_SLOT( slotOk()));
+    connect(locationEdit, TQ_SIGNAL( activated( const TQString&  )),
+            this,  TQ_SLOT( locationActivated( const TQString& ) ));
 
     // the Filter label/edit
     whatsThisText = i18n("<qt>This is the filter to apply to the file list. "
@@ -1034,12 +1034,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
     TQWhatsThis::add(filterWidget, whatsThisText);
     setFilter(filter);
     d->filterLabel->setBuddy(filterWidget);
-    connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged()));
+    connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged()));
 
     // the Automatically Select Extension checkbox
     // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig())
     d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget);
-    connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked()));
+    connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked()));
 
     initGUI(); // activate GM
 
@@ -1056,8 +1056,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge
 void KFileDialog::initSpeedbar()
 {
     d->urlBar = new KFileSpeedBar( d->mainWidget, "url bar" );
-    connect( d->urlBar, TQT_SIGNAL( activated( const KURL& )),
-             TQT_SLOT( enterURL( const KURL& )) );
+    connect( d->urlBar, TQ_SIGNAL( activated( const KURL& )),
+             TQ_SLOT( enterURL( const KURL& )) );
 
     // need to set the current url of the urlbar manually (not via urlEntered()
     // here, because the initial url of KDirOperator might be the same as the
@@ -1083,17 +1083,17 @@ void KFileDialog::initGUI()
 
     TQGridLayout* lafBox= new TQGridLayout(2, 3, KDialog::spacingHint());
 
-    lafBox->addWidget(d->locationLabel, 0, 0, Qt::AlignVCenter);
-    lafBox->addWidget(locationEdit, 0, 1, Qt::AlignVCenter);
-    lafBox->addWidget(d->okButton, 0, 2, Qt::AlignVCenter);
+    lafBox->addWidget(d->locationLabel, 0, 0, TQt::AlignVCenter);
+    lafBox->addWidget(locationEdit, 0, 1, TQt::AlignVCenter);
+    lafBox->addWidget(d->okButton, 0, 2, TQt::AlignVCenter);
 
-    lafBox->addWidget(d->filterLabel, 1, 0, Qt::AlignVCenter);
-    lafBox->addWidget(filterWidget, 1, 1, Qt::AlignVCenter);
-    lafBox->addWidget(d->cancelButton, 1, 2, Qt::AlignVCenter);
+    lafBox->addWidget(d->filterLabel, 1, 0, TQt::AlignVCenter);
+    lafBox->addWidget(filterWidget, 1, 1, TQt::AlignVCenter);
+    lafBox->addWidget(d->cancelButton, 1, 2, TQt::AlignVCenter);
 
     lafBox->setColStretch(1, 4);
 
-    vbox->addLayout(TQT_TQLAYOUT(lafBox), 0);
+    vbox->addLayout(lafBox, 0);
     vbox->addSpacing(3);
 
     // add the Automatically Select Extension checkbox
@@ -1336,9 +1336,9 @@ TQString KFileDialog::getOpenFileNameWId(const TQString& startDir,
                                         const TQString& filter,
                                         WId parent_id, const TQString& caption)
 {
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg(startDir, filter, parent, "filedialog", true);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id != 0 )
         XSetTransientForHint( tqt_xdisplay(), dlg.winId(), parent_id );
 #else
@@ -1413,7 +1413,7 @@ TQString KFileDialog::getExistingDirectory(const TQString& startDir,
                                           TQWidget *parent,
                                           const TQString& caption)
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
     return TQFileDialog::getExistingDirectory(startDir, parent, "getExistingDirectory",
                                              caption, true, true);
 #else
@@ -1618,9 +1618,9 @@ TQString KFileDialog::getSaveFileNameWId(const TQString& dir, const TQString& fi
                                      const TQString& caption)
 {
     bool specialDir = dir.at(0) == ':';
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KFileDialog dlg( specialDir ? dir : TQString::null, filter, parent, "filedialog", true);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id != 0 )
         XSetTransientForHint(tqt_xdisplay(), dlg.winId(), parent_id);
 #else
@@ -2263,8 +2263,8 @@ void KFileDialog::toggleBookmarks(bool show)
         }
 
         d->bookmarkHandler = new KFileBookmarkHandler( this );
-        connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
-                    TQT_SLOT( enterURL( const TQString& )));
+        connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )),
+                    TQ_SLOT( enterURL( const TQString& )));
 
         toolbar->insertButton(TQString::fromLatin1("bookmark"),
                               (int)HOTLIST_BUTTON, true,
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index 55980bfb6..9807893d0 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -75,7 +75,7 @@ struct KFileDialogPrivate;
  */
 class TDEIO_EXPORT KFileDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -268,7 +268,7 @@ public:
      * tdefile->setFilter("*.cpp");
      * tdefile->setFilter("*.cpp|Sources (*.cpp)");
      * tdefile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
-     * tdefile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files");
+     * tdefile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
      * \endcode
      *
      * Note: The text to display is not parsed in any way. So, if you
@@ -359,7 +359,7 @@ public:
      * This widget has to inherit TQWidget and it has to implement
      * a slot showPreview(const KURL &); which is called
      * every time the file changes. You may want to look at
-     * koffice/lib/kofficecore/koFilterManager.cc for some hints :)
+     * koffice/lib/kofficecore/koFilterManager.cpp for some hints :)
      *
      * Ownership is transferred to KFileDialog. You need to create the
      * preview-widget with "new", i.e. on the heap.
@@ -713,7 +713,7 @@ public:
      * items into it, e.g.:
      * \code
      *      yourAction = new TDEAction( i18n("Your Action"), 0,
-     *                                this, TQT_SLOT( yourSlot() ),
+     *                                this, TQ_SLOT( yourSlot() ),
      *                                this, "action name" );
      *      yourAction->plug( tdefileDialog->toolBar() );
      * \endcode
@@ -811,7 +811,7 @@ signals:
      * or chose one of the predefined set via setFilter().
      *
      * @param filter contains the new filter (only the extension part,
-     * not the explanation), i.e. "*.cpp" or "*.cpp *.cc".
+     * not the explanation), i.e. "*.cpp".
      *
      * @see setFilter()
      * @see currentFilter()
diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index ed41f8f82..de4d45518 100644
--- a/tdeio/tdefile/tdefilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -49,9 +49,9 @@ KFileFilterCombo::KFileFilterCombo( TQWidget *parent, const char *name)
 {
     setTrapReturnKey( true );
     setInsertionPolicy(NoInsertion);
-    connect( this, TQT_SIGNAL( activated( int )), this, TQT_SIGNAL( filterChanged() ));
-    connect( this, TQT_SIGNAL( returnPressed() ), this, TQT_SIGNAL( filterChanged() ));
-    connect( this, TQT_SIGNAL( filterChanged() ), TQT_SLOT( slotFilterChanged() ));
+    connect( this, TQ_SIGNAL( activated( int )), this, TQ_SIGNAL( filterChanged() ));
+    connect( this, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( filterChanged() ));
+    connect( this, TQ_SIGNAL( filterChanged() ), TQ_SLOT( slotFilterChanged() ));
     m_allTypes = false;
 }
 
@@ -179,7 +179,7 @@ void KFileFilterCombo::slotFilterChanged()
 
 bool KFileFilterCombo::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && e->type() == TQEvent::FocusOut ) {
+    if ( o == lineEdit() && e->type() == TQEvent::FocusOut ) {
         if ( currentText() != d->lastFilter )
             emit filterChanged();
     }
diff --git a/tdeio/tdefile/tdefilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h
index f448003bb..1f1f40db9 100644
--- a/tdeio/tdefile/tdefilefiltercombo.h
+++ b/tdeio/tdefile/tdefilefiltercombo.h
@@ -30,7 +30,7 @@ class KFileFilterComboPrivate;
 
 class TDEIO_EXPORT KFileFilterCombo : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
  public:
     KFileFilterCombo(TQWidget *parent= 0, const char *name= 0);
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index e2d726319..65d33912b 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -59,13 +59,13 @@ public:
 
         noArrangement = false;
 	ignoreMaximumSize = false;
-	smallColumns = new TDERadioAction( i18n("Small Icons"), 0, TQT_TQOBJECT(parent),
-					 TQT_SLOT( slotSmallColumns() ),
+	smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent,
+					 TQ_SLOT( slotSmallColumns() ),
 					 parent->actionCollection(),
 					 "small columns" );
 
-	largeRows = new TDERadioAction( i18n("Large Icons"), 0, TQT_TQOBJECT(parent),
-				      TQT_SLOT( slotLargeRows() ),
+	largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent,
+				      TQ_SLOT( slotLargeRows() ),
 				      parent->actionCollection(),
 				      "large rows" );
 
@@ -75,22 +75,22 @@ public:
         previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0,
                                       parent->actionCollection(),
                                       "show previews" );
-        zoomIn = KStdAction::zoomIn( TQT_TQOBJECT(parent), TQT_SLOT( zoomIn() ),
+        zoomIn = KStdAction::zoomIn( parent, TQ_SLOT( zoomIn() ),
                                      parent->actionCollection(), "zoomIn" );
-        zoomOut = KStdAction::zoomOut( TQT_TQOBJECT(parent), TQT_SLOT( zoomOut() ),
+        zoomOut = KStdAction::zoomOut( parent, TQ_SLOT( zoomOut() ),
                                      parent->actionCollection(), "zoomOut" );
 
         previews->setGroup("previews");
         zoomIn->setGroup("previews");
         zoomOut->setGroup("previews");
 
-        connect( previews, TQT_SIGNAL( toggled( bool )),
-                 parent, TQT_SLOT( slotPreviewsToggled( bool )));
+        connect( previews, TQ_SIGNAL( toggled( bool )),
+                 parent, TQ_SLOT( slotPreviewsToggled( bool )));
 
-        connect( &previewTimer, TQT_SIGNAL( timeout() ),
-                 parent, TQT_SLOT( showPreviews() ));
-        connect( &autoOpenTimer, TQT_SIGNAL( timeout() ),
-                 parent, TQT_SLOT( slotAutoOpen() ));
+        connect( &previewTimer, TQ_SIGNAL( timeout() ),
+                 parent, TQ_SLOT( showPreviews() ));
+        connect( &autoOpenTimer, TQ_SIGNAL( timeout() ),
+                 parent, TQ_SLOT( slotAutoOpen() ));
     }
 
     ~KFileIconViewPrivate() {
@@ -133,21 +133,21 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name)
     slotSmallColumns();
     d->smallColumns->setChecked( true );
 
-    connect( this, TQT_SIGNAL( returnPressed(TQIconViewItem *) ),
-	     TQT_SLOT( slotActivate( TQIconViewItem *) ) );
+    connect( this, TQ_SIGNAL( returnPressed(TQIconViewItem *) ),
+	     TQ_SLOT( slotActivate( TQIconViewItem *) ) );
 
     // we want single click _and_ double click (as convenience)
-    connect( this, TQT_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ),
-	     TQT_SLOT( selected( TQIconViewItem *) ) );
-    connect( this, TQT_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ),
-	     TQT_SLOT( slotActivate( TQIconViewItem *) ) );
-
-    connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
-	     TQT_SLOT( showToolTip( TQIconViewItem * ) ) );
-    connect( this, TQT_SIGNAL( onViewport() ),
-	     TQT_SLOT( removeToolTip() ) );
-    connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)),
-	     TQT_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) );
+    connect( this, TQ_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ),
+	     TQ_SLOT( selected( TQIconViewItem *) ) );
+    connect( this, TQ_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ),
+	     TQ_SLOT( slotActivate( TQIconViewItem *) ) );
+
+    connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
+	     TQ_SLOT( showToolTip( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( onViewport() ),
+	     TQ_SLOT( removeToolTip() ) );
+    connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)),
+	     TQ_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) );
 
     KFile::SelectionMode sm = KFileView::selectionMode();
     switch ( sm ) {
@@ -167,11 +167,11 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name)
     }
 
     if ( sm == KFile::Multi || sm == KFile::Extended )
-	connect( this, TQT_SIGNAL( selectionChanged() ),
-		 TQT_SLOT( slotSelectionChanged() ));
+	connect( this, TQ_SIGNAL( selectionChanged() ),
+		 TQ_SLOT( slotSelectionChanged() ));
     else
-	connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )),
-		 TQT_SLOT( highlighted( TQIconViewItem * )));
+	connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )),
+		 TQ_SLOT( highlighted( TQIconViewItem * )));
 
     viewport()->installEventFilter( this );
 
@@ -398,8 +398,8 @@ void KFileIconView::highlighted( TQIconViewItem *item )
 
 void KFileIconView::setSelectionMode( KFile::SelectionMode sm )
 {
-    disconnect( TQT_SIGNAL( selectionChanged() ), this );
-    disconnect( TQT_SIGNAL( selectionChanged( TQIconViewItem * )), this );
+    disconnect( TQ_SIGNAL( selectionChanged() ), this );
+    disconnect( TQ_SIGNAL( selectionChanged( TQIconViewItem * )), this );
 
     KFileView::setSelectionMode( sm );
     switch ( KFileView::selectionMode() ) {
@@ -419,11 +419,11 @@ void KFileIconView::setSelectionMode( KFile::SelectionMode sm )
     }
 
     if ( sm == KFile::Multi || sm == KFile::Extended )
-	connect( this, TQT_SIGNAL( selectionChanged() ),
-		 TQT_SLOT( slotSelectionChanged() ));
+	connect( this, TQ_SIGNAL( selectionChanged() ),
+		 TQ_SLOT( slotSelectionChanged() ));
     else
-	connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )),
-		 TQT_SLOT( highlighted( TQIconViewItem * )));
+	connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )),
+		 TQ_SLOT( highlighted( TQIconViewItem * )));
 }
 
 bool KFileIconView::isSelected( const KFileItem *i ) const
@@ -593,12 +593,12 @@ void KFileIconView::showPreviews()
     d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize);
     d->job->setIgnoreMaximumSize(d->ignoreMaximumSize);
 
-    connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )),
-             this, TQT_SLOT( slotPreviewResult( TDEIO::Job * )));
-    connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
-             TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
-//     connect( d->job, TQT_SIGNAL( failed( const KFileItem* )),
-//              this, TQT_SLOT( slotFailed( const KFileItem* ) ));
+    connect( d->job, TQ_SIGNAL( result( TDEIO::Job * )),
+             this, TQ_SLOT( slotPreviewResult( TDEIO::Job * )));
+    connect( d->job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )),
+             TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) ));
+//     connect( d->job, TQ_SIGNAL( failed( const KFileItem* )),
+//              this, TQ_SLOT( slotFailed( const KFileItem* ) ));
 }
 
 void KFileIconView::slotPreviewResult( TDEIO::Job *job )
@@ -737,7 +737,7 @@ void KFileIconView::listingCompleted()
 // need to remove our tooltip, eventually
 bool KFileIconView::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
+    if ( o == viewport() || o == this ) {
         int type = e->type();
         if ( type == TQEvent::Leave ||
              type == TQEvent::FocusOut )
diff --git a/tdeio/tdefile/tdefileiconview.h b/tdeio/tdefile/tdefileiconview.h
index c341d6048..8a03d4bc9 100644
--- a/tdeio/tdefile/tdefileiconview.h
+++ b/tdeio/tdefile/tdefileiconview.h
@@ -81,7 +81,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT KFileIconView : public TDEIconView, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileIconView(TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index 4590ee381..f271b4541 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -139,7 +139,7 @@ TQWidget* KFileMetaInfoWidget::makeWidget()
 
 #if 0
         case TQVariant::Size:        // a QSize
-        case TQVariant::String:      // a QString
+        case TQVariant::String:      // a TQString
         case TQVariant::List:        // a QValueList
         case TQVariant::Map:         // a QMap
         case TQVariant::StringList:  //  a QStringList
@@ -147,12 +147,12 @@ TQWidget* KFileMetaInfoWidget::makeWidget()
         case TQVariant::Pixmap:      // a QPixmap
         case TQVariant::Brush:       // a QBrush
         case TQVariant::Rect:        // a QRect
-        case TQVariant::Color:       // a QColor
+        case TQVariant::Color:       // a TQColor
         case TQVariant::Palette:     // a QPalette
         case TQVariant::ColorGroup:  // a QColorGroup
         case TQVariant::IconSet:     // a QIconSet
         case TQVariant::Point:       // a QPoint
-        case TQVariant::Image:       // a QImage
+        case TQVariant::Image:       // a TQImage
         case TQVariant::CString:     // a QCString
         case TQVariant::PointArray:  // a QPointArray
         case TQVariant::Region:      // a QRegion
@@ -185,7 +185,7 @@ TQWidget* KFileMetaInfoWidget::makeBoolWidget()
 {
     TQCheckBox* cb = new TQCheckBox(this, "metainfo bool widget");
     cb->setChecked(m_item.value().toBool());
-    connect(cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged(bool)));
+    connect(cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged(bool)));
     return cb;
 }
 
@@ -196,7 +196,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget()
 
     if (m_validator)
     {
-        if (m_validator->inherits(TQINTVALIDATOR_OBJECT_NAME_STRING))
+        if (m_validator->inherits("TQIntValidator"))
         {
             sb->setMinValue(static_cast<TQIntValidator*>(m_validator)->bottom());
             sb->setMaxValue(static_cast<TQIntValidator*>(m_validator)->top());
@@ -209,7 +209,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget()
     if (m_item.type() == TQVariant::UInt)
         sb->setMinValue(TQMAX(sb->minValue(), 0));
 
-    connect(sb, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int)));
+    connect(sb, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int)));
     return sb;
 }
 
@@ -229,7 +229,7 @@ TQWidget* KFileMetaInfoWidget::makeDoubleWidget()
         reparentValidator(dni, m_validator);
     }
 
-    connect(dni, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotChanged(double)));
+    connect(dni, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotChanged(double)));
     return dni;
 }
 
@@ -242,7 +242,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget()
                                                     (m_validator);
         b->insertStringList(val->stringList());
         b->setCurrentText(m_item.value().toString());
-        connect(b, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotComboChanged(const TQString &)));
+        connect(b, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotComboChanged(const TQString &)));
         b->setValidator(val);
         reparentValidator(b, val);
         return b;
@@ -251,8 +251,8 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget()
     if ( m_item.attributes() & KFileMimeTypeInfo::MultiLine ) {
         KEdit *edit = new KEdit( this );
         edit->setText( m_item.value().toString() );
-        connect( edit, TQT_SIGNAL( textChanged() ),
-                 this, TQT_SLOT( slotMultiLineEditChanged() ));
+        connect( edit, TQ_SIGNAL( textChanged() ),
+                 this, TQ_SLOT( slotMultiLineEditChanged() ));
         // can't use a validator with a TQTextEdit, but we may need to delete it
         if ( m_validator )
             reparentValidator( edit, m_validator );
@@ -265,16 +265,16 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget()
         e->setValidator(m_validator);
         reparentValidator(e, m_validator);
     }
-    connect(e,    TQT_SIGNAL(textChanged(const TQString&)),
-            this, TQT_SLOT(slotLineEditChanged(const TQString&)));
+    connect(e,    TQ_SIGNAL(textChanged(const TQString&)),
+            this, TQ_SLOT(slotLineEditChanged(const TQString&)));
     return e;
 }
 
 TQWidget* KFileMetaInfoWidget::makeDateWidget()
 {
   TQWidget *e = new TQDateEdit(m_item.value().toDate(), this);
-  connect(e,    TQT_SIGNAL(valueChanged(const TQDate&)),
-          this, TQT_SLOT(slotDateChanged(const TQDate&)));
+  connect(e,    TQ_SIGNAL(valueChanged(const TQDate&)),
+          this, TQ_SLOT(slotDateChanged(const TQDate&)));
   return e;
 }
 
@@ -301,7 +301,7 @@ void KFileMetaInfoWidget::reparentValidator( TQWidget *widget,
 
 void KFileMetaInfoWidget::slotChanged(bool value)
 {
-    Q_ASSERT(m_widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING));
+    Q_ASSERT(m_widget->inherits("TQComboBox"));
     m_value = TQVariant(value);
     emit valueChanged(m_value);
     m_dirty = true;
@@ -309,7 +309,7 @@ void KFileMetaInfoWidget::slotChanged(bool value)
 
 void KFileMetaInfoWidget::slotChanged(int value)
 {
-    Q_ASSERT(m_widget->inherits(TQSPINBOX_OBJECT_NAME_STRING));
+    Q_ASSERT(m_widget->inherits("TQSpinBox"));
     m_value = TQVariant(value);
     emit valueChanged(m_value);
     m_dirty = true;
@@ -342,7 +342,7 @@ void KFileMetaInfoWidget::slotLineEditChanged(const TQString& value)
 // that may be a little expensive for long texts, but what can we do?
 void KFileMetaInfoWidget::slotMultiLineEditChanged()
 {
-    Q_ASSERT(m_widget->inherits(TQTEXTEDIT_OBJECT_NAME_STRING));
+    Q_ASSERT(m_widget->inherits("TQTextEdit"));
     m_value = TQVariant( static_cast<const TQTextEdit*>( sender() )->text() );
     emit valueChanged(m_value);
     m_dirty = true;
@@ -350,7 +350,7 @@ void KFileMetaInfoWidget::slotMultiLineEditChanged()
 
 void KFileMetaInfoWidget::slotDateChanged(const TQDate& value)
 {
-    Q_ASSERT(m_widget->inherits(TQDATEEDIT_OBJECT_NAME_STRING));
+    Q_ASSERT(m_widget->inherits("TQDateEdit"));
     m_value = TQVariant(value);
     emit valueChanged(m_value);
     m_dirty = true;
@@ -358,7 +358,7 @@ void KFileMetaInfoWidget::slotDateChanged(const TQDate& value)
 
 void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value)
 {
-    Q_ASSERT(m_widget->inherits(TQTIMEEDIT_OBJECT_NAME_STRING));
+    Q_ASSERT(m_widget->inherits("TQTimeEdit"));
     m_value = TQVariant(value);
     emit valueChanged(m_value);
     m_dirty = true;
@@ -366,7 +366,7 @@ void KFileMetaInfoWidget::slotTimeChanged(const TQTime& value)
 
 void KFileMetaInfoWidget::slotDateTimeChanged(const TQDateTime& value)
 {
-    Q_ASSERT(m_widget->inherits(TQDATETIMEEDIT_OBJECT_NAME_STRING));
+    Q_ASSERT(m_widget->inherits("TQDateTimeEdit"));
     m_value = TQVariant(value);
     emit valueChanged(m_value);
     m_dirty = true;
diff --git a/tdeio/tdefile/tdefilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h
index 5ba4d6eef..57ef4ce64 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.h
+++ b/tdeio/tdefile/tdefilemetainfowidget.h
@@ -29,7 +29,7 @@
  */
 class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Mode
     {
diff --git a/tdeio/tdefile/tdefilemetapreview.cpp b/tdeio/tdefile/tdefilemetapreview.cpp
index d587511e4..42f40ef9b 100644
--- a/tdeio/tdefile/tdefilemetapreview.cpp
+++ b/tdeio/tdefile/tdefilemetapreview.cpp
@@ -188,7 +188,7 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( TQWidget *parent )
         return 0L;
     }
 
-    return dynamic_cast<KPreviewWidgetBase*>( factory->create( TQT_TQOBJECT(parent), "tdefileaudiopreview" ));
+    return dynamic_cast<KPreviewWidgetBase*>( factory->create( parent, "tdefileaudiopreview" ));
 }
 
 void KFileMetaPreview::virtual_hook( int, void* ) {}
diff --git a/tdeio/tdefile/tdefilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h
index 443324da3..24fe415a2 100644
--- a/tdeio/tdefile/tdefilemetapreview.h
+++ b/tdeio/tdefile/tdefilemetapreview.h
@@ -17,7 +17,7 @@
 
 class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileMetaPreview(TQWidget *parent, const char *name = 0);
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index acec61475..36fc81eb5 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -95,8 +95,8 @@ void KFilePreview::setFileView( KFileView *view )
     view->setSorting( sorting() );
     left = view;
 
-    connect( left->signaler(), TQT_SIGNAL( fileHighlighted(const KFileItem*) ),
-             TQT_SLOT( slotHighlighted( const KFileItem * )));
+    connect( left->signaler(), TQ_SIGNAL( fileHighlighted(const KFileItem*) ),
+             TQ_SLOT( slotHighlighted( const KFileItem * )));
 
     // Why copy the actions? --ellis, 13 Jan 02.
     //for ( uint i = 0; i < view->actionCollection()->count(); i++ )
@@ -110,10 +110,10 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &)
     left->setOnlyDoubleClickSelectsFiles( onlyDoubleClickSelectsFiles() );
 
     if (w) {
-        connect(this, TQT_SIGNAL( showPreview(const KURL &) ),
-                w, TQT_SLOT( showPreview(const KURL &) ));
-        connect( this, TQT_SIGNAL( clearPreview() ),
-                w, TQT_SLOT( clearPreview() ));
+        connect(this, TQ_SIGNAL( showPreview(const KURL &) ),
+                w, TQ_SLOT( showPreview(const KURL &) ));
+        connect( this, TQ_SIGNAL( clearPreview() ),
+                w, TQ_SLOT( clearPreview() ));
     }
     else {
         preview->hide();
diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h
index 5d4014fe1..8ca2c6937 100644
--- a/tdeio/tdefile/tdefilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -38,7 +38,7 @@
  */
 class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFilePreview(TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index a2fb01c2c..326e2d21e 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -152,17 +152,17 @@ void KFileSharePropsPlugin::init()
             TQButtonGroup *rbGroup = new TQButtonGroup( m_widget );
             rbGroup->hide();
             m_rbUnShare = new TQRadioButton( i18n("Not shared"), m_widget );
-            connect( m_rbUnShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) );
+            connect( m_rbUnShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) );
             vbox->addWidget( m_rbUnShare, 0 );
             rbGroup->insert( m_rbUnShare );
 
             m_rbShare = new TQRadioButton( i18n("Shared - read only for others"), m_widget );
-            connect( m_rbShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) );
+            connect( m_rbShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) );
             vbox->addWidget( m_rbShare, 0 );
             rbGroup->insert( m_rbShare );
 
             m_rbSharerw = new TQRadioButton( i18n("Shared - writeable for others"), m_widget );
-            connect( m_rbSharerw, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) );
+            connect( m_rbSharerw, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) );
             vbox->addWidget( m_rbSharerw, 0 );
             rbGroup->insert( m_rbSharerw );
 
@@ -193,8 +193,8 @@ void KFileSharePropsPlugin::init()
             label->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak );
 	    vbox->addWidget( label, 0 );
 	    m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget );
-	    connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
-	    vbox->addWidget( m_pbConfig, 0, Qt::AlignHCenter );
+	    connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) );
+	    vbox->addWidget( m_pbConfig, 0, TQt::AlignHCenter );
 
             vbox->addStretch( 10 );
             
@@ -220,8 +220,8 @@ void KFileSharePropsPlugin::init()
         TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L );
         vbox->addLayout( hBox, 0 );
         m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget );
-        connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
-        hBox->addWidget( m_pbConfig, 0, Qt::AlignHCenter );
+        connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) );
+        hBox->addWidget( m_pbConfig, 0, TQt::AlignHCenter );
         vbox->addStretch( 10 ); // align items on top
         break;
     }
@@ -244,8 +244,8 @@ void KFileSharePropsPlugin::slotConfigureFileSharing()
        d->m_configProc = 0;
        return;
     }
-    connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)),
-            this, TQT_SLOT(slotConfigureFileSharingDone()));
+    connect(d->m_configProc, TQ_SIGNAL(processExited(TDEProcess *)),
+            this, TQ_SLOT(slotConfigureFileSharingDone()));
     m_pbConfig->setEnabled(false);
 }
 
diff --git a/tdeio/tdefile/tdefilesharedlg.h b/tdeio/tdefile/tdefilesharedlg.h
index 4b817f714..e2ed6b194 100644
--- a/tdeio/tdefile/tdefilesharedlg.h
+++ b/tdeio/tdefile/tdefilesharedlg.h
@@ -32,7 +32,7 @@ class TQPushButton;
  */
 class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFileSharePropsPlugin( KPropertiesDialog *_props );
     virtual ~KFileSharePropsPlugin();
diff --git a/tdeio/tdefile/tdefilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h
index 62415dadc..33c12c530 100644
--- a/tdeio/tdefile/tdefilespeedbar.h
+++ b/tdeio/tdefile/tdefilespeedbar.h
@@ -25,7 +25,7 @@ class TDEConfig;
 
 class TDEIO_EXPORT KFileSpeedBar : public KURLBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 );
     ~KFileSpeedBar();
diff --git a/tdeio/tdefile/tdefiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp
index b55c3ffb2..70e7d7c40 100644
--- a/tdeio/tdefile/tdefiletreebranch.cpp
+++ b/tdeio/tdefile/tdefiletreebranch.cpp
@@ -64,32 +64,32 @@ KFileTreeBranch::KFileTreeBranch( KFileTreeView *parent, const KURL& url,
 
     setShowingDotFiles( showHidden );
 
-    connect( this, TQT_SIGNAL( refreshItems(const KFileItemList&)),
-             this, TQT_SLOT  ( slotRefreshItems( const KFileItemList& )));
+    connect( this, TQ_SIGNAL( refreshItems(const KFileItemList&)),
+             this, TQ_SLOT  ( slotRefreshItems( const KFileItemList& )));
 
-    connect( this, TQT_SIGNAL( newItems(const KFileItemList&)),
-             this, TQT_SLOT  ( addItems( const KFileItemList& )));
+    connect( this, TQ_SIGNAL( newItems(const KFileItemList&)),
+             this, TQ_SLOT  ( addItems( const KFileItemList& )));
 
-    connect( this, TQT_SIGNAL( completed(const KURL& )),
-             this,   TQT_SLOT(slCompleted(const KURL&)));
+    connect( this, TQ_SIGNAL( completed(const KURL& )),
+             this,   TQ_SLOT(slCompleted(const KURL&)));
 
-    connect( this, TQT_SIGNAL( started( const KURL& )),
-             this,   TQT_SLOT( slotListerStarted( const KURL& )));
+    connect( this, TQ_SIGNAL( started( const KURL& )),
+             this,   TQ_SLOT( slotListerStarted( const KURL& )));
 
-    connect( this, TQT_SIGNAL( deleteItem( KFileItem* )),
-             this,   TQT_SLOT( slotDeleteItem( KFileItem* )));
+    connect( this, TQ_SIGNAL( deleteItem( KFileItem* )),
+             this,   TQ_SLOT( slotDeleteItem( KFileItem* )));
 
-    connect( this, TQT_SIGNAL( canceled(const KURL&) ),
-             this,   TQT_SLOT( slotCanceled(const KURL&) ));
+    connect( this, TQ_SIGNAL( canceled(const KURL&) ),
+             this,   TQ_SLOT( slotCanceled(const KURL&) ));
 
-    connect( this, TQT_SIGNAL( clear()),
-             this, TQT_SLOT( slotDirlisterClear()));
+    connect( this, TQ_SIGNAL( clear()),
+             this, TQ_SLOT( slotDirlisterClear()));
 
-    connect( this, TQT_SIGNAL( clear(const KURL&)),
-             this, TQT_SLOT( slotDirlisterClearURL(const KURL&)));
+    connect( this, TQ_SIGNAL( clear(const KURL&)),
+             this, TQ_SLOT( slotDirlisterClearURL(const KURL&)));
 
-    connect( this, TQT_SIGNAL( redirection( const KURL& , const KURL& ) ),
-             this, TQT_SLOT( slotRedirect( const KURL&, const KURL& )));
+    connect( this, TQ_SIGNAL( redirection( const KURL& , const KURL& ) ),
+             this, TQ_SLOT( slotRedirect( const KURL&, const KURL& )));
 
     m_openChildrenURLs.append( url );
 }
diff --git a/tdeio/tdefile/tdefiletreebranch.h b/tdeio/tdefile/tdefiletreebranch.h
index 8c9428de3..af5b323de 100644
--- a/tdeio/tdefile/tdefiletreebranch.h
+++ b/tdeio/tdefile/tdefiletreebranch.h
@@ -47,7 +47,7 @@ class KFileTreeView;
 
 class TDEIO_EXPORT KFileTreeBranch : public KDirLister
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    /**
     * constructs a branch for KFileTreeView. Does not yet start to list it.
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 2710d4c08..e9c87f5b6 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -48,32 +48,32 @@ KFileTreeView::KFileTreeView( TQWidget *parent, const char *name )
     setSelectionModeExt( TDEListView::Single );
 
     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;
 
     m_autoOpenTimer = new TQTimer( this );
-    connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoOpenFolder() ) );
+    connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoOpenFolder() ) );
 
     /* The executed-Slot only opens  a path, while the expanded-Slot populates it */
-    connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ),
-             this, TQT_SLOT( slotExecuted( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL( expanded ( TQListViewItem *) ),
-    	     this, TQT_SLOT( slotExpanded( TQListViewItem *) ));
-    connect( this, TQT_SIGNAL( collapsed( TQListViewItem *) ),
-	     this, TQT_SLOT( slotCollapsed( TQListViewItem* )));
+    connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ),
+             this, TQ_SLOT( slotExecuted( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL( expanded ( TQListViewItem *) ),
+    	     this, TQ_SLOT( slotExpanded( TQListViewItem *) ));
+    connect( this, TQ_SIGNAL( collapsed( TQListViewItem *) ),
+	     this, TQ_SLOT( slotCollapsed( TQListViewItem* )));
 
 
     /* connections from the konqtree widget */
-    connect( this, TQT_SIGNAL( selectionChanged() ),
-             this, TQT_SLOT( slotSelectionChanged() ) );
-    connect( this, TQT_SIGNAL( onItem( TQListViewItem * )),
-	     this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) );
-    connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
-             this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
+    connect( this, TQ_SIGNAL( selectionChanged() ),
+             this, TQ_SLOT( slotSelectionChanged() ) );
+    connect( this, TQ_SIGNAL( onItem( TQListViewItem * )),
+	     this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) );
+    connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)),
+             this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int)));
 
 
     m_bDrag = false;
@@ -375,12 +375,12 @@ KFileTreeBranch* KFileTreeView::addBranch( const KURL &path, const TQString& nam
 
 KFileTreeBranch *KFileTreeView::addBranch(KFileTreeBranch *newBranch)
 {
-   connect( newBranch, TQT_SIGNAL(populateFinished( KFileTreeViewItem* )),
-            this, TQT_SLOT( slotPopulateFinished( KFileTreeViewItem* )));
+   connect( newBranch, TQ_SIGNAL(populateFinished( KFileTreeViewItem* )),
+            this, TQ_SLOT( slotPopulateFinished( KFileTreeViewItem* )));
 
-   connect( newBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*,
+   connect( newBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*,
                                const KFileTreeViewItemList& )),
-            this, TQT_SLOT( slotNewTreeViewItems( KFileTreeBranch*,
+            this, TQ_SLOT( slotNewTreeViewItems( KFileTreeBranch*,
                         const KFileTreeViewItemList& )));
 
    m_branches.append( newBranch );
diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index 60f756dc2..b0dd9af36 100644
--- a/tdeio/tdefile/tdefiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -65,7 +65,7 @@ private:
  */
 class TDEIO_EXPORT KFileTreeView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFileTreeView( TQWidget *parent, const char *name = 0 );
     virtual ~KFileTreeView();
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index f171975d8..aa82344c1 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -90,20 +90,20 @@ KFileView::~KFileView()
 void KFileView::setParentView(KFileView *parent)
 {
     if ( parent ) { // pass all signals right to our parent
-        TQObject::connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *,
+        TQObject::connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *,
                                                         const TQPoint& ) ),
-                parent->sig, TQT_SIGNAL( activatedMenu(const KFileItem *,
+                parent->sig, TQ_SIGNAL( activatedMenu(const KFileItem *,
                                                         const TQPoint& )));
-        TQObject::connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *)),
-                parent->sig, TQT_SIGNAL( dirActivated(const KFileItem*)));
-        TQObject::connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *)),
-                parent->sig, TQT_SIGNAL( fileSelected(const KFileItem*)));
-        TQObject::connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ),
-                            parent->sig,TQT_SIGNAL(fileHighlighted(const KFileItem*)));
-        TQObject::connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ),
-                            parent->sig, TQT_SIGNAL(sortingChanged( TQDir::SortSpec)));
-        TQObject::connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ),
-                            parent->sig, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
+        TQObject::connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *)),
+                parent->sig, TQ_SIGNAL( dirActivated(const KFileItem*)));
+        TQObject::connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *)),
+                parent->sig, TQ_SIGNAL( fileSelected(const KFileItem*)));
+        TQObject::connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ),
+                            parent->sig,TQ_SIGNAL(fileHighlighted(const KFileItem*)));
+        TQObject::connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ),
+                            parent->sig, TQ_SIGNAL(sortingChanged( TQDir::SortSpec)));
+        TQObject::connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ),
+                            parent->sig, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&)));
     }
 }
 
diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h
index a747f393e..6703b8c82 100644
--- a/tdeio/tdefile/tdefileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -35,7 +35,7 @@ class TDEActionCollection;
  **/
 class TDEIO_EXPORT KFileViewSignaler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index ce7127d9e..9239d5f4d 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -10,7 +10,7 @@ KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
     : TQObject( parent, name ),
       m_startDir( startDir )
 {
-    TQTimer::singleShot( 1000, this, TQT_SLOT( doit() ));
+    TQTimer::singleShot( 1000, this, TQ_SLOT( doit() ));
 }
 
 void KFDTest::doit()
diff --git a/tdeio/tdefile/tests/kfdtest.h b/tdeio/tdefile/tests/kfdtest.h
index 6c59550b8..5a076460e 100644
--- a/tdeio/tdefile/tests/kfdtest.h
+++ b/tdeio/tdefile/tests/kfdtest.h
@@ -12,7 +12,7 @@
 
 class KFDTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFDTest( const TQString& startDir, TQObject *parent = 0, const char *name = 0);
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index da031eac2..1f3f2e67d 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -45,14 +45,14 @@ testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"),
 
    /* Connect to see the status bar */
    KStatusBar* sta = statusBar();
-   connect( treeView, TQT_SIGNAL( onItem( const TQString& )),
-	    sta, TQT_SLOT( message( const TQString& )));
+   connect( treeView, TQ_SIGNAL( onItem( const TQString& )),
+	    sta, TQ_SLOT( message( const TQString& )));
 
-   connect( treeView, TQT_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )),
-	    this, TQT_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& )));
+   connect( treeView, TQ_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )),
+	    this, TQ_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& )));
 
-   connect( treeView, TQT_SIGNAL( dropped( KURL::List&, KURL& )), this,
-	    TQT_SLOT( copyURLs( KURL::List&, KURL& )));
+   connect( treeView, TQ_SIGNAL( dropped( KURL::List&, KURL& )), this,
+	    TQ_SLOT( copyURLs( KURL::List&, KURL& )));
 
    treeView->addColumn( "File" );
    treeView->addColumn( "ChildCount" );
@@ -77,10 +77,10 @@ void testFrame::showPath( const KURL &url )
       if( dirOnlyMode ) treeView->setDirOnlyMode( nb, true );
       nb->setOpenPixmap( pixOpen );
 
-      connect( nb, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)),
-	       this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*)));
-      connect( nb, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )),
-	       this, TQT_SLOT( slotSetChildCount( KFileTreeViewItem*, int )));
+      connect( nb, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)),
+	       this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*)));
+      connect( nb, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )),
+	       this, TQ_SLOT( slotSetChildCount( KFileTreeViewItem*, int )));
       // nb->setChildRecurse(false );
 
       nb->setOpen(true);
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 0375f8d11..246d769ef 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
@@ -22,7 +22,7 @@
 
 class testFrame: public TDEMainWindow
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    testFrame();
    void showPath( const KURL & );
diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp
index 24a5c247d..54d4aeab1 100644
--- a/tdeio/tdeio/chmodjob.cpp
+++ b/tdeio/tdeio/chmodjob.cpp
@@ -48,7 +48,7 @@ ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask,
       m_newOwner( newOwner ), m_newGroup( newGroup ),
       m_recursive( recursive ), m_lstItems( lstItems )
 {
-    TQTimer::singleShot( 0, this, TQT_SLOT(processList()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(processList()) );
 }
 
 void ChmodJob::processList()
@@ -77,9 +77,9 @@ void ChmodJob::processList()
             {
                 //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl;
                 TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ );
-                connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *,
+                connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *,
                                                   const TDEIO::UDSEntryList& )),
-                         TQT_SLOT( slotEntries( TDEIO::Job*,
+                         TQ_SLOT( slotEntries( TDEIO::Job*,
                                             const TDEIO::UDSEntryList& )));
                 addSubjob( listJob );
                 return; // we'll come back later, when this one's finished
diff --git a/tdeio/tdeio/chmodjob.h b/tdeio/tdeio/chmodjob.h
index 87ce89683..fec1fe18b 100644
--- a/tdeio/tdeio/chmodjob.h
+++ b/tdeio/tdeio/chmodjob.h
@@ -36,7 +36,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT ChmodJob : public TDEIO::Job
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
 	/**
 	 * Create new ChmodJobs using the TDEIO::chmod() function.
diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp
index 5ae0f5685..8b21e3a0c 100644
--- a/tdeio/tdeio/connection.cpp
+++ b/tdeio/tdeio/connection.cpp
@@ -143,7 +143,7 @@ void Connection::init(TDESocket *sock)
 	if ( m_suspended ) {
             suspend();
 	}
-	TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member);
+	TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member);
     }
     dequeue();
 }
@@ -159,7 +159,7 @@ void Connection::init(int _fd_in, int fd_out)
 	if ( m_suspended ) {
             suspend();
 	}
-	TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member);
+	TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member);
     }
     dequeue();
 }
@@ -175,7 +175,7 @@ void Connection::connect(TQObject *_receiver, const char *_member)
 	notifier = new TQSocketNotifier(fd_in, TQSocketNotifier::Read);
         if ( m_suspended )
             suspend();
-	TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member);
+	TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member);
     }
 }
 
diff --git a/tdeio/tdeio/connection.h b/tdeio/tdeio/connection.h
index f573aafac..011928899 100644
--- a/tdeio/tdeio/connection.h
+++ b/tdeio/tdeio/connection.h
@@ -47,7 +47,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT Connection : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	/**
 	 * Creates a new connection.
diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index 41a76efd1..46c230f06 100644
--- a/tdeio/tdeio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
@@ -62,7 +62,7 @@ DataSlave::DataSlave() :
   //kdDebug() << this << k_funcinfo << endl;
   _suspended = false;
   timer = new TQTimer(this);
-  connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(dispatchNext()));
+  connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(dispatchNext()));
 }
 
 DataSlave::~DataSlave() {
diff --git a/tdeio/tdeio/dataslave.h b/tdeio/tdeio/dataslave.h
index f4ae32e66..9bd5bfc4f 100644
--- a/tdeio/tdeio/dataslave.h
+++ b/tdeio/tdeio/dataslave.h
@@ -46,7 +46,7 @@ namespace TDEIO {
      * @author Leo Savernik
      */
     class DataSlave : public TDEIO::Slave {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	DataSlave();
 
diff --git a/tdeio/tdeio/davjob.h b/tdeio/tdeio/davjob.h
index 4cf8edb97..a6a2f77bb 100644
--- a/tdeio/tdeio/davjob.h
+++ b/tdeio/tdeio/davjob.h
@@ -54,7 +54,7 @@ namespace TDEIO {
      * @since 3.1
      */
     class TDEIO_EXPORT DavJob : public TransferJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 7198a3fd5..2944cd6aa 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -35,7 +35,7 @@
 #include <kstdguiitem.h>
 #include <klineedit.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -86,7 +86,7 @@ void DefaultProgress::init()
 {
   d = new DefaultProgressPrivate;
 
-#ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
+#ifdef TQ_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
   // Set a useful icon for this window!
   KWin::setIcons( winId(),
           TDEGlobal::iconLoader()->loadIcon( "document-save", TDEIcon::NoGroup, 32 ),
@@ -98,7 +98,7 @@ void DefaultProgress::init()
   topLayout->addStrut( 360 );   // makes dlg at least that wide
 
   TQGridLayout *grid = new TQGridLayout( 2, 3 );
-  topLayout->addLayout(TQT_TQLAYOUT(grid));
+  topLayout->addLayout(grid);
   grid->addColSpacing(1, KDialog::spacingHint());
   // filenames or action name
   grid->addWidget(new TQLabel(i18n("Source:"), this), 0, 0);
@@ -147,7 +147,7 @@ void DefaultProgress::init()
   topLayout->addWidget( line );
 
   d->keepOpen = new TQCheckBox( i18n("&Keep this window open after transfer is complete"), this);
-  connect( d->keepOpen, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotKeepOpenToggled(bool) ) );
+  connect( d->keepOpen, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotKeepOpenToggled(bool) ) );
   topLayout->addWidget(d->keepOpen);
   d->keepOpen->hide();
 
@@ -155,20 +155,20 @@ void DefaultProgress::init()
   topLayout->addLayout(hBox);
 
   d->openFile = new KPushButton( i18n("Open &File"), this );
-  connect( d->openFile, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenFile() ) );
+  connect( d->openFile, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenFile() ) );
   hBox->addWidget( d->openFile );
   d->openFile->setEnabled(false);
   d->openFile->hide();
 
   d->openLocation = new KPushButton( i18n("Open &Destination"), this );
-  connect( d->openLocation, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenLocation() ) );
+  connect( d->openLocation, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenLocation() ) );
   hBox->addWidget( d->openLocation );
   d->openLocation->hide();
 
   hBox->addStretch(1);
 
   d->cancelClose = new KPushButton( KStdGuiItem::cancel(), this );
-  connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) );
+  connect( d->cancelClose, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStop() ) );
   hBox->addWidget( d->cancelClose );
 
   resize( sizeHint() );
diff --git a/tdeio/tdeio/defaultprogress.h b/tdeio/tdeio/defaultprogress.h
index de0dfd093..d3fdf785e 100644
--- a/tdeio/tdeio/defaultprogress.h
+++ b/tdeio/tdeio/defaultprogress.h
@@ -36,7 +36,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT DefaultProgress : public ProgressBase {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp
index c4e4daa0c..66ab1202d 100644
--- a/tdeio/tdeio/forwardingslavebase.cpp
+++ b/tdeio/tdeio/forwardingslavebase.cpp
@@ -318,52 +318,52 @@ void ForwardingSlaveBase::connectJob(TDEIO::Job *job)
         kdDebug() << it.key() << " = " << it.data() << endl;
 #endif
 
-    connect( job, TQT_SIGNAL( result(TDEIO::Job *) ),
-             this, TQT_SLOT( slotResult(TDEIO::Job *) ) );
-    connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ),
-             this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) );
-    connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ),
-             this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) );
-    connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ),
-             this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) );
+    connect( job, TQ_SIGNAL( result(TDEIO::Job *) ),
+             this, TQ_SLOT( slotResult(TDEIO::Job *) ) );
+    connect( job, TQ_SIGNAL( warning(TDEIO::Job *, const TQString &) ),
+             this, TQ_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ),
+             this, TQ_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQ_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQ_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQ_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQ_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQ_SIGNAL( speed(TDEIO::Job *, unsigned long) ),
+             this, TQ_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) );
 }
 
 void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job)
 {
     connectJob(job);
-    connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ),
-             this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) );
+    connect( job, TQ_SIGNAL( redirection(TDEIO::Job *, const KURL &) ),
+             this, TQ_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) );
 }
 
 void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job)
 {
     connectSimpleJob(job);
-    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 &) ) );
 }
 
 void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job)
 {
     connectSimpleJob(job);
-    connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
-             this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
-    connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
-             this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) );
-    connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ),
-             this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) );
-    connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ),
-             this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) );
+    connect( job, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ),
+             this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
+    connect( job, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ),
+             this, TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) );
+    connect( job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ),
+             this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) );
+    connect( job, TQ_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ),
+             this, TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) );
 }
 
 void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job)
 {
     connectJob(job);
-    connect( job, TQT_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ),
-             this, TQT_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) );
+    connect( job, TQ_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ),
+             this, TQ_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) );
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/tdeio/tdeio/forwardingslavebase.h b/tdeio/tdeio/forwardingslavebase.h
index 5905fcf5e..00d38cdba 100644
--- a/tdeio/tdeio/forwardingslavebase.h
+++ b/tdeio/tdeio/forwardingslavebase.h
@@ -87,7 +87,7 @@ class ForwardingSlaveBasePrivate;
  */
 class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     ForwardingSlaveBase(const TQCString &protocol,
                         const TQCString &poolSocket,
diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp
index ff51ac19c..be6e6d89a 100644
--- a/tdeio/tdeio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -1144,22 +1144,34 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er
       break;
 
     case  TDEIO::ERR_SERVER_TIMEOUT:
+    {
+      int connTimeout   = KProtocolManager::connectTimeout();
+      int respTimeout   = KProtocolManager::responseTimeout();
+      int prConnTimeout = KProtocolManager::proxyConnectTimeout();
       errorName = i18n( "Timeout Error" );
-      description = i18n( "Although contact was made with the server, a "
-        "response was not received within the amount of time allocated for "
-        "the request as follows:<ul>"
-        "<li>Timeout for establishing a connection: %1 seconds</li>"
-        "<li>Timeout for receiving a response: %2 seconds</li>"
-        "<li>Timeout for accessing proxy servers: %3 seconds</li></ul>"
-        "Please note that you can alter these timeout settings in the TDE "
-        "Control Center, by selecting Network -> Preferences." )
-        .arg( KProtocolManager::connectTimeout() )
-        .arg( KProtocolManager::responseTimeout() )
-        .arg( KProtocolManager::proxyConnectTimeout() );
+      description = i18n("Although contact was made with the server, a "
+          "response was not received within the amount of time allocated for "
+          "the request as follows:")
+        .append(TQString::fromLatin1("<ul><li>"))
+        .append(i18n("Timeout for establishing a connection: %n second",
+                     "Timeout for establishing a connection: %n seconds",
+                     connTimeout))
+        .append(TQString::fromLatin1("</li><li>"))
+        .append(i18n("Timeout for receiving a response: %n second",
+                     "Timeout for receiving a response: %n seconds",
+                     respTimeout))
+        .append(TQString::fromLatin1("</li><li>"))
+        .append(i18n("Timeout for accessing proxy servers: %n second",
+                     "Timeout for accessing proxy servers: %n seconds",
+                     prConnTimeout))
+        .append(TQString::fromLatin1("</li></ul>"))
+        .append(i18n("Please note that you can alter these timeout settings in the TDE "
+                     "Control Center, by selecting Network -> Preferences." ));
       causes << cNetpath << i18n( "The server was too busy responding to other "
         "requests to respond." );
       solutions << sTryagain << sServeradmin;
       break;
+    }
 
     case  TDEIO::ERR_UNKNOWN:
       errorName = i18n( "Unknown Error" );
@@ -1295,6 +1307,8 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er
 #endif
 #ifdef HAVE_SYS_UCRED_H
 #include <sys/ucred.h>
+#elif defined(HAVE_UCRED_H)
+#include <ucred.h>
 #endif
 #ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index f6156a966..5943ae402 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -73,7 +73,7 @@ extern "C" {
 #ifdef Q_OS_UNIX
 #include <utime.h>
 #endif
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <netwm.h>
 #include <fixx11h.h>
 #endif
@@ -89,15 +89,23 @@ template class TQPtrList<TDEIO::Job>;
 class Job::JobPrivate
 {
 public:
-    JobPrivate() : m_autoErrorHandling( false ), m_autoWarningHandling( true ),
-                   m_interactive( true ), m_parentJob( 0L ), m_extraFlags(0),
-                   m_processedSize(0), m_userTimestamp(0)
+    JobPrivate() : m_autoErrorHandling(false), m_autoWarningHandling(true),
+                   m_interactive(true), m_errorParentWidgetGP(0), m_parentJob(0L),
+                   m_extraFlags(0), m_processedSize(0), m_userTimestamp(0)
                    {}
 
+    ~JobPrivate()
+    {
+      if (m_errorParentWidgetGP)
+      {
+        delete m_errorParentWidgetGP;
+      }
+    }
+
     bool m_autoErrorHandling;
     bool m_autoWarningHandling;
     bool m_interactive;
-    TQGuardedPtr<TQWidget> m_errorParentWidget;
+    TQGuardedPtr<TQWidget> *m_errorParentWidgetGP;
     // Maybe we could use the TQObject parent/child mechanism instead
     // (requires a new ctor, and moving the ctor code to some init()).
     Job* m_parentJob;
@@ -106,7 +114,18 @@ public:
     unsigned long m_userTimestamp;
 };
 
-Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0)
+static TQObject *__job_root_obj = nullptr;
+
+static TQObject* __getJobRoot()
+{
+    if (!__job_root_obj)
+    {
+        __job_root_obj = new TQObject(0, "jobroot");
+    }
+    return __job_root_obj;
+}
+
+Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m_percent(0)
    , m_progressId(0), m_speedTimer(0), d( new JobPrivate )
 {
     // All jobs delete themselves after emiting 'result'.
@@ -118,16 +137,16 @@ Job::Job(bool showProgressInfo) : TQObject(0, "job"), m_error(0), m_percent(0)
         addMetaData("progress-id", TQString::number(m_progressId));
         //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl;
         // Connect global progress info signals
-        connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
-        connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ),
-                 Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) );
-        connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-                 Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-        connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-                 Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-        connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+        connect( this, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+        connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ),
+                 Observer::self(), TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) );
+        connect( this, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 Observer::self(), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( this, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 Observer::self(), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( this, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
     }
     // Don't exit while this job is running
     if (kapp)
@@ -141,7 +160,9 @@ Job::~Job()
     delete m_speedTimer;
     delete d;
     if (kapp)
-        kapp->deref();
+    {
+      kapp->deref();
+    }
 }
 
 int& Job::extraFlags()
@@ -164,15 +185,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData)
     //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl;
     subjobs.append(job);
 
-    connect( job, TQT_SIGNAL(result(TDEIO::Job*)),
-             TQT_SLOT(slotResult(TDEIO::Job*)) );
+    connect( job, TQ_SIGNAL(result(TDEIO::Job*)),
+             TQ_SLOT(slotResult(TDEIO::Job*)) );
 
     // Forward information from that subjob.
-    connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )),
-             TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) );
+    connect( job, TQ_SIGNAL(speed( TDEIO::Job*, unsigned long )),
+             TQ_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) );
 
-    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 &)) );
 
     if (inheritMetaData)
        job->mergeMetaData(m_outgoingMetaData);
@@ -219,7 +240,7 @@ void Job::emitSpeed( unsigned long bytes_per_second )
   if ( !m_speedTimer )
   {
     m_speedTimer = new TQTimer();
-    connect( m_speedTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSpeedTimeout() ) );
+    connect( m_speedTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSpeedTimeout() ) );
   }
   emit speed( this, bytes_per_second );
   m_speedTimer->start( 5000 );   // 5 seconds interval should be enough
@@ -231,7 +252,7 @@ void Job::emitResult()
   if ( m_progressId ) // Did we get an ID from the observer ?
     Observer::self()->jobFinished( m_progressId );
   if ( m_error && d->m_interactive && d->m_autoErrorHandling )
-    showErrorDialog( d->m_errorParentWidget );
+    showErrorDialog( d->m_errorParentWidgetGP ? *d->m_errorParentWidgetGP : nullptr);
   emit result(this);
   deleteLater();
 }
@@ -320,8 +341,16 @@ void Job::showErrorDialog( TQWidget * parent )
 
 void Job::setAutoErrorHandlingEnabled( bool enable, TQWidget *parentWidget )
 {
+  if (d->m_errorParentWidgetGP && (TQWidget*)(*d->m_errorParentWidgetGP) != parentWidget)
+  {
+    delete d->m_errorParentWidgetGP;
+    d->m_errorParentWidgetGP = nullptr;
+  }
   d->m_autoErrorHandling = enable;
-  d->m_errorParentWidget = parentWidget;
+  if (enable && parentWidget && !d->m_errorParentWidgetGP)
+  {
+    d->m_errorParentWidgetGP = new TQGuardedPtr<TQWidget>(parentWidget);
+  }
 }
 
 bool Job::isAutoErrorHandlingEnabled() const
@@ -362,7 +391,7 @@ TQWidget *Job::window() const
 
 void Job::updateUserTimestamp( unsigned long time )
 {
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   if( d->m_userTimestamp == 0 || NET::timestampCompare( time, d->m_userTimestamp ) > 0 )
       d->m_userTimestamp = time;
 #endif
@@ -449,7 +478,7 @@ SimpleJob::SimpleJob(const KURL& url, int command, const TQByteArray &packedArgs
         kdDebug() << "ERR_MALFORMED_URL" << endl;
         m_error = ERR_MALFORMED_URL;
         m_errorText = m_url.url();
-        TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) );
+        TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) );
         return;
     }
 }
@@ -495,38 +524,38 @@ void SimpleJob::start(Slave *slave)
 {
     m_slave = slave;
 
-    connect( m_slave, TQT_SIGNAL( error( int , const TQString & ) ),
-             TQT_SLOT( slotError( int , const TQString & ) ) );
+    connect( m_slave, TQ_SIGNAL( error( int , const TQString & ) ),
+             TQ_SLOT( slotError( int , const TQString & ) ) );
 
-    connect( m_slave, TQT_SIGNAL( warning( const TQString & ) ),
-             TQT_SLOT( slotWarning( const TQString & ) ) );
+    connect( m_slave, TQ_SIGNAL( warning( const TQString & ) ),
+             TQ_SLOT( slotWarning( const TQString & ) ) );
 
-    connect( m_slave, TQT_SIGNAL( infoMessage( const TQString & ) ),
-             TQT_SLOT( slotInfoMessage( const TQString & ) ) );
+    connect( m_slave, TQ_SIGNAL( infoMessage( const TQString & ) ),
+             TQ_SLOT( slotInfoMessage( const TQString & ) ) );
 
-    connect( m_slave, TQT_SIGNAL( connected() ),
-             TQT_SLOT( slotConnected() ) );
+    connect( m_slave, TQ_SIGNAL( connected() ),
+             TQ_SLOT( slotConnected() ) );
 
-    connect( m_slave, TQT_SIGNAL( finished() ),
-             TQT_SLOT( slotFinished() ) );
+    connect( m_slave, TQ_SIGNAL( finished() ),
+             TQ_SLOT( slotFinished() ) );
 
     if ((extraFlags() & EF_TransferJobDataSent) == 0)
     {
-        connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
-                 TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
+        connect( m_slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+                 TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
 
-        connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
-                 TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
+        connect( m_slave, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+                 TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
 
-        connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ),
-                 TQT_SLOT( slotSpeed( unsigned long ) ) );
+        connect( m_slave, TQ_SIGNAL( speed( unsigned long ) ),
+                 TQ_SLOT( slotSpeed( unsigned long ) ) );
     }
 
-    connect( slave, TQT_SIGNAL( needProgressId() ),
-             TQT_SLOT( slotNeedProgressId() ) );
+    connect( slave, TQ_SIGNAL( needProgressId() ),
+             TQ_SLOT( slotNeedProgressId() ) );
 
-    connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ),
-             TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) );
+    connect( slave, TQ_SIGNAL(metaData( const TDEIO::MetaData& ) ),
+             TQ_SLOT( slotMetaData( const TDEIO::MetaData& ) ) );
 
     if (m_window)
     {
@@ -697,8 +726,8 @@ MkdirJob::MkdirJob( const KURL& url, int command,
 
 void MkdirJob::start(Slave *slave)
 {
-    connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
-             TQT_SLOT( slotRedirection(const KURL &) ) );
+    connect( slave, TQ_SIGNAL( redirection(const KURL &) ),
+             TQ_SLOT( slotRedirection(const KURL &) ) );
 
     SimpleJob::start(slave);
 }
@@ -818,8 +847,8 @@ LocalURLJob::LocalURLJob( const KURL& url, int command,
 
 void LocalURLJob::start(Slave *slave)
 {
-    connect( slave, TQT_SIGNAL( localURL(const KURL &, bool) ),
-             TQT_SLOT( slotLocalURL(const KURL &, bool) ) );
+    connect( slave, TQ_SIGNAL( localURL(const KURL &, bool) ),
+             TQ_SLOT( slotLocalURL(const KURL &, bool) ) );
 
     SimpleJob::start(slave);
 }
@@ -859,10 +888,10 @@ void StatJob::start(Slave *slave)
     m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" );
     m_outgoingMetaData.replace( "details", TQString::number(m_details) );
 
-    connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ),
-             TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) );
-    connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
-             TQT_SLOT( slotRedirection(const KURL &) ) );
+    connect( slave, TQ_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ),
+             TQ_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) );
+    connect( slave, TQ_SIGNAL( redirection(const KURL &) ),
+             TQ_SLOT( slotRedirection(const KURL &) ) );
 
     SimpleJob::start(slave);
 }
@@ -1164,26 +1193,26 @@ void TransferJob::resume()
 void TransferJob::start(Slave *slave)
 {
     assert(slave);
-    connect( slave, TQT_SIGNAL( data( const TQByteArray & ) ),
-             TQT_SLOT( slotData( const TQByteArray & ) ) );
+    connect( slave, TQ_SIGNAL( data( const TQByteArray & ) ),
+             TQ_SLOT( slotData( const TQByteArray & ) ) );
 
-    connect( slave, TQT_SIGNAL( dataReq() ),
-             TQT_SLOT( slotDataReq() ) );
+    connect( slave, TQ_SIGNAL( dataReq() ),
+             TQ_SLOT( slotDataReq() ) );
 
-    connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
-             TQT_SLOT( slotRedirection(const KURL &) ) );
+    connect( slave, TQ_SIGNAL( redirection(const KURL &) ),
+             TQ_SLOT( slotRedirection(const KURL &) ) );
 
-    connect( slave, TQT_SIGNAL(mimeType( const TQString& ) ),
-             TQT_SLOT( slotMimetype( const TQString& ) ) );
+    connect( slave, TQ_SIGNAL(mimeType( const TQString& ) ),
+             TQ_SLOT( slotMimetype( const TQString& ) ) );
 
-    connect( slave, TQT_SIGNAL(errorPage() ),
-             TQT_SLOT( slotErrorPage() ) );
+    connect( slave, TQ_SIGNAL(errorPage() ),
+             TQ_SLOT( slotErrorPage() ) );
 
-    connect( slave, TQT_SIGNAL( needSubURLData() ),
-             TQT_SLOT( slotNeedSubURLData() ) );
+    connect( slave, TQ_SIGNAL( needSubURLData() ),
+             TQ_SLOT( slotNeedSubURLData() ) );
 
-    connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
-             TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
+    connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ),
+             TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
 
     if (slave->suspended())
     {
@@ -1202,8 +1231,8 @@ void TransferJob::slotNeedSubURLData()
     // Job needs data from subURL.
     m_subJob = TDEIO::get( m_subUrl, false, false);
     suspend(); // Put job on hold until we have some data.
-    connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)),
-            TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &)));
+    connect(m_subJob, TQ_SIGNAL( data(TDEIO::Job*,const TQByteArray &)),
+            TQ_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &)));
     addSubjob(m_subJob);
 }
 
@@ -1396,7 +1425,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo
                                          packedArgs, postData, showProgressInfo );
 
     if (redirection)
-      TQTimer::singleShot(0, job, TQT_SLOT(slotPostRedirection()) );
+      TQTimer::singleShot(0, job, TQ_SLOT(slotPostRedirection()) );
 
     return job;
 }
@@ -1429,10 +1458,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command,
     : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ),
       m_uploadOffset( 0 )
 {
-    connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) );
-    connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
-             TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) );
+    connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQ_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ),
+             TQ_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) );
 }
 
 void StoredTransferJob::setData( const TQByteArray& arr )
@@ -1560,8 +1589,8 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command,
 
 void DirectCopyJob::start( Slave* slave )
 {
-    connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ),
-             TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
+    connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ),
+             TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) );
     SimpleJob::start(slave);
 }
 
@@ -1608,7 +1637,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions,
     d->m_delJob = 0;
     d->m_sourceSize = (TDEIO::filesize_t) -1;
     d->m_modificationTime = static_cast<time_t>( -1 );
-    TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
 }
 
 void FileCopyJob::slotStart()
@@ -1702,8 +1731,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url)
     m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false);
     addSubjob( m_copyJob );
     connectSubjob( m_copyJob );
-    connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
-             TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
+    connect( m_copyJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+             TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
 }
 
 void FileCopyJob::startRenameJob(const KURL &slave_url)
@@ -1716,14 +1745,14 @@ void FileCopyJob::startRenameJob(const KURL &slave_url)
 
 void FileCopyJob::connectSubjob( SimpleJob * job )
 {
-    connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )),
-             this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) );
+    connect( job, TQ_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )),
+             this, TQ_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) );
 
-    connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )),
-             this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) );
+    connect( job, TQ_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )),
+             this, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) );
 
-    connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )),
-             this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) );
+    connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )),
+             this, TQ_SLOT( slotPercent(TDEIO::Job*, unsigned long)) );
 
 }
 
@@ -1765,16 +1794,16 @@ void FileCopyJob::startDataPump()
     m_putJob = put( m_dest, m_permissions, m_overwrite, m_resume, false /* no GUI */);
     if ( d->m_modificationTime != static_cast<time_t>( -1 ) ) {
         TQDateTime dt; dt.setTime_t( d->m_modificationTime );
-        m_putJob->addMetaData( "modified", dt.toString( Qt::ISODate ) );
+        m_putJob->addMetaData( "modified", dt.toString( TQt::ISODate ) );
     }
     //kdDebug(7007) << "FileCopyJob: m_putJob = " << m_putJob << " m_dest=" << m_dest << endl;
 
     // The first thing the put job will tell us is whether we can
     // resume or not (this is always emitted)
-    connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
-             TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
-    connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)),
-             TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&)));
+    connect( m_putJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+             TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
+    connect( m_putJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)),
+             TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&)));
     addSubjob( m_putJob );
 }
 
@@ -1833,8 +1862,8 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
                 m_getJob->addMetaData( "resume", TDEIO::number(offset) );
 
                 // Might or might not get emitted
-                connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
-                         TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
+                connect( m_getJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)),
+                         TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t)));
             }
             m_putJob->slave()->setOffset( offset );
 
@@ -1843,10 +1872,10 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset )
             connectSubjob( m_getJob ); // Progress info depends on get
             m_getJob->resume(); // Order a beer
 
-            connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
-                     TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) );
-            connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ),
-                     TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
+            connect( m_getJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+                     TQ_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) );
+            connect( m_getJob, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ),
+                     TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
         }
         else // copyjob
         {
@@ -2075,9 +2104,9 @@ void ListJob::slotListEntries( const TDEIO::UDSEntryList& list )
                                                prefix + filename + "/",
                                                includeHidden);
                     Scheduler::scheduleJob(job);
-                    connect(job, TQT_SIGNAL(entries( TDEIO::Job *,
+                    connect(job, TQ_SIGNAL(entries( TDEIO::Job *,
                                                  const TDEIO::UDSEntryList& )),
-                            TQT_SLOT( gotEntries( TDEIO::Job*,
+                            TQ_SLOT( gotEntries( TDEIO::Job*,
                                               const TDEIO::UDSEntryList& )));
                     addSubjob(job);
                 }
@@ -2210,15 +2239,15 @@ void ListJob::start(Slave *slave)
     {
         m_error = ERR_ACCESS_DENIED;
         m_errorText = m_url.url();
-        TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) );
+        TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) );
         return;
     }
-    connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )),
-             TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& )));
-    connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
-             TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
-    connect( slave, TQT_SIGNAL( redirection(const KURL &) ),
-             TQT_SLOT( slotRedirection(const KURL &) ) );
+    connect( slave, TQ_SIGNAL( listEntries( const TDEIO::UDSEntryList& )),
+             TQ_SLOT( slotListEntries( const TDEIO::UDSEntryList& )));
+    connect( slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+             TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) );
+    connect( slave, TQ_SIGNAL( redirection(const KURL &) ),
+             TQ_SLOT( slotRedirection(const KURL &) ) );
 
     SimpleJob::start(slave);
 }
@@ -2261,13 +2290,13 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a
     d->m_globalDestinationState = destinationState;
 
     if ( showProgressInfo ) {
-        connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+        connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
 
-        connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
-                 Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+        connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+                 Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
     }
-    TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
     /**
        States:
        STATE_STATING for the dest
@@ -2298,7 +2327,7 @@ void CopyJob::slotStart()
     */
     m_reportTimer = new TQTimer(this);
 
-    connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport()));
+    connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport()));
     m_reportTimer->start(REPORT_TIMEOUT,false);
 
     // Stat the dest
@@ -2812,9 +2841,9 @@ void CopyJob::startListing( const KURL & src )
     d->m_bURLDirty = true;
     ListJob * newjob = listRecursive( src, false );
     newjob->setUnrestricted(true);
-    connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+    connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *,
                                     const TDEIO::UDSEntryList& )),
-            TQT_SLOT( slotEntries( TDEIO::Job*,
+            TQ_SLOT( slotEntries( TDEIO::Job*,
                                const TDEIO::UDSEntryList& )));
     addSubjob( newjob );
 }
@@ -3142,7 +3171,7 @@ void CopyJob::slotResultCopyingFiles( Job * job )
             }
             else
             {
-                if ( m_bCurrentOperationIsLink && ::tqqt_cast<TDEIO::DeleteJob*>( job ) )
+                if ( m_bCurrentOperationIsLink && ::tqt_cast<TDEIO::DeleteJob*>( job ) )
                 {
                     // Very special case, see a few lines below
                     // We are deleting the source of a symlink we successfully moved... ignore error
@@ -3159,7 +3188,7 @@ void CopyJob::slotResultCopyingFiles( Job * job )
     {
         // Special case for moving links. That operation needs two jobs, unlike others.
         if ( m_bCurrentOperationIsLink && m_mode == Move
-             && !::tqqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done
+             && !::tqt_cast<TDEIO::DeleteJob *>( job ) // Deleting source not already done
              )
         {
             subjobs.remove( job );
@@ -3519,10 +3548,10 @@ void CopyJob::copyNextFile()
             d->m_bURLDirty = true;
         }
         addSubjob(newjob);
-        connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-                 this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-        connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-                 this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( newjob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 this, TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+        connect( newjob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+                 this, TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
     }
     else
     {
@@ -4002,29 +4031,29 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn
 {
   if ( showProgressInfo ) {
 
-     connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
-              Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+     connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+              Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
 
-     connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
-              Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+     connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+              Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
 
      // See slotReport
-     /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
-      m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+     /*connect( this, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+      m_observer, TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
 
-      connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
-      m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+      connect( this, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+      m_observer, TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
 
-      connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
-      m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/
+      connect( this, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+      m_observer, TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/
 
      m_reportTimer=new TQTimer(this);
-     connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport()));
+     connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport()));
      //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX
      m_reportTimer->start(REPORT_TIMEOUT,false);
   }
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotStart()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotStart()));
 }
 
 void DeleteJob::slotStart()
@@ -4350,9 +4379,9 @@ void DeleteJob::slotResult( Job *job )
                 ListJob *newjob = listRecursive( url, false );
                 newjob->setUnrestricted(true); // No KIOSK restrictions
                 Scheduler::scheduleJob(newjob);
-                connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *,
+                connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *,
                                                 const TDEIO::UDSEntryList& )),
-                        TQT_SLOT( slotEntries( TDEIO::Job*,
+                        TQ_SLOT( slotEntries( TDEIO::Job*,
                                            const TDEIO::UDSEntryList& )));
                 addSubjob(newjob);
             } else {
@@ -4666,7 +4695,7 @@ TQString CacheInfo::cachedFileName()
 
 TQFile *CacheInfo::cachedFile()
 {
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
    const char *mode = (readWrite ? "rb+" : "rb");
 #else
    const char *mode = (readWrite ? "r+" : "r");
diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index cd078b842..d83668f5b 100644
--- a/tdeio/tdeio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -50,8 +50,8 @@ namespace TDEIO {
      *
      * \code
      *   TDEIO::Job * job = TDEIO::someoperation( some parameters );
-     *   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 * ) ) );
      * \endcode
      *   (other connects, specific to the job)
      *
@@ -65,7 +65,7 @@ namespace TDEIO {
      * @see TDEIO::Slave
      */
     class TDEIO_EXPORT Job : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
 
     protected:
         Job( bool showProgressInfo );
@@ -525,7 +525,7 @@ namespace TDEIO {
      * that manage subjobs but aren't scheduled directly.
      */
     class TDEIO_EXPORT SimpleJob : public TDEIO::Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -686,7 +686,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT StatJob : public SimpleJob {
 
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -778,7 +778,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT MkdirJob : public SimpleJob {
 
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -836,7 +836,7 @@ namespace TDEIO {
      * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy())
      */
     class TDEIO_EXPORT DirectCopyJob : public SimpleJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -872,7 +872,7 @@ namespace TDEIO {
      * reading of data from the slave should be suspended.
      */
     class TDEIO_EXPORT TransferJob : public SimpleJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
        /**
@@ -1072,7 +1072,7 @@ namespace TDEIO {
      * @since 3.3
      */
     class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
        /**
@@ -1117,7 +1117,7 @@ namespace TDEIO {
      * @see TDEIO::multi_get()
      */
     class TDEIO_EXPORT MultiGetJob : public TransferJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -1205,7 +1205,7 @@ namespace TDEIO {
      * @see TDEIO::mimetype()
      */
     class TDEIO_EXPORT MimetypeJob : public TransferJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
        /**
@@ -1247,7 +1247,7 @@ namespace TDEIO {
      * @see TDEIO::file_move()
      */
     class TDEIO_EXPORT FileCopyJob : public Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 	/**
@@ -1389,7 +1389,7 @@ namespace TDEIO {
      * @see TDEIO::listDir()
      */
     class TDEIO_EXPORT ListJob : public SimpleJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
        /**
@@ -1505,7 +1505,7 @@ namespace TDEIO {
      * @see TDEIO::linkAs()
      */
     class TDEIO_EXPORT CopyJob : public Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 	/**
@@ -1760,7 +1760,7 @@ namespace TDEIO {
      * @see TDEIO::del()
      */
     class TDEIO_EXPORT DeleteJob : public Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 	/**
@@ -1864,7 +1864,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT LocalURLJob : public SimpleJob {
 
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeio/tdeio/kacl.cpp b/tdeio/tdeio/kacl.cpp
index fcf3cc13f..b62ac5438 100644
--- a/tdeio/tdeio/kacl.cpp
+++ b/tdeio/tdeio/kacl.cpp
@@ -62,7 +62,7 @@ public:
     bool setMaskPermissions( unsigned short v );
     TQString getUserName( uid_t uid ) const;
     TQString getGroupName( gid_t gid ) const;
-    bool setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type );
+    bool setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type );
     bool setNamedUserOrGroupPermissions( const TQString& name, unsigned short permissions, acl_tag_t type );
 
     acl_t m_acl;
@@ -429,7 +429,7 @@ ACLUserPermissionsList KACL::allUserPermissions() const
 }
 
 #ifdef USE_POSIX_ACL
-bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString, unsigned short> > &list, acl_tag_t type )
+bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< TQPair<TQString, unsigned short> > &list, acl_tag_t type )
 {
     bool allIsWell = true;
     bool atLeastOneUserOrGroup = false;
@@ -456,7 +456,7 @@ bool KACL::KACLPrivate::setAllUsersOrGroups( const TQValueList< QPair<TQString,
 //printACL( newACL, "After cleaning out entries: " );
 
     // now add the entries from the list
-    TQValueList< QPair<TQString, unsigned short> >::const_iterator it = list.constBegin();
+    TQValueList< TQPair<TQString, unsigned short> >::const_iterator it = list.constBegin();
     while ( it != list.constEnd() ) {
         acl_create_entry( &newACL, &entry );
         acl_set_tag_type( entry, type );
diff --git a/tdeio/tdeio/kacl.h b/tdeio/tdeio/kacl.h
index f581f7a8e..3b96f8dfb 100644
--- a/tdeio/tdeio/kacl.h
+++ b/tdeio/tdeio/kacl.h
@@ -23,12 +23,12 @@
 #include <sys/types.h>
 #include <tdeio/global.h>
 
-typedef QPair<TQString, unsigned short> ACLUserPermissions;
+typedef TQPair<TQString, unsigned short> ACLUserPermissions;
 typedef TQValueList<ACLUserPermissions> ACLUserPermissionsList;
 typedef TQValueListIterator<ACLUserPermissions> ACLUserPermissionsIterator;
 typedef TQValueListConstIterator<ACLUserPermissions> ACLUserPermissionsConstIterator;
 
-typedef QPair<TQString, unsigned short> ACLGroupPermissions;
+typedef TQPair<TQString, unsigned short> ACLGroupPermissions;
 typedef TQValueList<ACLGroupPermissions> ACLGroupPermissionsList;
 typedef TQValueListIterator<ACLGroupPermissions> ACLGroupPermissionsIterator;
 typedef TQValueListConstIterator<ACLGroupPermissions> ACLGroupPermissionsConstIterator;
@@ -146,7 +146,7 @@ public:
   bool setNamedUserPermissions( const TQString& name, unsigned short );
 
   /** Returns the list of all group permission entries. Each entry consists
-   * of a name/permissions pair. This is a QPair, therefore access is provided 
+   * of a name/permissions pair. This is a TQPair, therefore access is provided 
    * via the .first and .next members.
    * @return the list of all group permission entries. */
   ACLUserPermissionsList allUserPermissions() const;
@@ -170,7 +170,7 @@ public:
   bool setNamedGroupPermissions( const TQString& name, unsigned short );
 
   /** Returns the list of all group permission entries. Each entry consists
-   * of a name/permissions pair. This is a QPair, therefor access is provided 
+   * of a name/permissions pair. This is a TQPair, therefor access is provided 
    * via the .first and .next members.
    * @return the list of all group permission entries. */
 
diff --git a/tdeio/tdeio/kar.cpp b/tdeio/tdeio/kar.cpp
index 07072d0c6..dd8716c5b 100644
--- a/tdeio/tdeio/kar.cpp
+++ b/tdeio/tdeio/kar.cpp
@@ -45,7 +45,7 @@ KAr::KAr( const TQString& filename )
     //kdDebug(7042) << "KAr(filename) reached." << endl;
     m_filename = filename;
     d = new KArPrivate;
-    setDevice( TQT_TQIODEVICE(new TQFile( filename )) );
+    setDevice( new TQFile( filename ) );
 }
 
 KAr::KAr( TQIODevice * dev )
diff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp
index c6fa72371..313c8e47b 100644
--- a/tdeio/tdeio/kautomount.cpp
+++ b/tdeio/tdeio/kautomount.cpp
@@ -39,7 +39,7 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString&
   m_bShowFilemanagerWindow = _show_filemanager_window;
 
   TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint );
-  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 * ) ) );
 }
 
 void KAutoMount::slotResult( TDEIO::Job * job )
@@ -81,7 +81,7 @@ KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desk
   : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint )
 {
   TDEIO::Job * job = TDEIO::unmount( m_mountpoint );
-  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 * ) ) );
 }
 
 void KAutoUnmount::slotResult( TDEIO::Job * job )
diff --git a/tdeio/tdeio/kautomount.h b/tdeio/tdeio/kautomount.h
index 203c037d9..9c56c56ec 100644
--- a/tdeio/tdeio/kautomount.h
+++ b/tdeio/tdeio/kautomount.h
@@ -24,10 +24,6 @@
 
 #include <tdelibs_export.h>
 
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
 #ifdef Q_OS_UNIX
 
 namespace TDEIO {
@@ -44,7 +40,7 @@ class Job;
  */
 class TDEIO_EXPORT KAutoMount : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class gcc_gives_a_warning_without_this;
 public:
   /**
@@ -89,7 +85,7 @@ private:
  */
 class TDEIO_EXPORT KAutoUnmount : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class gcc_gives_a_warning_without_this;
 public:
   /**
diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp
index 5ec790aa7..8d67808df 100644
--- a/tdeio/tdeio/kdatatool.cpp
+++ b/tdeio/tdeio/kdatatool.cpp
@@ -251,7 +251,7 @@ TQPtrList<TDEAction> KDataToolAction::dataToolActionList( const TQValueList<KDat
         {
             //kdDebug() << "creating action " << *uit << " " << *cit << endl;
             KDataToolAction * action = new KDataToolAction( *uit, *entry, *cit );
-            connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ),
+            connect( action, TQ_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ),
                      receiver, slot );
             actionList.append( action );
         }
diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index a77f8a9ea..d94acdc11 100644
--- a/tdeio/tdeio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -193,7 +193,7 @@ private:
  */
 class TDEIO_EXPORT KDataToolAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -253,7 +253,7 @@ private:
  */
 class TDEIO_EXPORT KDataTool : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 1f3a03d1d..e5045db5b 100644
--- a/tdeio/tdeio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -63,12 +63,12 @@ KDirListerCache::KDirListerCache( int maxCount )
   urlsCurrentlyHeld.setAutoDelete( true );
   pendingUpdates.setAutoDelete( true );
 
-  connect( kdirwatch, TQT_SIGNAL( dirty( const KURL& ) ),
-           this, TQT_SLOT( slotFileDirty( const KURL& ) ) );
-  connect( kdirwatch, TQT_SIGNAL( created( const TQString& ) ),
-           this, TQT_SLOT( slotFileCreated( const TQString& ) ) );
-  connect( kdirwatch, TQT_SIGNAL( deleted( const TQString& ) ),
-           this, TQT_SLOT( slotFileDeleted( const TQString& ) ) );
+  connect( kdirwatch, TQ_SIGNAL( dirty( const KURL& ) ),
+           this, TQ_SLOT( slotFileDirty( const KURL& ) ) );
+  connect( kdirwatch, TQ_SIGNAL( created( const TQString& ) ),
+           this, TQ_SLOT( slotFileCreated( const TQString& ) ) );
+  connect( kdirwatch, TQ_SIGNAL( deleted( const TQString& ) ),
+           this, TQ_SLOT( slotFileDeleted( const TQString& ) ) );
 }
 
 KDirListerCache::~KDirListerCache()
@@ -243,12 +243,12 @@ bool KDirListerCache::listDir( KDirLister *lister, const KURL& _u,
         job->setWindow( lister->d->window );
       }
 
-      connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
-               this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
-      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-               this, TQT_SLOT( slotResult( TDEIO::Job * ) ) );
-      connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ),
-               this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) );
+      connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ),
+               this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) );
+      connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+               this, TQ_SLOT( slotResult( TDEIO::Job * ) ) );
+      connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ),
+               this, TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) );
 
       emit lister->started( _url );
 
@@ -608,10 +608,10 @@ void KDirListerCache::updateDirectory( const KURL& _dir )
   job = TDEIO::listDir( _dir, false /* no default GUI */ );
   jobs.insert( job, TQValueList<TDEIO::UDSEntry>() );
 
-  connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
-           this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
-  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
-           this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) );
+  connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
+           this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
+  connect( job, TQ_SIGNAL(result( TDEIO::Job * )),
+           this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) );
 
   kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl;
 
@@ -925,7 +925,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url )
     {
       // Nice hack to save memory: use the qt object name to store the filename
       TQTimer *timer = new TQTimer( this, _url.path().utf8() );
-      connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileDirtyDelayed()) );
+      connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFileDirtyDelayed()) );
       pendingUpdates.insert( _url.path(), timer );
       timer->start( 500, true );
     }
@@ -935,7 +935,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url )
 // delayed updating of files, FAM is flooding us with events
 void KDirListerCache::slotFileDirtyDelayed()
 {
-  TQString file = TQString::fromUtf8( TQT_TQOBJECT_CONST(sender())->name() );
+  TQString file = TQString::fromUtf8( sender()->name() );
 
   kdDebug(7004) << k_funcinfo << file << endl;
 
@@ -1357,10 +1357,10 @@ void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url )
   // make the job an update job
   job->disconnect( this );
     
-  connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
-           this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
-  connect( job, TQT_SIGNAL(result( TDEIO::Job * )),
-           this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) );
+  connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )),
+           this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) );
+  connect( job, TQ_SIGNAL(result( TDEIO::Job * )),
+           this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) );
 
   // FIXME: autoUpdate-Counts!!
 
@@ -1946,44 +1946,53 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload )
 
   d->changes = NONE;
 
+  if ( !validURL( _url ) ) {
+    return false;
+  }
+
+  // Some ioslaves like media:/ or home:/ can provide a local url istead of a remote one
   // If a local path is available, monitor that instead of the given remote URL...
   if (!_url.isLocalFile()) {
-      TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url);
-      if (localURLJob) {
-          d->openURL_url[localURLJob] = _url;
-          d->openURL_keep[localURLJob] = _keep;
-          d->openURL_reload[localURLJob] = _reload;
-          connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
-          connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed()));
-      }
+    TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(_url);
+    if (localURLJob) {
+      d->openURLContext[localURLJob] = KDirListerPrivate::OpenURLContext{_url, _keep, _reload};
+      connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)),
+              this, TQ_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool)));
+      connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed()));
+      d->complete = false;
       return true;
+    }
   }
-  else {
-      return s_pCache->listDir( this, _url, _keep, _reload );
-  }
+
+  return s_pCache->listDir( this, _url, _keep, _reload );
 }
 
 void KDirLister::slotOpenURLGotLocalURL(TDEIO::LocalURLJob *job, const KURL& url, bool isLocal) {
-  KURL realURL = d->openURL_url[job];
+  auto jobIt = d->openURLContext.find(job);
+
+  Q_ASSERT( jobIt != d->openURLContext.end() );
+
+  auto ctx = jobIt.data();
+  KURL realURL = ctx.url;
   if (isLocal) {
-      realURL = url;
-      realURL.setInternalReferenceURL(d->openURL_url[job].url());
-      d->m_referenceURLMap[d->openURL_url[job].url()] = url.path();
+    realURL = url;
+    realURL.setInternalReferenceURL(ctx.url.url());
+    d->m_referenceURLMap[ctx.url.url()] = url.path();
   }
-  s_pCache->listDir( this, realURL, d->openURL_keep[job], d->openURL_reload[job] );
-  d->openURL_url.remove(job);
-  d->openURL_keep.remove(job);
-  d->openURL_reload.remove(job);
+  d->openURLContext.remove(jobIt);
+  d->complete = d->jobData.isEmpty() && d->openURLContext.isEmpty();
+  s_pCache->listDir( this, realURL, ctx.keep, ctx.reload );
 }
 
 void KDirLister::slotLocalURLKIODestroyed() {
-  TDEIO::LocalURLJob* terminatedJob = const_cast<TDEIO::LocalURLJob*>(static_cast<const TDEIO::LocalURLJob*>(sender()));
+  TDEIO::Job* terminatedJob = const_cast<TDEIO::Job*>(static_cast<const TDEIO::Job*>(sender()));
+  auto jobIt = d->openURLContext.find(terminatedJob);
 
-  if (d->openURL_url.contains(terminatedJob)) {
-      s_pCache->listDir( this, d->openURL_url[terminatedJob], d->openURL_keep[terminatedJob], d->openURL_reload[terminatedJob] );
-      d->openURL_url.remove(terminatedJob);
-      d->openURL_keep.remove(terminatedJob);
-      d->openURL_reload.remove(terminatedJob);
+  if (jobIt != d->openURLContext.end()) {
+    auto ctx = jobIt.data();
+    d->openURLContext.remove(jobIt);
+    d->complete = d->jobData.isEmpty() && d->openURLContext.isEmpty();
+    s_pCache->listDir( this, ctx.url, ctx.keep, ctx.reload );
   }
 }
 
@@ -1991,6 +2000,11 @@ void KDirLister::stop()
 {
   kdDebug(7003) << k_funcinfo << endl;
   s_pCache->stop( this );
+  for( auto it = d->openURLContext.begin(); it != d->openURLContext.end(); ++it ) {
+    it.key()->disconnect( this );
+    it.key()->kill();
+  }
+  d->openURLContext.clear();
   d->m_referenceURLMap.clear();
 }
 
@@ -1998,6 +2012,17 @@ void KDirLister::stop( const KURL& _url )
 {
   kdDebug(7003) << k_funcinfo << _url.prettyURL() << endl;
   s_pCache->stop( this, _url );
+  TQPtrList<TDEIO::Job> toRemove;
+  for( auto it = d->openURLContext.begin(); it != d->openURLContext.end(); ++it ) {
+    if( it.data().url ==_url ) {
+      it.key()->disconnect( this );
+      it.key()->kill();
+      toRemove.append(it.key());
+    }
+  }
+  for(const auto &job: toRemove) {
+    d->openURLContext.remove(job);
+  }
   d->m_referenceURLMap.remove(_url.url());
 }
 
@@ -2355,25 +2380,24 @@ void KDirLister::handleError( TDEIO::Job *job )
 
 void KDirLister::addNewItem( const KFileItem *item )
 {
-  if ( ( d->dirOnlyMode && !item->isDir() ) || !matchesFilter( item ) ) {
-    return; // No reason to continue... bailing out here prevents a mimetype scan.
-  }
-
-  if ((item->url().internalReferenceURL() != "")
-      && (d->m_referenceURLMap.contains(item->url().internalReferenceURL()))) {
+  TQString refURL = item->url().internalReferenceURL();
+  if (!refURL.isEmpty() && d->m_referenceURLMap.contains(refURL) &&
+      item->url().path().startsWith(d->m_referenceURLMap[refURL]))
+  {
     // Likely a media:/ tdeioslave URL or similar
     // Rewrite the URL to ensure that the user remains within the media:/ tree!
-    TQString itemPath = item->url().path();
-    if (itemPath.startsWith(d->m_referenceURLMap[item->url().internalReferenceURL()])) {
-      itemPath = itemPath.remove(0, d->m_referenceURLMap[item->url().internalReferenceURL()].length());
-      TQString newPath = item->url().internalReferenceURL();
-      if (!newPath.endsWith("/")) newPath = newPath + "/";
-      while (itemPath.startsWith("/")) itemPath = itemPath.remove(0,1);
-      while (itemPath.endsWith("/")) itemPath.truncate(itemPath.length()-1);
-      newPath = newPath + itemPath;
-      const_cast<KFileItem*>(item)->setListerURL(item->url());
-      const_cast<KFileItem*>(item)->setURL(newPath);
+    if (!refURL.endsWith("/"))
+    {
+      refURL.append("/");
     }
+    KURL newItemURL(refURL);
+    newItemURL.addPath(item->url().fileName());
+    const_cast<KFileItem*>(item)->setListerURL(newItemURL);
+    const_cast<KFileItem*>(item)->setURL(newItemURL);
+  }
+
+  if ( ( d->dirOnlyMode && !item->isDir() ) || !matchesFilter( item ) ) {
+    return; // No reason to continue... bailing out here prevents a mimetype scan.
   }
 
   if ( matchesMimeFilter( item ) )
@@ -2399,7 +2423,6 @@ void KDirLister::addNewItems( const KFileItemList& items )
   // TODO: make this faster - test if we have a filter at all first
   // DF: was this profiled? The matchesFoo() functions should be fast, w/o filters...
   // Of course if there is no filter and we can do a range-insertion instead of a loop, that might be good.
-  // But that's for Qt4, not possible with TQPtrList.
   for ( KFileItemListIterator kit( items ); kit.current(); ++kit ) {
     addNewItem( *kit );
   }
@@ -2420,21 +2443,20 @@ void KDirLister::addRefreshItem( const KFileItem *item )
 {
   bool isExcluded = (d->dirOnlyMode && !item->isDir()) || !matchesFilter( item );
 
-  if ((item->url().internalReferenceURL() != "")
-      && (d->m_referenceURLMap.contains(item->url().internalReferenceURL()))) {
+  TQString refURL = item->url().internalReferenceURL();
+  if (!refURL.isEmpty() && d->m_referenceURLMap.contains(refURL) &&
+      item->url().path().startsWith(d->m_referenceURLMap[refURL]))
+  {
     // Likely a media:/ tdeioslave URL or similar
     // Rewrite the URL to ensure that the user remains within the media:/ tree!
-    TQString itemPath = item->url().path();
-    if (itemPath.startsWith(d->m_referenceURLMap[item->url().internalReferenceURL()])) {
-      itemPath = itemPath.remove(0, d->m_referenceURLMap[item->url().internalReferenceURL()].length());
-      TQString newPath = item->url().internalReferenceURL();
-      if (!newPath.endsWith("/")) newPath = newPath + "/";
-      while (itemPath.startsWith("/")) itemPath = itemPath.remove(0,1);
-      while (itemPath.endsWith("/")) itemPath.truncate(itemPath.length()-1);
-      newPath = newPath + itemPath;
-      const_cast<KFileItem*>(item)->setListerURL(item->url());
-      const_cast<KFileItem*>(item)->setURL(newPath);
+    if (!refURL.endsWith("/"))
+    {
+      refURL.append("/");
     }
+    KURL newItemURL(refURL);
+    newItemURL.addPath(item->url().fileName());
+    const_cast<KFileItem*>(item)->setListerURL(newItemURL);
+    const_cast<KFileItem*>(item)->setURL(newItemURL);
   }
 
   if ( !isExcluded && matchesMimeFilter( item ) )
@@ -2644,39 +2666,38 @@ void KDirLister::jobStarted( TDEIO::ListJob *job )
 
 void KDirLister::connectJob( TDEIO::ListJob *job )
 {
-  connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )),
-           this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) );
-  connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )),
-           this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) );
-  connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )),
-           this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) );
-  connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )),
-           this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) );
-  connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )),
-           this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) );
+  connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )),
+           this, TQ_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(totalSize( TDEIO::Job *, TDEIO::filesize_t )),
+           this, TQ_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) );
+  connect( job, TQ_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )),
+           this, TQ_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) );
+  connect( job, TQ_SIGNAL(speed( TDEIO::Job *, unsigned long )),
+           this, TQ_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) );
 }
 
 void KDirLister::emitCompleted( const KURL& _url )
 {
-  KURL emitURL = _url;
-
-  if ((_url.internalReferenceURL() != "")
-      && (d->m_referenceURLMap.contains(_url.internalReferenceURL()))) {
+  TQString refURL = _url.internalReferenceURL();
+  if (!refURL.isEmpty() && d->m_referenceURLMap.contains(refURL) &&
+      _url.path().startsWith(d->m_referenceURLMap[refURL]))
+  {
     // Likely a media:/ tdeioslave URL or similar
     // Rewrite the URL to ensure that the user remains within the media:/ tree!
-    TQString itemPath = _url.path();
-    if (itemPath.startsWith(d->m_referenceURLMap[_url.internalReferenceURL()])) {
-      itemPath = itemPath.remove(0, d->m_referenceURLMap[_url.internalReferenceURL()].length());
-      TQString newPath = _url.internalReferenceURL();
-      if (!newPath.endsWith("/")) newPath = newPath + "/";
-      while (itemPath.startsWith("/")) itemPath = itemPath.remove(0,1);
-      while (itemPath.endsWith("/")) itemPath.truncate(itemPath.length()-1);
-      newPath = newPath + itemPath;
-      emitURL = newPath;
+    if (!refURL.endsWith("/"))
+    {
+      refURL.append("/");
     }
+    KURL newItemURL(refURL);
+    newItemURL.addPath(_url.fileName());
+    emit completed(newItemURL);
+  }
+  else
+  {
+    emit completed(_url);
   }
-
-  emit completed( emitURL );
 }
 
 void KDirLister::setMainWindow( TQWidget *window )
diff --git a/tdeio/tdeio/kdirlister.h b/tdeio/tdeio/kdirlister.h
index a48709b19..b69a51841 100644
--- a/tdeio/tdeio/kdirlister.h
+++ b/tdeio/tdeio/kdirlister.h
@@ -58,7 +58,7 @@ class TDEIO_EXPORT KDirLister : public TQObject
   friend class KDirListerPrivate;
   friend class KDirListerCache;
 
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate )
   TQ_PROPERTY( bool showingDotFiles READ showingDotFiles WRITE setShowingDotFiles )
   TQ_PROPERTY( bool dirOnlyMode READ dirOnlyMode WRITE setDirOnlyMode )
diff --git a/tdeio/tdeio/kdirlister_p.h b/tdeio/tdeio/kdirlister_p.h
index 0e1bfa259..7c3461c4b 100644
--- a/tdeio/tdeio/kdirlister_p.h
+++ b/tdeio/tdeio/kdirlister_p.h
@@ -111,9 +111,13 @@ public:
   TQStringList mimeFilter, oldMimeFilter;
   TQStringList mimeExcludeFilter, oldMimeExcludeFilter;
 
-  TQMap<TDEIO::Job*, KURL> openURL_url;
-  TQMap<TDEIO::Job*, bool> openURL_keep;
-  TQMap<TDEIO::Job*, bool> openURL_reload;
+  struct OpenURLContext {
+    KURL url;
+    bool keep;
+    bool reload;
+  };
+
+  TQMap<TDEIO::Job*, OpenURLContext> openURLContext;
 
   TQMap<TQString,TQString> m_referenceURLMap;
 };
@@ -133,7 +137,7 @@ public:
  */
 class KDirListerCache : public TQObject, KDirNotify
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDirListerCache( int maxCount = 10 );
   ~KDirListerCache();
diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp
index 60f7945ac..857e50703 100644
--- a/tdeio/tdeio/kdirwatch.cpp
+++ b/tdeio/tdeio/kdirwatch.cpp
@@ -64,11 +64,17 @@
 // debug
 #include <sys/ioctl.h>
 
+#ifdef Q_OS_SOLARIS
+#include <sys/filio.h> /* FIONREAD */
+#endif /* solaris */
+
 #ifdef HAVE_INOTIFY
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/syscall.h>
+#ifdef Q_OS_LINUX
 #include <linux/types.h>
+#endif /* Linux */
 // Linux kernel headers are documented to not compile
 #define _S390_BITOPS_H
 #include <sys/inotify.h>
@@ -220,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate()
   : rescan_timer(0, "KDirWatchPrivate::rescan_timer")
 {
   timer = new TQTimer(this, "KDirWatchPrivate::timer");
-  connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan()));
+  connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan()));
   freq = 3600000; // 1 hour as upper bound
   statEntries = 0;
   delayRemove = false;
@@ -234,7 +240,7 @@ KDirWatchPrivate::KDirWatchPrivate()
 
   // used for FAM and DNOTIFY
   rescan_all = false;
-  connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan()));
+  connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan()));
 
 #ifdef HAVE_FAM
   // It's possible that FAM server can't be started
@@ -243,8 +249,8 @@ KDirWatchPrivate::KDirWatchPrivate()
     use_fam=true;
     sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc),
 			      TQSocketNotifier::Read, this);
-    connect( sn, TQT_SIGNAL(activated(int)),
- 	     this, TQT_SLOT(famEventReceived()) );
+    connect( sn, TQ_SIGNAL(activated(int)),
+ 	     this, TQ_SLOT(famEventReceived()) );
   }
   else {
     kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl;
@@ -280,7 +286,7 @@ KDirWatchPrivate::KDirWatchPrivate()
     fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC);
 
     mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this );
-    connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) );
+    connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) );
   }
 #endif
 
@@ -314,7 +320,7 @@ KDirWatchPrivate::KDirWatchPrivate()
     fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL));
     fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL));
     mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this);
-    connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated()));
+    connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated()));
     // Install the signal handler only once
     if ( dnotify_signal == 0 )
     {
@@ -1243,7 +1249,7 @@ void KDirWatchPrivate::emitEvent(Entry* e, int event, const KURL &fileName)
     else
 #ifdef Q_OS_UNIX
       path += "/" + fileName.path();
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
       //current drive is passed instead of /
       path += TQDir::currentDirPath().left(2) + "/" + fileName.path();
 #endif
@@ -1414,7 +1420,7 @@ void KDirWatchPrivate::slotRescan()
     timer->start(freq);
   }
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed()));
 }
 
 bool KDirWatchPrivate::isNoisyFile( const char * filename )
@@ -1463,7 +1469,7 @@ void KDirWatchPrivate::famEventReceived()
       checkFAMEvent(&fe);
   }
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed()));
 }
 
 void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe)
@@ -1549,10 +1555,14 @@ void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe)
             removeEntry(0,e->path,sub_entry); // <e> can be invalid here!!
             sub_entry->m_status = Normal;
             if (!useFAM(sub_entry))
+            {
 #ifdef HAVE_INOTIFY
               if (!useINotify(sub_entry ))
 #endif
+              {
                 useStat(sub_entry);
+              }
+            }
           }
           break;
         }
diff --git a/tdeio/tdeio/kdirwatch.h b/tdeio/tdeio/kdirwatch.h
index 0ef3d1d34..ce7dae5cc 100644
--- a/tdeio/tdeio/kdirwatch.h
+++ b/tdeio/tdeio/kdirwatch.h
@@ -64,7 +64,7 @@ class KDirWatchPrivate;
   */
 class TDEIO_EXPORT KDirWatch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
     
   public:
    /**
diff --git a/tdeio/tdeio/kdirwatch_p.h b/tdeio/tdeio/kdirwatch_p.h
index a0d87fee3..46c83cf72 100644
--- a/tdeio/tdeio/kdirwatch_p.h
+++ b/tdeio/tdeio/kdirwatch_p.h
@@ -21,7 +21,7 @@
  */
 class KDirWatchPrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   enum entryStatus { Normal = 0, NonExistent };
diff --git a/tdeio/tdeio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h
index 25613c101..f2c4f1225 100644
--- a/tdeio/tdeio/kfilterbase.h
+++ b/tdeio/tdeio/kfilterbase.h
@@ -24,7 +24,7 @@
 
 #include <tdelibs_export.h>
 
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
 #undef ERROR //avoid conflicts
 #endif
 
@@ -37,7 +37,7 @@ class TQIODevice;
  */
 class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFilterBase();
     virtual ~KFilterBase();
diff --git a/tdeio/tdeio/kfilterdev.cpp b/tdeio/tdeio/kfilterdev.cpp
index b4e024031..4df335090 100644
--- a/tdeio/tdeio/kfilterdev.cpp
+++ b/tdeio/tdeio/kfilterdev.cpp
@@ -70,9 +70,9 @@ TQIODevice* KFilterDev::createFilterDevice(KFilterBase* base, TQFile* file)
 
    //we don't need a filter
    if (base==0)
-       return TQT_TQIODEVICE(new TQFile(file->name())); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF)
+       return new TQFile(file->name()); // A bit strange IMHO. We ask for a TQFile but we create another one !?! (DF)
 
-   base->setDevice(TQT_TQIODEVICE(file));
+   base->setDevice(file);
    return new KFilterDev(base);
 }
 #endif
@@ -86,11 +86,11 @@ TQIODevice * KFilterDev::deviceForFile( const TQString & fileName, const TQStrin
                          : KFilterBase::findFilterByMimeType( mimetype );
     if ( base )
     {
-        base->setDevice(TQT_TQIODEVICE(f), true);
+        base->setDevice(f, true);
         return new KFilterDev(base, true);
     }
     if(!forceFilter)
-        return TQT_TQIODEVICE(f);
+        return f;
     else
     {
         delete f;
@@ -116,7 +116,7 @@ TQIODevice * KFilterDev::device( TQIODevice* inDevice, const TQString & mimetype
    return 0;
 }
 
-bool KFilterDev::open( TQ_OpenMode mode )
+bool KFilterDev::open( int mode )
 {
     //kdDebug(7005) << "KFilterDev::open " << mode << endl;
     if ( mode == IO_ReadOnly )
@@ -132,7 +132,7 @@ bool KFilterDev::open( TQ_OpenMode mode )
     d->bNeedHeader = !d->bSkipHeaders;
     filter->init( mode );
     d->bOpenedUnderlyingDevice = !filter->device()->isOpen();
-    bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (TQ_OpenMode)mode ) : true;
+    bool ret = d->bOpenedUnderlyingDevice ? filter->device()->open( (int)mode ) : true;
     d->result = KFilterBase::OK;
 
     if ( !ret )
@@ -169,11 +169,7 @@ void KFilterDev::flush()
     // Hmm, might not be enough...
 }
 
-#ifdef USE_QT4
-qint64 KFilterDev::size() const
-#else // USE_QT4
 TQIODevice::Offset KFilterDev::size() const
-#endif // USE_QT4
 {
     // Well, hmm, Houston, we have a problem.
     // We can't know the size of the uncompressed data
@@ -236,7 +232,7 @@ bool KFilterDev::atEnd() const
                                      && d->ungetchBuffer.isEmpty();
 }
 
-TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
+TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
 {
     Q_ASSERT ( filter->mode() == IO_ReadOnly );
     //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl;
@@ -355,7 +351,7 @@ TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
     return dataReceived;
 }
 
-TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len )
+TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len )
 {
     Q_ASSERT ( filter->mode() == IO_WriteOnly );
     // If we had an error, return 0.
diff --git a/tdeio/tdeio/kfilterdev.h b/tdeio/tdeio/kfilterdev.h
index 8dd0999a9..1783eccdf 100644
--- a/tdeio/tdeio/kfilterdev.h
+++ b/tdeio/tdeio/kfilterdev.h
@@ -55,7 +55,7 @@ public:
      */
 #ifdef qdoc
 #else
-    virtual bool open( TQ_OpenMode mode );
+    virtual bool open( int mode );
 #endif
     /**
      * Close after reading or writing.
@@ -82,11 +82,7 @@ public:
     // Not implemented
 #ifdef qdoc
 #else
-#ifdef USE_QT4
-    virtual qint64 size() const;
-#else // USE_QT4
     virtual TQIODevice::Offset size() const;
-#endif // USE_QT4
 #endif
 
     virtual TQIODevice::Offset at() const;
@@ -99,8 +95,8 @@ public:
 
 #ifdef qdoc
 #else
-    virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen );
-    virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len );
+    virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
+    virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len );
 #endif
     //int readLine( char *data, uint maxlen );
 
diff --git a/tdeio/tdeio/klimitediodevice.h b/tdeio/tdeio/klimitediodevice.h
index 3dc6c80f3..4337215ff 100644
--- a/tdeio/tdeio/klimitediodevice.h
+++ b/tdeio/tdeio/klimitediodevice.h
@@ -47,7 +47,7 @@ public:
     }
     virtual ~KLimitedIODevice() {}
 
-    virtual bool open( TQ_OpenMode m ) {
+    virtual bool open( int m ) {
         //kdDebug(7005) << "KLimitedIODevice::open m=" << m << endl;
         if ( m & IO_ReadOnly ) {
             /*bool ok = false;
@@ -67,23 +67,19 @@ public:
     virtual void close() {}
     virtual void flush() {}
 
-#ifdef USE_QT4
-    virtual qint64 size() const { return m_length; }
-#else // USE_QT4
     virtual Offset size() const { return m_length; }
-#endif // USE_QT4
 
-    virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen )
+    virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen )
     {
         maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit
         return m_dev->readBlock( data, maxlen );
     }
-    virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported
+    virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported
     virtual int putch( int ) { return -1; } // unsupported
 
     virtual int getch() {
         char c[2];
-        if ( tqreadBlock(c, 1) == -1)
+        if ( readBlock(c, 1) == -1)
             return -1;
         else
             return c[0];
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 0dd96cb6d..67ac7f7ea 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -525,6 +525,10 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode )
         // root of protocol: if we found nothing, revert to mimeTypeIcon (which is usually "folder")
         if ( _url.path().length() <= 1 && ( i == unknown || i.isEmpty() ) )
             i = mimeTypeIcon;
+
+        // special case: root directory (/) -- Gitea issue #128
+        if ( _url == KURL("file:///") )
+            i = "folder_red";
     }
     return i;
 }
@@ -851,7 +855,7 @@ pid_t KDEDesktopMimeType::runFSDevice( const KURL& _url, const KSimpleConfig &cf
     if ( fstype == "Default" ) // KDE-1 thing
       fstype = TQString::null;
     TQString point = cfg.readEntry( "MountPoint" );
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     (void) new KAutoMount( ro, fstype, dev, point, _url.path() );
 #endif
     retval = -1; // we don't want to return 0, but we don't want to return a pid
@@ -1134,7 +1138,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
       if ( fstype == "Default" ) // KDE-1 thing
           fstype = TQString::null;
       TQString point = cfg.readEntry( "MountPoint" );
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       (void)new KAutoMount( ro, fstype, dev, point, path, false );
 #endif
     }
@@ -1144,7 +1148,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT
       if ( mp.isEmpty() )
         return;
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
       (void)new KAutoUnmount( mp, path );
 #endif
     }
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 72fdf925e..b8bbf9679 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -93,12 +93,12 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text,
     ((TQBoxLayout*)btns->layout())->addStretch(1);
     d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns );
 
-    connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) );
+    connect( d->btnEditMimeType, TQ_SIGNAL(clicked()), this, TQ_SLOT(editMimeType()) );
     d->btnEditMimeType->setEnabled( false );
-    connect( d->lvMimeTypes, TQT_SIGNAL( doubleClicked ( TQListViewItem * )),
-             this, TQT_SLOT( editMimeType()));
-    connect( d->lvMimeTypes, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-             this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) );
+    connect( d->lvMimeTypes, TQ_SIGNAL( doubleClicked ( TQListViewItem * )),
+             this, TQ_SLOT( editMimeType()));
+    connect( d->lvMimeTypes, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+             this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) );
 
     TQWhatsThis::add( d->btnEditMimeType, i18n(
         "Click this button to display the familiar TDE mime type editor.") );
@@ -192,9 +192,9 @@ void KMimeTypeChooser::editMimeType()
   if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->parent()) )
     return;
   TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 );
-  // thanks to libkonq/konq_operations.cc
-  connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()),
-           this, TQT_SLOT(slotSycocaDatabaseChanged()) );
+  // thanks to libkonq/konq_operations.cpp
+  connect( KSycoca::self(), TQ_SIGNAL(databaseChanged()),
+           this, TQ_SLOT(slotSycocaDatabaseChanged()) );
   TQString keditfiletype = TQString::fromLatin1("keditfiletype");
   KRun::runCommand( keditfiletype
                     + " --parent " + TQString::number( (ulong)topLevelWidget()->winId())
diff --git a/tdeio/tdeio/kmimetypechooser.h b/tdeio/tdeio/kmimetypechooser.h
index ad4c236c9..db3aa0c81 100644
--- a/tdeio/tdeio/kmimetypechooser.h
+++ b/tdeio/tdeio/kmimetypechooser.h
@@ -33,7 +33,7 @@
  */
 class TDEIO_EXPORT KMimeTypeChooser : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h
index c8828a0da..b0a6d7f9e 100644
--- a/tdeio/tdeio/kmimetyperesolver.h
+++ b/tdeio/tdeio/kmimetyperesolver.h
@@ -42,13 +42,13 @@ protected:
 
 /**
  * @internal
- * This class is used by KMimeTypeResolver, because it can't be a QObject
+ * This class is used by KMimeTypeResolver, because it can't be a TQObject
  * itself. So an object of this class is used to handle signals, slots etc.
  * and forwards them to the KMimeTypeResolver instance.
  */
 class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMimeTypeResolverHelper( KMimeTypeResolverBase *resolver,
@@ -56,12 +56,12 @@ public:
         : m_resolver( resolver ),
           m_timer( new TQTimer( this ) )
     {
-        connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotProcessMimeIcons() ));
+        connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotProcessMimeIcons() ));
 
-        connect( view->horizontalScrollBar(), TQT_SIGNAL( sliderMoved(int) ),
-                 TQT_SLOT( slotAdjust() ) );
-        connect( view->verticalScrollBar(), TQT_SIGNAL( sliderMoved(int) ),
-                 TQT_SLOT( slotAdjust() ) );
+        connect( view->horizontalScrollBar(), TQ_SIGNAL( sliderMoved(int) ),
+                 TQ_SLOT( slotAdjust() ) );
+        connect( view->verticalScrollBar(), TQ_SIGNAL( sliderMoved(int) ),
+                 TQ_SLOT( slotAdjust() ) );
 
         view->viewport()->installEventFilter( this );
     }
diff --git a/tdeio/tdeio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp
index b4a3d903a..b72a94318 100644
--- a/tdeio/tdeio/knfsshare.cpp
+++ b/tdeio/tdeio/knfsshare.cpp
@@ -162,8 +162,8 @@ KNFSShare::KNFSShare() {
   d = new KNFSSharePrivate();
   if (TQFile::exists(d->exportsFile)) {
     KDirWatch::self()->addFile(d->exportsFile);
-    connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this,
-   	        TQT_SLOT(slotFileChange(const TQString&)));
+    connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this,
+   	        TQ_SLOT(slotFileChange(const TQString&)));
   }
 }
 
diff --git a/tdeio/tdeio/knfsshare.h b/tdeio/tdeio/knfsshare.h
index 64cd28dcf..1d2c306c7 100644
--- a/tdeio/tdeio/knfsshare.h
+++ b/tdeio/tdeio/knfsshare.h
@@ -34,7 +34,7 @@ class KNFSSharePrivate;
  */
 class TDEIO_EXPORT KNFSShare : public TQObject 
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   /**
    * Returns the one and only instance of KNFSShare
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 89c84952f..99584b5ac 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -61,7 +61,7 @@
 #include <kde_file.h>
 #include <kstringhandler.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -155,8 +155,10 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window,
         noAuth = true;
       }
     }
-    else if (_mimetype == "application/x-executable")
+    else if (_mimetype == "application/x-executable" || _mimetype == "application/x-pie-executable")
+    {
       noRun = true;
+    }
   }
   else if ( isExecutable(_mimetype) )
   {
@@ -560,7 +562,7 @@ static pid_t runCommandInternal( TDEProcess* proc, const KService* service, cons
      return 0;
   }
   TQString bin = KRun::binaryName( binName, true );
-#ifdef Q_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification
+#ifdef TQ_WS_X11 // Startup notification doesn't work with QT/E, service isn't needed without Startup notification
   bool silent;
   TQCString wmclass;
   TDEStartupInfoId id;
@@ -697,8 +699,12 @@ static pid_t runTempService( const KService& _service, const KURL::List& _urls,
 static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service )
 {
   // Check which protocols the application supports.
-  // This can be a list of actual protocol names, or just TDEIO for KDE apps.
+  // This can be a list of actual protocol names, or just TDEIO for TDE apps, or KIO for KDE apps.
   TQStringList supportedProtocols = _service.property("X-TDE-Protocols").toStringList();
+  if (supportedProtocols.isEmpty())
+  {
+    supportedProtocols = _service.property("X-KDE-Protocols").toStringList();
+  }
   KRunMX1 mx1( _service );
   TQString exec = _service.exec();
   if ( mx1.expandMacrosShellQuote( exec ) && !mx1.hasUrls ) {
@@ -706,9 +712,9 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
   } else {
     if ( supportedProtocols.isEmpty() )
     {
-      // compat mode: assume TDEIO if not set and it's a KDE app
+      // compat mode: assume TDEIO if not set and it's a TDE or KDE app
       TQStringList categories = _service.property("Categories").toStringList();
-      if (( categories.find("TDE") != categories.end() ) && ( categories.find("KDE") != categories.end() ))
+      if ((categories.find("TDE") != categories.end()) || (categories.find("KDE") != categories.end()))
          supportedProtocols.append( "TDEIO" );
       else { // if no KDE app, be a bit over-generic
          supportedProtocols.append( "http");
@@ -719,12 +725,13 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
   kdDebug(7010) << "supportedProtocols:" << supportedProtocols << endl;
 
   KURL::List urls( _urls );
-  if ( supportedProtocols.find( "TDEIO" ) == supportedProtocols.end() ) {
+  if ((supportedProtocols.find("TDEIO") == supportedProtocols.end()) &&
+      (supportedProtocols.find("KIO") == supportedProtocols.end())) {
     for( KURL::List::Iterator it = urls.begin(); it != urls.end(); ++it ) {
       const KURL url = *it;
       bool supported = url.isLocalFile() || supportedProtocols.find( url.protocol().lower() ) != supportedProtocols.end();
       kdDebug(7010) << "Looking at url=" << url << " supported=" << supported << endl;
-      if ( !supported && KProtocolInfo::protocolClass(url.protocol()) == ":local" )
+      if ((!supported) && (KProtocolInfo::protocolClass(url.protocol()) == ":local"))
       {
         // Maybe we can resolve to a local URL?
         KURL localURL = TDEIO::NetAccess::mostLocalURL( url, 0 );
@@ -911,7 +918,7 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_
   // loop and do initialization afterwards.
   // Reason: We must complete the constructor before we do anything else.
   m_bInit = true;
-  connect( &m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) );
+  connect( &m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) );
   m_timer.start( 0, true );
   kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl;
 
@@ -1102,8 +1109,8 @@ void KRun::init()
   // It may be a directory or a file, let's stat
   TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo );
   job->setWindow (d->m_window);
-  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 * ) ) );
   m_job = job;
   kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl;
 }
@@ -1151,10 +1158,10 @@ void KRun::scanFile()
 
   TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo );
   job->setWindow (d->m_window);
-  connect(job, TQT_SIGNAL( result(TDEIO::Job *)),
-          this, TQT_SLOT( slotScanFinished(TDEIO::Job *)));
-  connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)),
-          this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &)));
+  connect(job, TQ_SIGNAL( result(TDEIO::Job *)),
+          this, TQ_SLOT( slotScanFinished(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &)),
+          this, TQ_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &)));
   m_job = job;
   kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl;
 }
@@ -1334,14 +1341,14 @@ void KRun::foundMimeType( const TQString& type )
     // (For instance a tar.gz is a directory contained inside a file)
     // It may be a directory or a file, let's stat
     TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo );
-    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 * ) ) );
     m_job = job;
 
     return;
   }
 */
-  TDEIO::TransferJob *job = ::tqqt_cast<TDEIO::TransferJob *>( m_job );
+  TDEIO::TransferJob *job = ::tqt_cast<TDEIO::TransferJob *>( m_job );
   if ( job )
   {
      job->putOnHold();
@@ -1451,6 +1458,7 @@ bool KRun::isExecutable( const TQString& serviceType )
              serviceType == "media/builtin-trash" ||
              serviceType == "media/builtin-webbrowser" ||
              serviceType == "application/x-executable" ||
+             serviceType == "application/x-pie-executable" ||
              serviceType == "application/x-msdos-program" ||
              serviceType == "application/x-shellscript" );
 }
@@ -1463,7 +1471,7 @@ TDEProcessRunner::run(TDEProcess * p, const TQString & binName)
   return (new TDEProcessRunner(p, binName))->pid();
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 pid_t
 TDEProcessRunner::run(TDEProcess * p, const TQString & binName, const TDEStartupInfoId& id )
 {
@@ -1477,15 +1485,15 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName )
     binName( _binName )
 {
   TQObject::connect(
-      process_, TQT_SIGNAL(processExited(TDEProcess *)),
-      this,     TQT_SLOT(slotProcessExited(TDEProcess *)));
+      process_, TQ_SIGNAL(processExited(TDEProcess *)),
+      this,     TQ_SLOT(slotProcessExited(TDEProcess *)));
 
   process_->start();
   if ( !process_->pid() )
       slotProcessExited( process_ );
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, const TDEStartupInfoId& id )
   : TQObject(),
     process_(p),
@@ -1493,8 +1501,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, co
     id_( id )
 {
   TQObject::connect(
-      process_, TQT_SIGNAL(processExited(TDEProcess *)),
-      this,     TQT_SLOT(slotProcessExited(TDEProcess *)));
+      process_, TQ_SIGNAL(processExited(TDEProcess *)),
+      this,     TQ_SLOT(slotProcessExited(TDEProcess *)));
 
   process_->start();
   if ( !process_->pid() )
@@ -1537,7 +1545,7 @@ TDEProcessRunner::slotProcessExited(TDEProcess * p)
       kapp->deref();
     }
   }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   if( !id_.none())
   {
       TDEStartupInfoData data;
diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h
index 6e5604f7a..62a1a5d91 100644
--- a/tdeio/tdeio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -57,7 +57,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT KRun : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a KRun object to run the preferred application for a file/URL.
@@ -477,12 +477,12 @@ public:
  */
 class TDEIO_EXPORT TDEProcessRunner : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
     static pid_t run(TDEProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
     static pid_t run(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
 
@@ -497,14 +497,14 @@ class TDEIO_EXPORT TDEProcessRunner : public TQObject
   private:
 
     TDEProcessRunner(TDEProcess *, const TQString & binName);
-#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
     TDEProcessRunner(TDEProcess *, const TQString & binName, const TDEStartupInfoId& id );
 #endif
     TDEProcessRunner();
 
     TDEProcess * process_;
     TQString binName;
-#ifdef Q_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
+#ifdef TQ_WS_X11 // We don't have TDEStartupInfo in Qt/Embedded
     TDEStartupInfoId id_;
 #endif
 };
diff --git a/tdeio/tdeio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp
index 608594ee5..d209812dd 100644
--- a/tdeio/tdeio/ksambashare.cpp
+++ b/tdeio/tdeio/ksambashare.cpp
@@ -181,8 +181,8 @@ KSambaShare::KSambaShare() {
   if (TQFile::exists(d->smbConf)) {
     KDirWatch::self()->addFile(d->smbConf);
     KDirWatch::self()->addFile(FILESHARECONF);
-    connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this,
-   	        TQT_SLOT(slotFileChange(const TQString&)));
+    connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this,
+   	        TQ_SLOT(slotFileChange(const TQString&)));
   } 
 }
 
diff --git a/tdeio/tdeio/ksambashare.h b/tdeio/tdeio/ksambashare.h
index ffd298588..d97a4a645 100644
--- a/tdeio/tdeio/ksambashare.h
+++ b/tdeio/tdeio/ksambashare.h
@@ -33,7 +33,7 @@ class KSambaSharePrivate;
  */
 class TDEIO_EXPORT KSambaShare : public TQObject 
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   /**
    * Returns the one and only instance of KSambaShare
diff --git a/tdeio/tdeio/kscan.cpp b/tdeio/tdeio/kscan.cpp
index b49459771..3ca269da9 100644
--- a/tdeio/tdeio/kscan.cpp
+++ b/tdeio/tdeio/kscan.cpp
@@ -41,7 +41,7 @@ KScanDialog * KScanDialog::getScanDialog( TQWidget *parent, const char *name,
     TQStringList args;
     args << TQString::number( (int)modal );
 
-    TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KScanDialog", args );
+    TQObject *res = factory->create( parent, name, "KScanDialog", args );
 
     return dynamic_cast<KScanDialog *>( res );
 }
@@ -84,7 +84,7 @@ KOCRDialog * KOCRDialog::getOCRDialog( TQWidget *parent, const char *name,
     TQStringList args;
     args << TQString::number( (int)modal );
 
-    TQObject *res = factory->create( TQT_TQOBJECT(parent), name, "KOCRDialog", args );
+    TQObject *res = factory->create( parent, name, "KOCRDialog", args );
 
     return dynamic_cast<KOCRDialog *>( res );
 }
@@ -133,7 +133,7 @@ TQObject *KScanDialogFactory::createObject( TQObject *parent, const char *name,
     if ( args.count() == 1 )
         modal = (bool)args[ 0 ].toInt();
 
-    return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal ));
+    return createDialog( static_cast<TQWidget*>( parent ), name, modal );
 }
 
 
@@ -166,7 +166,7 @@ TQObject *KOCRDialogFactory::createObject( TQObject *parent, const char *name,
     if ( args.count() == 1 )
         modal = (bool)args[ 0 ].toInt();
 
-    return TQT_TQOBJECT(createDialog( TQT_TQWIDGET( parent ), name, modal ));
+    return createDialog( static_cast<TQWidget*>( parent ), name, modal );
 }
 
 void KScanDialog::virtual_hook( int id, void* data )
diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h
index 940b8ceaa..cfc70e08a 100644
--- a/tdeio/tdeio/kscan.h
+++ b/tdeio/tdeio/kscan.h
@@ -43,8 +43,8 @@ class TQImage;
  *     if ( !m_scanDialog ) // no scanning support installed?
  *         return;
  *
- *     connect( m_scanDialog, TQT_SIGNAL( finalImage( const TQImage&, int )),
- *              TQT_SLOT( slotScanned( const TQImage&, int ) ));
+ *     connect( m_scanDialog, TQ_SIGNAL( finalImage( const TQImage&, int )),
+ *              TQ_SLOT( slotScanned( const TQImage&, int ) ));
  * }
  *
  * if ( m_scanDialog->setup() ) // only if scanner configured/available
@@ -62,7 +62,7 @@ class TQImage;
  */
 class TDEIO_EXPORT KScanDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -70,7 +70,7 @@ public:
      * or 0L if no scan-support
      * is available. Pass a suitable @p parent widget, if you like. If you
      * don't you have to 'delete' the returned pointer yourself.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      * @return the KScanDialog, or 0 if the function failed
@@ -100,7 +100,7 @@ protected:
      * @param dialogFace the KDialogBase::DialogType
      * @param buttonMask a ORed mask of all buttons (see
      * KDialogBase::ButtonCode)
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      * @see KDialogBase
@@ -187,7 +187,7 @@ public:
     /**
      * Your library should reimplement this method to return your KScanDialog
      * derived dialog.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      */
@@ -197,13 +197,13 @@ public:
 protected:
     /**
      * Creates a new KScanDialogFactory.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      */
     KScanDialogFactory( TQObject *parent=0, const char *name=0 );
 
     virtual TQObject* createObject( TQObject* parent = 0, const char* name = 0,
-                                   const char* classname = TQOBJECT_OBJECT_NAME_STRING,
+                                   const char* classname = "TQObject",
                                    const TQStringList &args = TQStringList() );
 
 
@@ -235,7 +235,7 @@ private:
  */
 class TDEIO_EXPORT KOCRDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -243,7 +243,7 @@ public:
      * or 0L if no OCR-support
      * is available. Pass a suitable @p parent widget, if you like. If you
      * don't you have to 'delete' the returned pointer yourself.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      * @return the KOCRDialog, or 0 if the function failed
@@ -260,7 +260,7 @@ protected:
      * @param dialogFace the KDialogBase::DialogType
      * @param buttonMask a ORed mask of all buttons (see
      * KDialogBase::ButtonCode)
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      */
@@ -323,7 +323,7 @@ public:
     /**
      * Your library should reimplement this method to return your KOCRDialog
      * derived dialog.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      * @param modal if true the dialog is model
      */
@@ -333,13 +333,13 @@ public:
 protected:
     /**
      * Creates a new KScanDialogFactory.
-     * @param parent the QWidget's parent, or 0
+     * @param parent the TQWidget's parent, or 0
      * @param name the name of the TQObject, can be 0
      */
     KOCRDialogFactory( TQObject *parent=0, const char *name=0 );
 
     virtual 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/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 05cf554c0..74df1a6b1 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent)
   DCOPClient *client = kapp->dcopClient();
 
   int result = client->callAsync("kded", "tdebuildsycoca", "recreate()",
-               data, TQT_TQOBJECT(&dlg), TQT_SLOT(slotFinished()));
+               data, &dlg, TQ_SLOT(slotFinished()));
 
   if (result)
   {
@@ -939,7 +939,7 @@ KServiceProgressDialog::KServiceProgressDialog(TQWidget *parent, const char *nam
                           const TQString &caption, const TQString &text)
  : KProgressDialog(parent, name, caption, text, true)
 {
-  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);
@@ -968,7 +968,7 @@ KServiceProgressDialog::slotFinished()
 {
   progressBar()->setProgress(20);
   m_timer.stop();
-  TQTimer::singleShot(1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot(1000, this, TQ_SLOT(close()));
 }
 
 #include "kservice_p.moc"
diff --git a/tdeio/tdeio/kservice_p.h b/tdeio/tdeio/kservice_p.h
index 180ab8fc3..b0f0269ce 100644
--- a/tdeio/tdeio/kservice_p.h
+++ b/tdeio/tdeio/kservice_p.h
@@ -25,7 +25,7 @@
 
 class KServiceProgressDialog : public KProgressDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KServiceProgressDialog(TQWidget *parent, const char *name, 
                           const TQString &caption, const TQString &text);
diff --git a/tdeio/tdeio/kservicetypefactory.cpp b/tdeio/tdeio/kservicetypefactory.cpp
index 682a87d6b..77cda4059 100644
--- a/tdeio/tdeio/kservicetypefactory.cpp
+++ b/tdeio/tdeio/kservicetypefactory.cpp
@@ -234,7 +234,7 @@ KServiceType::List KServiceTypeFactory::allServiceTypes()
         it != list.end();
         ++it)
    {
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
       KServiceType *newServiceType = dynamic_cast<KServiceType *>((*it).data());
 #else //FIXME
       KServiceType *newServiceType = (KServiceType*)(*it).data();
diff --git a/tdeio/tdeio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h
index a23fbe78e..632aef7a6 100644
--- a/tdeio/tdeio/kshellcompletion.h
+++ b/tdeio/tdeio/kshellcompletion.h
@@ -39,7 +39,7 @@ class KShellCompletionPrivate;
  */
 class TDEIO_EXPORT KShellCompletion : public KURLCompletion 
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
         /**
diff --git a/tdeio/tdeio/kshred.h b/tdeio/tdeio/kshred.h
index 5fabcaa5b..dae5cc3df 100644
--- a/tdeio/tdeio/kshred.h
+++ b/tdeio/tdeio/kshred.h
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
 
-  Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/tdeio/tdeio/ktar.cpp b/tdeio/tdeio/ktar.cpp
index 058d328b7..74b47e69b 100644
--- a/tdeio/tdeio/ktar.cpp
+++ b/tdeio/tdeio/ktar.cpp
@@ -129,7 +129,7 @@ void KTar::prepareDevice( const TQString & filename,
                             const TQString & mimetype, bool /*forced*/ )
 {
   if( "application/x-tar" == mimetype )
-      setDevice( TQT_TQIODEVICE(new TQFile( filename )) );
+      setDevice( new TQFile( filename ) );
   else
   {
     // The compression filters are very slow with random access.
@@ -149,7 +149,7 @@ void KTar::prepareDevice( const TQString & filename,
     // the device must be closed, however, for KArchive.setDevice()
     TQFile* file = d->tmpFile->file();
     file->close();
-    setDevice(TQT_TQIODEVICE(file));
+    setDevice(file);
   }
 }
 
diff --git a/tdeio/tdeio/ktrader.h b/tdeio/tdeio/ktrader.h
index 3703f5e60..bcbb2aaa9 100644
--- a/tdeio/tdeio/ktrader.h
+++ b/tdeio/tdeio/ktrader.h
@@ -84,7 +84,7 @@
  */
 class TDEIO_EXPORT TDETrader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * A list of services.
diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index cbd74d4e8..3c6861c15 100644
--- a/tdeio/tdeio/kurifilter.h
+++ b/tdeio/tdeio/kurifilter.h
@@ -306,7 +306,7 @@ public:
     /**
      * Overloaded assigenment operator.
      *
-     * This function allows you to easily assign a QString
+     * This function allows you to easily assign a TQString
      * to a KURIFilterData object.
      *
      * @return an instance of a KURIFilterData object.
@@ -362,7 +362,7 @@ private:
  */
 class TDEIO_EXPORT KURIFilterPlugin : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp
index f7d095ced..1bbac7cfe 100644
--- a/tdeio/tdeio/kurlcompletion.cpp
+++ b/tdeio/tdeio/kurlcompletion.cpp
@@ -1333,12 +1333,12 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job )
 		assert( d->list_job );
 
 		connect( d->list_job,
-				TQT_SIGNAL(result(TDEIO::Job*)),
-				TQT_SLOT(slotIOFinished(TDEIO::Job*)) );
+				TQ_SIGNAL(result(TDEIO::Job*)),
+				TQ_SLOT(slotIOFinished(TDEIO::Job*)) );
 
 		connect( d->list_job,
-				TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
-				TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) );
+				TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+				TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) );
 
 		delete kurl;
 	}
diff --git a/tdeio/tdeio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h
index a6b68b1b4..6c0bada4f 100644
--- a/tdeio/tdeio/kurlcompletion.h
+++ b/tdeio/tdeio/kurlcompletion.h
@@ -40,7 +40,7 @@ class KURLCompletionPrivate;
  */
 class TDEIO_EXPORT KURLCompletion : public TDECompletion
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	/**
diff --git a/tdeio/tdeio/kzip.cpp b/tdeio/tdeio/kzip.cpp
index 91f36a085..159d5c20a 100644
--- a/tdeio/tdeio/kzip.cpp
+++ b/tdeio/tdeio/kzip.cpp
@@ -385,7 +385,7 @@ bool KZip::openArchive( int mode )
                 return false;
             }
             Q_ASSERT( d->m_saveFile->file() );
-            setDevice( TQT_TQIODEVICE(d->m_saveFile->file()) );
+            setDevice( d->m_saveFile->file() );
         }
         return true;
     case IO_ReadOnly:
@@ -393,7 +393,7 @@ bool KZip::openArchive( int mode )
     {
         // ReadWrite mode still uses TQFile for now; we'd need to copy to the tempfile, in fact.
         if ( !m_filename.isEmpty() ) {
-            setDevice( TQT_TQIODEVICE(new TQFile( m_filename )) );
+            setDevice( new TQFile( m_filename ) );
             if ( !device()->open( mode ) )
                 return false;
         }
diff --git a/tdeio/tdeio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp
index 4f0721492..e00c262c8 100644
--- a/tdeio/tdeio/metainfojob.cpp
+++ b/tdeio/tdeio/metainfojob.cpp
@@ -61,7 +61,7 @@ MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems)
 
     // Return to event loop first, determineNextFile() might delete this;
     // (no idea what that means, it comes from previewjob)
-    TQTimer::singleShot(0, this, TQT_SLOT(start()));
+    TQTimer::singleShot(0, this, TQ_SLOT(start()));
 }
 
 MetaInfoJob::~MetaInfoJob()
@@ -130,8 +130,8 @@ void MetaInfoJob::getMetaInfo()
     TDEIO::TransferJob* job = TDEIO::get(URL, false, false);
     addSubjob(job);
 
-    connect(job,  TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-            this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &)));
+    connect(job,  TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+            this, TQ_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &)));
 
     job->addMetaData("mimeType", d->currentItem->current()->mimetype());
 }
diff --git a/tdeio/tdeio/metainfojob.h b/tdeio/tdeio/metainfojob.h
index 44a80de1e..61f944260 100644
--- a/tdeio/tdeio/metainfojob.h
+++ b/tdeio/tdeio/metainfojob.h
@@ -32,7 +32,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         /**
          * Creates a new MetaInfoJob.
diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp
index 132c87a50..da141e3ae 100644
--- a/tdeio/tdeio/netaccess.cpp
+++ b/tdeio/tdeio/netaccess.cpp
@@ -316,8 +316,8 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis
                    ? TDEIO::file_move( src, target, permissions, overwrite, resume )
                    : TDEIO::file_copy( src, target, permissions, overwrite, resume );
   job->setWindow (window);
-  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 *) ) );
 
   enter_loop();
   return bJobOK;
@@ -332,8 +332,8 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target,
                    ? TDEIO::move( src, target )
                    : TDEIO::copy( src, target );
   job->setWindow (window);
-  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 *) ) );
 
   enter_loop();
   return bJobOK;
@@ -347,8 +347,8 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source,
   job->setWindow (window);
   job->setDetails( details );
   job->setSide( source );
-  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 *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -358,8 +358,8 @@ KURL NetAccess::localURLInternal( const KURL & url, TQWidget* window )
   m_localURL = url;
   TDEIO::LocalURLJob* job = TDEIO::localURL(url);
   job->setWindow (window);
-  connect(job, TQT_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ),
-           this, TQT_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) ));
+  connect(job, TQ_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ),
+           this, TQ_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) ));
   enter_loop();
   return m_localURL;
 }
@@ -369,8 +369,8 @@ bool NetAccess::delInternal( const KURL & url, TQWidget* window )
   bJobOK = true; // success unless further error occurs
   TDEIO::Job * job = TDEIO::del( url );
   job->setWindow (window);
-  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 *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -381,8 +381,8 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions,
   bJobOK = true; // success unless further error occurs
   TDEIO::Job * job = TDEIO::mkdir( url, permissions );
   job->setWindow (window);
-  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 *) ) );
   enter_loop();
   return bJobOK;
 }
@@ -393,10 +393,10 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window )
   m_mimetype = TQString::fromLatin1("unknown");
   TDEIO::Job * job = TDEIO::mimetype( url );
   job->setWindow (window);
-  connect( job, TQT_SIGNAL( result (TDEIO::Job *) ),
-           this, TQT_SLOT( slotResult (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( slotResult (TDEIO::Job *) ) );
+  connect( job, TQ_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ),
+           this, TQ_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) );
   enter_loop();
   return m_mimetype;
 }
@@ -437,8 +437,8 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman
 
     TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true );
     job->setWindow( window );
-    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 *) ) );
     enter_loop();
 
     // since the TDEIO::special does not provide feedback we need to download the result
@@ -482,21 +482,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray*
       }
   }
 
-  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 *) ) );
 
   TQMetaObject *meta = job->metaObject();
 
-  static const char dataSignal[] = "data(TDEIO::Job*,const " TQBYTEARRAY_OBJECT_NAME_STRING "&)";
+  static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)";
   if ( meta->findSignal( dataSignal ) != -1 ) {
-      connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
-               this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
+      connect( job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)),
+               this, TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) );
   }
 
   static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)";
   if ( meta->findSignal( redirSignal ) != -1 ) {
-      connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)),
-               this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) );
+      connect( job, TQ_SIGNAL(redirection(TDEIO::Job*,const KURL&)),
+               this, TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) );
   }
 
   enter_loop();
@@ -516,7 +516,7 @@ void tqt_leave_modal( TQWidget *widget );
 void NetAccess::enter_loop()
 {
   TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
-  dummy.setFocusPolicy( TQ_NoFocus );
+  dummy.setFocusPolicy( TQWidget::NoFocus );
   tqt_enter_modal(&dummy);
   tqApp->enter_loop();
   tqt_leave_modal(&dummy);
diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h
index 7dde61385..b5e126086 100644
--- a/tdeio/tdeio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -58,7 +58,7 @@ namespace TDEIO {
    */
 class TDEIO_EXPORT NetAccess : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdeio/observer.h b/tdeio/tdeio/observer.h
index 1864f9977..31e0feda0 100644
--- a/tdeio/tdeio/observer.h
+++ b/tdeio/tdeio/observer.h
@@ -55,7 +55,7 @@ namespace TDEIO {
 class TDEIO_EXPORT Observer : public TQObject, public DCOPObject {
 
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index 91fba050d..63c13ff22 100644
--- a/tdeio/tdeio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -87,13 +87,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
     {
         lbl = new TQLabel( main );
         lbl->setPixmap( pix );
-        lbl->setAlignment( Qt::AlignLeft|Qt::AlignVCenter );
+        lbl->setAlignment( TQt::AlignLeft|TQt::AlignVCenter );
         lbl->setFixedSize( lbl->sizeHint() );
-        d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft );
+        d->layout->addWidget( lbl, 0, 0, TQt::AlignLeft );
     }
     d->prompt = new TQLabel( main );
-    d->prompt->setAlignment( Qt::AlignLeft|Qt::AlignVCenter|TQt::WordBreak );
-    d->layout->addWidget( d->prompt, 0, 2, Qt::AlignLeft );
+    d->prompt->setAlignment( TQt::AlignLeft|TQt::AlignVCenter|TQt::WordBreak );
+    d->layout->addWidget( d->prompt, 0, 2, TQt::AlignLeft );
     if ( prompt.isEmpty() )
         setPrompt( i18n( "You need to supply a username and a password" ) );
     else
@@ -106,7 +106,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
 
     // Row 4: Username field
     d->userNameLabel = new TQLabel( i18n("&Username:"), main );
-    d->userNameLabel->setAlignment( Qt::AlignVCenter | Qt::AlignLeft );
+    d->userNameLabel->setAlignment( TQt::AlignVCenter | TQt::AlignLeft );
     d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() );
     d->userNameHBox = new TQHBox( main );
 
@@ -123,7 +123,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
 
     // Row 6: Password field
     lbl = new TQLabel( i18n("&Password:"), main );
-    lbl->setAlignment( Qt::AlignVCenter | Qt::AlignLeft );
+    lbl->setAlignment( TQt::AlignVCenter | TQt::AlignLeft );
     lbl->setFixedSize( lbl->sizeHint() );
     TQHBox* hbox = new TQHBox( main );
     d->passEdit = new KLineEdit( hbox );
@@ -148,13 +148,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
         d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() );
         d->keep = cfg->readBoolEntry("Keep", false );
         d->keepCheckBox->setChecked( d->keep );
-        connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool )));
+        connect(d->keepCheckBox, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotKeep( bool )));
         d->layout->addWidget( hbox, 8, 2 );
     }
 
     // Configure necessary key-bindings and connect necessar slots and signals
-    connect( d->userEdit, TQT_SIGNAL(returnPressed()), d->passEdit, TQT_SLOT(setFocus()) );
-    connect( d->passEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) );
+    connect( d->userEdit, TQ_SIGNAL(returnPressed()), d->passEdit, TQ_SLOT(setFocus()) );
+    connect( d->passEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) );
 
     if ( !user.isEmpty() )
     {
@@ -239,13 +239,13 @@ void PasswordDialog::addCommentLine( const TQString& label,
     TQWidget *main = mainWidget();
 
     TQLabel* lbl = new TQLabel( label, main);
-    lbl->setAlignment( Qt::AlignVCenter|Qt::AlignRight );
+    lbl->setAlignment( TQt::AlignVCenter|TQt::AlignRight );
     lbl->setFixedSize( lbl->sizeHint() );
-    d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft );
+    d->layout->addWidget( lbl, d->nRow+2, 0, TQt::AlignLeft );
     lbl = new TQLabel( comment, main);
-    lbl->setAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak );
+    lbl->setAlignment( TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak );
     calculateLabelSize(lbl);
-    d->layout->addWidget( lbl, d->nRow+2, 2, Qt::AlignLeft );
+    d->layout->addWidget( lbl, d->nRow+2, 2, TQt::AlignLeft );
     d->layout->addRowSpacing( 3, 10 ); // Add a spacer
     d->nRow++;
 }
@@ -315,8 +315,8 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin
     d->userEditCombo->insertStringList( knownLogins.keys() );
     d->userEditCombo->setFocus();
 
-    connect( d->userEditCombo, TQT_SIGNAL( activated( const TQString& ) ),
-             this, TQT_SLOT( slotActivated( const TQString& ) ) );
+    connect( d->userEditCombo, TQ_SIGNAL( activated( const TQString& ) ),
+             this, TQ_SLOT( slotActivated( const TQString& ) ) );
 }
 
 void PasswordDialog::slotActivated( const TQString& userName )
diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h
index 929fa1014..c1e3606b4 100644
--- a/tdeio/tdeio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
@@ -35,7 +35,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT PasswordDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp
index d95cc7e88..61fb12c48 100644
--- a/tdeio/tdeio/pastedialog.cpp
+++ b/tdeio/tdeio/pastedialog.cpp
@@ -53,17 +53,17 @@ TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label,
 
     layout->addStretch();
 
-    //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-    //    TQT_SLOT( slotEditTextChanged( const TQString & ) ) );
-    //connect( this, TQT_SIGNAL( user1Clicked() ), m_lineEdit, TQT_SLOT( clear() ) );
+    //connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+    //    TQ_SLOT( slotEditTextChanged( const TQString & ) ) );
+    //connect( this, TQ_SIGNAL( user1Clicked() ), m_lineEdit, TQ_SLOT( clear() ) );
 
     //slotEditTextChanged( value );
     setMinimumWidth( 350 );
 
     m_clipboardChanged = false;
     if ( clipboard )
-        connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
-                 this, TQT_SLOT( slotClipboardDataChanged() ) );
+        connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ),
+                 this, TQ_SLOT( slotClipboardDataChanged() ) );
 }
 
 void TDEIO::PasteDialog::slotClipboardDataChanged()
diff --git a/tdeio/tdeio/pastedialog.h b/tdeio/tdeio/pastedialog.h
index 2e7bdfda1..07b4dfce5 100644
--- a/tdeio/tdeio/pastedialog.h
+++ b/tdeio/tdeio/pastedialog.h
@@ -34,7 +34,7 @@ namespace TDEIO {
  */
 class PasteDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PasteDialog( const TQString &caption, const TQString &label,
                  const TQString &value, const TQStringList& items,
diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp
index 38ee74ac2..d1820a69e 100644
--- a/tdeio/tdeio/previewjob.cpp
+++ b/tdeio/tdeio/previewjob.cpp
@@ -139,7 +139,7 @@ PreviewJob::PreviewJob( const KFileItemList &items, int width, int height,
     d->ignoreMaximumSize = false;
 
     // Return to event loop first, determineNextFile() might delete this;
-    connect(&d->startPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startPreview()) );
+    connect(&d->startPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startPreview()) );
     d->startPreviewTimer.start(0, true);
 }
 
@@ -450,7 +450,7 @@ void PreviewJob::createThumbnail( TQString pixPath )
     thumbURL.setPath(pixPath);
     TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false);
     addSubjob(job);
-    connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &)));
+    connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &)));
     bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool();
     job->addMetaData("mimeType", d->currentItem.item->mimetype());
     job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width));
diff --git a/tdeio/tdeio/previewjob.h b/tdeio/tdeio/previewjob.h
index a1b9550ba..b4cecf412 100644
--- a/tdeio/tdeio/previewjob.h
+++ b/tdeio/tdeio/previewjob.h
@@ -34,7 +34,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT PreviewJob : public TDEIO::Job
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
 	/**
 	 * Creates a new PreviewJob.
diff --git a/tdeio/tdeio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp
index 146f4182e..608213c6a 100644
--- a/tdeio/tdeio/progressbase.cpp
+++ b/tdeio/tdeio/progressbase.cpp
@@ -37,14 +37,14 @@ ProgressBase::ProgressBase( TQWidget *parent )
 void ProgressBase::setJob( TDEIO::Job *job )
 {
   // first connect all slots
-  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
 
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+	   TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
 
-  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
-	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
 
   // then assign job
   m_pJob = job;
@@ -54,37 +54,37 @@ void ProgressBase::setJob( TDEIO::Job *job )
 void ProgressBase::setJob( TDEIO::CopyJob *job )
 {
   // first connect all slots
-  connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-	   TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-	   TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ),
-	   TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) );
-  connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ),
-	   TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) );
-  connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ),
- 	   TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) );
-
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
-	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQ_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ),
+	   TQ_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) );
+  connect( job, TQ_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ),
+	   TQ_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) );
+  connect( job, TQ_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ),
+ 	   TQ_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) );
+
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+	   TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
 
   // then assign job
   m_pJob = job;
@@ -94,33 +94,33 @@ void ProgressBase::setJob( TDEIO::CopyJob *job )
 void ProgressBase::setJob( TDEIO::DeleteJob *job )
 {
   // first connect all slots
-  connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-	   TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
-	   TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
-  connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
-  connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
-	   TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
-
-  connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
-	   TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );
-
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
-
-  connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ),
-	   TQT_SLOT( slotFinished( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ),
+	   TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) );
+  connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) );
+  connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ),
+	   TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) );
+
+  connect( job, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ),
+	   TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );
+
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+	   TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
+
+  connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ),
+	   TQ_SLOT( slotFinished( TDEIO::Job* ) ) );
 
   // then assign job
   m_pJob = job;
diff --git a/tdeio/tdeio/progressbase.h b/tdeio/tdeio/progressbase.h
index 655edeee5..9dcad7c13 100644
--- a/tdeio/tdeio/progressbase.h
+++ b/tdeio/tdeio/progressbase.h
@@ -69,7 +69,7 @@ namespace TDEIO
 */
 class TDEIO_EXPORT ProgressBase : public TQWidget {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp
index 41d8851d9..ce2ae5323 100644
--- a/tdeio/tdeio/renamedlg.cpp
+++ b/tdeio/tdeio/renamedlg.cpp
@@ -48,7 +48,7 @@
 #include <kguiitem.h>
 #include <ksqueezedtextlabel.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -99,7 +99,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
     // i.e. in a separate process.
     // ####### This isn't the case anymore - remove?
-#if !defined(Q_WS_QWS) && !defined(Q_WS_WIN) //FIXME(E): Implement for QT Embedded & win32
+#if !defined(TQ_WS_QWS) && !defined(TQ_WS_WIN) //FIXME(E): Implement for QT Embedded & win32
     if (d->modal)
         KWin::setState( winId(), NET::StaysOnTop );
 #endif
@@ -113,42 +113,42 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     setCaption( _caption );
 
     d->bCancel = new KPushButton( KStdGuiItem::cancel(), this );
-    connect(d->bCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed()));
+    connect(d->bCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed()));
 
     if ( ! (_mode & M_NORENAME ) ) {
         d->bRename = new TQPushButton( i18n( "&Rename" ), this );
         d->bRename->setEnabled(false);
         d->bSuggestNewName = new TQPushButton( i18n( "Suggest New &Name" ), this );
-        connect(d->bSuggestNewName, TQT_SIGNAL(clicked()), this, TQT_SLOT(b8Pressed()));
-        connect(d->bRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed()));
+        connect(d->bSuggestNewName, TQ_SIGNAL(clicked()), this, TQ_SLOT(b8Pressed()));
+        connect(d->bRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed()));
     }
 
     if ( ( _mode & M_MULTI ) && ( _mode & M_SKIP ) ) {
         d->bSkip = new TQPushButton( i18n( "&Skip" ), this );
-        connect(d->bSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed()));
+        connect(d->bSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed()));
 
         d->bAutoSkip = new TQPushButton( i18n( "&Auto Skip" ), this );
-        connect(d->bAutoSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b3Pressed()));
+        connect(d->bAutoSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b3Pressed()));
     }
 
     if ( _mode & M_OVERWRITE ) {
         d->bOverwrite = new TQPushButton( i18n( "&Overwrite" ), this );
-        connect(d->bOverwrite, TQT_SIGNAL(clicked()), this, TQT_SLOT(b4Pressed()));
+        connect(d->bOverwrite, TQ_SIGNAL(clicked()), this, TQ_SLOT(b4Pressed()));
 
         if ( _mode & M_MULTI ) {
             d->bOverwriteAll = new TQPushButton( i18n( "O&verwrite All" ), this );
-            connect(d->bOverwriteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b5Pressed()));
+            connect(d->bOverwriteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b5Pressed()));
         }
     }
 
     if ( _mode & M_RESUME ) {
         d->bResume = new TQPushButton( i18n( "&Resume" ), this );
-        connect(d->bResume, TQT_SIGNAL(clicked()), this, TQT_SLOT(b6Pressed()));
+        connect(d->bResume, TQ_SIGNAL(clicked()), this, TQ_SLOT(b6Pressed()));
 
         if ( _mode & M_MULTI )
         {
             d->bResumeAll = new TQPushButton( i18n( "R&esume All" ), this );
-            connect(d->bResumeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b7Pressed()));
+            connect(d->bResumeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b7Pressed()));
         }
     }
 
@@ -194,12 +194,12 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
                     lib->unload();
                     continue;
                 }
-                TQObject *obj = factory->create( TQT_TQOBJECT(this), (*it)->name().latin1() );
+                TQObject *obj = factory->create( this, (*it)->name().latin1() );
                 if(!obj) {
                     lib->unload();
                     continue;
                 }
-                RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(TQT_TQWIDGET(obj));
+                RenameDlgPlugin *plugin = static_cast<RenameDlgPlugin *>(static_cast<TQWidget*>(obj));
                 if(!plugin ){
                     delete obj;
                     continue;
@@ -223,7 +223,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
             // No plugin found, build default dialog
             TQGridLayout * gridLayout = new TQGridLayout( 0L, 9, 2, KDialog::marginHint(),
                                                         KDialog::spacingHint() );
-            pLayout->addLayout(TQT_TQLAYOUT(gridLayout));
+            pLayout->addLayout(gridLayout);
             gridLayout->setColStretch(0,0);
             gridLayout->setColStretch(1,10);
 
@@ -325,8 +325,8 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
     TQString fileName = d->dest.fileName();
     d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) );
     if ( d->bRename || d->bOverwrite )
-        connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)),
-                TQT_SLOT(enableRenameButton(const TQString &)));
+        connect(d->m_pLineEdit, TQ_SIGNAL(textChanged(const TQString &)),
+                TQ_SLOT(enableRenameButton(const TQString &)));
     if ( d->bSuggestNewName )
     {
         layout2->addWidget( d->bSuggestNewName );
diff --git a/tdeio/tdeio/renamedlg.h b/tdeio/tdeio/renamedlg.h
index 2183d05b6..2550f63f6 100644
--- a/tdeio/tdeio/renamedlg.h
+++ b/tdeio/tdeio/renamedlg.h
@@ -47,7 +47,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW
  */
 class TDEIO_EXPORT RenameDlg : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Construct a "rename" dialog.
diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp
index 3935a91cf..30c2d8375 100644
--- a/tdeio/tdeio/scheduler.cpp
+++ b/tdeio/tdeio/scheduler.cpp
@@ -139,9 +139,9 @@ Scheduler::Scheduler()
     extraJobData = new ExtraJobData;
     sessionData = new SessionData;
     slaveConfig = SlaveConfig::self();
-    connect(&slaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startStep()));
-    connect(&coSlaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotScheduleCoSlave()));
-    connect(&cleanupTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCleanIdleSlaves()));
+    connect(&slaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startStep()));
+    connect(&coSlaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotScheduleCoSlave()));
+    connect(&cleanupTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCleanIdleSlaves()));
     busy = false;
 }
 
@@ -541,15 +541,15 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL
    {
       slaveList->append(slave);
       idleSlaves->append(slave);
-      connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)),
-                TQT_SLOT(slotSlaveDied(TDEIO::Slave *)));
-      connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)),
-                TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool)));
-
-      connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)),
-              sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool)));
-      connect(slave,TQT_SIGNAL(delAuthorization(const TQCString&)), sessionData,
-              TQT_SLOT(slotDelAuthData(const TQCString&)));
+      connect(slave, TQ_SIGNAL(slaveDied(TDEIO::Slave *)),
+                TQ_SLOT(slotSlaveDied(TDEIO::Slave *)));
+      connect(slave, TQ_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)),
+                TQ_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool)));
+
+      connect(slave,TQ_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)),
+              sessionData,TQ_SLOT(slotAuthData(const TQCString&, const TQCString&, bool)));
+      connect(slave,TQ_SIGNAL(delAuthorization(const TQCString&)), sessionData,
+              TQ_SLOT(slotDelAuthData(const TQCString&)));
    }
    else
    {
@@ -713,10 +713,10 @@ Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config )
     setupSlave(slave, url, protocol, proxy, true, &config);
 
     slave->send( CMD_CONNECT );
-    connect(slave, TQT_SIGNAL(connected()),
-                TQT_SLOT(slotSlaveConnected()));
-    connect(slave, TQT_SIGNAL(error(int, const TQString &)),
-                TQT_SLOT(slotSlaveError(int, const TQString &)));
+    connect(slave, TQ_SIGNAL(connected()),
+                TQ_SLOT(slotSlaveConnected()));
+    connect(slave, TQ_SIGNAL(error(int, const TQString &)),
+                TQ_SLOT(slotSlaveError(int, const TQString &)));
 
     coSlaves.insert(slave, new TQPtrList<SimpleJob>());
 //    kdDebug(7006) << "_getConnectedSlave( " << slave << ")" << endl;
@@ -772,8 +772,8 @@ Scheduler::slotSlaveConnected()
     Slave *slave = (Slave *)sender();
 //    kdDebug(7006) << "slotSlaveConnected( " << slave << ")" << endl;
     slave->setConnected(true);
-    disconnect(slave, TQT_SIGNAL(connected()),
-               this, TQT_SLOT(slotSlaveConnected()));
+    disconnect(slave, TQ_SIGNAL(connected()),
+               this, TQ_SLOT(slotSlaveConnected()));
     emit slaveConnected(slave);
     assert(!coIdleSlaves->contains(slave));
     coIdleSlaves->append(slave);
@@ -838,10 +838,10 @@ Scheduler::_disconnectSlave(TDEIO::Slave *slave)
     delete list;
     coIdleSlaves->removeRef(slave);
     assert(!coIdleSlaves->contains(slave));
-    disconnect(slave, TQT_SIGNAL(connected()),
-               this, TQT_SLOT(slotSlaveConnected()));
-    disconnect(slave, TQT_SIGNAL(error(int, const TQString &)),
-               this, TQT_SLOT(slotSlaveError(int, const TQString &)));
+    disconnect(slave, TQ_SIGNAL(connected()),
+               this, TQ_SLOT(slotSlaveConnected()));
+    disconnect(slave, TQ_SIGNAL(error(int, const TQString &)),
+               this, TQ_SLOT(slotSlaveError(int, const TQString &)));
     if (slave->isAlive())
     {
        idleSlaves->append(slave);
@@ -865,7 +865,7 @@ Scheduler::_registerWindow(TQWidget *wid)
    if (!wid)
       return;
 
-   TQObject *obj = TQT_TQOBJECT(wid);
+   TQObject *obj = wid;
    if (!m_windowList.contains(obj))
    {
       // We must store the window Id because by the time
@@ -873,8 +873,8 @@ Scheduler::_registerWindow(TQWidget *wid)
       // access TQWidget::winId() (already destructed)
       WId windowId = wid->winId();
       m_windowList.insert(obj, windowId);
-      connect(TQT_TQOBJECT(wid), TQT_SIGNAL(destroyed(TQObject *)),
-              this, TQT_SLOT(slotUnregisterWindow(TQObject*)));
+      connect(wid, TQ_SIGNAL(destroyed(TQObject *)),
+              this, TQ_SLOT(slotUnregisterWindow(TQObject*)));
       TQByteArray params;
       TQDataStream stream(params, IO_WriteOnly);
       stream << windowId;
@@ -894,8 +894,8 @@ Scheduler::slotUnregisterWindow(TQObject *obj)
    if (it == m_windowList.end())
       return;
    WId windowId = it.data();
-   disconnect( it.key(), TQT_SIGNAL(destroyed(TQObject *)),
-              this, TQT_SLOT(slotUnregisterWindow(TQObject*)));
+   disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)),
+              this, TQ_SLOT(slotUnregisterWindow(TQObject*)));
    m_windowList.remove( it );
    if (kapp)
    {
diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h
index fe0d050e4..f7f7bb1a7 100644
--- a/tdeio/tdeio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -108,7 +108,7 @@ namespace TDEIO {
      **/
 
     class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         typedef TQPtrList<SimpleJob> JobList;
diff --git a/tdeio/tdeio/sessiondata.h b/tdeio/tdeio/sessiondata.h
index 4aee40497..48595c68e 100644
--- a/tdeio/tdeio/sessiondata.h
+++ b/tdeio/tdeio/sessiondata.h
@@ -34,7 +34,7 @@ class SlaveConfig;
  */
 class TDEIO_EXPORT SessionData : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SessionData();
diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp
index 5871bbd09..ffc09d559 100644
--- a/tdeio/tdeio/skipdlg.cpp
+++ b/tdeio/tdeio/skipdlg.cpp
@@ -32,7 +32,7 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
-#ifdef Q_WS_X11 
+#ifdef TQ_WS_X11 
 #include <twin.h>
 #endif
 
@@ -46,7 +46,7 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
 
   // Set "StaysOnTop", because this dialog is typically used in tdeio_uiserver,
   // i.e. in a separate process.
-#ifdef Q_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32
+#ifdef TQ_WS_X11 //FIXME(E): Implement for QT Embedded, mac & win32
   if (modal)
     KWin::setState( winId(), NET::StaysOnTop );
 #endif
@@ -56,15 +56,15 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
   setCaption( i18n( "Information" ) );
 
   b0 = new KPushButton( KStdGuiItem::cancel(), this );
-  connect(b0, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed()));
+  connect(b0, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed()));
 
   if ( _multi )
   {
     b1 = new TQPushButton( i18n( "Skip" ), this );
-    connect(b1, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed()));
+    connect(b1, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed()));
 
     b2 = new TQPushButton( i18n( "Auto Skip" ), this );
-    connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed()));
+    connect(b2, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed()));
   }
 
   TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 );
diff --git a/tdeio/tdeio/skipdlg.h b/tdeio/tdeio/skipdlg.h
index c07086463..a63eb062b 100644
--- a/tdeio/tdeio/skipdlg.h
+++ b/tdeio/tdeio/skipdlg.h
@@ -36,7 +36,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT SkipDlg : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   SkipDlg( TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal = false );
   ~SkipDlg();
diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp
index b4a7c8f2a..5ced7acf8 100644
--- a/tdeio/tdeio/slave.cpp
+++ b/tdeio/tdeio/slave.cpp
@@ -89,12 +89,12 @@ namespace TDEIO {
 
 void Slave::accept(TDESocket *socket)
 {
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     slaveconn.init(socket);
 #endif
     delete serv;
     serv = 0;
-    slaveconn.connect(this, TQT_SLOT(gotInput()));
+    slaveconn.connect(this, TQ_SLOT(gotInput()));
     unlinkSocket();
 }
 
@@ -116,7 +116,7 @@ void Slave::timeout()
       kdDebug(7002) << "slave is slow... pid=" << m_pid << " t=" << delta_t << endl;
       if (delta_t < SLAVE_CONNECTION_TIMEOUT_MAX)
       {
-         TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQT_SLOT(timeout()));
+         TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQ_SLOT(timeout()));
          return;
       }
    }
@@ -151,9 +151,9 @@ Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString &
     idle_since = contact_started;
     m_pid = 0;
     m_port = 0;
-#ifndef Q_WS_WIN
-    connect(serv, TQT_SIGNAL(accepted( TDESocket* )),
-	    TQT_SLOT(accept(TDESocket*) ) );
+#ifndef TQ_WS_WIN
+    connect(serv, TQ_SIGNAL(accepted( TDESocket* )),
+	    TQ_SLOT(accept(TDESocket*) ) );
 #endif
 }
 
@@ -173,9 +173,9 @@ Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol
     m_pid = 0;
     m_port = 0;
     if (serv != 0) {
-#ifndef Q_WS_WIN
-      connect(serv, TQT_SIGNAL(accepted( TDESocket* )),
-        TQT_SLOT(accept(TDESocket*) ) );
+#ifndef TQ_WS_WIN
+      connect(serv, TQ_SIGNAL(accepted( TDESocket* )),
+        TQ_SLOT(accept(TDESocket*) ) );
 #endif
     }
 }
@@ -376,7 +376,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
    socketfile.close();
 #endif
     
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
@@ -418,9 +418,9 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
 
        proc.start(TDEProcess::DontCare);
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
        slave->setPID(proc.pid());
-       TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout()));
+       TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout()));
 #endif
        return slave;
     }
@@ -450,9 +450,9 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error
         delete slave;
         return 0;
     }
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     slave->setPID(pid);
-    TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout()));
+    TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout()));
 #endif
     return slave;
 }
@@ -478,7 +478,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
    socketfile.unlink();
 #endif
 
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     TDEServerSocket *kss = new TDEServerSocket(TQFile::encodeName(socketfile.name()).data());
 
     Slave *slave = new Slave(kss, protocol, socketfile.name());
@@ -505,9 +505,9 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url )
         delete slave;
         return 0;
     }
-#ifndef Q_WS_WIN
+#ifndef TQ_WS_WIN
     slave->setPID(pid);
-    TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout()));
+    TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout()));
 #endif
     return slave;
 }
diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h
index ae4eb00db..2f8138dc9 100644
--- a/tdeio/tdeio/slave.h
+++ b/tdeio/tdeio/slave.h
@@ -42,7 +42,7 @@ namespace TDEIO {
     */
     class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface
     {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
     protected:
diff --git a/tdeio/tdeio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h
index a21965040..9f8562649 100644
--- a/tdeio/tdeio/slaveconfig.h
+++ b/tdeio/tdeio/slaveconfig.h
@@ -45,7 +45,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT SlaveConfig : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
         static SlaveConfig *self();
         ~SlaveConfig();
diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp
index 47f935cda..1b9e853ed 100644
--- a/tdeio/tdeio/slaveinterface.cpp
+++ b/tdeio/tdeio/slaveinterface.cpp
@@ -135,7 +135,7 @@ SlaveInterface::SlaveInterface( Connection * connection )
     m_progressId = 0;
 
     d = new SlaveInterfacePrivate;
-    connect(&d->speed_timer, TQT_SIGNAL(timeout()), TQT_SLOT(calcSpeed()));
+    connect(&d->speed_timer, TQ_SIGNAL(timeout()), TQ_SLOT(calcSpeed()));
 }
 
 SlaveInterface::~SlaveInterface()
diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index 584a4f606..2f9fdbd5a 100644
--- a/tdeio/tdeio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -92,7 +92,7 @@ class SlaveInterfacePrivate;
  */
 class TDEIO_EXPORT SlaveInterface : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SlaveInterface( Connection *connection );
diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp
index d7ef698c4..270c997d3 100644
--- a/tdeio/tdeio/statusbarprogress.cpp
+++ b/tdeio/tdeio/statusbarprogress.cpp
@@ -49,7 +49,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
   box->addWidget( m_pButton  );
   stack = new TQWidgetStack( this );
   box->addWidget( stack );
-  connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStop() ) );
+  connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStop() ) );
 
   m_pProgressBar = new KProgress( this );
   m_pProgressBar->setFrameStyle( TQFrame::Box | TQFrame::Raised );
@@ -144,7 +144,7 @@ bool StatusbarProgress::eventFilter( TQObject *, TQEvent *ev ) {
   if ( ev->type() == TQEvent::MouseButtonPress ) {
     TQMouseEvent *e = (TQMouseEvent*)ev;
 
-    if ( e->button() == Qt::LeftButton ) {    // toggle view on left mouse button
+    if ( e->button() == TQt::LeftButton ) {    // toggle view on left mouse button
       if ( mode == Label ) {
 	mode = Progress;
       } else if ( mode == Progress ) {
diff --git a/tdeio/tdeio/statusbarprogress.h b/tdeio/tdeio/statusbarprogress.h
index d1d591fbe..ff235e9ab 100644
--- a/tdeio/tdeio/statusbarprogress.h
+++ b/tdeio/tdeio/statusbarprogress.h
@@ -59,7 +59,7 @@ class Job;
 */
 class TDEIO_EXPORT StatusbarProgress : public ProgressBase {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index 0237c9fd5..d75e8804f 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -44,7 +44,7 @@
 #include <ksslall.h>
 #include <ksslcertdlg.h>
 #include <tdemessagebox.h>
-#ifndef Q_WS_WIN //temporary
+#ifndef TQ_WS_WIN //temporary
 #include <kresolver.h>
 #endif
 
@@ -762,7 +762,7 @@ int TCPSlaveBase::verifyCertificate()
 
    _IPmatchesCN = d->kssl->peerInfo().certMatchesAddress();
    if (!_IPmatchesCN) {
-#ifndef Q_WS_WIN //temporary
+#ifndef TQ_WS_WIN //temporary
       KNetwork::KResolverResults res = KNetwork::KResolver::resolve(d->kssl->peerInfo().peerHost(), "80", KNetwork::KResolver::CanonName);
       if (!res.isEmpty()) {
          TQString old = d->kssl->peerInfo().peerHost();
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index 7b4c7ccd3..aa4d1f873 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -172,7 +172,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
           if ( KDE_stat( path.data(), &buf ) == 0 ) {
               mode = buf.st_mode;
           }
-          else { // link pointing to nowhere (see tdeio/file/file.cc)
+          else { // link pointing to nowhere (see tdeio/file/file.cpp)
               mode = (S_IFMT-1) | S_IRWXU | S_IRWXG | S_IRWXO;
           }
         }
@@ -700,7 +700,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
   if (p.isNull())
       kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl;
 
-  if ( mime->name() == "application/x-executable" ) {
+  if ( mime->name() == "application/x-executable" || mime->name() == "application/x-pie-executable" ) {
 	// At first glance it might seem to be a good idea to
 	// look for .desktop files for this executable before resorting to the embedded icon
 	// in the same fashion as the minicli, but on close examination this is NOT A GOOD IDEA.
@@ -965,7 +965,7 @@ TQString KFileItem::getToolTipText(int maxcount)
   if(!timeStr.isEmpty())
     tip += start + i18n("Modified:") + mid +
            timeStr + end;
-#ifndef Q_WS_WIN //TODO: show win32-specific permissions
+#ifndef TQ_WS_WIN //TODO: show win32-specific permissions
   TQString userStr = user();
   TQString groupStr = group();
   if(!userStr.isEmpty() || !groupStr.isEmpty())
diff --git a/tdeio/tdeio/tdefileitem.h b/tdeio/tdeio/tdefileitem.h
index b0dd9b4b8..171b611e3 100644
--- a/tdeio/tdeio/tdefileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -30,7 +30,7 @@
 #include <kmimetype.h>
 #include <tdefilemetainfo.h>
 
-#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
+#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cpp, will be removed for 3.4
 
 /**
  * A KFileItem is a generic class to handle a file, local or remote.
diff --git a/tdeio/tdeio/tdefilemetainfo.cpp b/tdeio/tdeio/tdefilemetainfo.cpp
index c1389695d..d6be6e17c 100644
--- a/tdeio/tdeio/tdefilemetainfo.cpp
+++ b/tdeio/tdeio/tdefilemetainfo.cpp
@@ -951,7 +951,7 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
         return 0;
 
     KFilePlugin* plugin = KParts::ComponentFactory::createInstanceFromService<KFilePlugin>
-                          ( service, TQT_TQOBJECT(this), mimeType.local8Bit() );
+                          ( service, this, mimeType.local8Bit() );
     if (!plugin)
         kdWarning(7033) << "error loading the plugin from " << service->desktopEntryPath() << endl;
 
diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h
index 2266690e8..e0371c7dd 100644
--- a/tdeio/tdeio/tdefilemetainfo.h
+++ b/tdeio/tdeio/tdefilemetainfo.h
@@ -1393,7 +1393,7 @@ private:
  **/
 class TDEIO_EXPORT KFilePlugin : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -1643,11 +1643,11 @@ private:
  *  supported and which groups and items are provided for it, you can ask
  *  the KFileMetainfoProvider for it.
  **/
-class TDEIO_EXPORT KFileMetaInfoProvider: private QObject
+class TDEIO_EXPORT KFileMetaInfoProvider: private TQObject
 {
     friend class KFilePlugin;
 
-  Q_OBJECT
+  TQ_OBJECT
 public:
     virtual ~KFileMetaInfoProvider();
 
diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp
index dc3f8c05a..d13214195 100644
--- a/tdeio/tdeio/tdefileshare.cpp
+++ b/tdeio/tdeio/tdefileshare.cpp
@@ -54,12 +54,12 @@ bool KFileShare::s_sharingEnabled;
 KFileSharePrivate::KFileSharePrivate()
 {
   KDirWatch::self()->addFile(FILESHARECONF);
-  connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this,
-          TQT_SLOT(slotFileChange(const TQString &)));
-  connect(KDirWatch::self(), TQT_SIGNAL(created(const TQString&)),this,
-          TQT_SLOT(slotFileChange(const TQString &)));
-  connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),this,
-          TQT_SLOT(slotFileChange(const TQString &)));
+  connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this,
+          TQ_SLOT(slotFileChange(const TQString &)));
+  connect(KDirWatch::self(), TQ_SIGNAL(created(const TQString&)),this,
+          TQ_SLOT(slotFileChange(const TQString &)));
+  connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),this,
+          TQ_SLOT(slotFileChange(const TQString &)));
 }
 
 KFileSharePrivate::~KFileSharePrivate()
diff --git a/tdeio/tdeio/tdefileshare.h b/tdeio/tdeio/tdefileshare.h
index b909a8e2f..7ef2b67a9 100644
--- a/tdeio/tdeio/tdefileshare.h
+++ b/tdeio/tdeio/tdefileshare.h
@@ -31,7 +31,7 @@ class KDirWatch;
  */
 class KFileSharePrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KFileSharePrivate();
diff --git a/tdeio/tdeio/yacc.c b/tdeio/tdeio/yacc.c
index a4f618769..b845d5cb8 100644
--- a/tdeio/tdeio/yacc.c
+++ b/tdeio/tdeio/yacc.c
@@ -579,7 +579,9 @@ while (0)
 # define YYDPRINTF(Args)			\
 do {						\
   if (yydebug)					\
+	{ \
     YYFPRINTF Args;				\
+	} \
 } while (0)
 
 # define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 54987e43c..2245fcfac 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -125,7 +125,7 @@ KIOExec::KIOExec()
                 TDEIO::Job *job = TDEIO::file_copy( url, dest );
                 jobList->append( job );
 
-                connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+                connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotResult( TDEIO::Job * ) ) );
             }
         }
     }
@@ -133,7 +133,7 @@ KIOExec::KIOExec()
 
     if ( tempfiles ) {
         // #113991
-        TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) );
+        TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) );
         //slotRunApp(); // does not return
         return;
     }
@@ -174,7 +174,7 @@ void KIOExec::slotResult( TDEIO::Job * job )
 
     kdDebug() << "All files downloaded, will call slotRunApp shortly" << endl;
     // We know we can run the app now - but let's finish the job properly first.
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) );
 
     jobList->clear();
 }
@@ -204,7 +204,7 @@ void KIOExec::slotRunApp()
 
     kdDebug() << "EXEC " << KShell::joinArgs( params ) << endl;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     // propagate the startup indentification to the started process
     TDEStartupInfoId id;
     id.initId( kapp->startupId());
@@ -215,7 +215,7 @@ void KIOExec::slotRunApp()
     proc << params;
     proc.start( TDEProcess::Block );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TDEStartupInfo::resetStartupEnv();
 #endif
 
diff --git a/tdeio/tdeioexec/main.h b/tdeio/tdeioexec/main.h
index beb6a2297..863da887a 100644
--- a/tdeio/tdeioexec/main.h
+++ b/tdeio/tdeioexec/main.h
@@ -10,7 +10,7 @@ namespace TDEIO { class Job; }
 
 class KIOExec : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KIOExec();
 
diff --git a/tdeio/tests/CMakeLists.txt b/tdeio/tests/CMakeLists.txt
index 323a7d86e..e9f5ea5ff 100644
--- a/tdeio/tests/CMakeLists.txt
+++ b/tdeio/tests/CMakeLists.txt
@@ -80,6 +80,7 @@ configure_file( kmimetypetest.sh.cmake kmimetypetest.sh @ONLY )
 add_test( NAME "tdeio/kmimetypetest"
     COMMAND sh -x "${CMAKE_CURRENT_BINARY_DIR}/kmimetypetest.sh"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )
+set_tests_properties( "tdeio/kmimetypetest" PROPERTIES TIMEOUT 30)
 
 
 # TODO add kdirwatchunittest
diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp
index ed0a63ed9..45e4d1dda 100644
--- a/tdeio/tests/dataprotocoltest.cpp
+++ b/tdeio/tests/dataprotocoltest.cpp
@@ -247,7 +247,7 @@ const char * const url;
 #if 0
 // == charset tests
 	// -------------------- string
-const QChar
+const TQChar
 const TQChar * const charset_urls[] = {
 #endif
 
diff --git a/tdeio/tests/dummymeta.h b/tdeio/tests/dummymeta.h
index 4cefcc01d..20c9fec54 100644
--- a/tdeio/tests/dummymeta.h
+++ b/tdeio/tests/dummymeta.h
@@ -7,7 +7,7 @@ class KFileMetaInfo;
 
 class DummyMeta : public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     DummyMeta( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp
index 7df3ff3f0..15770c941 100644
--- a/tdeio/tests/jobtest.cpp
+++ b/tdeio/tests/jobtest.cpp
@@ -160,7 +160,7 @@ static void createTestFile( const TQString& path )
     TQFile f( path );
     if ( !f.open( IO_WriteOnly ) )
         kdFatal() << "Can't create " << path << endl;
-    f.tqwriteBlock( "Hello world", 11 );
+    f.writeBlock( "Hello world", 11 );
     f.close();
     setTimeStamp( path );
 }
@@ -195,8 +195,8 @@ void JobTest::get()
     KURL u; u.setPath( filePath );
     m_result = -1;
     TDEIO::StoredTransferJob* job = TDEIO::storedGet( u );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-            this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+            this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) );
     kapp->eventLoop()->enterLoop();
     assert( m_result == 0 ); // no error
     assert( m_data.size() == 11 );
@@ -498,8 +498,8 @@ void JobTest::listRecursive()
     KURL u;
     u.setPath( src );
     TDEIO::ListJob* job = TDEIO::listRecursive( u );
-    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 );
     m_names.sort();
@@ -565,8 +565,8 @@ void JobTest::copyFileToSystem( bool resolve_local_urls )
 
     // copy the file with file_copy
     TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d );
-    connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)),
-             this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
+    connect( job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)),
+             this, TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) );
     bool ok = TDEIO::NetAccess::synchronousRun( job, 0 );
     assert( ok );
 
diff --git a/tdeio/tests/jobtest.h b/tdeio/tests/jobtest.h
index 5bff6d0e3..bcf1af5ac 100644
--- a/tdeio/tests/jobtest.h
+++ b/tdeio/tests/jobtest.h
@@ -26,7 +26,7 @@
 
 class JobTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     JobTest() {}
diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp
index e99de7e79..674e6a3dd 100644
--- a/tdeio/tests/kdcopcheck.cpp
+++ b/tdeio/tests/kdcopcheck.cpp
@@ -40,14 +40,14 @@ TestService::TestService(const TQString &exec)
 
    proc.start();
 
-   connect(kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString&)),
-           this, TQT_SLOT(newApp(const TQCString&)));
-   connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)),
-           this, TQT_SLOT(endApp(const TQCString&)));
-   connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)),
-           this, TQT_SLOT(appExit()));
-
-   TQTimer::singleShot(20*1000, this, TQT_SLOT(stop()));
+   connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)),
+           this, TQ_SLOT(newApp(const TQCString&)));
+   connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)),
+           this, TQ_SLOT(endApp(const TQCString&)));
+   connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)),
+           this, TQ_SLOT(appExit()));
+
+   TQTimer::singleShot(20*1000, this, TQ_SLOT(stop()));
    result = KService::DCOP_None;
 }
 
diff --git a/tdeio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h
index 593dbba1e..07236909c 100644
--- a/tdeio/tests/kdcopcheck.h
+++ b/tdeio/tests/kdcopcheck.h
@@ -7,7 +7,7 @@
 
 class TestService : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestService(const TQString &exec);
 
diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp
index b1208f41d..54cefac87 100644
--- a/tdeio/tests/kdirlistertest.cpp
+++ b/tdeio/tests/kdirlistertest.cpp
@@ -49,48 +49,48 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name )
   layout->addWidget( test );
   resize( layout->sizeHint() );
 
-  connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) );
-  connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) );
-  connect( startT, TQT_SIGNAL( clicked() ), TQT_SLOT( startTar() ) );
-  connect( test, TQT_SIGNAL( clicked() ), TQT_SLOT( test() ) );
-
-  connect( lister, TQT_SIGNAL( started( const KURL & ) ),
-           debug,  TQT_SLOT( started( const KURL & ) ) );
-  connect( lister, TQT_SIGNAL( completed() ),
-           debug,  TQT_SLOT( completed() ) );
-  connect( lister, TQT_SIGNAL( completed( const KURL & ) ),
-           debug,  TQT_SLOT( completed( const KURL & ) ) );
-  connect( lister, TQT_SIGNAL( canceled() ),
-           debug,  TQT_SLOT( canceled() ) );
-  connect( lister, TQT_SIGNAL( canceled( const KURL & ) ),
-           debug,  TQT_SLOT( canceled( const KURL & ) ) );
-  connect( lister, TQT_SIGNAL( redirection( const KURL & ) ),
-           debug,  TQT_SLOT( redirection( const KURL & ) ) );
-  connect( lister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ),
-           debug,  TQT_SLOT( redirection( const KURL &, const KURL & ) ) );
-  connect( lister, TQT_SIGNAL( clear() ),
-           debug,  TQT_SLOT( clear() ) );
-  connect( lister, TQT_SIGNAL( newItems( const KFileItemList & ) ),
-           debug,  TQT_SLOT( newItems( const KFileItemList & ) ) );
-  connect( lister, TQT_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ),
-           debug,  TQT_SLOT( itemsFilteredByMime( const KFileItemList & ) ) );
-  connect( lister, TQT_SIGNAL( deleteItem( KFileItem * ) ),
-           debug,  TQT_SLOT( deleteItem( KFileItem * ) ) );
-  connect( lister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ),
-           debug,  TQT_SLOT( refreshItems( const KFileItemList & ) ) );
-  connect( lister, TQT_SIGNAL( infoMessage( const TQString& ) ),
-           debug,  TQT_SLOT( infoMessage( const TQString& ) ) );
-  connect( lister, TQT_SIGNAL( percent( int ) ),
-           debug,  TQT_SLOT( percent( int ) ) );
-  connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ),
-           debug,  TQT_SLOT( totalSize( TDEIO::filesize_t ) ) );
-  connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
-           debug,  TQT_SLOT( processedSize( TDEIO::filesize_t ) ) );
-  connect( lister, TQT_SIGNAL( speed( int ) ),
-           debug,  TQT_SLOT( speed( int ) ) );
-
-  connect( lister, TQT_SIGNAL( completed() ),
-           this,  TQT_SLOT( completed() ) );
+  connect( startR, TQ_SIGNAL( clicked() ), TQ_SLOT( startRoot() ) );
+  connect( startH, TQ_SIGNAL( clicked() ), TQ_SLOT( startHome() ) );
+  connect( startT, TQ_SIGNAL( clicked() ), TQ_SLOT( startTar() ) );
+  connect( test, TQ_SIGNAL( clicked() ), TQ_SLOT( test() ) );
+
+  connect( lister, TQ_SIGNAL( started( const KURL & ) ),
+           debug,  TQ_SLOT( started( const KURL & ) ) );
+  connect( lister, TQ_SIGNAL( completed() ),
+           debug,  TQ_SLOT( completed() ) );
+  connect( lister, TQ_SIGNAL( completed( const KURL & ) ),
+           debug,  TQ_SLOT( completed( const KURL & ) ) );
+  connect( lister, TQ_SIGNAL( canceled() ),
+           debug,  TQ_SLOT( canceled() ) );
+  connect( lister, TQ_SIGNAL( canceled( const KURL & ) ),
+           debug,  TQ_SLOT( canceled( const KURL & ) ) );
+  connect( lister, TQ_SIGNAL( redirection( const KURL & ) ),
+           debug,  TQ_SLOT( redirection( const KURL & ) ) );
+  connect( lister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ),
+           debug,  TQ_SLOT( redirection( const KURL &, const KURL & ) ) );
+  connect( lister, TQ_SIGNAL( clear() ),
+           debug,  TQ_SLOT( clear() ) );
+  connect( lister, TQ_SIGNAL( newItems( const KFileItemList & ) ),
+           debug,  TQ_SLOT( newItems( const KFileItemList & ) ) );
+  connect( lister, TQ_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ),
+           debug,  TQ_SLOT( itemsFilteredByMime( const KFileItemList & ) ) );
+  connect( lister, TQ_SIGNAL( deleteItem( KFileItem * ) ),
+           debug,  TQ_SLOT( deleteItem( KFileItem * ) ) );
+  connect( lister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ),
+           debug,  TQ_SLOT( refreshItems( const KFileItemList & ) ) );
+  connect( lister, TQ_SIGNAL( infoMessage( const TQString& ) ),
+           debug,  TQ_SLOT( infoMessage( const TQString& ) ) );
+  connect( lister, TQ_SIGNAL( percent( int ) ),
+           debug,  TQ_SLOT( percent( int ) ) );
+  connect( lister, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ),
+           debug,  TQ_SLOT( totalSize( TDEIO::filesize_t ) ) );
+  connect( lister, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+           debug,  TQ_SLOT( processedSize( TDEIO::filesize_t ) ) );
+  connect( lister, TQ_SIGNAL( speed( int ) ),
+           debug,  TQ_SLOT( speed( int ) ) );
+
+  connect( lister, TQ_SIGNAL( completed() ),
+           this,  TQ_SLOT( completed() ) );
 }
 
 KDirListerTest::~KDirListerTest()
diff --git a/tdeio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h
index 484121eef..550b5c1ce 100644
--- a/tdeio/tests/kdirlistertest.h
+++ b/tdeio/tests/kdirlistertest.h
@@ -33,7 +33,7 @@ using namespace std;
 
 class PrintSignals : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    PrintSignals() : TQObject() { }
 
@@ -100,7 +100,7 @@ public slots:
 
 class KDirListerTest : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KDirListerTest( TQWidget *parent=0, const char *name=0 );
    ~KDirListerTest();
diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp
index 9f50c2170..eed240f2d 100644
--- a/tdeio/tests/kdirwatchtest.cpp
+++ b/tdeio/tests/kdirwatchtest.cpp
@@ -38,9 +38,9 @@ int main (int argc, char **argv)
   KDirWatch *dirwatch1 = KDirWatch::self();
   KDirWatch *dirwatch2 = new KDirWatch;
 
-  testObject.connect(dirwatch1, TQT_SIGNAL( dirty( const TQString &)), TQT_SLOT( dirty( const TQString &)) );
-  testObject.connect(dirwatch1, TQT_SIGNAL( created( const TQString &)), TQT_SLOT( created( const TQString &)) );
-  testObject.connect(dirwatch1, TQT_SIGNAL( deleted( const TQString &)), TQT_SLOT( deleted( const TQString &)) );
+  testObject.connect(dirwatch1, TQ_SIGNAL( dirty( const TQString &)), TQ_SLOT( dirty( const TQString &)) );
+  testObject.connect(dirwatch1, TQ_SIGNAL( created( const TQString &)), TQ_SLOT( created( const TQString &)) );
+  testObject.connect(dirwatch1, TQ_SIGNAL( deleted( const TQString &)), TQ_SLOT( deleted( const TQString &)) );
 
   if (args->count() >0) {
     for(int i = 0; i < args->count(); i++) {
diff --git a/tdeio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h
index 493043c01..ee7974f6f 100644
--- a/tdeio/tests/kdirwatchtest.h
+++ b/tdeio/tests/kdirwatchtest.h
@@ -21,7 +21,7 @@
 
 class myTest : public TQObject 
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    myTest() { };
 public slots:
diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp
index ed59f3c19..773ce476b 100644
--- a/tdeio/tests/kdirwatchunittest.cpp
+++ b/tdeio/tests/kdirwatchunittest.cpp
@@ -120,9 +120,9 @@ void KDirWatchTest::allTests()
     TQDir* dir = new TQDir(m_workingDir);
     VERIFY (dir != 0);
 
-    connect(d, TQT_SIGNAL (dirty( const TQString &)), TQT_SLOT( slotDirty( const TQString &)) );
-    connect(d, TQT_SIGNAL (created( const TQString &)), TQT_SLOT( slotCreated( const TQString &)) );
-    connect(d, TQT_SIGNAL (deleted( const TQString &)), TQT_SLOT( slotDeleted( const TQString &)) );
+    connect(d, TQ_SIGNAL (dirty( const TQString &)), TQ_SLOT( slotDirty( const TQString &)) );
+    connect(d, TQ_SIGNAL (created( const TQString &)), TQ_SLOT( slotCreated( const TQString &)) );
+    connect(d, TQ_SIGNAL (deleted( const TQString &)), TQ_SLOT( slotDeleted( const TQString &)) );
 
     VERIFY (dir->mkdir (m_workingDir));
 
diff --git a/tdeio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h
index 416aeecfe..99c7f73c3 100644
--- a/tdeio/tests/kdirwatchunittest.h
+++ b/tdeio/tests/kdirwatchunittest.h
@@ -24,7 +24,7 @@
 
 class KDirWatchTest : public KUnitTest::Tester
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum { sigDirty, sigCreated, sigDeleted };
diff --git a/tdeio/tests/kfiltertest.cpp b/tdeio/tests/kfiltertest.cpp
index f16b957ab..ed73d6782 100644
--- a/tdeio/tests/kfiltertest.cpp
+++ b/tdeio/tests/kfiltertest.cpp
@@ -35,7 +35,7 @@ void test_block( const TQString & fileName )
 
     TQByteArray array(1024);
     int n;
-    while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) )
+    while ( ( n = dev->readBlock( array.data(), array.size() ) ) )
     {
         kdDebug() << "readBlock returned " << n << endl << endl;
         // TQCString s(array,n+1); // Terminate with 0 before printing
@@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName )
     if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; }
 
     TQCString s("hello\n");
-    int ret = dev->tqwriteBlock( s, s.size()-1 );
+    int ret = dev->writeBlock( s, s.size()-1 );
     kdDebug() << "writeBlock ret=" << ret << endl;
-    //ret = dev->tqwriteBlock( s, s.size()-1 );
+    //ret = dev->writeBlock( s, s.size()-1 );
     //kdDebug() << "writeBlock ret=" << ret << endl;
     dev->close();
     delete dev;
diff --git a/tdeio/tests/kmimetypetest.sh.cmake b/tdeio/tests/kmimetypetest.sh.cmake
index 3bcd98669..55a0ffbc6 100644
--- a/tdeio/tests/kmimetypetest.sh.cmake
+++ b/tdeio/tests/kmimetypetest.sh.cmake
@@ -5,11 +5,16 @@ HOME=@CMAKE_CURRENT_BINARY_DIR@/test-home
 mkdir $HOME $HOME/.trinity $HOME/.trinity/share
 ln -s @CMAKE_SOURCE_DIR@/mimetypes $HOME/.trinity/share/mimelnk
 export HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
 # run dcop server
 ../../dcop/dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
+while ! ../../dcop/dcopserver --serverid 2>/dev/null; do
+  sleep 2
+done
+
 # update tdesycoca using mime types from source
 ../../kded/tdebuildsycoca --noincremental --nosignal
 
diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp
index 7562b488a..c10a36898 100644
--- a/tdeio/tests/kruntest.cpp
+++ b/tdeio/tests/kruntest.cpp
@@ -56,9 +56,9 @@ Receiver::Receiver()
         start = new TQPushButton( "Launch KRuns", this );
         stop = new TQPushButton( "Stop those KRuns", this );
         stop->setEnabled(false);
-        TQObject::connect( h, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()) );
-        TQObject::connect( start, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()) );
-        TQObject::connect( stop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStop()) );
+        TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) );
+        TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) );
+        TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) );
 
         adjustSize();
         show();
diff --git a/tdeio/tests/kruntest.h b/tdeio/tests/kruntest.h
index 68e7a7280..b8870816c 100644
--- a/tdeio/tests/kruntest.h
+++ b/tdeio/tests/kruntest.h
@@ -25,7 +25,7 @@
 
 class testKRun : public KRun
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   testKRun( const KURL& _url, mode_t _mode = 0,
@@ -42,7 +42,7 @@ public:
 class TQPushButton;
 class Receiver : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Receiver();
   ~Receiver() {}
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index dec955156..0b3e6621d 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
     // a search using the default search engine
     // 'ls' is a bit of a special case though, due to the toplevel domain called 'ls'
     filter( "cp", "http://www.google.com/search?q=cp&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL,
-            TQStringList(), 0, false /* don't check for executables, see konq_misc.cc */ );
+            TQStringList(), 0, false /* don't check for executables, see konq_misc.cpp */ );
 
     // Executable tests - No IKWS in minicli
     filter( "cp", "cp", KURIFilterData::EXECUTABLE, minicliFilters );
diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp
index 3237f0180..f30e7ad10 100644
--- a/tdeio/tests/previewtest.cpp
+++ b/tdeio/tests/previewtest.cpp
@@ -19,7 +19,7 @@ PreviewTest::PreviewTest()
     m_url->setText("/home/malte/gore_bush.jpg");
     layout->addWidget(m_url, 0, 0);
     TQPushButton *btn = new TQPushButton("Generate", this);
-    connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate()));
+    connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate()));
     layout->addWidget(btn, 0, 1);
     m_preview = new TQLabel(this);
     m_preview->setMinimumSize(400, 300);
@@ -31,9 +31,9 @@ void PreviewTest::slotGenerate()
     KURL::List urls;
     urls.append(m_url->text());
     TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48);
-    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
-    connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &)));
-    connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed()));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
+    connect(job, TQ_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQ_SLOT(slotPreview(const KFileItem *, const TQPixmap &)));
+    connect(job, TQ_SIGNAL(failed(const KFileItem *)), TQ_SLOT(slotFailed()));
 }
 
 void PreviewTest::slotResult(TDEIO::Job*)
diff --git a/tdeio/tests/previewtest.h b/tdeio/tests/previewtest.h
index 5ef82916d..2a3f5e5d1 100644
--- a/tdeio/tests/previewtest.h
+++ b/tdeio/tests/previewtest.h
@@ -8,7 +8,7 @@ class KFileItem;
 
 class PreviewTest : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PreviewTest();
 
diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp
index 4b14a6bb6..0c517c808 100644
--- a/tdeio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -32,10 +32,10 @@ SpeedTest::SpeedTest( const KURL & url )
 {
     Job *job = listRecursive( url );
     //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS !
-    connect(job, TQT_SIGNAL( result( TDEIO::Job*)),
-	    TQT_SLOT( finished( TDEIO::Job* ) ));
-    /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
-	    TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
+    connect(job, TQ_SIGNAL( result( TDEIO::Job*)),
+	    TQ_SLOT( finished( TDEIO::Job* ) ));
+    /*connect(job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+	    TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     */
 }
 
diff --git a/tdeio/tests/speed.h b/tdeio/tests/speed.h
index cd59cb6f6..1e9dab6a1 100644
--- a/tdeio/tests/speed.h
+++ b/tdeio/tests/speed.h
@@ -9,7 +9,7 @@ namespace TDEIO {
 }
 
 class SpeedTest : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SpeedTest(const KURL & url);
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index 4d52eab2e..bd5a1f1bb 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -63,7 +63,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
   // Operation groupbox & buttons
   opButtons = new TQButtonGroup( "Operation", main_widget );
   topLayout->addWidget( opButtons, 10 );
-  connect( opButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeOperation(int)) );
+  connect( opButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeOperation(int)) );
 
   TQBoxLayout *hbLayout = new TQHBoxLayout( opButtons, 15 );
 
@@ -117,7 +117,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
   // Progress groupbox & buttons
   progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget );
   topLayout->addWidget( progressButtons, 10 );
-  connect( progressButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeProgressMode(int)) );
+  connect( progressButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeProgressMode(int)) );
 
   hbLayout = new TQHBoxLayout( progressButtons, 15 );
 
@@ -145,19 +145,19 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
 
   pbStart = new TQPushButton( "&Start", main_widget );
   pbStart->setFixedSize( pbStart->sizeHint() );
-  connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) );
+  connect( pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(startJob()) );
   hbLayout->addWidget( pbStart, 5 );
 
   pbStop = new TQPushButton( "Sto&p", main_widget );
   pbStop->setFixedSize( pbStop->sizeHint() );
   pbStop->setEnabled( false );
-  connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) );
+  connect( pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(stopJob()) );
   hbLayout->addWidget( pbStop, 5 );
 
   // close button
   close = new TQPushButton( "&Close", main_widget );
   close->setFixedSize( close->sizeHint() );
-  connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit()));
+  connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotQuit()));
 
   topLayout->addWidget( close, 5 );
 
@@ -166,10 +166,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
 
   slave = 0;
 //  slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org"));
-  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)),
-	this, TQT_SLOT(slotSlaveConnected()));
-  TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)),
-	this, TQT_SLOT(slotSlaveError()));
+  TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave*)),
+	this, TQ_SLOT(slotSlaveConnected()));
+  TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)),
+	this, TQ_SLOT(slotSlaveError()));
 }
 
 
@@ -242,14 +242,14 @@ void KioslaveTest::startJob() {
   switch ( selectedOperation ) {
   case List:
     myJob = TDEIO::listDir( src );
-    connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
-            TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
+    connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+            TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     break;
 
   case ListRecursive:
     myJob = TDEIO::listRecursive( src );
-    connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
-            TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
+    connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)),
+            TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)));
     break;
 
   case Stat:
@@ -258,15 +258,15 @@ void KioslaveTest::startJob() {
 
   case Get:
     myJob = TDEIO::get( src, true );
-    connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
-            TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
+    connect(myJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)),
+            TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &)));
     break;
 
   case Put:
     putBuffer = 0;
     myJob = TDEIO::put( src, -1, true, false);
-    connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)),
-            TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &)));
+    connect(myJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)),
+            TQ_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &)));
     break;
 
   case Copy:
@@ -300,11 +300,11 @@ void KioslaveTest::startJob() {
     job = myJob;
   }
 
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
-  connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ),
-           TQT_SLOT( slotResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( canceled( TDEIO::Job * ) ),
+           TQ_SLOT( slotResult( TDEIO::Job * ) ) );
 
   if (progressMode == ProgressStatus) {
     statusProgress->setJob( job );
diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 7f11bd4e3..efe089fd9 100644
--- a/tdeio/tests/tdeioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -27,7 +27,7 @@
 #include "tdeio/slave.h"
 
 class KioslaveTest : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KioslaveTest( TQString src, TQString dest, uint op, uint pr );
diff --git a/tdeioslave/file/CMakeLists.txt b/tdeioslave/file/CMakeLists.txt
index 6456e962b..0215e1522 100644
--- a/tdeioslave/file/CMakeLists.txt
+++ b/tdeioslave/file/CMakeLists.txt
@@ -44,7 +44,7 @@ tde_create_translated_desktop(
 set( target tdeio_file )
 
 set( ${target}_SRCS
-  file.cc
+  file.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/file/Makefile.am b/tdeioslave/file/Makefile.am
index c7f35b51f..d31b69b41 100644
--- a/tdeioslave/file/Makefile.am
+++ b/tdeioslave/file/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_file.la
 
-tdeio_file_la_SOURCES = file.cc
+tdeio_file_la_SOURCES = file.cpp
 tdeio_file_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(ACL_LIBS)
 tdeio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
 noinst_HEADERS = file.h
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cpp
index fda72f2d5..a069cc5a8 100644
--- a/tdeioslave/file/file.cc
+++ b/tdeioslave/file/file.cpp
@@ -569,7 +569,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum
     // set modification time
     const TQString mtimeStr = metaData( "modified" );
     if ( !mtimeStr.isEmpty() ) {
-        TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( mtimeStr, Qt::ISODate ));
+        TQDateTime dt = TQDateTime::fromString( mtimeStr, TQt::ISODate );
         if ( dt.isValid() ) {
             KDE_struct_stat dest_statbuf;
             if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) {
@@ -1336,10 +1336,10 @@ void FileProtocol::special( const TQByteArray &data)
       TQString filename;
       stream >> filename;
       KShred shred( filename );
-      connect( &shred, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ),
-               this, TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
-      connect( &shred, TQT_SIGNAL( infoMessage( const TQString & ) ),
-               this, TQT_SLOT( slotInfoMessage( const TQString & ) ) );
+      connect( &shred, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ),
+               this, TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) );
+      connect( &shred, TQ_SIGNAL( infoMessage( const TQString & ) ),
+               this, TQ_SLOT( slotInfoMessage( const TQString & ) ) );
       if (!shred.shred())
           error( TDEIO::ERR_CANNOT_DELETE, filename );
       else
@@ -1446,14 +1446,15 @@ void FileProtocol::mount( bool _ro, const char *_fstype, const TQString& _dev, c
               buffer.sprintf( "%s %s %s %s 2>%s", mountProg.latin1(), readonly.data(), dev.data(), point.data(), tmp );
             else
               // mount giving device + mountpoint + fstype
-#if defined(__svr4__) && defined(__sun__) // MARCO for Solaris 8 and I
+#if defined(Q_OS_SOLARIS)
+		// MACRO for Solaris 8 and I
                 // believe this is true for SVR4 in general
-                buffer.sprintf( "%s -F %s %s %s %s 2>%s"
-				mountProg.latin1()
-                                fstype.data()
-                                _ro ? "-oro" : ""
-                                dev.data()
-                                point.data()
+                buffer.sprintf( "%s -F %s %s %s %s 2>%s",
+				mountProg.latin1(),
+                                fstype.data(),
+                                _ro ? "-oro" : "",
+                                dev.data(),
+                                point.data(),
                                 tmp );
 #elif defined(__OpenBSD__)
               buffer.sprintf( "%s %s %s -t %s %s %s 2>%s", "tdesu", mountProg.latin1(), readonly.data(),
diff --git a/tdeioslave/file/file.h b/tdeioslave/file/file.h
index 226e0a428..04a6ed225 100644
--- a/tdeioslave/file/file.h
+++ b/tdeioslave/file/file.h
@@ -42,7 +42,7 @@
 
 class FileProtocol : public TQObject, public TDEIO::SlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileProtocol( const TQCString &pool, const TQCString &app);
   virtual ~FileProtocol() { }
diff --git a/tdeioslave/ftp/CMakeLists.txt b/tdeioslave/ftp/CMakeLists.txt
index 7ef877e9d..797c5ae9c 100644
--- a/tdeioslave/ftp/CMakeLists.txt
+++ b/tdeioslave/ftp/CMakeLists.txt
@@ -38,7 +38,7 @@ tde_create_translated_desktop(
 set( target tdeio_ftp )
 
 set( ${target}_SRCS
-  ftp.cc
+  ftp.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
index fef6e168f..816659625 100644
--- a/tdeioslave/ftp/Makefile.am
+++ b/tdeioslave/ftp/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_ftp.la
 
-tdeio_ftp_la_SOURCES = ftp.cc
+tdeio_ftp_la_SOURCES = ftp.cpp
 tdeio_ftp_la_LIBADD  = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
 tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 
diff --git a/tdeioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cpp
index 65f3eedc5..8e0f96b5d 100644
--- a/tdeioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cpp
@@ -100,8 +100,8 @@ namespace TDEIO {
         mimimumMimeSize =     1024
     };
 
-    // JPF: this helper was derived from write_all in file.cc (FileProtocol).
-    static // JPF: in ftp.cc we make it static
+    // JPF: this helper was derived from write_all in file.cpp (FileProtocol).
+    static // JPF: in ftp.cpp we make it static
     /**
      * This helper handles some special issues (blocking and interrupted
      * system call) when writing to a file handle.
diff --git a/tdeioslave/http/CMakeLists.txt b/tdeioslave/http/CMakeLists.txt
index a1a6c296a..a8570d60f 100644
--- a/tdeioslave/http/CMakeLists.txt
+++ b/tdeioslave/http/CMakeLists.txt
@@ -62,7 +62,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
 set( target tdeio_http )
 
 set( ${target}_SRCS
-  http.cc
+  http.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
index 8e2eb4187..f4f4ddc7f 100644
--- a/tdeioslave/http/Makefile.am
+++ b/tdeioslave/http/Makefile.am
@@ -13,7 +13,7 @@ lib_LTLIBRARIES=
 tdeinit_LTLIBRARIES = tdeio_http_cache_cleaner.la
 kde_module_LTLIBRARIES = tdeio_http.la
 
-tdeio_http_la_SOURCES = http.cc
+tdeio_http_la_SOURCES = http.cpp
 tdeio_http_la_METASOURCES = AUTO
 tdeio_http_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_TQT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
 tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
diff --git a/tdeioslave/http/README.webdav b/tdeioslave/http/README.webdav
index d7f6cca26..7d0d2528b 100644
--- a/tdeioslave/http/README.webdav
+++ b/tdeioslave/http/README.webdav
@@ -13,7 +13,7 @@ Applications supporting extended webdav features
 [none currently]
 
 Much of the info here is elaborated by rfc #2518; the rest can be understood by reading
-davPropStat() in http.cc, specifically the setMetaData() calls.
+davPropStat() in http.cpp, specifically the setMetaData() calls.
 
 Extended information is transferred via tdeio's metadata system...
 
@@ -44,9 +44,9 @@ To create a lock, call a special request, with the following data:
 
 int, value 5 (LOCK request)
 KURL url - the location of the resource to lock
-QString scope - the scope of the lock, currently "exclusive" or "shared"
-QString type - the type of the lock, currently only "write"
-QString owner (optional) - owner contact details (url)
+TQString scope - the scope of the lock, currently "exclusive" or "shared"
+TQString type - the type of the lock, currently only "write"
+TQString owner (optional) - owner contact details (url)
 
 Additionally, the lock timeout requested from the server may be altered from the default
 of Infinity by setting the metadata "davTimeout" to the number of seconds, or 0 for
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cpp
index 8cd0f7a64..cd5d51a63 100644
--- a/tdeioslave/http/http.cc
+++ b/tdeioslave/http/http.cpp
@@ -4444,10 +4444,10 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ )
 
   HTTPFilterChain chain;
 
-  TQObject::connect(&chain, TQT_SIGNAL(output(const TQByteArray &)),
-          this, TQT_SLOT(slotData(const TQByteArray &)));
-  TQObject::connect(&chain, TQT_SIGNAL(error(int, const TQString &)),
-          this, TQT_SLOT(error(int, const TQString &)));
+  TQObject::connect(&chain, TQ_SIGNAL(output(const TQByteArray &)),
+          this, TQ_SLOT(slotData(const TQByteArray &)));
+  TQObject::connect(&chain, TQ_SIGNAL(error(int, const TQString &)),
+          this, TQ_SLOT(error(int, const TQString &)));
 
    // decode all of the transfer encodings
   while (!m_qTransferEncodings.isEmpty())
diff --git a/tdeioslave/http/http.h b/tdeioslave/http/http.h
index aacdf1d47..51ec5b232 100644
--- a/tdeioslave/http/http.h
+++ b/tdeioslave/http/http.h
@@ -48,7 +48,7 @@ namespace TDEIO {
 
 class HTTPProtocol : public TQObject, public TDEIO::TCPSlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   HTTPProtocol( const TQCString &protocol, const TQCString &pool,
                 const TQCString &app );
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index aaf94d25a..1f2be7abf 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -77,7 +77,7 @@ public:
 };
 
 // !START OF SYNC!
-// Keep the following in sync with the cache code in http.cc
+// Keep the following in sync with the cache code in http.cpp
 #define CACHE_REVISION "7\n"
 
 FileInfo *readEntry( const TQString &filename)
@@ -158,7 +158,7 @@ FileInfo *readEntry( const TQString &filename)
    unlink( CEF.data());
    return 0;
 }
-// Keep the above in sync with the cache code in http.cc
+// Keep the above in sync with the cache code in http.cpp
 // !END OF SYNC!
 
 void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQString &strDir)
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp
index 798b06318..52a2b7967 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.cpp
+++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp
@@ -87,7 +87,7 @@ KCookieServer::KCookieServer(const TQCString &name)
    mRequestList = new RequestList;
    mAdvicePending = false;
    mTimer = new TQTimer();
-   connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave()));
+   connect( mTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotSave()));
    mConfig = new TDEConfig("kcookiejarrc");
    mCookieJar->loadConfig( mConfig );
 
@@ -107,8 +107,8 @@ KCookieServer::KCookieServer(const TQCString &name)
    {
       mCookieJar->loadCookies( filename);
    }
-   connect(this, TQT_SIGNAL(windowUnregistered(long)),
-           this, TQT_SLOT(slotDeleteSessionCookies(long)));
+   connect(this, TQ_SIGNAL(windowUnregistered(long)),
+           this, TQ_SLOT(slotDeleteSessionCookies(long)));
 }
 
 KCookieServer::~KCookieServer()
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.h b/tdeioslave/http/kcookiejar/kcookieserver.h
index 2cbb9ccf1..4603808e0 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.h
+++ b/tdeioslave/http/kcookiejar/kcookieserver.h
@@ -38,7 +38,7 @@ class TDEConfig;
 
 class KCookieServer : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KCookieServer(const TQCString &);
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index 5b78d6956..a014387a2 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -65,7 +65,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #endif
 
@@ -76,11 +76,11 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
                         int defaultButton, bool showDetails )
            :KDialog( parent, "cookiealert", true )
 {
-#ifndef Q_WS_QWS //FIXME(E): Implement for Qt Embedded
+#ifndef TQ_WS_QWS //FIXME(E): Implement for Qt Embedded
     setCaption( i18n("Cookie Alert") );
     setIcon( SmallIcon("cookie") );
     // all cookies in the list should have the same window at this time, so let's take the first
-# ifdef Q_WS_X11
+# ifdef TQ_WS_X11
     if( cookieList.first()->windowIds().count() > 0 )
     {
         XSetTransientForHint( tqt_xdisplay(), winId(), cookieList.first()->windowIds().first());
@@ -102,7 +102,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     hBox->setSpacing( KDialog::spacingHint() );
     TQLabel* icon = new TQLabel( hBox );
     icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) );
-    icon->setAlignment( Qt::AlignCenter );
+    icon->setAlignment( TQt::AlignCenter );
     icon->setFixedSize( 2*icon->sizeHint() );
 
     int count = cookieList.count();
@@ -111,7 +111,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     TQString txt = i18n("You received a cookie from",
                        "You received %n cookies from", count);
     TQLabel* lbl = new TQLabel( txt, vBox );
-    lbl->setAlignment( Qt::AlignCenter );
+    lbl->setAlignment( TQt::AlignCenter );
     KHttpCookiePtr cookie = cookieList.first();
 
     TQString host (cookie->host());
@@ -128,10 +128,10 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     if (cookie->isCrossDomain())
        txt += i18n(" <b>[Cross Domain!]</b>");
     lbl = new TQLabel( txt, vBox );
-    lbl->setAlignment( Qt::AlignCenter );
+    lbl->setAlignment( TQt::AlignCenter );
     lbl = new TQLabel( i18n("Do you want to accept or reject?"), vBox );
-    lbl->setAlignment( Qt::AlignCenter );
-    vlayout->addWidget( hBox, 0, Qt::AlignLeft );
+    lbl->setAlignment( TQt::AlignCenter );
+    vlayout->addWidget( hBox, 0, TQt::AlignLeft );
 
     // Cookie Details dialog...
     m_detailView = new KCookieDetail( cookieList, count, this );
@@ -182,20 +182,20 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
     TQPushButton* btn = new TQPushButton( i18n("&Accept"), bbox );
     btn->setDefault( true );
     btn->setFocus();
-    connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
+    connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
     bbLay->addWidget( btn );
     btn = new TQPushButton( i18n("&Reject"), bbox );
-    connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
+    connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
     bbLay->addWidget( btn );
     bbLay->addStretch( 1 );
 #ifndef TQT_NO_ACCEL
     TQAccel* a = new TQAccel( this );
-    a->connectItem( a->insertItem(Qt::Key_Escape), btn, TQT_SLOT(animateClick()) );
+    a->connectItem( a->insertItem(TQt::Key_Escape), btn, TQ_SLOT(animateClick()) );
 #endif
 
     m_button = new TQPushButton( bbox );
     m_button->setText( m_showDetails ? i18n("&Details <<"):i18n("&Details >>") );
-    connect( m_button, TQT_SIGNAL(clicked()), TQT_SLOT(slotCookieDetails()) );
+    connect( m_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotCookieDetails()) );
     bbLay->addWidget( m_button );
 #ifndef TQT_NO_WHATSTHIS
     TQWhatsThis::add( m_button, i18n("See or modify the cookie information") );
@@ -315,7 +315,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount,
         TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this );
         btnNext->setFixedSize( btnNext->sizeHint() );
         grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 );
-        connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) );
+        connect( btnNext, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextCookie()) );
 #ifndef TQT_NO_TOOLTIP
         TQToolTip::add( btnNext, i18n("Show details of the next cookie") );
 #endif
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.h b/tdeioslave/http/kcookiejar/kcookiewin.h
index d739732dc..ddf744019 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.h
+++ b/tdeioslave/http/kcookiejar/kcookiewin.h
@@ -39,7 +39,7 @@ class KURLLabel;
 
 class KCookieDetail : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public :
     KCookieDetail( KHttpCookieList cookieList, int cookieCount, TQWidget *parent=0,
@@ -63,7 +63,7 @@ private slots:
 
 class KCookieWin : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public :
     KCookieWin( TQWidget *parent, KHttpCookieList cookieList, int defaultButton=0,
diff --git a/tdeioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index ed8aaadfa..f0381203a 100644
--- a/tdeioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -60,7 +60,7 @@ uninstall-local:
 # make messages.po. Move this one to ../po/ and "make merge" in po
 # the -x is for skipping messages already translated in tdelibs
 messages:
-	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 -o -name \*.c`; \
 	if test -n "$$LIST"; then \
 		 $(XGETTEXT) -C -ki18n -x $(kde_includes)/tde.pot $$LIST -o ../po/iso.pot; \
 	fi
diff --git a/tdeioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index 8696b0c67..80e32b415 100644
--- a/tdeioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
- /* This file is heavily based on tar.cc from tdebase
+ /* This file is heavily based on tar.cpp from tdebase
   * (c) David Faure <faure@kde.org>
   */
 
diff --git a/tdeioslave/iso/kiso.cpp b/tdeioslave/iso/kiso.cpp
index 513bd7c04..fdd2df413 100644
--- a/tdeioslave/iso/kiso.cpp
+++ b/tdeioslave/iso/kiso.cpp
@@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename,
 {
   /* 'hack' for Qt's false assumption that only S_ISREG is seekable */
   if( "inode/blockdevice" == mimetype )
-      setDevice( TQT_TQIODEVICE(new QFileHack( filename )) );
+      setDevice( new QFileHack( filename ) );
   else
   {
     if( "application/x-gzip" == mimetype
@@ -190,7 +190,7 @@ KIso::~KIso()
 /* callback function for libisofs */
 static int readf(char *buf, long long start, long long len,void *udata) {
 
-    TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
+    TQIODevice* dev = ( static_cast<KIso*>(udata) )->device();
 
     if (dev->at(start<<11)) {
         if ((dev->readBlock(buf, len<<11)) != -1) return (len);
diff --git a/tdemarkdown/CMakeL10n.txt b/tdemarkdown/CMakeL10n.txt
new file mode 100644
index 000000000..89b0e07f9
--- /dev/null
+++ b/tdemarkdown/CMakeL10n.txt
@@ -0,0 +1,8 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+  CATALOG "desktop_files/tdemarkdown-desktops/"
+  SOURCES *.desktop
+  EXCLUDES "^md4c/"
+  DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/tdemarkdown/CMakeLists.txt b/tdemarkdown/CMakeLists.txt
new file mode 100644
index 000000000..38df3b6e0
--- /dev/null
+++ b/tdemarkdown/CMakeLists.txt
@@ -0,0 +1,67 @@
+###########################################
+#                                         #
+#  Copyright (C)  2022 Mavridis Philippe  #
+#                  <mavridisf@gmail.com>  #
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  Released under GNU GPL v2 or greater.  #
+#                                         #
+###########################################
+
+### Header and library directories ########
+#
+include_directories(
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/tdecore
+  ${CMAKE_BINARY_DIR}/tdecore
+  ${CMAKE_SOURCE_DIR}/tdehtml
+  ${CMAKE_SOURCE_DIR}/tdeui
+  ${CMAKE_SOURCE_DIR}/tdeutils
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/md4c/src
+)
+
+include_directories( SYSTEM
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+### Build libtdemarkdown (kpart) ###########
+#
+tde_add_kpart( libtdemarkdown
+  AUTOMOC
+  SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/md4c/src/entity.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/md4c/src/md4c.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/md4c/src/md4c-html.c
+    markdown_part.cpp
+  LINK
+    tdeparts-shared tdehtml-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+### Install part .desktop entry #############
+#
+tde_create_translated_desktop(
+  SOURCE markdown_part.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR tdemarkdown-desktops
+)
+
+
+### Install XML-GUI #########################
+#
+install(
+  FILES markdown_part.rc
+  DESTINATION ${DATA_INSTALL_DIR}/tdemarkdown
+)
diff --git a/tdemarkdown/LICENSE b/tdemarkdown/LICENSE
new file mode 100644
index 000000000..17cb28643
--- /dev/null
+++ b/tdemarkdown/LICENSE
@@ -0,0 +1,117 @@
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+     a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+     b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+     c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+     a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+     c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+     one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+
+     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. Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+     Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+     Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
diff --git a/tdemarkdown/README.md b/tdemarkdown/README.md
new file mode 100644
index 000000000..0b6e811bf
--- /dev/null
+++ b/tdemarkdown/README.md
@@ -0,0 +1,14 @@
+# TDEMarkdown
+
+TDEMarkdown is a lightweight markdown viewer for Trinity based on the [md4c](https://www.github.com/mity/md4c) library and using TDEHTML for rendering its output.
+
+It integrates nicely into Konqueror and supports both Commonmark and GitHub markdown syntaxes.
+
+
+## Contributing
+
+If you wish to contribute to TDEMarkdown:
+
+- You can **report a bug, request a feature or contribute code** via the [TDE Gitea Workspace (TGW)](https://mirror.git.trinitydesktop.org/gitea)
+
+- You can **contribute translations** via the [TDE Weblate Translation Workspace (TWTW)](https://mirror.git.trinitydesktop.org/weblate)
diff --git a/tdemarkdown/markdown_part.cpp b/tdemarkdown/markdown_part.cpp
new file mode 100644
index 000000000..255ed7280
--- /dev/null
+++ b/tdemarkdown/markdown_part.cpp
@@ -0,0 +1,143 @@
+/***************************************************************************
+ *   Markdown Viewer part                                                  *
+ *   Copyright (c) 2022 Mavridis Philippe <mavridisf@gmail.com>            *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+
+
+#include <tqbuffer.h>
+#include <tqfile.h>
+
+#include <tdeparts/genericfactory.h>
+#include <kstandarddirs.h>
+
+#include <tdehtmlview.h>
+
+/* MD4C-HTML */
+#include <md4c-html.h>
+
+#include "markdown_part.h"
+
+
+typedef KParts::GenericFactory<MarkdownPart> Factory;
+K_EXPORT_COMPONENT_FACTORY(libtdemarkdown, Factory)
+
+MarkdownPart::MarkdownPart(TQWidget* parentWidget, const char* widgetName,
+                           TQObject* parent, const char* name, const TQStringList& args)
+    : TDEHTMLPart(parentWidget, name = "TDEMarkdown")
+{
+    setInstance(Factory::instance());
+
+    /* Features */
+    setJScriptEnabled(false);
+    setJavaEnabled(false);
+    setMetaRefreshEnabled(false);
+    setPluginsEnabled(false);
+    setAutoloadImages(true);
+    setXMLFile( locate("data", "tdemarkdown/markdown_part.rc") );
+}
+
+MarkdownPart::~MarkdownPart()
+{
+}
+
+TDEAboutData* MarkdownPart::createAboutData()
+{
+    TDEAboutData* aboutData = new TDEAboutData(
+            "tdemarkdown", I18N_NOOP("TDE Markdown Viewer"), "1.0",
+            I18N_NOOP("TDEMarkdown is an embeddable viewer for Markdown documents."),
+            TDEAboutData::License_GPL_V2, "© 2022 Mavridis Philippe"
+    );
+    aboutData->addAuthor("Mavridis Philippe (blu.256)", I18N_NOOP("Developer"), "mavridisf@gmail.com");
+    return aboutData;
+}
+
+bool MarkdownPart::openURL(const KURL& u)
+{
+    if(u.isLocalFile())
+    {
+      TQFile local(u.path());
+
+      if(!local.open(IO_ReadOnly))
+      {
+          return false;
+      }
+
+      TQByteArray data = local.readAll();
+
+      local.close();
+
+      if(!data.isNull())
+      {
+          if (data[data.size()-1] != '\0')
+          {
+              data.resize(data.size()+1);
+              data[data.size()-1] = '\0';
+          }
+          begin(u);
+          TQString parsed(parse((MD_CHAR*) data.data(), u.fileName().utf8().data()));
+          write(parsed);
+          end();
+      }
+    }
+
+    emit started(0L);
+    return true;
+}
+
+TQString& MarkdownPart::parse(MD_CHAR* document, MD_CHAR* title)
+{
+    m_buffer  = "<!DOCTYPE html>\n";
+    m_buffer += "<html>\n";
+    m_buffer += "  <head>\n";
+    m_buffer += "    <meta charset='utf-8'>\n";
+    m_buffer += "    <title>" + (title ? title : i18n("Markdown document")) + "</title>\n";
+    m_buffer += "  </head>\n";
+    m_buffer += "  <body>\n";
+
+    TQByteArray data;
+    int success = md_html(document,
+                          MD_SIZE(strlen(document)),
+                          &MarkdownPart::processHTML,
+                          &data,
+                          MD_DIALECT_GITHUB | MD_FLAG_PERMISSIVEURLAUTOLINKS | MD_FLAG_PERMISSIVEEMAILAUTOLINKS | MD_FLAG_PERMISSIVEWWWAUTOLINKS
+                              | MD_FLAG_LATEXMATHSPANS | MD_FLAG_PERMISSIVEATXHEADERS | MD_FLAG_UNDERLINE | MD_FLAG_TASKLISTS,
+                          0);
+
+    if (success == -1)
+    {
+        m_buffer += TQString("<b>%1</b>").arg(i18n("Error: malformed document."));
+    }
+    else
+    {
+        if (data[data.size()-1] != '\0')
+        {
+            data.resize(data.size()+1);
+            data[data.size()-1] = '\0';
+        }
+        m_buffer += TQString::fromLocal8Bit(data);
+    }
+
+    m_buffer += "  </body>\n";
+    m_buffer += "</html>\n";
+    return m_buffer;
+}
+
+void MarkdownPart::processHTML(const MD_CHAR* data, MD_SIZE data_size, void* user_data)
+{
+    TQByteArray   *ud = static_cast<TQByteArray*>(user_data);
+    TQBuffer buff(*ud);
+
+    if (data_size > 0)
+    {
+        buff.open(IO_WriteOnly | IO_Append);
+        buff.writeBlock(data, (int)data_size);
+        buff.close();
+    }
+}
+
+#include "markdown_part.moc"
diff --git a/tdemarkdown/markdown_part.desktop b/tdemarkdown/markdown_part.desktop
new file mode 100644
index 000000000..47cff4b03
--- /dev/null
+++ b/tdemarkdown/markdown_part.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Markdown Viewer
+
+Comment=Embeddable lightweight markdown viewing component
+
+Type=Service
+Icon=text-x-generic
+MimeType=text/markdown
+X-TDE-Library=libtdemarkdown
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
diff --git a/tdemarkdown/markdown_part.h b/tdemarkdown/markdown_part.h
new file mode 100644
index 000000000..f3e003ec9
--- /dev/null
+++ b/tdemarkdown/markdown_part.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   Markdown Viewer part                                                  *
+ *   Copyright (c) 2022 Mavridis Philippe <mavridisf@gmail.com>            *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ ***************************************************************************/
+
+
+#ifndef __MARKDOWN_PART_H
+#define __MARKDOWN_PART_H
+
+#include <tqwidget.h>
+
+#include <tdehtml_part.h>
+
+class TDEHTMLPart;
+
+class MarkdownPart : public TDEHTMLPart
+{
+    TQ_OBJECT
+
+    public:
+        MarkdownPart(TQWidget* parentWidget, const char* widgetName,
+                     TQObject* parent, const char* name, const TQStringList& args);
+        ~MarkdownPart();
+
+        /* Create and return About data */
+        static TDEAboutData* createAboutData();
+
+        /* Implemented virtual from TDEHTMLPart */
+        bool openURL(const KURL& u);
+
+        /* Parser */
+        TQString& parse(MD_CHAR* document, MD_CHAR* title = nullptr);
+
+    private:
+        TQString m_buffer;
+
+        static void processHTML(const MD_CHAR* data, MD_SIZE data_size, void* userData);
+
+};
+
+
+#endif // __MARKDOWN_PART_H
diff --git a/tdemarkdown/markdown_part.rc b/tdemarkdown/markdown_part.rc
new file mode 100644
index 000000000..5834eb6f8
--- /dev/null
+++ b/tdemarkdown/markdown_part.rc
@@ -0,0 +1,18 @@
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<kpartgui name="MarkdownPart" version="1">
+<MenuBar>
+ <Menu name="edit"><text>&amp;Edit</text>
+  <Action name="selectAll" />
+  <Separator />
+  <Action name="find" />
+  <Action name="findNext" />
+  <Action name="findPrevious" />
+ </Menu>
+ <Menu name="view"><text>&amp;View</text>
+  <Action name="viewDocumentSource" />
+ </Menu>
+</MenuBar>
+<ToolBar name="mainToolBar"><text>Main Toolbar</text>
+ <Action name="find" />
+</ToolBar>
+</kpartgui>
diff --git a/tdemarkdown/md4c/CHANGELOG.md b/tdemarkdown/md4c/CHANGELOG.md
new file mode 100644
index 000000000..63a9c3233
--- /dev/null
+++ b/tdemarkdown/md4c/CHANGELOG.md
@@ -0,0 +1,442 @@
+
+# MD4C Change Log
+
+
+## Next Version (Work in Progress)
+
+Changes:
+
+ * Changes mandated by CommonMark specification 0.30.
+
+   Actually there are only very minor changes to recognition of HTML blocks:
+
+   - The tag `<textarea>` now triggers HTML block (of type 1 as per the
+     specification).
+
+   - HTML declaration (HTML block type 4) is not required to begin with an
+     upper-case ASCII character after the `<!`. Any ASCII character is now
+     allowed.
+
+   Other than that, the newest specification mainly improves test coverage and
+   clarifies its wording in some cases, without affecting the implementation.
+
+   Refer to [CommonMark
+   0.30 notes](https://github.com/commonmark/commonmark-spec/releases/tag/0.30)
+   for more info.
+
+Fixes:
+
+ * [#163](https://github.com/mity/md4c/issues/163):
+   Make HTML renderer to emit `'\n'` after the root tag when in the XHTML mode.
+
+ * [#165](https://github.com/mity/md4c/issues/165):
+   Make HTML renderer not to percent-encode `'~'` in URLs. Although it does
+   work, it's not needed, and it can actually be confusing with URLs such as
+   `http://www.example.com/~johndoe/`.
+
+ * [#167](https://github.com/mity/md4c/issues/167),
+   [#168](https://github.com/mity/md4c/issues/168):
+   Fix multiple instances of various buffer overflow bugs, found mostly using
+   a fuzz testing. Contributed by [dtldarek](https://github.com/dtldarek) and
+   [Thierry Coppey](https://github.com/TCKnet).
+
+ * [#169](https://github.com/mity/md4c/issues/169):
+   Table underline now does not require 3 characters per table column anymore.
+   One dash (optionally with a leading or tailing `:` appended or prepended)
+   is now sufficient. This improves compatibility with the GFM.
+
+ * [#172](https://github.com/mity/md4c/issues/172):
+   Fix quadratic time behavior caused by unnecessary lookup for link reference
+   definition even if the potential label contains nested brackets.
+
+ * [#173](https://github.com/mity/md4c/issues/173),
+   [#174](https://github.com/mity/md4c/issues/174):
+   Multiple bugs identified with [OSS-Fuzz](https://github.com/google/oss-fuzz)
+   were fixed.
+
+
+## Version 0.4.8
+
+Fixes:
+
+ * [#149](https://github.com/mity/md4c/issues/149):
+   A HTML block started in a container block (and not explicitly finished in
+   the block) could eat 1 line of actual contents.
+
+ * [#150](https://github.com/mity/md4c/issues/150):
+   Fix md2html utility to output proper DOCTYPE and HTML tags when `--full-html`
+   command line options is used, accordingly to the expected output format
+   (HTML or XHTML).
+
+ * [#152](https://github.com/mity/md4c/issues/152):
+   Suppress recognition of a permissive autolink if it would otherwise form a
+   complete body of an outer inline link.
+
+ * [#153](https://github.com/mity/md4c/issues/153),
+   [#154](https://github.com/mity/md4c/issues/154):
+   Set `MD_BLOCK_UL_DETAIL::mark` and `MD_BLOCK_OL_DETAIL::mark_delimiter`
+   correctly, even when the blocks are nested at the same line in a complicated
+   ways.
+
+ * [#155](https://github.com/mity/md4c/issues/155):
+   Avoid reading 1 character beyond the input size in some complex cases.
+
+
+## Version 0.4.7
+
+Changes:
+
+ * Add `MD_TABLE_DETAIL` structure into the API. The structure describes column
+   count and row count of the table, and pointer to it is passed into the
+   application-provided block callback with the `MD_BLOCK_TABLE` block type.
+
+Fixes:
+
+ * [#131](https://github.com/mity/md4c/issues/131):
+   Fix handling of a reference image nested in a reference link.
+
+ * [#135](https://github.com/mity/md4c/issues/135):
+   Handle unmatched parenthesis pairs inside a permissive URL and WWW auto-links
+   in a way more compatible with the GFM.
+
+ * [#138](https://github.com/mity/md4c/issues/138):
+   The tag `<tbody></tbody>` is now suppressed whenever the table has zero body
+   rows.
+
+ * [#139](https://github.com/mity/md4c/issues/139):
+   Recognize a list item mark even when EOF follows it.
+
+ * [#142](https://github.com/mity/md4c/issues/142):
+   Fix reference link definition label matching in a case when the label ends
+   with a Unicode character with non-trivial case folding mapping.
+
+
+## Version 0.4.6
+
+Fixes:
+
+ * [#130](https://github.com/mity/md4c/issues/130):
+   Fix `ISANYOF` macro, which could provide unexpected results when encountering
+   zero byte in the input text; in some cases leading to broken internal state
+   of the parser.
+
+   The bug could result in denial of service and possibly also to other security
+   implications. Applications are advised to update to 0.4.6.
+
+
+## Version 0.4.5
+
+Fixes:
+
+ * [#118](https://github.com/mity/md4c/issues/118):
+   Fix HTML renderer's `MD_HTML_FLAG_VERBATIM_ENTITIES` flag, exposed in the
+   `md2html` utility via `--fverbatim-entities`.
+
+ * [#124](https://github.com/mity/md4c/issues/124):
+   Fix handling of indentation of 16 or more spaces in the fenced code blocks.
+
+
+## Version 0.4.4
+
+Changes:
+
+ * Make Unicode-specific code compliant to Unicode 13.0.
+
+New features:
+
+ * The HTML renderer, developed originally as the heart of the `md2html`
+   utility, is now built as a standalone library, in order to simplify its
+   reuse in applications.
+
+ * With `MD_HTML_FLAG_SKIP_UTF8_BOM`, the HTML renderer now skips UTF-8 byte
+   order mark (BOM) if the input begins with it, before passing to the Markdown
+   parser.
+
+   `md2html` utility automatically enables the flag (unless it is custom-built
+   with `-DMD4C_USE_ASCII`).
+
+ * With `MD_HTML_FLAG_XHTML`, The HTML renderer generates XHTML instead of
+   HTML.
+
+   This effectively means `<br />` instead of `<br>`, `<hr />` instead of
+   `<hr>`, and `<img ... />` instead of `<img ...>`.
+
+   `md2html` utility now understands the command line option `-x` or `--xhtml`
+   enabling the XHTML mode.
+
+Fixes:
+
+ * [#113](https://github.com/mity/md4c/issues/113):
+   Add missing folding info data for the following Unicode characters:
+   `U+0184`, `U+018a`, `U+01b2`, `U+01b5`, `U+01f4`, `U+0372`, `U+038f`,
+   `U+1c84`, `U+1fb9`, `U+1fbb`, `U+1fd9`, `U+1fdb`, `U+1fe9`, `U+1feb`,
+   `U+1ff9`, `U+1ffb`, `U+2c7f`, `U+2ced`, `U+a77b`, `U+a792`, `U+a7c9`.
+
+   Due the bug, the link definition label matching did not work in the case
+   insensitive way for these characters.
+
+
+## Version 0.4.3
+
+New features:
+
+ * With `MD_FLAG_UNDERLINE`, spans enclosed in underscore (`_foo_`) are seen
+   as underline (`MD_SPAN_UNDERLINE`) rather than an ordinary emphasis or
+   strong emphasis.
+
+Changes:
+
+ * The implementation of wiki-links extension (with `MD_FLAG_WIKILINKS`) has
+   been simplified.
+
+    - A noticeable increase of MD4C's memory footprint introduced by the
+      extension implementation in 0.4.0 has been removed.
+    - The priority handling towards other inline elements have been unified.
+      (This affects an obscure case where syntax of an image was in place of
+      wiki-link destination made the wiki-link invalid. Now *all* inline spans
+      in the wiki-link destination, including the images, is suppressed.)
+    - The length limitation of 100 characters now always applies to wiki-link
+      destination.
+
+ * Recognition of strike-through spans (with the flag `MD_FLAG_STRIKETHROUGH`)
+   has become much stricter and, arguably, reasonable.
+
+    - Only single tildes (`~`) and double tildes (`~~`) are recognized as
+      strike-through marks. Longer ones are not anymore.
+    - The length of the opener and closer marks have to be the same.
+    - The tildes cannot open a strike-through span if a whitespace follows.
+    - The tildes cannot close a strike-through span if a whitespace precedes.
+
+   This change follows the changes of behavior in cmark-gfm some time ago, so
+   it is also beneficial from compatibility point of view.
+
+ * When building MD4C by hand instead of using its CMake-based build, the UTF-8
+   support was by default disabled, unless explicitly asked for by defining
+   a preprocessor macro `MD4C_USE_UTF8`.
+
+   This has been changed and the UTF-8 mode now becomes the default, no matter
+   how `md4c.c` is compiled. If you need to disable it and use the ASCII-only
+   mode, you have explicitly define macro `MD4C_USE_ASCII` when compiling it.
+
+   (The CMake-based build as provided in our repository explicitly asked for
+   the UTF-8 support with `-DMD4C_USE_UTF8`. I.e. if you are using MD4C library
+   built with our vanilla `CMakeLists.txt` files, this change should not affect
+   you.)
+
+Fixes:
+
+ * Fixed some string length handling in the special `MD4C_USE_UTF16` build.
+
+   (This does not affect you unless you are on Windows and explicitly define
+   the macro when building MD4C.)
+
+ * [#100](https://github.com/mity/md4c/issues/100):
+   Fixed an off-by-one error in the maximal length limit of some segments
+   of e-mail addresses used in autolinks.
+
+ * [#107](https://github.com/mity/md4c/issues/107):
+   Fix mis-detection of asterisk-encoded emphasis in some corner cases when
+   length of the opener and closer differs, as in `***foo *bar baz***`.
+
+
+## Version 0.4.2
+
+Fixes:
+
+ * [#98](https://github.com/mity/md4c/issues/98):
+   Fix mis-detection of asterisk-encoded emphasis in some corner cases when
+   length of the opener and closer differs, as in `**a *b c** d*`.
+
+
+## Version 0.4.1
+
+Unfortunately, 0.4.0 has been released with badly updated ChangeLog. Fixing
+this is the only change on 0.4.1.
+
+
+## Version 0.4.0
+
+New features:
+
+ * With `MD_FLAG_LATEXMATHSPANS`, LaTeX math spans (`$...$`) and LaTeX display
+   math spans (`$$...$$`) are now recognized. (Note though that the HTML
+   renderer outputs them verbatim in a custom `<x-equation>` tag.)
+
+   Contributed by [Tilman Roeder](https://github.com/dyedgreen).
+
+ * With `MD_FLAG_WIKILINKS`, Wiki-style links (`[[...]]`) are now recognized.
+   (Note though that the HTML renderer renders them as a custom `<x-wikilink>`
+   tag.)
+
+   Contributed by [Nils Blomqvist](https://github.com/niblo).
+
+Changes:
+
+ * Parsing of tables (with `MD_FLAG_TABLES`) is now closer to the way how
+   cmark-gfm parses tables as we do not require every row of the table to
+   contain a pipe `|` anymore.
+
+   As a consequence, paragraphs now cannot interrupt tables. A paragraph which
+   follows the table has to be delimited with a blank line.
+
+Fixes:
+
+ * [#94](https://github.com/mity/md4c/issues/94):
+   `md_build_ref_def_hashtable()`: Do not allocate more memory than strictly
+   needed.
+
+ * [#95](https://github.com/mity/md4c/issues/95):
+   `md_is_container_mark()`: Ordered list mark requires at least one digit.
+
+ * [#96](https://github.com/mity/md4c/issues/96):
+   Some fixes for link label comparison.
+
+
+## Version 0.3.4
+
+Changes:
+
+ * Make Unicode-specific code compliant to Unicode 12.1.
+
+ * Structure `MD_BLOCK_CODE_DETAIL` got new member `fenced_char`. Application
+   can use it to detect character used to form the block fences (`` ` `` or
+   `~`). In the case of indented code block, it is set to zero.
+
+Fixes:
+
+ * [#77](https://github.com/mity/md4c/issues/77):
+   Fix maximal count of digits for numerical character references, as requested
+   by CommonMark specification 0.29.
+
+ * [#78](https://github.com/mity/md4c/issues/78):
+   Fix link reference definition label matching for Unicode characters where
+   the folding mapping leads to multiple codepoints, as e.g. in `ẞ` -> `SS`.
+
+ * [#83](https://github.com/mity/md4c/issues/83):
+   Fix recognition of an empty blockquote which interrupts a paragraph.
+
+
+## Version 0.3.3
+
+Changes:
+
+ * Make permissive URL autolink and permissive WWW autolink extensions stricter.
+
+   This brings the behavior closer to GFM and mitigates risk of false positives.
+   In particular, the domain has to contain at least one dot and parenthesis
+   can be part of the link destination only if `(` and `)` are balanced.
+
+Fixes:
+
+ * [#73](https://github.com/mity/md4c/issues/73):
+   Some raw HTML inputs could lead to quadratic parsing times.
+
+ * [#74](https://github.com/mity/md4c/issues/74):
+   Fix input leading to a crash. Found by fuzzing.
+
+ * [#76](https://github.com/mity/md4c/issues/76):
+   Fix handling of parenthesis in some corner cases of permissive URL autolink
+   and permissive WWW autolink extensions.
+
+
+## Version 0.3.2
+
+Changes:
+
+ * Changes mandated by CommonMark specification 0.29.
+
+   Most importantly, the white-space trimming rules for code spans have changed.
+   At most one space/newline is trimmed from beginning/end of the code span
+   (if the code span contains some non-space contents, and if it begins and
+   ends with space at the same time). In all other cases the spaces in the code
+   span are now left intact.
+
+   Other changes in behavior are in corner cases only. Refer to [CommonMark
+   0.29 notes](https://github.com/commonmark/commonmark-spec/releases/tag/0.29)
+   for more info.
+
+Fixes:
+
+ * [#68](https://github.com/mity/md4c/issues/68):
+   Some specific HTML blocks were not recognized when EOF follows without any
+   end-of-line character.
+
+ * [#69](https://github.com/mity/md4c/issues/69):
+   Strike-through span not working correctly when its opener mark is directly
+   followed by other opener mark; or when other closer mark directly precedes
+   its closer mark.
+
+
+## Version 0.3.1
+
+Fixes:
+
+ * [#58](https://github.com/mity/md4c/issues/58),
+   [#59](https://github.com/mity/md4c/issues/59),
+   [#60](https://github.com/mity/md4c/issues/60),
+   [#63](https://github.com/mity/md4c/issues/63),
+   [#66](https://github.com/mity/md4c/issues/66):
+   Some inputs could lead to quadratic parsing times. Thanks to Anders Kaseorg
+   for finding all those issues.
+
+ * [#61](https://github.com/mity/md4c/issues/59):
+   Flag `MD_FLAG_NOHTMLSPANS` erroneously affected also recognition of
+   CommonMark autolinks.
+
+
+## Version 0.3.0
+
+New features:
+
+ * Add extension for GitHub-style task lists:
+
+   ```
+    * [x] foo
+    * [x] bar
+    * [ ] baz
+   ```
+
+   (It has to be explicitly enabled with `MD_FLAG_TASKLISTS`.)
+
+ * Added support for building as a shared library. On non-Windows platforms,
+   this is now default behavior; on Windows static library is still the default.
+   The CMake option `BUILD_SHARED_LIBS` can be used to request one or the other
+   explicitly.
+
+   Contributed by Lisandro Damián Nicanor Pérez Meyer.
+
+ * Renamed structure `MD_RENDERER` to `MD_PARSER` and refactorize its contents
+   a little bit. Note this is source-level incompatible and initialization code
+   in apps may need to be updated.
+
+   The aim of the change is to be more friendly for long-term ABI compatibility
+   we shall maintain, starting with this release.
+
+ * Added `CHANGELOG.md` (this file).
+
+ * Make sure `md_process_table_row()` reports the same count of table cells for
+   all table rows, no matter how broken the input is. The cell count is derived
+   from table underline line. Bogus cells in other rows are silently ignored.
+   Missing cells in other rows are reported as empty ones.
+
+Fixes:
+
+ * CID 1475544:
+   Calling `md_free_attribute()` on uninitialized data.
+
+ * [#47](https://github.com/mity/md4c/issues/47):
+   Using bad offsets in `md_is_entity_str()`, in some cases leading to buffer
+   overflow.
+
+ * [#51](https://github.com/mity/md4c/issues/51):
+   Segfault in `md_process_table_cell()`.
+
+ * [#53](https://github.com/mity/md4c/issues/53):
+   With `MD_FLAG_PERMISSIVEURLAUTOLINKS` or `MD_FLAG_PERMISSIVEWWWAUTOLINKS`
+   we could generate bad output for ordinary Markdown links, if a non-space
+   character immediately follows like e.g. in `[link](http://github.com)X`.
+
+
+## Version 0.2.7
+
+This was the last version before the changelog has been added.
diff --git a/tdemarkdown/md4c/CMakeLists.txt b/tdemarkdown/md4c/CMakeLists.txt
new file mode 100644
index 000000000..c3f4bdaf1
--- /dev/null
+++ b/tdemarkdown/md4c/CMakeLists.txt
@@ -0,0 +1,64 @@
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
+
+project(MD4C C)
+
+set(MD_VERSION_MAJOR 0)
+set(MD_VERSION_MINOR 4)
+set(MD_VERSION_RELEASE 8)
+set(MD_VERSION "${MD_VERSION_MAJOR}.${MD_VERSION_MINOR}.${MD_VERSION_RELEASE}")
+
+set(PROJECT_VERSION "${MD_VERSION}")
+set(PROJECT_URL "https://github.com/mity/md4c")
+
+if(WIN32)
+    # On Windows, given there is no standard lib install dir etc., we rather
+    # by default build static lib.
+    option(BUILD_SHARED_LIBS "help string describing option" OFF)
+else()
+    # On Linux, MD4C is slowly being adding into some distros which prefer
+    # shared lib.
+    option(BUILD_SHARED_LIBS "help string describing option" ON)
+endif()
+
+add_definitions(
+    -DMD_VERSION_MAJOR=${MD_VERSION_MAJOR}
+    -DMD_VERSION_MINOR=${MD_VERSION_MINOR}
+    -DMD_VERSION_RELEASE=${MD_VERSION_RELEASE}
+)
+
+set(CMAKE_CONFIGURATION_TYPES Debug Release RelWithDebInfo MinSizeRel)
+if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+    set(CMAKE_BUILD_TYPE $ENV{CMAKE_BUILD_TYPE})
+
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "")
+        set(CMAKE_BUILD_TYPE "Release")
+    endif()
+endif()
+
+
+if(${CMAKE_C_COMPILER_ID} MATCHES GNU|Clang)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+elseif(MSVC)
+    # Disable warnings about the so-called unsecured functions:
+    add_definitions(/D_CRT_SECURE_NO_WARNINGS /W3)
+
+    # Specify proper C runtime library:
+    string(REGEX REPLACE "/M[DT]d?" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+    string(REGEX REPLACE "/M[DT]d?" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+    string(REGEX REPLACE "/M[DT]d?" "" CMAKE_C_FLAGS_RELWITHDEBINFO "{$CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    string(REGEX REPLACE "/M[DT]d?" "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} /MT")
+    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_RELEASE} /MT")
+endif()
+
+include(GNUInstallDirs)
+
+add_subdirectory(src)
+add_subdirectory(md2html)
diff --git a/tdemarkdown/md4c/LICENSE.md b/tdemarkdown/md4c/LICENSE.md
new file mode 100644
index 000000000..2088ba453
--- /dev/null
+++ b/tdemarkdown/md4c/LICENSE.md
@@ -0,0 +1,22 @@
+
+# The MIT License (MIT)
+
+Copyright © 2016-2020 Martin Mitáš
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the “Software”),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
diff --git a/tdemarkdown/md4c/README.md b/tdemarkdown/md4c/README.md
new file mode 100644
index 000000000..9abe987e9
--- /dev/null
+++ b/tdemarkdown/md4c/README.md
@@ -0,0 +1,297 @@
+[![Linux Build Status (travis-ci.com)](https://img.shields.io/travis/mity/md4c/master.svg?logo=linux&label=linux%20build)](https://travis-ci.com/mity/md4c)
+[![Windows Build Status (appveyor.com)](https://img.shields.io/appveyor/ci/mity/md4c/master.svg?logo=windows&label=windows%20build)](https://ci.appveyor.com/project/mity/md4c/branch/master)
+[![Code Coverage Status (codecov.io)](https://img.shields.io/codecov/c/github/mity/md4c/master.svg?logo=codecov&label=code%20coverage)](https://codecov.io/github/mity/md4c)
+[![Coverity Scan Status](https://img.shields.io/coverity/scan/mity-md4c.svg?label=coverity%20scan)](https://scan.coverity.com/projects/mity-md4c)
+
+
+# MD4C Readme
+
+* Home: http://github.com/mity/md4c
+* Wiki: http://github.com/mity/md4c/wiki
+* Issue tracker: http://github.com/mity/md4c/issues
+
+MD4C stands for "Markdown for C" and that's exactly what this project is about.
+
+
+## What is Markdown
+
+In short, Markdown is the markup language this `README.md` file is written in.
+
+The following resources can explain more if you are unfamiliar with it:
+* [Wikipedia article](http://en.wikipedia.org/wiki/Markdown)
+* [CommonMark site](http://commonmark.org)
+
+
+## What is MD4C
+
+MD4C is Markdown parser implementation in C, with the following features:
+
+* **Compliance:** Generally, MD4C aims to be compliant to the latest version of
+  [CommonMark specification](http://spec.commonmark.org/). Currently, we are
+  fully compliant to CommonMark 0.30.
+
+* **Extensions:** MD4C supports some commonly requested and accepted extensions.
+  See below.
+
+* **Performance:** MD4C is [very fast](https://talk.commonmark.org/t/2520).
+
+* **Compactness:** MD4C parser is implemented in one source file and one header
+  file. There are no dependencies other than standard C library.
+
+* **Embedding:** MD4C parser is easy to reuse in other projects, its API is
+  very straightforward: There is actually just one function, `md_parse()`.
+
+* **Push model:** MD4C parses the complete document and calls few callback
+  functions provided by the application to inform it about a start/end of
+  every block, a start/end of every span, and with any textual contents.
+
+* **Portability:** MD4C builds and works on Windows and POSIX-compliant OSes.
+  (It should be simple to make it run also on most other platforms, at least as
+  long as the platform provides C standard library, including a heap memory
+  management.)
+
+* **Encoding:** MD4C by default expects UTF-8 encoding of the input document.
+  But it can be compiled to recognize ASCII-only control characters (i.e. to
+  disable all Unicode-specific code), or (on Windows) to expect UTF-16 (i.e.
+  what is on Windows commonly called just "Unicode"). See more details below.
+
+* **Permissive license:** MD4C is available under the [MIT license](LICENSE.md).
+
+
+## Using MD4C
+
+### Parsing Markdown
+
+If you need just to parse a Markdown document, you need to include `md4c.h`
+and link against MD4C library (`-lmd4c`); or alternatively add `md4c.[hc]`
+directly to your code base as the parser is only implemented in the single C
+source file.
+
+The main provided function is `md_parse()`. It takes a text in the Markdown
+syntax and a pointer to a structure which provides pointers to several callback
+functions.
+
+As `md_parse()` processes the input, it calls the callbacks (when entering or
+leaving any Markdown block or span; and when outputting any textual content of
+the document), allowing application to convert it into another format or render
+it onto the screen.
+
+
+### Converting to HTML
+
+If you need to convert Markdown to HTML, include `md4c-html.h` and link against
+MD4C-HTML library (`-lmd4c-html`); or alternatively add the sources `md4c.[hc]`,
+`md4c-html.[hc]` and `entity.[hc]` into your code base.
+
+To convert a Markdown input, call `md_html()` function. It takes the Markdown
+input and calls the provided callback function. The callback is fed with
+chunks of the HTML output. Typical callback implementation just appends the
+chunks into a buffer or writes them to a file.
+
+
+## Markdown Extensions
+
+The default behavior is to recognize only Markdown syntax defined by the
+[CommonMark specification](http://spec.commonmark.org/).
+
+However, with appropriate flags, the behavior can be tuned to enable some
+extensions:
+
+* With the flag `MD_FLAG_COLLAPSEWHITESPACE`, a non-trivial whitespace is
+  collapsed into a single space.
+
+* With the flag `MD_FLAG_TABLES`, GitHub-style tables are supported.
+
+* With the flag `MD_FLAG_TASKLISTS`, GitHub-style task lists are supported.
+
+* With the flag `MD_FLAG_STRIKETHROUGH`, strike-through spans are enabled
+  (text enclosed in tilde marks, e.g. `~foo bar~`).
+
+* With the flag `MD_FLAG_PERMISSIVEURLAUTOLINKS` permissive URL autolinks
+  (not enclosed in `<` and `>`) are supported.
+
+* With the flag `MD_FLAG_PERMISSIVEEMAILAUTOLINKS`, permissive e-mail
+  autolinks (not enclosed in `<` and `>`) are supported.
+
+* With the flag `MD_FLAG_PERMISSIVEWWWAUTOLINKS` permissive WWW autolinks
+  without any scheme specified (e.g. `www.example.com`) are supported. MD4C
+  then assumes `http:` scheme.
+
+* With the flag `MD_FLAG_LATEXMATHSPANS` LaTeX math spans (`$...$`) and
+  LaTeX display math spans (`$$...$$`) are supported. (Note though that the
+  HTML renderer outputs them verbatim in a custom tag `<x-equation>`.)
+
+* With the flag `MD_FLAG_WIKILINKS`, wiki-style links (`[[link label]]` and
+  `[[target article|link label]]`) are supported. (Note that the HTML renderer
+  outputs them in a custom tag `<x-wikilink>`.)
+
+* With the flag `MD_FLAG_UNDERLINE`, underscore (`_`) denotes an underline
+  instead of an ordinary emphasis or strong emphasis.
+
+Few features of CommonMark (those some people see as mis-features) may be
+disabled with the following flags:
+
+* With the flag `MD_FLAG_NOHTMLSPANS` or `MD_FLAG_NOHTMLBLOCKS`, raw inline
+  HTML or raw HTML blocks respectively are disabled.
+
+* With the flag `MD_FLAG_NOINDENTEDCODEBLOCKS`, indented code blocks are
+  disabled.
+
+
+## Input/Output Encoding
+
+The CommonMark specification declares that any sequence of Unicode code points
+is a valid CommonMark document.
+
+But, under a closer inspection, Unicode plays any role in few very specific
+situations when parsing Markdown documents:
+
+1. For detection of word boundaries when processing emphasis and strong
+   emphasis, some classification of Unicode characters (whether it is
+   a whitespace or a punctuation) is needed.
+
+2. For (case-insensitive) matching of a link reference label with the
+   corresponding link reference definition, Unicode case folding is used.
+
+3. For translating HTML entities (e.g. `&amp;`) and numeric character
+   references (e.g. `&#35;` or `&#xcab;`) into their Unicode equivalents.
+
+   However note MD4C leaves this translation on the renderer/application; as
+   the renderer is supposed to really know output encoding and whether it
+   really needs to perform this kind of translation. (For example, when the
+   renderer outputs HTML, it may leave the entities untranslated and defer the
+   work to a web browser.)
+
+MD4C relies on this property of the CommonMark and the implementation is, to
+a large degree, encoding-agnostic. Most of MD4C code only assumes that the
+encoding of your choice is compatible with ASCII. I.e. that the codepoints
+below 128 have the same numeric values as ASCII.
+
+Any input MD4C does not understand is simply seen as part of the document text
+and sent to the renderer's callback functions unchanged.
+
+The two situations (word boundary detection and link reference matching) where
+MD4C has to understand Unicode are handled as specified by the following
+preprocessor macros (as specified at the time MD4C is being built):
+
+* If preprocessor macro `MD4C_USE_UTF8` is defined, MD4C assumes UTF-8 for the
+  word boundary detection and for the case-insensitive matching of link labels.
+
+  When none of these macros is explicitly used, this is the default behavior.
+
+* On Windows, if preprocessor macro `MD4C_USE_UTF16` is defined, MD4C uses
+  `WCHAR` instead of `char` and assumes UTF-16 encoding in those situations.
+  (UTF-16 is what Windows developers usually call just "Unicode" and what
+  Win32API generally works with.)
+
+  Note that because this macro affects also the types in `md4c.h`, you have
+  to define the macro both when building MD4C as well as when including
+  `md4c.h`.
+
+  Also note this is only supported in the parser (`md4c.[hc]`). The HTML
+  renderer does not support this and you will have to write your own custom
+  renderer to use this feature.
+
+* If preprocessor macro `MD4C_USE_ASCII` is defined, MD4C assumes nothing but
+  an ASCII input.
+
+  That effectively means that non-ASCII whitespace or punctuation characters
+  won't be recognized as such and that link reference matching will work in
+  a case-insensitive way only for ASCII letters (`[a-zA-Z]`).
+
+
+## Documentation
+
+The API of the parser is quite well documented in the comments in the `md4c.h`.
+Similarly, the markdown-to-html API is described in its header `md4c-html.h`.
+
+There is also [project wiki](http://github.com/mity/md4c/wiki) which provides
+some more comprehensive documentation. However note it is incomplete and some
+details may be somewhat outdated.
+
+
+## FAQ
+
+**Q: How does MD4C compare to a parser XY?**
+
+**A:** Some other implementations combine Markdown parser and HTML generator
+into a single entangled code hidden behind an interface which just allows the
+conversion from Markdown to HTML. They are often unusable if you want to
+process the input in any other way.
+
+Even when the parsing is available as a standalone feature, most parsers (if
+not all of them; at least within the scope of C/C++ language) are full DOM-like
+parsers: They construct abstract syntax tree (AST) representation of the whole
+Markdown document. That takes time and it leads to bigger memory footprint.
+
+It's completely fine as long as you really need it. If you don't need the full
+AST, there is a very high chance that using MD4C will be substantially faster
+and less hungry in terms of memory consumption.
+
+Last but not least, some Markdown parsers are implemented in a naive way. When
+fed with a [smartly crafted input pattern](test/pathological_tests.py), they
+may exhibit quadratic (or even worse) parsing times. What MD4C can still parse
+in a fraction of second may turn into long minutes or possibly hours with them.
+Hence, when such a naive parser is used to process an input from an untrusted
+source, the possibility of denial-of-service attacks becomes a real danger.
+
+A lot of our effort went into providing linear parsing times no matter what
+kind of crazy input MD4C parser is fed with. (If you encounter an input pattern
+which leads to a sub-linear parsing times, please do not hesitate and report it
+as a bug.)
+
+**Q: Does MD4C perform any input validation?**
+
+**A:** No. And we are proud of it. :-)
+
+CommonMark specification states that any sequence of Unicode characters is
+a valid Markdown document. (In practice, this more or less always means UTF-8
+encoding.)
+
+In other words, according to the specification, it does not matter whether some
+Markdown syntax construction is in some way broken or not. If it is broken, it
+will simply not be recognized and the parser should see it just as a verbatim
+text.
+
+MD4C takes this a step further: It sees any sequence of bytes as a valid input,
+following completely the GIGO philosophy (garbage in, garbage out). I.e. any
+ill-formed UTF-8 byte sequence will propagate to the respective callback as
+a part of the text.
+
+If you need to validate that the input is, say, a well-formed UTF-8 document,
+you have to do it on your own. The easiest way how to do this is to simply
+validate the whole document before passing it to the MD4C parser.
+
+
+## License
+
+MD4C is covered with MIT license, see the file `LICENSE.md`.
+
+
+## Links to Related Projects
+
+Ports and bindings to other languages:
+
+* [commonmark-d](https://github.com/AuburnSounds/commonmark-d):
+  Port of MD4C to D language.
+
+* [markdown-wasm](https://github.com/rsms/markdown-wasm):
+  Port of MD4C to WebAssembly.
+
+* [PyMD4C](https://github.com/dominickpastore/pymd4c):
+  Python bindings for MD4C
+
+Software using MD4C:
+
+* [QOwnNotes](https://www.qownnotes.org/):
+  A plain-text file notepad and todo-list manager with markdown support and
+  ownCloud / Nextcloud integration.
+
+* [Qt](https://www.qt.io/):
+  Cross-platform C++ GUI framework.
+
+* [Textosaurus](https://github.com/martinrotter/textosaurus):
+  Cross-platform text editor based on Qt and Scintilla.
+
+* [8th](https://8th-dev.com/):
+  Cross-platform concatenative programming language.
diff --git a/tdemarkdown/md4c/md2html/CMakeLists.txt b/tdemarkdown/md4c/md2html/CMakeLists.txt
new file mode 100644
index 000000000..14de6712e
--- /dev/null
+++ b/tdemarkdown/md4c/md2html/CMakeLists.txt
@@ -0,0 +1,22 @@
+
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
+
+
+# Build rules for md2html command line utility
+
+include_directories("${PROJECT_SOURCE_DIR}/src")
+add_executable(md2html cmdline.c cmdline.h md2html.c)
+target_link_libraries(md2html md4c-html)
+
+
+# Install rules
+
+install(
+    TARGETS md2html
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+install(FILES "md2html.1" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+
diff --git a/tdemarkdown/md4c/md2html/cmdline.c b/tdemarkdown/md4c/md2html/cmdline.c
new file mode 100644
index 000000000..c3fddfaa4
--- /dev/null
+++ b/tdemarkdown/md4c/md2html/cmdline.c
@@ -0,0 +1,205 @@
+/*
+ * C Reusables
+ * <http://github.com/mity/c-reusables>
+ *
+ * Copyright (c) 2017-2020 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "cmdline.h"
+
+#include <stdio.h>
+#include <string.h>
+
+
+#ifdef _WIN32
+    #define snprintf    _snprintf
+#endif
+
+
+#define CMDLINE_AUXBUF_SIZE     32
+
+
+
+static int
+cmdline_handle_short_opt_group(const CMDLINE_OPTION* options, const char* arggroup,
+        int (*callback)(int /*optval*/, const char* /*arg*/, void* /*userdata*/),
+        void* userdata)
+{
+    const CMDLINE_OPTION* opt;
+    int i;
+    int ret = 0;
+
+    for(i = 0; arggroup[i] != '\0'; i++) {
+        for(opt = options; opt->id != 0; opt++) {
+            if(arggroup[i] == opt->shortname)
+                break;
+        }
+
+        if(opt->id != 0  &&  !(opt->flags & CMDLINE_OPTFLAG_REQUIREDARG)) {
+            ret = callback(opt->id, NULL, userdata);
+        } else {
+            /* Unknown option. */
+            char badoptname[3];
+            badoptname[0] = '-';
+            badoptname[1] = arggroup[i];
+            badoptname[2] = '\0';
+            ret = callback((opt->id != 0 ? CMDLINE_OPTID_MISSINGARG : CMDLINE_OPTID_UNKNOWN),
+                            badoptname, userdata);
+        }
+
+        if(ret != 0)
+            break;
+    }
+
+    return ret;
+}
+
+int
+cmdline_read(const CMDLINE_OPTION* options, int argc, char** argv,
+        int (*callback)(int /*optval*/, const char* /*arg*/, void* /*userdata*/),
+        void* userdata)
+{
+    const CMDLINE_OPTION* opt;
+    char auxbuf[CMDLINE_AUXBUF_SIZE+1];
+    int fast_optarg_decision = 1;
+    int after_doubledash = 0;
+    int i = 1;
+    int ret = 0;
+
+    auxbuf[CMDLINE_AUXBUF_SIZE] = '\0';
+
+    /* Check whether there is any CMDLINE_OPTFLAG_COMPILERLIKE option with
+     * a name not starting with '-'. That would imply we can to check for
+     * non-option arguments only after refusing all such options. */
+    for(opt = options; opt->id != 0; opt++) {
+        if((opt->flags & CMDLINE_OPTFLAG_COMPILERLIKE)  &&  opt->longname[0] != '-')
+            fast_optarg_decision = 0;
+    }
+
+    while(i < argc) {
+        if(after_doubledash  ||  strcmp(argv[i], "-") == 0) {
+            /* Non-option argument.
+             * Standalone "-" usually means "read from stdin" or "write to
+             * stdout" so treat it always as a non-option. */
+            ret = callback(CMDLINE_OPTID_NONE, argv[i], userdata);
+        } else if(strcmp(argv[i], "--") == 0) {
+            /* End of options. All the remaining tokens are non-options
+             * even if they start with a dash. */
+            after_doubledash = 1;
+        } else if(fast_optarg_decision  &&  argv[i][0] != '-') {
+            /* Non-option argument. */
+            ret = callback(CMDLINE_OPTID_NONE, argv[i], userdata);
+        } else {
+            for(opt = options; opt->id != 0; opt++) {
+                if(opt->flags & CMDLINE_OPTFLAG_COMPILERLIKE) {
+                    size_t len = strlen(opt->longname);
+                    if(strncmp(argv[i], opt->longname, len) == 0) {
+                        /* Compiler-like option. */
+                        if(argv[i][len] != '\0')
+                            ret = callback(opt->id, argv[i] + len, userdata);
+                        else if(i+1 < argc)
+                            ret = callback(opt->id, argv[++i], userdata);
+                        else
+                            ret = callback(CMDLINE_OPTID_MISSINGARG, opt->longname, userdata);
+                        break;
+                    }
+                } else if(opt->longname != NULL  &&  strncmp(argv[i], "--", 2) == 0) {
+                    size_t len = strlen(opt->longname);
+                    if(strncmp(argv[i]+2, opt->longname, len) == 0) {
+                        /* Regular long option. */
+                        if(argv[i][2+len] == '\0') {
+                            /* with no argument provided. */
+                            if(!(opt->flags & CMDLINE_OPTFLAG_REQUIREDARG))
+                                ret = callback(opt->id, NULL, userdata);
+                            else
+                                ret = callback(CMDLINE_OPTID_MISSINGARG, argv[i], userdata);
+                            break;
+                        } else if(argv[i][2+len] == '=') {
+                            /* with an argument provided. */
+                            if(opt->flags & (CMDLINE_OPTFLAG_OPTIONALARG | CMDLINE_OPTFLAG_REQUIREDARG)) {
+                                ret = callback(opt->id, argv[i]+2+len+1, userdata);
+                            } else {
+                                snprintf(auxbuf, CMDLINE_AUXBUF_SIZE, "--%s", opt->longname);
+                                ret = callback(CMDLINE_OPTID_BOGUSARG, auxbuf, userdata);
+                            }
+                            break;
+                        } else {
+                            continue;
+                        }
+                    }
+                } else if(opt->shortname != '\0'  &&  argv[i][0] == '-') {
+                    if(argv[i][1] == opt->shortname) {
+                        /* Regular short option. */
+                        if(opt->flags & CMDLINE_OPTFLAG_REQUIREDARG) {
+                            if(argv[i][2] != '\0')
+                                ret = callback(opt->id, argv[i]+2, userdata);
+                            else if(i+1 < argc)
+                                ret = callback(opt->id, argv[++i], userdata);
+                            else
+                                ret = callback(CMDLINE_OPTID_MISSINGARG, argv[i], userdata);
+                            break;
+                        } else {
+                            ret = callback(opt->id, NULL, userdata);
+
+                            /* There might be more (argument-less) short options
+                             * grouped together. */
+                            if(ret == 0  &&  argv[i][2] != '\0')
+                                ret = cmdline_handle_short_opt_group(options, argv[i]+2, callback, userdata);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if(opt->id == 0) {  /* still not handled? */
+                if(argv[i][0] != '-') {
+                    /* Non-option argument. */
+                    ret = callback(CMDLINE_OPTID_NONE, argv[i], userdata);
+                } else {
+                    /* Unknown option. */
+                    char* badoptname = argv[i];
+
+                    if(strncmp(badoptname, "--", 2) == 0) {
+                        /* Strip any argument from the long option. */
+                        char* assignment = strchr(badoptname, '=');
+                        if(assignment != NULL) {
+                            size_t len = assignment - badoptname;
+                            if(len > CMDLINE_AUXBUF_SIZE)
+                                len = CMDLINE_AUXBUF_SIZE;
+                            strncpy(auxbuf, badoptname, len);
+                            auxbuf[len] = '\0';
+                            badoptname = auxbuf;
+                        }
+                    }
+
+                    ret = callback(CMDLINE_OPTID_UNKNOWN, badoptname, userdata);
+                }
+            }
+        }
+
+        if(ret != 0)
+            return ret;
+        i++;
+    }
+
+    return ret;
+}
+
diff --git a/tdemarkdown/md4c/md2html/cmdline.h b/tdemarkdown/md4c/md2html/cmdline.h
new file mode 100644
index 000000000..5bbde47eb
--- /dev/null
+++ b/tdemarkdown/md4c/md2html/cmdline.h
@@ -0,0 +1,153 @@
+/*
+ * C Reusables
+ * <http://github.com/mity/c-reusables>
+ *
+ * Copyright (c) 2017 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef CRE_CMDLINE_H
+#define CRE_CMDLINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* The option may have an argument. (Affects only long option.) */
+#define CMDLINE_OPTFLAG_OPTIONALARG     0x0001
+
+/* The option must have an argument.
+ * Such short option cannot be grouped within single '-abc'. */
+#define CMDLINE_OPTFLAG_REQUIREDARG     0x0002
+
+/* Enable special compiler-like mode for the long option.
+ *
+ * Note ::shortname is not supported with this flag. CMDLINE_OPTION::shortname
+ * is silently ignored if the flag is used.
+ *
+ * With this flag, CMDLINE_OPTION::longname is treated differently as follows:
+ *
+ * 1. The option matches if the CMDLINE_OPTION::longname is the exact prefix
+ *   of the argv[i] from commandline.
+ *
+ * 2. Double dash ("--") is not automatically prepended to
+ *    CMDLINE_OPTION::longname. (If you desire any leading dash, include it
+ *    explicitly in CMDLINE_OPTION initialization.)
+ *
+ * 3. An argument (optionally after a whitespace) is required (the flag
+ *    CMDLINE_OPTFLAG_COMPILERLIKE implicitly implies also the flag
+ *    CMDLINE_OPTFLAG_REQUIREDARG).
+ *
+ *    But there is no delimiter expected (no "=" between the option and its
+ *    argument). Whitespace is optional between the option and its argument.
+ *
+ *    Intended use is for options similar to what many compilers accept.
+ *    For example:
+ *      -DDEBUG=0               (-D is the option, DEBUG=0 is the argument).
+ *      -Isrc/include           (-I is the option, src/include is the argument).
+ *      -isystem /usr/include   (-isystem is the option, /usr/include is the argument).
+ *      -lmath                  (-l is the option, math is the argument).
+ */
+#define CMDLINE_OPTFLAG_COMPILERLIKE    0x0004
+
+
+/* Special (reserved) option IDs. Do not use these for any CMDLINE_OPTION::id.
+ * See documentation of cmdline_read() to get info about their meaning.
+ */
+#define CMDLINE_OPTID_NONE              0
+#define CMDLINE_OPTID_UNKNOWN           (-0x7fffffff + 0)
+#define CMDLINE_OPTID_MISSINGARG        (-0x7fffffff + 1)
+#define CMDLINE_OPTID_BOGUSARG          (-0x7fffffff + 2)
+
+
+typedef struct CMDLINE_OPTION {
+    char shortname;         /* Short (single char) option or 0. */
+    const char* longname;   /* Long name (after "--") or NULL. */
+    int id;                 /* Non-zero ID to identify the option in the callback; or zero to denote end of options list. */
+    unsigned flags;         /* Bitmask of CMDLINE_OPTFLAG_xxxx flags. */
+} CMDLINE_OPTION;
+
+
+/* Parses all options and their arguments as specified by argc, argv accordingly
+ * with the given options (except argv[0] which is ignored).
+ *
+ * The caller must specify the list of supported options in the 1st parameter
+ * of the function. The array must end with a record whose CMDLINE_OPTION::id
+ * is zero to zero.
+ *
+ * The provided callback function is called for each option on the command
+ * line so that:
+ *
+ *   -- the "id" refers to the id of the option as specified  in options[].
+ *
+ *   -- the "arg" specifies an argument of the option or NULL if none is
+ *      provided.
+ *
+ *   -- the "userdata" just allows to pass in some caller's context into
+ *      the callback.
+ *
+ * Special cases (recognized via special "id" value) are reported to the
+ * callback as follows:
+ *
+ *   -- If id is CMDLINE_OPTID_NONE, the callback informs about a non-option
+ *      also known as a positional argument.
+ *
+ *      All argv[] tokens which are not interpreted as an options or an argument
+ *      of any option fall into this category.
+ *
+ *      Usually, programs interpret these as paths to file to process.
+ *
+ *   -- If id is CMDLINE_OPTID_UNKNOWN, the corresponding argv[] looks like an
+ *      option but it is not found in the options[] passed to cmdline_read().
+ *
+ *      The callback's parameter arg specifies the guilty command line token.
+ *      Usually, program writes down an error message and exits.
+ *
+ *   -- If id is CMDLINE_OPTID_MISSINGARG, the given option is valid but its
+ *      flag in options[] requires an argument; yet there is none on the
+ *      command line.
+ *
+ *      The callback's parameter arg specifies the guilty option name.
+ *      Usually, program writes down an error message and exits.
+ *
+ *   -- If id is CMDLINE_OPTID_BOGUSARG, the given option is valid but its
+ *      flag in options[] does not expect an argument; yet the command line
+ *      does provide one.
+ *
+ *      The callback's parameter arg specifies the guilty option name.
+ *      Usually, program writes down an error message and exits.
+ *
+ * On success, zero is returned.
+ *
+ * If the callback returns a non-zero, cmdline_read() aborts immediately and
+ * cmdline_read() propagates the same return value to the caller.
+ */
+
+int cmdline_read(const CMDLINE_OPTION* options, int argc, char** argv,
+        int (*callback)(int /*id*/, const char* /*arg*/, void* /*userdata*/),
+        void* userdata);
+
+
+#ifdef __cplusplus
+}  /* extern "C" { */
+#endif
+
+#endif  /* CRE_CMDLINE_H */
diff --git a/tdemarkdown/md4c/md2html/md2html.1 b/tdemarkdown/md4c/md2html/md2html.1
new file mode 100644
index 000000000..cffaee8b8
--- /dev/null
+++ b/tdemarkdown/md4c/md2html/md2html.1
@@ -0,0 +1,113 @@
+.TH MD2HTML 1 "June 2019" "" "General Commands Manual"
+.nh
+.ad l
+.
+.SH NAME
+.
+md2html \- convert Markdown to HTML
+.
+.SH SYNOPSIS
+.
+.B md2html
+.RI [ OPTION ]...\&
+.RI [ FILE ]
+.
+.SH OPTIONS
+.
+.SS General options:
+.
+.TP
+.BR -o ", " --output= \fIOUTFILE\fR
+Write output to \fIOUTFILE\fR instead of \fBstdout\fR(3)
+.
+.TP
+.BR -f ", " --full-html
+Generate full HTML document, including header
+.
+.TP
+.BR -s ", " --stat
+Measure time of input parsing
+.
+.TP
+.BR -h ", " --help
+Display help and exit
+.
+.TP
+.BR -v ", " --version
+Display version and exit
+.
+.SS Markdown dialect options:
+.
+.TP
+.B --commonmark
+CommonMark (the default)
+.
+.TP
+.B --github
+Github Flavored Markdown
+.
+.PP
+Note: dialect options are equivalent to some combination of flags below.
+.
+.SS Markdown extension options:
+.
+.TP
+.B --fcollapse-whitespace
+Collapse non-trivial whitespace
+.
+.TP
+.B --fverbatim-entities
+Do not translate entities
+.
+.TP
+.B --fpermissive-atx-headers
+Allow ATX headers without delimiting space
+.
+.TP
+.B --fpermissive-url-autolinks
+Allow URL autolinks without "<" and ">" delimiters
+.
+.TP
+.B --fpermissive-www-autolinks
+Allow WWW autolinks without any scheme (e.g. "www.example.com")
+.
+.TP
+.B --fpermissive-email-autolinks
+Allow e-mail autolinks without "<", ">" and "mailto:"
+.
+.TP
+.B --fpermissive-autolinks
+Enable all 3 of the above permissive autolinks options
+.
+.TP
+.B --fno-indented-code
+Disable indented code blocks
+.
+.TP
+.B --fno-html-blocks
+Disable raw HTML blocks
+.
+.TP
+.B --fno-html-spans
+Disable raw HTML spans
+.
+.TP
+.B --fno-html
+Same as \fB--fno-html-blocks --fno-html-spans\fR
+.
+.TP
+.B --ftables
+Enable tables
+.
+.TP
+.B --fstrikethrough
+Enable strikethrough spans
+.
+.TP
+.B --ftasklists
+Enable task lists
+.
+.SH SEE ALSO
+.
+https://github.com/mity/md4c
+.
diff --git a/tdemarkdown/md4c/md2html/md2html.c b/tdemarkdown/md4c/md2html/md2html.c
new file mode 100644
index 000000000..06b2b74b1
--- /dev/null
+++ b/tdemarkdown/md4c/md2html/md2html.c
@@ -0,0 +1,383 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2020 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "md4c-html.h"
+#include "cmdline.h"
+
+
+
+/* Global options. */
+static unsigned parser_flags = 0;
+#ifndef MD4C_USE_ASCII
+    static unsigned renderer_flags = MD_HTML_FLAG_DEBUG | MD_HTML_FLAG_SKIP_UTF8_BOM;
+#else
+    static unsigned renderer_flags = MD_HTML_FLAG_DEBUG;
+#endif
+static int want_fullhtml = 0;
+static int want_xhtml = 0;
+static int want_stat = 0;
+
+
+/*********************************
+ ***  Simple grow-able buffer  ***
+ *********************************/
+
+/* We render to a memory buffer instead of directly outputting the rendered
+ * documents, as this allows using this utility for evaluating performance
+ * of MD4C (--stat option). This allows us to measure just time of the parser,
+ * without the I/O.
+ */
+
+struct membuffer {
+    char* data;
+    size_t asize;
+    size_t size;
+};
+
+static void
+membuf_init(struct membuffer* buf, MD_SIZE new_asize)
+{
+    buf->size = 0;
+    buf->asize = new_asize;
+    buf->data = malloc(buf->asize);
+    if(buf->data == NULL) {
+        fprintf(stderr, "membuf_init: malloc() failed.\n");
+        exit(1);
+    }
+}
+
+static void
+membuf_fini(struct membuffer* buf)
+{
+    if(buf->data)
+        free(buf->data);
+}
+
+static void
+membuf_grow(struct membuffer* buf, size_t new_asize)
+{
+    buf->data = realloc(buf->data, new_asize);
+    if(buf->data == NULL) {
+        fprintf(stderr, "membuf_grow: realloc() failed.\n");
+        exit(1);
+    }
+    buf->asize = new_asize;
+}
+
+static void
+membuf_append(struct membuffer* buf, const char* data, MD_SIZE size)
+{
+    if(buf->asize < buf->size + size)
+        membuf_grow(buf, buf->size + buf->size / 2 + size);
+    memcpy(buf->data + buf->size, data, size);
+    buf->size += size;
+}
+
+
+/**********************
+ ***  Main program  ***
+ **********************/
+
+static void
+process_output(const MD_CHAR* text, MD_SIZE size, void* userdata)
+{
+    membuf_append((struct membuffer*) userdata, text, size);
+}
+
+static int
+process_file(FILE* in, FILE* out)
+{
+    size_t n;
+    struct membuffer buf_in = {0};
+    struct membuffer buf_out = {0};
+    int ret = -1;
+    clock_t t0, t1;
+
+    membuf_init(&buf_in, 32 * 1024);
+
+    /* Read the input file into a buffer. */
+    while(1) {
+        if(buf_in.size >= buf_in.asize)
+            membuf_grow(&buf_in, buf_in.asize + buf_in.asize / 2);
+
+        n = fread(buf_in.data + buf_in.size, 1, buf_in.asize - buf_in.size, in);
+        if(n == 0)
+            break;
+        buf_in.size += n;
+    }
+
+    /* Input size is good estimation of output size. Add some more reserve to
+     * deal with the HTML header/footer and tags. */
+    membuf_init(&buf_out, (MD_SIZE)(buf_in.size + buf_in.size/8 + 64));
+
+    /* Parse the document. This shall call our callbacks provided via the
+     * md_renderer_t structure. */
+    t0 = clock();
+
+    ret = md_html(buf_in.data, (MD_SIZE)buf_in.size, process_output, (void*) &buf_out,
+                    parser_flags, renderer_flags);
+
+    t1 = clock();
+    if(ret != 0) {
+        fprintf(stderr, "Parsing failed.\n");
+        goto out;
+    }
+
+    /* Write down the document in the HTML format. */
+    if(want_fullhtml) {
+        if(want_xhtml) {
+            fprintf(out, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+            fprintf(out, "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" "
+                            "\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n");
+            fprintf(out, "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n");
+        } else {
+            fprintf(out, "<!DOCTYPE html>\n");
+            fprintf(out, "<html>\n");
+        }
+        fprintf(out, "<head>\n");
+        fprintf(out, "<title></title>\n");
+        fprintf(out, "<meta name=\"generator\" content=\"md2html\"%s>\n", want_xhtml ? " /" : "");
+        fprintf(out, "</head>\n");
+        fprintf(out, "<body>\n");
+    }
+
+    fwrite(buf_out.data, 1, buf_out.size, out);
+
+    if(want_fullhtml) {
+        fprintf(out, "</body>\n");
+        fprintf(out, "</html>\n");
+    }
+
+    if(want_stat) {
+        if(t0 != (clock_t)-1  &&  t1 != (clock_t)-1) {
+            double elapsed = (double)(t1 - t0) / CLOCKS_PER_SEC;
+            if (elapsed < 1)
+                fprintf(stderr, "Time spent on parsing: %7.2f ms.\n", elapsed*1e3);
+            else
+                fprintf(stderr, "Time spent on parsing: %6.3f s.\n", elapsed);
+        }
+    }
+
+    /* Success if we have reached here. */
+    ret = 0;
+
+out:
+    membuf_fini(&buf_in);
+    membuf_fini(&buf_out);
+
+    return ret;
+}
+
+
+static const CMDLINE_OPTION cmdline_options[] = {
+    { 'o', "output",                        'o', CMDLINE_OPTFLAG_REQUIREDARG },
+    { 'f', "full-html",                     'f', 0 },
+    { 'x', "xhtml",                         'x', 0 },
+    { 's', "stat",                          's', 0 },
+    { 'h', "help",                          'h', 0 },
+    { 'v', "version",                       'v', 0 },
+
+    {  0,  "commonmark",                    'c', 0 },
+    {  0,  "github",                        'g', 0 },
+
+    {  0,  "fcollapse-whitespace",          'W', 0 },
+    {  0,  "flatex-math",                   'L', 0 },
+    {  0,  "fpermissive-atx-headers",       'A', 0 },
+    {  0,  "fpermissive-autolinks",         'V', 0 },
+    {  0,  "fpermissive-email-autolinks",   '@', 0 },
+    {  0,  "fpermissive-url-autolinks",     'U', 0 },
+    {  0,  "fpermissive-www-autolinks",     '.', 0 },
+    {  0,  "fstrikethrough",                'S', 0 },
+    {  0,  "ftables",                       'T', 0 },
+    {  0,  "ftasklists",                    'X', 0 },
+    {  0,  "funderline",                    '_', 0 },
+    {  0,  "fverbatim-entities",            'E', 0 },
+    {  0,  "fwiki-links",                   'K', 0 },
+
+    {  0,  "fno-html-blocks",               'F', 0 },
+    {  0,  "fno-html-spans",                'G', 0 },
+    {  0,  "fno-html",                      'H', 0 },
+    {  0,  "fno-indented-code",             'I', 0 },
+
+    {  0,  NULL,                             0,  0 }
+};
+
+static void
+usage(void)
+{
+    printf(
+        "Usage: md2html [OPTION]... [FILE]\n"
+        "Convert input FILE (or standard input) in Markdown format to HTML.\n"
+        "\n"
+        "General options:\n"
+        "  -o  --output=FILE    Output file (default is standard output)\n"
+        "  -f, --full-html      Generate full HTML document, including header\n"
+        "  -x, --xhtml          Generate XHTML instead of HTML\n"
+        "  -s, --stat           Measure time of input parsing\n"
+        "  -h, --help           Display this help and exit\n"
+        "  -v, --version        Display version and exit\n"
+        "\n"
+        "Markdown dialect options:\n"
+        "(note these are equivalent to some combinations of the flags below)\n"
+        "      --commonmark     CommonMark (this is default)\n"
+        "      --github         Github Flavored Markdown\n"
+        "\n"
+        "Markdown extension options:\n"
+        "      --fcollapse-whitespace\n"
+        "                       Collapse non-trivial whitespace\n"
+        "      --flatex-math    Enable LaTeX style mathematics spans\n"
+        "      --fpermissive-atx-headers\n"
+        "                       Allow ATX headers without delimiting space\n"
+        "      --fpermissive-url-autolinks\n"
+        "                       Allow URL autolinks without '<', '>'\n"
+        "      --fpermissive-www-autolinks\n"
+        "                       Allow WWW autolinks without any scheme (e.g. 'www.example.com')\n"
+        "      --fpermissive-email-autolinks  \n"
+        "                       Allow e-mail autolinks without '<', '>' and 'mailto:'\n"
+        "      --fpermissive-autolinks\n"
+        "                       Same as --fpermissive-url-autolinks --fpermissive-www-autolinks\n"
+        "                       --fpermissive-email-autolinks\n"
+        "      --fstrikethrough Enable strike-through spans\n"
+        "      --ftables        Enable tables\n"
+        "      --ftasklists     Enable task lists\n"
+        "      --funderline     Enable underline spans\n"
+        "      --fwiki-links    Enable wiki links\n"
+        "\n"
+        "Markdown suppression options:\n"
+        "      --fno-html-blocks\n"
+        "                       Disable raw HTML blocks\n"
+        "      --fno-html-spans\n"
+        "                       Disable raw HTML spans\n"
+        "      --fno-html       Same as --fno-html-blocks --fno-html-spans\n"
+        "      --fno-indented-code\n"
+        "                       Disable indented code blocks\n"
+        "\n"
+        "HTML generator options:\n"
+        "      --fverbatim-entities\n"
+        "                       Do not translate entities\n"
+        "\n"
+    );
+}
+
+static void
+version(void)
+{
+    printf("%d.%d.%d\n", MD_VERSION_MAJOR, MD_VERSION_MINOR, MD_VERSION_RELEASE);
+}
+
+static const char* input_path = NULL;
+static const char* output_path = NULL;
+
+static int
+cmdline_callback(int opt, char const* value, void* data)
+{
+    switch(opt) {
+        case 0:
+            if(input_path) {
+                fprintf(stderr, "Too many arguments. Only one input file can be specified.\n");
+                fprintf(stderr, "Use --help for more info.\n");
+                exit(1);
+            }
+            input_path = value;
+            break;
+
+        case 'o':   output_path = value; break;
+        case 'f':   want_fullhtml = 1; break;
+        case 'x':   want_xhtml = 1; renderer_flags |= MD_HTML_FLAG_XHTML; break;
+        case 's':   want_stat = 1; break;
+        case 'h':   usage(); exit(0); break;
+        case 'v':   version(); exit(0); break;
+
+        case 'c':   parser_flags |= MD_DIALECT_COMMONMARK; break;
+        case 'g':   parser_flags |= MD_DIALECT_GITHUB; break;
+
+        case 'E':   renderer_flags |= MD_HTML_FLAG_VERBATIM_ENTITIES; break;
+        case 'A':   parser_flags |= MD_FLAG_PERMISSIVEATXHEADERS; break;
+        case 'I':   parser_flags |= MD_FLAG_NOINDENTEDCODEBLOCKS; break;
+        case 'F':   parser_flags |= MD_FLAG_NOHTMLBLOCKS; break;
+        case 'G':   parser_flags |= MD_FLAG_NOHTMLSPANS; break;
+        case 'H':   parser_flags |= MD_FLAG_NOHTML; break;
+        case 'W':   parser_flags |= MD_FLAG_COLLAPSEWHITESPACE; break;
+        case 'U':   parser_flags |= MD_FLAG_PERMISSIVEURLAUTOLINKS; break;
+        case '.':   parser_flags |= MD_FLAG_PERMISSIVEWWWAUTOLINKS; break;
+        case '@':   parser_flags |= MD_FLAG_PERMISSIVEEMAILAUTOLINKS; break;
+        case 'V':   parser_flags |= MD_FLAG_PERMISSIVEAUTOLINKS; break;
+        case 'T':   parser_flags |= MD_FLAG_TABLES; break;
+        case 'S':   parser_flags |= MD_FLAG_STRIKETHROUGH; break;
+        case 'L':   parser_flags |= MD_FLAG_LATEXMATHSPANS; break;
+        case 'K':   parser_flags |= MD_FLAG_WIKILINKS; break;
+        case 'X':   parser_flags |= MD_FLAG_TASKLISTS; break;
+        case '_':   parser_flags |= MD_FLAG_UNDERLINE; break;
+
+        default:
+            fprintf(stderr, "Illegal option: %s\n", value);
+            fprintf(stderr, "Use --help for more info.\n");
+            exit(1);
+            break;
+    }
+
+    return 0;
+}
+
+int
+main(int argc, char** argv)
+{
+    FILE* in = stdin;
+    FILE* out = stdout;
+    int ret = 0;
+
+    if(cmdline_read(cmdline_options, argc, argv, cmdline_callback, NULL) != 0) {
+        usage();
+        exit(1);
+    }
+
+    if(input_path != NULL && strcmp(input_path, "-") != 0) {
+        in = fopen(input_path, "rb");
+        if(in == NULL) {
+            fprintf(stderr, "Cannot open %s.\n", input_path);
+            exit(1);
+        }
+    }
+    if(output_path != NULL && strcmp(output_path, "-") != 0) {
+        out = fopen(output_path, "wt");
+        if(out == NULL) {
+            fprintf(stderr, "Cannot open %s.\n", output_path);
+            exit(1);
+        }
+    }
+
+    ret = process_file(in, out);
+    if(in != stdin)
+        fclose(in);
+    if(out != stdout)
+        fclose(out);
+
+    return ret;
+}
diff --git a/tdemarkdown/md4c/scripts/build_folding_map.py b/tdemarkdown/md4c/scripts/build_folding_map.py
new file mode 100644
index 000000000..b401775f5
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/build_folding_map.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import textwrap
+
+
+self_path = os.path.dirname(os.path.realpath(__file__));
+f = open(self_path + "/unicode/CaseFolding.txt", "r")
+
+status_list = [ "C", "F" ]
+
+folding_list = [ dict(), dict(), dict() ]
+
+# Filter the foldings for "full" folding.
+for line in f:
+    comment_off = line.find("#")
+    if comment_off >= 0:
+        line = line[:comment_off]
+    line = line.strip()
+    if not line:
+        continue
+
+    raw_codepoint, status, raw_mapping, ignored_tail = line.split(";", 3)
+    if not status.strip() in status_list:
+        continue
+    codepoint = int(raw_codepoint.strip(), 16)
+    mapping = [int(it, 16) for it in raw_mapping.strip().split(" ")]
+    mapping_len = len(mapping)
+
+    if mapping_len in range(1, 4):
+        folding_list[mapping_len-1][codepoint] = mapping
+    else:
+        assert(False)
+f.close()
+
+
+# If we assume that (index0 ... index-1) makes a range (as defined below),
+# check that the newly provided index is compatible with the range too; i.e.
+# verify that the range can be extended without breaking its properties.
+#
+# Currently, we can handle ranges which:
+#
+# (1) either form consecutive sequence of codepoints and which map that range
+#     to other consecutive range of codepoints (of the same length);
+#
+# (2) or a consecutive sequence of codepoints with step 2 where each codepoint
+#     CP is mapped to the codepoint CP+1
+#     (e.g. 0x1234 -> 0x1235; 0x1236 -> 0x1237; 0x1238 -> 0x1239; ...).
+#
+# Note: When the codepoints in the range are mapped to multiple codepoints,
+# only the 1st mapped codepoint is considered. All the other ones have to be
+# shared by all the mappings covered by the range.
+def is_range_compatible(folding, codepoint_list, index0, index):
+    N = index - index0
+    codepoint0 = codepoint_list[index0]
+    codepoint1 = codepoint_list[index0+1]
+    codepointN = codepoint_list[index]
+    mapping0 = folding[codepoint0]
+    mapping1 = folding[codepoint1]
+    mappingN = folding[codepointN]
+
+    # Check the range type (1):
+    if codepoint1 - codepoint0 == 1 and codepointN - codepoint0 == N                \
+            and mapping1[0] - mapping0[0] == 1 and mapping1[1:] == mapping0[1:]     \
+            and mappingN[0] - mapping0[0] == N and mappingN[1:] == mapping0[1:]:
+        return True
+
+    # Check the range type (2):
+    if codepoint1 - codepoint0 == 2 and codepointN - codepoint0 == 2 * N            \
+            and mapping0[0] - codepoint0 == 1                                       \
+            and mapping1[0] - codepoint1 == 1 and mapping1[1:] == mapping0[1:]      \
+            and mappingN[0] - codepointN == 1 and mappingN[1:] == mapping0[1:]:
+        return True
+
+    return False
+
+
+def mapping_str(list, mapping):
+    return ",".join("0x{:04x}".format(x) for x in mapping)
+
+for mapping_len in range(1, 4):
+    folding = folding_list[mapping_len-1]
+    codepoint_list = list(folding)
+
+    index0 = 0
+    count = len(folding)
+
+    records = list()
+    data_records = list()
+
+    while index0 < count:
+        index1 = index0 + 1
+        while index1 < count and is_range_compatible(folding, codepoint_list, index0, index1):
+            index1 += 1
+
+        if index1 - index0 > 2:
+            # Range of codepoints
+            records.append("R(0x{:04x},0x{:04x})".format(codepoint_list[index0], codepoint_list[index1-1]))
+            data_records.append(mapping_str(data_records, folding[codepoint_list[index0]]))
+            data_records.append(mapping_str(data_records, folding[codepoint_list[index1-1]]))
+            index0 = index1
+        else:
+            # Single codepoint
+            records.append("S(0x{:04x})".format(codepoint_list[index0]))
+            data_records.append(mapping_str(data_records, folding[codepoint_list[index0]]))
+            index0 += 1
+
+    sys.stdout.write("static const unsigned FOLD_MAP_{}[] = {{\n".format(mapping_len))
+    sys.stdout.write("\n".join(textwrap.wrap(", ".join(records), 110,
+                        initial_indent = "    ", subsequent_indent="    ")))
+    sys.stdout.write("\n};\n")
+
+    sys.stdout.write("static const unsigned FOLD_MAP_{}_DATA[] = {{\n".format(mapping_len))
+    sys.stdout.write("\n".join(textwrap.wrap(", ".join(data_records), 110,
+                        initial_indent = "    ", subsequent_indent="    ")))
+    sys.stdout.write("\n};\n")
+
+
+
diff --git a/tdemarkdown/md4c/scripts/build_punct_map.py b/tdemarkdown/md4c/scripts/build_punct_map.py
new file mode 100644
index 000000000..13102f26f
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/build_punct_map.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import textwrap
+
+
+self_path = os.path.dirname(os.path.realpath(__file__));
+f = open(self_path + "/unicode/DerivedGeneralCategory.txt", "r")
+
+codepoint_list = []
+category_list = [ "Pc", "Pd", "Pe", "Pf", "Pi", "Po", "Ps" ]
+
+# Filter codepoints falling in the right category:
+for line in f:
+    comment_off = line.find("#")
+    if comment_off >= 0:
+        line = line[:comment_off]
+    line = line.strip()
+    if not line:
+        continue
+
+    char_range, category = line.split(";")
+    char_range = char_range.strip()
+    category = category.strip()
+
+    if not category in category_list:
+        continue
+
+    delim_off = char_range.find("..")
+    if delim_off >= 0:
+        codepoint0 = int(char_range[:delim_off], 16)
+        codepoint1 = int(char_range[delim_off+2:], 16)
+        for codepoint in range(codepoint0, codepoint1 + 1):
+            codepoint_list.append(codepoint)
+    else:
+        codepoint = int(char_range, 16)
+        codepoint_list.append(codepoint)
+f.close()
+
+
+codepoint_list.sort()
+
+
+index0 = 0
+count = len(codepoint_list)
+
+records = list()
+while index0 < count:
+    index1 = index0 + 1
+    while index1 < count and codepoint_list[index1] == codepoint_list[index1-1] + 1:
+        index1 += 1
+
+    if index1 - index0 > 1:
+        # Range of codepoints
+        records.append("R(0x{:04x},0x{:04x})".format(codepoint_list[index0], codepoint_list[index1-1]))
+    else:
+        # Single codepoint
+        records.append("S(0x{:04x})".format(codepoint_list[index0]))
+
+    index0 = index1
+
+sys.stdout.write("static const unsigned PUNCT_MAP[] = {\n")
+sys.stdout.write("\n".join(textwrap.wrap(", ".join(records), 110,
+                    initial_indent = "    ", subsequent_indent="    ")))
+sys.stdout.write("\n};\n\n")
diff --git a/tdemarkdown/md4c/scripts/build_whitespace_map.py b/tdemarkdown/md4c/scripts/build_whitespace_map.py
new file mode 100644
index 000000000..932b5716e
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/build_whitespace_map.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import textwrap
+
+
+self_path = os.path.dirname(os.path.realpath(__file__));
+f = open(self_path + "/unicode/DerivedGeneralCategory.txt", "r")
+
+codepoint_list = []
+category_list = [ "Zs" ]
+
+# Filter codepoints falling in the right category:
+for line in f:
+    comment_off = line.find("#")
+    if comment_off >= 0:
+        line = line[:comment_off]
+    line = line.strip()
+    if not line:
+        continue
+
+    char_range, category = line.split(";")
+    char_range = char_range.strip()
+    category = category.strip()
+
+    if not category in category_list:
+        continue
+
+    delim_off = char_range.find("..")
+    if delim_off >= 0:
+        codepoint0 = int(char_range[:delim_off], 16)
+        codepoint1 = int(char_range[delim_off+2:], 16)
+        for codepoint in range(codepoint0, codepoint1 + 1):
+            codepoint_list.append(codepoint)
+    else:
+        codepoint = int(char_range, 16)
+        codepoint_list.append(codepoint)
+f.close()
+
+
+codepoint_list.sort()
+
+
+index0 = 0
+count = len(codepoint_list)
+
+records = list()
+while index0 < count:
+    index1 = index0 + 1
+    while index1 < count and codepoint_list[index1] == codepoint_list[index1-1] + 1:
+        index1 += 1
+
+    if index1 - index0 > 1:
+        # Range of codepoints
+        records.append("R(0x{:04x},0x{:04x})".format(codepoint_list[index0], codepoint_list[index1-1]))
+    else:
+        # Single codepoint
+        records.append("S(0x{:04x})".format(codepoint_list[index0]))
+
+    index0 = index1
+
+sys.stdout.write("static const unsigned WHITESPACE_MAP[] = {\n")
+sys.stdout.write("\n".join(textwrap.wrap(", ".join(records), 110,
+                    initial_indent = "    ", subsequent_indent="    ")))
+sys.stdout.write("\n};\n\n")
diff --git a/tdemarkdown/md4c/scripts/coverity.sh b/tdemarkdown/md4c/scripts/coverity.sh
new file mode 100755
index 000000000..bcf7f140b
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/coverity.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# This scripts attempts to build the project via cov-build utility, and prepare
+# a package for uploading to the coverity scan service.
+#
+# (See http://scan.coverity.com for more info.)
+
+set -e
+
+# Check presence of coverity static analyzer.
+if ! which cov-build; then
+    echo "Utility cov-build not found in PATH."
+    exit 1
+fi
+
+# Choose a build system (ninja or GNU make).
+if which ninja; then
+    BUILD_TOOL=ninja
+    GENERATOR=Ninja
+elif which make; then
+    BUILD_TOOL=make
+    GENERATOR="MSYS Makefiles"
+else
+    echo "No suitable build system found."
+    exit 1
+fi
+
+# Choose a zip tool.
+if which 7za; then
+    MKZIP="7za a -r -mx9"
+elif which 7z; then
+    MKZIP="7z a -r -mx9"
+elif which zip; then
+    MKZIP="zip -r"
+else
+    echo "No suitable zip utility found"
+    exit 1
+fi
+
+# Change dir to project root.
+cd `dirname "$0"`/..
+
+CWD=`pwd`
+ROOT_DIR="$CWD"
+BUILD_DIR="$CWD/coverity"
+OUTPUT="$CWD/cov-int.zip"
+
+# Sanity checks.
+if [ ! -x "$ROOT_DIR/scripts/coverity.sh" ]; then
+    echo "There is some path mismatch."
+    exit 1
+fi
+if [ -e "$BUILD_DIR" ]; then
+    echo "Path $BUILD_DIR already exists. Delete it and retry."
+    exit 1
+fi
+if [ -e "$OUTPUT" ]; then
+    echo "Path $OUTPUT already exists. Delete it and retry."
+    exit 1
+fi
+
+# Build the project with the Coverity analyzes enabled.
+mkdir -p "$BUILD_DIR"
+cd "$BUILD_DIR"
+cmake -G "$GENERATOR" "$ROOT_DIR"
+cov-build --dir cov-int "$BUILD_TOOL"
+$MKZIP "$OUTPUT" "cov-int"
+cd "$ROOT_DIR"
+rm -rf "$BUILD_DIR"
+
diff --git a/tdemarkdown/md4c/scripts/run-tests.sh b/tdemarkdown/md4c/scripts/run-tests.sh
new file mode 100755
index 000000000..c00b36a92
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/run-tests.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# Run this script from build directory.
+
+#set -e
+
+SELF_DIR=`dirname $0`
+PROJECT_DIR="$SELF_DIR/.."
+TEST_DIR="$PROJECT_DIR/test"
+
+
+PROGRAM="md2html/md2html"
+if [ ! -x "$PROGRAM" ]; then
+    echo "Cannot find the $PROGRAM." >&2
+    echo "You have to run this script from the build directory." >&2
+    exit 1
+fi
+
+if which py >>/dev/null 2>&1; then
+    PYTHON=py
+elif which python3 >>/dev/null 2>&1; then
+    PYTHON=python3
+elif which python >>/dev/null 2>&1; then
+    if [ `python --version | awk '{print $2}' | cut -d. -f1` -ge 3 ]; then
+        PYTHON=python
+    fi
+fi
+
+echo
+echo "CommonMark specification:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/spec.txt" -p "$PROGRAM"
+
+echo
+echo "Code coverage & regressions:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/coverage.txt" -p "$PROGRAM"
+
+echo
+echo "Permissive e-mail autolinks extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-email-autolinks.txt" -p "$PROGRAM --fpermissive-email-autolinks"
+
+echo
+echo "Permissive URL autolinks extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-url-autolinks.txt" -p "$PROGRAM --fpermissive-url-autolinks"
+
+echo
+echo "WWW autolinks extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/permissive-www-autolinks.txt" -p "$PROGRAM --fpermissive-www-autolinks"
+
+echo
+echo "Tables extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/tables.txt" -p "$PROGRAM --ftables"
+
+echo
+echo "Strikethrough extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/strikethrough.txt" -p "$PROGRAM --fstrikethrough"
+
+echo
+echo "Task lists extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/tasklists.txt" -p "$PROGRAM --ftasklists"
+
+echo
+echo "LaTeX extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/latex-math.txt" -p "$PROGRAM --flatex-math"
+
+echo
+echo "Wiki links extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/wiki-links.txt" -p "$PROGRAM --fwiki-links --ftables"
+
+echo
+echo "Underline extension:"
+$PYTHON "$TEST_DIR/spec_tests.py" -s "$TEST_DIR/underline.txt" -p "$PROGRAM --funderline"
+
+echo
+echo "Pathological input:"
+$PYTHON "$TEST_DIR/pathological_tests.py" -p "$PROGRAM"
diff --git a/tdemarkdown/md4c/scripts/unicode/CaseFolding.txt b/tdemarkdown/md4c/scripts/unicode/CaseFolding.txt
new file mode 100644
index 000000000..033788b25
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/unicode/CaseFolding.txt
@@ -0,0 +1,1584 @@
+# CaseFolding-13.0.0.txt
+# Date: 2019-09-08, 23:30:59 GMT
+# © 2019 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Unicode Character Database
+#   For documentation, see http://www.unicode.org/reports/tr44/
+#
+# Case Folding Properties
+#
+# This file is a supplement to the UnicodeData file.
+# It provides a case folding mapping generated from the Unicode Character Database.
+# If all characters are mapped according to the full mapping below, then
+# case differences (according to UnicodeData.txt and SpecialCasing.txt)
+# are eliminated.
+#
+# The data supports both implementations that require simple case foldings
+# (where string lengths don't change), and implementations that allow full case folding
+# (where string lengths may grow). Note that where they can be supported, the
+# full case foldings are superior: for example, they allow "MASSE" and "Maße" to match.
+#
+# All code points not listed in this file map to themselves.
+#
+# NOTE: case folding does not preserve normalization formats!
+#
+# For information on case folding, including how to have case folding
+# preserve normalization formats, see Section 3.13 Default Case Algorithms in
+# The Unicode Standard.
+#
+# ================================================================================
+# Format
+# ================================================================================
+# The entries in this file are in the following machine-readable format:
+#
+# <code>; <status>; <mapping>; # <name>
+#
+# The status field is:
+# C: common case folding, common mappings shared by both simple and full mappings.
+# F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+# S: simple case folding, mappings to single characters where different from F.
+# T: special case for uppercase I and dotted uppercase I
+#    - For non-Turkic languages, this mapping is normally not used.
+#    - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+#      Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+#      See the discussions of case mapping in the Unicode Standard for more information.
+#
+# Usage:
+#  A. To do a simple case folding, use the mappings with status C + S.
+#  B. To do a full case folding, use the mappings with status C + F.
+#
+#    The mappings with status T can be used or omitted depending on the desired case-folding
+#    behavior. (The default option is to exclude them.)
+#
+# =================================================================
+
+# Property: Case_Folding
+
+#  All code points not explicitly listed for Case_Folding
+#  have the value C for the status field, and the code point itself for the mapping field.
+
+# =================================================================
+0041; C; 0061; # LATIN CAPITAL LETTER A
+0042; C; 0062; # LATIN CAPITAL LETTER B
+0043; C; 0063; # LATIN CAPITAL LETTER C
+0044; C; 0064; # LATIN CAPITAL LETTER D
+0045; C; 0065; # LATIN CAPITAL LETTER E
+0046; C; 0066; # LATIN CAPITAL LETTER F
+0047; C; 0067; # LATIN CAPITAL LETTER G
+0048; C; 0068; # LATIN CAPITAL LETTER H
+0049; C; 0069; # LATIN CAPITAL LETTER I
+0049; T; 0131; # LATIN CAPITAL LETTER I
+004A; C; 006A; # LATIN CAPITAL LETTER J
+004B; C; 006B; # LATIN CAPITAL LETTER K
+004C; C; 006C; # LATIN CAPITAL LETTER L
+004D; C; 006D; # LATIN CAPITAL LETTER M
+004E; C; 006E; # LATIN CAPITAL LETTER N
+004F; C; 006F; # LATIN CAPITAL LETTER O
+0050; C; 0070; # LATIN CAPITAL LETTER P
+0051; C; 0071; # LATIN CAPITAL LETTER Q
+0052; C; 0072; # LATIN CAPITAL LETTER R
+0053; C; 0073; # LATIN CAPITAL LETTER S
+0054; C; 0074; # LATIN CAPITAL LETTER T
+0055; C; 0075; # LATIN CAPITAL LETTER U
+0056; C; 0076; # LATIN CAPITAL LETTER V
+0057; C; 0077; # LATIN CAPITAL LETTER W
+0058; C; 0078; # LATIN CAPITAL LETTER X
+0059; C; 0079; # LATIN CAPITAL LETTER Y
+005A; C; 007A; # LATIN CAPITAL LETTER Z
+00B5; C; 03BC; # MICRO SIGN
+00C0; C; 00E0; # LATIN CAPITAL LETTER A WITH GRAVE
+00C1; C; 00E1; # LATIN CAPITAL LETTER A WITH ACUTE
+00C2; C; 00E2; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+00C3; C; 00E3; # LATIN CAPITAL LETTER A WITH TILDE
+00C4; C; 00E4; # LATIN CAPITAL LETTER A WITH DIAERESIS
+00C5; C; 00E5; # LATIN CAPITAL LETTER A WITH RING ABOVE
+00C6; C; 00E6; # LATIN CAPITAL LETTER AE
+00C7; C; 00E7; # LATIN CAPITAL LETTER C WITH CEDILLA
+00C8; C; 00E8; # LATIN CAPITAL LETTER E WITH GRAVE
+00C9; C; 00E9; # LATIN CAPITAL LETTER E WITH ACUTE
+00CA; C; 00EA; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+00CB; C; 00EB; # LATIN CAPITAL LETTER E WITH DIAERESIS
+00CC; C; 00EC; # LATIN CAPITAL LETTER I WITH GRAVE
+00CD; C; 00ED; # LATIN CAPITAL LETTER I WITH ACUTE
+00CE; C; 00EE; # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+00CF; C; 00EF; # LATIN CAPITAL LETTER I WITH DIAERESIS
+00D0; C; 00F0; # LATIN CAPITAL LETTER ETH
+00D1; C; 00F1; # LATIN CAPITAL LETTER N WITH TILDE
+00D2; C; 00F2; # LATIN CAPITAL LETTER O WITH GRAVE
+00D3; C; 00F3; # LATIN CAPITAL LETTER O WITH ACUTE
+00D4; C; 00F4; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+00D5; C; 00F5; # LATIN CAPITAL LETTER O WITH TILDE
+00D6; C; 00F6; # LATIN CAPITAL LETTER O WITH DIAERESIS
+00D8; C; 00F8; # LATIN CAPITAL LETTER O WITH STROKE
+00D9; C; 00F9; # LATIN CAPITAL LETTER U WITH GRAVE
+00DA; C; 00FA; # LATIN CAPITAL LETTER U WITH ACUTE
+00DB; C; 00FB; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+00DC; C; 00FC; # LATIN CAPITAL LETTER U WITH DIAERESIS
+00DD; C; 00FD; # LATIN CAPITAL LETTER Y WITH ACUTE
+00DE; C; 00FE; # LATIN CAPITAL LETTER THORN
+00DF; F; 0073 0073; # LATIN SMALL LETTER SHARP S
+0100; C; 0101; # LATIN CAPITAL LETTER A WITH MACRON
+0102; C; 0103; # LATIN CAPITAL LETTER A WITH BREVE
+0104; C; 0105; # LATIN CAPITAL LETTER A WITH OGONEK
+0106; C; 0107; # LATIN CAPITAL LETTER C WITH ACUTE
+0108; C; 0109; # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+010A; C; 010B; # LATIN CAPITAL LETTER C WITH DOT ABOVE
+010C; C; 010D; # LATIN CAPITAL LETTER C WITH CARON
+010E; C; 010F; # LATIN CAPITAL LETTER D WITH CARON
+0110; C; 0111; # LATIN CAPITAL LETTER D WITH STROKE
+0112; C; 0113; # LATIN CAPITAL LETTER E WITH MACRON
+0114; C; 0115; # LATIN CAPITAL LETTER E WITH BREVE
+0116; C; 0117; # LATIN CAPITAL LETTER E WITH DOT ABOVE
+0118; C; 0119; # LATIN CAPITAL LETTER E WITH OGONEK
+011A; C; 011B; # LATIN CAPITAL LETTER E WITH CARON
+011C; C; 011D; # LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+011E; C; 011F; # LATIN CAPITAL LETTER G WITH BREVE
+0120; C; 0121; # LATIN CAPITAL LETTER G WITH DOT ABOVE
+0122; C; 0123; # LATIN CAPITAL LETTER G WITH CEDILLA
+0124; C; 0125; # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0126; C; 0127; # LATIN CAPITAL LETTER H WITH STROKE
+0128; C; 0129; # LATIN CAPITAL LETTER I WITH TILDE
+012A; C; 012B; # LATIN CAPITAL LETTER I WITH MACRON
+012C; C; 012D; # LATIN CAPITAL LETTER I WITH BREVE
+012E; C; 012F; # LATIN CAPITAL LETTER I WITH OGONEK
+0130; F; 0069 0307; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0130; T; 0069; # LATIN CAPITAL LETTER I WITH DOT ABOVE
+0132; C; 0133; # LATIN CAPITAL LIGATURE IJ
+0134; C; 0135; # LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0136; C; 0137; # LATIN CAPITAL LETTER K WITH CEDILLA
+0139; C; 013A; # LATIN CAPITAL LETTER L WITH ACUTE
+013B; C; 013C; # LATIN CAPITAL LETTER L WITH CEDILLA
+013D; C; 013E; # LATIN CAPITAL LETTER L WITH CARON
+013F; C; 0140; # LATIN CAPITAL LETTER L WITH MIDDLE DOT
+0141; C; 0142; # LATIN CAPITAL LETTER L WITH STROKE
+0143; C; 0144; # LATIN CAPITAL LETTER N WITH ACUTE
+0145; C; 0146; # LATIN CAPITAL LETTER N WITH CEDILLA
+0147; C; 0148; # LATIN CAPITAL LETTER N WITH CARON
+0149; F; 02BC 006E; # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+014A; C; 014B; # LATIN CAPITAL LETTER ENG
+014C; C; 014D; # LATIN CAPITAL LETTER O WITH MACRON
+014E; C; 014F; # LATIN CAPITAL LETTER O WITH BREVE
+0150; C; 0151; # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0152; C; 0153; # LATIN CAPITAL LIGATURE OE
+0154; C; 0155; # LATIN CAPITAL LETTER R WITH ACUTE
+0156; C; 0157; # LATIN CAPITAL LETTER R WITH CEDILLA
+0158; C; 0159; # LATIN CAPITAL LETTER R WITH CARON
+015A; C; 015B; # LATIN CAPITAL LETTER S WITH ACUTE
+015C; C; 015D; # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+015E; C; 015F; # LATIN CAPITAL LETTER S WITH CEDILLA
+0160; C; 0161; # LATIN CAPITAL LETTER S WITH CARON
+0162; C; 0163; # LATIN CAPITAL LETTER T WITH CEDILLA
+0164; C; 0165; # LATIN CAPITAL LETTER T WITH CARON
+0166; C; 0167; # LATIN CAPITAL LETTER T WITH STROKE
+0168; C; 0169; # LATIN CAPITAL LETTER U WITH TILDE
+016A; C; 016B; # LATIN CAPITAL LETTER U WITH MACRON
+016C; C; 016D; # LATIN CAPITAL LETTER U WITH BREVE
+016E; C; 016F; # LATIN CAPITAL LETTER U WITH RING ABOVE
+0170; C; 0171; # LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0172; C; 0173; # LATIN CAPITAL LETTER U WITH OGONEK
+0174; C; 0175; # LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+0176; C; 0177; # LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+0178; C; 00FF; # LATIN CAPITAL LETTER Y WITH DIAERESIS
+0179; C; 017A; # LATIN CAPITAL LETTER Z WITH ACUTE
+017B; C; 017C; # LATIN CAPITAL LETTER Z WITH DOT ABOVE
+017D; C; 017E; # LATIN CAPITAL LETTER Z WITH CARON
+017F; C; 0073; # LATIN SMALL LETTER LONG S
+0181; C; 0253; # LATIN CAPITAL LETTER B WITH HOOK
+0182; C; 0183; # LATIN CAPITAL LETTER B WITH TOPBAR
+0184; C; 0185; # LATIN CAPITAL LETTER TONE SIX
+0186; C; 0254; # LATIN CAPITAL LETTER OPEN O
+0187; C; 0188; # LATIN CAPITAL LETTER C WITH HOOK
+0189; C; 0256; # LATIN CAPITAL LETTER AFRICAN D
+018A; C; 0257; # LATIN CAPITAL LETTER D WITH HOOK
+018B; C; 018C; # LATIN CAPITAL LETTER D WITH TOPBAR
+018E; C; 01DD; # LATIN CAPITAL LETTER REVERSED E
+018F; C; 0259; # LATIN CAPITAL LETTER SCHWA
+0190; C; 025B; # LATIN CAPITAL LETTER OPEN E
+0191; C; 0192; # LATIN CAPITAL LETTER F WITH HOOK
+0193; C; 0260; # LATIN CAPITAL LETTER G WITH HOOK
+0194; C; 0263; # LATIN CAPITAL LETTER GAMMA
+0196; C; 0269; # LATIN CAPITAL LETTER IOTA
+0197; C; 0268; # LATIN CAPITAL LETTER I WITH STROKE
+0198; C; 0199; # LATIN CAPITAL LETTER K WITH HOOK
+019C; C; 026F; # LATIN CAPITAL LETTER TURNED M
+019D; C; 0272; # LATIN CAPITAL LETTER N WITH LEFT HOOK
+019F; C; 0275; # LATIN CAPITAL LETTER O WITH MIDDLE TILDE
+01A0; C; 01A1; # LATIN CAPITAL LETTER O WITH HORN
+01A2; C; 01A3; # LATIN CAPITAL LETTER OI
+01A4; C; 01A5; # LATIN CAPITAL LETTER P WITH HOOK
+01A6; C; 0280; # LATIN LETTER YR
+01A7; C; 01A8; # LATIN CAPITAL LETTER TONE TWO
+01A9; C; 0283; # LATIN CAPITAL LETTER ESH
+01AC; C; 01AD; # LATIN CAPITAL LETTER T WITH HOOK
+01AE; C; 0288; # LATIN CAPITAL LETTER T WITH RETROFLEX HOOK
+01AF; C; 01B0; # LATIN CAPITAL LETTER U WITH HORN
+01B1; C; 028A; # LATIN CAPITAL LETTER UPSILON
+01B2; C; 028B; # LATIN CAPITAL LETTER V WITH HOOK
+01B3; C; 01B4; # LATIN CAPITAL LETTER Y WITH HOOK
+01B5; C; 01B6; # LATIN CAPITAL LETTER Z WITH STROKE
+01B7; C; 0292; # LATIN CAPITAL LETTER EZH
+01B8; C; 01B9; # LATIN CAPITAL LETTER EZH REVERSED
+01BC; C; 01BD; # LATIN CAPITAL LETTER TONE FIVE
+01C4; C; 01C6; # LATIN CAPITAL LETTER DZ WITH CARON
+01C5; C; 01C6; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
+01C7; C; 01C9; # LATIN CAPITAL LETTER LJ
+01C8; C; 01C9; # LATIN CAPITAL LETTER L WITH SMALL LETTER J
+01CA; C; 01CC; # LATIN CAPITAL LETTER NJ
+01CB; C; 01CC; # LATIN CAPITAL LETTER N WITH SMALL LETTER J
+01CD; C; 01CE; # LATIN CAPITAL LETTER A WITH CARON
+01CF; C; 01D0; # LATIN CAPITAL LETTER I WITH CARON
+01D1; C; 01D2; # LATIN CAPITAL LETTER O WITH CARON
+01D3; C; 01D4; # LATIN CAPITAL LETTER U WITH CARON
+01D5; C; 01D6; # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01D7; C; 01D8; # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D9; C; 01DA; # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+01DB; C; 01DC; # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01DE; C; 01DF; # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+01E0; C; 01E1; # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+01E2; C; 01E3; # LATIN CAPITAL LETTER AE WITH MACRON
+01E4; C; 01E5; # LATIN CAPITAL LETTER G WITH STROKE
+01E6; C; 01E7; # LATIN CAPITAL LETTER G WITH CARON
+01E8; C; 01E9; # LATIN CAPITAL LETTER K WITH CARON
+01EA; C; 01EB; # LATIN CAPITAL LETTER O WITH OGONEK
+01EC; C; 01ED; # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+01EE; C; 01EF; # LATIN CAPITAL LETTER EZH WITH CARON
+01F0; F; 006A 030C; # LATIN SMALL LETTER J WITH CARON
+01F1; C; 01F3; # LATIN CAPITAL LETTER DZ
+01F2; C; 01F3; # LATIN CAPITAL LETTER D WITH SMALL LETTER Z
+01F4; C; 01F5; # LATIN CAPITAL LETTER G WITH ACUTE
+01F6; C; 0195; # LATIN CAPITAL LETTER HWAIR
+01F7; C; 01BF; # LATIN CAPITAL LETTER WYNN
+01F8; C; 01F9; # LATIN CAPITAL LETTER N WITH GRAVE
+01FA; C; 01FB; # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+01FC; C; 01FD; # LATIN CAPITAL LETTER AE WITH ACUTE
+01FE; C; 01FF; # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+0200; C; 0201; # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+0202; C; 0203; # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+0204; C; 0205; # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+0206; C; 0207; # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+0208; C; 0209; # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+020A; C; 020B; # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+020C; C; 020D; # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+020E; C; 020F; # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+0210; C; 0211; # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+0212; C; 0213; # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+0214; C; 0215; # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+0216; C; 0217; # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+0218; C; 0219; # LATIN CAPITAL LETTER S WITH COMMA BELOW
+021A; C; 021B; # LATIN CAPITAL LETTER T WITH COMMA BELOW
+021C; C; 021D; # LATIN CAPITAL LETTER YOGH
+021E; C; 021F; # LATIN CAPITAL LETTER H WITH CARON
+0220; C; 019E; # LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+0222; C; 0223; # LATIN CAPITAL LETTER OU
+0224; C; 0225; # LATIN CAPITAL LETTER Z WITH HOOK
+0226; C; 0227; # LATIN CAPITAL LETTER A WITH DOT ABOVE
+0228; C; 0229; # LATIN CAPITAL LETTER E WITH CEDILLA
+022A; C; 022B; # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+022C; C; 022D; # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+022E; C; 022F; # LATIN CAPITAL LETTER O WITH DOT ABOVE
+0230; C; 0231; # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+0232; C; 0233; # LATIN CAPITAL LETTER Y WITH MACRON
+023A; C; 2C65; # LATIN CAPITAL LETTER A WITH STROKE
+023B; C; 023C; # LATIN CAPITAL LETTER C WITH STROKE
+023D; C; 019A; # LATIN CAPITAL LETTER L WITH BAR
+023E; C; 2C66; # LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+0241; C; 0242; # LATIN CAPITAL LETTER GLOTTAL STOP
+0243; C; 0180; # LATIN CAPITAL LETTER B WITH STROKE
+0244; C; 0289; # LATIN CAPITAL LETTER U BAR
+0245; C; 028C; # LATIN CAPITAL LETTER TURNED V
+0246; C; 0247; # LATIN CAPITAL LETTER E WITH STROKE
+0248; C; 0249; # LATIN CAPITAL LETTER J WITH STROKE
+024A; C; 024B; # LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+024C; C; 024D; # LATIN CAPITAL LETTER R WITH STROKE
+024E; C; 024F; # LATIN CAPITAL LETTER Y WITH STROKE
+0345; C; 03B9; # COMBINING GREEK YPOGEGRAMMENI
+0370; C; 0371; # GREEK CAPITAL LETTER HETA
+0372; C; 0373; # GREEK CAPITAL LETTER ARCHAIC SAMPI
+0376; C; 0377; # GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+037F; C; 03F3; # GREEK CAPITAL LETTER YOT
+0386; C; 03AC; # GREEK CAPITAL LETTER ALPHA WITH TONOS
+0388; C; 03AD; # GREEK CAPITAL LETTER EPSILON WITH TONOS
+0389; C; 03AE; # GREEK CAPITAL LETTER ETA WITH TONOS
+038A; C; 03AF; # GREEK CAPITAL LETTER IOTA WITH TONOS
+038C; C; 03CC; # GREEK CAPITAL LETTER OMICRON WITH TONOS
+038E; C; 03CD; # GREEK CAPITAL LETTER UPSILON WITH TONOS
+038F; C; 03CE; # GREEK CAPITAL LETTER OMEGA WITH TONOS
+0390; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+0391; C; 03B1; # GREEK CAPITAL LETTER ALPHA
+0392; C; 03B2; # GREEK CAPITAL LETTER BETA
+0393; C; 03B3; # GREEK CAPITAL LETTER GAMMA
+0394; C; 03B4; # GREEK CAPITAL LETTER DELTA
+0395; C; 03B5; # GREEK CAPITAL LETTER EPSILON
+0396; C; 03B6; # GREEK CAPITAL LETTER ZETA
+0397; C; 03B7; # GREEK CAPITAL LETTER ETA
+0398; C; 03B8; # GREEK CAPITAL LETTER THETA
+0399; C; 03B9; # GREEK CAPITAL LETTER IOTA
+039A; C; 03BA; # GREEK CAPITAL LETTER KAPPA
+039B; C; 03BB; # GREEK CAPITAL LETTER LAMDA
+039C; C; 03BC; # GREEK CAPITAL LETTER MU
+039D; C; 03BD; # GREEK CAPITAL LETTER NU
+039E; C; 03BE; # GREEK CAPITAL LETTER XI
+039F; C; 03BF; # GREEK CAPITAL LETTER OMICRON
+03A0; C; 03C0; # GREEK CAPITAL LETTER PI
+03A1; C; 03C1; # GREEK CAPITAL LETTER RHO
+03A3; C; 03C3; # GREEK CAPITAL LETTER SIGMA
+03A4; C; 03C4; # GREEK CAPITAL LETTER TAU
+03A5; C; 03C5; # GREEK CAPITAL LETTER UPSILON
+03A6; C; 03C6; # GREEK CAPITAL LETTER PHI
+03A7; C; 03C7; # GREEK CAPITAL LETTER CHI
+03A8; C; 03C8; # GREEK CAPITAL LETTER PSI
+03A9; C; 03C9; # GREEK CAPITAL LETTER OMEGA
+03AA; C; 03CA; # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
+03AB; C; 03CB; # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+03B0; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
+03C2; C; 03C3; # GREEK SMALL LETTER FINAL SIGMA
+03CF; C; 03D7; # GREEK CAPITAL KAI SYMBOL
+03D0; C; 03B2; # GREEK BETA SYMBOL
+03D1; C; 03B8; # GREEK THETA SYMBOL
+03D5; C; 03C6; # GREEK PHI SYMBOL
+03D6; C; 03C0; # GREEK PI SYMBOL
+03D8; C; 03D9; # GREEK LETTER ARCHAIC KOPPA
+03DA; C; 03DB; # GREEK LETTER STIGMA
+03DC; C; 03DD; # GREEK LETTER DIGAMMA
+03DE; C; 03DF; # GREEK LETTER KOPPA
+03E0; C; 03E1; # GREEK LETTER SAMPI
+03E2; C; 03E3; # COPTIC CAPITAL LETTER SHEI
+03E4; C; 03E5; # COPTIC CAPITAL LETTER FEI
+03E6; C; 03E7; # COPTIC CAPITAL LETTER KHEI
+03E8; C; 03E9; # COPTIC CAPITAL LETTER HORI
+03EA; C; 03EB; # COPTIC CAPITAL LETTER GANGIA
+03EC; C; 03ED; # COPTIC CAPITAL LETTER SHIMA
+03EE; C; 03EF; # COPTIC CAPITAL LETTER DEI
+03F0; C; 03BA; # GREEK KAPPA SYMBOL
+03F1; C; 03C1; # GREEK RHO SYMBOL
+03F4; C; 03B8; # GREEK CAPITAL THETA SYMBOL
+03F5; C; 03B5; # GREEK LUNATE EPSILON SYMBOL
+03F7; C; 03F8; # GREEK CAPITAL LETTER SHO
+03F9; C; 03F2; # GREEK CAPITAL LUNATE SIGMA SYMBOL
+03FA; C; 03FB; # GREEK CAPITAL LETTER SAN
+03FD; C; 037B; # GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL
+03FE; C; 037C; # GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL
+03FF; C; 037D; # GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL
+0400; C; 0450; # CYRILLIC CAPITAL LETTER IE WITH GRAVE
+0401; C; 0451; # CYRILLIC CAPITAL LETTER IO
+0402; C; 0452; # CYRILLIC CAPITAL LETTER DJE
+0403; C; 0453; # CYRILLIC CAPITAL LETTER GJE
+0404; C; 0454; # CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0405; C; 0455; # CYRILLIC CAPITAL LETTER DZE
+0406; C; 0456; # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0407; C; 0457; # CYRILLIC CAPITAL LETTER YI
+0408; C; 0458; # CYRILLIC CAPITAL LETTER JE
+0409; C; 0459; # CYRILLIC CAPITAL LETTER LJE
+040A; C; 045A; # CYRILLIC CAPITAL LETTER NJE
+040B; C; 045B; # CYRILLIC CAPITAL LETTER TSHE
+040C; C; 045C; # CYRILLIC CAPITAL LETTER KJE
+040D; C; 045D; # CYRILLIC CAPITAL LETTER I WITH GRAVE
+040E; C; 045E; # CYRILLIC CAPITAL LETTER SHORT U
+040F; C; 045F; # CYRILLIC CAPITAL LETTER DZHE
+0410; C; 0430; # CYRILLIC CAPITAL LETTER A
+0411; C; 0431; # CYRILLIC CAPITAL LETTER BE
+0412; C; 0432; # CYRILLIC CAPITAL LETTER VE
+0413; C; 0433; # CYRILLIC CAPITAL LETTER GHE
+0414; C; 0434; # CYRILLIC CAPITAL LETTER DE
+0415; C; 0435; # CYRILLIC CAPITAL LETTER IE
+0416; C; 0436; # CYRILLIC CAPITAL LETTER ZHE
+0417; C; 0437; # CYRILLIC CAPITAL LETTER ZE
+0418; C; 0438; # CYRILLIC CAPITAL LETTER I
+0419; C; 0439; # CYRILLIC CAPITAL LETTER SHORT I
+041A; C; 043A; # CYRILLIC CAPITAL LETTER KA
+041B; C; 043B; # CYRILLIC CAPITAL LETTER EL
+041C; C; 043C; # CYRILLIC CAPITAL LETTER EM
+041D; C; 043D; # CYRILLIC CAPITAL LETTER EN
+041E; C; 043E; # CYRILLIC CAPITAL LETTER O
+041F; C; 043F; # CYRILLIC CAPITAL LETTER PE
+0420; C; 0440; # CYRILLIC CAPITAL LETTER ER
+0421; C; 0441; # CYRILLIC CAPITAL LETTER ES
+0422; C; 0442; # CYRILLIC CAPITAL LETTER TE
+0423; C; 0443; # CYRILLIC CAPITAL LETTER U
+0424; C; 0444; # CYRILLIC CAPITAL LETTER EF
+0425; C; 0445; # CYRILLIC CAPITAL LETTER HA
+0426; C; 0446; # CYRILLIC CAPITAL LETTER TSE
+0427; C; 0447; # CYRILLIC CAPITAL LETTER CHE
+0428; C; 0448; # CYRILLIC CAPITAL LETTER SHA
+0429; C; 0449; # CYRILLIC CAPITAL LETTER SHCHA
+042A; C; 044A; # CYRILLIC CAPITAL LETTER HARD SIGN
+042B; C; 044B; # CYRILLIC CAPITAL LETTER YERU
+042C; C; 044C; # CYRILLIC CAPITAL LETTER SOFT SIGN
+042D; C; 044D; # CYRILLIC CAPITAL LETTER E
+042E; C; 044E; # CYRILLIC CAPITAL LETTER YU
+042F; C; 044F; # CYRILLIC CAPITAL LETTER YA
+0460; C; 0461; # CYRILLIC CAPITAL LETTER OMEGA
+0462; C; 0463; # CYRILLIC CAPITAL LETTER YAT
+0464; C; 0465; # CYRILLIC CAPITAL LETTER IOTIFIED E
+0466; C; 0467; # CYRILLIC CAPITAL LETTER LITTLE YUS
+0468; C; 0469; # CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+046A; C; 046B; # CYRILLIC CAPITAL LETTER BIG YUS
+046C; C; 046D; # CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+046E; C; 046F; # CYRILLIC CAPITAL LETTER KSI
+0470; C; 0471; # CYRILLIC CAPITAL LETTER PSI
+0472; C; 0473; # CYRILLIC CAPITAL LETTER FITA
+0474; C; 0475; # CYRILLIC CAPITAL LETTER IZHITSA
+0476; C; 0477; # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0478; C; 0479; # CYRILLIC CAPITAL LETTER UK
+047A; C; 047B; # CYRILLIC CAPITAL LETTER ROUND OMEGA
+047C; C; 047D; # CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+047E; C; 047F; # CYRILLIC CAPITAL LETTER OT
+0480; C; 0481; # CYRILLIC CAPITAL LETTER KOPPA
+048A; C; 048B; # CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
+048C; C; 048D; # CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+048E; C; 048F; # CYRILLIC CAPITAL LETTER ER WITH TICK
+0490; C; 0491; # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0492; C; 0493; # CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0494; C; 0495; # CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+0496; C; 0497; # CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0498; C; 0499; # CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+049A; C; 049B; # CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+049C; C; 049D; # CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+049E; C; 049F; # CYRILLIC CAPITAL LETTER KA WITH STROKE
+04A0; C; 04A1; # CYRILLIC CAPITAL LETTER BASHKIR KA
+04A2; C; 04A3; # CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+04A4; C; 04A5; # CYRILLIC CAPITAL LIGATURE EN GHE
+04A6; C; 04A7; # CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+04A8; C; 04A9; # CYRILLIC CAPITAL LETTER ABKHASIAN HA
+04AA; C; 04AB; # CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+04AC; C; 04AD; # CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+04AE; C; 04AF; # CYRILLIC CAPITAL LETTER STRAIGHT U
+04B0; C; 04B1; # CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+04B2; C; 04B3; # CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+04B4; C; 04B5; # CYRILLIC CAPITAL LIGATURE TE TSE
+04B6; C; 04B7; # CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+04B8; C; 04B9; # CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+04BA; C; 04BB; # CYRILLIC CAPITAL LETTER SHHA
+04BC; C; 04BD; # CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+04BE; C; 04BF; # CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
+04C0; C; 04CF; # CYRILLIC LETTER PALOCHKA
+04C1; C; 04C2; # CYRILLIC CAPITAL LETTER ZHE WITH BREVE
+04C3; C; 04C4; # CYRILLIC CAPITAL LETTER KA WITH HOOK
+04C5; C; 04C6; # CYRILLIC CAPITAL LETTER EL WITH TAIL
+04C7; C; 04C8; # CYRILLIC CAPITAL LETTER EN WITH HOOK
+04C9; C; 04CA; # CYRILLIC CAPITAL LETTER EN WITH TAIL
+04CB; C; 04CC; # CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+04CD; C; 04CE; # CYRILLIC CAPITAL LETTER EM WITH TAIL
+04D0; C; 04D1; # CYRILLIC CAPITAL LETTER A WITH BREVE
+04D2; C; 04D3; # CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+04D4; C; 04D5; # CYRILLIC CAPITAL LIGATURE A IE
+04D6; C; 04D7; # CYRILLIC CAPITAL LETTER IE WITH BREVE
+04D8; C; 04D9; # CYRILLIC CAPITAL LETTER SCHWA
+04DA; C; 04DB; # CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+04DC; C; 04DD; # CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+04DE; C; 04DF; # CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+04E0; C; 04E1; # CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+04E2; C; 04E3; # CYRILLIC CAPITAL LETTER I WITH MACRON
+04E4; C; 04E5; # CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+04E6; C; 04E7; # CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+04E8; C; 04E9; # CYRILLIC CAPITAL LETTER BARRED O
+04EA; C; 04EB; # CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
+04EC; C; 04ED; # CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+04EE; C; 04EF; # CYRILLIC CAPITAL LETTER U WITH MACRON
+04F0; C; 04F1; # CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+04F2; C; 04F3; # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+04F4; C; 04F5; # CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+04F6; C; 04F7; # CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+04F8; C; 04F9; # CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+04FA; C; 04FB; # CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
+04FC; C; 04FD; # CYRILLIC CAPITAL LETTER HA WITH HOOK
+04FE; C; 04FF; # CYRILLIC CAPITAL LETTER HA WITH STROKE
+0500; C; 0501; # CYRILLIC CAPITAL LETTER KOMI DE
+0502; C; 0503; # CYRILLIC CAPITAL LETTER KOMI DJE
+0504; C; 0505; # CYRILLIC CAPITAL LETTER KOMI ZJE
+0506; C; 0507; # CYRILLIC CAPITAL LETTER KOMI DZJE
+0508; C; 0509; # CYRILLIC CAPITAL LETTER KOMI LJE
+050A; C; 050B; # CYRILLIC CAPITAL LETTER KOMI NJE
+050C; C; 050D; # CYRILLIC CAPITAL LETTER KOMI SJE
+050E; C; 050F; # CYRILLIC CAPITAL LETTER KOMI TJE
+0510; C; 0511; # CYRILLIC CAPITAL LETTER REVERSED ZE
+0512; C; 0513; # CYRILLIC CAPITAL LETTER EL WITH HOOK
+0514; C; 0515; # CYRILLIC CAPITAL LETTER LHA
+0516; C; 0517; # CYRILLIC CAPITAL LETTER RHA
+0518; C; 0519; # CYRILLIC CAPITAL LETTER YAE
+051A; C; 051B; # CYRILLIC CAPITAL LETTER QA
+051C; C; 051D; # CYRILLIC CAPITAL LETTER WE
+051E; C; 051F; # CYRILLIC CAPITAL LETTER ALEUT KA
+0520; C; 0521; # CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+0522; C; 0523; # CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+0524; C; 0525; # CYRILLIC CAPITAL LETTER PE WITH DESCENDER
+0526; C; 0527; # CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
+0528; C; 0529; # CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
+052A; C; 052B; # CYRILLIC CAPITAL LETTER DZZHE
+052C; C; 052D; # CYRILLIC CAPITAL LETTER DCHE
+052E; C; 052F; # CYRILLIC CAPITAL LETTER EL WITH DESCENDER
+0531; C; 0561; # ARMENIAN CAPITAL LETTER AYB
+0532; C; 0562; # ARMENIAN CAPITAL LETTER BEN
+0533; C; 0563; # ARMENIAN CAPITAL LETTER GIM
+0534; C; 0564; # ARMENIAN CAPITAL LETTER DA
+0535; C; 0565; # ARMENIAN CAPITAL LETTER ECH
+0536; C; 0566; # ARMENIAN CAPITAL LETTER ZA
+0537; C; 0567; # ARMENIAN CAPITAL LETTER EH
+0538; C; 0568; # ARMENIAN CAPITAL LETTER ET
+0539; C; 0569; # ARMENIAN CAPITAL LETTER TO
+053A; C; 056A; # ARMENIAN CAPITAL LETTER ZHE
+053B; C; 056B; # ARMENIAN CAPITAL LETTER INI
+053C; C; 056C; # ARMENIAN CAPITAL LETTER LIWN
+053D; C; 056D; # ARMENIAN CAPITAL LETTER XEH
+053E; C; 056E; # ARMENIAN CAPITAL LETTER CA
+053F; C; 056F; # ARMENIAN CAPITAL LETTER KEN
+0540; C; 0570; # ARMENIAN CAPITAL LETTER HO
+0541; C; 0571; # ARMENIAN CAPITAL LETTER JA
+0542; C; 0572; # ARMENIAN CAPITAL LETTER GHAD
+0543; C; 0573; # ARMENIAN CAPITAL LETTER CHEH
+0544; C; 0574; # ARMENIAN CAPITAL LETTER MEN
+0545; C; 0575; # ARMENIAN CAPITAL LETTER YI
+0546; C; 0576; # ARMENIAN CAPITAL LETTER NOW
+0547; C; 0577; # ARMENIAN CAPITAL LETTER SHA
+0548; C; 0578; # ARMENIAN CAPITAL LETTER VO
+0549; C; 0579; # ARMENIAN CAPITAL LETTER CHA
+054A; C; 057A; # ARMENIAN CAPITAL LETTER PEH
+054B; C; 057B; # ARMENIAN CAPITAL LETTER JHEH
+054C; C; 057C; # ARMENIAN CAPITAL LETTER RA
+054D; C; 057D; # ARMENIAN CAPITAL LETTER SEH
+054E; C; 057E; # ARMENIAN CAPITAL LETTER VEW
+054F; C; 057F; # ARMENIAN CAPITAL LETTER TIWN
+0550; C; 0580; # ARMENIAN CAPITAL LETTER REH
+0551; C; 0581; # ARMENIAN CAPITAL LETTER CO
+0552; C; 0582; # ARMENIAN CAPITAL LETTER YIWN
+0553; C; 0583; # ARMENIAN CAPITAL LETTER PIWR
+0554; C; 0584; # ARMENIAN CAPITAL LETTER KEH
+0555; C; 0585; # ARMENIAN CAPITAL LETTER OH
+0556; C; 0586; # ARMENIAN CAPITAL LETTER FEH
+0587; F; 0565 0582; # ARMENIAN SMALL LIGATURE ECH YIWN
+10A0; C; 2D00; # GEORGIAN CAPITAL LETTER AN
+10A1; C; 2D01; # GEORGIAN CAPITAL LETTER BAN
+10A2; C; 2D02; # GEORGIAN CAPITAL LETTER GAN
+10A3; C; 2D03; # GEORGIAN CAPITAL LETTER DON
+10A4; C; 2D04; # GEORGIAN CAPITAL LETTER EN
+10A5; C; 2D05; # GEORGIAN CAPITAL LETTER VIN
+10A6; C; 2D06; # GEORGIAN CAPITAL LETTER ZEN
+10A7; C; 2D07; # GEORGIAN CAPITAL LETTER TAN
+10A8; C; 2D08; # GEORGIAN CAPITAL LETTER IN
+10A9; C; 2D09; # GEORGIAN CAPITAL LETTER KAN
+10AA; C; 2D0A; # GEORGIAN CAPITAL LETTER LAS
+10AB; C; 2D0B; # GEORGIAN CAPITAL LETTER MAN
+10AC; C; 2D0C; # GEORGIAN CAPITAL LETTER NAR
+10AD; C; 2D0D; # GEORGIAN CAPITAL LETTER ON
+10AE; C; 2D0E; # GEORGIAN CAPITAL LETTER PAR
+10AF; C; 2D0F; # GEORGIAN CAPITAL LETTER ZHAR
+10B0; C; 2D10; # GEORGIAN CAPITAL LETTER RAE
+10B1; C; 2D11; # GEORGIAN CAPITAL LETTER SAN
+10B2; C; 2D12; # GEORGIAN CAPITAL LETTER TAR
+10B3; C; 2D13; # GEORGIAN CAPITAL LETTER UN
+10B4; C; 2D14; # GEORGIAN CAPITAL LETTER PHAR
+10B5; C; 2D15; # GEORGIAN CAPITAL LETTER KHAR
+10B6; C; 2D16; # GEORGIAN CAPITAL LETTER GHAN
+10B7; C; 2D17; # GEORGIAN CAPITAL LETTER QAR
+10B8; C; 2D18; # GEORGIAN CAPITAL LETTER SHIN
+10B9; C; 2D19; # GEORGIAN CAPITAL LETTER CHIN
+10BA; C; 2D1A; # GEORGIAN CAPITAL LETTER CAN
+10BB; C; 2D1B; # GEORGIAN CAPITAL LETTER JIL
+10BC; C; 2D1C; # GEORGIAN CAPITAL LETTER CIL
+10BD; C; 2D1D; # GEORGIAN CAPITAL LETTER CHAR
+10BE; C; 2D1E; # GEORGIAN CAPITAL LETTER XAN
+10BF; C; 2D1F; # GEORGIAN CAPITAL LETTER JHAN
+10C0; C; 2D20; # GEORGIAN CAPITAL LETTER HAE
+10C1; C; 2D21; # GEORGIAN CAPITAL LETTER HE
+10C2; C; 2D22; # GEORGIAN CAPITAL LETTER HIE
+10C3; C; 2D23; # GEORGIAN CAPITAL LETTER WE
+10C4; C; 2D24; # GEORGIAN CAPITAL LETTER HAR
+10C5; C; 2D25; # GEORGIAN CAPITAL LETTER HOE
+10C7; C; 2D27; # GEORGIAN CAPITAL LETTER YN
+10CD; C; 2D2D; # GEORGIAN CAPITAL LETTER AEN
+13F8; C; 13F0; # CHEROKEE SMALL LETTER YE
+13F9; C; 13F1; # CHEROKEE SMALL LETTER YI
+13FA; C; 13F2; # CHEROKEE SMALL LETTER YO
+13FB; C; 13F3; # CHEROKEE SMALL LETTER YU
+13FC; C; 13F4; # CHEROKEE SMALL LETTER YV
+13FD; C; 13F5; # CHEROKEE SMALL LETTER MV
+1C80; C; 0432; # CYRILLIC SMALL LETTER ROUNDED VE
+1C81; C; 0434; # CYRILLIC SMALL LETTER LONG-LEGGED DE
+1C82; C; 043E; # CYRILLIC SMALL LETTER NARROW O
+1C83; C; 0441; # CYRILLIC SMALL LETTER WIDE ES
+1C84; C; 0442; # CYRILLIC SMALL LETTER TALL TE
+1C85; C; 0442; # CYRILLIC SMALL LETTER THREE-LEGGED TE
+1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN
+1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT
+1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK
+1C90; C; 10D0; # GEORGIAN MTAVRULI CAPITAL LETTER AN
+1C91; C; 10D1; # GEORGIAN MTAVRULI CAPITAL LETTER BAN
+1C92; C; 10D2; # GEORGIAN MTAVRULI CAPITAL LETTER GAN
+1C93; C; 10D3; # GEORGIAN MTAVRULI CAPITAL LETTER DON
+1C94; C; 10D4; # GEORGIAN MTAVRULI CAPITAL LETTER EN
+1C95; C; 10D5; # GEORGIAN MTAVRULI CAPITAL LETTER VIN
+1C96; C; 10D6; # GEORGIAN MTAVRULI CAPITAL LETTER ZEN
+1C97; C; 10D7; # GEORGIAN MTAVRULI CAPITAL LETTER TAN
+1C98; C; 10D8; # GEORGIAN MTAVRULI CAPITAL LETTER IN
+1C99; C; 10D9; # GEORGIAN MTAVRULI CAPITAL LETTER KAN
+1C9A; C; 10DA; # GEORGIAN MTAVRULI CAPITAL LETTER LAS
+1C9B; C; 10DB; # GEORGIAN MTAVRULI CAPITAL LETTER MAN
+1C9C; C; 10DC; # GEORGIAN MTAVRULI CAPITAL LETTER NAR
+1C9D; C; 10DD; # GEORGIAN MTAVRULI CAPITAL LETTER ON
+1C9E; C; 10DE; # GEORGIAN MTAVRULI CAPITAL LETTER PAR
+1C9F; C; 10DF; # GEORGIAN MTAVRULI CAPITAL LETTER ZHAR
+1CA0; C; 10E0; # GEORGIAN MTAVRULI CAPITAL LETTER RAE
+1CA1; C; 10E1; # GEORGIAN MTAVRULI CAPITAL LETTER SAN
+1CA2; C; 10E2; # GEORGIAN MTAVRULI CAPITAL LETTER TAR
+1CA3; C; 10E3; # GEORGIAN MTAVRULI CAPITAL LETTER UN
+1CA4; C; 10E4; # GEORGIAN MTAVRULI CAPITAL LETTER PHAR
+1CA5; C; 10E5; # GEORGIAN MTAVRULI CAPITAL LETTER KHAR
+1CA6; C; 10E6; # GEORGIAN MTAVRULI CAPITAL LETTER GHAN
+1CA7; C; 10E7; # GEORGIAN MTAVRULI CAPITAL LETTER QAR
+1CA8; C; 10E8; # GEORGIAN MTAVRULI CAPITAL LETTER SHIN
+1CA9; C; 10E9; # GEORGIAN MTAVRULI CAPITAL LETTER CHIN
+1CAA; C; 10EA; # GEORGIAN MTAVRULI CAPITAL LETTER CAN
+1CAB; C; 10EB; # GEORGIAN MTAVRULI CAPITAL LETTER JIL
+1CAC; C; 10EC; # GEORGIAN MTAVRULI CAPITAL LETTER CIL
+1CAD; C; 10ED; # GEORGIAN MTAVRULI CAPITAL LETTER CHAR
+1CAE; C; 10EE; # GEORGIAN MTAVRULI CAPITAL LETTER XAN
+1CAF; C; 10EF; # GEORGIAN MTAVRULI CAPITAL LETTER JHAN
+1CB0; C; 10F0; # GEORGIAN MTAVRULI CAPITAL LETTER HAE
+1CB1; C; 10F1; # GEORGIAN MTAVRULI CAPITAL LETTER HE
+1CB2; C; 10F2; # GEORGIAN MTAVRULI CAPITAL LETTER HIE
+1CB3; C; 10F3; # GEORGIAN MTAVRULI CAPITAL LETTER WE
+1CB4; C; 10F4; # GEORGIAN MTAVRULI CAPITAL LETTER HAR
+1CB5; C; 10F5; # GEORGIAN MTAVRULI CAPITAL LETTER HOE
+1CB6; C; 10F6; # GEORGIAN MTAVRULI CAPITAL LETTER FI
+1CB7; C; 10F7; # GEORGIAN MTAVRULI CAPITAL LETTER YN
+1CB8; C; 10F8; # GEORGIAN MTAVRULI CAPITAL LETTER ELIFI
+1CB9; C; 10F9; # GEORGIAN MTAVRULI CAPITAL LETTER TURNED GAN
+1CBA; C; 10FA; # GEORGIAN MTAVRULI CAPITAL LETTER AIN
+1CBD; C; 10FD; # GEORGIAN MTAVRULI CAPITAL LETTER AEN
+1CBE; C; 10FE; # GEORGIAN MTAVRULI CAPITAL LETTER HARD SIGN
+1CBF; C; 10FF; # GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
+1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
+1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
+1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
+1E06; C; 1E07; # LATIN CAPITAL LETTER B WITH LINE BELOW
+1E08; C; 1E09; # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+1E0A; C; 1E0B; # LATIN CAPITAL LETTER D WITH DOT ABOVE
+1E0C; C; 1E0D; # LATIN CAPITAL LETTER D WITH DOT BELOW
+1E0E; C; 1E0F; # LATIN CAPITAL LETTER D WITH LINE BELOW
+1E10; C; 1E11; # LATIN CAPITAL LETTER D WITH CEDILLA
+1E12; C; 1E13; # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+1E14; C; 1E15; # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+1E16; C; 1E17; # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+1E18; C; 1E19; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+1E1A; C; 1E1B; # LATIN CAPITAL LETTER E WITH TILDE BELOW
+1E1C; C; 1E1D; # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+1E1E; C; 1E1F; # LATIN CAPITAL LETTER F WITH DOT ABOVE
+1E20; C; 1E21; # LATIN CAPITAL LETTER G WITH MACRON
+1E22; C; 1E23; # LATIN CAPITAL LETTER H WITH DOT ABOVE
+1E24; C; 1E25; # LATIN CAPITAL LETTER H WITH DOT BELOW
+1E26; C; 1E27; # LATIN CAPITAL LETTER H WITH DIAERESIS
+1E28; C; 1E29; # LATIN CAPITAL LETTER H WITH CEDILLA
+1E2A; C; 1E2B; # LATIN CAPITAL LETTER H WITH BREVE BELOW
+1E2C; C; 1E2D; # LATIN CAPITAL LETTER I WITH TILDE BELOW
+1E2E; C; 1E2F; # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
+1E30; C; 1E31; # LATIN CAPITAL LETTER K WITH ACUTE
+1E32; C; 1E33; # LATIN CAPITAL LETTER K WITH DOT BELOW
+1E34; C; 1E35; # LATIN CAPITAL LETTER K WITH LINE BELOW
+1E36; C; 1E37; # LATIN CAPITAL LETTER L WITH DOT BELOW
+1E38; C; 1E39; # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+1E3A; C; 1E3B; # LATIN CAPITAL LETTER L WITH LINE BELOW
+1E3C; C; 1E3D; # LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+1E3E; C; 1E3F; # LATIN CAPITAL LETTER M WITH ACUTE
+1E40; C; 1E41; # LATIN CAPITAL LETTER M WITH DOT ABOVE
+1E42; C; 1E43; # LATIN CAPITAL LETTER M WITH DOT BELOW
+1E44; C; 1E45; # LATIN CAPITAL LETTER N WITH DOT ABOVE
+1E46; C; 1E47; # LATIN CAPITAL LETTER N WITH DOT BELOW
+1E48; C; 1E49; # LATIN CAPITAL LETTER N WITH LINE BELOW
+1E4A; C; 1E4B; # LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+1E4C; C; 1E4D; # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+1E4E; C; 1E4F; # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
+1E50; C; 1E51; # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+1E52; C; 1E53; # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+1E54; C; 1E55; # LATIN CAPITAL LETTER P WITH ACUTE
+1E56; C; 1E57; # LATIN CAPITAL LETTER P WITH DOT ABOVE
+1E58; C; 1E59; # LATIN CAPITAL LETTER R WITH DOT ABOVE
+1E5A; C; 1E5B; # LATIN CAPITAL LETTER R WITH DOT BELOW
+1E5C; C; 1E5D; # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+1E5E; C; 1E5F; # LATIN CAPITAL LETTER R WITH LINE BELOW
+1E60; C; 1E61; # LATIN CAPITAL LETTER S WITH DOT ABOVE
+1E62; C; 1E63; # LATIN CAPITAL LETTER S WITH DOT BELOW
+1E64; C; 1E65; # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
+1E66; C; 1E67; # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+1E68; C; 1E69; # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
+1E6A; C; 1E6B; # LATIN CAPITAL LETTER T WITH DOT ABOVE
+1E6C; C; 1E6D; # LATIN CAPITAL LETTER T WITH DOT BELOW
+1E6E; C; 1E6F; # LATIN CAPITAL LETTER T WITH LINE BELOW
+1E70; C; 1E71; # LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+1E72; C; 1E73; # LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+1E74; C; 1E75; # LATIN CAPITAL LETTER U WITH TILDE BELOW
+1E76; C; 1E77; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+1E78; C; 1E79; # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+1E7A; C; 1E7B; # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
+1E7C; C; 1E7D; # LATIN CAPITAL LETTER V WITH TILDE
+1E7E; C; 1E7F; # LATIN CAPITAL LETTER V WITH DOT BELOW
+1E80; C; 1E81; # LATIN CAPITAL LETTER W WITH GRAVE
+1E82; C; 1E83; # LATIN CAPITAL LETTER W WITH ACUTE
+1E84; C; 1E85; # LATIN CAPITAL LETTER W WITH DIAERESIS
+1E86; C; 1E87; # LATIN CAPITAL LETTER W WITH DOT ABOVE
+1E88; C; 1E89; # LATIN CAPITAL LETTER W WITH DOT BELOW
+1E8A; C; 1E8B; # LATIN CAPITAL LETTER X WITH DOT ABOVE
+1E8C; C; 1E8D; # LATIN CAPITAL LETTER X WITH DIAERESIS
+1E8E; C; 1E8F; # LATIN CAPITAL LETTER Y WITH DOT ABOVE
+1E90; C; 1E91; # LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+1E92; C; 1E93; # LATIN CAPITAL LETTER Z WITH DOT BELOW
+1E94; C; 1E95; # LATIN CAPITAL LETTER Z WITH LINE BELOW
+1E96; F; 0068 0331; # LATIN SMALL LETTER H WITH LINE BELOW
+1E97; F; 0074 0308; # LATIN SMALL LETTER T WITH DIAERESIS
+1E98; F; 0077 030A; # LATIN SMALL LETTER W WITH RING ABOVE
+1E99; F; 0079 030A; # LATIN SMALL LETTER Y WITH RING ABOVE
+1E9A; F; 0061 02BE; # LATIN SMALL LETTER A WITH RIGHT HALF RING
+1E9B; C; 1E61; # LATIN SMALL LETTER LONG S WITH DOT ABOVE
+1E9E; F; 0073 0073; # LATIN CAPITAL LETTER SHARP S
+1E9E; S; 00DF; # LATIN CAPITAL LETTER SHARP S
+1EA0; C; 1EA1; # LATIN CAPITAL LETTER A WITH DOT BELOW
+1EA2; C; 1EA3; # LATIN CAPITAL LETTER A WITH HOOK ABOVE
+1EA4; C; 1EA5; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+1EA6; C; 1EA7; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+1EA8; C; 1EA9; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+1EAA; C; 1EAB; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+1EAC; C; 1EAD; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+1EAE; C; 1EAF; # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+1EB0; C; 1EB1; # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+1EB2; C; 1EB3; # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+1EB4; C; 1EB5; # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+1EB6; C; 1EB7; # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+1EB8; C; 1EB9; # LATIN CAPITAL LETTER E WITH DOT BELOW
+1EBA; C; 1EBB; # LATIN CAPITAL LETTER E WITH HOOK ABOVE
+1EBC; C; 1EBD; # LATIN CAPITAL LETTER E WITH TILDE
+1EBE; C; 1EBF; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+1EC0; C; 1EC1; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+1EC2; C; 1EC3; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+1EC4; C; 1EC5; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+1EC6; C; 1EC7; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+1EC8; C; 1EC9; # LATIN CAPITAL LETTER I WITH HOOK ABOVE
+1ECA; C; 1ECB; # LATIN CAPITAL LETTER I WITH DOT BELOW
+1ECC; C; 1ECD; # LATIN CAPITAL LETTER O WITH DOT BELOW
+1ECE; C; 1ECF; # LATIN CAPITAL LETTER O WITH HOOK ABOVE
+1ED0; C; 1ED1; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+1ED2; C; 1ED3; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+1ED4; C; 1ED5; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+1ED6; C; 1ED7; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+1ED8; C; 1ED9; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+1EDA; C; 1EDB; # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+1EDC; C; 1EDD; # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+1EDE; C; 1EDF; # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+1EE0; C; 1EE1; # LATIN CAPITAL LETTER O WITH HORN AND TILDE
+1EE2; C; 1EE3; # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+1EE4; C; 1EE5; # LATIN CAPITAL LETTER U WITH DOT BELOW
+1EE6; C; 1EE7; # LATIN CAPITAL LETTER U WITH HOOK ABOVE
+1EE8; C; 1EE9; # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+1EEA; C; 1EEB; # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+1EEC; C; 1EED; # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+1EEE; C; 1EEF; # LATIN CAPITAL LETTER U WITH HORN AND TILDE
+1EF0; C; 1EF1; # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+1EF2; C; 1EF3; # LATIN CAPITAL LETTER Y WITH GRAVE
+1EF4; C; 1EF5; # LATIN CAPITAL LETTER Y WITH DOT BELOW
+1EF6; C; 1EF7; # LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+1EF8; C; 1EF9; # LATIN CAPITAL LETTER Y WITH TILDE
+1EFA; C; 1EFB; # LATIN CAPITAL LETTER MIDDLE-WELSH LL
+1EFC; C; 1EFD; # LATIN CAPITAL LETTER MIDDLE-WELSH V
+1EFE; C; 1EFF; # LATIN CAPITAL LETTER Y WITH LOOP
+1F08; C; 1F00; # GREEK CAPITAL LETTER ALPHA WITH PSILI
+1F09; C; 1F01; # GREEK CAPITAL LETTER ALPHA WITH DASIA
+1F0A; C; 1F02; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
+1F0B; C; 1F03; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
+1F0C; C; 1F04; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
+1F0D; C; 1F05; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
+1F0E; C; 1F06; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
+1F0F; C; 1F07; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+1F18; C; 1F10; # GREEK CAPITAL LETTER EPSILON WITH PSILI
+1F19; C; 1F11; # GREEK CAPITAL LETTER EPSILON WITH DASIA
+1F1A; C; 1F12; # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
+1F1B; C; 1F13; # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
+1F1C; C; 1F14; # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
+1F1D; C; 1F15; # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+1F28; C; 1F20; # GREEK CAPITAL LETTER ETA WITH PSILI
+1F29; C; 1F21; # GREEK CAPITAL LETTER ETA WITH DASIA
+1F2A; C; 1F22; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
+1F2B; C; 1F23; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
+1F2C; C; 1F24; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
+1F2D; C; 1F25; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
+1F2E; C; 1F26; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
+1F2F; C; 1F27; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+1F38; C; 1F30; # GREEK CAPITAL LETTER IOTA WITH PSILI
+1F39; C; 1F31; # GREEK CAPITAL LETTER IOTA WITH DASIA
+1F3A; C; 1F32; # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
+1F3B; C; 1F33; # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
+1F3C; C; 1F34; # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
+1F3D; C; 1F35; # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
+1F3E; C; 1F36; # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
+1F3F; C; 1F37; # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+1F48; C; 1F40; # GREEK CAPITAL LETTER OMICRON WITH PSILI
+1F49; C; 1F41; # GREEK CAPITAL LETTER OMICRON WITH DASIA
+1F4A; C; 1F42; # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
+1F4B; C; 1F43; # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
+1F4C; C; 1F44; # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
+1F4D; C; 1F45; # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+1F50; F; 03C5 0313; # GREEK SMALL LETTER UPSILON WITH PSILI
+1F52; F; 03C5 0313 0300; # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
+1F54; F; 03C5 0313 0301; # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
+1F56; F; 03C5 0313 0342; # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
+1F59; C; 1F51; # GREEK CAPITAL LETTER UPSILON WITH DASIA
+1F5B; C; 1F53; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+1F5D; C; 1F55; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+1F5F; C; 1F57; # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+1F68; C; 1F60; # GREEK CAPITAL LETTER OMEGA WITH PSILI
+1F69; C; 1F61; # GREEK CAPITAL LETTER OMEGA WITH DASIA
+1F6A; C; 1F62; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
+1F6B; C; 1F63; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
+1F6C; C; 1F64; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
+1F6D; C; 1F65; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
+1F6E; C; 1F66; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
+1F6F; C; 1F67; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+1F80; F; 1F00 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
+1F81; F; 1F01 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
+1F82; F; 1F02 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F83; F; 1F03 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F84; F; 1F04 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F85; F; 1F05 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F86; F; 1F06 03B9; # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F87; F; 1F07 03B9; # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F88; F; 1F00 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+1F88; S; 1F80; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
+1F89; F; 1F01 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+1F89; S; 1F81; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
+1F8A; F; 1F02 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F8A; S; 1F82; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F8B; F; 1F03 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F8B; S; 1F83; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F8C; F; 1F04 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F8C; S; 1F84; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F8D; F; 1F05 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F8D; S; 1F85; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F8E; F; 1F06 03B9; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F8E; S; 1F86; # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F8F; F; 1F07 03B9; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F8F; S; 1F87; # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F90; F; 1F20 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
+1F91; F; 1F21 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
+1F92; F; 1F22 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1F93; F; 1F23 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1F94; F; 1F24 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1F95; F; 1F25 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1F96; F; 1F26 03B9; # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1F97; F; 1F27 03B9; # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F98; F; 1F20 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+1F98; S; 1F90; # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
+1F99; F; 1F21 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+1F99; S; 1F91; # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
+1F9A; F; 1F22 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F9A; S; 1F92; # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1F9B; F; 1F23 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F9B; S; 1F93; # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1F9C; F; 1F24 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F9C; S; 1F94; # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1F9D; F; 1F25 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F9D; S; 1F95; # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1F9E; F; 1F26 03B9; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F9E; S; 1F96; # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1F9F; F; 1F27 03B9; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F9F; S; 1F97; # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FA0; F; 1F60 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
+1FA1; F; 1F61 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
+1FA2; F; 1F62 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
+1FA3; F; 1F63 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
+1FA4; F; 1F64 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
+1FA5; F; 1F65 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
+1FA6; F; 1F66 03B9; # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
+1FA7; F; 1F67 03B9; # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1FA8; F; 1F60 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+1FA8; S; 1FA0; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
+1FA9; F; 1F61 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+1FA9; S; 1FA1; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
+1FAA; F; 1F62 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1FAA; S; 1FA2; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
+1FAB; F; 1F63 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1FAB; S; 1FA3; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
+1FAC; F; 1F64 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1FAC; S; 1FA4; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
+1FAD; F; 1F65 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1FAD; S; 1FA5; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
+1FAE; F; 1F66 03B9; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1FAE; S; 1FA6; # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
+1FAF; F; 1F67 03B9; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FAF; S; 1FA7; # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FB2; F; 1F70 03B9; # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
+1FB3; F; 03B1 03B9; # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
+1FB4; F; 03AC 03B9; # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+1FB6; F; 03B1 0342; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI
+1FB7; F; 03B1 0342 03B9; # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FB8; C; 1FB0; # GREEK CAPITAL LETTER ALPHA WITH VRACHY
+1FB9; C; 1FB1; # GREEK CAPITAL LETTER ALPHA WITH MACRON
+1FBA; C; 1F70; # GREEK CAPITAL LETTER ALPHA WITH VARIA
+1FBB; C; 1F71; # GREEK CAPITAL LETTER ALPHA WITH OXIA
+1FBC; F; 03B1 03B9; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FBC; S; 1FB3; # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FBE; C; 03B9; # GREEK PROSGEGRAMMENI
+1FC2; F; 1F74 03B9; # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
+1FC3; F; 03B7 03B9; # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
+1FC4; F; 03AE 03B9; # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+1FC6; F; 03B7 0342; # GREEK SMALL LETTER ETA WITH PERISPOMENI
+1FC7; F; 03B7 0342 03B9; # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FC8; C; 1F72; # GREEK CAPITAL LETTER EPSILON WITH VARIA
+1FC9; C; 1F73; # GREEK CAPITAL LETTER EPSILON WITH OXIA
+1FCA; C; 1F74; # GREEK CAPITAL LETTER ETA WITH VARIA
+1FCB; C; 1F75; # GREEK CAPITAL LETTER ETA WITH OXIA
+1FCC; F; 03B7 03B9; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FCC; S; 1FC3; # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FD2; F; 03B9 0308 0300; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
+1FD3; F; 03B9 0308 0301; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
+1FD6; F; 03B9 0342; # GREEK SMALL LETTER IOTA WITH PERISPOMENI
+1FD7; F; 03B9 0308 0342; # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+1FD8; C; 1FD0; # GREEK CAPITAL LETTER IOTA WITH VRACHY
+1FD9; C; 1FD1; # GREEK CAPITAL LETTER IOTA WITH MACRON
+1FDA; C; 1F76; # GREEK CAPITAL LETTER IOTA WITH VARIA
+1FDB; C; 1F77; # GREEK CAPITAL LETTER IOTA WITH OXIA
+1FE2; F; 03C5 0308 0300; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
+1FE3; F; 03C5 0308 0301; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
+1FE4; F; 03C1 0313; # GREEK SMALL LETTER RHO WITH PSILI
+1FE6; F; 03C5 0342; # GREEK SMALL LETTER UPSILON WITH PERISPOMENI
+1FE7; F; 03C5 0308 0342; # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+1FE8; C; 1FE0; # GREEK CAPITAL LETTER UPSILON WITH VRACHY
+1FE9; C; 1FE1; # GREEK CAPITAL LETTER UPSILON WITH MACRON
+1FEA; C; 1F7A; # GREEK CAPITAL LETTER UPSILON WITH VARIA
+1FEB; C; 1F7B; # GREEK CAPITAL LETTER UPSILON WITH OXIA
+1FEC; C; 1FE5; # GREEK CAPITAL LETTER RHO WITH DASIA
+1FF2; F; 1F7C 03B9; # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
+1FF3; F; 03C9 03B9; # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
+1FF4; F; 03CE 03B9; # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+1FF6; F; 03C9 0342; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI
+1FF7; F; 03C9 0342 03B9; # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FF8; C; 1F78; # GREEK CAPITAL LETTER OMICRON WITH VARIA
+1FF9; C; 1F79; # GREEK CAPITAL LETTER OMICRON WITH OXIA
+1FFA; C; 1F7C; # GREEK CAPITAL LETTER OMEGA WITH VARIA
+1FFB; C; 1F7D; # GREEK CAPITAL LETTER OMEGA WITH OXIA
+1FFC; F; 03C9 03B9; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+1FFC; S; 1FF3; # GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+2126; C; 03C9; # OHM SIGN
+212A; C; 006B; # KELVIN SIGN
+212B; C; 00E5; # ANGSTROM SIGN
+2132; C; 214E; # TURNED CAPITAL F
+2160; C; 2170; # ROMAN NUMERAL ONE
+2161; C; 2171; # ROMAN NUMERAL TWO
+2162; C; 2172; # ROMAN NUMERAL THREE
+2163; C; 2173; # ROMAN NUMERAL FOUR
+2164; C; 2174; # ROMAN NUMERAL FIVE
+2165; C; 2175; # ROMAN NUMERAL SIX
+2166; C; 2176; # ROMAN NUMERAL SEVEN
+2167; C; 2177; # ROMAN NUMERAL EIGHT
+2168; C; 2178; # ROMAN NUMERAL NINE
+2169; C; 2179; # ROMAN NUMERAL TEN
+216A; C; 217A; # ROMAN NUMERAL ELEVEN
+216B; C; 217B; # ROMAN NUMERAL TWELVE
+216C; C; 217C; # ROMAN NUMERAL FIFTY
+216D; C; 217D; # ROMAN NUMERAL ONE HUNDRED
+216E; C; 217E; # ROMAN NUMERAL FIVE HUNDRED
+216F; C; 217F; # ROMAN NUMERAL ONE THOUSAND
+2183; C; 2184; # ROMAN NUMERAL REVERSED ONE HUNDRED
+24B6; C; 24D0; # CIRCLED LATIN CAPITAL LETTER A
+24B7; C; 24D1; # CIRCLED LATIN CAPITAL LETTER B
+24B8; C; 24D2; # CIRCLED LATIN CAPITAL LETTER C
+24B9; C; 24D3; # CIRCLED LATIN CAPITAL LETTER D
+24BA; C; 24D4; # CIRCLED LATIN CAPITAL LETTER E
+24BB; C; 24D5; # CIRCLED LATIN CAPITAL LETTER F
+24BC; C; 24D6; # CIRCLED LATIN CAPITAL LETTER G
+24BD; C; 24D7; # CIRCLED LATIN CAPITAL LETTER H
+24BE; C; 24D8; # CIRCLED LATIN CAPITAL LETTER I
+24BF; C; 24D9; # CIRCLED LATIN CAPITAL LETTER J
+24C0; C; 24DA; # CIRCLED LATIN CAPITAL LETTER K
+24C1; C; 24DB; # CIRCLED LATIN CAPITAL LETTER L
+24C2; C; 24DC; # CIRCLED LATIN CAPITAL LETTER M
+24C3; C; 24DD; # CIRCLED LATIN CAPITAL LETTER N
+24C4; C; 24DE; # CIRCLED LATIN CAPITAL LETTER O
+24C5; C; 24DF; # CIRCLED LATIN CAPITAL LETTER P
+24C6; C; 24E0; # CIRCLED LATIN CAPITAL LETTER Q
+24C7; C; 24E1; # CIRCLED LATIN CAPITAL LETTER R
+24C8; C; 24E2; # CIRCLED LATIN CAPITAL LETTER S
+24C9; C; 24E3; # CIRCLED LATIN CAPITAL LETTER T
+24CA; C; 24E4; # CIRCLED LATIN CAPITAL LETTER U
+24CB; C; 24E5; # CIRCLED LATIN CAPITAL LETTER V
+24CC; C; 24E6; # CIRCLED LATIN CAPITAL LETTER W
+24CD; C; 24E7; # CIRCLED LATIN CAPITAL LETTER X
+24CE; C; 24E8; # CIRCLED LATIN CAPITAL LETTER Y
+24CF; C; 24E9; # CIRCLED LATIN CAPITAL LETTER Z
+2C00; C; 2C30; # GLAGOLITIC CAPITAL LETTER AZU
+2C01; C; 2C31; # GLAGOLITIC CAPITAL LETTER BUKY
+2C02; C; 2C32; # GLAGOLITIC CAPITAL LETTER VEDE
+2C03; C; 2C33; # GLAGOLITIC CAPITAL LETTER GLAGOLI
+2C04; C; 2C34; # GLAGOLITIC CAPITAL LETTER DOBRO
+2C05; C; 2C35; # GLAGOLITIC CAPITAL LETTER YESTU
+2C06; C; 2C36; # GLAGOLITIC CAPITAL LETTER ZHIVETE
+2C07; C; 2C37; # GLAGOLITIC CAPITAL LETTER DZELO
+2C08; C; 2C38; # GLAGOLITIC CAPITAL LETTER ZEMLJA
+2C09; C; 2C39; # GLAGOLITIC CAPITAL LETTER IZHE
+2C0A; C; 2C3A; # GLAGOLITIC CAPITAL LETTER INITIAL IZHE
+2C0B; C; 2C3B; # GLAGOLITIC CAPITAL LETTER I
+2C0C; C; 2C3C; # GLAGOLITIC CAPITAL LETTER DJERVI
+2C0D; C; 2C3D; # GLAGOLITIC CAPITAL LETTER KAKO
+2C0E; C; 2C3E; # GLAGOLITIC CAPITAL LETTER LJUDIJE
+2C0F; C; 2C3F; # GLAGOLITIC CAPITAL LETTER MYSLITE
+2C10; C; 2C40; # GLAGOLITIC CAPITAL LETTER NASHI
+2C11; C; 2C41; # GLAGOLITIC CAPITAL LETTER ONU
+2C12; C; 2C42; # GLAGOLITIC CAPITAL LETTER POKOJI
+2C13; C; 2C43; # GLAGOLITIC CAPITAL LETTER RITSI
+2C14; C; 2C44; # GLAGOLITIC CAPITAL LETTER SLOVO
+2C15; C; 2C45; # GLAGOLITIC CAPITAL LETTER TVRIDO
+2C16; C; 2C46; # GLAGOLITIC CAPITAL LETTER UKU
+2C17; C; 2C47; # GLAGOLITIC CAPITAL LETTER FRITU
+2C18; C; 2C48; # GLAGOLITIC CAPITAL LETTER HERU
+2C19; C; 2C49; # GLAGOLITIC CAPITAL LETTER OTU
+2C1A; C; 2C4A; # GLAGOLITIC CAPITAL LETTER PE
+2C1B; C; 2C4B; # GLAGOLITIC CAPITAL LETTER SHTA
+2C1C; C; 2C4C; # GLAGOLITIC CAPITAL LETTER TSI
+2C1D; C; 2C4D; # GLAGOLITIC CAPITAL LETTER CHRIVI
+2C1E; C; 2C4E; # GLAGOLITIC CAPITAL LETTER SHA
+2C1F; C; 2C4F; # GLAGOLITIC CAPITAL LETTER YERU
+2C20; C; 2C50; # GLAGOLITIC CAPITAL LETTER YERI
+2C21; C; 2C51; # GLAGOLITIC CAPITAL LETTER YATI
+2C22; C; 2C52; # GLAGOLITIC CAPITAL LETTER SPIDERY HA
+2C23; C; 2C53; # GLAGOLITIC CAPITAL LETTER YU
+2C24; C; 2C54; # GLAGOLITIC CAPITAL LETTER SMALL YUS
+2C25; C; 2C55; # GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL
+2C26; C; 2C56; # GLAGOLITIC CAPITAL LETTER YO
+2C27; C; 2C57; # GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS
+2C28; C; 2C58; # GLAGOLITIC CAPITAL LETTER BIG YUS
+2C29; C; 2C59; # GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS
+2C2A; C; 2C5A; # GLAGOLITIC CAPITAL LETTER FITA
+2C2B; C; 2C5B; # GLAGOLITIC CAPITAL LETTER IZHITSA
+2C2C; C; 2C5C; # GLAGOLITIC CAPITAL LETTER SHTAPIC
+2C2D; C; 2C5D; # GLAGOLITIC CAPITAL LETTER TROKUTASTI A
+2C2E; C; 2C5E; # GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
+2C60; C; 2C61; # LATIN CAPITAL LETTER L WITH DOUBLE BAR
+2C62; C; 026B; # LATIN CAPITAL LETTER L WITH MIDDLE TILDE
+2C63; C; 1D7D; # LATIN CAPITAL LETTER P WITH STROKE
+2C64; C; 027D; # LATIN CAPITAL LETTER R WITH TAIL
+2C67; C; 2C68; # LATIN CAPITAL LETTER H WITH DESCENDER
+2C69; C; 2C6A; # LATIN CAPITAL LETTER K WITH DESCENDER
+2C6B; C; 2C6C; # LATIN CAPITAL LETTER Z WITH DESCENDER
+2C6D; C; 0251; # LATIN CAPITAL LETTER ALPHA
+2C6E; C; 0271; # LATIN CAPITAL LETTER M WITH HOOK
+2C6F; C; 0250; # LATIN CAPITAL LETTER TURNED A
+2C70; C; 0252; # LATIN CAPITAL LETTER TURNED ALPHA
+2C72; C; 2C73; # LATIN CAPITAL LETTER W WITH HOOK
+2C75; C; 2C76; # LATIN CAPITAL LETTER HALF H
+2C7E; C; 023F; # LATIN CAPITAL LETTER S WITH SWASH TAIL
+2C7F; C; 0240; # LATIN CAPITAL LETTER Z WITH SWASH TAIL
+2C80; C; 2C81; # COPTIC CAPITAL LETTER ALFA
+2C82; C; 2C83; # COPTIC CAPITAL LETTER VIDA
+2C84; C; 2C85; # COPTIC CAPITAL LETTER GAMMA
+2C86; C; 2C87; # COPTIC CAPITAL LETTER DALDA
+2C88; C; 2C89; # COPTIC CAPITAL LETTER EIE
+2C8A; C; 2C8B; # COPTIC CAPITAL LETTER SOU
+2C8C; C; 2C8D; # COPTIC CAPITAL LETTER ZATA
+2C8E; C; 2C8F; # COPTIC CAPITAL LETTER HATE
+2C90; C; 2C91; # COPTIC CAPITAL LETTER THETHE
+2C92; C; 2C93; # COPTIC CAPITAL LETTER IAUDA
+2C94; C; 2C95; # COPTIC CAPITAL LETTER KAPA
+2C96; C; 2C97; # COPTIC CAPITAL LETTER LAULA
+2C98; C; 2C99; # COPTIC CAPITAL LETTER MI
+2C9A; C; 2C9B; # COPTIC CAPITAL LETTER NI
+2C9C; C; 2C9D; # COPTIC CAPITAL LETTER KSI
+2C9E; C; 2C9F; # COPTIC CAPITAL LETTER O
+2CA0; C; 2CA1; # COPTIC CAPITAL LETTER PI
+2CA2; C; 2CA3; # COPTIC CAPITAL LETTER RO
+2CA4; C; 2CA5; # COPTIC CAPITAL LETTER SIMA
+2CA6; C; 2CA7; # COPTIC CAPITAL LETTER TAU
+2CA8; C; 2CA9; # COPTIC CAPITAL LETTER UA
+2CAA; C; 2CAB; # COPTIC CAPITAL LETTER FI
+2CAC; C; 2CAD; # COPTIC CAPITAL LETTER KHI
+2CAE; C; 2CAF; # COPTIC CAPITAL LETTER PSI
+2CB0; C; 2CB1; # COPTIC CAPITAL LETTER OOU
+2CB2; C; 2CB3; # COPTIC CAPITAL LETTER DIALECT-P ALEF
+2CB4; C; 2CB5; # COPTIC CAPITAL LETTER OLD COPTIC AIN
+2CB6; C; 2CB7; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
+2CB8; C; 2CB9; # COPTIC CAPITAL LETTER DIALECT-P KAPA
+2CBA; C; 2CBB; # COPTIC CAPITAL LETTER DIALECT-P NI
+2CBC; C; 2CBD; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
+2CBE; C; 2CBF; # COPTIC CAPITAL LETTER OLD COPTIC OOU
+2CC0; C; 2CC1; # COPTIC CAPITAL LETTER SAMPI
+2CC2; C; 2CC3; # COPTIC CAPITAL LETTER CROSSED SHEI
+2CC4; C; 2CC5; # COPTIC CAPITAL LETTER OLD COPTIC SHEI
+2CC6; C; 2CC7; # COPTIC CAPITAL LETTER OLD COPTIC ESH
+2CC8; C; 2CC9; # COPTIC CAPITAL LETTER AKHMIMIC KHEI
+2CCA; C; 2CCB; # COPTIC CAPITAL LETTER DIALECT-P HORI
+2CCC; C; 2CCD; # COPTIC CAPITAL LETTER OLD COPTIC HORI
+2CCE; C; 2CCF; # COPTIC CAPITAL LETTER OLD COPTIC HA
+2CD0; C; 2CD1; # COPTIC CAPITAL LETTER L-SHAPED HA
+2CD2; C; 2CD3; # COPTIC CAPITAL LETTER OLD COPTIC HEI
+2CD4; C; 2CD5; # COPTIC CAPITAL LETTER OLD COPTIC HAT
+2CD6; C; 2CD7; # COPTIC CAPITAL LETTER OLD COPTIC GANGIA
+2CD8; C; 2CD9; # COPTIC CAPITAL LETTER OLD COPTIC DJA
+2CDA; C; 2CDB; # COPTIC CAPITAL LETTER OLD COPTIC SHIMA
+2CDC; C; 2CDD; # COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
+2CDE; C; 2CDF; # COPTIC CAPITAL LETTER OLD NUBIAN NGI
+2CE0; C; 2CE1; # COPTIC CAPITAL LETTER OLD NUBIAN NYI
+2CE2; C; 2CE3; # COPTIC CAPITAL LETTER OLD NUBIAN WAU
+2CEB; C; 2CEC; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
+2CED; C; 2CEE; # COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
+2CF2; C; 2CF3; # COPTIC CAPITAL LETTER BOHAIRIC KHEI
+A640; C; A641; # CYRILLIC CAPITAL LETTER ZEMLYA
+A642; C; A643; # CYRILLIC CAPITAL LETTER DZELO
+A644; C; A645; # CYRILLIC CAPITAL LETTER REVERSED DZE
+A646; C; A647; # CYRILLIC CAPITAL LETTER IOTA
+A648; C; A649; # CYRILLIC CAPITAL LETTER DJERV
+A64A; C; A64B; # CYRILLIC CAPITAL LETTER MONOGRAPH UK
+A64C; C; A64D; # CYRILLIC CAPITAL LETTER BROAD OMEGA
+A64E; C; A64F; # CYRILLIC CAPITAL LETTER NEUTRAL YER
+A650; C; A651; # CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+A652; C; A653; # CYRILLIC CAPITAL LETTER IOTIFIED YAT
+A654; C; A655; # CYRILLIC CAPITAL LETTER REVERSED YU
+A656; C; A657; # CYRILLIC CAPITAL LETTER IOTIFIED A
+A658; C; A659; # CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+A65A; C; A65B; # CYRILLIC CAPITAL LETTER BLENDED YUS
+A65C; C; A65D; # CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
+A65E; C; A65F; # CYRILLIC CAPITAL LETTER YN
+A660; C; A661; # CYRILLIC CAPITAL LETTER REVERSED TSE
+A662; C; A663; # CYRILLIC CAPITAL LETTER SOFT DE
+A664; C; A665; # CYRILLIC CAPITAL LETTER SOFT EL
+A666; C; A667; # CYRILLIC CAPITAL LETTER SOFT EM
+A668; C; A669; # CYRILLIC CAPITAL LETTER MONOCULAR O
+A66A; C; A66B; # CYRILLIC CAPITAL LETTER BINOCULAR O
+A66C; C; A66D; # CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+A680; C; A681; # CYRILLIC CAPITAL LETTER DWE
+A682; C; A683; # CYRILLIC CAPITAL LETTER DZWE
+A684; C; A685; # CYRILLIC CAPITAL LETTER ZHWE
+A686; C; A687; # CYRILLIC CAPITAL LETTER CCHE
+A688; C; A689; # CYRILLIC CAPITAL LETTER DZZE
+A68A; C; A68B; # CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+A68C; C; A68D; # CYRILLIC CAPITAL LETTER TWE
+A68E; C; A68F; # CYRILLIC CAPITAL LETTER TSWE
+A690; C; A691; # CYRILLIC CAPITAL LETTER TSSE
+A692; C; A693; # CYRILLIC CAPITAL LETTER TCHE
+A694; C; A695; # CYRILLIC CAPITAL LETTER HWE
+A696; C; A697; # CYRILLIC CAPITAL LETTER SHWE
+A698; C; A699; # CYRILLIC CAPITAL LETTER DOUBLE O
+A69A; C; A69B; # CYRILLIC CAPITAL LETTER CROSSED O
+A722; C; A723; # LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
+A724; C; A725; # LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+A726; C; A727; # LATIN CAPITAL LETTER HENG
+A728; C; A729; # LATIN CAPITAL LETTER TZ
+A72A; C; A72B; # LATIN CAPITAL LETTER TRESILLO
+A72C; C; A72D; # LATIN CAPITAL LETTER CUATRILLO
+A72E; C; A72F; # LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+A732; C; A733; # LATIN CAPITAL LETTER AA
+A734; C; A735; # LATIN CAPITAL LETTER AO
+A736; C; A737; # LATIN CAPITAL LETTER AU
+A738; C; A739; # LATIN CAPITAL LETTER AV
+A73A; C; A73B; # LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+A73C; C; A73D; # LATIN CAPITAL LETTER AY
+A73E; C; A73F; # LATIN CAPITAL LETTER REVERSED C WITH DOT
+A740; C; A741; # LATIN CAPITAL LETTER K WITH STROKE
+A742; C; A743; # LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+A744; C; A745; # LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+A746; C; A747; # LATIN CAPITAL LETTER BROKEN L
+A748; C; A749; # LATIN CAPITAL LETTER L WITH HIGH STROKE
+A74A; C; A74B; # LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+A74C; C; A74D; # LATIN CAPITAL LETTER O WITH LOOP
+A74E; C; A74F; # LATIN CAPITAL LETTER OO
+A750; C; A751; # LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+A752; C; A753; # LATIN CAPITAL LETTER P WITH FLOURISH
+A754; C; A755; # LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+A756; C; A757; # LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+A758; C; A759; # LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+A75A; C; A75B; # LATIN CAPITAL LETTER R ROTUNDA
+A75C; C; A75D; # LATIN CAPITAL LETTER RUM ROTUNDA
+A75E; C; A75F; # LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+A760; C; A761; # LATIN CAPITAL LETTER VY
+A762; C; A763; # LATIN CAPITAL LETTER VISIGOTHIC Z
+A764; C; A765; # LATIN CAPITAL LETTER THORN WITH STROKE
+A766; C; A767; # LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
+A768; C; A769; # LATIN CAPITAL LETTER VEND
+A76A; C; A76B; # LATIN CAPITAL LETTER ET
+A76C; C; A76D; # LATIN CAPITAL LETTER IS
+A76E; C; A76F; # LATIN CAPITAL LETTER CON
+A779; C; A77A; # LATIN CAPITAL LETTER INSULAR D
+A77B; C; A77C; # LATIN CAPITAL LETTER INSULAR F
+A77D; C; 1D79; # LATIN CAPITAL LETTER INSULAR G
+A77E; C; A77F; # LATIN CAPITAL LETTER TURNED INSULAR G
+A780; C; A781; # LATIN CAPITAL LETTER TURNED L
+A782; C; A783; # LATIN CAPITAL LETTER INSULAR R
+A784; C; A785; # LATIN CAPITAL LETTER INSULAR S
+A786; C; A787; # LATIN CAPITAL LETTER INSULAR T
+A78B; C; A78C; # LATIN CAPITAL LETTER SALTILLO
+A78D; C; 0265; # LATIN CAPITAL LETTER TURNED H
+A790; C; A791; # LATIN CAPITAL LETTER N WITH DESCENDER
+A792; C; A793; # LATIN CAPITAL LETTER C WITH BAR
+A796; C; A797; # LATIN CAPITAL LETTER B WITH FLOURISH
+A798; C; A799; # LATIN CAPITAL LETTER F WITH STROKE
+A79A; C; A79B; # LATIN CAPITAL LETTER VOLAPUK AE
+A79C; C; A79D; # LATIN CAPITAL LETTER VOLAPUK OE
+A79E; C; A79F; # LATIN CAPITAL LETTER VOLAPUK UE
+A7A0; C; A7A1; # LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
+A7A2; C; A7A3; # LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
+A7A4; C; A7A5; # LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
+A7A6; C; A7A7; # LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
+A7A8; C; A7A9; # LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
+A7AA; C; 0266; # LATIN CAPITAL LETTER H WITH HOOK
+A7AB; C; 025C; # LATIN CAPITAL LETTER REVERSED OPEN E
+A7AC; C; 0261; # LATIN CAPITAL LETTER SCRIPT G
+A7AD; C; 026C; # LATIN CAPITAL LETTER L WITH BELT
+A7AE; C; 026A; # LATIN CAPITAL LETTER SMALL CAPITAL I
+A7B0; C; 029E; # LATIN CAPITAL LETTER TURNED K
+A7B1; C; 0287; # LATIN CAPITAL LETTER TURNED T
+A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
+A7B3; C; AB53; # LATIN CAPITAL LETTER CHI
+A7B4; C; A7B5; # LATIN CAPITAL LETTER BETA
+A7B6; C; A7B7; # LATIN CAPITAL LETTER OMEGA
+A7B8; C; A7B9; # LATIN CAPITAL LETTER U WITH STROKE
+A7BA; C; A7BB; # LATIN CAPITAL LETTER GLOTTAL A
+A7BC; C; A7BD; # LATIN CAPITAL LETTER GLOTTAL I
+A7BE; C; A7BF; # LATIN CAPITAL LETTER GLOTTAL U
+A7C2; C; A7C3; # LATIN CAPITAL LETTER ANGLICANA W
+A7C4; C; A794; # LATIN CAPITAL LETTER C WITH PALATAL HOOK
+A7C5; C; 0282; # LATIN CAPITAL LETTER S WITH HOOK
+A7C6; C; 1D8E; # LATIN CAPITAL LETTER Z WITH PALATAL HOOK
+A7C7; C; A7C8; # LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
+A7C9; C; A7CA; # LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
+A7F5; C; A7F6; # LATIN CAPITAL LETTER REVERSED HALF H
+AB70; C; 13A0; # CHEROKEE SMALL LETTER A
+AB71; C; 13A1; # CHEROKEE SMALL LETTER E
+AB72; C; 13A2; # CHEROKEE SMALL LETTER I
+AB73; C; 13A3; # CHEROKEE SMALL LETTER O
+AB74; C; 13A4; # CHEROKEE SMALL LETTER U
+AB75; C; 13A5; # CHEROKEE SMALL LETTER V
+AB76; C; 13A6; # CHEROKEE SMALL LETTER GA
+AB77; C; 13A7; # CHEROKEE SMALL LETTER KA
+AB78; C; 13A8; # CHEROKEE SMALL LETTER GE
+AB79; C; 13A9; # CHEROKEE SMALL LETTER GI
+AB7A; C; 13AA; # CHEROKEE SMALL LETTER GO
+AB7B; C; 13AB; # CHEROKEE SMALL LETTER GU
+AB7C; C; 13AC; # CHEROKEE SMALL LETTER GV
+AB7D; C; 13AD; # CHEROKEE SMALL LETTER HA
+AB7E; C; 13AE; # CHEROKEE SMALL LETTER HE
+AB7F; C; 13AF; # CHEROKEE SMALL LETTER HI
+AB80; C; 13B0; # CHEROKEE SMALL LETTER HO
+AB81; C; 13B1; # CHEROKEE SMALL LETTER HU
+AB82; C; 13B2; # CHEROKEE SMALL LETTER HV
+AB83; C; 13B3; # CHEROKEE SMALL LETTER LA
+AB84; C; 13B4; # CHEROKEE SMALL LETTER LE
+AB85; C; 13B5; # CHEROKEE SMALL LETTER LI
+AB86; C; 13B6; # CHEROKEE SMALL LETTER LO
+AB87; C; 13B7; # CHEROKEE SMALL LETTER LU
+AB88; C; 13B8; # CHEROKEE SMALL LETTER LV
+AB89; C; 13B9; # CHEROKEE SMALL LETTER MA
+AB8A; C; 13BA; # CHEROKEE SMALL LETTER ME
+AB8B; C; 13BB; # CHEROKEE SMALL LETTER MI
+AB8C; C; 13BC; # CHEROKEE SMALL LETTER MO
+AB8D; C; 13BD; # CHEROKEE SMALL LETTER MU
+AB8E; C; 13BE; # CHEROKEE SMALL LETTER NA
+AB8F; C; 13BF; # CHEROKEE SMALL LETTER HNA
+AB90; C; 13C0; # CHEROKEE SMALL LETTER NAH
+AB91; C; 13C1; # CHEROKEE SMALL LETTER NE
+AB92; C; 13C2; # CHEROKEE SMALL LETTER NI
+AB93; C; 13C3; # CHEROKEE SMALL LETTER NO
+AB94; C; 13C4; # CHEROKEE SMALL LETTER NU
+AB95; C; 13C5; # CHEROKEE SMALL LETTER NV
+AB96; C; 13C6; # CHEROKEE SMALL LETTER QUA
+AB97; C; 13C7; # CHEROKEE SMALL LETTER QUE
+AB98; C; 13C8; # CHEROKEE SMALL LETTER QUI
+AB99; C; 13C9; # CHEROKEE SMALL LETTER QUO
+AB9A; C; 13CA; # CHEROKEE SMALL LETTER QUU
+AB9B; C; 13CB; # CHEROKEE SMALL LETTER QUV
+AB9C; C; 13CC; # CHEROKEE SMALL LETTER SA
+AB9D; C; 13CD; # CHEROKEE SMALL LETTER S
+AB9E; C; 13CE; # CHEROKEE SMALL LETTER SE
+AB9F; C; 13CF; # CHEROKEE SMALL LETTER SI
+ABA0; C; 13D0; # CHEROKEE SMALL LETTER SO
+ABA1; C; 13D1; # CHEROKEE SMALL LETTER SU
+ABA2; C; 13D2; # CHEROKEE SMALL LETTER SV
+ABA3; C; 13D3; # CHEROKEE SMALL LETTER DA
+ABA4; C; 13D4; # CHEROKEE SMALL LETTER TA
+ABA5; C; 13D5; # CHEROKEE SMALL LETTER DE
+ABA6; C; 13D6; # CHEROKEE SMALL LETTER TE
+ABA7; C; 13D7; # CHEROKEE SMALL LETTER DI
+ABA8; C; 13D8; # CHEROKEE SMALL LETTER TI
+ABA9; C; 13D9; # CHEROKEE SMALL LETTER DO
+ABAA; C; 13DA; # CHEROKEE SMALL LETTER DU
+ABAB; C; 13DB; # CHEROKEE SMALL LETTER DV
+ABAC; C; 13DC; # CHEROKEE SMALL LETTER DLA
+ABAD; C; 13DD; # CHEROKEE SMALL LETTER TLA
+ABAE; C; 13DE; # CHEROKEE SMALL LETTER TLE
+ABAF; C; 13DF; # CHEROKEE SMALL LETTER TLI
+ABB0; C; 13E0; # CHEROKEE SMALL LETTER TLO
+ABB1; C; 13E1; # CHEROKEE SMALL LETTER TLU
+ABB2; C; 13E2; # CHEROKEE SMALL LETTER TLV
+ABB3; C; 13E3; # CHEROKEE SMALL LETTER TSA
+ABB4; C; 13E4; # CHEROKEE SMALL LETTER TSE
+ABB5; C; 13E5; # CHEROKEE SMALL LETTER TSI
+ABB6; C; 13E6; # CHEROKEE SMALL LETTER TSO
+ABB7; C; 13E7; # CHEROKEE SMALL LETTER TSU
+ABB8; C; 13E8; # CHEROKEE SMALL LETTER TSV
+ABB9; C; 13E9; # CHEROKEE SMALL LETTER WA
+ABBA; C; 13EA; # CHEROKEE SMALL LETTER WE
+ABBB; C; 13EB; # CHEROKEE SMALL LETTER WI
+ABBC; C; 13EC; # CHEROKEE SMALL LETTER WO
+ABBD; C; 13ED; # CHEROKEE SMALL LETTER WU
+ABBE; C; 13EE; # CHEROKEE SMALL LETTER WV
+ABBF; C; 13EF; # CHEROKEE SMALL LETTER YA
+FB00; F; 0066 0066; # LATIN SMALL LIGATURE FF
+FB01; F; 0066 0069; # LATIN SMALL LIGATURE FI
+FB02; F; 0066 006C; # LATIN SMALL LIGATURE FL
+FB03; F; 0066 0066 0069; # LATIN SMALL LIGATURE FFI
+FB04; F; 0066 0066 006C; # LATIN SMALL LIGATURE FFL
+FB05; F; 0073 0074; # LATIN SMALL LIGATURE LONG S T
+FB06; F; 0073 0074; # LATIN SMALL LIGATURE ST
+FB13; F; 0574 0576; # ARMENIAN SMALL LIGATURE MEN NOW
+FB14; F; 0574 0565; # ARMENIAN SMALL LIGATURE MEN ECH
+FB15; F; 0574 056B; # ARMENIAN SMALL LIGATURE MEN INI
+FB16; F; 057E 0576; # ARMENIAN SMALL LIGATURE VEW NOW
+FB17; F; 0574 056D; # ARMENIAN SMALL LIGATURE MEN XEH
+FF21; C; FF41; # FULLWIDTH LATIN CAPITAL LETTER A
+FF22; C; FF42; # FULLWIDTH LATIN CAPITAL LETTER B
+FF23; C; FF43; # FULLWIDTH LATIN CAPITAL LETTER C
+FF24; C; FF44; # FULLWIDTH LATIN CAPITAL LETTER D
+FF25; C; FF45; # FULLWIDTH LATIN CAPITAL LETTER E
+FF26; C; FF46; # FULLWIDTH LATIN CAPITAL LETTER F
+FF27; C; FF47; # FULLWIDTH LATIN CAPITAL LETTER G
+FF28; C; FF48; # FULLWIDTH LATIN CAPITAL LETTER H
+FF29; C; FF49; # FULLWIDTH LATIN CAPITAL LETTER I
+FF2A; C; FF4A; # FULLWIDTH LATIN CAPITAL LETTER J
+FF2B; C; FF4B; # FULLWIDTH LATIN CAPITAL LETTER K
+FF2C; C; FF4C; # FULLWIDTH LATIN CAPITAL LETTER L
+FF2D; C; FF4D; # FULLWIDTH LATIN CAPITAL LETTER M
+FF2E; C; FF4E; # FULLWIDTH LATIN CAPITAL LETTER N
+FF2F; C; FF4F; # FULLWIDTH LATIN CAPITAL LETTER O
+FF30; C; FF50; # FULLWIDTH LATIN CAPITAL LETTER P
+FF31; C; FF51; # FULLWIDTH LATIN CAPITAL LETTER Q
+FF32; C; FF52; # FULLWIDTH LATIN CAPITAL LETTER R
+FF33; C; FF53; # FULLWIDTH LATIN CAPITAL LETTER S
+FF34; C; FF54; # FULLWIDTH LATIN CAPITAL LETTER T
+FF35; C; FF55; # FULLWIDTH LATIN CAPITAL LETTER U
+FF36; C; FF56; # FULLWIDTH LATIN CAPITAL LETTER V
+FF37; C; FF57; # FULLWIDTH LATIN CAPITAL LETTER W
+FF38; C; FF58; # FULLWIDTH LATIN CAPITAL LETTER X
+FF39; C; FF59; # FULLWIDTH LATIN CAPITAL LETTER Y
+FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
+10400; C; 10428; # DESERET CAPITAL LETTER LONG I
+10401; C; 10429; # DESERET CAPITAL LETTER LONG E
+10402; C; 1042A; # DESERET CAPITAL LETTER LONG A
+10403; C; 1042B; # DESERET CAPITAL LETTER LONG AH
+10404; C; 1042C; # DESERET CAPITAL LETTER LONG O
+10405; C; 1042D; # DESERET CAPITAL LETTER LONG OO
+10406; C; 1042E; # DESERET CAPITAL LETTER SHORT I
+10407; C; 1042F; # DESERET CAPITAL LETTER SHORT E
+10408; C; 10430; # DESERET CAPITAL LETTER SHORT A
+10409; C; 10431; # DESERET CAPITAL LETTER SHORT AH
+1040A; C; 10432; # DESERET CAPITAL LETTER SHORT O
+1040B; C; 10433; # DESERET CAPITAL LETTER SHORT OO
+1040C; C; 10434; # DESERET CAPITAL LETTER AY
+1040D; C; 10435; # DESERET CAPITAL LETTER OW
+1040E; C; 10436; # DESERET CAPITAL LETTER WU
+1040F; C; 10437; # DESERET CAPITAL LETTER YEE
+10410; C; 10438; # DESERET CAPITAL LETTER H
+10411; C; 10439; # DESERET CAPITAL LETTER PEE
+10412; C; 1043A; # DESERET CAPITAL LETTER BEE
+10413; C; 1043B; # DESERET CAPITAL LETTER TEE
+10414; C; 1043C; # DESERET CAPITAL LETTER DEE
+10415; C; 1043D; # DESERET CAPITAL LETTER CHEE
+10416; C; 1043E; # DESERET CAPITAL LETTER JEE
+10417; C; 1043F; # DESERET CAPITAL LETTER KAY
+10418; C; 10440; # DESERET CAPITAL LETTER GAY
+10419; C; 10441; # DESERET CAPITAL LETTER EF
+1041A; C; 10442; # DESERET CAPITAL LETTER VEE
+1041B; C; 10443; # DESERET CAPITAL LETTER ETH
+1041C; C; 10444; # DESERET CAPITAL LETTER THEE
+1041D; C; 10445; # DESERET CAPITAL LETTER ES
+1041E; C; 10446; # DESERET CAPITAL LETTER ZEE
+1041F; C; 10447; # DESERET CAPITAL LETTER ESH
+10420; C; 10448; # DESERET CAPITAL LETTER ZHEE
+10421; C; 10449; # DESERET CAPITAL LETTER ER
+10422; C; 1044A; # DESERET CAPITAL LETTER EL
+10423; C; 1044B; # DESERET CAPITAL LETTER EM
+10424; C; 1044C; # DESERET CAPITAL LETTER EN
+10425; C; 1044D; # DESERET CAPITAL LETTER ENG
+10426; C; 1044E; # DESERET CAPITAL LETTER OI
+10427; C; 1044F; # DESERET CAPITAL LETTER EW
+104B0; C; 104D8; # OSAGE CAPITAL LETTER A
+104B1; C; 104D9; # OSAGE CAPITAL LETTER AI
+104B2; C; 104DA; # OSAGE CAPITAL LETTER AIN
+104B3; C; 104DB; # OSAGE CAPITAL LETTER AH
+104B4; C; 104DC; # OSAGE CAPITAL LETTER BRA
+104B5; C; 104DD; # OSAGE CAPITAL LETTER CHA
+104B6; C; 104DE; # OSAGE CAPITAL LETTER EHCHA
+104B7; C; 104DF; # OSAGE CAPITAL LETTER E
+104B8; C; 104E0; # OSAGE CAPITAL LETTER EIN
+104B9; C; 104E1; # OSAGE CAPITAL LETTER HA
+104BA; C; 104E2; # OSAGE CAPITAL LETTER HYA
+104BB; C; 104E3; # OSAGE CAPITAL LETTER I
+104BC; C; 104E4; # OSAGE CAPITAL LETTER KA
+104BD; C; 104E5; # OSAGE CAPITAL LETTER EHKA
+104BE; C; 104E6; # OSAGE CAPITAL LETTER KYA
+104BF; C; 104E7; # OSAGE CAPITAL LETTER LA
+104C0; C; 104E8; # OSAGE CAPITAL LETTER MA
+104C1; C; 104E9; # OSAGE CAPITAL LETTER NA
+104C2; C; 104EA; # OSAGE CAPITAL LETTER O
+104C3; C; 104EB; # OSAGE CAPITAL LETTER OIN
+104C4; C; 104EC; # OSAGE CAPITAL LETTER PA
+104C5; C; 104ED; # OSAGE CAPITAL LETTER EHPA
+104C6; C; 104EE; # OSAGE CAPITAL LETTER SA
+104C7; C; 104EF; # OSAGE CAPITAL LETTER SHA
+104C8; C; 104F0; # OSAGE CAPITAL LETTER TA
+104C9; C; 104F1; # OSAGE CAPITAL LETTER EHTA
+104CA; C; 104F2; # OSAGE CAPITAL LETTER TSA
+104CB; C; 104F3; # OSAGE CAPITAL LETTER EHTSA
+104CC; C; 104F4; # OSAGE CAPITAL LETTER TSHA
+104CD; C; 104F5; # OSAGE CAPITAL LETTER DHA
+104CE; C; 104F6; # OSAGE CAPITAL LETTER U
+104CF; C; 104F7; # OSAGE CAPITAL LETTER WA
+104D0; C; 104F8; # OSAGE CAPITAL LETTER KHA
+104D1; C; 104F9; # OSAGE CAPITAL LETTER GHA
+104D2; C; 104FA; # OSAGE CAPITAL LETTER ZA
+104D3; C; 104FB; # OSAGE CAPITAL LETTER ZHA
+10C80; C; 10CC0; # OLD HUNGARIAN CAPITAL LETTER A
+10C81; C; 10CC1; # OLD HUNGARIAN CAPITAL LETTER AA
+10C82; C; 10CC2; # OLD HUNGARIAN CAPITAL LETTER EB
+10C83; C; 10CC3; # OLD HUNGARIAN CAPITAL LETTER AMB
+10C84; C; 10CC4; # OLD HUNGARIAN CAPITAL LETTER EC
+10C85; C; 10CC5; # OLD HUNGARIAN CAPITAL LETTER ENC
+10C86; C; 10CC6; # OLD HUNGARIAN CAPITAL LETTER ECS
+10C87; C; 10CC7; # OLD HUNGARIAN CAPITAL LETTER ED
+10C88; C; 10CC8; # OLD HUNGARIAN CAPITAL LETTER AND
+10C89; C; 10CC9; # OLD HUNGARIAN CAPITAL LETTER E
+10C8A; C; 10CCA; # OLD HUNGARIAN CAPITAL LETTER CLOSE E
+10C8B; C; 10CCB; # OLD HUNGARIAN CAPITAL LETTER EE
+10C8C; C; 10CCC; # OLD HUNGARIAN CAPITAL LETTER EF
+10C8D; C; 10CCD; # OLD HUNGARIAN CAPITAL LETTER EG
+10C8E; C; 10CCE; # OLD HUNGARIAN CAPITAL LETTER EGY
+10C8F; C; 10CCF; # OLD HUNGARIAN CAPITAL LETTER EH
+10C90; C; 10CD0; # OLD HUNGARIAN CAPITAL LETTER I
+10C91; C; 10CD1; # OLD HUNGARIAN CAPITAL LETTER II
+10C92; C; 10CD2; # OLD HUNGARIAN CAPITAL LETTER EJ
+10C93; C; 10CD3; # OLD HUNGARIAN CAPITAL LETTER EK
+10C94; C; 10CD4; # OLD HUNGARIAN CAPITAL LETTER AK
+10C95; C; 10CD5; # OLD HUNGARIAN CAPITAL LETTER UNK
+10C96; C; 10CD6; # OLD HUNGARIAN CAPITAL LETTER EL
+10C97; C; 10CD7; # OLD HUNGARIAN CAPITAL LETTER ELY
+10C98; C; 10CD8; # OLD HUNGARIAN CAPITAL LETTER EM
+10C99; C; 10CD9; # OLD HUNGARIAN CAPITAL LETTER EN
+10C9A; C; 10CDA; # OLD HUNGARIAN CAPITAL LETTER ENY
+10C9B; C; 10CDB; # OLD HUNGARIAN CAPITAL LETTER O
+10C9C; C; 10CDC; # OLD HUNGARIAN CAPITAL LETTER OO
+10C9D; C; 10CDD; # OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE
+10C9E; C; 10CDE; # OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE
+10C9F; C; 10CDF; # OLD HUNGARIAN CAPITAL LETTER OEE
+10CA0; C; 10CE0; # OLD HUNGARIAN CAPITAL LETTER EP
+10CA1; C; 10CE1; # OLD HUNGARIAN CAPITAL LETTER EMP
+10CA2; C; 10CE2; # OLD HUNGARIAN CAPITAL LETTER ER
+10CA3; C; 10CE3; # OLD HUNGARIAN CAPITAL LETTER SHORT ER
+10CA4; C; 10CE4; # OLD HUNGARIAN CAPITAL LETTER ES
+10CA5; C; 10CE5; # OLD HUNGARIAN CAPITAL LETTER ESZ
+10CA6; C; 10CE6; # OLD HUNGARIAN CAPITAL LETTER ET
+10CA7; C; 10CE7; # OLD HUNGARIAN CAPITAL LETTER ENT
+10CA8; C; 10CE8; # OLD HUNGARIAN CAPITAL LETTER ETY
+10CA9; C; 10CE9; # OLD HUNGARIAN CAPITAL LETTER ECH
+10CAA; C; 10CEA; # OLD HUNGARIAN CAPITAL LETTER U
+10CAB; C; 10CEB; # OLD HUNGARIAN CAPITAL LETTER UU
+10CAC; C; 10CEC; # OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE
+10CAD; C; 10CED; # OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE
+10CAE; C; 10CEE; # OLD HUNGARIAN CAPITAL LETTER EV
+10CAF; C; 10CEF; # OLD HUNGARIAN CAPITAL LETTER EZ
+10CB0; C; 10CF0; # OLD HUNGARIAN CAPITAL LETTER EZS
+10CB1; C; 10CF1; # OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN
+10CB2; C; 10CF2; # OLD HUNGARIAN CAPITAL LETTER US
+118A0; C; 118C0; # WARANG CITI CAPITAL LETTER NGAA
+118A1; C; 118C1; # WARANG CITI CAPITAL LETTER A
+118A2; C; 118C2; # WARANG CITI CAPITAL LETTER WI
+118A3; C; 118C3; # WARANG CITI CAPITAL LETTER YU
+118A4; C; 118C4; # WARANG CITI CAPITAL LETTER YA
+118A5; C; 118C5; # WARANG CITI CAPITAL LETTER YO
+118A6; C; 118C6; # WARANG CITI CAPITAL LETTER II
+118A7; C; 118C7; # WARANG CITI CAPITAL LETTER UU
+118A8; C; 118C8; # WARANG CITI CAPITAL LETTER E
+118A9; C; 118C9; # WARANG CITI CAPITAL LETTER O
+118AA; C; 118CA; # WARANG CITI CAPITAL LETTER ANG
+118AB; C; 118CB; # WARANG CITI CAPITAL LETTER GA
+118AC; C; 118CC; # WARANG CITI CAPITAL LETTER KO
+118AD; C; 118CD; # WARANG CITI CAPITAL LETTER ENY
+118AE; C; 118CE; # WARANG CITI CAPITAL LETTER YUJ
+118AF; C; 118CF; # WARANG CITI CAPITAL LETTER UC
+118B0; C; 118D0; # WARANG CITI CAPITAL LETTER ENN
+118B1; C; 118D1; # WARANG CITI CAPITAL LETTER ODD
+118B2; C; 118D2; # WARANG CITI CAPITAL LETTER TTE
+118B3; C; 118D3; # WARANG CITI CAPITAL LETTER NUNG
+118B4; C; 118D4; # WARANG CITI CAPITAL LETTER DA
+118B5; C; 118D5; # WARANG CITI CAPITAL LETTER AT
+118B6; C; 118D6; # WARANG CITI CAPITAL LETTER AM
+118B7; C; 118D7; # WARANG CITI CAPITAL LETTER BU
+118B8; C; 118D8; # WARANG CITI CAPITAL LETTER PU
+118B9; C; 118D9; # WARANG CITI CAPITAL LETTER HIYO
+118BA; C; 118DA; # WARANG CITI CAPITAL LETTER HOLO
+118BB; C; 118DB; # WARANG CITI CAPITAL LETTER HORR
+118BC; C; 118DC; # WARANG CITI CAPITAL LETTER HAR
+118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
+118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
+118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
+16E40; C; 16E60; # MEDEFAIDRIN CAPITAL LETTER M
+16E41; C; 16E61; # MEDEFAIDRIN CAPITAL LETTER S
+16E42; C; 16E62; # MEDEFAIDRIN CAPITAL LETTER V
+16E43; C; 16E63; # MEDEFAIDRIN CAPITAL LETTER W
+16E44; C; 16E64; # MEDEFAIDRIN CAPITAL LETTER ATIU
+16E45; C; 16E65; # MEDEFAIDRIN CAPITAL LETTER Z
+16E46; C; 16E66; # MEDEFAIDRIN CAPITAL LETTER KP
+16E47; C; 16E67; # MEDEFAIDRIN CAPITAL LETTER P
+16E48; C; 16E68; # MEDEFAIDRIN CAPITAL LETTER T
+16E49; C; 16E69; # MEDEFAIDRIN CAPITAL LETTER G
+16E4A; C; 16E6A; # MEDEFAIDRIN CAPITAL LETTER F
+16E4B; C; 16E6B; # MEDEFAIDRIN CAPITAL LETTER I
+16E4C; C; 16E6C; # MEDEFAIDRIN CAPITAL LETTER K
+16E4D; C; 16E6D; # MEDEFAIDRIN CAPITAL LETTER A
+16E4E; C; 16E6E; # MEDEFAIDRIN CAPITAL LETTER J
+16E4F; C; 16E6F; # MEDEFAIDRIN CAPITAL LETTER E
+16E50; C; 16E70; # MEDEFAIDRIN CAPITAL LETTER B
+16E51; C; 16E71; # MEDEFAIDRIN CAPITAL LETTER C
+16E52; C; 16E72; # MEDEFAIDRIN CAPITAL LETTER U
+16E53; C; 16E73; # MEDEFAIDRIN CAPITAL LETTER YU
+16E54; C; 16E74; # MEDEFAIDRIN CAPITAL LETTER L
+16E55; C; 16E75; # MEDEFAIDRIN CAPITAL LETTER Q
+16E56; C; 16E76; # MEDEFAIDRIN CAPITAL LETTER HP
+16E57; C; 16E77; # MEDEFAIDRIN CAPITAL LETTER NY
+16E58; C; 16E78; # MEDEFAIDRIN CAPITAL LETTER X
+16E59; C; 16E79; # MEDEFAIDRIN CAPITAL LETTER D
+16E5A; C; 16E7A; # MEDEFAIDRIN CAPITAL LETTER OE
+16E5B; C; 16E7B; # MEDEFAIDRIN CAPITAL LETTER N
+16E5C; C; 16E7C; # MEDEFAIDRIN CAPITAL LETTER R
+16E5D; C; 16E7D; # MEDEFAIDRIN CAPITAL LETTER O
+16E5E; C; 16E7E; # MEDEFAIDRIN CAPITAL LETTER AI
+16E5F; C; 16E7F; # MEDEFAIDRIN CAPITAL LETTER Y
+1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
+1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
+1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM
+1E903; C; 1E925; # ADLAM CAPITAL LETTER MIIM
+1E904; C; 1E926; # ADLAM CAPITAL LETTER BA
+1E905; C; 1E927; # ADLAM CAPITAL LETTER SINNYIIYHE
+1E906; C; 1E928; # ADLAM CAPITAL LETTER PE
+1E907; C; 1E929; # ADLAM CAPITAL LETTER BHE
+1E908; C; 1E92A; # ADLAM CAPITAL LETTER RA
+1E909; C; 1E92B; # ADLAM CAPITAL LETTER E
+1E90A; C; 1E92C; # ADLAM CAPITAL LETTER FA
+1E90B; C; 1E92D; # ADLAM CAPITAL LETTER I
+1E90C; C; 1E92E; # ADLAM CAPITAL LETTER O
+1E90D; C; 1E92F; # ADLAM CAPITAL LETTER DHA
+1E90E; C; 1E930; # ADLAM CAPITAL LETTER YHE
+1E90F; C; 1E931; # ADLAM CAPITAL LETTER WAW
+1E910; C; 1E932; # ADLAM CAPITAL LETTER NUN
+1E911; C; 1E933; # ADLAM CAPITAL LETTER KAF
+1E912; C; 1E934; # ADLAM CAPITAL LETTER YA
+1E913; C; 1E935; # ADLAM CAPITAL LETTER U
+1E914; C; 1E936; # ADLAM CAPITAL LETTER JIIM
+1E915; C; 1E937; # ADLAM CAPITAL LETTER CHI
+1E916; C; 1E938; # ADLAM CAPITAL LETTER HA
+1E917; C; 1E939; # ADLAM CAPITAL LETTER QAAF
+1E918; C; 1E93A; # ADLAM CAPITAL LETTER GA
+1E919; C; 1E93B; # ADLAM CAPITAL LETTER NYA
+1E91A; C; 1E93C; # ADLAM CAPITAL LETTER TU
+1E91B; C; 1E93D; # ADLAM CAPITAL LETTER NHA
+1E91C; C; 1E93E; # ADLAM CAPITAL LETTER VA
+1E91D; C; 1E93F; # ADLAM CAPITAL LETTER KHA
+1E91E; C; 1E940; # ADLAM CAPITAL LETTER GBE
+1E91F; C; 1E941; # ADLAM CAPITAL LETTER ZAL
+1E920; C; 1E942; # ADLAM CAPITAL LETTER KPO
+1E921; C; 1E943; # ADLAM CAPITAL LETTER SHA
+#
+# EOF
diff --git a/tdemarkdown/md4c/scripts/unicode/DerivedGeneralCategory.txt b/tdemarkdown/md4c/scripts/unicode/DerivedGeneralCategory.txt
new file mode 100644
index 000000000..3e82c7fc5
--- /dev/null
+++ b/tdemarkdown/md4c/scripts/unicode/DerivedGeneralCategory.txt
@@ -0,0 +1,4100 @@
+# DerivedGeneralCategory-13.0.0.txt
+# Date: 2019-10-21, 14:30:32 GMT
+# © 2019 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Unicode Character Database
+#   For documentation, see http://www.unicode.org/reports/tr44/
+
+# ================================================
+
+# Property:	General_Category
+
+# ================================================
+
+# General_Category=Unassigned
+
+0378..0379    ; Cn #   [2] <reserved-0378>..<reserved-0379>
+0380..0383    ; Cn #   [4] <reserved-0380>..<reserved-0383>
+038B          ; Cn #       <reserved-038B>
+038D          ; Cn #       <reserved-038D>
+03A2          ; Cn #       <reserved-03A2>
+0530          ; Cn #       <reserved-0530>
+0557..0558    ; Cn #   [2] <reserved-0557>..<reserved-0558>
+058B..058C    ; Cn #   [2] <reserved-058B>..<reserved-058C>
+0590          ; Cn #       <reserved-0590>
+05C8..05CF    ; Cn #   [8] <reserved-05C8>..<reserved-05CF>
+05EB..05EE    ; Cn #   [4] <reserved-05EB>..<reserved-05EE>
+05F5..05FF    ; Cn #  [11] <reserved-05F5>..<reserved-05FF>
+061D          ; Cn #       <reserved-061D>
+070E          ; Cn #       <reserved-070E>
+074B..074C    ; Cn #   [2] <reserved-074B>..<reserved-074C>
+07B2..07BF    ; Cn #  [14] <reserved-07B2>..<reserved-07BF>
+07FB..07FC    ; Cn #   [2] <reserved-07FB>..<reserved-07FC>
+082E..082F    ; Cn #   [2] <reserved-082E>..<reserved-082F>
+083F          ; Cn #       <reserved-083F>
+085C..085D    ; Cn #   [2] <reserved-085C>..<reserved-085D>
+085F          ; Cn #       <reserved-085F>
+086B..089F    ; Cn #  [53] <reserved-086B>..<reserved-089F>
+08B5          ; Cn #       <reserved-08B5>
+08C8..08D2    ; Cn #  [11] <reserved-08C8>..<reserved-08D2>
+0984          ; Cn #       <reserved-0984>
+098D..098E    ; Cn #   [2] <reserved-098D>..<reserved-098E>
+0991..0992    ; Cn #   [2] <reserved-0991>..<reserved-0992>
+09A9          ; Cn #       <reserved-09A9>
+09B1          ; Cn #       <reserved-09B1>
+09B3..09B5    ; Cn #   [3] <reserved-09B3>..<reserved-09B5>
+09BA..09BB    ; Cn #   [2] <reserved-09BA>..<reserved-09BB>
+09C5..09C6    ; Cn #   [2] <reserved-09C5>..<reserved-09C6>
+09C9..09CA    ; Cn #   [2] <reserved-09C9>..<reserved-09CA>
+09CF..09D6    ; Cn #   [8] <reserved-09CF>..<reserved-09D6>
+09D8..09DB    ; Cn #   [4] <reserved-09D8>..<reserved-09DB>
+09DE          ; Cn #       <reserved-09DE>
+09E4..09E5    ; Cn #   [2] <reserved-09E4>..<reserved-09E5>
+09FF..0A00    ; Cn #   [2] <reserved-09FF>..<reserved-0A00>
+0A04          ; Cn #       <reserved-0A04>
+0A0B..0A0E    ; Cn #   [4] <reserved-0A0B>..<reserved-0A0E>
+0A11..0A12    ; Cn #   [2] <reserved-0A11>..<reserved-0A12>
+0A29          ; Cn #       <reserved-0A29>
+0A31          ; Cn #       <reserved-0A31>
+0A34          ; Cn #       <reserved-0A34>
+0A37          ; Cn #       <reserved-0A37>
+0A3A..0A3B    ; Cn #   [2] <reserved-0A3A>..<reserved-0A3B>
+0A3D          ; Cn #       <reserved-0A3D>
+0A43..0A46    ; Cn #   [4] <reserved-0A43>..<reserved-0A46>
+0A49..0A4A    ; Cn #   [2] <reserved-0A49>..<reserved-0A4A>
+0A4E..0A50    ; Cn #   [3] <reserved-0A4E>..<reserved-0A50>
+0A52..0A58    ; Cn #   [7] <reserved-0A52>..<reserved-0A58>
+0A5D          ; Cn #       <reserved-0A5D>
+0A5F..0A65    ; Cn #   [7] <reserved-0A5F>..<reserved-0A65>
+0A77..0A80    ; Cn #  [10] <reserved-0A77>..<reserved-0A80>
+0A84          ; Cn #       <reserved-0A84>
+0A8E          ; Cn #       <reserved-0A8E>
+0A92          ; Cn #       <reserved-0A92>
+0AA9          ; Cn #       <reserved-0AA9>
+0AB1          ; Cn #       <reserved-0AB1>
+0AB4          ; Cn #       <reserved-0AB4>
+0ABA..0ABB    ; Cn #   [2] <reserved-0ABA>..<reserved-0ABB>
+0AC6          ; Cn #       <reserved-0AC6>
+0ACA          ; Cn #       <reserved-0ACA>
+0ACE..0ACF    ; Cn #   [2] <reserved-0ACE>..<reserved-0ACF>
+0AD1..0ADF    ; Cn #  [15] <reserved-0AD1>..<reserved-0ADF>
+0AE4..0AE5    ; Cn #   [2] <reserved-0AE4>..<reserved-0AE5>
+0AF2..0AF8    ; Cn #   [7] <reserved-0AF2>..<reserved-0AF8>
+0B00          ; Cn #       <reserved-0B00>
+0B04          ; Cn #       <reserved-0B04>
+0B0D..0B0E    ; Cn #   [2] <reserved-0B0D>..<reserved-0B0E>
+0B11..0B12    ; Cn #   [2] <reserved-0B11>..<reserved-0B12>
+0B29          ; Cn #       <reserved-0B29>
+0B31          ; Cn #       <reserved-0B31>
+0B34          ; Cn #       <reserved-0B34>
+0B3A..0B3B    ; Cn #   [2] <reserved-0B3A>..<reserved-0B3B>
+0B45..0B46    ; Cn #   [2] <reserved-0B45>..<reserved-0B46>
+0B49..0B4A    ; Cn #   [2] <reserved-0B49>..<reserved-0B4A>
+0B4E..0B54    ; Cn #   [7] <reserved-0B4E>..<reserved-0B54>
+0B58..0B5B    ; Cn #   [4] <reserved-0B58>..<reserved-0B5B>
+0B5E          ; Cn #       <reserved-0B5E>
+0B64..0B65    ; Cn #   [2] <reserved-0B64>..<reserved-0B65>
+0B78..0B81    ; Cn #  [10] <reserved-0B78>..<reserved-0B81>
+0B84          ; Cn #       <reserved-0B84>
+0B8B..0B8D    ; Cn #   [3] <reserved-0B8B>..<reserved-0B8D>
+0B91          ; Cn #       <reserved-0B91>
+0B96..0B98    ; Cn #   [3] <reserved-0B96>..<reserved-0B98>
+0B9B          ; Cn #       <reserved-0B9B>
+0B9D          ; Cn #       <reserved-0B9D>
+0BA0..0BA2    ; Cn #   [3] <reserved-0BA0>..<reserved-0BA2>
+0BA5..0BA7    ; Cn #   [3] <reserved-0BA5>..<reserved-0BA7>
+0BAB..0BAD    ; Cn #   [3] <reserved-0BAB>..<reserved-0BAD>
+0BBA..0BBD    ; Cn #   [4] <reserved-0BBA>..<reserved-0BBD>
+0BC3..0BC5    ; Cn #   [3] <reserved-0BC3>..<reserved-0BC5>
+0BC9          ; Cn #       <reserved-0BC9>
+0BCE..0BCF    ; Cn #   [2] <reserved-0BCE>..<reserved-0BCF>
+0BD1..0BD6    ; Cn #   [6] <reserved-0BD1>..<reserved-0BD6>
+0BD8..0BE5    ; Cn #  [14] <reserved-0BD8>..<reserved-0BE5>
+0BFB..0BFF    ; Cn #   [5] <reserved-0BFB>..<reserved-0BFF>
+0C0D          ; Cn #       <reserved-0C0D>
+0C11          ; Cn #       <reserved-0C11>
+0C29          ; Cn #       <reserved-0C29>
+0C3A..0C3C    ; Cn #   [3] <reserved-0C3A>..<reserved-0C3C>
+0C45          ; Cn #       <reserved-0C45>
+0C49          ; Cn #       <reserved-0C49>
+0C4E..0C54    ; Cn #   [7] <reserved-0C4E>..<reserved-0C54>
+0C57          ; Cn #       <reserved-0C57>
+0C5B..0C5F    ; Cn #   [5] <reserved-0C5B>..<reserved-0C5F>
+0C64..0C65    ; Cn #   [2] <reserved-0C64>..<reserved-0C65>
+0C70..0C76    ; Cn #   [7] <reserved-0C70>..<reserved-0C76>
+0C8D          ; Cn #       <reserved-0C8D>
+0C91          ; Cn #       <reserved-0C91>
+0CA9          ; Cn #       <reserved-0CA9>
+0CB4          ; Cn #       <reserved-0CB4>
+0CBA..0CBB    ; Cn #   [2] <reserved-0CBA>..<reserved-0CBB>
+0CC5          ; Cn #       <reserved-0CC5>
+0CC9          ; Cn #       <reserved-0CC9>
+0CCE..0CD4    ; Cn #   [7] <reserved-0CCE>..<reserved-0CD4>
+0CD7..0CDD    ; Cn #   [7] <reserved-0CD7>..<reserved-0CDD>
+0CDF          ; Cn #       <reserved-0CDF>
+0CE4..0CE5    ; Cn #   [2] <reserved-0CE4>..<reserved-0CE5>
+0CF0          ; Cn #       <reserved-0CF0>
+0CF3..0CFF    ; Cn #  [13] <reserved-0CF3>..<reserved-0CFF>
+0D0D          ; Cn #       <reserved-0D0D>
+0D11          ; Cn #       <reserved-0D11>
+0D45          ; Cn #       <reserved-0D45>
+0D49          ; Cn #       <reserved-0D49>
+0D50..0D53    ; Cn #   [4] <reserved-0D50>..<reserved-0D53>
+0D64..0D65    ; Cn #   [2] <reserved-0D64>..<reserved-0D65>
+0D80          ; Cn #       <reserved-0D80>
+0D84          ; Cn #       <reserved-0D84>
+0D97..0D99    ; Cn #   [3] <reserved-0D97>..<reserved-0D99>
+0DB2          ; Cn #       <reserved-0DB2>
+0DBC          ; Cn #       <reserved-0DBC>
+0DBE..0DBF    ; Cn #   [2] <reserved-0DBE>..<reserved-0DBF>
+0DC7..0DC9    ; Cn #   [3] <reserved-0DC7>..<reserved-0DC9>
+0DCB..0DCE    ; Cn #   [4] <reserved-0DCB>..<reserved-0DCE>
+0DD5          ; Cn #       <reserved-0DD5>
+0DD7          ; Cn #       <reserved-0DD7>
+0DE0..0DE5    ; Cn #   [6] <reserved-0DE0>..<reserved-0DE5>
+0DF0..0DF1    ; Cn #   [2] <reserved-0DF0>..<reserved-0DF1>
+0DF5..0E00    ; Cn #  [12] <reserved-0DF5>..<reserved-0E00>
+0E3B..0E3E    ; Cn #   [4] <reserved-0E3B>..<reserved-0E3E>
+0E5C..0E80    ; Cn #  [37] <reserved-0E5C>..<reserved-0E80>
+0E83          ; Cn #       <reserved-0E83>
+0E85          ; Cn #       <reserved-0E85>
+0E8B          ; Cn #       <reserved-0E8B>
+0EA4          ; Cn #       <reserved-0EA4>
+0EA6          ; Cn #       <reserved-0EA6>
+0EBE..0EBF    ; Cn #   [2] <reserved-0EBE>..<reserved-0EBF>
+0EC5          ; Cn #       <reserved-0EC5>
+0EC7          ; Cn #       <reserved-0EC7>
+0ECE..0ECF    ; Cn #   [2] <reserved-0ECE>..<reserved-0ECF>
+0EDA..0EDB    ; Cn #   [2] <reserved-0EDA>..<reserved-0EDB>
+0EE0..0EFF    ; Cn #  [32] <reserved-0EE0>..<reserved-0EFF>
+0F48          ; Cn #       <reserved-0F48>
+0F6D..0F70    ; Cn #   [4] <reserved-0F6D>..<reserved-0F70>
+0F98          ; Cn #       <reserved-0F98>
+0FBD          ; Cn #       <reserved-0FBD>
+0FCD          ; Cn #       <reserved-0FCD>
+0FDB..0FFF    ; Cn #  [37] <reserved-0FDB>..<reserved-0FFF>
+10C6          ; Cn #       <reserved-10C6>
+10C8..10CC    ; Cn #   [5] <reserved-10C8>..<reserved-10CC>
+10CE..10CF    ; Cn #   [2] <reserved-10CE>..<reserved-10CF>
+1249          ; Cn #       <reserved-1249>
+124E..124F    ; Cn #   [2] <reserved-124E>..<reserved-124F>
+1257          ; Cn #       <reserved-1257>
+1259          ; Cn #       <reserved-1259>
+125E..125F    ; Cn #   [2] <reserved-125E>..<reserved-125F>
+1289          ; Cn #       <reserved-1289>
+128E..128F    ; Cn #   [2] <reserved-128E>..<reserved-128F>
+12B1          ; Cn #       <reserved-12B1>
+12B6..12B7    ; Cn #   [2] <reserved-12B6>..<reserved-12B7>
+12BF          ; Cn #       <reserved-12BF>
+12C1          ; Cn #       <reserved-12C1>
+12C6..12C7    ; Cn #   [2] <reserved-12C6>..<reserved-12C7>
+12D7          ; Cn #       <reserved-12D7>
+1311          ; Cn #       <reserved-1311>
+1316..1317    ; Cn #   [2] <reserved-1316>..<reserved-1317>
+135B..135C    ; Cn #   [2] <reserved-135B>..<reserved-135C>
+137D..137F    ; Cn #   [3] <reserved-137D>..<reserved-137F>
+139A..139F    ; Cn #   [6] <reserved-139A>..<reserved-139F>
+13F6..13F7    ; Cn #   [2] <reserved-13F6>..<reserved-13F7>
+13FE..13FF    ; Cn #   [2] <reserved-13FE>..<reserved-13FF>
+169D..169F    ; Cn #   [3] <reserved-169D>..<reserved-169F>
+16F9..16FF    ; Cn #   [7] <reserved-16F9>..<reserved-16FF>
+170D          ; Cn #       <reserved-170D>
+1715..171F    ; Cn #  [11] <reserved-1715>..<reserved-171F>
+1737..173F    ; Cn #   [9] <reserved-1737>..<reserved-173F>
+1754..175F    ; Cn #  [12] <reserved-1754>..<reserved-175F>
+176D          ; Cn #       <reserved-176D>
+1771          ; Cn #       <reserved-1771>
+1774..177F    ; Cn #  [12] <reserved-1774>..<reserved-177F>
+17DE..17DF    ; Cn #   [2] <reserved-17DE>..<reserved-17DF>
+17EA..17EF    ; Cn #   [6] <reserved-17EA>..<reserved-17EF>
+17FA..17FF    ; Cn #   [6] <reserved-17FA>..<reserved-17FF>
+180F          ; Cn #       <reserved-180F>
+181A..181F    ; Cn #   [6] <reserved-181A>..<reserved-181F>
+1879..187F    ; Cn #   [7] <reserved-1879>..<reserved-187F>
+18AB..18AF    ; Cn #   [5] <reserved-18AB>..<reserved-18AF>
+18F6..18FF    ; Cn #  [10] <reserved-18F6>..<reserved-18FF>
+191F          ; Cn #       <reserved-191F>
+192C..192F    ; Cn #   [4] <reserved-192C>..<reserved-192F>
+193C..193F    ; Cn #   [4] <reserved-193C>..<reserved-193F>
+1941..1943    ; Cn #   [3] <reserved-1941>..<reserved-1943>
+196E..196F    ; Cn #   [2] <reserved-196E>..<reserved-196F>
+1975..197F    ; Cn #  [11] <reserved-1975>..<reserved-197F>
+19AC..19AF    ; Cn #   [4] <reserved-19AC>..<reserved-19AF>
+19CA..19CF    ; Cn #   [6] <reserved-19CA>..<reserved-19CF>
+19DB..19DD    ; Cn #   [3] <reserved-19DB>..<reserved-19DD>
+1A1C..1A1D    ; Cn #   [2] <reserved-1A1C>..<reserved-1A1D>
+1A5F          ; Cn #       <reserved-1A5F>
+1A7D..1A7E    ; Cn #   [2] <reserved-1A7D>..<reserved-1A7E>
+1A8A..1A8F    ; Cn #   [6] <reserved-1A8A>..<reserved-1A8F>
+1A9A..1A9F    ; Cn #   [6] <reserved-1A9A>..<reserved-1A9F>
+1AAE..1AAF    ; Cn #   [2] <reserved-1AAE>..<reserved-1AAF>
+1AC1..1AFF    ; Cn #  [63] <reserved-1AC1>..<reserved-1AFF>
+1B4C..1B4F    ; Cn #   [4] <reserved-1B4C>..<reserved-1B4F>
+1B7D..1B7F    ; Cn #   [3] <reserved-1B7D>..<reserved-1B7F>
+1BF4..1BFB    ; Cn #   [8] <reserved-1BF4>..<reserved-1BFB>
+1C38..1C3A    ; Cn #   [3] <reserved-1C38>..<reserved-1C3A>
+1C4A..1C4C    ; Cn #   [3] <reserved-1C4A>..<reserved-1C4C>
+1C89..1C8F    ; Cn #   [7] <reserved-1C89>..<reserved-1C8F>
+1CBB..1CBC    ; Cn #   [2] <reserved-1CBB>..<reserved-1CBC>
+1CC8..1CCF    ; Cn #   [8] <reserved-1CC8>..<reserved-1CCF>
+1CFB..1CFF    ; Cn #   [5] <reserved-1CFB>..<reserved-1CFF>
+1DFA          ; Cn #       <reserved-1DFA>
+1F16..1F17    ; Cn #   [2] <reserved-1F16>..<reserved-1F17>
+1F1E..1F1F    ; Cn #   [2] <reserved-1F1E>..<reserved-1F1F>
+1F46..1F47    ; Cn #   [2] <reserved-1F46>..<reserved-1F47>
+1F4E..1F4F    ; Cn #   [2] <reserved-1F4E>..<reserved-1F4F>
+1F58          ; Cn #       <reserved-1F58>
+1F5A          ; Cn #       <reserved-1F5A>
+1F5C          ; Cn #       <reserved-1F5C>
+1F5E          ; Cn #       <reserved-1F5E>
+1F7E..1F7F    ; Cn #   [2] <reserved-1F7E>..<reserved-1F7F>
+1FB5          ; Cn #       <reserved-1FB5>
+1FC5          ; Cn #       <reserved-1FC5>
+1FD4..1FD5    ; Cn #   [2] <reserved-1FD4>..<reserved-1FD5>
+1FDC          ; Cn #       <reserved-1FDC>
+1FF0..1FF1    ; Cn #   [2] <reserved-1FF0>..<reserved-1FF1>
+1FF5          ; Cn #       <reserved-1FF5>
+1FFF          ; Cn #       <reserved-1FFF>
+2065          ; Cn #       <reserved-2065>
+2072..2073    ; Cn #   [2] <reserved-2072>..<reserved-2073>
+208F          ; Cn #       <reserved-208F>
+209D..209F    ; Cn #   [3] <reserved-209D>..<reserved-209F>
+20C0..20CF    ; Cn #  [16] <reserved-20C0>..<reserved-20CF>
+20F1..20FF    ; Cn #  [15] <reserved-20F1>..<reserved-20FF>
+218C..218F    ; Cn #   [4] <reserved-218C>..<reserved-218F>
+2427..243F    ; Cn #  [25] <reserved-2427>..<reserved-243F>
+244B..245F    ; Cn #  [21] <reserved-244B>..<reserved-245F>
+2B74..2B75    ; Cn #   [2] <reserved-2B74>..<reserved-2B75>
+2B96          ; Cn #       <reserved-2B96>
+2C2F          ; Cn #       <reserved-2C2F>
+2C5F          ; Cn #       <reserved-2C5F>
+2CF4..2CF8    ; Cn #   [5] <reserved-2CF4>..<reserved-2CF8>
+2D26          ; Cn #       <reserved-2D26>
+2D28..2D2C    ; Cn #   [5] <reserved-2D28>..<reserved-2D2C>
+2D2E..2D2F    ; Cn #   [2] <reserved-2D2E>..<reserved-2D2F>
+2D68..2D6E    ; Cn #   [7] <reserved-2D68>..<reserved-2D6E>
+2D71..2D7E    ; Cn #  [14] <reserved-2D71>..<reserved-2D7E>
+2D97..2D9F    ; Cn #   [9] <reserved-2D97>..<reserved-2D9F>
+2DA7          ; Cn #       <reserved-2DA7>
+2DAF          ; Cn #       <reserved-2DAF>
+2DB7          ; Cn #       <reserved-2DB7>
+2DBF          ; Cn #       <reserved-2DBF>
+2DC7          ; Cn #       <reserved-2DC7>
+2DCF          ; Cn #       <reserved-2DCF>
+2DD7          ; Cn #       <reserved-2DD7>
+2DDF          ; Cn #       <reserved-2DDF>
+2E53..2E7F    ; Cn #  [45] <reserved-2E53>..<reserved-2E7F>
+2E9A          ; Cn #       <reserved-2E9A>
+2EF4..2EFF    ; Cn #  [12] <reserved-2EF4>..<reserved-2EFF>
+2FD6..2FEF    ; Cn #  [26] <reserved-2FD6>..<reserved-2FEF>
+2FFC..2FFF    ; Cn #   [4] <reserved-2FFC>..<reserved-2FFF>
+3040          ; Cn #       <reserved-3040>
+3097..3098    ; Cn #   [2] <reserved-3097>..<reserved-3098>
+3100..3104    ; Cn #   [5] <reserved-3100>..<reserved-3104>
+3130          ; Cn #       <reserved-3130>
+318F          ; Cn #       <reserved-318F>
+31E4..31EF    ; Cn #  [12] <reserved-31E4>..<reserved-31EF>
+321F          ; Cn #       <reserved-321F>
+9FFD..9FFF    ; Cn #   [3] <reserved-9FFD>..<reserved-9FFF>
+A48D..A48F    ; Cn #   [3] <reserved-A48D>..<reserved-A48F>
+A4C7..A4CF    ; Cn #   [9] <reserved-A4C7>..<reserved-A4CF>
+A62C..A63F    ; Cn #  [20] <reserved-A62C>..<reserved-A63F>
+A6F8..A6FF    ; Cn #   [8] <reserved-A6F8>..<reserved-A6FF>
+A7C0..A7C1    ; Cn #   [2] <reserved-A7C0>..<reserved-A7C1>
+A7CB..A7F4    ; Cn #  [42] <reserved-A7CB>..<reserved-A7F4>
+A82D..A82F    ; Cn #   [3] <reserved-A82D>..<reserved-A82F>
+A83A..A83F    ; Cn #   [6] <reserved-A83A>..<reserved-A83F>
+A878..A87F    ; Cn #   [8] <reserved-A878>..<reserved-A87F>
+A8C6..A8CD    ; Cn #   [8] <reserved-A8C6>..<reserved-A8CD>
+A8DA..A8DF    ; Cn #   [6] <reserved-A8DA>..<reserved-A8DF>
+A954..A95E    ; Cn #  [11] <reserved-A954>..<reserved-A95E>
+A97D..A97F    ; Cn #   [3] <reserved-A97D>..<reserved-A97F>
+A9CE          ; Cn #       <reserved-A9CE>
+A9DA..A9DD    ; Cn #   [4] <reserved-A9DA>..<reserved-A9DD>
+A9FF          ; Cn #       <reserved-A9FF>
+AA37..AA3F    ; Cn #   [9] <reserved-AA37>..<reserved-AA3F>
+AA4E..AA4F    ; Cn #   [2] <reserved-AA4E>..<reserved-AA4F>
+AA5A..AA5B    ; Cn #   [2] <reserved-AA5A>..<reserved-AA5B>
+AAC3..AADA    ; Cn #  [24] <reserved-AAC3>..<reserved-AADA>
+AAF7..AB00    ; Cn #  [10] <reserved-AAF7>..<reserved-AB00>
+AB07..AB08    ; Cn #   [2] <reserved-AB07>..<reserved-AB08>
+AB0F..AB10    ; Cn #   [2] <reserved-AB0F>..<reserved-AB10>
+AB17..AB1F    ; Cn #   [9] <reserved-AB17>..<reserved-AB1F>
+AB27          ; Cn #       <reserved-AB27>
+AB2F          ; Cn #       <reserved-AB2F>
+AB6C..AB6F    ; Cn #   [4] <reserved-AB6C>..<reserved-AB6F>
+ABEE..ABEF    ; Cn #   [2] <reserved-ABEE>..<reserved-ABEF>
+ABFA..ABFF    ; Cn #   [6] <reserved-ABFA>..<reserved-ABFF>
+D7A4..D7AF    ; Cn #  [12] <reserved-D7A4>..<reserved-D7AF>
+D7C7..D7CA    ; Cn #   [4] <reserved-D7C7>..<reserved-D7CA>
+D7FC..D7FF    ; Cn #   [4] <reserved-D7FC>..<reserved-D7FF>
+FA6E..FA6F    ; Cn #   [2] <reserved-FA6E>..<reserved-FA6F>
+FADA..FAFF    ; Cn #  [38] <reserved-FADA>..<reserved-FAFF>
+FB07..FB12    ; Cn #  [12] <reserved-FB07>..<reserved-FB12>
+FB18..FB1C    ; Cn #   [5] <reserved-FB18>..<reserved-FB1C>
+FB37          ; Cn #       <reserved-FB37>
+FB3D          ; Cn #       <reserved-FB3D>
+FB3F          ; Cn #       <reserved-FB3F>
+FB42          ; Cn #       <reserved-FB42>
+FB45          ; Cn #       <reserved-FB45>
+FBC2..FBD2    ; Cn #  [17] <reserved-FBC2>..<reserved-FBD2>
+FD40..FD4F    ; Cn #  [16] <reserved-FD40>..<reserved-FD4F>
+FD90..FD91    ; Cn #   [2] <reserved-FD90>..<reserved-FD91>
+FDC8..FDEF    ; Cn #  [40] <reserved-FDC8>..<noncharacter-FDEF>
+FDFE..FDFF    ; Cn #   [2] <reserved-FDFE>..<reserved-FDFF>
+FE1A..FE1F    ; Cn #   [6] <reserved-FE1A>..<reserved-FE1F>
+FE53          ; Cn #       <reserved-FE53>
+FE67          ; Cn #       <reserved-FE67>
+FE6C..FE6F    ; Cn #   [4] <reserved-FE6C>..<reserved-FE6F>
+FE75          ; Cn #       <reserved-FE75>
+FEFD..FEFE    ; Cn #   [2] <reserved-FEFD>..<reserved-FEFE>
+FF00          ; Cn #       <reserved-FF00>
+FFBF..FFC1    ; Cn #   [3] <reserved-FFBF>..<reserved-FFC1>
+FFC8..FFC9    ; Cn #   [2] <reserved-FFC8>..<reserved-FFC9>
+FFD0..FFD1    ; Cn #   [2] <reserved-FFD0>..<reserved-FFD1>
+FFD8..FFD9    ; Cn #   [2] <reserved-FFD8>..<reserved-FFD9>
+FFDD..FFDF    ; Cn #   [3] <reserved-FFDD>..<reserved-FFDF>
+FFE7          ; Cn #       <reserved-FFE7>
+FFEF..FFF8    ; Cn #  [10] <reserved-FFEF>..<reserved-FFF8>
+FFFE..FFFF    ; Cn #   [2] <noncharacter-FFFE>..<noncharacter-FFFF>
+1000C         ; Cn #       <reserved-1000C>
+10027         ; Cn #       <reserved-10027>
+1003B         ; Cn #       <reserved-1003B>
+1003E         ; Cn #       <reserved-1003E>
+1004E..1004F  ; Cn #   [2] <reserved-1004E>..<reserved-1004F>
+1005E..1007F  ; Cn #  [34] <reserved-1005E>..<reserved-1007F>
+100FB..100FF  ; Cn #   [5] <reserved-100FB>..<reserved-100FF>
+10103..10106  ; Cn #   [4] <reserved-10103>..<reserved-10106>
+10134..10136  ; Cn #   [3] <reserved-10134>..<reserved-10136>
+1018F         ; Cn #       <reserved-1018F>
+1019D..1019F  ; Cn #   [3] <reserved-1019D>..<reserved-1019F>
+101A1..101CF  ; Cn #  [47] <reserved-101A1>..<reserved-101CF>
+101FE..1027F  ; Cn # [130] <reserved-101FE>..<reserved-1027F>
+1029D..1029F  ; Cn #   [3] <reserved-1029D>..<reserved-1029F>
+102D1..102DF  ; Cn #  [15] <reserved-102D1>..<reserved-102DF>
+102FC..102FF  ; Cn #   [4] <reserved-102FC>..<reserved-102FF>
+10324..1032C  ; Cn #   [9] <reserved-10324>..<reserved-1032C>
+1034B..1034F  ; Cn #   [5] <reserved-1034B>..<reserved-1034F>
+1037B..1037F  ; Cn #   [5] <reserved-1037B>..<reserved-1037F>
+1039E         ; Cn #       <reserved-1039E>
+103C4..103C7  ; Cn #   [4] <reserved-103C4>..<reserved-103C7>
+103D6..103FF  ; Cn #  [42] <reserved-103D6>..<reserved-103FF>
+1049E..1049F  ; Cn #   [2] <reserved-1049E>..<reserved-1049F>
+104AA..104AF  ; Cn #   [6] <reserved-104AA>..<reserved-104AF>
+104D4..104D7  ; Cn #   [4] <reserved-104D4>..<reserved-104D7>
+104FC..104FF  ; Cn #   [4] <reserved-104FC>..<reserved-104FF>
+10528..1052F  ; Cn #   [8] <reserved-10528>..<reserved-1052F>
+10564..1056E  ; Cn #  [11] <reserved-10564>..<reserved-1056E>
+10570..105FF  ; Cn # [144] <reserved-10570>..<reserved-105FF>
+10737..1073F  ; Cn #   [9] <reserved-10737>..<reserved-1073F>
+10756..1075F  ; Cn #  [10] <reserved-10756>..<reserved-1075F>
+10768..107FF  ; Cn # [152] <reserved-10768>..<reserved-107FF>
+10806..10807  ; Cn #   [2] <reserved-10806>..<reserved-10807>
+10809         ; Cn #       <reserved-10809>
+10836         ; Cn #       <reserved-10836>
+10839..1083B  ; Cn #   [3] <reserved-10839>..<reserved-1083B>
+1083D..1083E  ; Cn #   [2] <reserved-1083D>..<reserved-1083E>
+10856         ; Cn #       <reserved-10856>
+1089F..108A6  ; Cn #   [8] <reserved-1089F>..<reserved-108A6>
+108B0..108DF  ; Cn #  [48] <reserved-108B0>..<reserved-108DF>
+108F3         ; Cn #       <reserved-108F3>
+108F6..108FA  ; Cn #   [5] <reserved-108F6>..<reserved-108FA>
+1091C..1091E  ; Cn #   [3] <reserved-1091C>..<reserved-1091E>
+1093A..1093E  ; Cn #   [5] <reserved-1093A>..<reserved-1093E>
+10940..1097F  ; Cn #  [64] <reserved-10940>..<reserved-1097F>
+109B8..109BB  ; Cn #   [4] <reserved-109B8>..<reserved-109BB>
+109D0..109D1  ; Cn #   [2] <reserved-109D0>..<reserved-109D1>
+10A04         ; Cn #       <reserved-10A04>
+10A07..10A0B  ; Cn #   [5] <reserved-10A07>..<reserved-10A0B>
+10A14         ; Cn #       <reserved-10A14>
+10A18         ; Cn #       <reserved-10A18>
+10A36..10A37  ; Cn #   [2] <reserved-10A36>..<reserved-10A37>
+10A3B..10A3E  ; Cn #   [4] <reserved-10A3B>..<reserved-10A3E>
+10A49..10A4F  ; Cn #   [7] <reserved-10A49>..<reserved-10A4F>
+10A59..10A5F  ; Cn #   [7] <reserved-10A59>..<reserved-10A5F>
+10AA0..10ABF  ; Cn #  [32] <reserved-10AA0>..<reserved-10ABF>
+10AE7..10AEA  ; Cn #   [4] <reserved-10AE7>..<reserved-10AEA>
+10AF7..10AFF  ; Cn #   [9] <reserved-10AF7>..<reserved-10AFF>
+10B36..10B38  ; Cn #   [3] <reserved-10B36>..<reserved-10B38>
+10B56..10B57  ; Cn #   [2] <reserved-10B56>..<reserved-10B57>
+10B73..10B77  ; Cn #   [5] <reserved-10B73>..<reserved-10B77>
+10B92..10B98  ; Cn #   [7] <reserved-10B92>..<reserved-10B98>
+10B9D..10BA8  ; Cn #  [12] <reserved-10B9D>..<reserved-10BA8>
+10BB0..10BFF  ; Cn #  [80] <reserved-10BB0>..<reserved-10BFF>
+10C49..10C7F  ; Cn #  [55] <reserved-10C49>..<reserved-10C7F>
+10CB3..10CBF  ; Cn #  [13] <reserved-10CB3>..<reserved-10CBF>
+10CF3..10CF9  ; Cn #   [7] <reserved-10CF3>..<reserved-10CF9>
+10D28..10D2F  ; Cn #   [8] <reserved-10D28>..<reserved-10D2F>
+10D3A..10E5F  ; Cn # [294] <reserved-10D3A>..<reserved-10E5F>
+10E7F         ; Cn #       <reserved-10E7F>
+10EAA         ; Cn #       <reserved-10EAA>
+10EAE..10EAF  ; Cn #   [2] <reserved-10EAE>..<reserved-10EAF>
+10EB2..10EFF  ; Cn #  [78] <reserved-10EB2>..<reserved-10EFF>
+10F28..10F2F  ; Cn #   [8] <reserved-10F28>..<reserved-10F2F>
+10F5A..10FAF  ; Cn #  [86] <reserved-10F5A>..<reserved-10FAF>
+10FCC..10FDF  ; Cn #  [20] <reserved-10FCC>..<reserved-10FDF>
+10FF7..10FFF  ; Cn #   [9] <reserved-10FF7>..<reserved-10FFF>
+1104E..11051  ; Cn #   [4] <reserved-1104E>..<reserved-11051>
+11070..1107E  ; Cn #  [15] <reserved-11070>..<reserved-1107E>
+110C2..110CC  ; Cn #  [11] <reserved-110C2>..<reserved-110CC>
+110CE..110CF  ; Cn #   [2] <reserved-110CE>..<reserved-110CF>
+110E9..110EF  ; Cn #   [7] <reserved-110E9>..<reserved-110EF>
+110FA..110FF  ; Cn #   [6] <reserved-110FA>..<reserved-110FF>
+11135         ; Cn #       <reserved-11135>
+11148..1114F  ; Cn #   [8] <reserved-11148>..<reserved-1114F>
+11177..1117F  ; Cn #   [9] <reserved-11177>..<reserved-1117F>
+111E0         ; Cn #       <reserved-111E0>
+111F5..111FF  ; Cn #  [11] <reserved-111F5>..<reserved-111FF>
+11212         ; Cn #       <reserved-11212>
+1123F..1127F  ; Cn #  [65] <reserved-1123F>..<reserved-1127F>
+11287         ; Cn #       <reserved-11287>
+11289         ; Cn #       <reserved-11289>
+1128E         ; Cn #       <reserved-1128E>
+1129E         ; Cn #       <reserved-1129E>
+112AA..112AF  ; Cn #   [6] <reserved-112AA>..<reserved-112AF>
+112EB..112EF  ; Cn #   [5] <reserved-112EB>..<reserved-112EF>
+112FA..112FF  ; Cn #   [6] <reserved-112FA>..<reserved-112FF>
+11304         ; Cn #       <reserved-11304>
+1130D..1130E  ; Cn #   [2] <reserved-1130D>..<reserved-1130E>
+11311..11312  ; Cn #   [2] <reserved-11311>..<reserved-11312>
+11329         ; Cn #       <reserved-11329>
+11331         ; Cn #       <reserved-11331>
+11334         ; Cn #       <reserved-11334>
+1133A         ; Cn #       <reserved-1133A>
+11345..11346  ; Cn #   [2] <reserved-11345>..<reserved-11346>
+11349..1134A  ; Cn #   [2] <reserved-11349>..<reserved-1134A>
+1134E..1134F  ; Cn #   [2] <reserved-1134E>..<reserved-1134F>
+11351..11356  ; Cn #   [6] <reserved-11351>..<reserved-11356>
+11358..1135C  ; Cn #   [5] <reserved-11358>..<reserved-1135C>
+11364..11365  ; Cn #   [2] <reserved-11364>..<reserved-11365>
+1136D..1136F  ; Cn #   [3] <reserved-1136D>..<reserved-1136F>
+11375..113FF  ; Cn # [139] <reserved-11375>..<reserved-113FF>
+1145C         ; Cn #       <reserved-1145C>
+11462..1147F  ; Cn #  [30] <reserved-11462>..<reserved-1147F>
+114C8..114CF  ; Cn #   [8] <reserved-114C8>..<reserved-114CF>
+114DA..1157F  ; Cn # [166] <reserved-114DA>..<reserved-1157F>
+115B6..115B7  ; Cn #   [2] <reserved-115B6>..<reserved-115B7>
+115DE..115FF  ; Cn #  [34] <reserved-115DE>..<reserved-115FF>
+11645..1164F  ; Cn #  [11] <reserved-11645>..<reserved-1164F>
+1165A..1165F  ; Cn #   [6] <reserved-1165A>..<reserved-1165F>
+1166D..1167F  ; Cn #  [19] <reserved-1166D>..<reserved-1167F>
+116B9..116BF  ; Cn #   [7] <reserved-116B9>..<reserved-116BF>
+116CA..116FF  ; Cn #  [54] <reserved-116CA>..<reserved-116FF>
+1171B..1171C  ; Cn #   [2] <reserved-1171B>..<reserved-1171C>
+1172C..1172F  ; Cn #   [4] <reserved-1172C>..<reserved-1172F>
+11740..117FF  ; Cn # [192] <reserved-11740>..<reserved-117FF>
+1183C..1189F  ; Cn # [100] <reserved-1183C>..<reserved-1189F>
+118F3..118FE  ; Cn #  [12] <reserved-118F3>..<reserved-118FE>
+11907..11908  ; Cn #   [2] <reserved-11907>..<reserved-11908>
+1190A..1190B  ; Cn #   [2] <reserved-1190A>..<reserved-1190B>
+11914         ; Cn #       <reserved-11914>
+11917         ; Cn #       <reserved-11917>
+11936         ; Cn #       <reserved-11936>
+11939..1193A  ; Cn #   [2] <reserved-11939>..<reserved-1193A>
+11947..1194F  ; Cn #   [9] <reserved-11947>..<reserved-1194F>
+1195A..1199F  ; Cn #  [70] <reserved-1195A>..<reserved-1199F>
+119A8..119A9  ; Cn #   [2] <reserved-119A8>..<reserved-119A9>
+119D8..119D9  ; Cn #   [2] <reserved-119D8>..<reserved-119D9>
+119E5..119FF  ; Cn #  [27] <reserved-119E5>..<reserved-119FF>
+11A48..11A4F  ; Cn #   [8] <reserved-11A48>..<reserved-11A4F>
+11AA3..11ABF  ; Cn #  [29] <reserved-11AA3>..<reserved-11ABF>
+11AF9..11BFF  ; Cn # [263] <reserved-11AF9>..<reserved-11BFF>
+11C09         ; Cn #       <reserved-11C09>
+11C37         ; Cn #       <reserved-11C37>
+11C46..11C4F  ; Cn #  [10] <reserved-11C46>..<reserved-11C4F>
+11C6D..11C6F  ; Cn #   [3] <reserved-11C6D>..<reserved-11C6F>
+11C90..11C91  ; Cn #   [2] <reserved-11C90>..<reserved-11C91>
+11CA8         ; Cn #       <reserved-11CA8>
+11CB7..11CFF  ; Cn #  [73] <reserved-11CB7>..<reserved-11CFF>
+11D07         ; Cn #       <reserved-11D07>
+11D0A         ; Cn #       <reserved-11D0A>
+11D37..11D39  ; Cn #   [3] <reserved-11D37>..<reserved-11D39>
+11D3B         ; Cn #       <reserved-11D3B>
+11D3E         ; Cn #       <reserved-11D3E>
+11D48..11D4F  ; Cn #   [8] <reserved-11D48>..<reserved-11D4F>
+11D5A..11D5F  ; Cn #   [6] <reserved-11D5A>..<reserved-11D5F>
+11D66         ; Cn #       <reserved-11D66>
+11D69         ; Cn #       <reserved-11D69>
+11D8F         ; Cn #       <reserved-11D8F>
+11D92         ; Cn #       <reserved-11D92>
+11D99..11D9F  ; Cn #   [7] <reserved-11D99>..<reserved-11D9F>
+11DAA..11EDF  ; Cn # [310] <reserved-11DAA>..<reserved-11EDF>
+11EF9..11FAF  ; Cn # [183] <reserved-11EF9>..<reserved-11FAF>
+11FB1..11FBF  ; Cn #  [15] <reserved-11FB1>..<reserved-11FBF>
+11FF2..11FFE  ; Cn #  [13] <reserved-11FF2>..<reserved-11FFE>
+1239A..123FF  ; Cn # [102] <reserved-1239A>..<reserved-123FF>
+1246F         ; Cn #       <reserved-1246F>
+12475..1247F  ; Cn #  [11] <reserved-12475>..<reserved-1247F>
+12544..12FFF  ; Cn # [2748] <reserved-12544>..<reserved-12FFF>
+1342F         ; Cn #       <reserved-1342F>
+13439..143FF  ; Cn # [4039] <reserved-13439>..<reserved-143FF>
+14647..167FF  ; Cn # [8633] <reserved-14647>..<reserved-167FF>
+16A39..16A3F  ; Cn #   [7] <reserved-16A39>..<reserved-16A3F>
+16A5F         ; Cn #       <reserved-16A5F>
+16A6A..16A6D  ; Cn #   [4] <reserved-16A6A>..<reserved-16A6D>
+16A70..16ACF  ; Cn #  [96] <reserved-16A70>..<reserved-16ACF>
+16AEE..16AEF  ; Cn #   [2] <reserved-16AEE>..<reserved-16AEF>
+16AF6..16AFF  ; Cn #  [10] <reserved-16AF6>..<reserved-16AFF>
+16B46..16B4F  ; Cn #  [10] <reserved-16B46>..<reserved-16B4F>
+16B5A         ; Cn #       <reserved-16B5A>
+16B62         ; Cn #       <reserved-16B62>
+16B78..16B7C  ; Cn #   [5] <reserved-16B78>..<reserved-16B7C>
+16B90..16E3F  ; Cn # [688] <reserved-16B90>..<reserved-16E3F>
+16E9B..16EFF  ; Cn # [101] <reserved-16E9B>..<reserved-16EFF>
+16F4B..16F4E  ; Cn #   [4] <reserved-16F4B>..<reserved-16F4E>
+16F88..16F8E  ; Cn #   [7] <reserved-16F88>..<reserved-16F8E>
+16FA0..16FDF  ; Cn #  [64] <reserved-16FA0>..<reserved-16FDF>
+16FE5..16FEF  ; Cn #  [11] <reserved-16FE5>..<reserved-16FEF>
+16FF2..16FFF  ; Cn #  [14] <reserved-16FF2>..<reserved-16FFF>
+187F8..187FF  ; Cn #   [8] <reserved-187F8>..<reserved-187FF>
+18CD6..18CFF  ; Cn #  [42] <reserved-18CD6>..<reserved-18CFF>
+18D09..1AFFF  ; Cn # [8951] <reserved-18D09>..<reserved-1AFFF>
+1B11F..1B14F  ; Cn #  [49] <reserved-1B11F>..<reserved-1B14F>
+1B153..1B163  ; Cn #  [17] <reserved-1B153>..<reserved-1B163>
+1B168..1B16F  ; Cn #   [8] <reserved-1B168>..<reserved-1B16F>
+1B2FC..1BBFF  ; Cn # [2308] <reserved-1B2FC>..<reserved-1BBFF>
+1BC6B..1BC6F  ; Cn #   [5] <reserved-1BC6B>..<reserved-1BC6F>
+1BC7D..1BC7F  ; Cn #   [3] <reserved-1BC7D>..<reserved-1BC7F>
+1BC89..1BC8F  ; Cn #   [7] <reserved-1BC89>..<reserved-1BC8F>
+1BC9A..1BC9B  ; Cn #   [2] <reserved-1BC9A>..<reserved-1BC9B>
+1BCA4..1CFFF  ; Cn # [4956] <reserved-1BCA4>..<reserved-1CFFF>
+1D0F6..1D0FF  ; Cn #  [10] <reserved-1D0F6>..<reserved-1D0FF>
+1D127..1D128  ; Cn #   [2] <reserved-1D127>..<reserved-1D128>
+1D1E9..1D1FF  ; Cn #  [23] <reserved-1D1E9>..<reserved-1D1FF>
+1D246..1D2DF  ; Cn # [154] <reserved-1D246>..<reserved-1D2DF>
+1D2F4..1D2FF  ; Cn #  [12] <reserved-1D2F4>..<reserved-1D2FF>
+1D357..1D35F  ; Cn #   [9] <reserved-1D357>..<reserved-1D35F>
+1D379..1D3FF  ; Cn # [135] <reserved-1D379>..<reserved-1D3FF>
+1D455         ; Cn #       <reserved-1D455>
+1D49D         ; Cn #       <reserved-1D49D>
+1D4A0..1D4A1  ; Cn #   [2] <reserved-1D4A0>..<reserved-1D4A1>
+1D4A3..1D4A4  ; Cn #   [2] <reserved-1D4A3>..<reserved-1D4A4>
+1D4A7..1D4A8  ; Cn #   [2] <reserved-1D4A7>..<reserved-1D4A8>
+1D4AD         ; Cn #       <reserved-1D4AD>
+1D4BA         ; Cn #       <reserved-1D4BA>
+1D4BC         ; Cn #       <reserved-1D4BC>
+1D4C4         ; Cn #       <reserved-1D4C4>
+1D506         ; Cn #       <reserved-1D506>
+1D50B..1D50C  ; Cn #   [2] <reserved-1D50B>..<reserved-1D50C>
+1D515         ; Cn #       <reserved-1D515>
+1D51D         ; Cn #       <reserved-1D51D>
+1D53A         ; Cn #       <reserved-1D53A>
+1D53F         ; Cn #       <reserved-1D53F>
+1D545         ; Cn #       <reserved-1D545>
+1D547..1D549  ; Cn #   [3] <reserved-1D547>..<reserved-1D549>
+1D551         ; Cn #       <reserved-1D551>
+1D6A6..1D6A7  ; Cn #   [2] <reserved-1D6A6>..<reserved-1D6A7>
+1D7CC..1D7CD  ; Cn #   [2] <reserved-1D7CC>..<reserved-1D7CD>
+1DA8C..1DA9A  ; Cn #  [15] <reserved-1DA8C>..<reserved-1DA9A>
+1DAA0         ; Cn #       <reserved-1DAA0>
+1DAB0..1DFFF  ; Cn # [1360] <reserved-1DAB0>..<reserved-1DFFF>
+1E007         ; Cn #       <reserved-1E007>
+1E019..1E01A  ; Cn #   [2] <reserved-1E019>..<reserved-1E01A>
+1E022         ; Cn #       <reserved-1E022>
+1E025         ; Cn #       <reserved-1E025>
+1E02B..1E0FF  ; Cn # [213] <reserved-1E02B>..<reserved-1E0FF>
+1E12D..1E12F  ; Cn #   [3] <reserved-1E12D>..<reserved-1E12F>
+1E13E..1E13F  ; Cn #   [2] <reserved-1E13E>..<reserved-1E13F>
+1E14A..1E14D  ; Cn #   [4] <reserved-1E14A>..<reserved-1E14D>
+1E150..1E2BF  ; Cn # [368] <reserved-1E150>..<reserved-1E2BF>
+1E2FA..1E2FE  ; Cn #   [5] <reserved-1E2FA>..<reserved-1E2FE>
+1E300..1E7FF  ; Cn # [1280] <reserved-1E300>..<reserved-1E7FF>
+1E8C5..1E8C6  ; Cn #   [2] <reserved-1E8C5>..<reserved-1E8C6>
+1E8D7..1E8FF  ; Cn #  [41] <reserved-1E8D7>..<reserved-1E8FF>
+1E94C..1E94F  ; Cn #   [4] <reserved-1E94C>..<reserved-1E94F>
+1E95A..1E95D  ; Cn #   [4] <reserved-1E95A>..<reserved-1E95D>
+1E960..1EC70  ; Cn # [785] <reserved-1E960>..<reserved-1EC70>
+1ECB5..1ED00  ; Cn #  [76] <reserved-1ECB5>..<reserved-1ED00>
+1ED3E..1EDFF  ; Cn # [194] <reserved-1ED3E>..<reserved-1EDFF>
+1EE04         ; Cn #       <reserved-1EE04>
+1EE20         ; Cn #       <reserved-1EE20>
+1EE23         ; Cn #       <reserved-1EE23>
+1EE25..1EE26  ; Cn #   [2] <reserved-1EE25>..<reserved-1EE26>
+1EE28         ; Cn #       <reserved-1EE28>
+1EE33         ; Cn #       <reserved-1EE33>
+1EE38         ; Cn #       <reserved-1EE38>
+1EE3A         ; Cn #       <reserved-1EE3A>
+1EE3C..1EE41  ; Cn #   [6] <reserved-1EE3C>..<reserved-1EE41>
+1EE43..1EE46  ; Cn #   [4] <reserved-1EE43>..<reserved-1EE46>
+1EE48         ; Cn #       <reserved-1EE48>
+1EE4A         ; Cn #       <reserved-1EE4A>
+1EE4C         ; Cn #       <reserved-1EE4C>
+1EE50         ; Cn #       <reserved-1EE50>
+1EE53         ; Cn #       <reserved-1EE53>
+1EE55..1EE56  ; Cn #   [2] <reserved-1EE55>..<reserved-1EE56>
+1EE58         ; Cn #       <reserved-1EE58>
+1EE5A         ; Cn #       <reserved-1EE5A>
+1EE5C         ; Cn #       <reserved-1EE5C>
+1EE5E         ; Cn #       <reserved-1EE5E>
+1EE60         ; Cn #       <reserved-1EE60>
+1EE63         ; Cn #       <reserved-1EE63>
+1EE65..1EE66  ; Cn #   [2] <reserved-1EE65>..<reserved-1EE66>
+1EE6B         ; Cn #       <reserved-1EE6B>
+1EE73         ; Cn #       <reserved-1EE73>
+1EE78         ; Cn #       <reserved-1EE78>
+1EE7D         ; Cn #       <reserved-1EE7D>
+1EE7F         ; Cn #       <reserved-1EE7F>
+1EE8A         ; Cn #       <reserved-1EE8A>
+1EE9C..1EEA0  ; Cn #   [5] <reserved-1EE9C>..<reserved-1EEA0>
+1EEA4         ; Cn #       <reserved-1EEA4>
+1EEAA         ; Cn #       <reserved-1EEAA>
+1EEBC..1EEEF  ; Cn #  [52] <reserved-1EEBC>..<reserved-1EEEF>
+1EEF2..1EFFF  ; Cn # [270] <reserved-1EEF2>..<reserved-1EFFF>
+1F02C..1F02F  ; Cn #   [4] <reserved-1F02C>..<reserved-1F02F>
+1F094..1F09F  ; Cn #  [12] <reserved-1F094>..<reserved-1F09F>
+1F0AF..1F0B0  ; Cn #   [2] <reserved-1F0AF>..<reserved-1F0B0>
+1F0C0         ; Cn #       <reserved-1F0C0>
+1F0D0         ; Cn #       <reserved-1F0D0>
+1F0F6..1F0FF  ; Cn #  [10] <reserved-1F0F6>..<reserved-1F0FF>
+1F1AE..1F1E5  ; Cn #  [56] <reserved-1F1AE>..<reserved-1F1E5>
+1F203..1F20F  ; Cn #  [13] <reserved-1F203>..<reserved-1F20F>
+1F23C..1F23F  ; Cn #   [4] <reserved-1F23C>..<reserved-1F23F>
+1F249..1F24F  ; Cn #   [7] <reserved-1F249>..<reserved-1F24F>
+1F252..1F25F  ; Cn #  [14] <reserved-1F252>..<reserved-1F25F>
+1F266..1F2FF  ; Cn # [154] <reserved-1F266>..<reserved-1F2FF>
+1F6D8..1F6DF  ; Cn #   [8] <reserved-1F6D8>..<reserved-1F6DF>
+1F6ED..1F6EF  ; Cn #   [3] <reserved-1F6ED>..<reserved-1F6EF>
+1F6FD..1F6FF  ; Cn #   [3] <reserved-1F6FD>..<reserved-1F6FF>
+1F774..1F77F  ; Cn #  [12] <reserved-1F774>..<reserved-1F77F>
+1F7D9..1F7DF  ; Cn #   [7] <reserved-1F7D9>..<reserved-1F7DF>
+1F7EC..1F7FF  ; Cn #  [20] <reserved-1F7EC>..<reserved-1F7FF>
+1F80C..1F80F  ; Cn #   [4] <reserved-1F80C>..<reserved-1F80F>
+1F848..1F84F  ; Cn #   [8] <reserved-1F848>..<reserved-1F84F>
+1F85A..1F85F  ; Cn #   [6] <reserved-1F85A>..<reserved-1F85F>
+1F888..1F88F  ; Cn #   [8] <reserved-1F888>..<reserved-1F88F>
+1F8AE..1F8AF  ; Cn #   [2] <reserved-1F8AE>..<reserved-1F8AF>
+1F8B2..1F8FF  ; Cn #  [78] <reserved-1F8B2>..<reserved-1F8FF>
+1F979         ; Cn #       <reserved-1F979>
+1F9CC         ; Cn #       <reserved-1F9CC>
+1FA54..1FA5F  ; Cn #  [12] <reserved-1FA54>..<reserved-1FA5F>
+1FA6E..1FA6F  ; Cn #   [2] <reserved-1FA6E>..<reserved-1FA6F>
+1FA75..1FA77  ; Cn #   [3] <reserved-1FA75>..<reserved-1FA77>
+1FA7B..1FA7F  ; Cn #   [5] <reserved-1FA7B>..<reserved-1FA7F>
+1FA87..1FA8F  ; Cn #   [9] <reserved-1FA87>..<reserved-1FA8F>
+1FAA9..1FAAF  ; Cn #   [7] <reserved-1FAA9>..<reserved-1FAAF>
+1FAB7..1FABF  ; Cn #   [9] <reserved-1FAB7>..<reserved-1FABF>
+1FAC3..1FACF  ; Cn #  [13] <reserved-1FAC3>..<reserved-1FACF>
+1FAD7..1FAFF  ; Cn #  [41] <reserved-1FAD7>..<reserved-1FAFF>
+1FB93         ; Cn #       <reserved-1FB93>
+1FBCB..1FBEF  ; Cn #  [37] <reserved-1FBCB>..<reserved-1FBEF>
+1FBFA..1FFFF  ; Cn # [1030] <reserved-1FBFA>..<noncharacter-1FFFF>
+2A6DE..2A6FF  ; Cn #  [34] <reserved-2A6DE>..<reserved-2A6FF>
+2B735..2B73F  ; Cn #  [11] <reserved-2B735>..<reserved-2B73F>
+2B81E..2B81F  ; Cn #   [2] <reserved-2B81E>..<reserved-2B81F>
+2CEA2..2CEAF  ; Cn #  [14] <reserved-2CEA2>..<reserved-2CEAF>
+2EBE1..2F7FF  ; Cn # [3103] <reserved-2EBE1>..<reserved-2F7FF>
+2FA1E..2FFFF  ; Cn # [1506] <reserved-2FA1E>..<noncharacter-2FFFF>
+3134B..E0000  ; Cn # [715958] <reserved-3134B>..<reserved-E0000>
+E0002..E001F  ; Cn #  [30] <reserved-E0002>..<reserved-E001F>
+E0080..E00FF  ; Cn # [128] <reserved-E0080>..<reserved-E00FF>
+E01F0..EFFFF  ; Cn # [65040] <reserved-E01F0>..<noncharacter-EFFFF>
+FFFFE..FFFFF  ; Cn #   [2] <noncharacter-FFFFE>..<noncharacter-FFFFF>
+10FFFE..10FFFF; Cn #   [2] <noncharacter-10FFFE>..<noncharacter-10FFFF>
+
+# Total code points: 830672
+
+# ================================================
+
+# General_Category=Uppercase_Letter
+
+0041..005A    ; Lu #  [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z
+00C0..00D6    ; Lu #  [23] LATIN CAPITAL LETTER A WITH GRAVE..LATIN CAPITAL LETTER O WITH DIAERESIS
+00D8..00DE    ; Lu #   [7] LATIN CAPITAL LETTER O WITH STROKE..LATIN CAPITAL LETTER THORN
+0100          ; Lu #       LATIN CAPITAL LETTER A WITH MACRON
+0102          ; Lu #       LATIN CAPITAL LETTER A WITH BREVE
+0104          ; Lu #       LATIN CAPITAL LETTER A WITH OGONEK
+0106          ; Lu #       LATIN CAPITAL LETTER C WITH ACUTE
+0108          ; Lu #       LATIN CAPITAL LETTER C WITH CIRCUMFLEX
+010A          ; Lu #       LATIN CAPITAL LETTER C WITH DOT ABOVE
+010C          ; Lu #       LATIN CAPITAL LETTER C WITH CARON
+010E          ; Lu #       LATIN CAPITAL LETTER D WITH CARON
+0110          ; Lu #       LATIN CAPITAL LETTER D WITH STROKE
+0112          ; Lu #       LATIN CAPITAL LETTER E WITH MACRON
+0114          ; Lu #       LATIN CAPITAL LETTER E WITH BREVE
+0116          ; Lu #       LATIN CAPITAL LETTER E WITH DOT ABOVE
+0118          ; Lu #       LATIN CAPITAL LETTER E WITH OGONEK
+011A          ; Lu #       LATIN CAPITAL LETTER E WITH CARON
+011C          ; Lu #       LATIN CAPITAL LETTER G WITH CIRCUMFLEX
+011E          ; Lu #       LATIN CAPITAL LETTER G WITH BREVE
+0120          ; Lu #       LATIN CAPITAL LETTER G WITH DOT ABOVE
+0122          ; Lu #       LATIN CAPITAL LETTER G WITH CEDILLA
+0124          ; Lu #       LATIN CAPITAL LETTER H WITH CIRCUMFLEX
+0126          ; Lu #       LATIN CAPITAL LETTER H WITH STROKE
+0128          ; Lu #       LATIN CAPITAL LETTER I WITH TILDE
+012A          ; Lu #       LATIN CAPITAL LETTER I WITH MACRON
+012C          ; Lu #       LATIN CAPITAL LETTER I WITH BREVE
+012E          ; Lu #       LATIN CAPITAL LETTER I WITH OGONEK
+0130          ; Lu #       LATIN CAPITAL LETTER I WITH DOT ABOVE
+0132          ; Lu #       LATIN CAPITAL LIGATURE IJ
+0134          ; Lu #       LATIN CAPITAL LETTER J WITH CIRCUMFLEX
+0136          ; Lu #       LATIN CAPITAL LETTER K WITH CEDILLA
+0139          ; Lu #       LATIN CAPITAL LETTER L WITH ACUTE
+013B          ; Lu #       LATIN CAPITAL LETTER L WITH CEDILLA
+013D          ; Lu #       LATIN CAPITAL LETTER L WITH CARON
+013F          ; Lu #       LATIN CAPITAL LETTER L WITH MIDDLE DOT
+0141          ; Lu #       LATIN CAPITAL LETTER L WITH STROKE
+0143          ; Lu #       LATIN CAPITAL LETTER N WITH ACUTE
+0145          ; Lu #       LATIN CAPITAL LETTER N WITH CEDILLA
+0147          ; Lu #       LATIN CAPITAL LETTER N WITH CARON
+014A          ; Lu #       LATIN CAPITAL LETTER ENG
+014C          ; Lu #       LATIN CAPITAL LETTER O WITH MACRON
+014E          ; Lu #       LATIN CAPITAL LETTER O WITH BREVE
+0150          ; Lu #       LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
+0152          ; Lu #       LATIN CAPITAL LIGATURE OE
+0154          ; Lu #       LATIN CAPITAL LETTER R WITH ACUTE
+0156          ; Lu #       LATIN CAPITAL LETTER R WITH CEDILLA
+0158          ; Lu #       LATIN CAPITAL LETTER R WITH CARON
+015A          ; Lu #       LATIN CAPITAL LETTER S WITH ACUTE
+015C          ; Lu #       LATIN CAPITAL LETTER S WITH CIRCUMFLEX
+015E          ; Lu #       LATIN CAPITAL LETTER S WITH CEDILLA
+0160          ; Lu #       LATIN CAPITAL LETTER S WITH CARON
+0162          ; Lu #       LATIN CAPITAL LETTER T WITH CEDILLA
+0164          ; Lu #       LATIN CAPITAL LETTER T WITH CARON
+0166          ; Lu #       LATIN CAPITAL LETTER T WITH STROKE
+0168          ; Lu #       LATIN CAPITAL LETTER U WITH TILDE
+016A          ; Lu #       LATIN CAPITAL LETTER U WITH MACRON
+016C          ; Lu #       LATIN CAPITAL LETTER U WITH BREVE
+016E          ; Lu #       LATIN CAPITAL LETTER U WITH RING ABOVE
+0170          ; Lu #       LATIN CAPITAL LETTER U WITH DOUBLE ACUTE
+0172          ; Lu #       LATIN CAPITAL LETTER U WITH OGONEK
+0174          ; Lu #       LATIN CAPITAL LETTER W WITH CIRCUMFLEX
+0176          ; Lu #       LATIN CAPITAL LETTER Y WITH CIRCUMFLEX
+0178..0179    ; Lu #   [2] LATIN CAPITAL LETTER Y WITH DIAERESIS..LATIN CAPITAL LETTER Z WITH ACUTE
+017B          ; Lu #       LATIN CAPITAL LETTER Z WITH DOT ABOVE
+017D          ; Lu #       LATIN CAPITAL LETTER Z WITH CARON
+0181..0182    ; Lu #   [2] LATIN CAPITAL LETTER B WITH HOOK..LATIN CAPITAL LETTER B WITH TOPBAR
+0184          ; Lu #       LATIN CAPITAL LETTER TONE SIX
+0186..0187    ; Lu #   [2] LATIN CAPITAL LETTER OPEN O..LATIN CAPITAL LETTER C WITH HOOK
+0189..018B    ; Lu #   [3] LATIN CAPITAL LETTER AFRICAN D..LATIN CAPITAL LETTER D WITH TOPBAR
+018E..0191    ; Lu #   [4] LATIN CAPITAL LETTER REVERSED E..LATIN CAPITAL LETTER F WITH HOOK
+0193..0194    ; Lu #   [2] LATIN CAPITAL LETTER G WITH HOOK..LATIN CAPITAL LETTER GAMMA
+0196..0198    ; Lu #   [3] LATIN CAPITAL LETTER IOTA..LATIN CAPITAL LETTER K WITH HOOK
+019C..019D    ; Lu #   [2] LATIN CAPITAL LETTER TURNED M..LATIN CAPITAL LETTER N WITH LEFT HOOK
+019F..01A0    ; Lu #   [2] LATIN CAPITAL LETTER O WITH MIDDLE TILDE..LATIN CAPITAL LETTER O WITH HORN
+01A2          ; Lu #       LATIN CAPITAL LETTER OI
+01A4          ; Lu #       LATIN CAPITAL LETTER P WITH HOOK
+01A6..01A7    ; Lu #   [2] LATIN LETTER YR..LATIN CAPITAL LETTER TONE TWO
+01A9          ; Lu #       LATIN CAPITAL LETTER ESH
+01AC          ; Lu #       LATIN CAPITAL LETTER T WITH HOOK
+01AE..01AF    ; Lu #   [2] LATIN CAPITAL LETTER T WITH RETROFLEX HOOK..LATIN CAPITAL LETTER U WITH HORN
+01B1..01B3    ; Lu #   [3] LATIN CAPITAL LETTER UPSILON..LATIN CAPITAL LETTER Y WITH HOOK
+01B5          ; Lu #       LATIN CAPITAL LETTER Z WITH STROKE
+01B7..01B8    ; Lu #   [2] LATIN CAPITAL LETTER EZH..LATIN CAPITAL LETTER EZH REVERSED
+01BC          ; Lu #       LATIN CAPITAL LETTER TONE FIVE
+01C4          ; Lu #       LATIN CAPITAL LETTER DZ WITH CARON
+01C7          ; Lu #       LATIN CAPITAL LETTER LJ
+01CA          ; Lu #       LATIN CAPITAL LETTER NJ
+01CD          ; Lu #       LATIN CAPITAL LETTER A WITH CARON
+01CF          ; Lu #       LATIN CAPITAL LETTER I WITH CARON
+01D1          ; Lu #       LATIN CAPITAL LETTER O WITH CARON
+01D3          ; Lu #       LATIN CAPITAL LETTER U WITH CARON
+01D5          ; Lu #       LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON
+01D7          ; Lu #       LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
+01D9          ; Lu #       LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
+01DB          ; Lu #       LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
+01DE          ; Lu #       LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
+01E0          ; Lu #       LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON
+01E2          ; Lu #       LATIN CAPITAL LETTER AE WITH MACRON
+01E4          ; Lu #       LATIN CAPITAL LETTER G WITH STROKE
+01E6          ; Lu #       LATIN CAPITAL LETTER G WITH CARON
+01E8          ; Lu #       LATIN CAPITAL LETTER K WITH CARON
+01EA          ; Lu #       LATIN CAPITAL LETTER O WITH OGONEK
+01EC          ; Lu #       LATIN CAPITAL LETTER O WITH OGONEK AND MACRON
+01EE          ; Lu #       LATIN CAPITAL LETTER EZH WITH CARON
+01F1          ; Lu #       LATIN CAPITAL LETTER DZ
+01F4          ; Lu #       LATIN CAPITAL LETTER G WITH ACUTE
+01F6..01F8    ; Lu #   [3] LATIN CAPITAL LETTER HWAIR..LATIN CAPITAL LETTER N WITH GRAVE
+01FA          ; Lu #       LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+01FC          ; Lu #       LATIN CAPITAL LETTER AE WITH ACUTE
+01FE          ; Lu #       LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
+0200          ; Lu #       LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+0202          ; Lu #       LATIN CAPITAL LETTER A WITH INVERTED BREVE
+0204          ; Lu #       LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+0206          ; Lu #       LATIN CAPITAL LETTER E WITH INVERTED BREVE
+0208          ; Lu #       LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+020A          ; Lu #       LATIN CAPITAL LETTER I WITH INVERTED BREVE
+020C          ; Lu #       LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+020E          ; Lu #       LATIN CAPITAL LETTER O WITH INVERTED BREVE
+0210          ; Lu #       LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+0212          ; Lu #       LATIN CAPITAL LETTER R WITH INVERTED BREVE
+0214          ; Lu #       LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+0216          ; Lu #       LATIN CAPITAL LETTER U WITH INVERTED BREVE
+0218          ; Lu #       LATIN CAPITAL LETTER S WITH COMMA BELOW
+021A          ; Lu #       LATIN CAPITAL LETTER T WITH COMMA BELOW
+021C          ; Lu #       LATIN CAPITAL LETTER YOGH
+021E          ; Lu #       LATIN CAPITAL LETTER H WITH CARON
+0220          ; Lu #       LATIN CAPITAL LETTER N WITH LONG RIGHT LEG
+0222          ; Lu #       LATIN CAPITAL LETTER OU
+0224          ; Lu #       LATIN CAPITAL LETTER Z WITH HOOK
+0226          ; Lu #       LATIN CAPITAL LETTER A WITH DOT ABOVE
+0228          ; Lu #       LATIN CAPITAL LETTER E WITH CEDILLA
+022A          ; Lu #       LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON
+022C          ; Lu #       LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+022E          ; Lu #       LATIN CAPITAL LETTER O WITH DOT ABOVE
+0230          ; Lu #       LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON
+0232          ; Lu #       LATIN CAPITAL LETTER Y WITH MACRON
+023A..023B    ; Lu #   [2] LATIN CAPITAL LETTER A WITH STROKE..LATIN CAPITAL LETTER C WITH STROKE
+023D..023E    ; Lu #   [2] LATIN CAPITAL LETTER L WITH BAR..LATIN CAPITAL LETTER T WITH DIAGONAL STROKE
+0241          ; Lu #       LATIN CAPITAL LETTER GLOTTAL STOP
+0243..0246    ; Lu #   [4] LATIN CAPITAL LETTER B WITH STROKE..LATIN CAPITAL LETTER E WITH STROKE
+0248          ; Lu #       LATIN CAPITAL LETTER J WITH STROKE
+024A          ; Lu #       LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL
+024C          ; Lu #       LATIN CAPITAL LETTER R WITH STROKE
+024E          ; Lu #       LATIN CAPITAL LETTER Y WITH STROKE
+0370          ; Lu #       GREEK CAPITAL LETTER HETA
+0372          ; Lu #       GREEK CAPITAL LETTER ARCHAIC SAMPI
+0376          ; Lu #       GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
+037F          ; Lu #       GREEK CAPITAL LETTER YOT
+0386          ; Lu #       GREEK CAPITAL LETTER ALPHA WITH TONOS
+0388..038A    ; Lu #   [3] GREEK CAPITAL LETTER EPSILON WITH TONOS..GREEK CAPITAL LETTER IOTA WITH TONOS
+038C          ; Lu #       GREEK CAPITAL LETTER OMICRON WITH TONOS
+038E..038F    ; Lu #   [2] GREEK CAPITAL LETTER UPSILON WITH TONOS..GREEK CAPITAL LETTER OMEGA WITH TONOS
+0391..03A1    ; Lu #  [17] GREEK CAPITAL LETTER ALPHA..GREEK CAPITAL LETTER RHO
+03A3..03AB    ; Lu #   [9] GREEK CAPITAL LETTER SIGMA..GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
+03CF          ; Lu #       GREEK CAPITAL KAI SYMBOL
+03D2..03D4    ; Lu #   [3] GREEK UPSILON WITH HOOK SYMBOL..GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL
+03D8          ; Lu #       GREEK LETTER ARCHAIC KOPPA
+03DA          ; Lu #       GREEK LETTER STIGMA
+03DC          ; Lu #       GREEK LETTER DIGAMMA
+03DE          ; Lu #       GREEK LETTER KOPPA
+03E0          ; Lu #       GREEK LETTER SAMPI
+03E2          ; Lu #       COPTIC CAPITAL LETTER SHEI
+03E4          ; Lu #       COPTIC CAPITAL LETTER FEI
+03E6          ; Lu #       COPTIC CAPITAL LETTER KHEI
+03E8          ; Lu #       COPTIC CAPITAL LETTER HORI
+03EA          ; Lu #       COPTIC CAPITAL LETTER GANGIA
+03EC          ; Lu #       COPTIC CAPITAL LETTER SHIMA
+03EE          ; Lu #       COPTIC CAPITAL LETTER DEI
+03F4          ; Lu #       GREEK CAPITAL THETA SYMBOL
+03F7          ; Lu #       GREEK CAPITAL LETTER SHO
+03F9..03FA    ; Lu #   [2] GREEK CAPITAL LUNATE SIGMA SYMBOL..GREEK CAPITAL LETTER SAN
+03FD..042F    ; Lu #  [51] GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL..CYRILLIC CAPITAL LETTER YA
+0460          ; Lu #       CYRILLIC CAPITAL LETTER OMEGA
+0462          ; Lu #       CYRILLIC CAPITAL LETTER YAT
+0464          ; Lu #       CYRILLIC CAPITAL LETTER IOTIFIED E
+0466          ; Lu #       CYRILLIC CAPITAL LETTER LITTLE YUS
+0468          ; Lu #       CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
+046A          ; Lu #       CYRILLIC CAPITAL LETTER BIG YUS
+046C          ; Lu #       CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
+046E          ; Lu #       CYRILLIC CAPITAL LETTER KSI
+0470          ; Lu #       CYRILLIC CAPITAL LETTER PSI
+0472          ; Lu #       CYRILLIC CAPITAL LETTER FITA
+0474          ; Lu #       CYRILLIC CAPITAL LETTER IZHITSA
+0476          ; Lu #       CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0478          ; Lu #       CYRILLIC CAPITAL LETTER UK
+047A          ; Lu #       CYRILLIC CAPITAL LETTER ROUND OMEGA
+047C          ; Lu #       CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
+047E          ; Lu #       CYRILLIC CAPITAL LETTER OT
+0480          ; Lu #       CYRILLIC CAPITAL LETTER KOPPA
+048A          ; Lu #       CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
+048C          ; Lu #       CYRILLIC CAPITAL LETTER SEMISOFT SIGN
+048E          ; Lu #       CYRILLIC CAPITAL LETTER ER WITH TICK
+0490          ; Lu #       CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0492          ; Lu #       CYRILLIC CAPITAL LETTER GHE WITH STROKE
+0494          ; Lu #       CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
+0496          ; Lu #       CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
+0498          ; Lu #       CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
+049A          ; Lu #       CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+049C          ; Lu #       CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
+049E          ; Lu #       CYRILLIC CAPITAL LETTER KA WITH STROKE
+04A0          ; Lu #       CYRILLIC CAPITAL LETTER BASHKIR KA
+04A2          ; Lu #       CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+04A4          ; Lu #       CYRILLIC CAPITAL LIGATURE EN GHE
+04A6          ; Lu #       CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
+04A8          ; Lu #       CYRILLIC CAPITAL LETTER ABKHASIAN HA
+04AA          ; Lu #       CYRILLIC CAPITAL LETTER ES WITH DESCENDER
+04AC          ; Lu #       CYRILLIC CAPITAL LETTER TE WITH DESCENDER
+04AE          ; Lu #       CYRILLIC CAPITAL LETTER STRAIGHT U
+04B0          ; Lu #       CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+04B2          ; Lu #       CYRILLIC CAPITAL LETTER HA WITH DESCENDER
+04B4          ; Lu #       CYRILLIC CAPITAL LIGATURE TE TSE
+04B6          ; Lu #       CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
+04B8          ; Lu #       CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
+04BA          ; Lu #       CYRILLIC CAPITAL LETTER SHHA
+04BC          ; Lu #       CYRILLIC CAPITAL LETTER ABKHASIAN CHE
+04BE          ; Lu #       CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
+04C0..04C1    ; Lu #   [2] CYRILLIC LETTER PALOCHKA..CYRILLIC CAPITAL LETTER ZHE WITH BREVE
+04C3          ; Lu #       CYRILLIC CAPITAL LETTER KA WITH HOOK
+04C5          ; Lu #       CYRILLIC CAPITAL LETTER EL WITH TAIL
+04C7          ; Lu #       CYRILLIC CAPITAL LETTER EN WITH HOOK
+04C9          ; Lu #       CYRILLIC CAPITAL LETTER EN WITH TAIL
+04CB          ; Lu #       CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
+04CD          ; Lu #       CYRILLIC CAPITAL LETTER EM WITH TAIL
+04D0          ; Lu #       CYRILLIC CAPITAL LETTER A WITH BREVE
+04D2          ; Lu #       CYRILLIC CAPITAL LETTER A WITH DIAERESIS
+04D4          ; Lu #       CYRILLIC CAPITAL LIGATURE A IE
+04D6          ; Lu #       CYRILLIC CAPITAL LETTER IE WITH BREVE
+04D8          ; Lu #       CYRILLIC CAPITAL LETTER SCHWA
+04DA          ; Lu #       CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
+04DC          ; Lu #       CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
+04DE          ; Lu #       CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
+04E0          ; Lu #       CYRILLIC CAPITAL LETTER ABKHASIAN DZE
+04E2          ; Lu #       CYRILLIC CAPITAL LETTER I WITH MACRON
+04E4          ; Lu #       CYRILLIC CAPITAL LETTER I WITH DIAERESIS
+04E6          ; Lu #       CYRILLIC CAPITAL LETTER O WITH DIAERESIS
+04E8          ; Lu #       CYRILLIC CAPITAL LETTER BARRED O
+04EA          ; Lu #       CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
+04EC          ; Lu #       CYRILLIC CAPITAL LETTER E WITH DIAERESIS
+04EE          ; Lu #       CYRILLIC CAPITAL LETTER U WITH MACRON
+04F0          ; Lu #       CYRILLIC CAPITAL LETTER U WITH DIAERESIS
+04F2          ; Lu #       CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
+04F4          ; Lu #       CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
+04F6          ; Lu #       CYRILLIC CAPITAL LETTER GHE WITH DESCENDER
+04F8          ; Lu #       CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
+04FA          ; Lu #       CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK
+04FC          ; Lu #       CYRILLIC CAPITAL LETTER HA WITH HOOK
+04FE          ; Lu #       CYRILLIC CAPITAL LETTER HA WITH STROKE
+0500          ; Lu #       CYRILLIC CAPITAL LETTER KOMI DE
+0502          ; Lu #       CYRILLIC CAPITAL LETTER KOMI DJE
+0504          ; Lu #       CYRILLIC CAPITAL LETTER KOMI ZJE
+0506          ; Lu #       CYRILLIC CAPITAL LETTER KOMI DZJE
+0508          ; Lu #       CYRILLIC CAPITAL LETTER KOMI LJE
+050A          ; Lu #       CYRILLIC CAPITAL LETTER KOMI NJE
+050C          ; Lu #       CYRILLIC CAPITAL LETTER KOMI SJE
+050E          ; Lu #       CYRILLIC CAPITAL LETTER KOMI TJE
+0510          ; Lu #       CYRILLIC CAPITAL LETTER REVERSED ZE
+0512          ; Lu #       CYRILLIC CAPITAL LETTER EL WITH HOOK
+0514          ; Lu #       CYRILLIC CAPITAL LETTER LHA
+0516          ; Lu #       CYRILLIC CAPITAL LETTER RHA
+0518          ; Lu #       CYRILLIC CAPITAL LETTER YAE
+051A          ; Lu #       CYRILLIC CAPITAL LETTER QA
+051C          ; Lu #       CYRILLIC CAPITAL LETTER WE
+051E          ; Lu #       CYRILLIC CAPITAL LETTER ALEUT KA
+0520          ; Lu #       CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK
+0522          ; Lu #       CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK
+0524          ; Lu #       CYRILLIC CAPITAL LETTER PE WITH DESCENDER
+0526          ; Lu #       CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER
+0528          ; Lu #       CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK
+052A          ; Lu #       CYRILLIC CAPITAL LETTER DZZHE
+052C          ; Lu #       CYRILLIC CAPITAL LETTER DCHE
+052E          ; Lu #       CYRILLIC CAPITAL LETTER EL WITH DESCENDER
+0531..0556    ; Lu #  [38] ARMENIAN CAPITAL LETTER AYB..ARMENIAN CAPITAL LETTER FEH
+10A0..10C5    ; Lu #  [38] GEORGIAN CAPITAL LETTER AN..GEORGIAN CAPITAL LETTER HOE
+10C7          ; Lu #       GEORGIAN CAPITAL LETTER YN
+10CD          ; Lu #       GEORGIAN CAPITAL LETTER AEN
+13A0..13F5    ; Lu #  [86] CHEROKEE LETTER A..CHEROKEE LETTER MV
+1C90..1CBA    ; Lu #  [43] GEORGIAN MTAVRULI CAPITAL LETTER AN..GEORGIAN MTAVRULI CAPITAL LETTER AIN
+1CBD..1CBF    ; Lu #   [3] GEORGIAN MTAVRULI CAPITAL LETTER AEN..GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN
+1E00          ; Lu #       LATIN CAPITAL LETTER A WITH RING BELOW
+1E02          ; Lu #       LATIN CAPITAL LETTER B WITH DOT ABOVE
+1E04          ; Lu #       LATIN CAPITAL LETTER B WITH DOT BELOW
+1E06          ; Lu #       LATIN CAPITAL LETTER B WITH LINE BELOW
+1E08          ; Lu #       LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+1E0A          ; Lu #       LATIN CAPITAL LETTER D WITH DOT ABOVE
+1E0C          ; Lu #       LATIN CAPITAL LETTER D WITH DOT BELOW
+1E0E          ; Lu #       LATIN CAPITAL LETTER D WITH LINE BELOW
+1E10          ; Lu #       LATIN CAPITAL LETTER D WITH CEDILLA
+1E12          ; Lu #       LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
+1E14          ; Lu #       LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
+1E16          ; Lu #       LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
+1E18          ; Lu #       LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
+1E1A          ; Lu #       LATIN CAPITAL LETTER E WITH TILDE BELOW
+1E1C          ; Lu #       LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
+1E1E          ; Lu #       LATIN CAPITAL LETTER F WITH DOT ABOVE
+1E20          ; Lu #       LATIN CAPITAL LETTER G WITH MACRON
+1E22          ; Lu #       LATIN CAPITAL LETTER H WITH DOT ABOVE
+1E24          ; Lu #       LATIN CAPITAL LETTER H WITH DOT BELOW
+1E26          ; Lu #       LATIN CAPITAL LETTER H WITH DIAERESIS
+1E28          ; Lu #       LATIN CAPITAL LETTER H WITH CEDILLA
+1E2A          ; Lu #       LATIN CAPITAL LETTER H WITH BREVE BELOW
+1E2C          ; Lu #       LATIN CAPITAL LETTER I WITH TILDE BELOW
+1E2E          ; Lu #       LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
+1E30          ; Lu #       LATIN CAPITAL LETTER K WITH ACUTE
+1E32          ; Lu #       LATIN CAPITAL LETTER K WITH DOT BELOW
+1E34          ; Lu #       LATIN CAPITAL LETTER K WITH LINE BELOW
+1E36          ; Lu #       LATIN CAPITAL LETTER L WITH DOT BELOW
+1E38          ; Lu #       LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
+1E3A          ; Lu #       LATIN CAPITAL LETTER L WITH LINE BELOW
+1E3C          ; Lu #       LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
+1E3E          ; Lu #       LATIN CAPITAL LETTER M WITH ACUTE
+1E40          ; Lu #       LATIN CAPITAL LETTER M WITH DOT ABOVE
+1E42          ; Lu #       LATIN CAPITAL LETTER M WITH DOT BELOW
+1E44          ; Lu #       LATIN CAPITAL LETTER N WITH DOT ABOVE
+1E46          ; Lu #       LATIN CAPITAL LETTER N WITH DOT BELOW
+1E48          ; Lu #       LATIN CAPITAL LETTER N WITH LINE BELOW
+1E4A          ; Lu #       LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
+1E4C          ; Lu #       LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
+1E4E          ; Lu #       LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
+1E50          ; Lu #       LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
+1E52          ; Lu #       LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
+1E54          ; Lu #       LATIN CAPITAL LETTER P WITH ACUTE
+1E56          ; Lu #       LATIN CAPITAL LETTER P WITH DOT ABOVE
+1E58          ; Lu #       LATIN CAPITAL LETTER R WITH DOT ABOVE
+1E5A          ; Lu #       LATIN CAPITAL LETTER R WITH DOT BELOW
+1E5C          ; Lu #       LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
+1E5E          ; Lu #       LATIN CAPITAL LETTER R WITH LINE BELOW
+1E60          ; Lu #       LATIN CAPITAL LETTER S WITH DOT ABOVE
+1E62          ; Lu #       LATIN CAPITAL LETTER S WITH DOT BELOW
+1E64          ; Lu #       LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
+1E66          ; Lu #       LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+1E68          ; Lu #       LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
+1E6A          ; Lu #       LATIN CAPITAL LETTER T WITH DOT ABOVE
+1E6C          ; Lu #       LATIN CAPITAL LETTER T WITH DOT BELOW
+1E6E          ; Lu #       LATIN CAPITAL LETTER T WITH LINE BELOW
+1E70          ; Lu #       LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
+1E72          ; Lu #       LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
+1E74          ; Lu #       LATIN CAPITAL LETTER U WITH TILDE BELOW
+1E76          ; Lu #       LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
+1E78          ; Lu #       LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
+1E7A          ; Lu #       LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
+1E7C          ; Lu #       LATIN CAPITAL LETTER V WITH TILDE
+1E7E          ; Lu #       LATIN CAPITAL LETTER V WITH DOT BELOW
+1E80          ; Lu #       LATIN CAPITAL LETTER W WITH GRAVE
+1E82          ; Lu #       LATIN CAPITAL LETTER W WITH ACUTE
+1E84          ; Lu #       LATIN CAPITAL LETTER W WITH DIAERESIS
+1E86          ; Lu #       LATIN CAPITAL LETTER W WITH DOT ABOVE
+1E88          ; Lu #       LATIN CAPITAL LETTER W WITH DOT BELOW
+1E8A          ; Lu #       LATIN CAPITAL LETTER X WITH DOT ABOVE
+1E8C          ; Lu #       LATIN CAPITAL LETTER X WITH DIAERESIS
+1E8E          ; Lu #       LATIN CAPITAL LETTER Y WITH DOT ABOVE
+1E90          ; Lu #       LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
+1E92          ; Lu #       LATIN CAPITAL LETTER Z WITH DOT BELOW
+1E94          ; Lu #       LATIN CAPITAL LETTER Z WITH LINE BELOW
+1E9E          ; Lu #       LATIN CAPITAL LETTER SHARP S
+1EA0          ; Lu #       LATIN CAPITAL LETTER A WITH DOT BELOW
+1EA2          ; Lu #       LATIN CAPITAL LETTER A WITH HOOK ABOVE
+1EA4          ; Lu #       LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
+1EA6          ; Lu #       LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
+1EA8          ; Lu #       LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+1EAA          ; Lu #       LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
+1EAC          ; Lu #       LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+1EAE          ; Lu #       LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+1EB0          ; Lu #       LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+1EB2          ; Lu #       LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+1EB4          ; Lu #       LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+1EB6          ; Lu #       LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+1EB8          ; Lu #       LATIN CAPITAL LETTER E WITH DOT BELOW
+1EBA          ; Lu #       LATIN CAPITAL LETTER E WITH HOOK ABOVE
+1EBC          ; Lu #       LATIN CAPITAL LETTER E WITH TILDE
+1EBE          ; Lu #       LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
+1EC0          ; Lu #       LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
+1EC2          ; Lu #       LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+1EC4          ; Lu #       LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
+1EC6          ; Lu #       LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+1EC8          ; Lu #       LATIN CAPITAL LETTER I WITH HOOK ABOVE
+1ECA          ; Lu #       LATIN CAPITAL LETTER I WITH DOT BELOW
+1ECC          ; Lu #       LATIN CAPITAL LETTER O WITH DOT BELOW
+1ECE          ; Lu #       LATIN CAPITAL LETTER O WITH HOOK ABOVE
+1ED0          ; Lu #       LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
+1ED2          ; Lu #       LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
+1ED4          ; Lu #       LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+1ED6          ; Lu #       LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
+1ED8          ; Lu #       LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+1EDA          ; Lu #       LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+1EDC          ; Lu #       LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+1EDE          ; Lu #       LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+1EE0          ; Lu #       LATIN CAPITAL LETTER O WITH HORN AND TILDE
+1EE2          ; Lu #       LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+1EE4          ; Lu #       LATIN CAPITAL LETTER U WITH DOT BELOW
+1EE6          ; Lu #       LATIN CAPITAL LETTER U WITH HOOK ABOVE
+1EE8          ; Lu #       LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+1EEA          ; Lu #       LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+1EEC          ; Lu #       LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+1EEE          ; Lu #       LATIN CAPITAL LETTER U WITH HORN AND TILDE
+1EF0          ; Lu #       LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+1EF2          ; Lu #       LATIN CAPITAL LETTER Y WITH GRAVE
+1EF4          ; Lu #       LATIN CAPITAL LETTER Y WITH DOT BELOW
+1EF6          ; Lu #       LATIN CAPITAL LETTER Y WITH HOOK ABOVE
+1EF8          ; Lu #       LATIN CAPITAL LETTER Y WITH TILDE
+1EFA          ; Lu #       LATIN CAPITAL LETTER MIDDLE-WELSH LL
+1EFC          ; Lu #       LATIN CAPITAL LETTER MIDDLE-WELSH V
+1EFE          ; Lu #       LATIN CAPITAL LETTER Y WITH LOOP
+1F08..1F0F    ; Lu #   [8] GREEK CAPITAL LETTER ALPHA WITH PSILI..GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
+1F18..1F1D    ; Lu #   [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
+1F28..1F2F    ; Lu #   [8] GREEK CAPITAL LETTER ETA WITH PSILI..GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
+1F38..1F3F    ; Lu #   [8] GREEK CAPITAL LETTER IOTA WITH PSILI..GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
+1F48..1F4D    ; Lu #   [6] GREEK CAPITAL LETTER OMICRON WITH PSILI..GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
+1F59          ; Lu #       GREEK CAPITAL LETTER UPSILON WITH DASIA
+1F5B          ; Lu #       GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
+1F5D          ; Lu #       GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
+1F5F          ; Lu #       GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
+1F68..1F6F    ; Lu #   [8] GREEK CAPITAL LETTER OMEGA WITH PSILI..GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
+1FB8..1FBB    ; Lu #   [4] GREEK CAPITAL LETTER ALPHA WITH VRACHY..GREEK CAPITAL LETTER ALPHA WITH OXIA
+1FC8..1FCB    ; Lu #   [4] GREEK CAPITAL LETTER EPSILON WITH VARIA..GREEK CAPITAL LETTER ETA WITH OXIA
+1FD8..1FDB    ; Lu #   [4] GREEK CAPITAL LETTER IOTA WITH VRACHY..GREEK CAPITAL LETTER IOTA WITH OXIA
+1FE8..1FEC    ; Lu #   [5] GREEK CAPITAL LETTER UPSILON WITH VRACHY..GREEK CAPITAL LETTER RHO WITH DASIA
+1FF8..1FFB    ; Lu #   [4] GREEK CAPITAL LETTER OMICRON WITH VARIA..GREEK CAPITAL LETTER OMEGA WITH OXIA
+2102          ; Lu #       DOUBLE-STRUCK CAPITAL C
+2107          ; Lu #       EULER CONSTANT
+210B..210D    ; Lu #   [3] SCRIPT CAPITAL H..DOUBLE-STRUCK CAPITAL H
+2110..2112    ; Lu #   [3] SCRIPT CAPITAL I..SCRIPT CAPITAL L
+2115          ; Lu #       DOUBLE-STRUCK CAPITAL N
+2119..211D    ; Lu #   [5] DOUBLE-STRUCK CAPITAL P..DOUBLE-STRUCK CAPITAL R
+2124          ; Lu #       DOUBLE-STRUCK CAPITAL Z
+2126          ; Lu #       OHM SIGN
+2128          ; Lu #       BLACK-LETTER CAPITAL Z
+212A..212D    ; Lu #   [4] KELVIN SIGN..BLACK-LETTER CAPITAL C
+2130..2133    ; Lu #   [4] SCRIPT CAPITAL E..SCRIPT CAPITAL M
+213E..213F    ; Lu #   [2] DOUBLE-STRUCK CAPITAL GAMMA..DOUBLE-STRUCK CAPITAL PI
+2145          ; Lu #       DOUBLE-STRUCK ITALIC CAPITAL D
+2183          ; Lu #       ROMAN NUMERAL REVERSED ONE HUNDRED
+2C00..2C2E    ; Lu #  [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE
+2C60          ; Lu #       LATIN CAPITAL LETTER L WITH DOUBLE BAR
+2C62..2C64    ; Lu #   [3] LATIN CAPITAL LETTER L WITH MIDDLE TILDE..LATIN CAPITAL LETTER R WITH TAIL
+2C67          ; Lu #       LATIN CAPITAL LETTER H WITH DESCENDER
+2C69          ; Lu #       LATIN CAPITAL LETTER K WITH DESCENDER
+2C6B          ; Lu #       LATIN CAPITAL LETTER Z WITH DESCENDER
+2C6D..2C70    ; Lu #   [4] LATIN CAPITAL LETTER ALPHA..LATIN CAPITAL LETTER TURNED ALPHA
+2C72          ; Lu #       LATIN CAPITAL LETTER W WITH HOOK
+2C75          ; Lu #       LATIN CAPITAL LETTER HALF H
+2C7E..2C80    ; Lu #   [3] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC CAPITAL LETTER ALFA
+2C82          ; Lu #       COPTIC CAPITAL LETTER VIDA
+2C84          ; Lu #       COPTIC CAPITAL LETTER GAMMA
+2C86          ; Lu #       COPTIC CAPITAL LETTER DALDA
+2C88          ; Lu #       COPTIC CAPITAL LETTER EIE
+2C8A          ; Lu #       COPTIC CAPITAL LETTER SOU
+2C8C          ; Lu #       COPTIC CAPITAL LETTER ZATA
+2C8E          ; Lu #       COPTIC CAPITAL LETTER HATE
+2C90          ; Lu #       COPTIC CAPITAL LETTER THETHE
+2C92          ; Lu #       COPTIC CAPITAL LETTER IAUDA
+2C94          ; Lu #       COPTIC CAPITAL LETTER KAPA
+2C96          ; Lu #       COPTIC CAPITAL LETTER LAULA
+2C98          ; Lu #       COPTIC CAPITAL LETTER MI
+2C9A          ; Lu #       COPTIC CAPITAL LETTER NI
+2C9C          ; Lu #       COPTIC CAPITAL LETTER KSI
+2C9E          ; Lu #       COPTIC CAPITAL LETTER O
+2CA0          ; Lu #       COPTIC CAPITAL LETTER PI
+2CA2          ; Lu #       COPTIC CAPITAL LETTER RO
+2CA4          ; Lu #       COPTIC CAPITAL LETTER SIMA
+2CA6          ; Lu #       COPTIC CAPITAL LETTER TAU
+2CA8          ; Lu #       COPTIC CAPITAL LETTER UA
+2CAA          ; Lu #       COPTIC CAPITAL LETTER FI
+2CAC          ; Lu #       COPTIC CAPITAL LETTER KHI
+2CAE          ; Lu #       COPTIC CAPITAL LETTER PSI
+2CB0          ; Lu #       COPTIC CAPITAL LETTER OOU
+2CB2          ; Lu #       COPTIC CAPITAL LETTER DIALECT-P ALEF
+2CB4          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC AIN
+2CB6          ; Lu #       COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE
+2CB8          ; Lu #       COPTIC CAPITAL LETTER DIALECT-P KAPA
+2CBA          ; Lu #       COPTIC CAPITAL LETTER DIALECT-P NI
+2CBC          ; Lu #       COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI
+2CBE          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC OOU
+2CC0          ; Lu #       COPTIC CAPITAL LETTER SAMPI
+2CC2          ; Lu #       COPTIC CAPITAL LETTER CROSSED SHEI
+2CC4          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC SHEI
+2CC6          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC ESH
+2CC8          ; Lu #       COPTIC CAPITAL LETTER AKHMIMIC KHEI
+2CCA          ; Lu #       COPTIC CAPITAL LETTER DIALECT-P HORI
+2CCC          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC HORI
+2CCE          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC HA
+2CD0          ; Lu #       COPTIC CAPITAL LETTER L-SHAPED HA
+2CD2          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC HEI
+2CD4          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC HAT
+2CD6          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC GANGIA
+2CD8          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC DJA
+2CDA          ; Lu #       COPTIC CAPITAL LETTER OLD COPTIC SHIMA
+2CDC          ; Lu #       COPTIC CAPITAL LETTER OLD NUBIAN SHIMA
+2CDE          ; Lu #       COPTIC CAPITAL LETTER OLD NUBIAN NGI
+2CE0          ; Lu #       COPTIC CAPITAL LETTER OLD NUBIAN NYI
+2CE2          ; Lu #       COPTIC CAPITAL LETTER OLD NUBIAN WAU
+2CEB          ; Lu #       COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI
+2CED          ; Lu #       COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA
+2CF2          ; Lu #       COPTIC CAPITAL LETTER BOHAIRIC KHEI
+A640          ; Lu #       CYRILLIC CAPITAL LETTER ZEMLYA
+A642          ; Lu #       CYRILLIC CAPITAL LETTER DZELO
+A644          ; Lu #       CYRILLIC CAPITAL LETTER REVERSED DZE
+A646          ; Lu #       CYRILLIC CAPITAL LETTER IOTA
+A648          ; Lu #       CYRILLIC CAPITAL LETTER DJERV
+A64A          ; Lu #       CYRILLIC CAPITAL LETTER MONOGRAPH UK
+A64C          ; Lu #       CYRILLIC CAPITAL LETTER BROAD OMEGA
+A64E          ; Lu #       CYRILLIC CAPITAL LETTER NEUTRAL YER
+A650          ; Lu #       CYRILLIC CAPITAL LETTER YERU WITH BACK YER
+A652          ; Lu #       CYRILLIC CAPITAL LETTER IOTIFIED YAT
+A654          ; Lu #       CYRILLIC CAPITAL LETTER REVERSED YU
+A656          ; Lu #       CYRILLIC CAPITAL LETTER IOTIFIED A
+A658          ; Lu #       CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS
+A65A          ; Lu #       CYRILLIC CAPITAL LETTER BLENDED YUS
+A65C          ; Lu #       CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS
+A65E          ; Lu #       CYRILLIC CAPITAL LETTER YN
+A660          ; Lu #       CYRILLIC CAPITAL LETTER REVERSED TSE
+A662          ; Lu #       CYRILLIC CAPITAL LETTER SOFT DE
+A664          ; Lu #       CYRILLIC CAPITAL LETTER SOFT EL
+A666          ; Lu #       CYRILLIC CAPITAL LETTER SOFT EM
+A668          ; Lu #       CYRILLIC CAPITAL LETTER MONOCULAR O
+A66A          ; Lu #       CYRILLIC CAPITAL LETTER BINOCULAR O
+A66C          ; Lu #       CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O
+A680          ; Lu #       CYRILLIC CAPITAL LETTER DWE
+A682          ; Lu #       CYRILLIC CAPITAL LETTER DZWE
+A684          ; Lu #       CYRILLIC CAPITAL LETTER ZHWE
+A686          ; Lu #       CYRILLIC CAPITAL LETTER CCHE
+A688          ; Lu #       CYRILLIC CAPITAL LETTER DZZE
+A68A          ; Lu #       CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK
+A68C          ; Lu #       CYRILLIC CAPITAL LETTER TWE
+A68E          ; Lu #       CYRILLIC CAPITAL LETTER TSWE
+A690          ; Lu #       CYRILLIC CAPITAL LETTER TSSE
+A692          ; Lu #       CYRILLIC CAPITAL LETTER TCHE
+A694          ; Lu #       CYRILLIC CAPITAL LETTER HWE
+A696          ; Lu #       CYRILLIC CAPITAL LETTER SHWE
+A698          ; Lu #       CYRILLIC CAPITAL LETTER DOUBLE O
+A69A          ; Lu #       CYRILLIC CAPITAL LETTER CROSSED O
+A722          ; Lu #       LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF
+A724          ; Lu #       LATIN CAPITAL LETTER EGYPTOLOGICAL AIN
+A726          ; Lu #       LATIN CAPITAL LETTER HENG
+A728          ; Lu #       LATIN CAPITAL LETTER TZ
+A72A          ; Lu #       LATIN CAPITAL LETTER TRESILLO
+A72C          ; Lu #       LATIN CAPITAL LETTER CUATRILLO
+A72E          ; Lu #       LATIN CAPITAL LETTER CUATRILLO WITH COMMA
+A732          ; Lu #       LATIN CAPITAL LETTER AA
+A734          ; Lu #       LATIN CAPITAL LETTER AO
+A736          ; Lu #       LATIN CAPITAL LETTER AU
+A738          ; Lu #       LATIN CAPITAL LETTER AV
+A73A          ; Lu #       LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR
+A73C          ; Lu #       LATIN CAPITAL LETTER AY
+A73E          ; Lu #       LATIN CAPITAL LETTER REVERSED C WITH DOT
+A740          ; Lu #       LATIN CAPITAL LETTER K WITH STROKE
+A742          ; Lu #       LATIN CAPITAL LETTER K WITH DIAGONAL STROKE
+A744          ; Lu #       LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE
+A746          ; Lu #       LATIN CAPITAL LETTER BROKEN L
+A748          ; Lu #       LATIN CAPITAL LETTER L WITH HIGH STROKE
+A74A          ; Lu #       LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY
+A74C          ; Lu #       LATIN CAPITAL LETTER O WITH LOOP
+A74E          ; Lu #       LATIN CAPITAL LETTER OO
+A750          ; Lu #       LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER
+A752          ; Lu #       LATIN CAPITAL LETTER P WITH FLOURISH
+A754          ; Lu #       LATIN CAPITAL LETTER P WITH SQUIRREL TAIL
+A756          ; Lu #       LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER
+A758          ; Lu #       LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE
+A75A          ; Lu #       LATIN CAPITAL LETTER R ROTUNDA
+A75C          ; Lu #       LATIN CAPITAL LETTER RUM ROTUNDA
+A75E          ; Lu #       LATIN CAPITAL LETTER V WITH DIAGONAL STROKE
+A760          ; Lu #       LATIN CAPITAL LETTER VY
+A762          ; Lu #       LATIN CAPITAL LETTER VISIGOTHIC Z
+A764          ; Lu #       LATIN CAPITAL LETTER THORN WITH STROKE
+A766          ; Lu #       LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER
+A768          ; Lu #       LATIN CAPITAL LETTER VEND
+A76A          ; Lu #       LATIN CAPITAL LETTER ET
+A76C          ; Lu #       LATIN CAPITAL LETTER IS
+A76E          ; Lu #       LATIN CAPITAL LETTER CON
+A779          ; Lu #       LATIN CAPITAL LETTER INSULAR D
+A77B          ; Lu #       LATIN CAPITAL LETTER INSULAR F
+A77D..A77E    ; Lu #   [2] LATIN CAPITAL LETTER INSULAR G..LATIN CAPITAL LETTER TURNED INSULAR G
+A780          ; Lu #       LATIN CAPITAL LETTER TURNED L
+A782          ; Lu #       LATIN CAPITAL LETTER INSULAR R
+A784          ; Lu #       LATIN CAPITAL LETTER INSULAR S
+A786          ; Lu #       LATIN CAPITAL LETTER INSULAR T
+A78B          ; Lu #       LATIN CAPITAL LETTER SALTILLO
+A78D          ; Lu #       LATIN CAPITAL LETTER TURNED H
+A790          ; Lu #       LATIN CAPITAL LETTER N WITH DESCENDER
+A792          ; Lu #       LATIN CAPITAL LETTER C WITH BAR
+A796          ; Lu #       LATIN CAPITAL LETTER B WITH FLOURISH
+A798          ; Lu #       LATIN CAPITAL LETTER F WITH STROKE
+A79A          ; Lu #       LATIN CAPITAL LETTER VOLAPUK AE
+A79C          ; Lu #       LATIN CAPITAL LETTER VOLAPUK OE
+A79E          ; Lu #       LATIN CAPITAL LETTER VOLAPUK UE
+A7A0          ; Lu #       LATIN CAPITAL LETTER G WITH OBLIQUE STROKE
+A7A2          ; Lu #       LATIN CAPITAL LETTER K WITH OBLIQUE STROKE
+A7A4          ; Lu #       LATIN CAPITAL LETTER N WITH OBLIQUE STROKE
+A7A6          ; Lu #       LATIN CAPITAL LETTER R WITH OBLIQUE STROKE
+A7A8          ; Lu #       LATIN CAPITAL LETTER S WITH OBLIQUE STROKE
+A7AA..A7AE    ; Lu #   [5] LATIN CAPITAL LETTER H WITH HOOK..LATIN CAPITAL LETTER SMALL CAPITAL I
+A7B0..A7B4    ; Lu #   [5] LATIN CAPITAL LETTER TURNED K..LATIN CAPITAL LETTER BETA
+A7B6          ; Lu #       LATIN CAPITAL LETTER OMEGA
+A7B8          ; Lu #       LATIN CAPITAL LETTER U WITH STROKE
+A7BA          ; Lu #       LATIN CAPITAL LETTER GLOTTAL A
+A7BC          ; Lu #       LATIN CAPITAL LETTER GLOTTAL I
+A7BE          ; Lu #       LATIN CAPITAL LETTER GLOTTAL U
+A7C2          ; Lu #       LATIN CAPITAL LETTER ANGLICANA W
+A7C4..A7C7    ; Lu #   [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY
+A7C9          ; Lu #       LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY
+A7F5          ; Lu #       LATIN CAPITAL LETTER REVERSED HALF H
+FF21..FF3A    ; Lu #  [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z
+10400..10427  ; Lu #  [40] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER EW
+104B0..104D3  ; Lu #  [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA
+10C80..10CB2  ; Lu #  [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US
+118A0..118BF  ; Lu #  [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO
+16E40..16E5F  ; Lu #  [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y
+1D400..1D419  ; Lu #  [26] MATHEMATICAL BOLD CAPITAL A..MATHEMATICAL BOLD CAPITAL Z
+1D434..1D44D  ; Lu #  [26] MATHEMATICAL ITALIC CAPITAL A..MATHEMATICAL ITALIC CAPITAL Z
+1D468..1D481  ; Lu #  [26] MATHEMATICAL BOLD ITALIC CAPITAL A..MATHEMATICAL BOLD ITALIC CAPITAL Z
+1D49C         ; Lu #       MATHEMATICAL SCRIPT CAPITAL A
+1D49E..1D49F  ; Lu #   [2] MATHEMATICAL SCRIPT CAPITAL C..MATHEMATICAL SCRIPT CAPITAL D
+1D4A2         ; Lu #       MATHEMATICAL SCRIPT CAPITAL G
+1D4A5..1D4A6  ; Lu #   [2] MATHEMATICAL SCRIPT CAPITAL J..MATHEMATICAL SCRIPT CAPITAL K
+1D4A9..1D4AC  ; Lu #   [4] MATHEMATICAL SCRIPT CAPITAL N..MATHEMATICAL SCRIPT CAPITAL Q
+1D4AE..1D4B5  ; Lu #   [8] MATHEMATICAL SCRIPT CAPITAL S..MATHEMATICAL SCRIPT CAPITAL Z
+1D4D0..1D4E9  ; Lu #  [26] MATHEMATICAL BOLD SCRIPT CAPITAL A..MATHEMATICAL BOLD SCRIPT CAPITAL Z
+1D504..1D505  ; Lu #   [2] MATHEMATICAL FRAKTUR CAPITAL A..MATHEMATICAL FRAKTUR CAPITAL B
+1D507..1D50A  ; Lu #   [4] MATHEMATICAL FRAKTUR CAPITAL D..MATHEMATICAL FRAKTUR CAPITAL G
+1D50D..1D514  ; Lu #   [8] MATHEMATICAL FRAKTUR CAPITAL J..MATHEMATICAL FRAKTUR CAPITAL Q
+1D516..1D51C  ; Lu #   [7] MATHEMATICAL FRAKTUR CAPITAL S..MATHEMATICAL FRAKTUR CAPITAL Y
+1D538..1D539  ; Lu #   [2] MATHEMATICAL DOUBLE-STRUCK CAPITAL A..MATHEMATICAL DOUBLE-STRUCK CAPITAL B
+1D53B..1D53E  ; Lu #   [4] MATHEMATICAL DOUBLE-STRUCK CAPITAL D..MATHEMATICAL DOUBLE-STRUCK CAPITAL G
+1D540..1D544  ; Lu #   [5] MATHEMATICAL DOUBLE-STRUCK CAPITAL I..MATHEMATICAL DOUBLE-STRUCK CAPITAL M
+1D546         ; Lu #       MATHEMATICAL DOUBLE-STRUCK CAPITAL O
+1D54A..1D550  ; Lu #   [7] MATHEMATICAL DOUBLE-STRUCK CAPITAL S..MATHEMATICAL DOUBLE-STRUCK CAPITAL Y
+1D56C..1D585  ; Lu #  [26] MATHEMATICAL BOLD FRAKTUR CAPITAL A..MATHEMATICAL BOLD FRAKTUR CAPITAL Z
+1D5A0..1D5B9  ; Lu #  [26] MATHEMATICAL SANS-SERIF CAPITAL A..MATHEMATICAL SANS-SERIF CAPITAL Z
+1D5D4..1D5ED  ; Lu #  [26] MATHEMATICAL SANS-SERIF BOLD CAPITAL A..MATHEMATICAL SANS-SERIF BOLD CAPITAL Z
+1D608..1D621  ; Lu #  [26] MATHEMATICAL SANS-SERIF ITALIC CAPITAL A..MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z
+1D63C..1D655  ; Lu #  [26] MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z
+1D670..1D689  ; Lu #  [26] MATHEMATICAL MONOSPACE CAPITAL A..MATHEMATICAL MONOSPACE CAPITAL Z
+1D6A8..1D6C0  ; Lu #  [25] MATHEMATICAL BOLD CAPITAL ALPHA..MATHEMATICAL BOLD CAPITAL OMEGA
+1D6E2..1D6FA  ; Lu #  [25] MATHEMATICAL ITALIC CAPITAL ALPHA..MATHEMATICAL ITALIC CAPITAL OMEGA
+1D71C..1D734  ; Lu #  [25] MATHEMATICAL BOLD ITALIC CAPITAL ALPHA..MATHEMATICAL BOLD ITALIC CAPITAL OMEGA
+1D756..1D76E  ; Lu #  [25] MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA..MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA
+1D790..1D7A8  ; Lu #  [25] MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA
+1D7CA         ; Lu #       MATHEMATICAL BOLD CAPITAL DIGAMMA
+1E900..1E921  ; Lu #  [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA
+
+# Total code points: 1791
+
+# ================================================
+
+# General_Category=Lowercase_Letter
+
+0061..007A    ; Ll #  [26] LATIN SMALL LETTER A..LATIN SMALL LETTER Z
+00B5          ; Ll #       MICRO SIGN
+00DF..00F6    ; Ll #  [24] LATIN SMALL LETTER SHARP S..LATIN SMALL LETTER O WITH DIAERESIS
+00F8..00FF    ; Ll #   [8] LATIN SMALL LETTER O WITH STROKE..LATIN SMALL LETTER Y WITH DIAERESIS
+0101          ; Ll #       LATIN SMALL LETTER A WITH MACRON
+0103          ; Ll #       LATIN SMALL LETTER A WITH BREVE
+0105          ; Ll #       LATIN SMALL LETTER A WITH OGONEK
+0107          ; Ll #       LATIN SMALL LETTER C WITH ACUTE
+0109          ; Ll #       LATIN SMALL LETTER C WITH CIRCUMFLEX
+010B          ; Ll #       LATIN SMALL LETTER C WITH DOT ABOVE
+010D          ; Ll #       LATIN SMALL LETTER C WITH CARON
+010F          ; Ll #       LATIN SMALL LETTER D WITH CARON
+0111          ; Ll #       LATIN SMALL LETTER D WITH STROKE
+0113          ; Ll #       LATIN SMALL LETTER E WITH MACRON
+0115          ; Ll #       LATIN SMALL LETTER E WITH BREVE
+0117          ; Ll #       LATIN SMALL LETTER E WITH DOT ABOVE
+0119          ; Ll #       LATIN SMALL LETTER E WITH OGONEK
+011B          ; Ll #       LATIN SMALL LETTER E WITH CARON
+011D          ; Ll #       LATIN SMALL LETTER G WITH CIRCUMFLEX
+011F          ; Ll #       LATIN SMALL LETTER G WITH BREVE
+0121          ; Ll #       LATIN SMALL LETTER G WITH DOT ABOVE
+0123          ; Ll #       LATIN SMALL LETTER G WITH CEDILLA
+0125          ; Ll #       LATIN SMALL LETTER H WITH CIRCUMFLEX
+0127          ; Ll #       LATIN SMALL LETTER H WITH STROKE
+0129          ; Ll #       LATIN SMALL LETTER I WITH TILDE
+012B          ; Ll #       LATIN SMALL LETTER I WITH MACRON
+012D          ; Ll #       LATIN SMALL LETTER I WITH BREVE
+012F          ; Ll #       LATIN SMALL LETTER I WITH OGONEK
+0131          ; Ll #       LATIN SMALL LETTER DOTLESS I
+0133          ; Ll #       LATIN SMALL LIGATURE IJ
+0135          ; Ll #       LATIN SMALL LETTER J WITH CIRCUMFLEX
+0137..0138    ; Ll #   [2] LATIN SMALL LETTER K WITH CEDILLA..LATIN SMALL LETTER KRA
+013A          ; Ll #       LATIN SMALL LETTER L WITH ACUTE
+013C          ; Ll #       LATIN SMALL LETTER L WITH CEDILLA
+013E          ; Ll #       LATIN SMALL LETTER L WITH CARON
+0140          ; Ll #       LATIN SMALL LETTER L WITH MIDDLE DOT
+0142          ; Ll #       LATIN SMALL LETTER L WITH STROKE
+0144          ; Ll #       LATIN SMALL LETTER N WITH ACUTE
+0146          ; Ll #       LATIN SMALL LETTER N WITH CEDILLA
+0148..0149    ; Ll #   [2] LATIN SMALL LETTER N WITH CARON..LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
+014B          ; Ll #       LATIN SMALL LETTER ENG
+014D          ; Ll #       LATIN SMALL LETTER O WITH MACRON
+014F          ; Ll #       LATIN SMALL LETTER O WITH BREVE
+0151          ; Ll #       LATIN SMALL LETTER O WITH DOUBLE ACUTE
+0153          ; Ll #       LATIN SMALL LIGATURE OE
+0155          ; Ll #       LATIN SMALL LETTER R WITH ACUTE
+0157          ; Ll #       LATIN SMALL LETTER R WITH CEDILLA
+0159          ; Ll #       LATIN SMALL LETTER R WITH CARON
+015B          ; Ll #       LATIN SMALL LETTER S WITH ACUTE
+015D          ; Ll #       LATIN SMALL LETTER S WITH CIRCUMFLEX
+015F          ; Ll #       LATIN SMALL LETTER S WITH CEDILLA
+0161          ; Ll #       LATIN SMALL LETTER S WITH CARON
+0163          ; Ll #       LATIN SMALL LETTER T WITH CEDILLA
+0165          ; Ll #       LATIN SMALL LETTER T WITH CARON
+0167          ; Ll #       LATIN SMALL LETTER T WITH STROKE
+0169          ; Ll #       LATIN SMALL LETTER U WITH TILDE
+016B          ; Ll #       LATIN SMALL LETTER U WITH MACRON
+016D          ; Ll #       LATIN SMALL LETTER U WITH BREVE
+016F          ; Ll #       LATIN SMALL LETTER U WITH RING ABOVE
+0171          ; Ll #       LATIN SMALL LETTER U WITH DOUBLE ACUTE
+0173          ; Ll #       LATIN SMALL LETTER U WITH OGONEK
+0175          ; Ll #       LATIN SMALL LETTER W WITH CIRCUMFLEX
+0177          ; Ll #       LATIN SMALL LETTER Y WITH CIRCUMFLEX
+017A          ; Ll #       LATIN SMALL LETTER Z WITH ACUTE
+017C          ; Ll #       LATIN SMALL LETTER Z WITH DOT ABOVE
+017E..0180    ; Ll #   [3] LATIN SMALL LETTER Z WITH CARON..LATIN SMALL LETTER B WITH STROKE
+0183          ; Ll #       LATIN SMALL LETTER B WITH TOPBAR
+0185          ; Ll #       LATIN SMALL LETTER TONE SIX
+0188          ; Ll #       LATIN SMALL LETTER C WITH HOOK
+018C..018D    ; Ll #   [2] LATIN SMALL LETTER D WITH TOPBAR..LATIN SMALL LETTER TURNED DELTA
+0192          ; Ll #       LATIN SMALL LETTER F WITH HOOK
+0195          ; Ll #       LATIN SMALL LETTER HV
+0199..019B    ; Ll #   [3] LATIN SMALL LETTER K WITH HOOK..LATIN SMALL LETTER LAMBDA WITH STROKE
+019E          ; Ll #       LATIN SMALL LETTER N WITH LONG RIGHT LEG
+01A1          ; Ll #       LATIN SMALL LETTER O WITH HORN
+01A3          ; Ll #       LATIN SMALL LETTER OI
+01A5          ; Ll #       LATIN SMALL LETTER P WITH HOOK
+01A8          ; Ll #       LATIN SMALL LETTER TONE TWO
+01AA..01AB    ; Ll #   [2] LATIN LETTER REVERSED ESH LOOP..LATIN SMALL LETTER T WITH PALATAL HOOK
+01AD          ; Ll #       LATIN SMALL LETTER T WITH HOOK
+01B0          ; Ll #       LATIN SMALL LETTER U WITH HORN
+01B4          ; Ll #       LATIN SMALL LETTER Y WITH HOOK
+01B6          ; Ll #       LATIN SMALL LETTER Z WITH STROKE
+01B9..01BA    ; Ll #   [2] LATIN SMALL LETTER EZH REVERSED..LATIN SMALL LETTER EZH WITH TAIL
+01BD..01BF    ; Ll #   [3] LATIN SMALL LETTER TONE FIVE..LATIN LETTER WYNN
+01C6          ; Ll #       LATIN SMALL LETTER DZ WITH CARON
+01C9          ; Ll #       LATIN SMALL LETTER LJ
+01CC          ; Ll #       LATIN SMALL LETTER NJ
+01CE          ; Ll #       LATIN SMALL LETTER A WITH CARON
+01D0          ; Ll #       LATIN SMALL LETTER I WITH CARON
+01D2          ; Ll #       LATIN SMALL LETTER O WITH CARON
+01D4          ; Ll #       LATIN SMALL LETTER U WITH CARON
+01D6          ; Ll #       LATIN SMALL LETTER U WITH DIAERESIS AND MACRON
+01D8          ; Ll #       LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
+01DA          ; Ll #       LATIN SMALL LETTER U WITH DIAERESIS AND CARON
+01DC..01DD    ; Ll #   [2] LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE..LATIN SMALL LETTER TURNED E
+01DF          ; Ll #       LATIN SMALL LETTER A WITH DIAERESIS AND MACRON
+01E1          ; Ll #       LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON
+01E3          ; Ll #       LATIN SMALL LETTER AE WITH MACRON
+01E5          ; Ll #       LATIN SMALL LETTER G WITH STROKE
+01E7          ; Ll #       LATIN SMALL LETTER G WITH CARON
+01E9          ; Ll #       LATIN SMALL LETTER K WITH CARON
+01EB          ; Ll #       LATIN SMALL LETTER O WITH OGONEK
+01ED          ; Ll #       LATIN SMALL LETTER O WITH OGONEK AND MACRON
+01EF..01F0    ; Ll #   [2] LATIN SMALL LETTER EZH WITH CARON..LATIN SMALL LETTER J WITH CARON
+01F3          ; Ll #       LATIN SMALL LETTER DZ
+01F5          ; Ll #       LATIN SMALL LETTER G WITH ACUTE
+01F9          ; Ll #       LATIN SMALL LETTER N WITH GRAVE
+01FB          ; Ll #       LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+01FD          ; Ll #       LATIN SMALL LETTER AE WITH ACUTE
+01FF          ; Ll #       LATIN SMALL LETTER O WITH STROKE AND ACUTE
+0201          ; Ll #       LATIN SMALL LETTER A WITH DOUBLE GRAVE
+0203          ; Ll #       LATIN SMALL LETTER A WITH INVERTED BREVE
+0205          ; Ll #       LATIN SMALL LETTER E WITH DOUBLE GRAVE
+0207          ; Ll #       LATIN SMALL LETTER E WITH INVERTED BREVE
+0209          ; Ll #       LATIN SMALL LETTER I WITH DOUBLE GRAVE
+020B          ; Ll #       LATIN SMALL LETTER I WITH INVERTED BREVE
+020D          ; Ll #       LATIN SMALL LETTER O WITH DOUBLE GRAVE
+020F          ; Ll #       LATIN SMALL LETTER O WITH INVERTED BREVE
+0211          ; Ll #       LATIN SMALL LETTER R WITH DOUBLE GRAVE
+0213          ; Ll #       LATIN SMALL LETTER R WITH INVERTED BREVE
+0215          ; Ll #       LATIN SMALL LETTER U WITH DOUBLE GRAVE
+0217          ; Ll #       LATIN SMALL LETTER U WITH INVERTED BREVE
+0219          ; Ll #       LATIN SMALL LETTER S WITH COMMA BELOW
+021B          ; Ll #       LATIN SMALL LETTER T WITH COMMA BELOW
+021D          ; Ll #       LATIN SMALL LETTER YOGH
+021F          ; Ll #       LATIN SMALL LETTER H WITH CARON
+0221          ; Ll #       LATIN SMALL LETTER D WITH CURL
+0223          ; Ll #       LATIN SMALL LETTER OU
+0225          ; Ll #       LATIN SMALL LETTER Z WITH HOOK
+0227          ; Ll #       LATIN SMALL LETTER A WITH DOT ABOVE
+0229          ; Ll #       LATIN SMALL LETTER E WITH CEDILLA
+022B          ; Ll #       LATIN SMALL LETTER O WITH DIAERESIS AND MACRON
+022D          ; Ll #       LATIN SMALL LETTER O WITH TILDE AND MACRON
+022F          ; Ll #       LATIN SMALL LETTER O WITH DOT ABOVE
+0231          ; Ll #       LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON
+0233..0239    ; Ll #   [7] LATIN SMALL LETTER Y WITH MACRON..LATIN SMALL LETTER QP DIGRAPH
+023C          ; Ll #       LATIN SMALL LETTER C WITH STROKE
+023F..0240    ; Ll #   [2] LATIN SMALL LETTER S WITH SWASH TAIL..LATIN SMALL LETTER Z WITH SWASH TAIL
+0242          ; Ll #       LATIN SMALL LETTER GLOTTAL STOP
+0247          ; Ll #       LATIN SMALL LETTER E WITH STROKE
+0249          ; Ll #       LATIN SMALL LETTER J WITH STROKE
+024B          ; Ll #       LATIN SMALL LETTER Q WITH HOOK TAIL
+024D          ; Ll #       LATIN SMALL LETTER R WITH STROKE
+024F..0293    ; Ll #  [69] LATIN SMALL LETTER Y WITH STROKE..LATIN SMALL LETTER EZH WITH CURL
+0295..02AF    ; Ll #  [27] LATIN LETTER PHARYNGEAL VOICED FRICATIVE..LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL
+0371          ; Ll #       GREEK SMALL LETTER HETA
+0373          ; Ll #       GREEK SMALL LETTER ARCHAIC SAMPI
+0377          ; Ll #       GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
+037B..037D    ; Ll #   [3] GREEK SMALL REVERSED LUNATE SIGMA SYMBOL..GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
+0390          ; Ll #       GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
+03AC..03CE    ; Ll #  [35] GREEK SMALL LETTER ALPHA WITH TONOS..GREEK SMALL LETTER OMEGA WITH TONOS
+03D0..03D1    ; Ll #   [2] GREEK BETA SYMBOL..GREEK THETA SYMBOL
+03D5..03D7    ; Ll #   [3] GREEK PHI SYMBOL..GREEK KAI SYMBOL
+03D9          ; Ll #       GREEK SMALL LETTER ARCHAIC KOPPA
+03DB          ; Ll #       GREEK SMALL LETTER STIGMA
+03DD          ; Ll #       GREEK SMALL LETTER DIGAMMA
+03DF          ; Ll #       GREEK SMALL LETTER KOPPA
+03E1          ; Ll #       GREEK SMALL LETTER SAMPI
+03E3          ; Ll #       COPTIC SMALL LETTER SHEI
+03E5          ; Ll #       COPTIC SMALL LETTER FEI
+03E7          ; Ll #       COPTIC SMALL LETTER KHEI
+03E9          ; Ll #       COPTIC SMALL LETTER HORI
+03EB          ; Ll #       COPTIC SMALL LETTER GANGIA
+03ED          ; Ll #       COPTIC SMALL LETTER SHIMA
+03EF..03F3    ; Ll #   [5] COPTIC SMALL LETTER DEI..GREEK LETTER YOT
+03F5          ; Ll #       GREEK LUNATE EPSILON SYMBOL
+03F8          ; Ll #       GREEK SMALL LETTER SHO
+03FB..03FC    ; Ll #   [2] GREEK SMALL LETTER SAN..GREEK RHO WITH STROKE SYMBOL
+0430..045F    ; Ll #  [48] CYRILLIC SMALL LETTER A..CYRILLIC SMALL LETTER DZHE
+0461          ; Ll #       CYRILLIC SMALL LETTER OMEGA
+0463          ; Ll #       CYRILLIC SMALL LETTER YAT
+0465          ; Ll #       CYRILLIC SMALL LETTER IOTIFIED E
+0467          ; Ll #       CYRILLIC SMALL LETTER LITTLE YUS
+0469          ; Ll #       CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
+046B          ; Ll #       CYRILLIC SMALL LETTER BIG YUS
+046D          ; Ll #       CYRILLIC SMALL LETTER IOTIFIED BIG YUS
+046F          ; Ll #       CYRILLIC SMALL LETTER KSI
+0471          ; Ll #       CYRILLIC SMALL LETTER PSI
+0473          ; Ll #       CYRILLIC SMALL LETTER FITA
+0475          ; Ll #       CYRILLIC SMALL LETTER IZHITSA
+0477          ; Ll #       CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+0479          ; Ll #       CYRILLIC SMALL LETTER UK
+047B          ; Ll #       CYRILLIC SMALL LETTER ROUND OMEGA
+047D          ; Ll #       CYRILLIC SMALL LETTER OMEGA WITH TITLO
+047F          ; Ll #       CYRILLIC SMALL LETTER OT
+0481          ; Ll #       CYRILLIC SMALL LETTER KOPPA
+048B          ; Ll #       CYRILLIC SMALL LETTER SHORT I WITH TAIL
+048D          ; Ll #       CYRILLIC SMALL LETTER SEMISOFT SIGN
+048F          ; Ll #       CYRILLIC SMALL LETTER ER WITH TICK
+0491          ; Ll #       CYRILLIC SMALL LETTER GHE WITH UPTURN
+0493          ; Ll #       CYRILLIC SMALL LETTER GHE WITH STROKE
+0495          ; Ll #       CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
+0497          ; Ll #       CYRILLIC SMALL LETTER ZHE WITH DESCENDER
+0499          ; Ll #       CYRILLIC SMALL LETTER ZE WITH DESCENDER
+049B          ; Ll #       CYRILLIC SMALL LETTER KA WITH DESCENDER
+049D          ; Ll #       CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
+049F          ; Ll #       CYRILLIC SMALL LETTER KA WITH STROKE
+04A1          ; Ll #       CYRILLIC SMALL LETTER BASHKIR KA
+04A3          ; Ll #       CYRILLIC SMALL LETTER EN WITH DESCENDER
+04A5          ; Ll #       CYRILLIC SMALL LIGATURE EN GHE
+04A7          ; Ll #       CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
+04A9          ; Ll #       CYRILLIC SMALL LETTER ABKHASIAN HA
+04AB          ; Ll #       CYRILLIC SMALL LETTER ES WITH DESCENDER
+04AD          ; Ll #       CYRILLIC SMALL LETTER TE WITH DESCENDER
+04AF          ; Ll #       CYRILLIC SMALL LETTER STRAIGHT U
+04B1          ; Ll #       CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+04B3          ; Ll #       CYRILLIC SMALL LETTER HA WITH DESCENDER
+04B5          ; Ll #       CYRILLIC SMALL LIGATURE TE TSE
+04B7          ; Ll #       CYRILLIC SMALL LETTER CHE WITH DESCENDER
+04B9          ; Ll #       CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
+04BB          ; Ll #       CYRILLIC SMALL LETTER SHHA
+04BD          ; Ll #       CYRILLIC SMALL LETTER ABKHASIAN CHE
+04BF          ; Ll #       CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
+04C2          ; Ll #       CYRILLIC SMALL LETTER ZHE WITH BREVE
+04C4          ; Ll #       CYRILLIC SMALL LETTER KA WITH HOOK
+04C6          ; Ll #       CYRILLIC SMALL LETTER EL WITH TAIL
+04C8          ; Ll #       CYRILLIC SMALL LETTER EN WITH HOOK
+04CA          ; Ll #       CYRILLIC SMALL LETTER EN WITH TAIL
+04CC          ; Ll #       CYRILLIC SMALL LETTER KHAKASSIAN CHE
+04CE..04CF    ; Ll #   [2] CYRILLIC SMALL LETTER EM WITH TAIL..CYRILLIC SMALL LETTER PALOCHKA
+04D1          ; Ll #       CYRILLIC SMALL LETTER A WITH BREVE
+04D3          ; Ll #       CYRILLIC SMALL LETTER A WITH DIAERESIS
+04D5          ; Ll #       CYRILLIC SMALL LIGATURE A IE
+04D7          ; Ll #       CYRILLIC SMALL LETTER IE WITH BREVE
+04D9          ; Ll #       CYRILLIC SMALL LETTER SCHWA
+04DB          ; Ll #       CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
+04DD          ; Ll #       CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
+04DF          ; Ll #       CYRILLIC SMALL LETTER ZE WITH DIAERESIS
+04E1          ; Ll #       CYRILLIC SMALL LETTER ABKHASIAN DZE
+04E3          ; Ll #       CYRILLIC SMALL LETTER I WITH MACRON
+04E5          ; Ll #       CYRILLIC SMALL LETTER I WITH DIAERESIS
+04E7          ; Ll #       CYRILLIC SMALL LETTER O WITH DIAERESIS
+04E9          ; Ll #       CYRILLIC SMALL LETTER BARRED O
+04EB          ; Ll #       CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
+04ED          ; Ll #       CYRILLIC SMALL LETTER E WITH DIAERESIS
+04EF          ; Ll #       CYRILLIC SMALL LETTER U WITH MACRON
+04F1          ; Ll #       CYRILLIC SMALL LETTER U WITH DIAERESIS
+04F3          ; Ll #       CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
+04F5          ; Ll #       CYRILLIC SMALL LETTER CHE WITH DIAERESIS
+04F7          ; Ll #       CYRILLIC SMALL LETTER GHE WITH DESCENDER
+04F9          ; Ll #       CYRILLIC SMALL LETTER YERU WITH DIAERESIS
+04FB          ; Ll #       CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK
+04FD          ; Ll #       CYRILLIC SMALL LETTER HA WITH HOOK
+04FF          ; Ll #       CYRILLIC SMALL LETTER HA WITH STROKE
+0501          ; Ll #       CYRILLIC SMALL LETTER KOMI DE
+0503          ; Ll #       CYRILLIC SMALL LETTER KOMI DJE
+0505          ; Ll #       CYRILLIC SMALL LETTER KOMI ZJE
+0507          ; Ll #       CYRILLIC SMALL LETTER KOMI DZJE
+0509          ; Ll #       CYRILLIC SMALL LETTER KOMI LJE
+050B          ; Ll #       CYRILLIC SMALL LETTER KOMI NJE
+050D          ; Ll #       CYRILLIC SMALL LETTER KOMI SJE
+050F          ; Ll #       CYRILLIC SMALL LETTER KOMI TJE
+0511          ; Ll #       CYRILLIC SMALL LETTER REVERSED ZE
+0513          ; Ll #       CYRILLIC SMALL LETTER EL WITH HOOK
+0515          ; Ll #       CYRILLIC SMALL LETTER LHA
+0517          ; Ll #       CYRILLIC SMALL LETTER RHA
+0519          ; Ll #       CYRILLIC SMALL LETTER YAE
+051B          ; Ll #       CYRILLIC SMALL LETTER QA
+051D          ; Ll #       CYRILLIC SMALL LETTER WE
+051F          ; Ll #       CYRILLIC SMALL LETTER ALEUT KA
+0521          ; Ll #       CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK
+0523          ; Ll #       CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK
+0525          ; Ll #       CYRILLIC SMALL LETTER PE WITH DESCENDER
+0527          ; Ll #       CYRILLIC SMALL LETTER SHHA WITH DESCENDER
+0529          ; Ll #       CYRILLIC SMALL LETTER EN WITH LEFT HOOK
+052B          ; Ll #       CYRILLIC SMALL LETTER DZZHE
+052D          ; Ll #       CYRILLIC SMALL LETTER DCHE
+052F          ; Ll #       CYRILLIC SMALL LETTER EL WITH DESCENDER
+0560..0588    ; Ll #  [41] ARMENIAN SMALL LETTER TURNED AYB..ARMENIAN SMALL LETTER YI WITH STROKE
+10D0..10FA    ; Ll #  [43] GEORGIAN LETTER AN..GEORGIAN LETTER AIN
+10FD..10FF    ; Ll #   [3] GEORGIAN LETTER AEN..GEORGIAN LETTER LABIAL SIGN
+13F8..13FD    ; Ll #   [6] CHEROKEE SMALL LETTER YE..CHEROKEE SMALL LETTER MV
+1C80..1C88    ; Ll #   [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK
+1D00..1D2B    ; Ll #  [44] LATIN LETTER SMALL CAPITAL A..CYRILLIC LETTER SMALL CAPITAL EL
+1D6B..1D77    ; Ll #  [13] LATIN SMALL LETTER UE..LATIN SMALL LETTER TURNED G
+1D79..1D9A    ; Ll #  [34] LATIN SMALL LETTER INSULAR G..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK
+1E01          ; Ll #       LATIN SMALL LETTER A WITH RING BELOW
+1E03          ; Ll #       LATIN SMALL LETTER B WITH DOT ABOVE
+1E05          ; Ll #       LATIN SMALL LETTER B WITH DOT BELOW
+1E07          ; Ll #       LATIN SMALL LETTER B WITH LINE BELOW
+1E09          ; Ll #       LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+1E0B          ; Ll #       LATIN SMALL LETTER D WITH DOT ABOVE
+1E0D          ; Ll #       LATIN SMALL LETTER D WITH DOT BELOW
+1E0F          ; Ll #       LATIN SMALL LETTER D WITH LINE BELOW
+1E11          ; Ll #       LATIN SMALL LETTER D WITH CEDILLA
+1E13          ; Ll #       LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
+1E15          ; Ll #       LATIN SMALL LETTER E WITH MACRON AND GRAVE
+1E17          ; Ll #       LATIN SMALL LETTER E WITH MACRON AND ACUTE
+1E19          ; Ll #       LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
+1E1B          ; Ll #       LATIN SMALL LETTER E WITH TILDE BELOW
+1E1D          ; Ll #       LATIN SMALL LETTER E WITH CEDILLA AND BREVE
+1E1F          ; Ll #       LATIN SMALL LETTER F WITH DOT ABOVE
+1E21          ; Ll #       LATIN SMALL LETTER G WITH MACRON
+1E23          ; Ll #       LATIN SMALL LETTER H WITH DOT ABOVE
+1E25          ; Ll #       LATIN SMALL LETTER H WITH DOT BELOW
+1E27          ; Ll #       LATIN SMALL LETTER H WITH DIAERESIS
+1E29          ; Ll #       LATIN SMALL LETTER H WITH CEDILLA
+1E2B          ; Ll #       LATIN SMALL LETTER H WITH BREVE BELOW
+1E2D          ; Ll #       LATIN SMALL LETTER I WITH TILDE BELOW
+1E2F          ; Ll #       LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
+1E31          ; Ll #       LATIN SMALL LETTER K WITH ACUTE
+1E33          ; Ll #       LATIN SMALL LETTER K WITH DOT BELOW
+1E35          ; Ll #       LATIN SMALL LETTER K WITH LINE BELOW
+1E37          ; Ll #       LATIN SMALL LETTER L WITH DOT BELOW
+1E39          ; Ll #       LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
+1E3B          ; Ll #       LATIN SMALL LETTER L WITH LINE BELOW
+1E3D          ; Ll #       LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
+1E3F          ; Ll #       LATIN SMALL LETTER M WITH ACUTE
+1E41          ; Ll #       LATIN SMALL LETTER M WITH DOT ABOVE
+1E43          ; Ll #       LATIN SMALL LETTER M WITH DOT BELOW
+1E45          ; Ll #       LATIN SMALL LETTER N WITH DOT ABOVE
+1E47          ; Ll #       LATIN SMALL LETTER N WITH DOT BELOW
+1E49          ; Ll #       LATIN SMALL LETTER N WITH LINE BELOW
+1E4B          ; Ll #       LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
+1E4D          ; Ll #       LATIN SMALL LETTER O WITH TILDE AND ACUTE
+1E4F          ; Ll #       LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
+1E51          ; Ll #       LATIN SMALL LETTER O WITH MACRON AND GRAVE
+1E53          ; Ll #       LATIN SMALL LETTER O WITH MACRON AND ACUTE
+1E55          ; Ll #       LATIN SMALL LETTER P WITH ACUTE
+1E57          ; Ll #       LATIN SMALL LETTER P WITH DOT ABOVE
+1E59          ; Ll #       LATIN SMALL LETTER R WITH DOT ABOVE
+1E5B          ; Ll #       LATIN SMALL LETTER R WITH DOT BELOW
+1E5D          ; Ll #       LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
+1E5F          ; Ll #       LATIN SMALL LETTER R WITH LINE BELOW
+1E61          ; Ll #       LATIN SMALL LETTER S WITH DOT ABOVE
+1E63          ; Ll #       LATIN SMALL LETTER S WITH DOT BELOW
+1E65          ; Ll #       LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
+1E67          ; Ll #       LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
+1E69          ; Ll #       LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
+1E6B          ; Ll #       LATIN SMALL LETTER T WITH DOT ABOVE
+1E6D          ; Ll #       LATIN SMALL LETTER T WITH DOT BELOW
+1E6F          ; Ll #       LATIN SMALL LETTER T WITH LINE BELOW
+1E71          ; Ll #       LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
+1E73          ; Ll #       LATIN SMALL LETTER U WITH DIAERESIS BELOW
+1E75          ; Ll #       LATIN SMALL LETTER U WITH TILDE BELOW
+1E77          ; Ll #       LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
+1E79          ; Ll #       LATIN SMALL LETTER U WITH TILDE AND ACUTE
+1E7B          ; Ll #       LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
+1E7D          ; Ll #       LATIN SMALL LETTER V WITH TILDE
+1E7F          ; Ll #       LATIN SMALL LETTER V WITH DOT BELOW
+1E81          ; Ll #       LATIN SMALL LETTER W WITH GRAVE
+1E83          ; Ll #       LATIN SMALL LETTER W WITH ACUTE
+1E85          ; Ll #       LATIN SMALL LETTER W WITH DIAERESIS
+1E87          ; Ll #       LATIN SMALL LETTER W WITH DOT ABOVE
+1E89          ; Ll #       LATIN SMALL LETTER W WITH DOT BELOW
+1E8B          ; Ll #       LATIN SMALL LETTER X WITH DOT ABOVE
+1E8D          ; Ll #       LATIN SMALL LETTER X WITH DIAERESIS
+1E8F          ; Ll #       LATIN SMALL LETTER Y WITH DOT ABOVE
+1E91          ; Ll #       LATIN SMALL LETTER Z WITH CIRCUMFLEX
+1E93          ; Ll #       LATIN SMALL LETTER Z WITH DOT BELOW
+1E95..1E9D    ; Ll #   [9] LATIN SMALL LETTER Z WITH LINE BELOW..LATIN SMALL LETTER LONG S WITH HIGH STROKE
+1E9F          ; Ll #       LATIN SMALL LETTER DELTA
+1EA1          ; Ll #       LATIN SMALL LETTER A WITH DOT BELOW
+1EA3          ; Ll #       LATIN SMALL LETTER A WITH HOOK ABOVE
+1EA5          ; Ll #       LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
+1EA7          ; Ll #       LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
+1EA9          ; Ll #       LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
+1EAB          ; Ll #       LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
+1EAD          ; Ll #       LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+1EAF          ; Ll #       LATIN SMALL LETTER A WITH BREVE AND ACUTE
+1EB1          ; Ll #       LATIN SMALL LETTER A WITH BREVE AND GRAVE
+1EB3          ; Ll #       LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+1EB5          ; Ll #       LATIN SMALL LETTER A WITH BREVE AND TILDE
+1EB7          ; Ll #       LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+1EB9          ; Ll #       LATIN SMALL LETTER E WITH DOT BELOW
+1EBB          ; Ll #       LATIN SMALL LETTER E WITH HOOK ABOVE
+1EBD          ; Ll #       LATIN SMALL LETTER E WITH TILDE
+1EBF          ; Ll #       LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
+1EC1          ; Ll #       LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
+1EC3          ; Ll #       LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
+1EC5          ; Ll #       LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
+1EC7          ; Ll #       LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+1EC9          ; Ll #       LATIN SMALL LETTER I WITH HOOK ABOVE
+1ECB          ; Ll #       LATIN SMALL LETTER I WITH DOT BELOW
+1ECD          ; Ll #       LATIN SMALL LETTER O WITH DOT BELOW
+1ECF          ; Ll #       LATIN SMALL LETTER O WITH HOOK ABOVE
+1ED1          ; Ll #       LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
+1ED3          ; Ll #       LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
+1ED5          ; Ll #       LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
+1ED7          ; Ll #       LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
+1ED9          ; Ll #       LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+1EDB          ; Ll #       LATIN SMALL LETTER O WITH HORN AND ACUTE
+1EDD          ; Ll #       LATIN SMALL LETTER O WITH HORN AND GRAVE
+1EDF          ; Ll #       LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+1EE1          ; Ll #       LATIN SMALL LETTER O WITH HORN AND TILDE
+1EE3          ; Ll #       LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+1EE5          ; Ll #       LATIN SMALL LETTER U WITH DOT BELOW
+1EE7          ; Ll #       LATIN SMALL LETTER U WITH HOOK ABOVE
+1EE9          ; Ll #       LATIN SMALL LETTER U WITH HORN AND ACUTE
+1EEB          ; Ll #       LATIN SMALL LETTER U WITH HORN AND GRAVE
+1EED          ; Ll #       LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+1EEF          ; Ll #       LATIN SMALL LETTER U WITH HORN AND TILDE
+1EF1          ; Ll #       LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+1EF3          ; Ll #       LATIN SMALL LETTER Y WITH GRAVE
+1EF5          ; Ll #       LATIN SMALL LETTER Y WITH DOT BELOW
+1EF7          ; Ll #       LATIN SMALL LETTER Y WITH HOOK ABOVE
+1EF9          ; Ll #       LATIN SMALL LETTER Y WITH TILDE
+1EFB          ; Ll #       LATIN SMALL LETTER MIDDLE-WELSH LL
+1EFD          ; Ll #       LATIN SMALL LETTER MIDDLE-WELSH V
+1EFF..1F07    ; Ll #   [9] LATIN SMALL LETTER Y WITH LOOP..GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
+1F10..1F15    ; Ll #   [6] GREEK SMALL LETTER EPSILON WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
+1F20..1F27    ; Ll #   [8] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
+1F30..1F37    ; Ll #   [8] GREEK SMALL LETTER IOTA WITH PSILI..GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
+1F40..1F45    ; Ll #   [6] GREEK SMALL LETTER OMICRON WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
+1F50..1F57    ; Ll #   [8] GREEK SMALL LETTER UPSILON WITH PSILI..GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
+1F60..1F67    ; Ll #   [8] GREEK SMALL LETTER OMEGA WITH PSILI..GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
+1F70..1F7D    ; Ll #  [14] GREEK SMALL LETTER ALPHA WITH VARIA..GREEK SMALL LETTER OMEGA WITH OXIA
+1F80..1F87    ; Ll #   [8] GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1F90..1F97    ; Ll #   [8] GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1FA0..1FA7    ; Ll #   [8] GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
+1FB0..1FB4    ; Ll #   [5] GREEK SMALL LETTER ALPHA WITH VRACHY..GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
+1FB6..1FB7    ; Ll #   [2] GREEK SMALL LETTER ALPHA WITH PERISPOMENI..GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FBE          ; Ll #       GREEK PROSGEGRAMMENI
+1FC2..1FC4    ; Ll #   [3] GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
+1FC6..1FC7    ; Ll #   [2] GREEK SMALL LETTER ETA WITH PERISPOMENI..GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
+1FD0..1FD3    ; Ll #   [4] GREEK SMALL LETTER IOTA WITH VRACHY..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
+1FD6..1FD7    ; Ll #   [2] GREEK SMALL LETTER IOTA WITH PERISPOMENI..GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
+1FE0..1FE7    ; Ll #   [8] GREEK SMALL LETTER UPSILON WITH VRACHY..GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
+1FF2..1FF4    ; Ll #   [3] GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI..GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
+1FF6..1FF7    ; Ll #   [2] GREEK SMALL LETTER OMEGA WITH PERISPOMENI..GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
+210A          ; Ll #       SCRIPT SMALL G
+210E..210F    ; Ll #   [2] PLANCK CONSTANT..PLANCK CONSTANT OVER TWO PI
+2113          ; Ll #       SCRIPT SMALL L
+212F          ; Ll #       SCRIPT SMALL E
+2134          ; Ll #       SCRIPT SMALL O
+2139          ; Ll #       INFORMATION SOURCE
+213C..213D    ; Ll #   [2] DOUBLE-STRUCK SMALL PI..DOUBLE-STRUCK SMALL GAMMA
+2146..2149    ; Ll #   [4] DOUBLE-STRUCK ITALIC SMALL D..DOUBLE-STRUCK ITALIC SMALL J
+214E          ; Ll #       TURNED SMALL F
+2184          ; Ll #       LATIN SMALL LETTER REVERSED C
+2C30..2C5E    ; Ll #  [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE
+2C61          ; Ll #       LATIN SMALL LETTER L WITH DOUBLE BAR
+2C65..2C66    ; Ll #   [2] LATIN SMALL LETTER A WITH STROKE..LATIN SMALL LETTER T WITH DIAGONAL STROKE
+2C68          ; Ll #       LATIN SMALL LETTER H WITH DESCENDER
+2C6A          ; Ll #       LATIN SMALL LETTER K WITH DESCENDER
+2C6C          ; Ll #       LATIN SMALL LETTER Z WITH DESCENDER
+2C71          ; Ll #       LATIN SMALL LETTER V WITH RIGHT HOOK
+2C73..2C74    ; Ll #   [2] LATIN SMALL LETTER W WITH HOOK..LATIN SMALL LETTER V WITH CURL
+2C76..2C7B    ; Ll #   [6] LATIN SMALL LETTER HALF H..LATIN LETTER SMALL CAPITAL TURNED E
+2C81          ; Ll #       COPTIC SMALL LETTER ALFA
+2C83          ; Ll #       COPTIC SMALL LETTER VIDA
+2C85          ; Ll #       COPTIC SMALL LETTER GAMMA
+2C87          ; Ll #       COPTIC SMALL LETTER DALDA
+2C89          ; Ll #       COPTIC SMALL LETTER EIE
+2C8B          ; Ll #       COPTIC SMALL LETTER SOU
+2C8D          ; Ll #       COPTIC SMALL LETTER ZATA
+2C8F          ; Ll #       COPTIC SMALL LETTER HATE
+2C91          ; Ll #       COPTIC SMALL LETTER THETHE
+2C93          ; Ll #       COPTIC SMALL LETTER IAUDA
+2C95          ; Ll #       COPTIC SMALL LETTER KAPA
+2C97          ; Ll #       COPTIC SMALL LETTER LAULA
+2C99          ; Ll #       COPTIC SMALL LETTER MI
+2C9B          ; Ll #       COPTIC SMALL LETTER NI
+2C9D          ; Ll #       COPTIC SMALL LETTER KSI
+2C9F          ; Ll #       COPTIC SMALL LETTER O
+2CA1          ; Ll #       COPTIC SMALL LETTER PI
+2CA3          ; Ll #       COPTIC SMALL LETTER RO
+2CA5          ; Ll #       COPTIC SMALL LETTER SIMA
+2CA7          ; Ll #       COPTIC SMALL LETTER TAU
+2CA9          ; Ll #       COPTIC SMALL LETTER UA
+2CAB          ; Ll #       COPTIC SMALL LETTER FI
+2CAD          ; Ll #       COPTIC SMALL LETTER KHI
+2CAF          ; Ll #       COPTIC SMALL LETTER PSI
+2CB1          ; Ll #       COPTIC SMALL LETTER OOU
+2CB3          ; Ll #       COPTIC SMALL LETTER DIALECT-P ALEF
+2CB5          ; Ll #       COPTIC SMALL LETTER OLD COPTIC AIN
+2CB7          ; Ll #       COPTIC SMALL LETTER CRYPTOGRAMMIC EIE
+2CB9          ; Ll #       COPTIC SMALL LETTER DIALECT-P KAPA
+2CBB          ; Ll #       COPTIC SMALL LETTER DIALECT-P NI
+2CBD          ; Ll #       COPTIC SMALL LETTER CRYPTOGRAMMIC NI
+2CBF          ; Ll #       COPTIC SMALL LETTER OLD COPTIC OOU
+2CC1          ; Ll #       COPTIC SMALL LETTER SAMPI
+2CC3          ; Ll #       COPTIC SMALL LETTER CROSSED SHEI
+2CC5          ; Ll #       COPTIC SMALL LETTER OLD COPTIC SHEI
+2CC7          ; Ll #       COPTIC SMALL LETTER OLD COPTIC ESH
+2CC9          ; Ll #       COPTIC SMALL LETTER AKHMIMIC KHEI
+2CCB          ; Ll #       COPTIC SMALL LETTER DIALECT-P HORI
+2CCD          ; Ll #       COPTIC SMALL LETTER OLD COPTIC HORI
+2CCF          ; Ll #       COPTIC SMALL LETTER OLD COPTIC HA
+2CD1          ; Ll #       COPTIC SMALL LETTER L-SHAPED HA
+2CD3          ; Ll #       COPTIC SMALL LETTER OLD COPTIC HEI
+2CD5          ; Ll #       COPTIC SMALL LETTER OLD COPTIC HAT
+2CD7          ; Ll #       COPTIC SMALL LETTER OLD COPTIC GANGIA
+2CD9          ; Ll #       COPTIC SMALL LETTER OLD COPTIC DJA
+2CDB          ; Ll #       COPTIC SMALL LETTER OLD COPTIC SHIMA
+2CDD          ; Ll #       COPTIC SMALL LETTER OLD NUBIAN SHIMA
+2CDF          ; Ll #       COPTIC SMALL LETTER OLD NUBIAN NGI
+2CE1          ; Ll #       COPTIC SMALL LETTER OLD NUBIAN NYI
+2CE3..2CE4    ; Ll #   [2] COPTIC SMALL LETTER OLD NUBIAN WAU..COPTIC SYMBOL KAI
+2CEC          ; Ll #       COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI
+2CEE          ; Ll #       COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA
+2CF3          ; Ll #       COPTIC SMALL LETTER BOHAIRIC KHEI
+2D00..2D25    ; Ll #  [38] GEORGIAN SMALL LETTER AN..GEORGIAN SMALL LETTER HOE
+2D27          ; Ll #       GEORGIAN SMALL LETTER YN
+2D2D          ; Ll #       GEORGIAN SMALL LETTER AEN
+A641          ; Ll #       CYRILLIC SMALL LETTER ZEMLYA
+A643          ; Ll #       CYRILLIC SMALL LETTER DZELO
+A645          ; Ll #       CYRILLIC SMALL LETTER REVERSED DZE
+A647          ; Ll #       CYRILLIC SMALL LETTER IOTA
+A649          ; Ll #       CYRILLIC SMALL LETTER DJERV
+A64B          ; Ll #       CYRILLIC SMALL LETTER MONOGRAPH UK
+A64D          ; Ll #       CYRILLIC SMALL LETTER BROAD OMEGA
+A64F          ; Ll #       CYRILLIC SMALL LETTER NEUTRAL YER
+A651          ; Ll #       CYRILLIC SMALL LETTER YERU WITH BACK YER
+A653          ; Ll #       CYRILLIC SMALL LETTER IOTIFIED YAT
+A655          ; Ll #       CYRILLIC SMALL LETTER REVERSED YU
+A657          ; Ll #       CYRILLIC SMALL LETTER IOTIFIED A
+A659          ; Ll #       CYRILLIC SMALL LETTER CLOSED LITTLE YUS
+A65B          ; Ll #       CYRILLIC SMALL LETTER BLENDED YUS
+A65D          ; Ll #       CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS
+A65F          ; Ll #       CYRILLIC SMALL LETTER YN
+A661          ; Ll #       CYRILLIC SMALL LETTER REVERSED TSE
+A663          ; Ll #       CYRILLIC SMALL LETTER SOFT DE
+A665          ; Ll #       CYRILLIC SMALL LETTER SOFT EL
+A667          ; Ll #       CYRILLIC SMALL LETTER SOFT EM
+A669          ; Ll #       CYRILLIC SMALL LETTER MONOCULAR O
+A66B          ; Ll #       CYRILLIC SMALL LETTER BINOCULAR O
+A66D          ; Ll #       CYRILLIC SMALL LETTER DOUBLE MONOCULAR O
+A681          ; Ll #       CYRILLIC SMALL LETTER DWE
+A683          ; Ll #       CYRILLIC SMALL LETTER DZWE
+A685          ; Ll #       CYRILLIC SMALL LETTER ZHWE
+A687          ; Ll #       CYRILLIC SMALL LETTER CCHE
+A689          ; Ll #       CYRILLIC SMALL LETTER DZZE
+A68B          ; Ll #       CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK
+A68D          ; Ll #       CYRILLIC SMALL LETTER TWE
+A68F          ; Ll #       CYRILLIC SMALL LETTER TSWE
+A691          ; Ll #       CYRILLIC SMALL LETTER TSSE
+A693          ; Ll #       CYRILLIC SMALL LETTER TCHE
+A695          ; Ll #       CYRILLIC SMALL LETTER HWE
+A697          ; Ll #       CYRILLIC SMALL LETTER SHWE
+A699          ; Ll #       CYRILLIC SMALL LETTER DOUBLE O
+A69B          ; Ll #       CYRILLIC SMALL LETTER CROSSED O
+A723          ; Ll #       LATIN SMALL LETTER EGYPTOLOGICAL ALEF
+A725          ; Ll #       LATIN SMALL LETTER EGYPTOLOGICAL AIN
+A727          ; Ll #       LATIN SMALL LETTER HENG
+A729          ; Ll #       LATIN SMALL LETTER TZ
+A72B          ; Ll #       LATIN SMALL LETTER TRESILLO
+A72D          ; Ll #       LATIN SMALL LETTER CUATRILLO
+A72F..A731    ; Ll #   [3] LATIN SMALL LETTER CUATRILLO WITH COMMA..LATIN LETTER SMALL CAPITAL S
+A733          ; Ll #       LATIN SMALL LETTER AA
+A735          ; Ll #       LATIN SMALL LETTER AO
+A737          ; Ll #       LATIN SMALL LETTER AU
+A739          ; Ll #       LATIN SMALL LETTER AV
+A73B          ; Ll #       LATIN SMALL LETTER AV WITH HORIZONTAL BAR
+A73D          ; Ll #       LATIN SMALL LETTER AY
+A73F          ; Ll #       LATIN SMALL LETTER REVERSED C WITH DOT
+A741          ; Ll #       LATIN SMALL LETTER K WITH STROKE
+A743          ; Ll #       LATIN SMALL LETTER K WITH DIAGONAL STROKE
+A745          ; Ll #       LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE
+A747          ; Ll #       LATIN SMALL LETTER BROKEN L
+A749          ; Ll #       LATIN SMALL LETTER L WITH HIGH STROKE
+A74B          ; Ll #       LATIN SMALL LETTER O WITH LONG STROKE OVERLAY
+A74D          ; Ll #       LATIN SMALL LETTER O WITH LOOP
+A74F          ; Ll #       LATIN SMALL LETTER OO
+A751          ; Ll #       LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER
+A753          ; Ll #       LATIN SMALL LETTER P WITH FLOURISH
+A755          ; Ll #       LATIN SMALL LETTER P WITH SQUIRREL TAIL
+A757          ; Ll #       LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER
+A759          ; Ll #       LATIN SMALL LETTER Q WITH DIAGONAL STROKE
+A75B          ; Ll #       LATIN SMALL LETTER R ROTUNDA
+A75D          ; Ll #       LATIN SMALL LETTER RUM ROTUNDA
+A75F          ; Ll #       LATIN SMALL LETTER V WITH DIAGONAL STROKE
+A761          ; Ll #       LATIN SMALL LETTER VY
+A763          ; Ll #       LATIN SMALL LETTER VISIGOTHIC Z
+A765          ; Ll #       LATIN SMALL LETTER THORN WITH STROKE
+A767          ; Ll #       LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER
+A769          ; Ll #       LATIN SMALL LETTER VEND
+A76B          ; Ll #       LATIN SMALL LETTER ET
+A76D          ; Ll #       LATIN SMALL LETTER IS
+A76F          ; Ll #       LATIN SMALL LETTER CON
+A771..A778    ; Ll #   [8] LATIN SMALL LETTER DUM..LATIN SMALL LETTER UM
+A77A          ; Ll #       LATIN SMALL LETTER INSULAR D
+A77C          ; Ll #       LATIN SMALL LETTER INSULAR F
+A77F          ; Ll #       LATIN SMALL LETTER TURNED INSULAR G
+A781          ; Ll #       LATIN SMALL LETTER TURNED L
+A783          ; Ll #       LATIN SMALL LETTER INSULAR R
+A785          ; Ll #       LATIN SMALL LETTER INSULAR S
+A787          ; Ll #       LATIN SMALL LETTER INSULAR T
+A78C          ; Ll #       LATIN SMALL LETTER SALTILLO
+A78E          ; Ll #       LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
+A791          ; Ll #       LATIN SMALL LETTER N WITH DESCENDER
+A793..A795    ; Ll #   [3] LATIN SMALL LETTER C WITH BAR..LATIN SMALL LETTER H WITH PALATAL HOOK
+A797          ; Ll #       LATIN SMALL LETTER B WITH FLOURISH
+A799          ; Ll #       LATIN SMALL LETTER F WITH STROKE
+A79B          ; Ll #       LATIN SMALL LETTER VOLAPUK AE
+A79D          ; Ll #       LATIN SMALL LETTER VOLAPUK OE
+A79F          ; Ll #       LATIN SMALL LETTER VOLAPUK UE
+A7A1          ; Ll #       LATIN SMALL LETTER G WITH OBLIQUE STROKE
+A7A3          ; Ll #       LATIN SMALL LETTER K WITH OBLIQUE STROKE
+A7A5          ; Ll #       LATIN SMALL LETTER N WITH OBLIQUE STROKE
+A7A7          ; Ll #       LATIN SMALL LETTER R WITH OBLIQUE STROKE
+A7A9          ; Ll #       LATIN SMALL LETTER S WITH OBLIQUE STROKE
+A7AF          ; Ll #       LATIN LETTER SMALL CAPITAL Q
+A7B5          ; Ll #       LATIN SMALL LETTER BETA
+A7B7          ; Ll #       LATIN SMALL LETTER OMEGA
+A7B9          ; Ll #       LATIN SMALL LETTER U WITH STROKE
+A7BB          ; Ll #       LATIN SMALL LETTER GLOTTAL A
+A7BD          ; Ll #       LATIN SMALL LETTER GLOTTAL I
+A7BF          ; Ll #       LATIN SMALL LETTER GLOTTAL U
+A7C3          ; Ll #       LATIN SMALL LETTER ANGLICANA W
+A7C8          ; Ll #       LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY
+A7CA          ; Ll #       LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY
+A7F6          ; Ll #       LATIN SMALL LETTER REVERSED HALF H
+A7FA          ; Ll #       LATIN LETTER SMALL CAPITAL TURNED M
+AB30..AB5A    ; Ll #  [43] LATIN SMALL LETTER BARRED ALPHA..LATIN SMALL LETTER Y WITH SHORT RIGHT LEG
+AB60..AB68    ; Ll #   [9] LATIN SMALL LETTER SAKHA YAT..LATIN SMALL LETTER TURNED R WITH MIDDLE TILDE
+AB70..ABBF    ; Ll #  [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA
+FB00..FB06    ; Ll #   [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST
+FB13..FB17    ; Ll #   [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN SMALL LIGATURE MEN XEH
+FF41..FF5A    ; Ll #  [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z
+10428..1044F  ; Ll #  [40] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER EW
+104D8..104FB  ; Ll #  [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA
+10CC0..10CF2  ; Ll #  [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US
+118C0..118DF  ; Ll #  [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO
+16E60..16E7F  ; Ll #  [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y
+1D41A..1D433  ; Ll #  [26] MATHEMATICAL BOLD SMALL A..MATHEMATICAL BOLD SMALL Z
+1D44E..1D454  ; Ll #   [7] MATHEMATICAL ITALIC SMALL A..MATHEMATICAL ITALIC SMALL G
+1D456..1D467  ; Ll #  [18] MATHEMATICAL ITALIC SMALL I..MATHEMATICAL ITALIC SMALL Z
+1D482..1D49B  ; Ll #  [26] MATHEMATICAL BOLD ITALIC SMALL A..MATHEMATICAL BOLD ITALIC SMALL Z
+1D4B6..1D4B9  ; Ll #   [4] MATHEMATICAL SCRIPT SMALL A..MATHEMATICAL SCRIPT SMALL D
+1D4BB         ; Ll #       MATHEMATICAL SCRIPT SMALL F
+1D4BD..1D4C3  ; Ll #   [7] MATHEMATICAL SCRIPT SMALL H..MATHEMATICAL SCRIPT SMALL N
+1D4C5..1D4CF  ; Ll #  [11] MATHEMATICAL SCRIPT SMALL P..MATHEMATICAL SCRIPT SMALL Z
+1D4EA..1D503  ; Ll #  [26] MATHEMATICAL BOLD SCRIPT SMALL A..MATHEMATICAL BOLD SCRIPT SMALL Z
+1D51E..1D537  ; Ll #  [26] MATHEMATICAL FRAKTUR SMALL A..MATHEMATICAL FRAKTUR SMALL Z
+1D552..1D56B  ; Ll #  [26] MATHEMATICAL DOUBLE-STRUCK SMALL A..MATHEMATICAL DOUBLE-STRUCK SMALL Z
+1D586..1D59F  ; Ll #  [26] MATHEMATICAL BOLD FRAKTUR SMALL A..MATHEMATICAL BOLD FRAKTUR SMALL Z
+1D5BA..1D5D3  ; Ll #  [26] MATHEMATICAL SANS-SERIF SMALL A..MATHEMATICAL SANS-SERIF SMALL Z
+1D5EE..1D607  ; Ll #  [26] MATHEMATICAL SANS-SERIF BOLD SMALL A..MATHEMATICAL SANS-SERIF BOLD SMALL Z
+1D622..1D63B  ; Ll #  [26] MATHEMATICAL SANS-SERIF ITALIC SMALL A..MATHEMATICAL SANS-SERIF ITALIC SMALL Z
+1D656..1D66F  ; Ll #  [26] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z
+1D68A..1D6A5  ; Ll #  [28] MATHEMATICAL MONOSPACE SMALL A..MATHEMATICAL ITALIC SMALL DOTLESS J
+1D6C2..1D6DA  ; Ll #  [25] MATHEMATICAL BOLD SMALL ALPHA..MATHEMATICAL BOLD SMALL OMEGA
+1D6DC..1D6E1  ; Ll #   [6] MATHEMATICAL BOLD EPSILON SYMBOL..MATHEMATICAL BOLD PI SYMBOL
+1D6FC..1D714  ; Ll #  [25] MATHEMATICAL ITALIC SMALL ALPHA..MATHEMATICAL ITALIC SMALL OMEGA
+1D716..1D71B  ; Ll #   [6] MATHEMATICAL ITALIC EPSILON SYMBOL..MATHEMATICAL ITALIC PI SYMBOL
+1D736..1D74E  ; Ll #  [25] MATHEMATICAL BOLD ITALIC SMALL ALPHA..MATHEMATICAL BOLD ITALIC SMALL OMEGA
+1D750..1D755  ; Ll #   [6] MATHEMATICAL BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD ITALIC PI SYMBOL
+1D770..1D788  ; Ll #  [25] MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA
+1D78A..1D78F  ; Ll #   [6] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD PI SYMBOL
+1D7AA..1D7C2  ; Ll #  [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA
+1D7C4..1D7C9  ; Ll #   [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL
+1D7CB         ; Ll #       MATHEMATICAL BOLD SMALL DIGAMMA
+1E922..1E943  ; Ll #  [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA
+
+# Total code points: 2155
+
+# ================================================
+
+# General_Category=Titlecase_Letter
+
+01C5          ; Lt #       LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON
+01C8          ; Lt #       LATIN CAPITAL LETTER L WITH SMALL LETTER J
+01CB          ; Lt #       LATIN CAPITAL LETTER N WITH SMALL LETTER J
+01F2          ; Lt #       LATIN CAPITAL LETTER D WITH SMALL LETTER Z
+1F88..1F8F    ; Lt #   [8] GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI..GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1F98..1F9F    ; Lt #   [8] GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI..GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FA8..1FAF    ; Lt #   [8] GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI..GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
+1FBC          ; Lt #       GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
+1FCC          ; Lt #       GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
+1FFC          ; Lt #       GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
+
+# Total code points: 31
+
+# ================================================
+
+# General_Category=Modifier_Letter
+
+02B0..02C1    ; Lm #  [18] MODIFIER LETTER SMALL H..MODIFIER LETTER REVERSED GLOTTAL STOP
+02C6..02D1    ; Lm #  [12] MODIFIER LETTER CIRCUMFLEX ACCENT..MODIFIER LETTER HALF TRIANGULAR COLON
+02E0..02E4    ; Lm #   [5] MODIFIER LETTER SMALL GAMMA..MODIFIER LETTER SMALL REVERSED GLOTTAL STOP
+02EC          ; Lm #       MODIFIER LETTER VOICING
+02EE          ; Lm #       MODIFIER LETTER DOUBLE APOSTROPHE
+0374          ; Lm #       GREEK NUMERAL SIGN
+037A          ; Lm #       GREEK YPOGEGRAMMENI
+0559          ; Lm #       ARMENIAN MODIFIER LETTER LEFT HALF RING
+0640          ; Lm #       ARABIC TATWEEL
+06E5..06E6    ; Lm #   [2] ARABIC SMALL WAW..ARABIC SMALL YEH
+07F4..07F5    ; Lm #   [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE
+07FA          ; Lm #       NKO LAJANYALAN
+081A          ; Lm #       SAMARITAN MODIFIER LETTER EPENTHETIC YUT
+0824          ; Lm #       SAMARITAN MODIFIER LETTER SHORT A
+0828          ; Lm #       SAMARITAN MODIFIER LETTER I
+0971          ; Lm #       DEVANAGARI SIGN HIGH SPACING DOT
+0E46          ; Lm #       THAI CHARACTER MAIYAMOK
+0EC6          ; Lm #       LAO KO LA
+10FC          ; Lm #       MODIFIER LETTER GEORGIAN NAR
+17D7          ; Lm #       KHMER SIGN LEK TOO
+1843          ; Lm #       MONGOLIAN LETTER TODO LONG VOWEL SIGN
+1AA7          ; Lm #       TAI THAM SIGN MAI YAMOK
+1C78..1C7D    ; Lm #   [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD
+1D2C..1D6A    ; Lm #  [63] MODIFIER LETTER CAPITAL A..GREEK SUBSCRIPT SMALL LETTER CHI
+1D78          ; Lm #       MODIFIER LETTER CYRILLIC EN
+1D9B..1DBF    ; Lm #  [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA
+2071          ; Lm #       SUPERSCRIPT LATIN SMALL LETTER I
+207F          ; Lm #       SUPERSCRIPT LATIN SMALL LETTER N
+2090..209C    ; Lm #  [13] LATIN SUBSCRIPT SMALL LETTER A..LATIN SUBSCRIPT SMALL LETTER T
+2C7C..2C7D    ; Lm #   [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V
+2D6F          ; Lm #       TIFINAGH MODIFIER LETTER LABIALIZATION MARK
+2E2F          ; Lm #       VERTICAL TILDE
+3005          ; Lm #       IDEOGRAPHIC ITERATION MARK
+3031..3035    ; Lm #   [5] VERTICAL KANA REPEAT MARK..VERTICAL KANA REPEAT MARK LOWER HALF
+303B          ; Lm #       VERTICAL IDEOGRAPHIC ITERATION MARK
+309D..309E    ; Lm #   [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK
+30FC..30FE    ; Lm #   [3] KATAKANA-HIRAGANA PROLONGED SOUND MARK..KATAKANA VOICED ITERATION MARK
+A015          ; Lm #       YI SYLLABLE WU
+A4F8..A4FD    ; Lm #   [6] LISU LETTER TONE MYA TI..LISU LETTER TONE MYA JEU
+A60C          ; Lm #       VAI SYLLABLE LENGTHENER
+A67F          ; Lm #       CYRILLIC PAYEROK
+A69C..A69D    ; Lm #   [2] MODIFIER LETTER CYRILLIC HARD SIGN..MODIFIER LETTER CYRILLIC SOFT SIGN
+A717..A71F    ; Lm #   [9] MODIFIER LETTER DOT VERTICAL BAR..MODIFIER LETTER LOW INVERTED EXCLAMATION MARK
+A770          ; Lm #       MODIFIER LETTER US
+A788          ; Lm #       MODIFIER LETTER LOW CIRCUMFLEX ACCENT
+A7F8..A7F9    ; Lm #   [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
+A9CF          ; Lm #       JAVANESE PANGRANGKEP
+A9E6          ; Lm #       MYANMAR MODIFIER LETTER SHAN REDUPLICATION
+AA70          ; Lm #       MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION
+AADD          ; Lm #       TAI VIET SYMBOL SAM
+AAF3..AAF4    ; Lm #   [2] MEETEI MAYEK SYLLABLE REPETITION MARK..MEETEI MAYEK WORD REPETITION MARK
+AB5C..AB5F    ; Lm #   [4] MODIFIER LETTER SMALL HENG..MODIFIER LETTER SMALL U WITH LEFT HOOK
+AB69          ; Lm #       MODIFIER LETTER SMALL TURNED W
+FF70          ; Lm #       HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK
+FF9E..FF9F    ; Lm #   [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK
+16B40..16B43  ; Lm #   [4] PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM
+16F93..16F9F  ; Lm #  [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8
+16FE0..16FE1  ; Lm #   [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK
+16FE3         ; Lm #       OLD CHINESE ITERATION MARK
+1E137..1E13D  ; Lm #   [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER
+1E94B         ; Lm #       ADLAM NASALIZATION MARK
+
+# Total code points: 260
+
+# ================================================
+
+# General_Category=Other_Letter
+
+00AA          ; Lo #       FEMININE ORDINAL INDICATOR
+00BA          ; Lo #       MASCULINE ORDINAL INDICATOR
+01BB          ; Lo #       LATIN LETTER TWO WITH STROKE
+01C0..01C3    ; Lo #   [4] LATIN LETTER DENTAL CLICK..LATIN LETTER RETROFLEX CLICK
+0294          ; Lo #       LATIN LETTER GLOTTAL STOP
+05D0..05EA    ; Lo #  [27] HEBREW LETTER ALEF..HEBREW LETTER TAV
+05EF..05F2    ; Lo #   [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD
+0620..063F    ; Lo #  [32] ARABIC LETTER KASHMIRI YEH..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE
+0641..064A    ; Lo #  [10] ARABIC LETTER FEH..ARABIC LETTER YEH
+066E..066F    ; Lo #   [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF
+0671..06D3    ; Lo #  [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
+06D5          ; Lo #       ARABIC LETTER AE
+06EE..06EF    ; Lo #   [2] ARABIC LETTER DAL WITH INVERTED V..ARABIC LETTER REH WITH INVERTED V
+06FA..06FC    ; Lo #   [3] ARABIC LETTER SHEEN WITH DOT BELOW..ARABIC LETTER GHAIN WITH DOT BELOW
+06FF          ; Lo #       ARABIC LETTER HEH WITH INVERTED V
+0710          ; Lo #       SYRIAC LETTER ALAPH
+0712..072F    ; Lo #  [30] SYRIAC LETTER BETH..SYRIAC LETTER PERSIAN DHALATH
+074D..07A5    ; Lo #  [89] SYRIAC LETTER SOGDIAN ZHAIN..THAANA LETTER WAAVU
+07B1          ; Lo #       THAANA LETTER NAA
+07CA..07EA    ; Lo #  [33] NKO LETTER A..NKO LETTER JONA RA
+0800..0815    ; Lo #  [22] SAMARITAN LETTER ALAF..SAMARITAN LETTER TAAF
+0840..0858    ; Lo #  [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN
+0860..086A    ; Lo #  [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA
+08A0..08B4    ; Lo #  [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW
+08B6..08C7    ; Lo #  [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE
+0904..0939    ; Lo #  [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA
+093D          ; Lo #       DEVANAGARI SIGN AVAGRAHA
+0950          ; Lo #       DEVANAGARI OM
+0958..0961    ; Lo #  [10] DEVANAGARI LETTER QA..DEVANAGARI LETTER VOCALIC LL
+0972..0980    ; Lo #  [15] DEVANAGARI LETTER CANDRA A..BENGALI ANJI
+0985..098C    ; Lo #   [8] BENGALI LETTER A..BENGALI LETTER VOCALIC L
+098F..0990    ; Lo #   [2] BENGALI LETTER E..BENGALI LETTER AI
+0993..09A8    ; Lo #  [22] BENGALI LETTER O..BENGALI LETTER NA
+09AA..09B0    ; Lo #   [7] BENGALI LETTER PA..BENGALI LETTER RA
+09B2          ; Lo #       BENGALI LETTER LA
+09B6..09B9    ; Lo #   [4] BENGALI LETTER SHA..BENGALI LETTER HA
+09BD          ; Lo #       BENGALI SIGN AVAGRAHA
+09CE          ; Lo #       BENGALI LETTER KHANDA TA
+09DC..09DD    ; Lo #   [2] BENGALI LETTER RRA..BENGALI LETTER RHA
+09DF..09E1    ; Lo #   [3] BENGALI LETTER YYA..BENGALI LETTER VOCALIC LL
+09F0..09F1    ; Lo #   [2] BENGALI LETTER RA WITH MIDDLE DIAGONAL..BENGALI LETTER RA WITH LOWER DIAGONAL
+09FC          ; Lo #       BENGALI LETTER VEDIC ANUSVARA
+0A05..0A0A    ; Lo #   [6] GURMUKHI LETTER A..GURMUKHI LETTER UU
+0A0F..0A10    ; Lo #   [2] GURMUKHI LETTER EE..GURMUKHI LETTER AI
+0A13..0A28    ; Lo #  [22] GURMUKHI LETTER OO..GURMUKHI LETTER NA
+0A2A..0A30    ; Lo #   [7] GURMUKHI LETTER PA..GURMUKHI LETTER RA
+0A32..0A33    ; Lo #   [2] GURMUKHI LETTER LA..GURMUKHI LETTER LLA
+0A35..0A36    ; Lo #   [2] GURMUKHI LETTER VA..GURMUKHI LETTER SHA
+0A38..0A39    ; Lo #   [2] GURMUKHI LETTER SA..GURMUKHI LETTER HA
+0A59..0A5C    ; Lo #   [4] GURMUKHI LETTER KHHA..GURMUKHI LETTER RRA
+0A5E          ; Lo #       GURMUKHI LETTER FA
+0A72..0A74    ; Lo #   [3] GURMUKHI IRI..GURMUKHI EK ONKAR
+0A85..0A8D    ; Lo #   [9] GUJARATI LETTER A..GUJARATI VOWEL CANDRA E
+0A8F..0A91    ; Lo #   [3] GUJARATI LETTER E..GUJARATI VOWEL CANDRA O
+0A93..0AA8    ; Lo #  [22] GUJARATI LETTER O..GUJARATI LETTER NA
+0AAA..0AB0    ; Lo #   [7] GUJARATI LETTER PA..GUJARATI LETTER RA
+0AB2..0AB3    ; Lo #   [2] GUJARATI LETTER LA..GUJARATI LETTER LLA
+0AB5..0AB9    ; Lo #   [5] GUJARATI LETTER VA..GUJARATI LETTER HA
+0ABD          ; Lo #       GUJARATI SIGN AVAGRAHA
+0AD0          ; Lo #       GUJARATI OM
+0AE0..0AE1    ; Lo #   [2] GUJARATI LETTER VOCALIC RR..GUJARATI LETTER VOCALIC LL
+0AF9          ; Lo #       GUJARATI LETTER ZHA
+0B05..0B0C    ; Lo #   [8] ORIYA LETTER A..ORIYA LETTER VOCALIC L
+0B0F..0B10    ; Lo #   [2] ORIYA LETTER E..ORIYA LETTER AI
+0B13..0B28    ; Lo #  [22] ORIYA LETTER O..ORIYA LETTER NA
+0B2A..0B30    ; Lo #   [7] ORIYA LETTER PA..ORIYA LETTER RA
+0B32..0B33    ; Lo #   [2] ORIYA LETTER LA..ORIYA LETTER LLA
+0B35..0B39    ; Lo #   [5] ORIYA LETTER VA..ORIYA LETTER HA
+0B3D          ; Lo #       ORIYA SIGN AVAGRAHA
+0B5C..0B5D    ; Lo #   [2] ORIYA LETTER RRA..ORIYA LETTER RHA
+0B5F..0B61    ; Lo #   [3] ORIYA LETTER YYA..ORIYA LETTER VOCALIC LL
+0B71          ; Lo #       ORIYA LETTER WA
+0B83          ; Lo #       TAMIL SIGN VISARGA
+0B85..0B8A    ; Lo #   [6] TAMIL LETTER A..TAMIL LETTER UU
+0B8E..0B90    ; Lo #   [3] TAMIL LETTER E..TAMIL LETTER AI
+0B92..0B95    ; Lo #   [4] TAMIL LETTER O..TAMIL LETTER KA
+0B99..0B9A    ; Lo #   [2] TAMIL LETTER NGA..TAMIL LETTER CA
+0B9C          ; Lo #       TAMIL LETTER JA
+0B9E..0B9F    ; Lo #   [2] TAMIL LETTER NYA..TAMIL LETTER TTA
+0BA3..0BA4    ; Lo #   [2] TAMIL LETTER NNA..TAMIL LETTER TA
+0BA8..0BAA    ; Lo #   [3] TAMIL LETTER NA..TAMIL LETTER PA
+0BAE..0BB9    ; Lo #  [12] TAMIL LETTER MA..TAMIL LETTER HA
+0BD0          ; Lo #       TAMIL OM
+0C05..0C0C    ; Lo #   [8] TELUGU LETTER A..TELUGU LETTER VOCALIC L
+0C0E..0C10    ; Lo #   [3] TELUGU LETTER E..TELUGU LETTER AI
+0C12..0C28    ; Lo #  [23] TELUGU LETTER O..TELUGU LETTER NA
+0C2A..0C39    ; Lo #  [16] TELUGU LETTER PA..TELUGU LETTER HA
+0C3D          ; Lo #       TELUGU SIGN AVAGRAHA
+0C58..0C5A    ; Lo #   [3] TELUGU LETTER TSA..TELUGU LETTER RRRA
+0C60..0C61    ; Lo #   [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL
+0C80          ; Lo #       KANNADA SIGN SPACING CANDRABINDU
+0C85..0C8C    ; Lo #   [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L
+0C8E..0C90    ; Lo #   [3] KANNADA LETTER E..KANNADA LETTER AI
+0C92..0CA8    ; Lo #  [23] KANNADA LETTER O..KANNADA LETTER NA
+0CAA..0CB3    ; Lo #  [10] KANNADA LETTER PA..KANNADA LETTER LLA
+0CB5..0CB9    ; Lo #   [5] KANNADA LETTER VA..KANNADA LETTER HA
+0CBD          ; Lo #       KANNADA SIGN AVAGRAHA
+0CDE          ; Lo #       KANNADA LETTER FA
+0CE0..0CE1    ; Lo #   [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL
+0CF1..0CF2    ; Lo #   [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA
+0D04..0D0C    ; Lo #   [9] MALAYALAM LETTER VEDIC ANUSVARA..MALAYALAM LETTER VOCALIC L
+0D0E..0D10    ; Lo #   [3] MALAYALAM LETTER E..MALAYALAM LETTER AI
+0D12..0D3A    ; Lo #  [41] MALAYALAM LETTER O..MALAYALAM LETTER TTTA
+0D3D          ; Lo #       MALAYALAM SIGN AVAGRAHA
+0D4E          ; Lo #       MALAYALAM LETTER DOT REPH
+0D54..0D56    ; Lo #   [3] MALAYALAM LETTER CHILLU M..MALAYALAM LETTER CHILLU LLL
+0D5F..0D61    ; Lo #   [3] MALAYALAM LETTER ARCHAIC II..MALAYALAM LETTER VOCALIC LL
+0D7A..0D7F    ; Lo #   [6] MALAYALAM LETTER CHILLU NN..MALAYALAM LETTER CHILLU K
+0D85..0D96    ; Lo #  [18] SINHALA LETTER AYANNA..SINHALA LETTER AUYANNA
+0D9A..0DB1    ; Lo #  [24] SINHALA LETTER ALPAPRAANA KAYANNA..SINHALA LETTER DANTAJA NAYANNA
+0DB3..0DBB    ; Lo #   [9] SINHALA LETTER SANYAKA DAYANNA..SINHALA LETTER RAYANNA
+0DBD          ; Lo #       SINHALA LETTER DANTAJA LAYANNA
+0DC0..0DC6    ; Lo #   [7] SINHALA LETTER VAYANNA..SINHALA LETTER FAYANNA
+0E01..0E30    ; Lo #  [48] THAI CHARACTER KO KAI..THAI CHARACTER SARA A
+0E32..0E33    ; Lo #   [2] THAI CHARACTER SARA AA..THAI CHARACTER SARA AM
+0E40..0E45    ; Lo #   [6] THAI CHARACTER SARA E..THAI CHARACTER LAKKHANGYAO
+0E81..0E82    ; Lo #   [2] LAO LETTER KO..LAO LETTER KHO SUNG
+0E84          ; Lo #       LAO LETTER KHO TAM
+0E86..0E8A    ; Lo #   [5] LAO LETTER PALI GHA..LAO LETTER SO TAM
+0E8C..0EA3    ; Lo #  [24] LAO LETTER PALI JHA..LAO LETTER LO LING
+0EA5          ; Lo #       LAO LETTER LO LOOT
+0EA7..0EB0    ; Lo #  [10] LAO LETTER WO..LAO VOWEL SIGN A
+0EB2..0EB3    ; Lo #   [2] LAO VOWEL SIGN AA..LAO VOWEL SIGN AM
+0EBD          ; Lo #       LAO SEMIVOWEL SIGN NYO
+0EC0..0EC4    ; Lo #   [5] LAO VOWEL SIGN E..LAO VOWEL SIGN AI
+0EDC..0EDF    ; Lo #   [4] LAO HO NO..LAO LETTER KHMU NYO
+0F00          ; Lo #       TIBETAN SYLLABLE OM
+0F40..0F47    ; Lo #   [8] TIBETAN LETTER KA..TIBETAN LETTER JA
+0F49..0F6C    ; Lo #  [36] TIBETAN LETTER NYA..TIBETAN LETTER RRA
+0F88..0F8C    ; Lo #   [5] TIBETAN SIGN LCE TSA CAN..TIBETAN SIGN INVERTED MCHU CAN
+1000..102A    ; Lo #  [43] MYANMAR LETTER KA..MYANMAR LETTER AU
+103F          ; Lo #       MYANMAR LETTER GREAT SA
+1050..1055    ; Lo #   [6] MYANMAR LETTER SHA..MYANMAR LETTER VOCALIC LL
+105A..105D    ; Lo #   [4] MYANMAR LETTER MON NGA..MYANMAR LETTER MON BBE
+1061          ; Lo #       MYANMAR LETTER SGAW KAREN SHA
+1065..1066    ; Lo #   [2] MYANMAR LETTER WESTERN PWO KAREN THA..MYANMAR LETTER WESTERN PWO KAREN PWA
+106E..1070    ; Lo #   [3] MYANMAR LETTER EASTERN PWO KAREN NNA..MYANMAR LETTER EASTERN PWO KAREN GHWA
+1075..1081    ; Lo #  [13] MYANMAR LETTER SHAN KA..MYANMAR LETTER SHAN HA
+108E          ; Lo #       MYANMAR LETTER RUMAI PALAUNG FA
+1100..1248    ; Lo # [329] HANGUL CHOSEONG KIYEOK..ETHIOPIC SYLLABLE QWA
+124A..124D    ; Lo #   [4] ETHIOPIC SYLLABLE QWI..ETHIOPIC SYLLABLE QWE
+1250..1256    ; Lo #   [7] ETHIOPIC SYLLABLE QHA..ETHIOPIC SYLLABLE QHO
+1258          ; Lo #       ETHIOPIC SYLLABLE QHWA
+125A..125D    ; Lo #   [4] ETHIOPIC SYLLABLE QHWI..ETHIOPIC SYLLABLE QHWE
+1260..1288    ; Lo #  [41] ETHIOPIC SYLLABLE BA..ETHIOPIC SYLLABLE XWA
+128A..128D    ; Lo #   [4] ETHIOPIC SYLLABLE XWI..ETHIOPIC SYLLABLE XWE
+1290..12B0    ; Lo #  [33] ETHIOPIC SYLLABLE NA..ETHIOPIC SYLLABLE KWA
+12B2..12B5    ; Lo #   [4] ETHIOPIC SYLLABLE KWI..ETHIOPIC SYLLABLE KWE
+12B8..12BE    ; Lo #   [7] ETHIOPIC SYLLABLE KXA..ETHIOPIC SYLLABLE KXO
+12C0          ; Lo #       ETHIOPIC SYLLABLE KXWA
+12C2..12C5    ; Lo #   [4] ETHIOPIC SYLLABLE KXWI..ETHIOPIC SYLLABLE KXWE
+12C8..12D6    ; Lo #  [15] ETHIOPIC SYLLABLE WA..ETHIOPIC SYLLABLE PHARYNGEAL O
+12D8..1310    ; Lo #  [57] ETHIOPIC SYLLABLE ZA..ETHIOPIC SYLLABLE GWA
+1312..1315    ; Lo #   [4] ETHIOPIC SYLLABLE GWI..ETHIOPIC SYLLABLE GWE
+1318..135A    ; Lo #  [67] ETHIOPIC SYLLABLE GGA..ETHIOPIC SYLLABLE FYA
+1380..138F    ; Lo #  [16] ETHIOPIC SYLLABLE SEBATBEIT MWA..ETHIOPIC SYLLABLE PWE
+1401..166C    ; Lo # [620] CANADIAN SYLLABICS E..CANADIAN SYLLABICS CARRIER TTSA
+166F..167F    ; Lo #  [17] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS BLACKFOOT W
+1681..169A    ; Lo #  [26] OGHAM LETTER BEITH..OGHAM LETTER PEITH
+16A0..16EA    ; Lo #  [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X
+16F1..16F8    ; Lo #   [8] RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC
+1700..170C    ; Lo #  [13] TAGALOG LETTER A..TAGALOG LETTER YA
+170E..1711    ; Lo #   [4] TAGALOG LETTER LA..TAGALOG LETTER HA
+1720..1731    ; Lo #  [18] HANUNOO LETTER A..HANUNOO LETTER HA
+1740..1751    ; Lo #  [18] BUHID LETTER A..BUHID LETTER HA
+1760..176C    ; Lo #  [13] TAGBANWA LETTER A..TAGBANWA LETTER YA
+176E..1770    ; Lo #   [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA
+1780..17B3    ; Lo #  [52] KHMER LETTER KA..KHMER INDEPENDENT VOWEL QAU
+17DC          ; Lo #       KHMER SIGN AVAKRAHASANYA
+1820..1842    ; Lo #  [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI
+1844..1878    ; Lo #  [53] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER CHA WITH TWO DOTS
+1880..1884    ; Lo #   [5] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER ALI GALI INVERTED UBADAMA
+1887..18A8    ; Lo #  [34] MONGOLIAN LETTER ALI GALI A..MONGOLIAN LETTER MANCHU ALI GALI BHA
+18AA          ; Lo #       MONGOLIAN LETTER MANCHU ALI GALI LHA
+18B0..18F5    ; Lo #  [70] CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S
+1900..191E    ; Lo #  [31] LIMBU VOWEL-CARRIER LETTER..LIMBU LETTER TRA
+1950..196D    ; Lo #  [30] TAI LE LETTER KA..TAI LE LETTER AI
+1970..1974    ; Lo #   [5] TAI LE LETTER TONE-2..TAI LE LETTER TONE-6
+1980..19AB    ; Lo #  [44] NEW TAI LUE LETTER HIGH QA..NEW TAI LUE LETTER LOW SUA
+19B0..19C9    ; Lo #  [26] NEW TAI LUE VOWEL SIGN VOWEL SHORTENER..NEW TAI LUE TONE MARK-2
+1A00..1A16    ; Lo #  [23] BUGINESE LETTER KA..BUGINESE LETTER HA
+1A20..1A54    ; Lo #  [53] TAI THAM LETTER HIGH KA..TAI THAM LETTER GREAT SA
+1B05..1B33    ; Lo #  [47] BALINESE LETTER AKARA..BALINESE LETTER HA
+1B45..1B4B    ; Lo #   [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK
+1B83..1BA0    ; Lo #  [30] SUNDANESE LETTER A..SUNDANESE LETTER HA
+1BAE..1BAF    ; Lo #   [2] SUNDANESE LETTER KHA..SUNDANESE LETTER SYA
+1BBA..1BE5    ; Lo #  [44] SUNDANESE AVAGRAHA..BATAK LETTER U
+1C00..1C23    ; Lo #  [36] LEPCHA LETTER KA..LEPCHA LETTER A
+1C4D..1C4F    ; Lo #   [3] LEPCHA LETTER TTA..LEPCHA LETTER DDA
+1C5A..1C77    ; Lo #  [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH
+1CE9..1CEC    ; Lo #   [4] VEDIC SIGN ANUSVARA ANTARGOMUKHA..VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL
+1CEE..1CF3    ; Lo #   [6] VEDIC SIGN HEXIFORM LONG ANUSVARA..VEDIC SIGN ROTATED ARDHAVISARGA
+1CF5..1CF6    ; Lo #   [2] VEDIC SIGN JIHVAMULIYA..VEDIC SIGN UPADHMANIYA
+1CFA          ; Lo #       VEDIC SIGN DOUBLE ANUSVARA ANTARGOMUKHA
+2135..2138    ; Lo #   [4] ALEF SYMBOL..DALET SYMBOL
+2D30..2D67    ; Lo #  [56] TIFINAGH LETTER YA..TIFINAGH LETTER YO
+2D80..2D96    ; Lo #  [23] ETHIOPIC SYLLABLE LOA..ETHIOPIC SYLLABLE GGWE
+2DA0..2DA6    ; Lo #   [7] ETHIOPIC SYLLABLE SSA..ETHIOPIC SYLLABLE SSO
+2DA8..2DAE    ; Lo #   [7] ETHIOPIC SYLLABLE CCA..ETHIOPIC SYLLABLE CCO
+2DB0..2DB6    ; Lo #   [7] ETHIOPIC SYLLABLE ZZA..ETHIOPIC SYLLABLE ZZO
+2DB8..2DBE    ; Lo #   [7] ETHIOPIC SYLLABLE CCHA..ETHIOPIC SYLLABLE CCHO
+2DC0..2DC6    ; Lo #   [7] ETHIOPIC SYLLABLE QYA..ETHIOPIC SYLLABLE QYO
+2DC8..2DCE    ; Lo #   [7] ETHIOPIC SYLLABLE KYA..ETHIOPIC SYLLABLE KYO
+2DD0..2DD6    ; Lo #   [7] ETHIOPIC SYLLABLE XYA..ETHIOPIC SYLLABLE XYO
+2DD8..2DDE    ; Lo #   [7] ETHIOPIC SYLLABLE GYA..ETHIOPIC SYLLABLE GYO
+3006          ; Lo #       IDEOGRAPHIC CLOSING MARK
+303C          ; Lo #       MASU MARK
+3041..3096    ; Lo #  [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE
+309F          ; Lo #       HIRAGANA DIGRAPH YORI
+30A1..30FA    ; Lo #  [90] KATAKANA LETTER SMALL A..KATAKANA LETTER VO
+30FF          ; Lo #       KATAKANA DIGRAPH KOTO
+3105..312F    ; Lo #  [43] BOPOMOFO LETTER B..BOPOMOFO LETTER NN
+3131..318E    ; Lo #  [94] HANGUL LETTER KIYEOK..HANGUL LETTER ARAEAE
+31A0..31BF    ; Lo #  [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH
+31F0..31FF    ; Lo #  [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO
+3400..4DBF    ; Lo # [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF
+4E00..9FFC    ; Lo # [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC
+A000..A014    ; Lo #  [21] YI SYLLABLE IT..YI SYLLABLE E
+A016..A48C    ; Lo # [1143] YI SYLLABLE BIT..YI SYLLABLE YYR
+A4D0..A4F7    ; Lo #  [40] LISU LETTER BA..LISU LETTER OE
+A500..A60B    ; Lo # [268] VAI SYLLABLE EE..VAI SYLLABLE NG
+A610..A61F    ; Lo #  [16] VAI SYLLABLE NDOLE FA..VAI SYMBOL JONG
+A62A..A62B    ; Lo #   [2] VAI SYLLABLE NDOLE MA..VAI SYLLABLE NDOLE DO
+A66E          ; Lo #       CYRILLIC LETTER MULTIOCULAR O
+A6A0..A6E5    ; Lo #  [70] BAMUM LETTER A..BAMUM LETTER KI
+A78F          ; Lo #       LATIN LETTER SINOLOGICAL DOT
+A7F7          ; Lo #       LATIN EPIGRAPHIC LETTER SIDEWAYS I
+A7FB..A801    ; Lo #   [7] LATIN EPIGRAPHIC LETTER REVERSED F..SYLOTI NAGRI LETTER I
+A803..A805    ; Lo #   [3] SYLOTI NAGRI LETTER U..SYLOTI NAGRI LETTER O
+A807..A80A    ; Lo #   [4] SYLOTI NAGRI LETTER KO..SYLOTI NAGRI LETTER GHO
+A80C..A822    ; Lo #  [23] SYLOTI NAGRI LETTER CO..SYLOTI NAGRI LETTER HO
+A840..A873    ; Lo #  [52] PHAGS-PA LETTER KA..PHAGS-PA LETTER CANDRABINDU
+A882..A8B3    ; Lo #  [50] SAURASHTRA LETTER A..SAURASHTRA LETTER LLA
+A8F2..A8F7    ; Lo #   [6] DEVANAGARI SIGN SPACING CANDRABINDU..DEVANAGARI SIGN CANDRABINDU AVAGRAHA
+A8FB          ; Lo #       DEVANAGARI HEADSTROKE
+A8FD..A8FE    ; Lo #   [2] DEVANAGARI JAIN OM..DEVANAGARI LETTER AY
+A90A..A925    ; Lo #  [28] KAYAH LI LETTER KA..KAYAH LI LETTER OO
+A930..A946    ; Lo #  [23] REJANG LETTER KA..REJANG LETTER A
+A960..A97C    ; Lo #  [29] HANGUL CHOSEONG TIKEUT-MIEUM..HANGUL CHOSEONG SSANGYEORINHIEUH
+A984..A9B2    ; Lo #  [47] JAVANESE LETTER A..JAVANESE LETTER HA
+A9E0..A9E4    ; Lo #   [5] MYANMAR LETTER SHAN GHA..MYANMAR LETTER SHAN BHA
+A9E7..A9EF    ; Lo #   [9] MYANMAR LETTER TAI LAING NYA..MYANMAR LETTER TAI LAING NNA
+A9FA..A9FE    ; Lo #   [5] MYANMAR LETTER TAI LAING LLA..MYANMAR LETTER TAI LAING BHA
+AA00..AA28    ; Lo #  [41] CHAM LETTER A..CHAM LETTER HA
+AA40..AA42    ; Lo #   [3] CHAM LETTER FINAL K..CHAM LETTER FINAL NG
+AA44..AA4B    ; Lo #   [8] CHAM LETTER FINAL CH..CHAM LETTER FINAL SS
+AA60..AA6F    ; Lo #  [16] MYANMAR LETTER KHAMTI GA..MYANMAR LETTER KHAMTI FA
+AA71..AA76    ; Lo #   [6] MYANMAR LETTER KHAMTI XA..MYANMAR LOGOGRAM KHAMTI HM
+AA7A          ; Lo #       MYANMAR LETTER AITON RA
+AA7E..AAAF    ; Lo #  [50] MYANMAR LETTER SHWE PALAUNG CHA..TAI VIET LETTER HIGH O
+AAB1          ; Lo #       TAI VIET VOWEL AA
+AAB5..AAB6    ; Lo #   [2] TAI VIET VOWEL E..TAI VIET VOWEL O
+AAB9..AABD    ; Lo #   [5] TAI VIET VOWEL UEA..TAI VIET VOWEL AN
+AAC0          ; Lo #       TAI VIET TONE MAI NUENG
+AAC2          ; Lo #       TAI VIET TONE MAI SONG
+AADB..AADC    ; Lo #   [2] TAI VIET SYMBOL KON..TAI VIET SYMBOL NUENG
+AAE0..AAEA    ; Lo #  [11] MEETEI MAYEK LETTER E..MEETEI MAYEK LETTER SSA
+AAF2          ; Lo #       MEETEI MAYEK ANJI
+AB01..AB06    ; Lo #   [6] ETHIOPIC SYLLABLE TTHU..ETHIOPIC SYLLABLE TTHO
+AB09..AB0E    ; Lo #   [6] ETHIOPIC SYLLABLE DDHU..ETHIOPIC SYLLABLE DDHO
+AB11..AB16    ; Lo #   [6] ETHIOPIC SYLLABLE DZU..ETHIOPIC SYLLABLE DZO
+AB20..AB26    ; Lo #   [7] ETHIOPIC SYLLABLE CCHHA..ETHIOPIC SYLLABLE CCHHO
+AB28..AB2E    ; Lo #   [7] ETHIOPIC SYLLABLE BBA..ETHIOPIC SYLLABLE BBO
+ABC0..ABE2    ; Lo #  [35] MEETEI MAYEK LETTER KOK..MEETEI MAYEK LETTER I LONSUM
+AC00..D7A3    ; Lo # [11172] HANGUL SYLLABLE GA..HANGUL SYLLABLE HIH
+D7B0..D7C6    ; Lo #  [23] HANGUL JUNGSEONG O-YEO..HANGUL JUNGSEONG ARAEA-E
+D7CB..D7FB    ; Lo #  [49] HANGUL JONGSEONG NIEUN-RIEUL..HANGUL JONGSEONG PHIEUPH-THIEUTH
+F900..FA6D    ; Lo # [366] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA6D
+FA70..FAD9    ; Lo # [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9
+FB1D          ; Lo #       HEBREW LETTER YOD WITH HIRIQ
+FB1F..FB28    ; Lo #  [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV
+FB2A..FB36    ; Lo #  [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH
+FB38..FB3C    ; Lo #   [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH
+FB3E          ; Lo #       HEBREW LETTER MEM WITH DAGESH
+FB40..FB41    ; Lo #   [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH
+FB43..FB44    ; Lo #   [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH
+FB46..FBB1    ; Lo # [108] HEBREW LETTER TSADI WITH DAGESH..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
+FBD3..FD3D    ; Lo # [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
+FD50..FD8F    ; Lo #  [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
+FD92..FDC7    ; Lo #  [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
+FDF0..FDFB    ; Lo #  [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU
+FE70..FE74    ; Lo #   [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM
+FE76..FEFC    ; Lo # [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM
+FF66..FF6F    ; Lo #  [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU
+FF71..FF9D    ; Lo #  [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N
+FFA0..FFBE    ; Lo #  [31] HALFWIDTH HANGUL FILLER..HALFWIDTH HANGUL LETTER HIEUH
+FFC2..FFC7    ; Lo #   [6] HALFWIDTH HANGUL LETTER A..HALFWIDTH HANGUL LETTER E
+FFCA..FFCF    ; Lo #   [6] HALFWIDTH HANGUL LETTER YEO..HALFWIDTH HANGUL LETTER OE
+FFD2..FFD7    ; Lo #   [6] HALFWIDTH HANGUL LETTER YO..HALFWIDTH HANGUL LETTER YU
+FFDA..FFDC    ; Lo #   [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL LETTER I
+10000..1000B  ; Lo #  [12] LINEAR B SYLLABLE B008 A..LINEAR B SYLLABLE B046 JE
+1000D..10026  ; Lo #  [26] LINEAR B SYLLABLE B036 JO..LINEAR B SYLLABLE B032 QO
+10028..1003A  ; Lo #  [19] LINEAR B SYLLABLE B060 RA..LINEAR B SYLLABLE B042 WO
+1003C..1003D  ; Lo #   [2] LINEAR B SYLLABLE B017 ZA..LINEAR B SYLLABLE B074 ZE
+1003F..1004D  ; Lo #  [15] LINEAR B SYLLABLE B020 ZO..LINEAR B SYLLABLE B091 TWO
+10050..1005D  ; Lo #  [14] LINEAR B SYMBOL B018..LINEAR B SYMBOL B089
+10080..100FA  ; Lo # [123] LINEAR B IDEOGRAM B100 MAN..LINEAR B IDEOGRAM VESSEL B305
+10280..1029C  ; Lo #  [29] LYCIAN LETTER A..LYCIAN LETTER X
+102A0..102D0  ; Lo #  [49] CARIAN LETTER A..CARIAN LETTER UUU3
+10300..1031F  ; Lo #  [32] OLD ITALIC LETTER A..OLD ITALIC LETTER ESS
+1032D..10340  ; Lo #  [20] OLD ITALIC LETTER YE..GOTHIC LETTER PAIRTHRA
+10342..10349  ; Lo #   [8] GOTHIC LETTER RAIDA..GOTHIC LETTER OTHAL
+10350..10375  ; Lo #  [38] OLD PERMIC LETTER AN..OLD PERMIC LETTER IA
+10380..1039D  ; Lo #  [30] UGARITIC LETTER ALPA..UGARITIC LETTER SSU
+103A0..103C3  ; Lo #  [36] OLD PERSIAN SIGN A..OLD PERSIAN SIGN HA
+103C8..103CF  ; Lo #   [8] OLD PERSIAN SIGN AURAMAZDAA..OLD PERSIAN SIGN BUUMISH
+10450..1049D  ; Lo #  [78] SHAVIAN LETTER PEEP..OSMANYA LETTER OO
+10500..10527  ; Lo #  [40] ELBASAN LETTER A..ELBASAN LETTER KHE
+10530..10563  ; Lo #  [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW
+10600..10736  ; Lo # [311] LINEAR A SIGN AB001..LINEAR A SIGN A664
+10740..10755  ; Lo #  [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE
+10760..10767  ; Lo #   [8] LINEAR A SIGN A800..LINEAR A SIGN A807
+10800..10805  ; Lo #   [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA
+10808         ; Lo #       CYPRIOT SYLLABLE JO
+1080A..10835  ; Lo #  [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO
+10837..10838  ; Lo #   [2] CYPRIOT SYLLABLE XA..CYPRIOT SYLLABLE XE
+1083C         ; Lo #       CYPRIOT SYLLABLE ZA
+1083F..10855  ; Lo #  [23] CYPRIOT SYLLABLE ZO..IMPERIAL ARAMAIC LETTER TAW
+10860..10876  ; Lo #  [23] PALMYRENE LETTER ALEPH..PALMYRENE LETTER TAW
+10880..1089E  ; Lo #  [31] NABATAEAN LETTER FINAL ALEPH..NABATAEAN LETTER TAW
+108E0..108F2  ; Lo #  [19] HATRAN LETTER ALEPH..HATRAN LETTER QOPH
+108F4..108F5  ; Lo #   [2] HATRAN LETTER SHIN..HATRAN LETTER TAW
+10900..10915  ; Lo #  [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU
+10920..10939  ; Lo #  [26] LYDIAN LETTER A..LYDIAN LETTER C
+10980..109B7  ; Lo #  [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA
+109BE..109BF  ; Lo #   [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN
+10A00         ; Lo #       KHAROSHTHI LETTER A
+10A10..10A13  ; Lo #   [4] KHAROSHTHI LETTER KA..KHAROSHTHI LETTER GHA
+10A15..10A17  ; Lo #   [3] KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA
+10A19..10A35  ; Lo #  [29] KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER VHA
+10A60..10A7C  ; Lo #  [29] OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABIAN LETTER THETH
+10A80..10A9C  ; Lo #  [29] OLD NORTH ARABIAN LETTER HEH..OLD NORTH ARABIAN LETTER ZAH
+10AC0..10AC7  ; Lo #   [8] MANICHAEAN LETTER ALEPH..MANICHAEAN LETTER WAW
+10AC9..10AE4  ; Lo #  [28] MANICHAEAN LETTER ZAYIN..MANICHAEAN LETTER TAW
+10B00..10B35  ; Lo #  [54] AVESTAN LETTER A..AVESTAN LETTER HE
+10B40..10B55  ; Lo #  [22] INSCRIPTIONAL PARTHIAN LETTER ALEPH..INSCRIPTIONAL PARTHIAN LETTER TAW
+10B60..10B72  ; Lo #  [19] INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPTIONAL PAHLAVI LETTER TAW
+10B80..10B91  ; Lo #  [18] PSALTER PAHLAVI LETTER ALEPH..PSALTER PAHLAVI LETTER TAW
+10C00..10C48  ; Lo #  [73] OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTER ORKHON BASH
+10D00..10D23  ; Lo #  [36] HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA MARK NA KHONNA
+10E80..10EA9  ; Lo #  [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET
+10EB0..10EB1  ; Lo #   [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE
+10F00..10F1C  ; Lo #  [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL
+10F27         ; Lo #       OLD SOGDIAN LIGATURE AYIN-DALETH
+10F30..10F45  ; Lo #  [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN
+10FB0..10FC4  ; Lo #  [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW
+10FE0..10FF6  ; Lo #  [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH
+11003..11037  ; Lo #  [53] BRAHMI SIGN JIHVAMULIYA..BRAHMI LETTER OLD TAMIL NNNA
+11083..110AF  ; Lo #  [45] KAITHI LETTER A..KAITHI LETTER HA
+110D0..110E8  ; Lo #  [25] SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE
+11103..11126  ; Lo #  [36] CHAKMA LETTER AA..CHAKMA LETTER HAA
+11144         ; Lo #       CHAKMA LETTER LHAA
+11147         ; Lo #       CHAKMA LETTER VAA
+11150..11172  ; Lo #  [35] MAHAJANI LETTER A..MAHAJANI LETTER RRA
+11176         ; Lo #       MAHAJANI LIGATURE SHRI
+11183..111B2  ; Lo #  [48] SHARADA LETTER A..SHARADA LETTER HA
+111C1..111C4  ; Lo #   [4] SHARADA SIGN AVAGRAHA..SHARADA OM
+111DA         ; Lo #       SHARADA EKAM
+111DC         ; Lo #       SHARADA HEADSTROKE
+11200..11211  ; Lo #  [18] KHOJKI LETTER A..KHOJKI LETTER JJA
+11213..1122B  ; Lo #  [25] KHOJKI LETTER NYA..KHOJKI LETTER LLA
+11280..11286  ; Lo #   [7] MULTANI LETTER A..MULTANI LETTER GA
+11288         ; Lo #       MULTANI LETTER GHA
+1128A..1128D  ; Lo #   [4] MULTANI LETTER CA..MULTANI LETTER JJA
+1128F..1129D  ; Lo #  [15] MULTANI LETTER NYA..MULTANI LETTER BA
+1129F..112A8  ; Lo #  [10] MULTANI LETTER BHA..MULTANI LETTER RHA
+112B0..112DE  ; Lo #  [47] KHUDAWADI LETTER A..KHUDAWADI LETTER HA
+11305..1130C  ; Lo #   [8] GRANTHA LETTER A..GRANTHA LETTER VOCALIC L
+1130F..11310  ; Lo #   [2] GRANTHA LETTER EE..GRANTHA LETTER AI
+11313..11328  ; Lo #  [22] GRANTHA LETTER OO..GRANTHA LETTER NA
+1132A..11330  ; Lo #   [7] GRANTHA LETTER PA..GRANTHA LETTER RA
+11332..11333  ; Lo #   [2] GRANTHA LETTER LA..GRANTHA LETTER LLA
+11335..11339  ; Lo #   [5] GRANTHA LETTER VA..GRANTHA LETTER HA
+1133D         ; Lo #       GRANTHA SIGN AVAGRAHA
+11350         ; Lo #       GRANTHA OM
+1135D..11361  ; Lo #   [5] GRANTHA SIGN PLUTA..GRANTHA LETTER VOCALIC LL
+11400..11434  ; Lo #  [53] NEWA LETTER A..NEWA LETTER HA
+11447..1144A  ; Lo #   [4] NEWA SIGN AVAGRAHA..NEWA SIDDHI
+1145F..11461  ; Lo #   [3] NEWA LETTER VEDIC ANUSVARA..NEWA SIGN UPADHMANIYA
+11480..114AF  ; Lo #  [48] TIRHUTA ANJI..TIRHUTA LETTER HA
+114C4..114C5  ; Lo #   [2] TIRHUTA SIGN AVAGRAHA..TIRHUTA GVANG
+114C7         ; Lo #       TIRHUTA OM
+11580..115AE  ; Lo #  [47] SIDDHAM LETTER A..SIDDHAM LETTER HA
+115D8..115DB  ; Lo #   [4] SIDDHAM LETTER THREE-CIRCLE ALTERNATE I..SIDDHAM LETTER ALTERNATE U
+11600..1162F  ; Lo #  [48] MODI LETTER A..MODI LETTER LLA
+11644         ; Lo #       MODI SIGN HUVA
+11680..116AA  ; Lo #  [43] TAKRI LETTER A..TAKRI LETTER RRA
+116B8         ; Lo #       TAKRI LETTER ARCHAIC KHA
+11700..1171A  ; Lo #  [27] AHOM LETTER KA..AHOM LETTER ALTERNATE BA
+11800..1182B  ; Lo #  [44] DOGRA LETTER A..DOGRA LETTER RRA
+118FF..11906  ; Lo #   [8] WARANG CITI OM..DIVES AKURU LETTER E
+11909         ; Lo #       DIVES AKURU LETTER O
+1190C..11913  ; Lo #   [8] DIVES AKURU LETTER KA..DIVES AKURU LETTER JA
+11915..11916  ; Lo #   [2] DIVES AKURU LETTER NYA..DIVES AKURU LETTER TTA
+11918..1192F  ; Lo #  [24] DIVES AKURU LETTER DDA..DIVES AKURU LETTER ZA
+1193F         ; Lo #       DIVES AKURU PREFIXED NASAL SIGN
+11941         ; Lo #       DIVES AKURU INITIAL RA
+119A0..119A7  ; Lo #   [8] NANDINAGARI LETTER A..NANDINAGARI LETTER VOCALIC RR
+119AA..119D0  ; Lo #  [39] NANDINAGARI LETTER E..NANDINAGARI LETTER RRA
+119E1         ; Lo #       NANDINAGARI SIGN AVAGRAHA
+119E3         ; Lo #       NANDINAGARI HEADSTROKE
+11A00         ; Lo #       ZANABAZAR SQUARE LETTER A
+11A0B..11A32  ; Lo #  [40] ZANABAZAR SQUARE LETTER KA..ZANABAZAR SQUARE LETTER KSSA
+11A3A         ; Lo #       ZANABAZAR SQUARE CLUSTER-INITIAL LETTER RA
+11A50         ; Lo #       SOYOMBO LETTER A
+11A5C..11A89  ; Lo #  [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA
+11A9D         ; Lo #       SOYOMBO MARK PLUTA
+11AC0..11AF8  ; Lo #  [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL
+11C00..11C08  ; Lo #   [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
+11C0A..11C2E  ; Lo #  [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA
+11C40         ; Lo #       BHAIKSUKI SIGN AVAGRAHA
+11C72..11C8F  ; Lo #  [30] MARCHEN LETTER KA..MARCHEN LETTER A
+11D00..11D06  ; Lo #   [7] MASARAM GONDI LETTER A..MASARAM GONDI LETTER E
+11D08..11D09  ; Lo #   [2] MASARAM GONDI LETTER AI..MASARAM GONDI LETTER O
+11D0B..11D30  ; Lo #  [38] MASARAM GONDI LETTER AU..MASARAM GONDI LETTER TRA
+11D46         ; Lo #       MASARAM GONDI REPHA
+11D60..11D65  ; Lo #   [6] GUNJALA GONDI LETTER A..GUNJALA GONDI LETTER UU
+11D67..11D68  ; Lo #   [2] GUNJALA GONDI LETTER EE..GUNJALA GONDI LETTER AI
+11D6A..11D89  ; Lo #  [32] GUNJALA GONDI LETTER OO..GUNJALA GONDI LETTER SA
+11D98         ; Lo #       GUNJALA GONDI OM
+11EE0..11EF2  ; Lo #  [19] MAKASAR LETTER KA..MAKASAR ANGKA
+11FB0         ; Lo #       LISU LETTER YHA
+12000..12399  ; Lo # [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U
+12480..12543  ; Lo # [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU
+13000..1342E  ; Lo # [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032
+14400..14646  ; Lo # [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530
+16800..16A38  ; Lo # [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ
+16A40..16A5E  ; Lo #  [31] MRO LETTER TA..MRO LETTER TEK
+16AD0..16AED  ; Lo #  [30] BASSA VAH LETTER ENNI..BASSA VAH LETTER I
+16B00..16B2F  ; Lo #  [48] PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG CONSONANT CAU
+16B63..16B77  ; Lo #  [21] PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS
+16B7D..16B8F  ; Lo #  [19] PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ
+16F00..16F4A  ; Lo #  [75] MIAO LETTER PA..MIAO LETTER RTE
+16F50         ; Lo #       MIAO LETTER NASALIZATION
+17000..187F7  ; Lo # [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7
+18800..18CD5  ; Lo # [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5
+18D00..18D08  ; Lo #   [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08
+1B000..1B11E  ; Lo # [287] KATAKANA LETTER ARCHAIC E..HENTAIGANA LETTER N-MU-MO-2
+1B150..1B152  ; Lo #   [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO
+1B164..1B167  ; Lo #   [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N
+1B170..1B2FB  ; Lo # [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB
+1BC00..1BC6A  ; Lo # [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M
+1BC70..1BC7C  ; Lo #  [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK
+1BC80..1BC88  ; Lo #   [9] DUPLOYAN AFFIX HIGH ACUTE..DUPLOYAN AFFIX HIGH VERTICAL
+1BC90..1BC99  ; Lo #  [10] DUPLOYAN AFFIX LOW ACUTE..DUPLOYAN AFFIX LOW ARROW
+1E100..1E12C  ; Lo #  [45] NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W
+1E14E         ; Lo #       NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ
+1E2C0..1E2EB  ; Lo #  [44] WANCHO LETTER AA..WANCHO LETTER YIH
+1E800..1E8C4  ; Lo # [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON
+1EE00..1EE03  ; Lo #   [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL
+1EE05..1EE1F  ; Lo #  [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF
+1EE21..1EE22  ; Lo #   [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM
+1EE24         ; Lo #       ARABIC MATHEMATICAL INITIAL HEH
+1EE27         ; Lo #       ARABIC MATHEMATICAL INITIAL HAH
+1EE29..1EE32  ; Lo #  [10] ARABIC MATHEMATICAL INITIAL YEH..ARABIC MATHEMATICAL INITIAL QAF
+1EE34..1EE37  ; Lo #   [4] ARABIC MATHEMATICAL INITIAL SHEEN..ARABIC MATHEMATICAL INITIAL KHAH
+1EE39         ; Lo #       ARABIC MATHEMATICAL INITIAL DAD
+1EE3B         ; Lo #       ARABIC MATHEMATICAL INITIAL GHAIN
+1EE42         ; Lo #       ARABIC MATHEMATICAL TAILED JEEM
+1EE47         ; Lo #       ARABIC MATHEMATICAL TAILED HAH
+1EE49         ; Lo #       ARABIC MATHEMATICAL TAILED YEH
+1EE4B         ; Lo #       ARABIC MATHEMATICAL TAILED LAM
+1EE4D..1EE4F  ; Lo #   [3] ARABIC MATHEMATICAL TAILED NOON..ARABIC MATHEMATICAL TAILED AIN
+1EE51..1EE52  ; Lo #   [2] ARABIC MATHEMATICAL TAILED SAD..ARABIC MATHEMATICAL TAILED QAF
+1EE54         ; Lo #       ARABIC MATHEMATICAL TAILED SHEEN
+1EE57         ; Lo #       ARABIC MATHEMATICAL TAILED KHAH
+1EE59         ; Lo #       ARABIC MATHEMATICAL TAILED DAD
+1EE5B         ; Lo #       ARABIC MATHEMATICAL TAILED GHAIN
+1EE5D         ; Lo #       ARABIC MATHEMATICAL TAILED DOTLESS NOON
+1EE5F         ; Lo #       ARABIC MATHEMATICAL TAILED DOTLESS QAF
+1EE61..1EE62  ; Lo #   [2] ARABIC MATHEMATICAL STRETCHED BEH..ARABIC MATHEMATICAL STRETCHED JEEM
+1EE64         ; Lo #       ARABIC MATHEMATICAL STRETCHED HEH
+1EE67..1EE6A  ; Lo #   [4] ARABIC MATHEMATICAL STRETCHED HAH..ARABIC MATHEMATICAL STRETCHED KAF
+1EE6C..1EE72  ; Lo #   [7] ARABIC MATHEMATICAL STRETCHED MEEM..ARABIC MATHEMATICAL STRETCHED QAF
+1EE74..1EE77  ; Lo #   [4] ARABIC MATHEMATICAL STRETCHED SHEEN..ARABIC MATHEMATICAL STRETCHED KHAH
+1EE79..1EE7C  ; Lo #   [4] ARABIC MATHEMATICAL STRETCHED DAD..ARABIC MATHEMATICAL STRETCHED DOTLESS BEH
+1EE7E         ; Lo #       ARABIC MATHEMATICAL STRETCHED DOTLESS FEH
+1EE80..1EE89  ; Lo #  [10] ARABIC MATHEMATICAL LOOPED ALEF..ARABIC MATHEMATICAL LOOPED YEH
+1EE8B..1EE9B  ; Lo #  [17] ARABIC MATHEMATICAL LOOPED LAM..ARABIC MATHEMATICAL LOOPED GHAIN
+1EEA1..1EEA3  ; Lo #   [3] ARABIC MATHEMATICAL DOUBLE-STRUCK BEH..ARABIC MATHEMATICAL DOUBLE-STRUCK DAL
+1EEA5..1EEA9  ; Lo #   [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
+1EEAB..1EEBB  ; Lo #  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
+20000..2A6DD  ; Lo # [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD
+2A700..2B734  ; Lo # [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
+2B740..2B81D  ; Lo # [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D
+2B820..2CEA1  ; Lo # [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1
+2CEB0..2EBE0  ; Lo # [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0
+2F800..2FA1D  ; Lo # [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D
+30000..3134A  ; Lo # [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A
+
+# Total code points: 127004
+
+# ================================================
+
+# General_Category=Nonspacing_Mark
+
+0300..036F    ; Mn # [112] COMBINING GRAVE ACCENT..COMBINING LATIN SMALL LETTER X
+0483..0487    ; Mn #   [5] COMBINING CYRILLIC TITLO..COMBINING CYRILLIC POKRYTIE
+0591..05BD    ; Mn #  [45] HEBREW ACCENT ETNAHTA..HEBREW POINT METEG
+05BF          ; Mn #       HEBREW POINT RAFE
+05C1..05C2    ; Mn #   [2] HEBREW POINT SHIN DOT..HEBREW POINT SIN DOT
+05C4..05C5    ; Mn #   [2] HEBREW MARK UPPER DOT..HEBREW MARK LOWER DOT
+05C7          ; Mn #       HEBREW POINT QAMATS QATAN
+0610..061A    ; Mn #  [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA
+064B..065F    ; Mn #  [21] ARABIC FATHATAN..ARABIC WAVY HAMZA BELOW
+0670          ; Mn #       ARABIC LETTER SUPERSCRIPT ALEF
+06D6..06DC    ; Mn #   [7] ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA..ARABIC SMALL HIGH SEEN
+06DF..06E4    ; Mn #   [6] ARABIC SMALL HIGH ROUNDED ZERO..ARABIC SMALL HIGH MADDA
+06E7..06E8    ; Mn #   [2] ARABIC SMALL HIGH YEH..ARABIC SMALL HIGH NOON
+06EA..06ED    ; Mn #   [4] ARABIC EMPTY CENTRE LOW STOP..ARABIC SMALL LOW MEEM
+0711          ; Mn #       SYRIAC LETTER SUPERSCRIPT ALAPH
+0730..074A    ; Mn #  [27] SYRIAC PTHAHA ABOVE..SYRIAC BARREKH
+07A6..07B0    ; Mn #  [11] THAANA ABAFILI..THAANA SUKUN
+07EB..07F3    ; Mn #   [9] NKO COMBINING SHORT HIGH TONE..NKO COMBINING DOUBLE DOT ABOVE
+07FD          ; Mn #       NKO DANTAYALAN
+0816..0819    ; Mn #   [4] SAMARITAN MARK IN..SAMARITAN MARK DAGESH
+081B..0823    ; Mn #   [9] SAMARITAN MARK EPENTHETIC YUT..SAMARITAN VOWEL SIGN A
+0825..0827    ; Mn #   [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U
+0829..082D    ; Mn #   [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA
+0859..085B    ; Mn #   [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK
+08D3..08E1    ; Mn #  [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA
+08E3..0902    ; Mn #  [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA
+093A          ; Mn #       DEVANAGARI VOWEL SIGN OE
+093C          ; Mn #       DEVANAGARI SIGN NUKTA
+0941..0948    ; Mn #   [8] DEVANAGARI VOWEL SIGN U..DEVANAGARI VOWEL SIGN AI
+094D          ; Mn #       DEVANAGARI SIGN VIRAMA
+0951..0957    ; Mn #   [7] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI VOWEL SIGN UUE
+0962..0963    ; Mn #   [2] DEVANAGARI VOWEL SIGN VOCALIC L..DEVANAGARI VOWEL SIGN VOCALIC LL
+0981          ; Mn #       BENGALI SIGN CANDRABINDU
+09BC          ; Mn #       BENGALI SIGN NUKTA
+09C1..09C4    ; Mn #   [4] BENGALI VOWEL SIGN U..BENGALI VOWEL SIGN VOCALIC RR
+09CD          ; Mn #       BENGALI SIGN VIRAMA
+09E2..09E3    ; Mn #   [2] BENGALI VOWEL SIGN VOCALIC L..BENGALI VOWEL SIGN VOCALIC LL
+09FE          ; Mn #       BENGALI SANDHI MARK
+0A01..0A02    ; Mn #   [2] GURMUKHI SIGN ADAK BINDI..GURMUKHI SIGN BINDI
+0A3C          ; Mn #       GURMUKHI SIGN NUKTA
+0A41..0A42    ; Mn #   [2] GURMUKHI VOWEL SIGN U..GURMUKHI VOWEL SIGN UU
+0A47..0A48    ; Mn #   [2] GURMUKHI VOWEL SIGN EE..GURMUKHI VOWEL SIGN AI
+0A4B..0A4D    ; Mn #   [3] GURMUKHI VOWEL SIGN OO..GURMUKHI SIGN VIRAMA
+0A51          ; Mn #       GURMUKHI SIGN UDAAT
+0A70..0A71    ; Mn #   [2] GURMUKHI TIPPI..GURMUKHI ADDAK
+0A75          ; Mn #       GURMUKHI SIGN YAKASH
+0A81..0A82    ; Mn #   [2] GUJARATI SIGN CANDRABINDU..GUJARATI SIGN ANUSVARA
+0ABC          ; Mn #       GUJARATI SIGN NUKTA
+0AC1..0AC5    ; Mn #   [5] GUJARATI VOWEL SIGN U..GUJARATI VOWEL SIGN CANDRA E
+0AC7..0AC8    ; Mn #   [2] GUJARATI VOWEL SIGN E..GUJARATI VOWEL SIGN AI
+0ACD          ; Mn #       GUJARATI SIGN VIRAMA
+0AE2..0AE3    ; Mn #   [2] GUJARATI VOWEL SIGN VOCALIC L..GUJARATI VOWEL SIGN VOCALIC LL
+0AFA..0AFF    ; Mn #   [6] GUJARATI SIGN SUKUN..GUJARATI SIGN TWO-CIRCLE NUKTA ABOVE
+0B01          ; Mn #       ORIYA SIGN CANDRABINDU
+0B3C          ; Mn #       ORIYA SIGN NUKTA
+0B3F          ; Mn #       ORIYA VOWEL SIGN I
+0B41..0B44    ; Mn #   [4] ORIYA VOWEL SIGN U..ORIYA VOWEL SIGN VOCALIC RR
+0B4D          ; Mn #       ORIYA SIGN VIRAMA
+0B55..0B56    ; Mn #   [2] ORIYA SIGN OVERLINE..ORIYA AI LENGTH MARK
+0B62..0B63    ; Mn #   [2] ORIYA VOWEL SIGN VOCALIC L..ORIYA VOWEL SIGN VOCALIC LL
+0B82          ; Mn #       TAMIL SIGN ANUSVARA
+0BC0          ; Mn #       TAMIL VOWEL SIGN II
+0BCD          ; Mn #       TAMIL SIGN VIRAMA
+0C00          ; Mn #       TELUGU SIGN COMBINING CANDRABINDU ABOVE
+0C04          ; Mn #       TELUGU SIGN COMBINING ANUSVARA ABOVE
+0C3E..0C40    ; Mn #   [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II
+0C46..0C48    ; Mn #   [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI
+0C4A..0C4D    ; Mn #   [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA
+0C55..0C56    ; Mn #   [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK
+0C62..0C63    ; Mn #   [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL
+0C81          ; Mn #       KANNADA SIGN CANDRABINDU
+0CBC          ; Mn #       KANNADA SIGN NUKTA
+0CBF          ; Mn #       KANNADA VOWEL SIGN I
+0CC6          ; Mn #       KANNADA VOWEL SIGN E
+0CCC..0CCD    ; Mn #   [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA
+0CE2..0CE3    ; Mn #   [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL
+0D00..0D01    ; Mn #   [2] MALAYALAM SIGN COMBINING ANUSVARA ABOVE..MALAYALAM SIGN CANDRABINDU
+0D3B..0D3C    ; Mn #   [2] MALAYALAM SIGN VERTICAL BAR VIRAMA..MALAYALAM SIGN CIRCULAR VIRAMA
+0D41..0D44    ; Mn #   [4] MALAYALAM VOWEL SIGN U..MALAYALAM VOWEL SIGN VOCALIC RR
+0D4D          ; Mn #       MALAYALAM SIGN VIRAMA
+0D62..0D63    ; Mn #   [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL
+0D81          ; Mn #       SINHALA SIGN CANDRABINDU
+0DCA          ; Mn #       SINHALA SIGN AL-LAKUNA
+0DD2..0DD4    ; Mn #   [3] SINHALA VOWEL SIGN KETTI IS-PILLA..SINHALA VOWEL SIGN KETTI PAA-PILLA
+0DD6          ; Mn #       SINHALA VOWEL SIGN DIGA PAA-PILLA
+0E31          ; Mn #       THAI CHARACTER MAI HAN-AKAT
+0E34..0E3A    ; Mn #   [7] THAI CHARACTER SARA I..THAI CHARACTER PHINTHU
+0E47..0E4E    ; Mn #   [8] THAI CHARACTER MAITAIKHU..THAI CHARACTER YAMAKKAN
+0EB1          ; Mn #       LAO VOWEL SIGN MAI KAN
+0EB4..0EBC    ; Mn #   [9] LAO VOWEL SIGN I..LAO SEMIVOWEL SIGN LO
+0EC8..0ECD    ; Mn #   [6] LAO TONE MAI EK..LAO NIGGAHITA
+0F18..0F19    ; Mn #   [2] TIBETAN ASTROLOGICAL SIGN -KHYUD PA..TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
+0F35          ; Mn #       TIBETAN MARK NGAS BZUNG NYI ZLA
+0F37          ; Mn #       TIBETAN MARK NGAS BZUNG SGOR RTAGS
+0F39          ; Mn #       TIBETAN MARK TSA -PHRU
+0F71..0F7E    ; Mn #  [14] TIBETAN VOWEL SIGN AA..TIBETAN SIGN RJES SU NGA RO
+0F80..0F84    ; Mn #   [5] TIBETAN VOWEL SIGN REVERSED I..TIBETAN MARK HALANTA
+0F86..0F87    ; Mn #   [2] TIBETAN SIGN LCI RTAGS..TIBETAN SIGN YANG RTAGS
+0F8D..0F97    ; Mn #  [11] TIBETAN SUBJOINED SIGN LCE TSA CAN..TIBETAN SUBJOINED LETTER JA
+0F99..0FBC    ; Mn #  [36] TIBETAN SUBJOINED LETTER NYA..TIBETAN SUBJOINED LETTER FIXED-FORM RA
+0FC6          ; Mn #       TIBETAN SYMBOL PADMA GDAN
+102D..1030    ; Mn #   [4] MYANMAR VOWEL SIGN I..MYANMAR VOWEL SIGN UU
+1032..1037    ; Mn #   [6] MYANMAR VOWEL SIGN AI..MYANMAR SIGN DOT BELOW
+1039..103A    ; Mn #   [2] MYANMAR SIGN VIRAMA..MYANMAR SIGN ASAT
+103D..103E    ; Mn #   [2] MYANMAR CONSONANT SIGN MEDIAL WA..MYANMAR CONSONANT SIGN MEDIAL HA
+1058..1059    ; Mn #   [2] MYANMAR VOWEL SIGN VOCALIC L..MYANMAR VOWEL SIGN VOCALIC LL
+105E..1060    ; Mn #   [3] MYANMAR CONSONANT SIGN MON MEDIAL NA..MYANMAR CONSONANT SIGN MON MEDIAL LA
+1071..1074    ; Mn #   [4] MYANMAR VOWEL SIGN GEBA KAREN I..MYANMAR VOWEL SIGN KAYAH EE
+1082          ; Mn #       MYANMAR CONSONANT SIGN SHAN MEDIAL WA
+1085..1086    ; Mn #   [2] MYANMAR VOWEL SIGN SHAN E ABOVE..MYANMAR VOWEL SIGN SHAN FINAL Y
+108D          ; Mn #       MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE
+109D          ; Mn #       MYANMAR VOWEL SIGN AITON AI
+135D..135F    ; Mn #   [3] ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING GEMINATION MARK
+1712..1714    ; Mn #   [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA
+1732..1734    ; Mn #   [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD
+1752..1753    ; Mn #   [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U
+1772..1773    ; Mn #   [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U
+17B4..17B5    ; Mn #   [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA
+17B7..17BD    ; Mn #   [7] KHMER VOWEL SIGN I..KHMER VOWEL SIGN UA
+17C6          ; Mn #       KHMER SIGN NIKAHIT
+17C9..17D3    ; Mn #  [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT
+17DD          ; Mn #       KHMER SIGN ATTHACAN
+180B..180D    ; Mn #   [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE
+1885..1886    ; Mn #   [2] MONGOLIAN LETTER ALI GALI BALUDA..MONGOLIAN LETTER ALI GALI THREE BALUDA
+18A9          ; Mn #       MONGOLIAN LETTER ALI GALI DAGALGA
+1920..1922    ; Mn #   [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U
+1927..1928    ; Mn #   [2] LIMBU VOWEL SIGN E..LIMBU VOWEL SIGN O
+1932          ; Mn #       LIMBU SMALL LETTER ANUSVARA
+1939..193B    ; Mn #   [3] LIMBU SIGN MUKPHRENG..LIMBU SIGN SA-I
+1A17..1A18    ; Mn #   [2] BUGINESE VOWEL SIGN I..BUGINESE VOWEL SIGN U
+1A1B          ; Mn #       BUGINESE VOWEL SIGN AE
+1A56          ; Mn #       TAI THAM CONSONANT SIGN MEDIAL LA
+1A58..1A5E    ; Mn #   [7] TAI THAM SIGN MAI KANG LAI..TAI THAM CONSONANT SIGN SA
+1A60          ; Mn #       TAI THAM SIGN SAKOT
+1A62          ; Mn #       TAI THAM VOWEL SIGN MAI SAT
+1A65..1A6C    ; Mn #   [8] TAI THAM VOWEL SIGN I..TAI THAM VOWEL SIGN OA BELOW
+1A73..1A7C    ; Mn #  [10] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN KHUEN-LUE KARAN
+1A7F          ; Mn #       TAI THAM COMBINING CRYPTOGRAMMIC DOT
+1AB0..1ABD    ; Mn #  [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW
+1ABF..1AC0    ; Mn #   [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW
+1B00..1B03    ; Mn #   [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG
+1B34          ; Mn #       BALINESE SIGN REREKAN
+1B36..1B3A    ; Mn #   [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA
+1B3C          ; Mn #       BALINESE VOWEL SIGN LA LENGA
+1B42          ; Mn #       BALINESE VOWEL SIGN PEPET
+1B6B..1B73    ; Mn #   [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG
+1B80..1B81    ; Mn #   [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR
+1BA2..1BA5    ; Mn #   [4] SUNDANESE CONSONANT SIGN PANYAKRA..SUNDANESE VOWEL SIGN PANYUKU
+1BA8..1BA9    ; Mn #   [2] SUNDANESE VOWEL SIGN PAMEPET..SUNDANESE VOWEL SIGN PANEULEUNG
+1BAB..1BAD    ; Mn #   [3] SUNDANESE SIGN VIRAMA..SUNDANESE CONSONANT SIGN PASANGAN WA
+1BE6          ; Mn #       BATAK SIGN TOMPI
+1BE8..1BE9    ; Mn #   [2] BATAK VOWEL SIGN PAKPAK E..BATAK VOWEL SIGN EE
+1BED          ; Mn #       BATAK VOWEL SIGN KARO O
+1BEF..1BF1    ; Mn #   [3] BATAK VOWEL SIGN U FOR SIMALUNGUN SA..BATAK CONSONANT SIGN H
+1C2C..1C33    ; Mn #   [8] LEPCHA VOWEL SIGN E..LEPCHA CONSONANT SIGN T
+1C36..1C37    ; Mn #   [2] LEPCHA SIGN RAN..LEPCHA SIGN NUKTA
+1CD0..1CD2    ; Mn #   [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
+1CD4..1CE0    ; Mn #  [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA
+1CE2..1CE8    ; Mn #   [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL
+1CED          ; Mn #       VEDIC SIGN TIRYAK
+1CF4          ; Mn #       VEDIC TONE CANDRA ABOVE
+1CF8..1CF9    ; Mn #   [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE
+1DC0..1DF9    ; Mn #  [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW
+1DFB..1DFF    ; Mn #   [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
+20D0..20DC    ; Mn #  [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE
+20E1          ; Mn #       COMBINING LEFT RIGHT ARROW ABOVE
+20E5..20F0    ; Mn #  [12] COMBINING REVERSE SOLIDUS OVERLAY..COMBINING ASTERISK ABOVE
+2CEF..2CF1    ; Mn #   [3] COPTIC COMBINING NI ABOVE..COPTIC COMBINING SPIRITUS LENIS
+2D7F          ; Mn #       TIFINAGH CONSONANT JOINER
+2DE0..2DFF    ; Mn #  [32] COMBINING CYRILLIC LETTER BE..COMBINING CYRILLIC LETTER IOTIFIED BIG YUS
+302A..302D    ; Mn #   [4] IDEOGRAPHIC LEVEL TONE MARK..IDEOGRAPHIC ENTERING TONE MARK
+3099..309A    ; Mn #   [2] COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK..COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+A66F          ; Mn #       COMBINING CYRILLIC VZMET
+A674..A67D    ; Mn #  [10] COMBINING CYRILLIC LETTER UKRAINIAN IE..COMBINING CYRILLIC PAYEROK
+A69E..A69F    ; Mn #   [2] COMBINING CYRILLIC LETTER EF..COMBINING CYRILLIC LETTER IOTIFIED E
+A6F0..A6F1    ; Mn #   [2] BAMUM COMBINING MARK KOQNDON..BAMUM COMBINING MARK TUKWENTIS
+A802          ; Mn #       SYLOTI NAGRI SIGN DVISVARA
+A806          ; Mn #       SYLOTI NAGRI SIGN HASANTA
+A80B          ; Mn #       SYLOTI NAGRI SIGN ANUSVARA
+A825..A826    ; Mn #   [2] SYLOTI NAGRI VOWEL SIGN U..SYLOTI NAGRI VOWEL SIGN E
+A82C          ; Mn #       SYLOTI NAGRI SIGN ALTERNATE HASANTA
+A8C4..A8C5    ; Mn #   [2] SAURASHTRA SIGN VIRAMA..SAURASHTRA SIGN CANDRABINDU
+A8E0..A8F1    ; Mn #  [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA
+A8FF          ; Mn #       DEVANAGARI VOWEL SIGN AY
+A926..A92D    ; Mn #   [8] KAYAH LI VOWEL UE..KAYAH LI TONE CALYA PLOPHU
+A947..A951    ; Mn #  [11] REJANG VOWEL SIGN I..REJANG CONSONANT SIGN R
+A980..A982    ; Mn #   [3] JAVANESE SIGN PANYANGGA..JAVANESE SIGN LAYAR
+A9B3          ; Mn #       JAVANESE SIGN CECAK TELU
+A9B6..A9B9    ; Mn #   [4] JAVANESE VOWEL SIGN WULU..JAVANESE VOWEL SIGN SUKU MENDUT
+A9BC..A9BD    ; Mn #   [2] JAVANESE VOWEL SIGN PEPET..JAVANESE CONSONANT SIGN KERET
+A9E5          ; Mn #       MYANMAR SIGN SHAN SAW
+AA29..AA2E    ; Mn #   [6] CHAM VOWEL SIGN AA..CHAM VOWEL SIGN OE
+AA31..AA32    ; Mn #   [2] CHAM VOWEL SIGN AU..CHAM VOWEL SIGN UE
+AA35..AA36    ; Mn #   [2] CHAM CONSONANT SIGN LA..CHAM CONSONANT SIGN WA
+AA43          ; Mn #       CHAM CONSONANT SIGN FINAL NG
+AA4C          ; Mn #       CHAM CONSONANT SIGN FINAL M
+AA7C          ; Mn #       MYANMAR SIGN TAI LAING TONE-2
+AAB0          ; Mn #       TAI VIET MAI KANG
+AAB2..AAB4    ; Mn #   [3] TAI VIET VOWEL I..TAI VIET VOWEL U
+AAB7..AAB8    ; Mn #   [2] TAI VIET MAI KHIT..TAI VIET VOWEL IA
+AABE..AABF    ; Mn #   [2] TAI VIET VOWEL AM..TAI VIET TONE MAI EK
+AAC1          ; Mn #       TAI VIET TONE MAI THO
+AAEC..AAED    ; Mn #   [2] MEETEI MAYEK VOWEL SIGN UU..MEETEI MAYEK VOWEL SIGN AAI
+AAF6          ; Mn #       MEETEI MAYEK VIRAMA
+ABE5          ; Mn #       MEETEI MAYEK VOWEL SIGN ANAP
+ABE8          ; Mn #       MEETEI MAYEK VOWEL SIGN UNAP
+ABED          ; Mn #       MEETEI MAYEK APUN IYEK
+FB1E          ; Mn #       HEBREW POINT JUDEO-SPANISH VARIKA
+FE00..FE0F    ; Mn #  [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16
+FE20..FE2F    ; Mn #  [16] COMBINING LIGATURE LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF
+101FD         ; Mn #       PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE
+102E0         ; Mn #       COPTIC EPACT THOUSANDS MARK
+10376..1037A  ; Mn #   [5] COMBINING OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII
+10A01..10A03  ; Mn #   [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R
+10A05..10A06  ; Mn #   [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O
+10A0C..10A0F  ; Mn #   [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA
+10A38..10A3A  ; Mn #   [3] KHAROSHTHI SIGN BAR ABOVE..KHAROSHTHI SIGN DOT BELOW
+10A3F         ; Mn #       KHAROSHTHI VIRAMA
+10AE5..10AE6  ; Mn #   [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW
+10D24..10D27  ; Mn #   [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI
+10EAB..10EAC  ; Mn #   [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK
+10F46..10F50  ; Mn #  [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW
+11001         ; Mn #       BRAHMI SIGN ANUSVARA
+11038..11046  ; Mn #  [15] BRAHMI VOWEL SIGN AA..BRAHMI VIRAMA
+1107F..11081  ; Mn #   [3] BRAHMI NUMBER JOINER..KAITHI SIGN ANUSVARA
+110B3..110B6  ; Mn #   [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI
+110B9..110BA  ; Mn #   [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA
+11100..11102  ; Mn #   [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA
+11127..1112B  ; Mn #   [5] CHAKMA VOWEL SIGN A..CHAKMA VOWEL SIGN UU
+1112D..11134  ; Mn #   [8] CHAKMA VOWEL SIGN AI..CHAKMA MAAYYAA
+11173         ; Mn #       MAHAJANI SIGN NUKTA
+11180..11181  ; Mn #   [2] SHARADA SIGN CANDRABINDU..SHARADA SIGN ANUSVARA
+111B6..111BE  ; Mn #   [9] SHARADA VOWEL SIGN U..SHARADA VOWEL SIGN O
+111C9..111CC  ; Mn #   [4] SHARADA SANDHI MARK..SHARADA EXTRA SHORT VOWEL MARK
+111CF         ; Mn #       SHARADA SIGN INVERTED CANDRABINDU
+1122F..11231  ; Mn #   [3] KHOJKI VOWEL SIGN U..KHOJKI VOWEL SIGN AI
+11234         ; Mn #       KHOJKI SIGN ANUSVARA
+11236..11237  ; Mn #   [2] KHOJKI SIGN NUKTA..KHOJKI SIGN SHADDA
+1123E         ; Mn #       KHOJKI SIGN SUKUN
+112DF         ; Mn #       KHUDAWADI SIGN ANUSVARA
+112E3..112EA  ; Mn #   [8] KHUDAWADI VOWEL SIGN U..KHUDAWADI SIGN VIRAMA
+11300..11301  ; Mn #   [2] GRANTHA SIGN COMBINING ANUSVARA ABOVE..GRANTHA SIGN CANDRABINDU
+1133B..1133C  ; Mn #   [2] COMBINING BINDU BELOW..GRANTHA SIGN NUKTA
+11340         ; Mn #       GRANTHA VOWEL SIGN II
+11366..1136C  ; Mn #   [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX
+11370..11374  ; Mn #   [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA
+11438..1143F  ; Mn #   [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI
+11442..11444  ; Mn #   [3] NEWA SIGN VIRAMA..NEWA SIGN ANUSVARA
+11446         ; Mn #       NEWA SIGN NUKTA
+1145E         ; Mn #       NEWA SANDHI MARK
+114B3..114B8  ; Mn #   [6] TIRHUTA VOWEL SIGN U..TIRHUTA VOWEL SIGN VOCALIC LL
+114BA         ; Mn #       TIRHUTA VOWEL SIGN SHORT E
+114BF..114C0  ; Mn #   [2] TIRHUTA SIGN CANDRABINDU..TIRHUTA SIGN ANUSVARA
+114C2..114C3  ; Mn #   [2] TIRHUTA SIGN VIRAMA..TIRHUTA SIGN NUKTA
+115B2..115B5  ; Mn #   [4] SIDDHAM VOWEL SIGN U..SIDDHAM VOWEL SIGN VOCALIC RR
+115BC..115BD  ; Mn #   [2] SIDDHAM SIGN CANDRABINDU..SIDDHAM SIGN ANUSVARA
+115BF..115C0  ; Mn #   [2] SIDDHAM SIGN VIRAMA..SIDDHAM SIGN NUKTA
+115DC..115DD  ; Mn #   [2] SIDDHAM VOWEL SIGN ALTERNATE U..SIDDHAM VOWEL SIGN ALTERNATE UU
+11633..1163A  ; Mn #   [8] MODI VOWEL SIGN U..MODI VOWEL SIGN AI
+1163D         ; Mn #       MODI SIGN ANUSVARA
+1163F..11640  ; Mn #   [2] MODI SIGN VIRAMA..MODI SIGN ARDHACANDRA
+116AB         ; Mn #       TAKRI SIGN ANUSVARA
+116AD         ; Mn #       TAKRI VOWEL SIGN AA
+116B0..116B5  ; Mn #   [6] TAKRI VOWEL SIGN U..TAKRI VOWEL SIGN AU
+116B7         ; Mn #       TAKRI SIGN NUKTA
+1171D..1171F  ; Mn #   [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA
+11722..11725  ; Mn #   [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU
+11727..1172B  ; Mn #   [5] AHOM VOWEL SIGN AW..AHOM SIGN KILLER
+1182F..11837  ; Mn #   [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA
+11839..1183A  ; Mn #   [2] DOGRA SIGN VIRAMA..DOGRA SIGN NUKTA
+1193B..1193C  ; Mn #   [2] DIVES AKURU SIGN ANUSVARA..DIVES AKURU SIGN CANDRABINDU
+1193E         ; Mn #       DIVES AKURU VIRAMA
+11943         ; Mn #       DIVES AKURU SIGN NUKTA
+119D4..119D7  ; Mn #   [4] NANDINAGARI VOWEL SIGN U..NANDINAGARI VOWEL SIGN VOCALIC RR
+119DA..119DB  ; Mn #   [2] NANDINAGARI VOWEL SIGN E..NANDINAGARI VOWEL SIGN AI
+119E0         ; Mn #       NANDINAGARI SIGN VIRAMA
+11A01..11A0A  ; Mn #  [10] ZANABAZAR SQUARE VOWEL SIGN I..ZANABAZAR SQUARE VOWEL LENGTH MARK
+11A33..11A38  ; Mn #   [6] ZANABAZAR SQUARE FINAL CONSONANT MARK..ZANABAZAR SQUARE SIGN ANUSVARA
+11A3B..11A3E  ; Mn #   [4] ZANABAZAR SQUARE CLUSTER-FINAL LETTER YA..ZANABAZAR SQUARE CLUSTER-FINAL LETTER VA
+11A47         ; Mn #       ZANABAZAR SQUARE SUBJOINER
+11A51..11A56  ; Mn #   [6] SOYOMBO VOWEL SIGN I..SOYOMBO VOWEL SIGN OE
+11A59..11A5B  ; Mn #   [3] SOYOMBO VOWEL SIGN VOCALIC R..SOYOMBO VOWEL LENGTH MARK
+11A8A..11A96  ; Mn #  [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA
+11A98..11A99  ; Mn #   [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER
+11C30..11C36  ; Mn #   [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
+11C38..11C3D  ; Mn #   [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
+11C3F         ; Mn #       BHAIKSUKI SIGN VIRAMA
+11C92..11CA7  ; Mn #  [22] MARCHEN SUBJOINED LETTER KA..MARCHEN SUBJOINED LETTER ZA
+11CAA..11CB0  ; Mn #   [7] MARCHEN SUBJOINED LETTER RA..MARCHEN VOWEL SIGN AA
+11CB2..11CB3  ; Mn #   [2] MARCHEN VOWEL SIGN U..MARCHEN VOWEL SIGN E
+11CB5..11CB6  ; Mn #   [2] MARCHEN SIGN ANUSVARA..MARCHEN SIGN CANDRABINDU
+11D31..11D36  ; Mn #   [6] MASARAM GONDI VOWEL SIGN AA..MASARAM GONDI VOWEL SIGN VOCALIC R
+11D3A         ; Mn #       MASARAM GONDI VOWEL SIGN E
+11D3C..11D3D  ; Mn #   [2] MASARAM GONDI VOWEL SIGN AI..MASARAM GONDI VOWEL SIGN O
+11D3F..11D45  ; Mn #   [7] MASARAM GONDI VOWEL SIGN AU..MASARAM GONDI VIRAMA
+11D47         ; Mn #       MASARAM GONDI RA-KARA
+11D90..11D91  ; Mn #   [2] GUNJALA GONDI VOWEL SIGN EE..GUNJALA GONDI VOWEL SIGN AI
+11D95         ; Mn #       GUNJALA GONDI SIGN ANUSVARA
+11D97         ; Mn #       GUNJALA GONDI VIRAMA
+11EF3..11EF4  ; Mn #   [2] MAKASAR VOWEL SIGN I..MAKASAR VOWEL SIGN U
+16AF0..16AF4  ; Mn #   [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE
+16B30..16B36  ; Mn #   [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM
+16F4F         ; Mn #       MIAO SIGN CONSONANT MODIFIER BAR
+16F8F..16F92  ; Mn #   [4] MIAO TONE RIGHT..MIAO TONE BELOW
+16FE4         ; Mn #       KHITAN SMALL SCRIPT FILLER
+1BC9D..1BC9E  ; Mn #   [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK
+1D167..1D169  ; Mn #   [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3
+1D17B..1D182  ; Mn #   [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE
+1D185..1D18B  ; Mn #   [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE
+1D1AA..1D1AD  ; Mn #   [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO
+1D242..1D244  ; Mn #   [3] COMBINING GREEK MUSICAL TRISEME..COMBINING GREEK MUSICAL PENTASEME
+1DA00..1DA36  ; Mn #  [55] SIGNWRITING HEAD RIM..SIGNWRITING AIR SUCKING IN
+1DA3B..1DA6C  ; Mn #  [50] SIGNWRITING MOUTH CLOSED NEUTRAL..SIGNWRITING EXCITEMENT
+1DA75         ; Mn #       SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS
+1DA84         ; Mn #       SIGNWRITING LOCATION HEAD NECK
+1DA9B..1DA9F  ; Mn #   [5] SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6
+1DAA1..1DAAF  ; Mn #  [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16
+1E000..1E006  ; Mn #   [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE
+1E008..1E018  ; Mn #  [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU
+1E01B..1E021  ; Mn #   [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI
+1E023..1E024  ; Mn #   [2] COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
+1E026..1E02A  ; Mn #   [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
+1E130..1E136  ; Mn #   [7] NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG TONE-D
+1E2EC..1E2EF  ; Mn #   [4] WANCHO TONE TUP..WANCHO TONE KOINI
+1E8D0..1E8D6  ; Mn #   [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
+1E944..1E94A  ; Mn #   [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
+E0100..E01EF  ; Mn # [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256
+
+# Total code points: 1839
+
+# ================================================
+
+# General_Category=Enclosing_Mark
+
+0488..0489    ; Me #   [2] COMBINING CYRILLIC HUNDRED THOUSANDS SIGN..COMBINING CYRILLIC MILLIONS SIGN
+1ABE          ; Me #       COMBINING PARENTHESES OVERLAY
+20DD..20E0    ; Me #   [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH
+20E2..20E4    ; Me #   [3] COMBINING ENCLOSING SCREEN..COMBINING ENCLOSING UPWARD POINTING TRIANGLE
+A670..A672    ; Me #   [3] COMBINING CYRILLIC TEN MILLIONS SIGN..COMBINING CYRILLIC THOUSAND MILLIONS SIGN
+
+# Total code points: 13
+
+# ================================================
+
+# General_Category=Spacing_Mark
+
+0903          ; Mc #       DEVANAGARI SIGN VISARGA
+093B          ; Mc #       DEVANAGARI VOWEL SIGN OOE
+093E..0940    ; Mc #   [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II
+0949..094C    ; Mc #   [4] DEVANAGARI VOWEL SIGN CANDRA O..DEVANAGARI VOWEL SIGN AU
+094E..094F    ; Mc #   [2] DEVANAGARI VOWEL SIGN PRISHTHAMATRA E..DEVANAGARI VOWEL SIGN AW
+0982..0983    ; Mc #   [2] BENGALI SIGN ANUSVARA..BENGALI SIGN VISARGA
+09BE..09C0    ; Mc #   [3] BENGALI VOWEL SIGN AA..BENGALI VOWEL SIGN II
+09C7..09C8    ; Mc #   [2] BENGALI VOWEL SIGN E..BENGALI VOWEL SIGN AI
+09CB..09CC    ; Mc #   [2] BENGALI VOWEL SIGN O..BENGALI VOWEL SIGN AU
+09D7          ; Mc #       BENGALI AU LENGTH MARK
+0A03          ; Mc #       GURMUKHI SIGN VISARGA
+0A3E..0A40    ; Mc #   [3] GURMUKHI VOWEL SIGN AA..GURMUKHI VOWEL SIGN II
+0A83          ; Mc #       GUJARATI SIGN VISARGA
+0ABE..0AC0    ; Mc #   [3] GUJARATI VOWEL SIGN AA..GUJARATI VOWEL SIGN II
+0AC9          ; Mc #       GUJARATI VOWEL SIGN CANDRA O
+0ACB..0ACC    ; Mc #   [2] GUJARATI VOWEL SIGN O..GUJARATI VOWEL SIGN AU
+0B02..0B03    ; Mc #   [2] ORIYA SIGN ANUSVARA..ORIYA SIGN VISARGA
+0B3E          ; Mc #       ORIYA VOWEL SIGN AA
+0B40          ; Mc #       ORIYA VOWEL SIGN II
+0B47..0B48    ; Mc #   [2] ORIYA VOWEL SIGN E..ORIYA VOWEL SIGN AI
+0B4B..0B4C    ; Mc #   [2] ORIYA VOWEL SIGN O..ORIYA VOWEL SIGN AU
+0B57          ; Mc #       ORIYA AU LENGTH MARK
+0BBE..0BBF    ; Mc #   [2] TAMIL VOWEL SIGN AA..TAMIL VOWEL SIGN I
+0BC1..0BC2    ; Mc #   [2] TAMIL VOWEL SIGN U..TAMIL VOWEL SIGN UU
+0BC6..0BC8    ; Mc #   [3] TAMIL VOWEL SIGN E..TAMIL VOWEL SIGN AI
+0BCA..0BCC    ; Mc #   [3] TAMIL VOWEL SIGN O..TAMIL VOWEL SIGN AU
+0BD7          ; Mc #       TAMIL AU LENGTH MARK
+0C01..0C03    ; Mc #   [3] TELUGU SIGN CANDRABINDU..TELUGU SIGN VISARGA
+0C41..0C44    ; Mc #   [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR
+0C82..0C83    ; Mc #   [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
+0CBE          ; Mc #       KANNADA VOWEL SIGN AA
+0CC0..0CC4    ; Mc #   [5] KANNADA VOWEL SIGN II..KANNADA VOWEL SIGN VOCALIC RR
+0CC7..0CC8    ; Mc #   [2] KANNADA VOWEL SIGN EE..KANNADA VOWEL SIGN AI
+0CCA..0CCB    ; Mc #   [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO
+0CD5..0CD6    ; Mc #   [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK
+0D02..0D03    ; Mc #   [2] MALAYALAM SIGN ANUSVARA..MALAYALAM SIGN VISARGA
+0D3E..0D40    ; Mc #   [3] MALAYALAM VOWEL SIGN AA..MALAYALAM VOWEL SIGN II
+0D46..0D48    ; Mc #   [3] MALAYALAM VOWEL SIGN E..MALAYALAM VOWEL SIGN AI
+0D4A..0D4C    ; Mc #   [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU
+0D57          ; Mc #       MALAYALAM AU LENGTH MARK
+0D82..0D83    ; Mc #   [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA
+0DCF..0DD1    ; Mc #   [3] SINHALA VOWEL SIGN AELA-PILLA..SINHALA VOWEL SIGN DIGA AEDA-PILLA
+0DD8..0DDF    ; Mc #   [8] SINHALA VOWEL SIGN GAETTA-PILLA..SINHALA VOWEL SIGN GAYANUKITTA
+0DF2..0DF3    ; Mc #   [2] SINHALA VOWEL SIGN DIGA GAETTA-PILLA..SINHALA VOWEL SIGN DIGA GAYANUKITTA
+0F3E..0F3F    ; Mc #   [2] TIBETAN SIGN YAR TSHES..TIBETAN SIGN MAR TSHES
+0F7F          ; Mc #       TIBETAN SIGN RNAM BCAD
+102B..102C    ; Mc #   [2] MYANMAR VOWEL SIGN TALL AA..MYANMAR VOWEL SIGN AA
+1031          ; Mc #       MYANMAR VOWEL SIGN E
+1038          ; Mc #       MYANMAR SIGN VISARGA
+103B..103C    ; Mc #   [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA
+1056..1057    ; Mc #   [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR
+1062..1064    ; Mc #   [3] MYANMAR VOWEL SIGN SGAW KAREN EU..MYANMAR TONE MARK SGAW KAREN KE PHO
+1067..106D    ; Mc #   [7] MYANMAR VOWEL SIGN WESTERN PWO KAREN EU..MYANMAR SIGN WESTERN PWO KAREN TONE-5
+1083..1084    ; Mc #   [2] MYANMAR VOWEL SIGN SHAN AA..MYANMAR VOWEL SIGN SHAN E
+1087..108C    ; Mc #   [6] MYANMAR SIGN SHAN TONE-2..MYANMAR SIGN SHAN COUNCIL TONE-3
+108F          ; Mc #       MYANMAR SIGN RUMAI PALAUNG TONE-5
+109A..109C    ; Mc #   [3] MYANMAR SIGN KHAMTI TONE-1..MYANMAR VOWEL SIGN AITON A
+17B6          ; Mc #       KHMER VOWEL SIGN AA
+17BE..17C5    ; Mc #   [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU
+17C7..17C8    ; Mc #   [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU
+1923..1926    ; Mc #   [4] LIMBU VOWEL SIGN EE..LIMBU VOWEL SIGN AU
+1929..192B    ; Mc #   [3] LIMBU SUBJOINED LETTER YA..LIMBU SUBJOINED LETTER WA
+1930..1931    ; Mc #   [2] LIMBU SMALL LETTER KA..LIMBU SMALL LETTER NGA
+1933..1938    ; Mc #   [6] LIMBU SMALL LETTER TA..LIMBU SMALL LETTER LA
+1A19..1A1A    ; Mc #   [2] BUGINESE VOWEL SIGN E..BUGINESE VOWEL SIGN O
+1A55          ; Mc #       TAI THAM CONSONANT SIGN MEDIAL RA
+1A57          ; Mc #       TAI THAM CONSONANT SIGN LA TANG LAI
+1A61          ; Mc #       TAI THAM VOWEL SIGN A
+1A63..1A64    ; Mc #   [2] TAI THAM VOWEL SIGN AA..TAI THAM VOWEL SIGN TALL AA
+1A6D..1A72    ; Mc #   [6] TAI THAM VOWEL SIGN OY..TAI THAM VOWEL SIGN THAM AI
+1B04          ; Mc #       BALINESE SIGN BISAH
+1B35          ; Mc #       BALINESE VOWEL SIGN TEDUNG
+1B3B          ; Mc #       BALINESE VOWEL SIGN RA REPA TEDUNG
+1B3D..1B41    ; Mc #   [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG
+1B43..1B44    ; Mc #   [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG
+1B82          ; Mc #       SUNDANESE SIGN PANGWISAD
+1BA1          ; Mc #       SUNDANESE CONSONANT SIGN PAMINGKAL
+1BA6..1BA7    ; Mc #   [2] SUNDANESE VOWEL SIGN PANAELAENG..SUNDANESE VOWEL SIGN PANOLONG
+1BAA          ; Mc #       SUNDANESE SIGN PAMAAEH
+1BE7          ; Mc #       BATAK VOWEL SIGN E
+1BEA..1BEC    ; Mc #   [3] BATAK VOWEL SIGN I..BATAK VOWEL SIGN O
+1BEE          ; Mc #       BATAK VOWEL SIGN U
+1BF2..1BF3    ; Mc #   [2] BATAK PANGOLAT..BATAK PANONGONAN
+1C24..1C2B    ; Mc #   [8] LEPCHA SUBJOINED LETTER YA..LEPCHA VOWEL SIGN UU
+1C34..1C35    ; Mc #   [2] LEPCHA CONSONANT SIGN NYIN-DO..LEPCHA CONSONANT SIGN KANG
+1CE1          ; Mc #       VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA
+1CF7          ; Mc #       VEDIC SIGN ATIKRAMA
+302E..302F    ; Mc #   [2] HANGUL SINGLE DOT TONE MARK..HANGUL DOUBLE DOT TONE MARK
+A823..A824    ; Mc #   [2] SYLOTI NAGRI VOWEL SIGN A..SYLOTI NAGRI VOWEL SIGN I
+A827          ; Mc #       SYLOTI NAGRI VOWEL SIGN OO
+A880..A881    ; Mc #   [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA
+A8B4..A8C3    ; Mc #  [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU
+A952..A953    ; Mc #   [2] REJANG CONSONANT SIGN H..REJANG VIRAMA
+A983          ; Mc #       JAVANESE SIGN WIGNYAN
+A9B4..A9B5    ; Mc #   [2] JAVANESE VOWEL SIGN TARUNG..JAVANESE VOWEL SIGN TOLONG
+A9BA..A9BB    ; Mc #   [2] JAVANESE VOWEL SIGN TALING..JAVANESE VOWEL SIGN DIRGA MURE
+A9BE..A9C0    ; Mc #   [3] JAVANESE CONSONANT SIGN PENGKAL..JAVANESE PANGKON
+AA2F..AA30    ; Mc #   [2] CHAM VOWEL SIGN O..CHAM VOWEL SIGN AI
+AA33..AA34    ; Mc #   [2] CHAM CONSONANT SIGN YA..CHAM CONSONANT SIGN RA
+AA4D          ; Mc #       CHAM CONSONANT SIGN FINAL H
+AA7B          ; Mc #       MYANMAR SIGN PAO KAREN TONE
+AA7D          ; Mc #       MYANMAR SIGN TAI LAING TONE-5
+AAEB          ; Mc #       MEETEI MAYEK VOWEL SIGN II
+AAEE..AAEF    ; Mc #   [2] MEETEI MAYEK VOWEL SIGN AU..MEETEI MAYEK VOWEL SIGN AAU
+AAF5          ; Mc #       MEETEI MAYEK VOWEL SIGN VISARGA
+ABE3..ABE4    ; Mc #   [2] MEETEI MAYEK VOWEL SIGN ONAP..MEETEI MAYEK VOWEL SIGN INAP
+ABE6..ABE7    ; Mc #   [2] MEETEI MAYEK VOWEL SIGN YENAP..MEETEI MAYEK VOWEL SIGN SOUNAP
+ABE9..ABEA    ; Mc #   [2] MEETEI MAYEK VOWEL SIGN CHEINAP..MEETEI MAYEK VOWEL SIGN NUNG
+ABEC          ; Mc #       MEETEI MAYEK LUM IYEK
+11000         ; Mc #       BRAHMI SIGN CANDRABINDU
+11002         ; Mc #       BRAHMI SIGN VISARGA
+11082         ; Mc #       KAITHI SIGN VISARGA
+110B0..110B2  ; Mc #   [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II
+110B7..110B8  ; Mc #   [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU
+1112C         ; Mc #       CHAKMA VOWEL SIGN E
+11145..11146  ; Mc #   [2] CHAKMA VOWEL SIGN AA..CHAKMA VOWEL SIGN EI
+11182         ; Mc #       SHARADA SIGN VISARGA
+111B3..111B5  ; Mc #   [3] SHARADA VOWEL SIGN AA..SHARADA VOWEL SIGN II
+111BF..111C0  ; Mc #   [2] SHARADA VOWEL SIGN AU..SHARADA SIGN VIRAMA
+111CE         ; Mc #       SHARADA VOWEL SIGN PRISHTHAMATRA E
+1122C..1122E  ; Mc #   [3] KHOJKI VOWEL SIGN AA..KHOJKI VOWEL SIGN II
+11232..11233  ; Mc #   [2] KHOJKI VOWEL SIGN O..KHOJKI VOWEL SIGN AU
+11235         ; Mc #       KHOJKI SIGN VIRAMA
+112E0..112E2  ; Mc #   [3] KHUDAWADI VOWEL SIGN AA..KHUDAWADI VOWEL SIGN II
+11302..11303  ; Mc #   [2] GRANTHA SIGN ANUSVARA..GRANTHA SIGN VISARGA
+1133E..1133F  ; Mc #   [2] GRANTHA VOWEL SIGN AA..GRANTHA VOWEL SIGN I
+11341..11344  ; Mc #   [4] GRANTHA VOWEL SIGN U..GRANTHA VOWEL SIGN VOCALIC RR
+11347..11348  ; Mc #   [2] GRANTHA VOWEL SIGN EE..GRANTHA VOWEL SIGN AI
+1134B..1134D  ; Mc #   [3] GRANTHA VOWEL SIGN OO..GRANTHA SIGN VIRAMA
+11357         ; Mc #       GRANTHA AU LENGTH MARK
+11362..11363  ; Mc #   [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL
+11435..11437  ; Mc #   [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II
+11440..11441  ; Mc #   [2] NEWA VOWEL SIGN O..NEWA VOWEL SIGN AU
+11445         ; Mc #       NEWA SIGN VISARGA
+114B0..114B2  ; Mc #   [3] TIRHUTA VOWEL SIGN AA..TIRHUTA VOWEL SIGN II
+114B9         ; Mc #       TIRHUTA VOWEL SIGN E
+114BB..114BE  ; Mc #   [4] TIRHUTA VOWEL SIGN AI..TIRHUTA VOWEL SIGN AU
+114C1         ; Mc #       TIRHUTA SIGN VISARGA
+115AF..115B1  ; Mc #   [3] SIDDHAM VOWEL SIGN AA..SIDDHAM VOWEL SIGN II
+115B8..115BB  ; Mc #   [4] SIDDHAM VOWEL SIGN E..SIDDHAM VOWEL SIGN AU
+115BE         ; Mc #       SIDDHAM SIGN VISARGA
+11630..11632  ; Mc #   [3] MODI VOWEL SIGN AA..MODI VOWEL SIGN II
+1163B..1163C  ; Mc #   [2] MODI VOWEL SIGN O..MODI VOWEL SIGN AU
+1163E         ; Mc #       MODI SIGN VISARGA
+116AC         ; Mc #       TAKRI SIGN VISARGA
+116AE..116AF  ; Mc #   [2] TAKRI VOWEL SIGN I..TAKRI VOWEL SIGN II
+116B6         ; Mc #       TAKRI SIGN VIRAMA
+11720..11721  ; Mc #   [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA
+11726         ; Mc #       AHOM VOWEL SIGN E
+1182C..1182E  ; Mc #   [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II
+11838         ; Mc #       DOGRA SIGN VISARGA
+11930..11935  ; Mc #   [6] DIVES AKURU VOWEL SIGN AA..DIVES AKURU VOWEL SIGN E
+11937..11938  ; Mc #   [2] DIVES AKURU VOWEL SIGN AI..DIVES AKURU VOWEL SIGN O
+1193D         ; Mc #       DIVES AKURU SIGN HALANTA
+11940         ; Mc #       DIVES AKURU MEDIAL YA
+11942         ; Mc #       DIVES AKURU MEDIAL RA
+119D1..119D3  ; Mc #   [3] NANDINAGARI VOWEL SIGN AA..NANDINAGARI VOWEL SIGN II
+119DC..119DF  ; Mc #   [4] NANDINAGARI VOWEL SIGN O..NANDINAGARI SIGN VISARGA
+119E4         ; Mc #       NANDINAGARI VOWEL SIGN PRISHTHAMATRA E
+11A39         ; Mc #       ZANABAZAR SQUARE SIGN VISARGA
+11A57..11A58  ; Mc #   [2] SOYOMBO VOWEL SIGN AI..SOYOMBO VOWEL SIGN AU
+11A97         ; Mc #       SOYOMBO SIGN VISARGA
+11C2F         ; Mc #       BHAIKSUKI VOWEL SIGN AA
+11C3E         ; Mc #       BHAIKSUKI SIGN VISARGA
+11CA9         ; Mc #       MARCHEN SUBJOINED LETTER YA
+11CB1         ; Mc #       MARCHEN VOWEL SIGN I
+11CB4         ; Mc #       MARCHEN VOWEL SIGN O
+11D8A..11D8E  ; Mc #   [5] GUNJALA GONDI VOWEL SIGN AA..GUNJALA GONDI VOWEL SIGN UU
+11D93..11D94  ; Mc #   [2] GUNJALA GONDI VOWEL SIGN OO..GUNJALA GONDI VOWEL SIGN AU
+11D96         ; Mc #       GUNJALA GONDI SIGN VISARGA
+11EF5..11EF6  ; Mc #   [2] MAKASAR VOWEL SIGN E..MAKASAR VOWEL SIGN O
+16F51..16F87  ; Mc #  [55] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN UI
+16FF0..16FF1  ; Mc #   [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY
+1D165..1D166  ; Mc #   [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM
+1D16D..1D172  ; Mc #   [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5
+
+# Total code points: 443
+
+# ================================================
+
+# General_Category=Decimal_Number
+
+0030..0039    ; Nd #  [10] DIGIT ZERO..DIGIT NINE
+0660..0669    ; Nd #  [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE
+06F0..06F9    ; Nd #  [10] EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE
+07C0..07C9    ; Nd #  [10] NKO DIGIT ZERO..NKO DIGIT NINE
+0966..096F    ; Nd #  [10] DEVANAGARI DIGIT ZERO..DEVANAGARI DIGIT NINE
+09E6..09EF    ; Nd #  [10] BENGALI DIGIT ZERO..BENGALI DIGIT NINE
+0A66..0A6F    ; Nd #  [10] GURMUKHI DIGIT ZERO..GURMUKHI DIGIT NINE
+0AE6..0AEF    ; Nd #  [10] GUJARATI DIGIT ZERO..GUJARATI DIGIT NINE
+0B66..0B6F    ; Nd #  [10] ORIYA DIGIT ZERO..ORIYA DIGIT NINE
+0BE6..0BEF    ; Nd #  [10] TAMIL DIGIT ZERO..TAMIL DIGIT NINE
+0C66..0C6F    ; Nd #  [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
+0CE6..0CEF    ; Nd #  [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE
+0D66..0D6F    ; Nd #  [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE
+0DE6..0DEF    ; Nd #  [10] SINHALA LITH DIGIT ZERO..SINHALA LITH DIGIT NINE
+0E50..0E59    ; Nd #  [10] THAI DIGIT ZERO..THAI DIGIT NINE
+0ED0..0ED9    ; Nd #  [10] LAO DIGIT ZERO..LAO DIGIT NINE
+0F20..0F29    ; Nd #  [10] TIBETAN DIGIT ZERO..TIBETAN DIGIT NINE
+1040..1049    ; Nd #  [10] MYANMAR DIGIT ZERO..MYANMAR DIGIT NINE
+1090..1099    ; Nd #  [10] MYANMAR SHAN DIGIT ZERO..MYANMAR SHAN DIGIT NINE
+17E0..17E9    ; Nd #  [10] KHMER DIGIT ZERO..KHMER DIGIT NINE
+1810..1819    ; Nd #  [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE
+1946..194F    ; Nd #  [10] LIMBU DIGIT ZERO..LIMBU DIGIT NINE
+19D0..19D9    ; Nd #  [10] NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE
+1A80..1A89    ; Nd #  [10] TAI THAM HORA DIGIT ZERO..TAI THAM HORA DIGIT NINE
+1A90..1A99    ; Nd #  [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE
+1B50..1B59    ; Nd #  [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE
+1BB0..1BB9    ; Nd #  [10] SUNDANESE DIGIT ZERO..SUNDANESE DIGIT NINE
+1C40..1C49    ; Nd #  [10] LEPCHA DIGIT ZERO..LEPCHA DIGIT NINE
+1C50..1C59    ; Nd #  [10] OL CHIKI DIGIT ZERO..OL CHIKI DIGIT NINE
+A620..A629    ; Nd #  [10] VAI DIGIT ZERO..VAI DIGIT NINE
+A8D0..A8D9    ; Nd #  [10] SAURASHTRA DIGIT ZERO..SAURASHTRA DIGIT NINE
+A900..A909    ; Nd #  [10] KAYAH LI DIGIT ZERO..KAYAH LI DIGIT NINE
+A9D0..A9D9    ; Nd #  [10] JAVANESE DIGIT ZERO..JAVANESE DIGIT NINE
+A9F0..A9F9    ; Nd #  [10] MYANMAR TAI LAING DIGIT ZERO..MYANMAR TAI LAING DIGIT NINE
+AA50..AA59    ; Nd #  [10] CHAM DIGIT ZERO..CHAM DIGIT NINE
+ABF0..ABF9    ; Nd #  [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DIGIT NINE
+FF10..FF19    ; Nd #  [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE
+104A0..104A9  ; Nd #  [10] OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
+10D30..10D39  ; Nd #  [10] HANIFI ROHINGYA DIGIT ZERO..HANIFI ROHINGYA DIGIT NINE
+11066..1106F  ; Nd #  [10] BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE
+110F0..110F9  ; Nd #  [10] SORA SOMPENG DIGIT ZERO..SORA SOMPENG DIGIT NINE
+11136..1113F  ; Nd #  [10] CHAKMA DIGIT ZERO..CHAKMA DIGIT NINE
+111D0..111D9  ; Nd #  [10] SHARADA DIGIT ZERO..SHARADA DIGIT NINE
+112F0..112F9  ; Nd #  [10] KHUDAWADI DIGIT ZERO..KHUDAWADI DIGIT NINE
+11450..11459  ; Nd #  [10] NEWA DIGIT ZERO..NEWA DIGIT NINE
+114D0..114D9  ; Nd #  [10] TIRHUTA DIGIT ZERO..TIRHUTA DIGIT NINE
+11650..11659  ; Nd #  [10] MODI DIGIT ZERO..MODI DIGIT NINE
+116C0..116C9  ; Nd #  [10] TAKRI DIGIT ZERO..TAKRI DIGIT NINE
+11730..11739  ; Nd #  [10] AHOM DIGIT ZERO..AHOM DIGIT NINE
+118E0..118E9  ; Nd #  [10] WARANG CITI DIGIT ZERO..WARANG CITI DIGIT NINE
+11950..11959  ; Nd #  [10] DIVES AKURU DIGIT ZERO..DIVES AKURU DIGIT NINE
+11C50..11C59  ; Nd #  [10] BHAIKSUKI DIGIT ZERO..BHAIKSUKI DIGIT NINE
+11D50..11D59  ; Nd #  [10] MASARAM GONDI DIGIT ZERO..MASARAM GONDI DIGIT NINE
+11DA0..11DA9  ; Nd #  [10] GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE
+16A60..16A69  ; Nd #  [10] MRO DIGIT ZERO..MRO DIGIT NINE
+16B50..16B59  ; Nd #  [10] PAHAWH HMONG DIGIT ZERO..PAHAWH HMONG DIGIT NINE
+1D7CE..1D7FF  ; Nd #  [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE
+1E140..1E149  ; Nd #  [10] NYIAKENG PUACHUE HMONG DIGIT ZERO..NYIAKENG PUACHUE HMONG DIGIT NINE
+1E2F0..1E2F9  ; Nd #  [10] WANCHO DIGIT ZERO..WANCHO DIGIT NINE
+1E950..1E959  ; Nd #  [10] ADLAM DIGIT ZERO..ADLAM DIGIT NINE
+1FBF0..1FBF9  ; Nd #  [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE
+
+# Total code points: 650
+
+# ================================================
+
+# General_Category=Letter_Number
+
+16EE..16F0    ; Nl #   [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL
+2160..2182    ; Nl #  [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND
+2185..2188    ; Nl #   [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND
+3007          ; Nl #       IDEOGRAPHIC NUMBER ZERO
+3021..3029    ; Nl #   [9] HANGZHOU NUMERAL ONE..HANGZHOU NUMERAL NINE
+3038..303A    ; Nl #   [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY
+A6E6..A6EF    ; Nl #  [10] BAMUM LETTER MO..BAMUM LETTER KOGHOM
+10140..10174  ; Nl #  [53] GREEK ACROPHONIC ATTIC ONE QUARTER..GREEK ACROPHONIC STRATIAN FIFTY MNAS
+10341         ; Nl #       GOTHIC LETTER NINETY
+1034A         ; Nl #       GOTHIC LETTER NINE HUNDRED
+103D1..103D5  ; Nl #   [5] OLD PERSIAN NUMBER ONE..OLD PERSIAN NUMBER HUNDRED
+12400..1246E  ; Nl # [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM
+
+# Total code points: 236
+
+# ================================================
+
+# General_Category=Other_Number
+
+00B2..00B3    ; No #   [2] SUPERSCRIPT TWO..SUPERSCRIPT THREE
+00B9          ; No #       SUPERSCRIPT ONE
+00BC..00BE    ; No #   [3] VULGAR FRACTION ONE QUARTER..VULGAR FRACTION THREE QUARTERS
+09F4..09F9    ; No #   [6] BENGALI CURRENCY NUMERATOR ONE..BENGALI CURRENCY DENOMINATOR SIXTEEN
+0B72..0B77    ; No #   [6] ORIYA FRACTION ONE QUARTER..ORIYA FRACTION THREE SIXTEENTHS
+0BF0..0BF2    ; No #   [3] TAMIL NUMBER TEN..TAMIL NUMBER ONE THOUSAND
+0C78..0C7E    ; No #   [7] TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR
+0D58..0D5E    ; No #   [7] MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH..MALAYALAM FRACTION ONE FIFTH
+0D70..0D78    ; No #   [9] MALAYALAM NUMBER TEN..MALAYALAM FRACTION THREE SIXTEENTHS
+0F2A..0F33    ; No #  [10] TIBETAN DIGIT HALF ONE..TIBETAN DIGIT HALF ZERO
+1369..137C    ; No #  [20] ETHIOPIC DIGIT ONE..ETHIOPIC NUMBER TEN THOUSAND
+17F0..17F9    ; No #  [10] KHMER SYMBOL LEK ATTAK SON..KHMER SYMBOL LEK ATTAK PRAM-BUON
+19DA          ; No #       NEW TAI LUE THAM DIGIT ONE
+2070          ; No #       SUPERSCRIPT ZERO
+2074..2079    ; No #   [6] SUPERSCRIPT FOUR..SUPERSCRIPT NINE
+2080..2089    ; No #  [10] SUBSCRIPT ZERO..SUBSCRIPT NINE
+2150..215F    ; No #  [16] VULGAR FRACTION ONE SEVENTH..FRACTION NUMERATOR ONE
+2189          ; No #       VULGAR FRACTION ZERO THIRDS
+2460..249B    ; No #  [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP
+24EA..24FF    ; No #  [22] CIRCLED DIGIT ZERO..NEGATIVE CIRCLED DIGIT ZERO
+2776..2793    ; No #  [30] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
+2CFD          ; No #       COPTIC FRACTION ONE HALF
+3192..3195    ; No #   [4] IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK
+3220..3229    ; No #  [10] PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN
+3248..324F    ; No #   [8] CIRCLED NUMBER TEN ON BLACK SQUARE..CIRCLED NUMBER EIGHTY ON BLACK SQUARE
+3251..325F    ; No #  [15] CIRCLED NUMBER TWENTY ONE..CIRCLED NUMBER THIRTY FIVE
+3280..3289    ; No #  [10] CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN
+32B1..32BF    ; No #  [15] CIRCLED NUMBER THIRTY SIX..CIRCLED NUMBER FIFTY
+A830..A835    ; No #   [6] NORTH INDIC FRACTION ONE QUARTER..NORTH INDIC FRACTION THREE SIXTEENTHS
+10107..10133  ; No #  [45] AEGEAN NUMBER ONE..AEGEAN NUMBER NINETY THOUSAND
+10175..10178  ; No #   [4] GREEK ONE HALF SIGN..GREEK THREE QUARTERS SIGN
+1018A..1018B  ; No #   [2] GREEK ZERO SIGN..GREEK ONE QUARTER SIGN
+102E1..102FB  ; No #  [27] COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED
+10320..10323  ; No #   [4] OLD ITALIC NUMERAL ONE..OLD ITALIC NUMERAL FIFTY
+10858..1085F  ; No #   [8] IMPERIAL ARAMAIC NUMBER ONE..IMPERIAL ARAMAIC NUMBER TEN THOUSAND
+10879..1087F  ; No #   [7] PALMYRENE NUMBER ONE..PALMYRENE NUMBER TWENTY
+108A7..108AF  ; No #   [9] NABATAEAN NUMBER ONE..NABATAEAN NUMBER ONE HUNDRED
+108FB..108FF  ; No #   [5] HATRAN NUMBER ONE..HATRAN NUMBER ONE HUNDRED
+10916..1091B  ; No #   [6] PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER THREE
+109BC..109BD  ; No #   [2] MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS..MEROITIC CURSIVE FRACTION ONE HALF
+109C0..109CF  ; No #  [16] MEROITIC CURSIVE NUMBER ONE..MEROITIC CURSIVE NUMBER SEVENTY
+109D2..109FF  ; No #  [46] MEROITIC CURSIVE NUMBER ONE HUNDRED..MEROITIC CURSIVE FRACTION TEN TWELFTHS
+10A40..10A48  ; No #   [9] KHAROSHTHI DIGIT ONE..KHAROSHTHI FRACTION ONE HALF
+10A7D..10A7E  ; No #   [2] OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARABIAN NUMBER FIFTY
+10A9D..10A9F  ; No #   [3] OLD NORTH ARABIAN NUMBER ONE..OLD NORTH ARABIAN NUMBER TWENTY
+10AEB..10AEF  ; No #   [5] MANICHAEAN NUMBER ONE..MANICHAEAN NUMBER ONE HUNDRED
+10B58..10B5F  ; No #   [8] INSCRIPTIONAL PARTHIAN NUMBER ONE..INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND
+10B78..10B7F  ; No #   [8] INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND
+10BA9..10BAF  ; No #   [7] PSALTER PAHLAVI NUMBER ONE..PSALTER PAHLAVI NUMBER ONE HUNDRED
+10CFA..10CFF  ; No #   [6] OLD HUNGARIAN NUMBER ONE..OLD HUNGARIAN NUMBER ONE THOUSAND
+10E60..10E7E  ; No #  [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS
+10F1D..10F26  ; No #  [10] OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF
+10F51..10F54  ; No #   [4] SOGDIAN NUMBER ONE..SOGDIAN NUMBER ONE HUNDRED
+10FC5..10FCB  ; No #   [7] CHORASMIAN NUMBER ONE..CHORASMIAN NUMBER ONE HUNDRED
+11052..11065  ; No #  [20] BRAHMI NUMBER ONE..BRAHMI NUMBER ONE THOUSAND
+111E1..111F4  ; No #  [20] SINHALA ARCHAIC DIGIT ONE..SINHALA ARCHAIC NUMBER ONE THOUSAND
+1173A..1173B  ; No #   [2] AHOM NUMBER TEN..AHOM NUMBER TWENTY
+118EA..118F2  ; No #   [9] WARANG CITI NUMBER TEN..WARANG CITI NUMBER NINETY
+11C5A..11C6C  ; No #  [19] BHAIKSUKI NUMBER ONE..BHAIKSUKI HUNDREDS UNIT MARK
+11FC0..11FD4  ; No #  [21] TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH..TAMIL FRACTION DOWNSCALING FACTOR KIIZH
+16B5B..16B61  ; No #   [7] PAHAWH HMONG NUMBER TENS..PAHAWH HMONG NUMBER TRILLIONS
+16E80..16E96  ; No #  [23] MEDEFAIDRIN DIGIT ZERO..MEDEFAIDRIN DIGIT THREE ALTERNATE FORM
+1D2E0..1D2F3  ; No #  [20] MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN
+1D360..1D378  ; No #  [25] COUNTING ROD UNIT DIGIT ONE..TALLY MARK FIVE
+1E8C7..1E8CF  ; No #   [9] MENDE KIKAKUI DIGIT ONE..MENDE KIKAKUI DIGIT NINE
+1EC71..1ECAB  ; No #  [59] INDIC SIYAQ NUMBER ONE..INDIC SIYAQ NUMBER PREFIXED NINE
+1ECAD..1ECAF  ; No #   [3] INDIC SIYAQ FRACTION ONE QUARTER..INDIC SIYAQ FRACTION THREE QUARTERS
+1ECB1..1ECB4  ; No #   [4] INDIC SIYAQ NUMBER ALTERNATE ONE..INDIC SIYAQ ALTERNATE LAKH MARK
+1ED01..1ED2D  ; No #  [45] OTTOMAN SIYAQ NUMBER ONE..OTTOMAN SIYAQ NUMBER NINETY THOUSAND
+1ED2F..1ED3D  ; No #  [15] OTTOMAN SIYAQ ALTERNATE NUMBER TWO..OTTOMAN SIYAQ FRACTION ONE SIXTH
+1F100..1F10C  ; No #  [13] DIGIT ZERO FULL STOP..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
+
+# Total code points: 895
+
+# ================================================
+
+# General_Category=Space_Separator
+
+0020          ; Zs #       SPACE
+00A0          ; Zs #       NO-BREAK SPACE
+1680          ; Zs #       OGHAM SPACE MARK
+2000..200A    ; Zs #  [11] EN QUAD..HAIR SPACE
+202F          ; Zs #       NARROW NO-BREAK SPACE
+205F          ; Zs #       MEDIUM MATHEMATICAL SPACE
+3000          ; Zs #       IDEOGRAPHIC SPACE
+
+# Total code points: 17
+
+# ================================================
+
+# General_Category=Line_Separator
+
+2028          ; Zl #       LINE SEPARATOR
+
+# Total code points: 1
+
+# ================================================
+
+# General_Category=Paragraph_Separator
+
+2029          ; Zp #       PARAGRAPH SEPARATOR
+
+# Total code points: 1
+
+# ================================================
+
+# General_Category=Control
+
+0000..001F    ; Cc #  [32] <control-0000>..<control-001F>
+007F..009F    ; Cc #  [33] <control-007F>..<control-009F>
+
+# Total code points: 65
+
+# ================================================
+
+# General_Category=Format
+
+00AD          ; Cf #       SOFT HYPHEN
+0600..0605    ; Cf #   [6] ARABIC NUMBER SIGN..ARABIC NUMBER MARK ABOVE
+061C          ; Cf #       ARABIC LETTER MARK
+06DD          ; Cf #       ARABIC END OF AYAH
+070F          ; Cf #       SYRIAC ABBREVIATION MARK
+08E2          ; Cf #       ARABIC DISPUTED END OF AYAH
+180E          ; Cf #       MONGOLIAN VOWEL SEPARATOR
+200B..200F    ; Cf #   [5] ZERO WIDTH SPACE..RIGHT-TO-LEFT MARK
+202A..202E    ; Cf #   [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE
+2060..2064    ; Cf #   [5] WORD JOINER..INVISIBLE PLUS
+2066..206F    ; Cf #  [10] LEFT-TO-RIGHT ISOLATE..NOMINAL DIGIT SHAPES
+FEFF          ; Cf #       ZERO WIDTH NO-BREAK SPACE
+FFF9..FFFB    ; Cf #   [3] INTERLINEAR ANNOTATION ANCHOR..INTERLINEAR ANNOTATION TERMINATOR
+110BD         ; Cf #       KAITHI NUMBER SIGN
+110CD         ; Cf #       KAITHI NUMBER SIGN ABOVE
+13430..13438  ; Cf #   [9] EGYPTIAN HIEROGLYPH VERTICAL JOINER..EGYPTIAN HIEROGLYPH END SEGMENT
+1BCA0..1BCA3  ; Cf #   [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP
+1D173..1D17A  ; Cf #   [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE
+E0001         ; Cf #       LANGUAGE TAG
+E0020..E007F  ; Cf #  [96] TAG SPACE..CANCEL TAG
+
+# Total code points: 161
+
+# ================================================
+
+# General_Category=Private_Use
+
+E000..F8FF    ; Co # [6400] <private-use-E000>..<private-use-F8FF>
+F0000..FFFFD  ; Co # [65534] <private-use-F0000>..<private-use-FFFFD>
+100000..10FFFD; Co # [65534] <private-use-100000>..<private-use-10FFFD>
+
+# Total code points: 137468
+
+# ================================================
+
+# General_Category=Surrogate
+
+D800..DFFF    ; Cs # [2048] <surrogate-D800>..<surrogate-DFFF>
+
+# Total code points: 2048
+
+# ================================================
+
+# General_Category=Dash_Punctuation
+
+002D          ; Pd #       HYPHEN-MINUS
+058A          ; Pd #       ARMENIAN HYPHEN
+05BE          ; Pd #       HEBREW PUNCTUATION MAQAF
+1400          ; Pd #       CANADIAN SYLLABICS HYPHEN
+1806          ; Pd #       MONGOLIAN TODO SOFT HYPHEN
+2010..2015    ; Pd #   [6] HYPHEN..HORIZONTAL BAR
+2E17          ; Pd #       DOUBLE OBLIQUE HYPHEN
+2E1A          ; Pd #       HYPHEN WITH DIAERESIS
+2E3A..2E3B    ; Pd #   [2] TWO-EM DASH..THREE-EM DASH
+2E40          ; Pd #       DOUBLE HYPHEN
+301C          ; Pd #       WAVE DASH
+3030          ; Pd #       WAVY DASH
+30A0          ; Pd #       KATAKANA-HIRAGANA DOUBLE HYPHEN
+FE31..FE32    ; Pd #   [2] PRESENTATION FORM FOR VERTICAL EM DASH..PRESENTATION FORM FOR VERTICAL EN DASH
+FE58          ; Pd #       SMALL EM DASH
+FE63          ; Pd #       SMALL HYPHEN-MINUS
+FF0D          ; Pd #       FULLWIDTH HYPHEN-MINUS
+10EAD         ; Pd #       YEZIDI HYPHENATION MARK
+
+# Total code points: 25
+
+# ================================================
+
+# General_Category=Open_Punctuation
+
+0028          ; Ps #       LEFT PARENTHESIS
+005B          ; Ps #       LEFT SQUARE BRACKET
+007B          ; Ps #       LEFT CURLY BRACKET
+0F3A          ; Ps #       TIBETAN MARK GUG RTAGS GYON
+0F3C          ; Ps #       TIBETAN MARK ANG KHANG GYON
+169B          ; Ps #       OGHAM FEATHER MARK
+201A          ; Ps #       SINGLE LOW-9 QUOTATION MARK
+201E          ; Ps #       DOUBLE LOW-9 QUOTATION MARK
+2045          ; Ps #       LEFT SQUARE BRACKET WITH QUILL
+207D          ; Ps #       SUPERSCRIPT LEFT PARENTHESIS
+208D          ; Ps #       SUBSCRIPT LEFT PARENTHESIS
+2308          ; Ps #       LEFT CEILING
+230A          ; Ps #       LEFT FLOOR
+2329          ; Ps #       LEFT-POINTING ANGLE BRACKET
+2768          ; Ps #       MEDIUM LEFT PARENTHESIS ORNAMENT
+276A          ; Ps #       MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT
+276C          ; Ps #       MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT
+276E          ; Ps #       HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT
+2770          ; Ps #       HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
+2772          ; Ps #       LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
+2774          ; Ps #       MEDIUM LEFT CURLY BRACKET ORNAMENT
+27C5          ; Ps #       LEFT S-SHAPED BAG DELIMITER
+27E6          ; Ps #       MATHEMATICAL LEFT WHITE SQUARE BRACKET
+27E8          ; Ps #       MATHEMATICAL LEFT ANGLE BRACKET
+27EA          ; Ps #       MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
+27EC          ; Ps #       MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
+27EE          ; Ps #       MATHEMATICAL LEFT FLATTENED PARENTHESIS
+2983          ; Ps #       LEFT WHITE CURLY BRACKET
+2985          ; Ps #       LEFT WHITE PARENTHESIS
+2987          ; Ps #       Z NOTATION LEFT IMAGE BRACKET
+2989          ; Ps #       Z NOTATION LEFT BINDING BRACKET
+298B          ; Ps #       LEFT SQUARE BRACKET WITH UNDERBAR
+298D          ; Ps #       LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
+298F          ; Ps #       LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+2991          ; Ps #       LEFT ANGLE BRACKET WITH DOT
+2993          ; Ps #       LEFT ARC LESS-THAN BRACKET
+2995          ; Ps #       DOUBLE LEFT ARC GREATER-THAN BRACKET
+2997          ; Ps #       LEFT BLACK TORTOISE SHELL BRACKET
+29D8          ; Ps #       LEFT WIGGLY FENCE
+29DA          ; Ps #       LEFT DOUBLE WIGGLY FENCE
+29FC          ; Ps #       LEFT-POINTING CURVED ANGLE BRACKET
+2E22          ; Ps #       TOP LEFT HALF BRACKET
+2E24          ; Ps #       BOTTOM LEFT HALF BRACKET
+2E26          ; Ps #       LEFT SIDEWAYS U BRACKET
+2E28          ; Ps #       LEFT DOUBLE PARENTHESIS
+2E42          ; Ps #       DOUBLE LOW-REVERSED-9 QUOTATION MARK
+3008          ; Ps #       LEFT ANGLE BRACKET
+300A          ; Ps #       LEFT DOUBLE ANGLE BRACKET
+300C          ; Ps #       LEFT CORNER BRACKET
+300E          ; Ps #       LEFT WHITE CORNER BRACKET
+3010          ; Ps #       LEFT BLACK LENTICULAR BRACKET
+3014          ; Ps #       LEFT TORTOISE SHELL BRACKET
+3016          ; Ps #       LEFT WHITE LENTICULAR BRACKET
+3018          ; Ps #       LEFT WHITE TORTOISE SHELL BRACKET
+301A          ; Ps #       LEFT WHITE SQUARE BRACKET
+301D          ; Ps #       REVERSED DOUBLE PRIME QUOTATION MARK
+FD3F          ; Ps #       ORNATE RIGHT PARENTHESIS
+FE17          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET
+FE35          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS
+FE37          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET
+FE39          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET
+FE3B          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET
+FE3D          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET
+FE3F          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET
+FE41          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET
+FE43          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET
+FE47          ; Ps #       PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET
+FE59          ; Ps #       SMALL LEFT PARENTHESIS
+FE5B          ; Ps #       SMALL LEFT CURLY BRACKET
+FE5D          ; Ps #       SMALL LEFT TORTOISE SHELL BRACKET
+FF08          ; Ps #       FULLWIDTH LEFT PARENTHESIS
+FF3B          ; Ps #       FULLWIDTH LEFT SQUARE BRACKET
+FF5B          ; Ps #       FULLWIDTH LEFT CURLY BRACKET
+FF5F          ; Ps #       FULLWIDTH LEFT WHITE PARENTHESIS
+FF62          ; Ps #       HALFWIDTH LEFT CORNER BRACKET
+
+# Total code points: 75
+
+# ================================================
+
+# General_Category=Close_Punctuation
+
+0029          ; Pe #       RIGHT PARENTHESIS
+005D          ; Pe #       RIGHT SQUARE BRACKET
+007D          ; Pe #       RIGHT CURLY BRACKET
+0F3B          ; Pe #       TIBETAN MARK GUG RTAGS GYAS
+0F3D          ; Pe #       TIBETAN MARK ANG KHANG GYAS
+169C          ; Pe #       OGHAM REVERSED FEATHER MARK
+2046          ; Pe #       RIGHT SQUARE BRACKET WITH QUILL
+207E          ; Pe #       SUPERSCRIPT RIGHT PARENTHESIS
+208E          ; Pe #       SUBSCRIPT RIGHT PARENTHESIS
+2309          ; Pe #       RIGHT CEILING
+230B          ; Pe #       RIGHT FLOOR
+232A          ; Pe #       RIGHT-POINTING ANGLE BRACKET
+2769          ; Pe #       MEDIUM RIGHT PARENTHESIS ORNAMENT
+276B          ; Pe #       MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
+276D          ; Pe #       MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
+276F          ; Pe #       HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
+2771          ; Pe #       HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
+2773          ; Pe #       LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
+2775          ; Pe #       MEDIUM RIGHT CURLY BRACKET ORNAMENT
+27C6          ; Pe #       RIGHT S-SHAPED BAG DELIMITER
+27E7          ; Pe #       MATHEMATICAL RIGHT WHITE SQUARE BRACKET
+27E9          ; Pe #       MATHEMATICAL RIGHT ANGLE BRACKET
+27EB          ; Pe #       MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+27ED          ; Pe #       MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
+27EF          ; Pe #       MATHEMATICAL RIGHT FLATTENED PARENTHESIS
+2984          ; Pe #       RIGHT WHITE CURLY BRACKET
+2986          ; Pe #       RIGHT WHITE PARENTHESIS
+2988          ; Pe #       Z NOTATION RIGHT IMAGE BRACKET
+298A          ; Pe #       Z NOTATION RIGHT BINDING BRACKET
+298C          ; Pe #       RIGHT SQUARE BRACKET WITH UNDERBAR
+298E          ; Pe #       RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+2990          ; Pe #       RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
+2992          ; Pe #       RIGHT ANGLE BRACKET WITH DOT
+2994          ; Pe #       RIGHT ARC GREATER-THAN BRACKET
+2996          ; Pe #       DOUBLE RIGHT ARC LESS-THAN BRACKET
+2998          ; Pe #       RIGHT BLACK TORTOISE SHELL BRACKET
+29D9          ; Pe #       RIGHT WIGGLY FENCE
+29DB          ; Pe #       RIGHT DOUBLE WIGGLY FENCE
+29FD          ; Pe #       RIGHT-POINTING CURVED ANGLE BRACKET
+2E23          ; Pe #       TOP RIGHT HALF BRACKET
+2E25          ; Pe #       BOTTOM RIGHT HALF BRACKET
+2E27          ; Pe #       RIGHT SIDEWAYS U BRACKET
+2E29          ; Pe #       RIGHT DOUBLE PARENTHESIS
+3009          ; Pe #       RIGHT ANGLE BRACKET
+300B          ; Pe #       RIGHT DOUBLE ANGLE BRACKET
+300D          ; Pe #       RIGHT CORNER BRACKET
+300F          ; Pe #       RIGHT WHITE CORNER BRACKET
+3011          ; Pe #       RIGHT BLACK LENTICULAR BRACKET
+3015          ; Pe #       RIGHT TORTOISE SHELL BRACKET
+3017          ; Pe #       RIGHT WHITE LENTICULAR BRACKET
+3019          ; Pe #       RIGHT WHITE TORTOISE SHELL BRACKET
+301B          ; Pe #       RIGHT WHITE SQUARE BRACKET
+301E..301F    ; Pe #   [2] DOUBLE PRIME QUOTATION MARK..LOW DOUBLE PRIME QUOTATION MARK
+FD3E          ; Pe #       ORNATE LEFT PARENTHESIS
+FE18          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET
+FE36          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS
+FE38          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET
+FE3A          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET
+FE3C          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET
+FE3E          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET
+FE40          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET
+FE42          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET
+FE44          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET
+FE48          ; Pe #       PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET
+FE5A          ; Pe #       SMALL RIGHT PARENTHESIS
+FE5C          ; Pe #       SMALL RIGHT CURLY BRACKET
+FE5E          ; Pe #       SMALL RIGHT TORTOISE SHELL BRACKET
+FF09          ; Pe #       FULLWIDTH RIGHT PARENTHESIS
+FF3D          ; Pe #       FULLWIDTH RIGHT SQUARE BRACKET
+FF5D          ; Pe #       FULLWIDTH RIGHT CURLY BRACKET
+FF60          ; Pe #       FULLWIDTH RIGHT WHITE PARENTHESIS
+FF63          ; Pe #       HALFWIDTH RIGHT CORNER BRACKET
+
+# Total code points: 73
+
+# ================================================
+
+# General_Category=Connector_Punctuation
+
+005F          ; Pc #       LOW LINE
+203F..2040    ; Pc #   [2] UNDERTIE..CHARACTER TIE
+2054          ; Pc #       INVERTED UNDERTIE
+FE33..FE34    ; Pc #   [2] PRESENTATION FORM FOR VERTICAL LOW LINE..PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
+FE4D..FE4F    ; Pc #   [3] DASHED LOW LINE..WAVY LOW LINE
+FF3F          ; Pc #       FULLWIDTH LOW LINE
+
+# Total code points: 10
+
+# ================================================
+
+# General_Category=Other_Punctuation
+
+0021..0023    ; Po #   [3] EXCLAMATION MARK..NUMBER SIGN
+0025..0027    ; Po #   [3] PERCENT SIGN..APOSTROPHE
+002A          ; Po #       ASTERISK
+002C          ; Po #       COMMA
+002E..002F    ; Po #   [2] FULL STOP..SOLIDUS
+003A..003B    ; Po #   [2] COLON..SEMICOLON
+003F..0040    ; Po #   [2] QUESTION MARK..COMMERCIAL AT
+005C          ; Po #       REVERSE SOLIDUS
+00A1          ; Po #       INVERTED EXCLAMATION MARK
+00A7          ; Po #       SECTION SIGN
+00B6..00B7    ; Po #   [2] PILCROW SIGN..MIDDLE DOT
+00BF          ; Po #       INVERTED QUESTION MARK
+037E          ; Po #       GREEK QUESTION MARK
+0387          ; Po #       GREEK ANO TELEIA
+055A..055F    ; Po #   [6] ARMENIAN APOSTROPHE..ARMENIAN ABBREVIATION MARK
+0589          ; Po #       ARMENIAN FULL STOP
+05C0          ; Po #       HEBREW PUNCTUATION PASEQ
+05C3          ; Po #       HEBREW PUNCTUATION SOF PASUQ
+05C6          ; Po #       HEBREW PUNCTUATION NUN HAFUKHA
+05F3..05F4    ; Po #   [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM
+0609..060A    ; Po #   [2] ARABIC-INDIC PER MILLE SIGN..ARABIC-INDIC PER TEN THOUSAND SIGN
+060C..060D    ; Po #   [2] ARABIC COMMA..ARABIC DATE SEPARATOR
+061B          ; Po #       ARABIC SEMICOLON
+061E..061F    ; Po #   [2] ARABIC TRIPLE DOT PUNCTUATION MARK..ARABIC QUESTION MARK
+066A..066D    ; Po #   [4] ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR
+06D4          ; Po #       ARABIC FULL STOP
+0700..070D    ; Po #  [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS
+07F7..07F9    ; Po #   [3] NKO SYMBOL GBAKURUNEN..NKO EXCLAMATION MARK
+0830..083E    ; Po #  [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU
+085E          ; Po #       MANDAIC PUNCTUATION
+0964..0965    ; Po #   [2] DEVANAGARI DANDA..DEVANAGARI DOUBLE DANDA
+0970          ; Po #       DEVANAGARI ABBREVIATION SIGN
+09FD          ; Po #       BENGALI ABBREVIATION SIGN
+0A76          ; Po #       GURMUKHI ABBREVIATION SIGN
+0AF0          ; Po #       GUJARATI ABBREVIATION SIGN
+0C77          ; Po #       TELUGU SIGN SIDDHAM
+0C84          ; Po #       KANNADA SIGN SIDDHAM
+0DF4          ; Po #       SINHALA PUNCTUATION KUNDDALIYA
+0E4F          ; Po #       THAI CHARACTER FONGMAN
+0E5A..0E5B    ; Po #   [2] THAI CHARACTER ANGKHANKHU..THAI CHARACTER KHOMUT
+0F04..0F12    ; Po #  [15] TIBETAN MARK INITIAL YIG MGO MDUN MA..TIBETAN MARK RGYA GRAM SHAD
+0F14          ; Po #       TIBETAN MARK GTER TSHEG
+0F85          ; Po #       TIBETAN MARK PALUTA
+0FD0..0FD4    ; Po #   [5] TIBETAN MARK BSKA- SHOG GI MGO RGYAN..TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA
+0FD9..0FDA    ; Po #   [2] TIBETAN MARK LEADING MCHAN RTAGS..TIBETAN MARK TRAILING MCHAN RTAGS
+104A..104F    ; Po #   [6] MYANMAR SIGN LITTLE SECTION..MYANMAR SYMBOL GENITIVE
+10FB          ; Po #       GEORGIAN PARAGRAPH SEPARATOR
+1360..1368    ; Po #   [9] ETHIOPIC SECTION MARK..ETHIOPIC PARAGRAPH SEPARATOR
+166E          ; Po #       CANADIAN SYLLABICS FULL STOP
+16EB..16ED    ; Po #   [3] RUNIC SINGLE PUNCTUATION..RUNIC CROSS PUNCTUATION
+1735..1736    ; Po #   [2] PHILIPPINE SINGLE PUNCTUATION..PHILIPPINE DOUBLE PUNCTUATION
+17D4..17D6    ; Po #   [3] KHMER SIGN KHAN..KHMER SIGN CAMNUC PII KUUH
+17D8..17DA    ; Po #   [3] KHMER SIGN BEYYAL..KHMER SIGN KOOMUUT
+1800..1805    ; Po #   [6] MONGOLIAN BIRGA..MONGOLIAN FOUR DOTS
+1807..180A    ; Po #   [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU
+1944..1945    ; Po #   [2] LIMBU EXCLAMATION MARK..LIMBU QUESTION MARK
+1A1E..1A1F    ; Po #   [2] BUGINESE PALLAWA..BUGINESE END OF SECTION
+1AA0..1AA6    ; Po #   [7] TAI THAM SIGN WIANG..TAI THAM SIGN REVERSED ROTATED RANA
+1AA8..1AAD    ; Po #   [6] TAI THAM SIGN KAAN..TAI THAM SIGN CAANG
+1B5A..1B60    ; Po #   [7] BALINESE PANTI..BALINESE PAMENENG
+1BFC..1BFF    ; Po #   [4] BATAK SYMBOL BINDU NA METEK..BATAK SYMBOL BINDU PANGOLAT
+1C3B..1C3F    ; Po #   [5] LEPCHA PUNCTUATION TA-ROL..LEPCHA PUNCTUATION TSHOOK
+1C7E..1C7F    ; Po #   [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
+1CC0..1CC7    ; Po #   [8] SUNDANESE PUNCTUATION BINDU SURYA..SUNDANESE PUNCTUATION BINDU BA SATANGA
+1CD3          ; Po #       VEDIC SIGN NIHSHVASA
+2016..2017    ; Po #   [2] DOUBLE VERTICAL LINE..DOUBLE LOW LINE
+2020..2027    ; Po #   [8] DAGGER..HYPHENATION POINT
+2030..2038    ; Po #   [9] PER MILLE SIGN..CARET
+203B..203E    ; Po #   [4] REFERENCE MARK..OVERLINE
+2041..2043    ; Po #   [3] CARET INSERTION POINT..HYPHEN BULLET
+2047..2051    ; Po #  [11] DOUBLE QUESTION MARK..TWO ASTERISKS ALIGNED VERTICALLY
+2053          ; Po #       SWUNG DASH
+2055..205E    ; Po #  [10] FLOWER PUNCTUATION MARK..VERTICAL FOUR DOTS
+2CF9..2CFC    ; Po #   [4] COPTIC OLD NUBIAN FULL STOP..COPTIC OLD NUBIAN VERSE DIVIDER
+2CFE..2CFF    ; Po #   [2] COPTIC FULL STOP..COPTIC MORPHOLOGICAL DIVIDER
+2D70          ; Po #       TIFINAGH SEPARATOR MARK
+2E00..2E01    ; Po #   [2] RIGHT ANGLE SUBSTITUTION MARKER..RIGHT ANGLE DOTTED SUBSTITUTION MARKER
+2E06..2E08    ; Po #   [3] RAISED INTERPOLATION MARKER..DOTTED TRANSPOSITION MARKER
+2E0B          ; Po #       RAISED SQUARE
+2E0E..2E16    ; Po #   [9] EDITORIAL CORONIS..DOTTED RIGHT-POINTING ANGLE
+2E18..2E19    ; Po #   [2] INVERTED INTERROBANG..PALM BRANCH
+2E1B          ; Po #       TILDE WITH RING ABOVE
+2E1E..2E1F    ; Po #   [2] TILDE WITH DOT ABOVE..TILDE WITH DOT BELOW
+2E2A..2E2E    ; Po #   [5] TWO DOTS OVER ONE DOT PUNCTUATION..REVERSED QUESTION MARK
+2E30..2E39    ; Po #  [10] RING POINT..TOP HALF SECTION SIGN
+2E3C..2E3F    ; Po #   [4] STENOGRAPHIC FULL STOP..CAPITULUM
+2E41          ; Po #       REVERSED COMMA
+2E43..2E4F    ; Po #  [13] DASH WITH LEFT UPTURN..CORNISH VERSE DIVIDER
+2E52          ; Po #       TIRONIAN SIGN CAPITAL ET
+3001..3003    ; Po #   [3] IDEOGRAPHIC COMMA..DITTO MARK
+303D          ; Po #       PART ALTERNATION MARK
+30FB          ; Po #       KATAKANA MIDDLE DOT
+A4FE..A4FF    ; Po #   [2] LISU PUNCTUATION COMMA..LISU PUNCTUATION FULL STOP
+A60D..A60F    ; Po #   [3] VAI COMMA..VAI QUESTION MARK
+A673          ; Po #       SLAVONIC ASTERISK
+A67E          ; Po #       CYRILLIC KAVYKA
+A6F2..A6F7    ; Po #   [6] BAMUM NJAEMLI..BAMUM QUESTION MARK
+A874..A877    ; Po #   [4] PHAGS-PA SINGLE HEAD MARK..PHAGS-PA MARK DOUBLE SHAD
+A8CE..A8CF    ; Po #   [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
+A8F8..A8FA    ; Po #   [3] DEVANAGARI SIGN PUSHPIKA..DEVANAGARI CARET
+A8FC          ; Po #       DEVANAGARI SIGN SIDDHAM
+A92E..A92F    ; Po #   [2] KAYAH LI SIGN CWI..KAYAH LI SIGN SHYA
+A95F          ; Po #       REJANG SECTION MARK
+A9C1..A9CD    ; Po #  [13] JAVANESE LEFT RERENGGAN..JAVANESE TURNED PADA PISELEH
+A9DE..A9DF    ; Po #   [2] JAVANESE PADA TIRTA TUMETES..JAVANESE PADA ISEN-ISEN
+AA5C..AA5F    ; Po #   [4] CHAM PUNCTUATION SPIRAL..CHAM PUNCTUATION TRIPLE DANDA
+AADE..AADF    ; Po #   [2] TAI VIET SYMBOL HO HOI..TAI VIET SYMBOL KOI KOI
+AAF0..AAF1    ; Po #   [2] MEETEI MAYEK CHEIKHAN..MEETEI MAYEK AHANG KHUDAM
+ABEB          ; Po #       MEETEI MAYEK CHEIKHEI
+FE10..FE16    ; Po #   [7] PRESENTATION FORM FOR VERTICAL COMMA..PRESENTATION FORM FOR VERTICAL QUESTION MARK
+FE19          ; Po #       PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS
+FE30          ; Po #       PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
+FE45..FE46    ; Po #   [2] SESAME DOT..WHITE SESAME DOT
+FE49..FE4C    ; Po #   [4] DASHED OVERLINE..DOUBLE WAVY OVERLINE
+FE50..FE52    ; Po #   [3] SMALL COMMA..SMALL FULL STOP
+FE54..FE57    ; Po #   [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK
+FE5F..FE61    ; Po #   [3] SMALL NUMBER SIGN..SMALL ASTERISK
+FE68          ; Po #       SMALL REVERSE SOLIDUS
+FE6A..FE6B    ; Po #   [2] SMALL PERCENT SIGN..SMALL COMMERCIAL AT
+FF01..FF03    ; Po #   [3] FULLWIDTH EXCLAMATION MARK..FULLWIDTH NUMBER SIGN
+FF05..FF07    ; Po #   [3] FULLWIDTH PERCENT SIGN..FULLWIDTH APOSTROPHE
+FF0A          ; Po #       FULLWIDTH ASTERISK
+FF0C          ; Po #       FULLWIDTH COMMA
+FF0E..FF0F    ; Po #   [2] FULLWIDTH FULL STOP..FULLWIDTH SOLIDUS
+FF1A..FF1B    ; Po #   [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON
+FF1F..FF20    ; Po #   [2] FULLWIDTH QUESTION MARK..FULLWIDTH COMMERCIAL AT
+FF3C          ; Po #       FULLWIDTH REVERSE SOLIDUS
+FF61          ; Po #       HALFWIDTH IDEOGRAPHIC FULL STOP
+FF64..FF65    ; Po #   [2] HALFWIDTH IDEOGRAPHIC COMMA..HALFWIDTH KATAKANA MIDDLE DOT
+10100..10102  ; Po #   [3] AEGEAN WORD SEPARATOR LINE..AEGEAN CHECK MARK
+1039F         ; Po #       UGARITIC WORD DIVIDER
+103D0         ; Po #       OLD PERSIAN WORD DIVIDER
+1056F         ; Po #       CAUCASIAN ALBANIAN CITATION MARK
+10857         ; Po #       IMPERIAL ARAMAIC SECTION SIGN
+1091F         ; Po #       PHOENICIAN WORD SEPARATOR
+1093F         ; Po #       LYDIAN TRIANGULAR MARK
+10A50..10A58  ; Po #   [9] KHAROSHTHI PUNCTUATION DOT..KHAROSHTHI PUNCTUATION LINES
+10A7F         ; Po #       OLD SOUTH ARABIAN NUMERIC INDICATOR
+10AF0..10AF6  ; Po #   [7] MANICHAEAN PUNCTUATION STAR..MANICHAEAN PUNCTUATION LINE FILLER
+10B39..10B3F  ; Po #   [7] AVESTAN ABBREVIATION MARK..LARGE ONE RING OVER TWO RINGS PUNCTUATION
+10B99..10B9C  ; Po #   [4] PSALTER PAHLAVI SECTION MARK..PSALTER PAHLAVI FOUR DOTS WITH DOT
+10F55..10F59  ; Po #   [5] SOGDIAN PUNCTUATION TWO VERTICAL BARS..SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT
+11047..1104D  ; Po #   [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS
+110BB..110BC  ; Po #   [2] KAITHI ABBREVIATION SIGN..KAITHI ENUMERATION SIGN
+110BE..110C1  ; Po #   [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA
+11140..11143  ; Po #   [4] CHAKMA SECTION MARK..CHAKMA QUESTION MARK
+11174..11175  ; Po #   [2] MAHAJANI ABBREVIATION SIGN..MAHAJANI SECTION MARK
+111C5..111C8  ; Po #   [4] SHARADA DANDA..SHARADA SEPARATOR
+111CD         ; Po #       SHARADA SUTRA MARK
+111DB         ; Po #       SHARADA SIGN SIDDHAM
+111DD..111DF  ; Po #   [3] SHARADA CONTINUATION SIGN..SHARADA SECTION MARK-2
+11238..1123D  ; Po #   [6] KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
+112A9         ; Po #       MULTANI SECTION MARK
+1144B..1144F  ; Po #   [5] NEWA DANDA..NEWA ABBREVIATION SIGN
+1145A..1145B  ; Po #   [2] NEWA DOUBLE COMMA..NEWA PLACEHOLDER MARK
+1145D         ; Po #       NEWA INSERTION SIGN
+114C6         ; Po #       TIRHUTA ABBREVIATION SIGN
+115C1..115D7  ; Po #  [23] SIDDHAM SIGN SIDDHAM..SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES
+11641..11643  ; Po #   [3] MODI DANDA..MODI ABBREVIATION SIGN
+11660..1166C  ; Po #  [13] MONGOLIAN BIRGA WITH ORNAMENT..MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT
+1173C..1173E  ; Po #   [3] AHOM SIGN SMALL SECTION..AHOM SIGN RULAI
+1183B         ; Po #       DOGRA ABBREVIATION SIGN
+11944..11946  ; Po #   [3] DIVES AKURU DOUBLE DANDA..DIVES AKURU END OF TEXT MARK
+119E2         ; Po #       NANDINAGARI SIGN SIDDHAM
+11A3F..11A46  ; Po #   [8] ZANABAZAR SQUARE INITIAL HEAD MARK..ZANABAZAR SQUARE CLOSING DOUBLE-LINED HEAD MARK
+11A9A..11A9C  ; Po #   [3] SOYOMBO MARK TSHEG..SOYOMBO MARK DOUBLE SHAD
+11A9E..11AA2  ; Po #   [5] SOYOMBO HEAD MARK WITH MOON AND SUN AND TRIPLE FLAME..SOYOMBO TERMINAL MARK-2
+11C41..11C45  ; Po #   [5] BHAIKSUKI DANDA..BHAIKSUKI GAP FILLER-2
+11C70..11C71  ; Po #   [2] MARCHEN HEAD MARK..MARCHEN MARK SHAD
+11EF7..11EF8  ; Po #   [2] MAKASAR PASSIMBANG..MAKASAR END OF SECTION
+11FFF         ; Po #       TAMIL PUNCTUATION END OF TEXT
+12470..12474  ; Po #   [5] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
+16A6E..16A6F  ; Po #   [2] MRO DANDA..MRO DOUBLE DANDA
+16AF5         ; Po #       BASSA VAH FULL STOP
+16B37..16B3B  ; Po #   [5] PAHAWH HMONG SIGN VOS THOM..PAHAWH HMONG SIGN VOS FEEM
+16B44         ; Po #       PAHAWH HMONG SIGN XAUS
+16E97..16E9A  ; Po #   [4] MEDEFAIDRIN COMMA..MEDEFAIDRIN EXCLAMATION OH
+16FE2         ; Po #       OLD CHINESE HOOK MARK
+1BC9F         ; Po #       DUPLOYAN PUNCTUATION CHINOOK FULL STOP
+1DA87..1DA8B  ; Po #   [5] SIGNWRITING COMMA..SIGNWRITING PARENTHESIS
+1E95E..1E95F  ; Po #   [2] ADLAM INITIAL EXCLAMATION MARK..ADLAM INITIAL QUESTION MARK
+
+# Total code points: 593
+
+# ================================================
+
+# General_Category=Math_Symbol
+
+002B          ; Sm #       PLUS SIGN
+003C..003E    ; Sm #   [3] LESS-THAN SIGN..GREATER-THAN SIGN
+007C          ; Sm #       VERTICAL LINE
+007E          ; Sm #       TILDE
+00AC          ; Sm #       NOT SIGN
+00B1          ; Sm #       PLUS-MINUS SIGN
+00D7          ; Sm #       MULTIPLICATION SIGN
+00F7          ; Sm #       DIVISION SIGN
+03F6          ; Sm #       GREEK REVERSED LUNATE EPSILON SYMBOL
+0606..0608    ; Sm #   [3] ARABIC-INDIC CUBE ROOT..ARABIC RAY
+2044          ; Sm #       FRACTION SLASH
+2052          ; Sm #       COMMERCIAL MINUS SIGN
+207A..207C    ; Sm #   [3] SUPERSCRIPT PLUS SIGN..SUPERSCRIPT EQUALS SIGN
+208A..208C    ; Sm #   [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN
+2118          ; Sm #       SCRIPT CAPITAL P
+2140..2144    ; Sm #   [5] DOUBLE-STRUCK N-ARY SUMMATION..TURNED SANS-SERIF CAPITAL Y
+214B          ; Sm #       TURNED AMPERSAND
+2190..2194    ; Sm #   [5] LEFTWARDS ARROW..LEFT RIGHT ARROW
+219A..219B    ; Sm #   [2] LEFTWARDS ARROW WITH STROKE..RIGHTWARDS ARROW WITH STROKE
+21A0          ; Sm #       RIGHTWARDS TWO HEADED ARROW
+21A3          ; Sm #       RIGHTWARDS ARROW WITH TAIL
+21A6          ; Sm #       RIGHTWARDS ARROW FROM BAR
+21AE          ; Sm #       LEFT RIGHT ARROW WITH STROKE
+21CE..21CF    ; Sm #   [2] LEFT RIGHT DOUBLE ARROW WITH STROKE..RIGHTWARDS DOUBLE ARROW WITH STROKE
+21D2          ; Sm #       RIGHTWARDS DOUBLE ARROW
+21D4          ; Sm #       LEFT RIGHT DOUBLE ARROW
+21F4..22FF    ; Sm # [268] RIGHT ARROW WITH SMALL CIRCLE..Z NOTATION BAG MEMBERSHIP
+2320..2321    ; Sm #   [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL
+237C          ; Sm #       RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW
+239B..23B3    ; Sm #  [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM
+23DC..23E1    ; Sm #   [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET
+25B7          ; Sm #       WHITE RIGHT-POINTING TRIANGLE
+25C1          ; Sm #       WHITE LEFT-POINTING TRIANGLE
+25F8..25FF    ; Sm #   [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE
+266F          ; Sm #       MUSIC SHARP SIGN
+27C0..27C4    ; Sm #   [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET
+27C7..27E5    ; Sm #  [31] OR WITH DOT INSIDE..WHITE SQUARE WITH RIGHTWARDS TICK
+27F0..27FF    ; Sm #  [16] UPWARDS QUADRUPLE ARROW..LONG RIGHTWARDS SQUIGGLE ARROW
+2900..2982    ; Sm # [131] RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE..Z NOTATION TYPE COLON
+2999..29D7    ; Sm #  [63] DOTTED FENCE..BLACK HOURGLASS
+29DC..29FB    ; Sm #  [32] INCOMPLETE INFINITY..TRIPLE PLUS
+29FE..2AFF    ; Sm # [258] TINY..N-ARY WHITE VERTICAL BAR
+2B30..2B44    ; Sm #  [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET
+2B47..2B4C    ; Sm #   [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
+FB29          ; Sm #       HEBREW LETTER ALTERNATIVE PLUS SIGN
+FE62          ; Sm #       SMALL PLUS SIGN
+FE64..FE66    ; Sm #   [3] SMALL LESS-THAN SIGN..SMALL EQUALS SIGN
+FF0B          ; Sm #       FULLWIDTH PLUS SIGN
+FF1C..FF1E    ; Sm #   [3] FULLWIDTH LESS-THAN SIGN..FULLWIDTH GREATER-THAN SIGN
+FF5C          ; Sm #       FULLWIDTH VERTICAL LINE
+FF5E          ; Sm #       FULLWIDTH TILDE
+FFE2          ; Sm #       FULLWIDTH NOT SIGN
+FFE9..FFEC    ; Sm #   [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS ARROW
+1D6C1         ; Sm #       MATHEMATICAL BOLD NABLA
+1D6DB         ; Sm #       MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
+1D6FB         ; Sm #       MATHEMATICAL ITALIC NABLA
+1D715         ; Sm #       MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
+1D735         ; Sm #       MATHEMATICAL BOLD ITALIC NABLA
+1D74F         ; Sm #       MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
+1D76F         ; Sm #       MATHEMATICAL SANS-SERIF BOLD NABLA
+1D789         ; Sm #       MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
+1D7A9         ; Sm #       MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
+1D7C3         ; Sm #       MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
+1EEF0..1EEF1  ; Sm #   [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
+
+# Total code points: 948
+
+# ================================================
+
+# General_Category=Currency_Symbol
+
+0024          ; Sc #       DOLLAR SIGN
+00A2..00A5    ; Sc #   [4] CENT SIGN..YEN SIGN
+058F          ; Sc #       ARMENIAN DRAM SIGN
+060B          ; Sc #       AFGHANI SIGN
+07FE..07FF    ; Sc #   [2] NKO DOROME SIGN..NKO TAMAN SIGN
+09F2..09F3    ; Sc #   [2] BENGALI RUPEE MARK..BENGALI RUPEE SIGN
+09FB          ; Sc #       BENGALI GANDA MARK
+0AF1          ; Sc #       GUJARATI RUPEE SIGN
+0BF9          ; Sc #       TAMIL RUPEE SIGN
+0E3F          ; Sc #       THAI CURRENCY SYMBOL BAHT
+17DB          ; Sc #       KHMER CURRENCY SYMBOL RIEL
+20A0..20BF    ; Sc #  [32] EURO-CURRENCY SIGN..BITCOIN SIGN
+A838          ; Sc #       NORTH INDIC RUPEE MARK
+FDFC          ; Sc #       RIAL SIGN
+FE69          ; Sc #       SMALL DOLLAR SIGN
+FF04          ; Sc #       FULLWIDTH DOLLAR SIGN
+FFE0..FFE1    ; Sc #   [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN
+FFE5..FFE6    ; Sc #   [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN
+11FDD..11FE0  ; Sc #   [4] TAMIL SIGN KAACU..TAMIL SIGN VARAAKAN
+1E2FF         ; Sc #       WANCHO NGUN SIGN
+1ECB0         ; Sc #       INDIC SIYAQ RUPEE MARK
+
+# Total code points: 62
+
+# ================================================
+
+# General_Category=Modifier_Symbol
+
+005E          ; Sk #       CIRCUMFLEX ACCENT
+0060          ; Sk #       GRAVE ACCENT
+00A8          ; Sk #       DIAERESIS
+00AF          ; Sk #       MACRON
+00B4          ; Sk #       ACUTE ACCENT
+00B8          ; Sk #       CEDILLA
+02C2..02C5    ; Sk #   [4] MODIFIER LETTER LEFT ARROWHEAD..MODIFIER LETTER DOWN ARROWHEAD
+02D2..02DF    ; Sk #  [14] MODIFIER LETTER CENTRED RIGHT HALF RING..MODIFIER LETTER CROSS ACCENT
+02E5..02EB    ; Sk #   [7] MODIFIER LETTER EXTRA-HIGH TONE BAR..MODIFIER LETTER YANG DEPARTING TONE MARK
+02ED          ; Sk #       MODIFIER LETTER UNASPIRATED
+02EF..02FF    ; Sk #  [17] MODIFIER LETTER LOW DOWN ARROWHEAD..MODIFIER LETTER LOW LEFT ARROW
+0375          ; Sk #       GREEK LOWER NUMERAL SIGN
+0384..0385    ; Sk #   [2] GREEK TONOS..GREEK DIALYTIKA TONOS
+1FBD          ; Sk #       GREEK KORONIS
+1FBF..1FC1    ; Sk #   [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI
+1FCD..1FCF    ; Sk #   [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI
+1FDD..1FDF    ; Sk #   [3] GREEK DASIA AND VARIA..GREEK DASIA AND PERISPOMENI
+1FED..1FEF    ; Sk #   [3] GREEK DIALYTIKA AND VARIA..GREEK VARIA
+1FFD..1FFE    ; Sk #   [2] GREEK OXIA..GREEK DASIA
+309B..309C    ; Sk #   [2] KATAKANA-HIRAGANA VOICED SOUND MARK..KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
+A700..A716    ; Sk #  [23] MODIFIER LETTER CHINESE TONE YIN PING..MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR
+A720..A721    ; Sk #   [2] MODIFIER LETTER STRESS AND HIGH TONE..MODIFIER LETTER STRESS AND LOW TONE
+A789..A78A    ; Sk #   [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
+AB5B          ; Sk #       MODIFIER BREVE WITH INVERTED BREVE
+AB6A..AB6B    ; Sk #   [2] MODIFIER LETTER LEFT TACK..MODIFIER LETTER RIGHT TACK
+FBB2..FBC1    ; Sk #  [16] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL SMALL TAH BELOW
+FF3E          ; Sk #       FULLWIDTH CIRCUMFLEX ACCENT
+FF40          ; Sk #       FULLWIDTH GRAVE ACCENT
+FFE3          ; Sk #       FULLWIDTH MACRON
+1F3FB..1F3FF  ; Sk #   [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
+
+# Total code points: 123
+
+# ================================================
+
+# General_Category=Other_Symbol
+
+00A6          ; So #       BROKEN BAR
+00A9          ; So #       COPYRIGHT SIGN
+00AE          ; So #       REGISTERED SIGN
+00B0          ; So #       DEGREE SIGN
+0482          ; So #       CYRILLIC THOUSANDS SIGN
+058D..058E    ; So #   [2] RIGHT-FACING ARMENIAN ETERNITY SIGN..LEFT-FACING ARMENIAN ETERNITY SIGN
+060E..060F    ; So #   [2] ARABIC POETIC VERSE SIGN..ARABIC SIGN MISRA
+06DE          ; So #       ARABIC START OF RUB EL HIZB
+06E9          ; So #       ARABIC PLACE OF SAJDAH
+06FD..06FE    ; So #   [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN
+07F6          ; So #       NKO SYMBOL OO DENNEN
+09FA          ; So #       BENGALI ISSHAR
+0B70          ; So #       ORIYA ISSHAR
+0BF3..0BF8    ; So #   [6] TAMIL DAY SIGN..TAMIL AS ABOVE SIGN
+0BFA          ; So #       TAMIL NUMBER SIGN
+0C7F          ; So #       TELUGU SIGN TUUMU
+0D4F          ; So #       MALAYALAM SIGN PARA
+0D79          ; So #       MALAYALAM DATE MARK
+0F01..0F03    ; So #   [3] TIBETAN MARK GTER YIG MGO TRUNCATED A..TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA
+0F13          ; So #       TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN
+0F15..0F17    ; So #   [3] TIBETAN LOGOTYPE SIGN CHAD RTAGS..TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS
+0F1A..0F1F    ; So #   [6] TIBETAN SIGN RDEL DKAR GCIG..TIBETAN SIGN RDEL DKAR RDEL NAG
+0F34          ; So #       TIBETAN MARK BSDUS RTAGS
+0F36          ; So #       TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN
+0F38          ; So #       TIBETAN MARK CHE MGO
+0FBE..0FC5    ; So #   [8] TIBETAN KU RU KHA..TIBETAN SYMBOL RDO RJE
+0FC7..0FCC    ; So #   [6] TIBETAN SYMBOL RDO RJE RGYA GRAM..TIBETAN SYMBOL NOR BU BZHI -KHYIL
+0FCE..0FCF    ; So #   [2] TIBETAN SIGN RDEL NAG RDEL DKAR..TIBETAN SIGN RDEL NAG GSUM
+0FD5..0FD8    ; So #   [4] RIGHT-FACING SVASTI SIGN..LEFT-FACING SVASTI SIGN WITH DOTS
+109E..109F    ; So #   [2] MYANMAR SYMBOL SHAN ONE..MYANMAR SYMBOL SHAN EXCLAMATION
+1390..1399    ; So #  [10] ETHIOPIC TONAL MARK YIZET..ETHIOPIC TONAL MARK KURT
+166D          ; So #       CANADIAN SYLLABICS CHI SIGN
+1940          ; So #       LIMBU SIGN LOO
+19DE..19FF    ; So #  [34] NEW TAI LUE SIGN LAE..KHMER SYMBOL DAP-PRAM ROC
+1B61..1B6A    ; So #  [10] BALINESE MUSICAL SYMBOL DONG..BALINESE MUSICAL SYMBOL DANG GEDE
+1B74..1B7C    ; So #   [9] BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING
+2100..2101    ; So #   [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT
+2103..2106    ; So #   [4] DEGREE CELSIUS..CADA UNA
+2108..2109    ; So #   [2] SCRUPLE..DEGREE FAHRENHEIT
+2114          ; So #       L B BAR SYMBOL
+2116..2117    ; So #   [2] NUMERO SIGN..SOUND RECORDING COPYRIGHT
+211E..2123    ; So #   [6] PRESCRIPTION TAKE..VERSICLE
+2125          ; So #       OUNCE SIGN
+2127          ; So #       INVERTED OHM SIGN
+2129          ; So #       TURNED GREEK SMALL LETTER IOTA
+212E          ; So #       ESTIMATED SYMBOL
+213A..213B    ; So #   [2] ROTATED CAPITAL Q..FACSIMILE SIGN
+214A          ; So #       PROPERTY LINE
+214C..214D    ; So #   [2] PER SIGN..AKTIESELSKAB
+214F          ; So #       SYMBOL FOR SAMARITAN SOURCE
+218A..218B    ; So #   [2] TURNED DIGIT TWO..TURNED DIGIT THREE
+2195..2199    ; So #   [5] UP DOWN ARROW..SOUTH WEST ARROW
+219C..219F    ; So #   [4] LEFTWARDS WAVE ARROW..UPWARDS TWO HEADED ARROW
+21A1..21A2    ; So #   [2] DOWNWARDS TWO HEADED ARROW..LEFTWARDS ARROW WITH TAIL
+21A4..21A5    ; So #   [2] LEFTWARDS ARROW FROM BAR..UPWARDS ARROW FROM BAR
+21A7..21AD    ; So #   [7] DOWNWARDS ARROW FROM BAR..LEFT RIGHT WAVE ARROW
+21AF..21CD    ; So #  [31] DOWNWARDS ZIGZAG ARROW..LEFTWARDS DOUBLE ARROW WITH STROKE
+21D0..21D1    ; So #   [2] LEFTWARDS DOUBLE ARROW..UPWARDS DOUBLE ARROW
+21D3          ; So #       DOWNWARDS DOUBLE ARROW
+21D5..21F3    ; So #  [31] UP DOWN DOUBLE ARROW..UP DOWN WHITE ARROW
+2300..2307    ; So #   [8] DIAMETER SIGN..WAVY LINE
+230C..231F    ; So #  [20] BOTTOM RIGHT CROP..BOTTOM RIGHT CORNER
+2322..2328    ; So #   [7] FROWN..KEYBOARD
+232B..237B    ; So #  [81] ERASE TO THE LEFT..NOT CHECK MARK
+237D..239A    ; So #  [30] SHOULDERED OPEN BOX..CLEAR SCREEN SYMBOL
+23B4..23DB    ; So #  [40] TOP SQUARE BRACKET..FUSE
+23E2..2426    ; So #  [69] WHITE TRAPEZIUM..SYMBOL FOR SUBSTITUTE FORM TWO
+2440..244A    ; So #  [11] OCR HOOK..OCR DOUBLE BACKSLASH
+249C..24E9    ; So #  [78] PARENTHESIZED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z
+2500..25B6    ; So # [183] BOX DRAWINGS LIGHT HORIZONTAL..BLACK RIGHT-POINTING TRIANGLE
+25B8..25C0    ; So #   [9] BLACK RIGHT-POINTING SMALL TRIANGLE..BLACK LEFT-POINTING TRIANGLE
+25C2..25F7    ; So #  [54] BLACK LEFT-POINTING SMALL TRIANGLE..WHITE CIRCLE WITH UPPER RIGHT QUADRANT
+2600..266E    ; So # [111] BLACK SUN WITH RAYS..MUSIC NATURAL SIGN
+2670..2767    ; So # [248] WEST SYRIAC CROSS..ROTATED FLORAL HEART BULLET
+2794..27BF    ; So #  [44] HEAVY WIDE-HEADED RIGHTWARDS ARROW..DOUBLE CURLY LOOP
+2800..28FF    ; So # [256] BRAILLE PATTERN BLANK..BRAILLE PATTERN DOTS-12345678
+2B00..2B2F    ; So #  [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE
+2B45..2B46    ; So #   [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW
+2B4D..2B73    ; So #  [39] DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
+2B76..2B95    ; So #  [32] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
+2B97..2BFF    ; So # [105] SYMBOL FOR TYPE A ELECTRONICS..HELLSCHREIBER PAUSE SYMBOL
+2CE5..2CEA    ; So #   [6] COPTIC SYMBOL MI RO..COPTIC SYMBOL SHIMA SIMA
+2E50..2E51    ; So #   [2] CROSS PATTY WITH RIGHT CROSSBAR..CROSS PATTY WITH LEFT CROSSBAR
+2E80..2E99    ; So #  [26] CJK RADICAL REPEAT..CJK RADICAL RAP
+2E9B..2EF3    ; So #  [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE
+2F00..2FD5    ; So # [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
+2FF0..2FFB    ; So #  [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
+3004          ; So #       JAPANESE INDUSTRIAL STANDARD SYMBOL
+3012..3013    ; So #   [2] POSTAL MARK..GETA MARK
+3020          ; So #       POSTAL MARK FACE
+3036..3037    ; So #   [2] CIRCLED POSTAL MARK..IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL
+303E..303F    ; So #   [2] IDEOGRAPHIC VARIATION INDICATOR..IDEOGRAPHIC HALF FILL SPACE
+3190..3191    ; So #   [2] IDEOGRAPHIC ANNOTATION LINKING MARK..IDEOGRAPHIC ANNOTATION REVERSE MARK
+3196..319F    ; So #  [10] IDEOGRAPHIC ANNOTATION TOP MARK..IDEOGRAPHIC ANNOTATION MAN MARK
+31C0..31E3    ; So #  [36] CJK STROKE T..CJK STROKE Q
+3200..321E    ; So #  [31] PARENTHESIZED HANGUL KIYEOK..PARENTHESIZED KOREAN CHARACTER O HU
+322A..3247    ; So #  [30] PARENTHESIZED IDEOGRAPH MOON..CIRCLED IDEOGRAPH KOTO
+3250          ; So #       PARTNERSHIP SIGN
+3260..327F    ; So #  [32] CIRCLED HANGUL KIYEOK..KOREAN STANDARD SYMBOL
+328A..32B0    ; So #  [39] CIRCLED IDEOGRAPH MOON..CIRCLED IDEOGRAPH NIGHT
+32C0..33FF    ; So # [320] IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY..SQUARE GAL
+4DC0..4DFF    ; So #  [64] HEXAGRAM FOR THE CREATIVE HEAVEN..HEXAGRAM FOR BEFORE COMPLETION
+A490..A4C6    ; So #  [55] YI RADICAL QOT..YI RADICAL KE
+A828..A82B    ; So #   [4] SYLOTI NAGRI POETRY MARK-1..SYLOTI NAGRI POETRY MARK-4
+A836..A837    ; So #   [2] NORTH INDIC QUARTER MARK..NORTH INDIC PLACEHOLDER MARK
+A839          ; So #       NORTH INDIC QUANTITY MARK
+AA77..AA79    ; So #   [3] MYANMAR SYMBOL AITON EXCLAMATION..MYANMAR SYMBOL AITON TWO
+FDFD          ; So #       ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM
+FFE4          ; So #       FULLWIDTH BROKEN BAR
+FFE8          ; So #       HALFWIDTH FORMS LIGHT VERTICAL
+FFED..FFEE    ; So #   [2] HALFWIDTH BLACK SQUARE..HALFWIDTH WHITE CIRCLE
+FFFC..FFFD    ; So #   [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHARACTER
+10137..1013F  ; So #   [9] AEGEAN WEIGHT BASE UNIT..AEGEAN MEASURE THIRD SUBUNIT
+10179..10189  ; So #  [17] GREEK YEAR SIGN..GREEK TRYBLION BASE SIGN
+1018C..1018E  ; So #   [3] GREEK SINUSOID SIGN..NOMISMA SIGN
+10190..1019C  ; So #  [13] ROMAN SEXTANS SIGN..ASCIA SYMBOL
+101A0         ; So #       GREEK SYMBOL TAU RHO
+101D0..101FC  ; So #  [45] PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND
+10877..10878  ; So #   [2] PALMYRENE LEFT-POINTING FLEURON..PALMYRENE RIGHT-POINTING FLEURON
+10AC8         ; So #       MANICHAEAN SIGN UD
+1173F         ; So #       AHOM SYMBOL VI
+11FD5..11FDC  ; So #   [8] TAMIL SIGN NEL..TAMIL SIGN MUKKURUNI
+11FE1..11FF1  ; So #  [17] TAMIL SIGN PAARAM..TAMIL SIGN VAKAIYARAA
+16B3C..16B3F  ; So #   [4] PAHAWH HMONG SIGN XYEEM NTXIV..PAHAWH HMONG SIGN XYEEM FAIB
+16B45         ; So #       PAHAWH HMONG SIGN CIM TSOV ROG
+1BC9C         ; So #       DUPLOYAN SIGN O WITH CROSS
+1D000..1D0F5  ; So # [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO
+1D100..1D126  ; So #  [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2
+1D129..1D164  ; So #  [60] MUSICAL SYMBOL MULTIPLE MEASURE REST..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
+1D16A..1D16C  ; So #   [3] MUSICAL SYMBOL FINGERED TREMOLO-1..MUSICAL SYMBOL FINGERED TREMOLO-3
+1D183..1D184  ; So #   [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN
+1D18C..1D1A9  ; So #  [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH
+1D1AE..1D1E8  ; So #  [59] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL KIEVAN FLAT SIGN
+1D200..1D241  ; So #  [66] GREEK VOCAL NOTATION SYMBOL-1..GREEK INSTRUMENTAL NOTATION SYMBOL-54
+1D245         ; So #       GREEK MUSICAL LEIMMA
+1D300..1D356  ; So #  [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING
+1D800..1D9FF  ; So # [512] SIGNWRITING HAND-FIST INDEX..SIGNWRITING HEAD
+1DA37..1DA3A  ; So #   [4] SIGNWRITING AIR BLOW SMALL ROTATIONS..SIGNWRITING BREATH EXHALE
+1DA6D..1DA74  ; So #   [8] SIGNWRITING SHOULDER HIP SPINE..SIGNWRITING TORSO-FLOORPLANE TWISTING
+1DA76..1DA83  ; So #  [14] SIGNWRITING LIMB COMBINATION..SIGNWRITING LOCATION DEPTH
+1DA85..1DA86  ; So #   [2] SIGNWRITING LOCATION TORSO..SIGNWRITING LOCATION LIMBS DIGITS
+1E14F         ; So #       NYIAKENG PUACHUE HMONG CIRCLED CA
+1ECAC         ; So #       INDIC SIYAQ PLACEHOLDER
+1ED2E         ; So #       OTTOMAN SIYAQ MARRATAN
+1F000..1F02B  ; So #  [44] MAHJONG TILE EAST WIND..MAHJONG TILE BACK
+1F030..1F093  ; So # [100] DOMINO TILE HORIZONTAL BACK..DOMINO TILE VERTICAL-06-06
+1F0A0..1F0AE  ; So #  [15] PLAYING CARD BACK..PLAYING CARD KING OF SPADES
+1F0B1..1F0BF  ; So #  [15] PLAYING CARD ACE OF HEARTS..PLAYING CARD RED JOKER
+1F0C1..1F0CF  ; So #  [15] PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER
+1F0D1..1F0F5  ; So #  [37] PLAYING CARD ACE OF CLUBS..PLAYING CARD TRUMP-21
+1F10D..1F1AD  ; So # [161] CIRCLED ZERO WITH SLASH..MASK WORK SYMBOL
+1F1E6..1F202  ; So #  [29] REGIONAL INDICATOR SYMBOL LETTER A..SQUARED KATAKANA SA
+1F210..1F23B  ; So #  [44] SQUARED CJK UNIFIED IDEOGRAPH-624B..SQUARED CJK UNIFIED IDEOGRAPH-914D
+1F240..1F248  ; So #   [9] TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C..TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557
+1F250..1F251  ; So #   [2] CIRCLED IDEOGRAPH ADVANTAGE..CIRCLED IDEOGRAPH ACCEPT
+1F260..1F265  ; So #   [6] ROUNDED SYMBOL FOR FU..ROUNDED SYMBOL FOR CAI
+1F300..1F3FA  ; So # [251] CYCLONE..AMPHORA
+1F400..1F6D7  ; So # [728] RAT..ELEVATOR
+1F6E0..1F6EC  ; So #  [13] HAMMER AND WRENCH..AIRPLANE ARRIVING
+1F6F0..1F6FC  ; So #  [13] SATELLITE..ROLLER SKATE
+1F700..1F773  ; So # [116] ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
+1F780..1F7D8  ; So #  [89] BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..NEGATIVE CIRCLED SQUARE
+1F7E0..1F7EB  ; So #  [12] LARGE ORANGE CIRCLE..LARGE BROWN SQUARE
+1F800..1F80B  ; So #  [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
+1F810..1F847  ; So #  [56] LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW
+1F850..1F859  ; So #  [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW
+1F860..1F887  ; So #  [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW
+1F890..1F8AD  ; So #  [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
+1F8B0..1F8B1  ; So #   [2] ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST
+1F900..1F978  ; So # [121] CIRCLED CROSS FORMEE WITH FOUR DOTS..DISGUISED FACE
+1F97A..1F9CB  ; So #  [82] FACE WITH PLEADING EYES..BUBBLE TEA
+1F9CD..1FA53  ; So # [135] STANDING PERSON..BLACK CHESS KNIGHT-BISHOP
+1FA60..1FA6D  ; So #  [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER
+1FA70..1FA74  ; So #   [5] BALLET SHOES..THONG SANDAL
+1FA78..1FA7A  ; So #   [3] DROP OF BLOOD..STETHOSCOPE
+1FA80..1FA86  ; So #   [7] YO-YO..NESTING DOLLS
+1FA90..1FAA8  ; So #  [25] RINGED PLANET..ROCK
+1FAB0..1FAB6  ; So #   [7] FLY..FEATHER
+1FAC0..1FAC2  ; So #   [3] ANATOMICAL HEART..PEOPLE HUGGING
+1FAD0..1FAD6  ; So #   [7] BLUEBERRIES..TEAPOT
+1FB00..1FB92  ; So # [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK
+1FB94..1FBCA  ; So #  [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON
+
+# Total code points: 6431
+
+# ================================================
+
+# General_Category=Initial_Punctuation
+
+00AB          ; Pi #       LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+2018          ; Pi #       LEFT SINGLE QUOTATION MARK
+201B..201C    ; Pi #   [2] SINGLE HIGH-REVERSED-9 QUOTATION MARK..LEFT DOUBLE QUOTATION MARK
+201F          ; Pi #       DOUBLE HIGH-REVERSED-9 QUOTATION MARK
+2039          ; Pi #       SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+2E02          ; Pi #       LEFT SUBSTITUTION BRACKET
+2E04          ; Pi #       LEFT DOTTED SUBSTITUTION BRACKET
+2E09          ; Pi #       LEFT TRANSPOSITION BRACKET
+2E0C          ; Pi #       LEFT RAISED OMISSION BRACKET
+2E1C          ; Pi #       LEFT LOW PARAPHRASE BRACKET
+2E20          ; Pi #       LEFT VERTICAL BAR WITH QUILL
+
+# Total code points: 12
+
+# ================================================
+
+# General_Category=Final_Punctuation
+
+00BB          ; Pf #       RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+2019          ; Pf #       RIGHT SINGLE QUOTATION MARK
+201D          ; Pf #       RIGHT DOUBLE QUOTATION MARK
+203A          ; Pf #       SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+2E03          ; Pf #       RIGHT SUBSTITUTION BRACKET
+2E05          ; Pf #       RIGHT DOTTED SUBSTITUTION BRACKET
+2E0A          ; Pf #       RIGHT TRANSPOSITION BRACKET
+2E0D          ; Pf #       RIGHT RAISED OMISSION BRACKET
+2E1D          ; Pf #       RIGHT LOW PARAPHRASE BRACKET
+2E21          ; Pf #       RIGHT VERTICAL BAR WITH QUILL
+
+# Total code points: 10
+
+# EOF
diff --git a/tdemarkdown/md4c/src/CMakeLists.txt b/tdemarkdown/md4c/src/CMakeLists.txt
new file mode 100644
index 000000000..66f2f5013
--- /dev/null
+++ b/tdemarkdown/md4c/src/CMakeLists.txt
@@ -0,0 +1,56 @@
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS 1)
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
+
+
+# Build rules for MD4C parser library
+
+configure_file(md4c.pc.in md4c.pc @ONLY)
+add_library(md4c md4c.c md4c.h)
+if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
+    target_compile_options(md4c PRIVATE -Wall -Wextra)
+endif()
+set_target_properties(md4c PROPERTIES
+    COMPILE_FLAGS "-DMD4C_USE_UTF8"
+    VERSION ${MD_VERSION}
+    SOVERSION ${MD_VERSION_MAJOR}
+    PUBLIC_HEADER md4c.h
+)
+
+# Build rules for HTML renderer library
+
+configure_file(md4c-html.pc.in md4c-html.pc @ONLY)
+add_library(md4c-html md4c-html.c md4c-html.h entity.c entity.h)
+set_target_properties(md4c-html PROPERTIES
+    VERSION ${MD_VERSION}
+    SOVERSION ${MD_VERSION_MAJOR}
+    PUBLIC_HEADER md4c-html.h
+)
+target_link_libraries(md4c-html md4c)
+
+
+# Install rules
+
+install(
+    TARGETS md4c
+    EXPORT md4cConfig
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+install(FILES ${CMAKE_BINARY_DIR}/src/md4c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+install(
+    TARGETS md4c-html
+    EXPORT md4cConfig
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+install(FILES ${CMAKE_BINARY_DIR}/src/md4c-html.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+install(EXPORT md4cConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/md4c/ NAMESPACE md4c::)
+
diff --git a/tdemarkdown/md4c/src/entity.c b/tdemarkdown/md4c/src/entity.c
new file mode 100644
index 000000000..9991ca17a
--- /dev/null
+++ b/tdemarkdown/md4c/src/entity.c
@@ -0,0 +1,2190 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2017 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "entity.h"
+#include <string.h>
+
+
+/* The table is generated from https://html.spec.whatwg.org/entities.json */
+static const struct entity entity_table[] = {
+    { "&AElig;", { 198, 0 } },
+    { "&AMP;", { 38, 0 } },
+    { "&Aacute;", { 193, 0 } },
+    { "&Abreve;", { 258, 0 } },
+    { "&Acirc;", { 194, 0 } },
+    { "&Acy;", { 1040, 0 } },
+    { "&Afr;", { 120068, 0 } },
+    { "&Agrave;", { 192, 0 } },
+    { "&Alpha;", { 913, 0 } },
+    { "&Amacr;", { 256, 0 } },
+    { "&And;", { 10835, 0 } },
+    { "&Aogon;", { 260, 0 } },
+    { "&Aopf;", { 120120, 0 } },
+    { "&ApplyFunction;", { 8289, 0 } },
+    { "&Aring;", { 197, 0 } },
+    { "&Ascr;", { 119964, 0 } },
+    { "&Assign;", { 8788, 0 } },
+    { "&Atilde;", { 195, 0 } },
+    { "&Auml;", { 196, 0 } },
+    { "&Backslash;", { 8726, 0 } },
+    { "&Barv;", { 10983, 0 } },
+    { "&Barwed;", { 8966, 0 } },
+    { "&Bcy;", { 1041, 0 } },
+    { "&Because;", { 8757, 0 } },
+    { "&Bernoullis;", { 8492, 0 } },
+    { "&Beta;", { 914, 0 } },
+    { "&Bfr;", { 120069, 0 } },
+    { "&Bopf;", { 120121, 0 } },
+    { "&Breve;", { 728, 0 } },
+    { "&Bscr;", { 8492, 0 } },
+    { "&Bumpeq;", { 8782, 0 } },
+    { "&CHcy;", { 1063, 0 } },
+    { "&COPY;", { 169, 0 } },
+    { "&Cacute;", { 262, 0 } },
+    { "&Cap;", { 8914, 0 } },
+    { "&CapitalDifferentialD;", { 8517, 0 } },
+    { "&Cayleys;", { 8493, 0 } },
+    { "&Ccaron;", { 268, 0 } },
+    { "&Ccedil;", { 199, 0 } },
+    { "&Ccirc;", { 264, 0 } },
+    { "&Cconint;", { 8752, 0 } },
+    { "&Cdot;", { 266, 0 } },
+    { "&Cedilla;", { 184, 0 } },
+    { "&CenterDot;", { 183, 0 } },
+    { "&Cfr;", { 8493, 0 } },
+    { "&Chi;", { 935, 0 } },
+    { "&CircleDot;", { 8857, 0 } },
+    { "&CircleMinus;", { 8854, 0 } },
+    { "&CirclePlus;", { 8853, 0 } },
+    { "&CircleTimes;", { 8855, 0 } },
+    { "&ClockwiseContourIntegral;", { 8754, 0 } },
+    { "&CloseCurlyDoubleQuote;", { 8221, 0 } },
+    { "&CloseCurlyQuote;", { 8217, 0 } },
+    { "&Colon;", { 8759, 0 } },
+    { "&Colone;", { 10868, 0 } },
+    { "&Congruent;", { 8801, 0 } },
+    { "&Conint;", { 8751, 0 } },
+    { "&ContourIntegral;", { 8750, 0 } },
+    { "&Copf;", { 8450, 0 } },
+    { "&Coproduct;", { 8720, 0 } },
+    { "&CounterClockwiseContourIntegral;", { 8755, 0 } },
+    { "&Cross;", { 10799, 0 } },
+    { "&Cscr;", { 119966, 0 } },
+    { "&Cup;", { 8915, 0 } },
+    { "&CupCap;", { 8781, 0 } },
+    { "&DD;", { 8517, 0 } },
+    { "&DDotrahd;", { 10513, 0 } },
+    { "&DJcy;", { 1026, 0 } },
+    { "&DScy;", { 1029, 0 } },
+    { "&DZcy;", { 1039, 0 } },
+    { "&Dagger;", { 8225, 0 } },
+    { "&Darr;", { 8609, 0 } },
+    { "&Dashv;", { 10980, 0 } },
+    { "&Dcaron;", { 270, 0 } },
+    { "&Dcy;", { 1044, 0 } },
+    { "&Del;", { 8711, 0 } },
+    { "&Delta;", { 916, 0 } },
+    { "&Dfr;", { 120071, 0 } },
+    { "&DiacriticalAcute;", { 180, 0 } },
+    { "&DiacriticalDot;", { 729, 0 } },
+    { "&DiacriticalDoubleAcute;", { 733, 0 } },
+    { "&DiacriticalGrave;", { 96, 0 } },
+    { "&DiacriticalTilde;", { 732, 0 } },
+    { "&Diamond;", { 8900, 0 } },
+    { "&DifferentialD;", { 8518, 0 } },
+    { "&Dopf;", { 120123, 0 } },
+    { "&Dot;", { 168, 0 } },
+    { "&DotDot;", { 8412, 0 } },
+    { "&DotEqual;", { 8784, 0 } },
+    { "&DoubleContourIntegral;", { 8751, 0 } },
+    { "&DoubleDot;", { 168, 0 } },
+    { "&DoubleDownArrow;", { 8659, 0 } },
+    { "&DoubleLeftArrow;", { 8656, 0 } },
+    { "&DoubleLeftRightArrow;", { 8660, 0 } },
+    { "&DoubleLeftTee;", { 10980, 0 } },
+    { "&DoubleLongLeftArrow;", { 10232, 0 } },
+    { "&DoubleLongLeftRightArrow;", { 10234, 0 } },
+    { "&DoubleLongRightArrow;", { 10233, 0 } },
+    { "&DoubleRightArrow;", { 8658, 0 } },
+    { "&DoubleRightTee;", { 8872, 0 } },
+    { "&DoubleUpArrow;", { 8657, 0 } },
+    { "&DoubleUpDownArrow;", { 8661, 0 } },
+    { "&DoubleVerticalBar;", { 8741, 0 } },
+    { "&DownArrow;", { 8595, 0 } },
+    { "&DownArrowBar;", { 10515, 0 } },
+    { "&DownArrowUpArrow;", { 8693, 0 } },
+    { "&DownBreve;", { 785, 0 } },
+    { "&DownLeftRightVector;", { 10576, 0 } },
+    { "&DownLeftTeeVector;", { 10590, 0 } },
+    { "&DownLeftVector;", { 8637, 0 } },
+    { "&DownLeftVectorBar;", { 10582, 0 } },
+    { "&DownRightTeeVector;", { 10591, 0 } },
+    { "&DownRightVector;", { 8641, 0 } },
+    { "&DownRightVectorBar;", { 10583, 0 } },
+    { "&DownTee;", { 8868, 0 } },
+    { "&DownTeeArrow;", { 8615, 0 } },
+    { "&Downarrow;", { 8659, 0 } },
+    { "&Dscr;", { 119967, 0 } },
+    { "&Dstrok;", { 272, 0 } },
+    { "&ENG;", { 330, 0 } },
+    { "&ETH;", { 208, 0 } },
+    { "&Eacute;", { 201, 0 } },
+    { "&Ecaron;", { 282, 0 } },
+    { "&Ecirc;", { 202, 0 } },
+    { "&Ecy;", { 1069, 0 } },
+    { "&Edot;", { 278, 0 } },
+    { "&Efr;", { 120072, 0 } },
+    { "&Egrave;", { 200, 0 } },
+    { "&Element;", { 8712, 0 } },
+    { "&Emacr;", { 274, 0 } },
+    { "&EmptySmallSquare;", { 9723, 0 } },
+    { "&EmptyVerySmallSquare;", { 9643, 0 } },
+    { "&Eogon;", { 280, 0 } },
+    { "&Eopf;", { 120124, 0 } },
+    { "&Epsilon;", { 917, 0 } },
+    { "&Equal;", { 10869, 0 } },
+    { "&EqualTilde;", { 8770, 0 } },
+    { "&Equilibrium;", { 8652, 0 } },
+    { "&Escr;", { 8496, 0 } },
+    { "&Esim;", { 10867, 0 } },
+    { "&Eta;", { 919, 0 } },
+    { "&Euml;", { 203, 0 } },
+    { "&Exists;", { 8707, 0 } },
+    { "&ExponentialE;", { 8519, 0 } },
+    { "&Fcy;", { 1060, 0 } },
+    { "&Ffr;", { 120073, 0 } },
+    { "&FilledSmallSquare;", { 9724, 0 } },
+    { "&FilledVerySmallSquare;", { 9642, 0 } },
+    { "&Fopf;", { 120125, 0 } },
+    { "&ForAll;", { 8704, 0 } },
+    { "&Fouriertrf;", { 8497, 0 } },
+    { "&Fscr;", { 8497, 0 } },
+    { "&GJcy;", { 1027, 0 } },
+    { "&GT;", { 62, 0 } },
+    { "&Gamma;", { 915, 0 } },
+    { "&Gammad;", { 988, 0 } },
+    { "&Gbreve;", { 286, 0 } },
+    { "&Gcedil;", { 290, 0 } },
+    { "&Gcirc;", { 284, 0 } },
+    { "&Gcy;", { 1043, 0 } },
+    { "&Gdot;", { 288, 0 } },
+    { "&Gfr;", { 120074, 0 } },
+    { "&Gg;", { 8921, 0 } },
+    { "&Gopf;", { 120126, 0 } },
+    { "&GreaterEqual;", { 8805, 0 } },
+    { "&GreaterEqualLess;", { 8923, 0 } },
+    { "&GreaterFullEqual;", { 8807, 0 } },
+    { "&GreaterGreater;", { 10914, 0 } },
+    { "&GreaterLess;", { 8823, 0 } },
+    { "&GreaterSlantEqual;", { 10878, 0 } },
+    { "&GreaterTilde;", { 8819, 0 } },
+    { "&Gscr;", { 119970, 0 } },
+    { "&Gt;", { 8811, 0 } },
+    { "&HARDcy;", { 1066, 0 } },
+    { "&Hacek;", { 711, 0 } },
+    { "&Hat;", { 94, 0 } },
+    { "&Hcirc;", { 292, 0 } },
+    { "&Hfr;", { 8460, 0 } },
+    { "&HilbertSpace;", { 8459, 0 } },
+    { "&Hopf;", { 8461, 0 } },
+    { "&HorizontalLine;", { 9472, 0 } },
+    { "&Hscr;", { 8459, 0 } },
+    { "&Hstrok;", { 294, 0 } },
+    { "&HumpDownHump;", { 8782, 0 } },
+    { "&HumpEqual;", { 8783, 0 } },
+    { "&IEcy;", { 1045, 0 } },
+    { "&IJlig;", { 306, 0 } },
+    { "&IOcy;", { 1025, 0 } },
+    { "&Iacute;", { 205, 0 } },
+    { "&Icirc;", { 206, 0 } },
+    { "&Icy;", { 1048, 0 } },
+    { "&Idot;", { 304, 0 } },
+    { "&Ifr;", { 8465, 0 } },
+    { "&Igrave;", { 204, 0 } },
+    { "&Im;", { 8465, 0 } },
+    { "&Imacr;", { 298, 0 } },
+    { "&ImaginaryI;", { 8520, 0 } },
+    { "&Implies;", { 8658, 0 } },
+    { "&Int;", { 8748, 0 } },
+    { "&Integral;", { 8747, 0 } },
+    { "&Intersection;", { 8898, 0 } },
+    { "&InvisibleComma;", { 8291, 0 } },
+    { "&InvisibleTimes;", { 8290, 0 } },
+    { "&Iogon;", { 302, 0 } },
+    { "&Iopf;", { 120128, 0 } },
+    { "&Iota;", { 921, 0 } },
+    { "&Iscr;", { 8464, 0 } },
+    { "&Itilde;", { 296, 0 } },
+    { "&Iukcy;", { 1030, 0 } },
+    { "&Iuml;", { 207, 0 } },
+    { "&Jcirc;", { 308, 0 } },
+    { "&Jcy;", { 1049, 0 } },
+    { "&Jfr;", { 120077, 0 } },
+    { "&Jopf;", { 120129, 0 } },
+    { "&Jscr;", { 119973, 0 } },
+    { "&Jsercy;", { 1032, 0 } },
+    { "&Jukcy;", { 1028, 0 } },
+    { "&KHcy;", { 1061, 0 } },
+    { "&KJcy;", { 1036, 0 } },
+    { "&Kappa;", { 922, 0 } },
+    { "&Kcedil;", { 310, 0 } },
+    { "&Kcy;", { 1050, 0 } },
+    { "&Kfr;", { 120078, 0 } },
+    { "&Kopf;", { 120130, 0 } },
+    { "&Kscr;", { 119974, 0 } },
+    { "&LJcy;", { 1033, 0 } },
+    { "&LT;", { 60, 0 } },
+    { "&Lacute;", { 313, 0 } },
+    { "&Lambda;", { 923, 0 } },
+    { "&Lang;", { 10218, 0 } },
+    { "&Laplacetrf;", { 8466, 0 } },
+    { "&Larr;", { 8606, 0 } },
+    { "&Lcaron;", { 317, 0 } },
+    { "&Lcedil;", { 315, 0 } },
+    { "&Lcy;", { 1051, 0 } },
+    { "&LeftAngleBracket;", { 10216, 0 } },
+    { "&LeftArrow;", { 8592, 0 } },
+    { "&LeftArrowBar;", { 8676, 0 } },
+    { "&LeftArrowRightArrow;", { 8646, 0 } },
+    { "&LeftCeiling;", { 8968, 0 } },
+    { "&LeftDoubleBracket;", { 10214, 0 } },
+    { "&LeftDownTeeVector;", { 10593, 0 } },
+    { "&LeftDownVector;", { 8643, 0 } },
+    { "&LeftDownVectorBar;", { 10585, 0 } },
+    { "&LeftFloor;", { 8970, 0 } },
+    { "&LeftRightArrow;", { 8596, 0 } },
+    { "&LeftRightVector;", { 10574, 0 } },
+    { "&LeftTee;", { 8867, 0 } },
+    { "&LeftTeeArrow;", { 8612, 0 } },
+    { "&LeftTeeVector;", { 10586, 0 } },
+    { "&LeftTriangle;", { 8882, 0 } },
+    { "&LeftTriangleBar;", { 10703, 0 } },
+    { "&LeftTriangleEqual;", { 8884, 0 } },
+    { "&LeftUpDownVector;", { 10577, 0 } },
+    { "&LeftUpTeeVector;", { 10592, 0 } },
+    { "&LeftUpVector;", { 8639, 0 } },
+    { "&LeftUpVectorBar;", { 10584, 0 } },
+    { "&LeftVector;", { 8636, 0 } },
+    { "&LeftVectorBar;", { 10578, 0 } },
+    { "&Leftarrow;", { 8656, 0 } },
+    { "&Leftrightarrow;", { 8660, 0 } },
+    { "&LessEqualGreater;", { 8922, 0 } },
+    { "&LessFullEqual;", { 8806, 0 } },
+    { "&LessGreater;", { 8822, 0 } },
+    { "&LessLess;", { 10913, 0 } },
+    { "&LessSlantEqual;", { 10877, 0 } },
+    { "&LessTilde;", { 8818, 0 } },
+    { "&Lfr;", { 120079, 0 } },
+    { "&Ll;", { 8920, 0 } },
+    { "&Lleftarrow;", { 8666, 0 } },
+    { "&Lmidot;", { 319, 0 } },
+    { "&LongLeftArrow;", { 10229, 0 } },
+    { "&LongLeftRightArrow;", { 10231, 0 } },
+    { "&LongRightArrow;", { 10230, 0 } },
+    { "&Longleftarrow;", { 10232, 0 } },
+    { "&Longleftrightarrow;", { 10234, 0 } },
+    { "&Longrightarrow;", { 10233, 0 } },
+    { "&Lopf;", { 120131, 0 } },
+    { "&LowerLeftArrow;", { 8601, 0 } },
+    { "&LowerRightArrow;", { 8600, 0 } },
+    { "&Lscr;", { 8466, 0 } },
+    { "&Lsh;", { 8624, 0 } },
+    { "&Lstrok;", { 321, 0 } },
+    { "&Lt;", { 8810, 0 } },
+    { "&Map;", { 10501, 0 } },
+    { "&Mcy;", { 1052, 0 } },
+    { "&MediumSpace;", { 8287, 0 } },
+    { "&Mellintrf;", { 8499, 0 } },
+    { "&Mfr;", { 120080, 0 } },
+    { "&MinusPlus;", { 8723, 0 } },
+    { "&Mopf;", { 120132, 0 } },
+    { "&Mscr;", { 8499, 0 } },
+    { "&Mu;", { 924, 0 } },
+    { "&NJcy;", { 1034, 0 } },
+    { "&Nacute;", { 323, 0 } },
+    { "&Ncaron;", { 327, 0 } },
+    { "&Ncedil;", { 325, 0 } },
+    { "&Ncy;", { 1053, 0 } },
+    { "&NegativeMediumSpace;", { 8203, 0 } },
+    { "&NegativeThickSpace;", { 8203, 0 } },
+    { "&NegativeThinSpace;", { 8203, 0 } },
+    { "&NegativeVeryThinSpace;", { 8203, 0 } },
+    { "&NestedGreaterGreater;", { 8811, 0 } },
+    { "&NestedLessLess;", { 8810, 0 } },
+    { "&NewLine;", { 10, 0 } },
+    { "&Nfr;", { 120081, 0 } },
+    { "&NoBreak;", { 8288, 0 } },
+    { "&NonBreakingSpace;", { 160, 0 } },
+    { "&Nopf;", { 8469, 0 } },
+    { "&Not;", { 10988, 0 } },
+    { "&NotCongruent;", { 8802, 0 } },
+    { "&NotCupCap;", { 8813, 0 } },
+    { "&NotDoubleVerticalBar;", { 8742, 0 } },
+    { "&NotElement;", { 8713, 0 } },
+    { "&NotEqual;", { 8800, 0 } },
+    { "&NotEqualTilde;", { 8770, 824 } },
+    { "&NotExists;", { 8708, 0 } },
+    { "&NotGreater;", { 8815, 0 } },
+    { "&NotGreaterEqual;", { 8817, 0 } },
+    { "&NotGreaterFullEqual;", { 8807, 824 } },
+    { "&NotGreaterGreater;", { 8811, 824 } },
+    { "&NotGreaterLess;", { 8825, 0 } },
+    { "&NotGreaterSlantEqual;", { 10878, 824 } },
+    { "&NotGreaterTilde;", { 8821, 0 } },
+    { "&NotHumpDownHump;", { 8782, 824 } },
+    { "&NotHumpEqual;", { 8783, 824 } },
+    { "&NotLeftTriangle;", { 8938, 0 } },
+    { "&NotLeftTriangleBar;", { 10703, 824 } },
+    { "&NotLeftTriangleEqual;", { 8940, 0 } },
+    { "&NotLess;", { 8814, 0 } },
+    { "&NotLessEqual;", { 8816, 0 } },
+    { "&NotLessGreater;", { 8824, 0 } },
+    { "&NotLessLess;", { 8810, 824 } },
+    { "&NotLessSlantEqual;", { 10877, 824 } },
+    { "&NotLessTilde;", { 8820, 0 } },
+    { "&NotNestedGreaterGreater;", { 10914, 824 } },
+    { "&NotNestedLessLess;", { 10913, 824 } },
+    { "&NotPrecedes;", { 8832, 0 } },
+    { "&NotPrecedesEqual;", { 10927, 824 } },
+    { "&NotPrecedesSlantEqual;", { 8928, 0 } },
+    { "&NotReverseElement;", { 8716, 0 } },
+    { "&NotRightTriangle;", { 8939, 0 } },
+    { "&NotRightTriangleBar;", { 10704, 824 } },
+    { "&NotRightTriangleEqual;", { 8941, 0 } },
+    { "&NotSquareSubset;", { 8847, 824 } },
+    { "&NotSquareSubsetEqual;", { 8930, 0 } },
+    { "&NotSquareSuperset;", { 8848, 824 } },
+    { "&NotSquareSupersetEqual;", { 8931, 0 } },
+    { "&NotSubset;", { 8834, 8402 } },
+    { "&NotSubsetEqual;", { 8840, 0 } },
+    { "&NotSucceeds;", { 8833, 0 } },
+    { "&NotSucceedsEqual;", { 10928, 824 } },
+    { "&NotSucceedsSlantEqual;", { 8929, 0 } },
+    { "&NotSucceedsTilde;", { 8831, 824 } },
+    { "&NotSuperset;", { 8835, 8402 } },
+    { "&NotSupersetEqual;", { 8841, 0 } },
+    { "&NotTilde;", { 8769, 0 } },
+    { "&NotTildeEqual;", { 8772, 0 } },
+    { "&NotTildeFullEqual;", { 8775, 0 } },
+    { "&NotTildeTilde;", { 8777, 0 } },
+    { "&NotVerticalBar;", { 8740, 0 } },
+    { "&Nscr;", { 119977, 0 } },
+    { "&Ntilde;", { 209, 0 } },
+    { "&Nu;", { 925, 0 } },
+    { "&OElig;", { 338, 0 } },
+    { "&Oacute;", { 211, 0 } },
+    { "&Ocirc;", { 212, 0 } },
+    { "&Ocy;", { 1054, 0 } },
+    { "&Odblac;", { 336, 0 } },
+    { "&Ofr;", { 120082, 0 } },
+    { "&Ograve;", { 210, 0 } },
+    { "&Omacr;", { 332, 0 } },
+    { "&Omega;", { 937, 0 } },
+    { "&Omicron;", { 927, 0 } },
+    { "&Oopf;", { 120134, 0 } },
+    { "&OpenCurlyDoubleQuote;", { 8220, 0 } },
+    { "&OpenCurlyQuote;", { 8216, 0 } },
+    { "&Or;", { 10836, 0 } },
+    { "&Oscr;", { 119978, 0 } },
+    { "&Oslash;", { 216, 0 } },
+    { "&Otilde;", { 213, 0 } },
+    { "&Otimes;", { 10807, 0 } },
+    { "&Ouml;", { 214, 0 } },
+    { "&OverBar;", { 8254, 0 } },
+    { "&OverBrace;", { 9182, 0 } },
+    { "&OverBracket;", { 9140, 0 } },
+    { "&OverParenthesis;", { 9180, 0 } },
+    { "&PartialD;", { 8706, 0 } },
+    { "&Pcy;", { 1055, 0 } },
+    { "&Pfr;", { 120083, 0 } },
+    { "&Phi;", { 934, 0 } },
+    { "&Pi;", { 928, 0 } },
+    { "&PlusMinus;", { 177, 0 } },
+    { "&Poincareplane;", { 8460, 0 } },
+    { "&Popf;", { 8473, 0 } },
+    { "&Pr;", { 10939, 0 } },
+    { "&Precedes;", { 8826, 0 } },
+    { "&PrecedesEqual;", { 10927, 0 } },
+    { "&PrecedesSlantEqual;", { 8828, 0 } },
+    { "&PrecedesTilde;", { 8830, 0 } },
+    { "&Prime;", { 8243, 0 } },
+    { "&Product;", { 8719, 0 } },
+    { "&Proportion;", { 8759, 0 } },
+    { "&Proportional;", { 8733, 0 } },
+    { "&Pscr;", { 119979, 0 } },
+    { "&Psi;", { 936, 0 } },
+    { "&QUOT;", { 34, 0 } },
+    { "&Qfr;", { 120084, 0 } },
+    { "&Qopf;", { 8474, 0 } },
+    { "&Qscr;", { 119980, 0 } },
+    { "&RBarr;", { 10512, 0 } },
+    { "&REG;", { 174, 0 } },
+    { "&Racute;", { 340, 0 } },
+    { "&Rang;", { 10219, 0 } },
+    { "&Rarr;", { 8608, 0 } },
+    { "&Rarrtl;", { 10518, 0 } },
+    { "&Rcaron;", { 344, 0 } },
+    { "&Rcedil;", { 342, 0 } },
+    { "&Rcy;", { 1056, 0 } },
+    { "&Re;", { 8476, 0 } },
+    { "&ReverseElement;", { 8715, 0 } },
+    { "&ReverseEquilibrium;", { 8651, 0 } },
+    { "&ReverseUpEquilibrium;", { 10607, 0 } },
+    { "&Rfr;", { 8476, 0 } },
+    { "&Rho;", { 929, 0 } },
+    { "&RightAngleBracket;", { 10217, 0 } },
+    { "&RightArrow;", { 8594, 0 } },
+    { "&RightArrowBar;", { 8677, 0 } },
+    { "&RightArrowLeftArrow;", { 8644, 0 } },
+    { "&RightCeiling;", { 8969, 0 } },
+    { "&RightDoubleBracket;", { 10215, 0 } },
+    { "&RightDownTeeVector;", { 10589, 0 } },
+    { "&RightDownVector;", { 8642, 0 } },
+    { "&RightDownVectorBar;", { 10581, 0 } },
+    { "&RightFloor;", { 8971, 0 } },
+    { "&RightTee;", { 8866, 0 } },
+    { "&RightTeeArrow;", { 8614, 0 } },
+    { "&RightTeeVector;", { 10587, 0 } },
+    { "&RightTriangle;", { 8883, 0 } },
+    { "&RightTriangleBar;", { 10704, 0 } },
+    { "&RightTriangleEqual;", { 8885, 0 } },
+    { "&RightUpDownVector;", { 10575, 0 } },
+    { "&RightUpTeeVector;", { 10588, 0 } },
+    { "&RightUpVector;", { 8638, 0 } },
+    { "&RightUpVectorBar;", { 10580, 0 } },
+    { "&RightVector;", { 8640, 0 } },
+    { "&RightVectorBar;", { 10579, 0 } },
+    { "&Rightarrow;", { 8658, 0 } },
+    { "&Ropf;", { 8477, 0 } },
+    { "&RoundImplies;", { 10608, 0 } },
+    { "&Rrightarrow;", { 8667, 0 } },
+    { "&Rscr;", { 8475, 0 } },
+    { "&Rsh;", { 8625, 0 } },
+    { "&RuleDelayed;", { 10740, 0 } },
+    { "&SHCHcy;", { 1065, 0 } },
+    { "&SHcy;", { 1064, 0 } },
+    { "&SOFTcy;", { 1068, 0 } },
+    { "&Sacute;", { 346, 0 } },
+    { "&Sc;", { 10940, 0 } },
+    { "&Scaron;", { 352, 0 } },
+    { "&Scedil;", { 350, 0 } },
+    { "&Scirc;", { 348, 0 } },
+    { "&Scy;", { 1057, 0 } },
+    { "&Sfr;", { 120086, 0 } },
+    { "&ShortDownArrow;", { 8595, 0 } },
+    { "&ShortLeftArrow;", { 8592, 0 } },
+    { "&ShortRightArrow;", { 8594, 0 } },
+    { "&ShortUpArrow;", { 8593, 0 } },
+    { "&Sigma;", { 931, 0 } },
+    { "&SmallCircle;", { 8728, 0 } },
+    { "&Sopf;", { 120138, 0 } },
+    { "&Sqrt;", { 8730, 0 } },
+    { "&Square;", { 9633, 0 } },
+    { "&SquareIntersection;", { 8851, 0 } },
+    { "&SquareSubset;", { 8847, 0 } },
+    { "&SquareSubsetEqual;", { 8849, 0 } },
+    { "&SquareSuperset;", { 8848, 0 } },
+    { "&SquareSupersetEqual;", { 8850, 0 } },
+    { "&SquareUnion;", { 8852, 0 } },
+    { "&Sscr;", { 119982, 0 } },
+    { "&Star;", { 8902, 0 } },
+    { "&Sub;", { 8912, 0 } },
+    { "&Subset;", { 8912, 0 } },
+    { "&SubsetEqual;", { 8838, 0 } },
+    { "&Succeeds;", { 8827, 0 } },
+    { "&SucceedsEqual;", { 10928, 0 } },
+    { "&SucceedsSlantEqual;", { 8829, 0 } },
+    { "&SucceedsTilde;", { 8831, 0 } },
+    { "&SuchThat;", { 8715, 0 } },
+    { "&Sum;", { 8721, 0 } },
+    { "&Sup;", { 8913, 0 } },
+    { "&Superset;", { 8835, 0 } },
+    { "&SupersetEqual;", { 8839, 0 } },
+    { "&Supset;", { 8913, 0 } },
+    { "&THORN;", { 222, 0 } },
+    { "&TRADE;", { 8482, 0 } },
+    { "&TSHcy;", { 1035, 0 } },
+    { "&TScy;", { 1062, 0 } },
+    { "&Tab;", { 9, 0 } },
+    { "&Tau;", { 932, 0 } },
+    { "&Tcaron;", { 356, 0 } },
+    { "&Tcedil;", { 354, 0 } },
+    { "&Tcy;", { 1058, 0 } },
+    { "&Tfr;", { 120087, 0 } },
+    { "&Therefore;", { 8756, 0 } },
+    { "&Theta;", { 920, 0 } },
+    { "&ThickSpace;", { 8287, 8202 } },
+    { "&ThinSpace;", { 8201, 0 } },
+    { "&Tilde;", { 8764, 0 } },
+    { "&TildeEqual;", { 8771, 0 } },
+    { "&TildeFullEqual;", { 8773, 0 } },
+    { "&TildeTilde;", { 8776, 0 } },
+    { "&Topf;", { 120139, 0 } },
+    { "&TripleDot;", { 8411, 0 } },
+    { "&Tscr;", { 119983, 0 } },
+    { "&Tstrok;", { 358, 0 } },
+    { "&Uacute;", { 218, 0 } },
+    { "&Uarr;", { 8607, 0 } },
+    { "&Uarrocir;", { 10569, 0 } },
+    { "&Ubrcy;", { 1038, 0 } },
+    { "&Ubreve;", { 364, 0 } },
+    { "&Ucirc;", { 219, 0 } },
+    { "&Ucy;", { 1059, 0 } },
+    { "&Udblac;", { 368, 0 } },
+    { "&Ufr;", { 120088, 0 } },
+    { "&Ugrave;", { 217, 0 } },
+    { "&Umacr;", { 362, 0 } },
+    { "&UnderBar;", { 95, 0 } },
+    { "&UnderBrace;", { 9183, 0 } },
+    { "&UnderBracket;", { 9141, 0 } },
+    { "&UnderParenthesis;", { 9181, 0 } },
+    { "&Union;", { 8899, 0 } },
+    { "&UnionPlus;", { 8846, 0 } },
+    { "&Uogon;", { 370, 0 } },
+    { "&Uopf;", { 120140, 0 } },
+    { "&UpArrow;", { 8593, 0 } },
+    { "&UpArrowBar;", { 10514, 0 } },
+    { "&UpArrowDownArrow;", { 8645, 0 } },
+    { "&UpDownArrow;", { 8597, 0 } },
+    { "&UpEquilibrium;", { 10606, 0 } },
+    { "&UpTee;", { 8869, 0 } },
+    { "&UpTeeArrow;", { 8613, 0 } },
+    { "&Uparrow;", { 8657, 0 } },
+    { "&Updownarrow;", { 8661, 0 } },
+    { "&UpperLeftArrow;", { 8598, 0 } },
+    { "&UpperRightArrow;", { 8599, 0 } },
+    { "&Upsi;", { 978, 0 } },
+    { "&Upsilon;", { 933, 0 } },
+    { "&Uring;", { 366, 0 } },
+    { "&Uscr;", { 119984, 0 } },
+    { "&Utilde;", { 360, 0 } },
+    { "&Uuml;", { 220, 0 } },
+    { "&VDash;", { 8875, 0 } },
+    { "&Vbar;", { 10987, 0 } },
+    { "&Vcy;", { 1042, 0 } },
+    { "&Vdash;", { 8873, 0 } },
+    { "&Vdashl;", { 10982, 0 } },
+    { "&Vee;", { 8897, 0 } },
+    { "&Verbar;", { 8214, 0 } },
+    { "&Vert;", { 8214, 0 } },
+    { "&VerticalBar;", { 8739, 0 } },
+    { "&VerticalLine;", { 124, 0 } },
+    { "&VerticalSeparator;", { 10072, 0 } },
+    { "&VerticalTilde;", { 8768, 0 } },
+    { "&VeryThinSpace;", { 8202, 0 } },
+    { "&Vfr;", { 120089, 0 } },
+    { "&Vopf;", { 120141, 0 } },
+    { "&Vscr;", { 119985, 0 } },
+    { "&Vvdash;", { 8874, 0 } },
+    { "&Wcirc;", { 372, 0 } },
+    { "&Wedge;", { 8896, 0 } },
+    { "&Wfr;", { 120090, 0 } },
+    { "&Wopf;", { 120142, 0 } },
+    { "&Wscr;", { 119986, 0 } },
+    { "&Xfr;", { 120091, 0 } },
+    { "&Xi;", { 926, 0 } },
+    { "&Xopf;", { 120143, 0 } },
+    { "&Xscr;", { 119987, 0 } },
+    { "&YAcy;", { 1071, 0 } },
+    { "&YIcy;", { 1031, 0 } },
+    { "&YUcy;", { 1070, 0 } },
+    { "&Yacute;", { 221, 0 } },
+    { "&Ycirc;", { 374, 0 } },
+    { "&Ycy;", { 1067, 0 } },
+    { "&Yfr;", { 120092, 0 } },
+    { "&Yopf;", { 120144, 0 } },
+    { "&Yscr;", { 119988, 0 } },
+    { "&Yuml;", { 376, 0 } },
+    { "&ZHcy;", { 1046, 0 } },
+    { "&Zacute;", { 377, 0 } },
+    { "&Zcaron;", { 381, 0 } },
+    { "&Zcy;", { 1047, 0 } },
+    { "&Zdot;", { 379, 0 } },
+    { "&ZeroWidthSpace;", { 8203, 0 } },
+    { "&Zeta;", { 918, 0 } },
+    { "&Zfr;", { 8488, 0 } },
+    { "&Zopf;", { 8484, 0 } },
+    { "&Zscr;", { 119989, 0 } },
+    { "&aacute;", { 225, 0 } },
+    { "&abreve;", { 259, 0 } },
+    { "&ac;", { 8766, 0 } },
+    { "&acE;", { 8766, 819 } },
+    { "&acd;", { 8767, 0 } },
+    { "&acirc;", { 226, 0 } },
+    { "&acute;", { 180, 0 } },
+    { "&acy;", { 1072, 0 } },
+    { "&aelig;", { 230, 0 } },
+    { "&af;", { 8289, 0 } },
+    { "&afr;", { 120094, 0 } },
+    { "&agrave;", { 224, 0 } },
+    { "&alefsym;", { 8501, 0 } },
+    { "&aleph;", { 8501, 0 } },
+    { "&alpha;", { 945, 0 } },
+    { "&amacr;", { 257, 0 } },
+    { "&amalg;", { 10815, 0 } },
+    { "&amp;", { 38, 0 } },
+    { "&and;", { 8743, 0 } },
+    { "&andand;", { 10837, 0 } },
+    { "&andd;", { 10844, 0 } },
+    { "&andslope;", { 10840, 0 } },
+    { "&andv;", { 10842, 0 } },
+    { "&ang;", { 8736, 0 } },
+    { "&ange;", { 10660, 0 } },
+    { "&angle;", { 8736, 0 } },
+    { "&angmsd;", { 8737, 0 } },
+    { "&angmsdaa;", { 10664, 0 } },
+    { "&angmsdab;", { 10665, 0 } },
+    { "&angmsdac;", { 10666, 0 } },
+    { "&angmsdad;", { 10667, 0 } },
+    { "&angmsdae;", { 10668, 0 } },
+    { "&angmsdaf;", { 10669, 0 } },
+    { "&angmsdag;", { 10670, 0 } },
+    { "&angmsdah;", { 10671, 0 } },
+    { "&angrt;", { 8735, 0 } },
+    { "&angrtvb;", { 8894, 0 } },
+    { "&angrtvbd;", { 10653, 0 } },
+    { "&angsph;", { 8738, 0 } },
+    { "&angst;", { 197, 0 } },
+    { "&angzarr;", { 9084, 0 } },
+    { "&aogon;", { 261, 0 } },
+    { "&aopf;", { 120146, 0 } },
+    { "&ap;", { 8776, 0 } },
+    { "&apE;", { 10864, 0 } },
+    { "&apacir;", { 10863, 0 } },
+    { "&ape;", { 8778, 0 } },
+    { "&apid;", { 8779, 0 } },
+    { "&apos;", { 39, 0 } },
+    { "&approx;", { 8776, 0 } },
+    { "&approxeq;", { 8778, 0 } },
+    { "&aring;", { 229, 0 } },
+    { "&ascr;", { 119990, 0 } },
+    { "&ast;", { 42, 0 } },
+    { "&asymp;", { 8776, 0 } },
+    { "&asympeq;", { 8781, 0 } },
+    { "&atilde;", { 227, 0 } },
+    { "&auml;", { 228, 0 } },
+    { "&awconint;", { 8755, 0 } },
+    { "&awint;", { 10769, 0 } },
+    { "&bNot;", { 10989, 0 } },
+    { "&backcong;", { 8780, 0 } },
+    { "&backepsilon;", { 1014, 0 } },
+    { "&backprime;", { 8245, 0 } },
+    { "&backsim;", { 8765, 0 } },
+    { "&backsimeq;", { 8909, 0 } },
+    { "&barvee;", { 8893, 0 } },
+    { "&barwed;", { 8965, 0 } },
+    { "&barwedge;", { 8965, 0 } },
+    { "&bbrk;", { 9141, 0 } },
+    { "&bbrktbrk;", { 9142, 0 } },
+    { "&bcong;", { 8780, 0 } },
+    { "&bcy;", { 1073, 0 } },
+    { "&bdquo;", { 8222, 0 } },
+    { "&becaus;", { 8757, 0 } },
+    { "&because;", { 8757, 0 } },
+    { "&bemptyv;", { 10672, 0 } },
+    { "&bepsi;", { 1014, 0 } },
+    { "&bernou;", { 8492, 0 } },
+    { "&beta;", { 946, 0 } },
+    { "&beth;", { 8502, 0 } },
+    { "&between;", { 8812, 0 } },
+    { "&bfr;", { 120095, 0 } },
+    { "&bigcap;", { 8898, 0 } },
+    { "&bigcirc;", { 9711, 0 } },
+    { "&bigcup;", { 8899, 0 } },
+    { "&bigodot;", { 10752, 0 } },
+    { "&bigoplus;", { 10753, 0 } },
+    { "&bigotimes;", { 10754, 0 } },
+    { "&bigsqcup;", { 10758, 0 } },
+    { "&bigstar;", { 9733, 0 } },
+    { "&bigtriangledown;", { 9661, 0 } },
+    { "&bigtriangleup;", { 9651, 0 } },
+    { "&biguplus;", { 10756, 0 } },
+    { "&bigvee;", { 8897, 0 } },
+    { "&bigwedge;", { 8896, 0 } },
+    { "&bkarow;", { 10509, 0 } },
+    { "&blacklozenge;", { 10731, 0 } },
+    { "&blacksquare;", { 9642, 0 } },
+    { "&blacktriangle;", { 9652, 0 } },
+    { "&blacktriangledown;", { 9662, 0 } },
+    { "&blacktriangleleft;", { 9666, 0 } },
+    { "&blacktriangleright;", { 9656, 0 } },
+    { "&blank;", { 9251, 0 } },
+    { "&blk12;", { 9618, 0 } },
+    { "&blk14;", { 9617, 0 } },
+    { "&blk34;", { 9619, 0 } },
+    { "&block;", { 9608, 0 } },
+    { "&bne;", { 61, 8421 } },
+    { "&bnequiv;", { 8801, 8421 } },
+    { "&bnot;", { 8976, 0 } },
+    { "&bopf;", { 120147, 0 } },
+    { "&bot;", { 8869, 0 } },
+    { "&bottom;", { 8869, 0 } },
+    { "&bowtie;", { 8904, 0 } },
+    { "&boxDL;", { 9559, 0 } },
+    { "&boxDR;", { 9556, 0 } },
+    { "&boxDl;", { 9558, 0 } },
+    { "&boxDr;", { 9555, 0 } },
+    { "&boxH;", { 9552, 0 } },
+    { "&boxHD;", { 9574, 0 } },
+    { "&boxHU;", { 9577, 0 } },
+    { "&boxHd;", { 9572, 0 } },
+    { "&boxHu;", { 9575, 0 } },
+    { "&boxUL;", { 9565, 0 } },
+    { "&boxUR;", { 9562, 0 } },
+    { "&boxUl;", { 9564, 0 } },
+    { "&boxUr;", { 9561, 0 } },
+    { "&boxV;", { 9553, 0 } },
+    { "&boxVH;", { 9580, 0 } },
+    { "&boxVL;", { 9571, 0 } },
+    { "&boxVR;", { 9568, 0 } },
+    { "&boxVh;", { 9579, 0 } },
+    { "&boxVl;", { 9570, 0 } },
+    { "&boxVr;", { 9567, 0 } },
+    { "&boxbox;", { 10697, 0 } },
+    { "&boxdL;", { 9557, 0 } },
+    { "&boxdR;", { 9554, 0 } },
+    { "&boxdl;", { 9488, 0 } },
+    { "&boxdr;", { 9484, 0 } },
+    { "&boxh;", { 9472, 0 } },
+    { "&boxhD;", { 9573, 0 } },
+    { "&boxhU;", { 9576, 0 } },
+    { "&boxhd;", { 9516, 0 } },
+    { "&boxhu;", { 9524, 0 } },
+    { "&boxminus;", { 8863, 0 } },
+    { "&boxplus;", { 8862, 0 } },
+    { "&boxtimes;", { 8864, 0 } },
+    { "&boxuL;", { 9563, 0 } },
+    { "&boxuR;", { 9560, 0 } },
+    { "&boxul;", { 9496, 0 } },
+    { "&boxur;", { 9492, 0 } },
+    { "&boxv;", { 9474, 0 } },
+    { "&boxvH;", { 9578, 0 } },
+    { "&boxvL;", { 9569, 0 } },
+    { "&boxvR;", { 9566, 0 } },
+    { "&boxvh;", { 9532, 0 } },
+    { "&boxvl;", { 9508, 0 } },
+    { "&boxvr;", { 9500, 0 } },
+    { "&bprime;", { 8245, 0 } },
+    { "&breve;", { 728, 0 } },
+    { "&brvbar;", { 166, 0 } },
+    { "&bscr;", { 119991, 0 } },
+    { "&bsemi;", { 8271, 0 } },
+    { "&bsim;", { 8765, 0 } },
+    { "&bsime;", { 8909, 0 } },
+    { "&bsol;", { 92, 0 } },
+    { "&bsolb;", { 10693, 0 } },
+    { "&bsolhsub;", { 10184, 0 } },
+    { "&bull;", { 8226, 0 } },
+    { "&bullet;", { 8226, 0 } },
+    { "&bump;", { 8782, 0 } },
+    { "&bumpE;", { 10926, 0 } },
+    { "&bumpe;", { 8783, 0 } },
+    { "&bumpeq;", { 8783, 0 } },
+    { "&cacute;", { 263, 0 } },
+    { "&cap;", { 8745, 0 } },
+    { "&capand;", { 10820, 0 } },
+    { "&capbrcup;", { 10825, 0 } },
+    { "&capcap;", { 10827, 0 } },
+    { "&capcup;", { 10823, 0 } },
+    { "&capdot;", { 10816, 0 } },
+    { "&caps;", { 8745, 65024 } },
+    { "&caret;", { 8257, 0 } },
+    { "&caron;", { 711, 0 } },
+    { "&ccaps;", { 10829, 0 } },
+    { "&ccaron;", { 269, 0 } },
+    { "&ccedil;", { 231, 0 } },
+    { "&ccirc;", { 265, 0 } },
+    { "&ccups;", { 10828, 0 } },
+    { "&ccupssm;", { 10832, 0 } },
+    { "&cdot;", { 267, 0 } },
+    { "&cedil;", { 184, 0 } },
+    { "&cemptyv;", { 10674, 0 } },
+    { "&cent;", { 162, 0 } },
+    { "&centerdot;", { 183, 0 } },
+    { "&cfr;", { 120096, 0 } },
+    { "&chcy;", { 1095, 0 } },
+    { "&check;", { 10003, 0 } },
+    { "&checkmark;", { 10003, 0 } },
+    { "&chi;", { 967, 0 } },
+    { "&cir;", { 9675, 0 } },
+    { "&cirE;", { 10691, 0 } },
+    { "&circ;", { 710, 0 } },
+    { "&circeq;", { 8791, 0 } },
+    { "&circlearrowleft;", { 8634, 0 } },
+    { "&circlearrowright;", { 8635, 0 } },
+    { "&circledR;", { 174, 0 } },
+    { "&circledS;", { 9416, 0 } },
+    { "&circledast;", { 8859, 0 } },
+    { "&circledcirc;", { 8858, 0 } },
+    { "&circleddash;", { 8861, 0 } },
+    { "&cire;", { 8791, 0 } },
+    { "&cirfnint;", { 10768, 0 } },
+    { "&cirmid;", { 10991, 0 } },
+    { "&cirscir;", { 10690, 0 } },
+    { "&clubs;", { 9827, 0 } },
+    { "&clubsuit;", { 9827, 0 } },
+    { "&colon;", { 58, 0 } },
+    { "&colone;", { 8788, 0 } },
+    { "&coloneq;", { 8788, 0 } },
+    { "&comma;", { 44, 0 } },
+    { "&commat;", { 64, 0 } },
+    { "&comp;", { 8705, 0 } },
+    { "&compfn;", { 8728, 0 } },
+    { "&complement;", { 8705, 0 } },
+    { "&complexes;", { 8450, 0 } },
+    { "&cong;", { 8773, 0 } },
+    { "&congdot;", { 10861, 0 } },
+    { "&conint;", { 8750, 0 } },
+    { "&copf;", { 120148, 0 } },
+    { "&coprod;", { 8720, 0 } },
+    { "&copy;", { 169, 0 } },
+    { "&copysr;", { 8471, 0 } },
+    { "&crarr;", { 8629, 0 } },
+    { "&cross;", { 10007, 0 } },
+    { "&cscr;", { 119992, 0 } },
+    { "&csub;", { 10959, 0 } },
+    { "&csube;", { 10961, 0 } },
+    { "&csup;", { 10960, 0 } },
+    { "&csupe;", { 10962, 0 } },
+    { "&ctdot;", { 8943, 0 } },
+    { "&cudarrl;", { 10552, 0 } },
+    { "&cudarrr;", { 10549, 0 } },
+    { "&cuepr;", { 8926, 0 } },
+    { "&cuesc;", { 8927, 0 } },
+    { "&cularr;", { 8630, 0 } },
+    { "&cularrp;", { 10557, 0 } },
+    { "&cup;", { 8746, 0 } },
+    { "&cupbrcap;", { 10824, 0 } },
+    { "&cupcap;", { 10822, 0 } },
+    { "&cupcup;", { 10826, 0 } },
+    { "&cupdot;", { 8845, 0 } },
+    { "&cupor;", { 10821, 0 } },
+    { "&cups;", { 8746, 65024 } },
+    { "&curarr;", { 8631, 0 } },
+    { "&curarrm;", { 10556, 0 } },
+    { "&curlyeqprec;", { 8926, 0 } },
+    { "&curlyeqsucc;", { 8927, 0 } },
+    { "&curlyvee;", { 8910, 0 } },
+    { "&curlywedge;", { 8911, 0 } },
+    { "&curren;", { 164, 0 } },
+    { "&curvearrowleft;", { 8630, 0 } },
+    { "&curvearrowright;", { 8631, 0 } },
+    { "&cuvee;", { 8910, 0 } },
+    { "&cuwed;", { 8911, 0 } },
+    { "&cwconint;", { 8754, 0 } },
+    { "&cwint;", { 8753, 0 } },
+    { "&cylcty;", { 9005, 0 } },
+    { "&dArr;", { 8659, 0 } },
+    { "&dHar;", { 10597, 0 } },
+    { "&dagger;", { 8224, 0 } },
+    { "&daleth;", { 8504, 0 } },
+    { "&darr;", { 8595, 0 } },
+    { "&dash;", { 8208, 0 } },
+    { "&dashv;", { 8867, 0 } },
+    { "&dbkarow;", { 10511, 0 } },
+    { "&dblac;", { 733, 0 } },
+    { "&dcaron;", { 271, 0 } },
+    { "&dcy;", { 1076, 0 } },
+    { "&dd;", { 8518, 0 } },
+    { "&ddagger;", { 8225, 0 } },
+    { "&ddarr;", { 8650, 0 } },
+    { "&ddotseq;", { 10871, 0 } },
+    { "&deg;", { 176, 0 } },
+    { "&delta;", { 948, 0 } },
+    { "&demptyv;", { 10673, 0 } },
+    { "&dfisht;", { 10623, 0 } },
+    { "&dfr;", { 120097, 0 } },
+    { "&dharl;", { 8643, 0 } },
+    { "&dharr;", { 8642, 0 } },
+    { "&diam;", { 8900, 0 } },
+    { "&diamond;", { 8900, 0 } },
+    { "&diamondsuit;", { 9830, 0 } },
+    { "&diams;", { 9830, 0 } },
+    { "&die;", { 168, 0 } },
+    { "&digamma;", { 989, 0 } },
+    { "&disin;", { 8946, 0 } },
+    { "&div;", { 247, 0 } },
+    { "&divide;", { 247, 0 } },
+    { "&divideontimes;", { 8903, 0 } },
+    { "&divonx;", { 8903, 0 } },
+    { "&djcy;", { 1106, 0 } },
+    { "&dlcorn;", { 8990, 0 } },
+    { "&dlcrop;", { 8973, 0 } },
+    { "&dollar;", { 36, 0 } },
+    { "&dopf;", { 120149, 0 } },
+    { "&dot;", { 729, 0 } },
+    { "&doteq;", { 8784, 0 } },
+    { "&doteqdot;", { 8785, 0 } },
+    { "&dotminus;", { 8760, 0 } },
+    { "&dotplus;", { 8724, 0 } },
+    { "&dotsquare;", { 8865, 0 } },
+    { "&doublebarwedge;", { 8966, 0 } },
+    { "&downarrow;", { 8595, 0 } },
+    { "&downdownarrows;", { 8650, 0 } },
+    { "&downharpoonleft;", { 8643, 0 } },
+    { "&downharpoonright;", { 8642, 0 } },
+    { "&drbkarow;", { 10512, 0 } },
+    { "&drcorn;", { 8991, 0 } },
+    { "&drcrop;", { 8972, 0 } },
+    { "&dscr;", { 119993, 0 } },
+    { "&dscy;", { 1109, 0 } },
+    { "&dsol;", { 10742, 0 } },
+    { "&dstrok;", { 273, 0 } },
+    { "&dtdot;", { 8945, 0 } },
+    { "&dtri;", { 9663, 0 } },
+    { "&dtrif;", { 9662, 0 } },
+    { "&duarr;", { 8693, 0 } },
+    { "&duhar;", { 10607, 0 } },
+    { "&dwangle;", { 10662, 0 } },
+    { "&dzcy;", { 1119, 0 } },
+    { "&dzigrarr;", { 10239, 0 } },
+    { "&eDDot;", { 10871, 0 } },
+    { "&eDot;", { 8785, 0 } },
+    { "&eacute;", { 233, 0 } },
+    { "&easter;", { 10862, 0 } },
+    { "&ecaron;", { 283, 0 } },
+    { "&ecir;", { 8790, 0 } },
+    { "&ecirc;", { 234, 0 } },
+    { "&ecolon;", { 8789, 0 } },
+    { "&ecy;", { 1101, 0 } },
+    { "&edot;", { 279, 0 } },
+    { "&ee;", { 8519, 0 } },
+    { "&efDot;", { 8786, 0 } },
+    { "&efr;", { 120098, 0 } },
+    { "&eg;", { 10906, 0 } },
+    { "&egrave;", { 232, 0 } },
+    { "&egs;", { 10902, 0 } },
+    { "&egsdot;", { 10904, 0 } },
+    { "&el;", { 10905, 0 } },
+    { "&elinters;", { 9191, 0 } },
+    { "&ell;", { 8467, 0 } },
+    { "&els;", { 10901, 0 } },
+    { "&elsdot;", { 10903, 0 } },
+    { "&emacr;", { 275, 0 } },
+    { "&empty;", { 8709, 0 } },
+    { "&emptyset;", { 8709, 0 } },
+    { "&emptyv;", { 8709, 0 } },
+    { "&emsp13;", { 8196, 0 } },
+    { "&emsp14;", { 8197, 0 } },
+    { "&emsp;", { 8195, 0 } },
+    { "&eng;", { 331, 0 } },
+    { "&ensp;", { 8194, 0 } },
+    { "&eogon;", { 281, 0 } },
+    { "&eopf;", { 120150, 0 } },
+    { "&epar;", { 8917, 0 } },
+    { "&eparsl;", { 10723, 0 } },
+    { "&eplus;", { 10865, 0 } },
+    { "&epsi;", { 949, 0 } },
+    { "&epsilon;", { 949, 0 } },
+    { "&epsiv;", { 1013, 0 } },
+    { "&eqcirc;", { 8790, 0 } },
+    { "&eqcolon;", { 8789, 0 } },
+    { "&eqsim;", { 8770, 0 } },
+    { "&eqslantgtr;", { 10902, 0 } },
+    { "&eqslantless;", { 10901, 0 } },
+    { "&equals;", { 61, 0 } },
+    { "&equest;", { 8799, 0 } },
+    { "&equiv;", { 8801, 0 } },
+    { "&equivDD;", { 10872, 0 } },
+    { "&eqvparsl;", { 10725, 0 } },
+    { "&erDot;", { 8787, 0 } },
+    { "&erarr;", { 10609, 0 } },
+    { "&escr;", { 8495, 0 } },
+    { "&esdot;", { 8784, 0 } },
+    { "&esim;", { 8770, 0 } },
+    { "&eta;", { 951, 0 } },
+    { "&eth;", { 240, 0 } },
+    { "&euml;", { 235, 0 } },
+    { "&euro;", { 8364, 0 } },
+    { "&excl;", { 33, 0 } },
+    { "&exist;", { 8707, 0 } },
+    { "&expectation;", { 8496, 0 } },
+    { "&exponentiale;", { 8519, 0 } },
+    { "&fallingdotseq;", { 8786, 0 } },
+    { "&fcy;", { 1092, 0 } },
+    { "&female;", { 9792, 0 } },
+    { "&ffilig;", { 64259, 0 } },
+    { "&fflig;", { 64256, 0 } },
+    { "&ffllig;", { 64260, 0 } },
+    { "&ffr;", { 120099, 0 } },
+    { "&filig;", { 64257, 0 } },
+    { "&fjlig;", { 102, 106 } },
+    { "&flat;", { 9837, 0 } },
+    { "&fllig;", { 64258, 0 } },
+    { "&fltns;", { 9649, 0 } },
+    { "&fnof;", { 402, 0 } },
+    { "&fopf;", { 120151, 0 } },
+    { "&forall;", { 8704, 0 } },
+    { "&fork;", { 8916, 0 } },
+    { "&forkv;", { 10969, 0 } },
+    { "&fpartint;", { 10765, 0 } },
+    { "&frac12", { 189, 0 } },
+    { "&frac12;", { 189, 0 } },
+    { "&frac13;", { 8531, 0 } },
+    { "&frac14", { 188, 0 } },
+    { "&frac14;", { 188, 0 } },
+    { "&frac15;", { 8533, 0 } },
+    { "&frac16;", { 8537, 0 } },
+    { "&frac18;", { 8539, 0 } },
+    { "&frac23;", { 8532, 0 } },
+    { "&frac25;", { 8534, 0 } },
+    { "&frac34", { 190, 0 } },
+    { "&frac34;", { 190, 0 } },
+    { "&frac35;", { 8535, 0 } },
+    { "&frac38;", { 8540, 0 } },
+    { "&frac45;", { 8536, 0 } },
+    { "&frac56;", { 8538, 0 } },
+    { "&frac58;", { 8541, 0 } },
+    { "&frac78;", { 8542, 0 } },
+    { "&frasl;", { 8260, 0 } },
+    { "&frown;", { 8994, 0 } },
+    { "&fscr;", { 119995, 0 } },
+    { "&gE;", { 8807, 0 } },
+    { "&gEl;", { 10892, 0 } },
+    { "&gacute;", { 501, 0 } },
+    { "&gamma;", { 947, 0 } },
+    { "&gammad;", { 989, 0 } },
+    { "&gap;", { 10886, 0 } },
+    { "&gbreve;", { 287, 0 } },
+    { "&gcirc;", { 285, 0 } },
+    { "&gcy;", { 1075, 0 } },
+    { "&gdot;", { 289, 0 } },
+    { "&ge;", { 8805, 0 } },
+    { "&gel;", { 8923, 0 } },
+    { "&geq;", { 8805, 0 } },
+    { "&geqq;", { 8807, 0 } },
+    { "&geqslant;", { 10878, 0 } },
+    { "&ges;", { 10878, 0 } },
+    { "&gescc;", { 10921, 0 } },
+    { "&gesdot;", { 10880, 0 } },
+    { "&gesdoto;", { 10882, 0 } },
+    { "&gesdotol;", { 10884, 0 } },
+    { "&gesl;", { 8923, 65024 } },
+    { "&gesles;", { 10900, 0 } },
+    { "&gfr;", { 120100, 0 } },
+    { "&gg;", { 8811, 0 } },
+    { "&ggg;", { 8921, 0 } },
+    { "&gimel;", { 8503, 0 } },
+    { "&gjcy;", { 1107, 0 } },
+    { "&gl;", { 8823, 0 } },
+    { "&glE;", { 10898, 0 } },
+    { "&gla;", { 10917, 0 } },
+    { "&glj;", { 10916, 0 } },
+    { "&gnE;", { 8809, 0 } },
+    { "&gnap;", { 10890, 0 } },
+    { "&gnapprox;", { 10890, 0 } },
+    { "&gne;", { 10888, 0 } },
+    { "&gneq;", { 10888, 0 } },
+    { "&gneqq;", { 8809, 0 } },
+    { "&gnsim;", { 8935, 0 } },
+    { "&gopf;", { 120152, 0 } },
+    { "&grave;", { 96, 0 } },
+    { "&gscr;", { 8458, 0 } },
+    { "&gsim;", { 8819, 0 } },
+    { "&gsime;", { 10894, 0 } },
+    { "&gsiml;", { 10896, 0 } },
+    { "&gt;", { 62, 0 } },
+    { "&gtcc;", { 10919, 0 } },
+    { "&gtcir;", { 10874, 0 } },
+    { "&gtdot;", { 8919, 0 } },
+    { "&gtlPar;", { 10645, 0 } },
+    { "&gtquest;", { 10876, 0 } },
+    { "&gtrapprox;", { 10886, 0 } },
+    { "&gtrarr;", { 10616, 0 } },
+    { "&gtrdot;", { 8919, 0 } },
+    { "&gtreqless;", { 8923, 0 } },
+    { "&gtreqqless;", { 10892, 0 } },
+    { "&gtrless;", { 8823, 0 } },
+    { "&gtrsim;", { 8819, 0 } },
+    { "&gvertneqq;", { 8809, 65024 } },
+    { "&gvnE;", { 8809, 65024 } },
+    { "&hArr;", { 8660, 0 } },
+    { "&hairsp;", { 8202, 0 } },
+    { "&half;", { 189, 0 } },
+    { "&hamilt;", { 8459, 0 } },
+    { "&hardcy;", { 1098, 0 } },
+    { "&harr;", { 8596, 0 } },
+    { "&harrcir;", { 10568, 0 } },
+    { "&harrw;", { 8621, 0 } },
+    { "&hbar;", { 8463, 0 } },
+    { "&hcirc;", { 293, 0 } },
+    { "&hearts;", { 9829, 0 } },
+    { "&heartsuit;", { 9829, 0 } },
+    { "&hellip;", { 8230, 0 } },
+    { "&hercon;", { 8889, 0 } },
+    { "&hfr;", { 120101, 0 } },
+    { "&hksearow;", { 10533, 0 } },
+    { "&hkswarow;", { 10534, 0 } },
+    { "&hoarr;", { 8703, 0 } },
+    { "&homtht;", { 8763, 0 } },
+    { "&hookleftarrow;", { 8617, 0 } },
+    { "&hookrightarrow;", { 8618, 0 } },
+    { "&hopf;", { 120153, 0 } },
+    { "&horbar;", { 8213, 0 } },
+    { "&hscr;", { 119997, 0 } },
+    { "&hslash;", { 8463, 0 } },
+    { "&hstrok;", { 295, 0 } },
+    { "&hybull;", { 8259, 0 } },
+    { "&hyphen;", { 8208, 0 } },
+    { "&iacute;", { 237, 0 } },
+    { "&ic;", { 8291, 0 } },
+    { "&icirc;", { 238, 0 } },
+    { "&icy;", { 1080, 0 } },
+    { "&iecy;", { 1077, 0 } },
+    { "&iexcl;", { 161, 0 } },
+    { "&iff;", { 8660, 0 } },
+    { "&ifr;", { 120102, 0 } },
+    { "&igrave;", { 236, 0 } },
+    { "&ii;", { 8520, 0 } },
+    { "&iiiint;", { 10764, 0 } },
+    { "&iiint;", { 8749, 0 } },
+    { "&iinfin;", { 10716, 0 } },
+    { "&iiota;", { 8489, 0 } },
+    { "&ijlig;", { 307, 0 } },
+    { "&imacr;", { 299, 0 } },
+    { "&image;", { 8465, 0 } },
+    { "&imagline;", { 8464, 0 } },
+    { "&imagpart;", { 8465, 0 } },
+    { "&imath;", { 305, 0 } },
+    { "&imof;", { 8887, 0 } },
+    { "&imped;", { 437, 0 } },
+    { "&in;", { 8712, 0 } },
+    { "&incare;", { 8453, 0 } },
+    { "&infin;", { 8734, 0 } },
+    { "&infintie;", { 10717, 0 } },
+    { "&inodot;", { 305, 0 } },
+    { "&int;", { 8747, 0 } },
+    { "&intcal;", { 8890, 0 } },
+    { "&integers;", { 8484, 0 } },
+    { "&intercal;", { 8890, 0 } },
+    { "&intlarhk;", { 10775, 0 } },
+    { "&intprod;", { 10812, 0 } },
+    { "&iocy;", { 1105, 0 } },
+    { "&iogon;", { 303, 0 } },
+    { "&iopf;", { 120154, 0 } },
+    { "&iota;", { 953, 0 } },
+    { "&iprod;", { 10812, 0 } },
+    { "&iquest;", { 191, 0 } },
+    { "&iscr;", { 119998, 0 } },
+    { "&isin;", { 8712, 0 } },
+    { "&isinE;", { 8953, 0 } },
+    { "&isindot;", { 8949, 0 } },
+    { "&isins;", { 8948, 0 } },
+    { "&isinsv;", { 8947, 0 } },
+    { "&isinv;", { 8712, 0 } },
+    { "&it;", { 8290, 0 } },
+    { "&itilde;", { 297, 0 } },
+    { "&iukcy;", { 1110, 0 } },
+    { "&iuml;", { 239, 0 } },
+    { "&jcirc;", { 309, 0 } },
+    { "&jcy;", { 1081, 0 } },
+    { "&jfr;", { 120103, 0 } },
+    { "&jmath;", { 567, 0 } },
+    { "&jopf;", { 120155, 0 } },
+    { "&jscr;", { 119999, 0 } },
+    { "&jsercy;", { 1112, 0 } },
+    { "&jukcy;", { 1108, 0 } },
+    { "&kappa;", { 954, 0 } },
+    { "&kappav;", { 1008, 0 } },
+    { "&kcedil;", { 311, 0 } },
+    { "&kcy;", { 1082, 0 } },
+    { "&kfr;", { 120104, 0 } },
+    { "&kgreen;", { 312, 0 } },
+    { "&khcy;", { 1093, 0 } },
+    { "&kjcy;", { 1116, 0 } },
+    { "&kopf;", { 120156, 0 } },
+    { "&kscr;", { 120000, 0 } },
+    { "&lAarr;", { 8666, 0 } },
+    { "&lArr;", { 8656, 0 } },
+    { "&lAtail;", { 10523, 0 } },
+    { "&lBarr;", { 10510, 0 } },
+    { "&lE;", { 8806, 0 } },
+    { "&lEg;", { 10891, 0 } },
+    { "&lHar;", { 10594, 0 } },
+    { "&lacute;", { 314, 0 } },
+    { "&laemptyv;", { 10676, 0 } },
+    { "&lagran;", { 8466, 0 } },
+    { "&lambda;", { 955, 0 } },
+    { "&lang;", { 10216, 0 } },
+    { "&langd;", { 10641, 0 } },
+    { "&langle;", { 10216, 0 } },
+    { "&lap;", { 10885, 0 } },
+    { "&laquo;", { 171, 0 } },
+    { "&larr;", { 8592, 0 } },
+    { "&larrb;", { 8676, 0 } },
+    { "&larrbfs;", { 10527, 0 } },
+    { "&larrfs;", { 10525, 0 } },
+    { "&larrhk;", { 8617, 0 } },
+    { "&larrlp;", { 8619, 0 } },
+    { "&larrpl;", { 10553, 0 } },
+    { "&larrsim;", { 10611, 0 } },
+    { "&larrtl;", { 8610, 0 } },
+    { "&lat;", { 10923, 0 } },
+    { "&latail;", { 10521, 0 } },
+    { "&late;", { 10925, 0 } },
+    { "&lates;", { 10925, 65024 } },
+    { "&lbarr;", { 10508, 0 } },
+    { "&lbbrk;", { 10098, 0 } },
+    { "&lbrace;", { 123, 0 } },
+    { "&lbrack;", { 91, 0 } },
+    { "&lbrke;", { 10635, 0 } },
+    { "&lbrksld;", { 10639, 0 } },
+    { "&lbrkslu;", { 10637, 0 } },
+    { "&lcaron;", { 318, 0 } },
+    { "&lcedil;", { 316, 0 } },
+    { "&lceil;", { 8968, 0 } },
+    { "&lcub;", { 123, 0 } },
+    { "&lcy;", { 1083, 0 } },
+    { "&ldca;", { 10550, 0 } },
+    { "&ldquo;", { 8220, 0 } },
+    { "&ldquor;", { 8222, 0 } },
+    { "&ldrdhar;", { 10599, 0 } },
+    { "&ldrushar;", { 10571, 0 } },
+    { "&ldsh;", { 8626, 0 } },
+    { "&le;", { 8804, 0 } },
+    { "&leftarrow;", { 8592, 0 } },
+    { "&leftarrowtail;", { 8610, 0 } },
+    { "&leftharpoondown;", { 8637, 0 } },
+    { "&leftharpoonup;", { 8636, 0 } },
+    { "&leftleftarrows;", { 8647, 0 } },
+    { "&leftrightarrow;", { 8596, 0 } },
+    { "&leftrightarrows;", { 8646, 0 } },
+    { "&leftrightharpoons;", { 8651, 0 } },
+    { "&leftrightsquigarrow;", { 8621, 0 } },
+    { "&leftthreetimes;", { 8907, 0 } },
+    { "&leg;", { 8922, 0 } },
+    { "&leq;", { 8804, 0 } },
+    { "&leqq;", { 8806, 0 } },
+    { "&leqslant;", { 10877, 0 } },
+    { "&les;", { 10877, 0 } },
+    { "&lescc;", { 10920, 0 } },
+    { "&lesdot;", { 10879, 0 } },
+    { "&lesdoto;", { 10881, 0 } },
+    { "&lesdotor;", { 10883, 0 } },
+    { "&lesg;", { 8922, 65024 } },
+    { "&lesges;", { 10899, 0 } },
+    { "&lessapprox;", { 10885, 0 } },
+    { "&lessdot;", { 8918, 0 } },
+    { "&lesseqgtr;", { 8922, 0 } },
+    { "&lesseqqgtr;", { 10891, 0 } },
+    { "&lessgtr;", { 8822, 0 } },
+    { "&lesssim;", { 8818, 0 } },
+    { "&lfisht;", { 10620, 0 } },
+    { "&lfloor;", { 8970, 0 } },
+    { "&lfr;", { 120105, 0 } },
+    { "&lg;", { 8822, 0 } },
+    { "&lgE;", { 10897, 0 } },
+    { "&lhard;", { 8637, 0 } },
+    { "&lharu;", { 8636, 0 } },
+    { "&lharul;", { 10602, 0 } },
+    { "&lhblk;", { 9604, 0 } },
+    { "&ljcy;", { 1113, 0 } },
+    { "&ll;", { 8810, 0 } },
+    { "&llarr;", { 8647, 0 } },
+    { "&llcorner;", { 8990, 0 } },
+    { "&llhard;", { 10603, 0 } },
+    { "&lltri;", { 9722, 0 } },
+    { "&lmidot;", { 320, 0 } },
+    { "&lmoust;", { 9136, 0 } },
+    { "&lmoustache;", { 9136, 0 } },
+    { "&lnE;", { 8808, 0 } },
+    { "&lnap;", { 10889, 0 } },
+    { "&lnapprox;", { 10889, 0 } },
+    { "&lne;", { 10887, 0 } },
+    { "&lneq;", { 10887, 0 } },
+    { "&lneqq;", { 8808, 0 } },
+    { "&lnsim;", { 8934, 0 } },
+    { "&loang;", { 10220, 0 } },
+    { "&loarr;", { 8701, 0 } },
+    { "&lobrk;", { 10214, 0 } },
+    { "&longleftarrow;", { 10229, 0 } },
+    { "&longleftrightarrow;", { 10231, 0 } },
+    { "&longmapsto;", { 10236, 0 } },
+    { "&longrightarrow;", { 10230, 0 } },
+    { "&looparrowleft;", { 8619, 0 } },
+    { "&looparrowright;", { 8620, 0 } },
+    { "&lopar;", { 10629, 0 } },
+    { "&lopf;", { 120157, 0 } },
+    { "&loplus;", { 10797, 0 } },
+    { "&lotimes;", { 10804, 0 } },
+    { "&lowast;", { 8727, 0 } },
+    { "&lowbar;", { 95, 0 } },
+    { "&loz;", { 9674, 0 } },
+    { "&lozenge;", { 9674, 0 } },
+    { "&lozf;", { 10731, 0 } },
+    { "&lpar;", { 40, 0 } },
+    { "&lparlt;", { 10643, 0 } },
+    { "&lrarr;", { 8646, 0 } },
+    { "&lrcorner;", { 8991, 0 } },
+    { "&lrhar;", { 8651, 0 } },
+    { "&lrhard;", { 10605, 0 } },
+    { "&lrm;", { 8206, 0 } },
+    { "&lrtri;", { 8895, 0 } },
+    { "&lsaquo;", { 8249, 0 } },
+    { "&lscr;", { 120001, 0 } },
+    { "&lsh;", { 8624, 0 } },
+    { "&lsim;", { 8818, 0 } },
+    { "&lsime;", { 10893, 0 } },
+    { "&lsimg;", { 10895, 0 } },
+    { "&lsqb;", { 91, 0 } },
+    { "&lsquo;", { 8216, 0 } },
+    { "&lsquor;", { 8218, 0 } },
+    { "&lstrok;", { 322, 0 } },
+    { "&lt;", { 60, 0 } },
+    { "&ltcc;", { 10918, 0 } },
+    { "&ltcir;", { 10873, 0 } },
+    { "&ltdot;", { 8918, 0 } },
+    { "&lthree;", { 8907, 0 } },
+    { "&ltimes;", { 8905, 0 } },
+    { "&ltlarr;", { 10614, 0 } },
+    { "&ltquest;", { 10875, 0 } },
+    { "&ltrPar;", { 10646, 0 } },
+    { "&ltri;", { 9667, 0 } },
+    { "&ltrie;", { 8884, 0 } },
+    { "&ltrif;", { 9666, 0 } },
+    { "&lurdshar;", { 10570, 0 } },
+    { "&luruhar;", { 10598, 0 } },
+    { "&lvertneqq;", { 8808, 65024 } },
+    { "&lvnE;", { 8808, 65024 } },
+    { "&mDDot;", { 8762, 0 } },
+    { "&macr;", { 175, 0 } },
+    { "&male;", { 9794, 0 } },
+    { "&malt;", { 10016, 0 } },
+    { "&maltese;", { 10016, 0 } },
+    { "&map;", { 8614, 0 } },
+    { "&mapsto;", { 8614, 0 } },
+    { "&mapstodown;", { 8615, 0 } },
+    { "&mapstoleft;", { 8612, 0 } },
+    { "&mapstoup;", { 8613, 0 } },
+    { "&marker;", { 9646, 0 } },
+    { "&mcomma;", { 10793, 0 } },
+    { "&mcy;", { 1084, 0 } },
+    { "&mdash;", { 8212, 0 } },
+    { "&measuredangle;", { 8737, 0 } },
+    { "&mfr;", { 120106, 0 } },
+    { "&mho;", { 8487, 0 } },
+    { "&micro;", { 181, 0 } },
+    { "&mid;", { 8739, 0 } },
+    { "&midast;", { 42, 0 } },
+    { "&midcir;", { 10992, 0 } },
+    { "&middot;", { 183, 0 } },
+    { "&minus;", { 8722, 0 } },
+    { "&minusb;", { 8863, 0 } },
+    { "&minusd;", { 8760, 0 } },
+    { "&minusdu;", { 10794, 0 } },
+    { "&mlcp;", { 10971, 0 } },
+    { "&mldr;", { 8230, 0 } },
+    { "&mnplus;", { 8723, 0 } },
+    { "&models;", { 8871, 0 } },
+    { "&mopf;", { 120158, 0 } },
+    { "&mp;", { 8723, 0 } },
+    { "&mscr;", { 120002, 0 } },
+    { "&mstpos;", { 8766, 0 } },
+    { "&mu;", { 956, 0 } },
+    { "&multimap;", { 8888, 0 } },
+    { "&mumap;", { 8888, 0 } },
+    { "&nGg;", { 8921, 824 } },
+    { "&nGt;", { 8811, 8402 } },
+    { "&nGtv;", { 8811, 824 } },
+    { "&nLeftarrow;", { 8653, 0 } },
+    { "&nLeftrightarrow;", { 8654, 0 } },
+    { "&nLl;", { 8920, 824 } },
+    { "&nLt;", { 8810, 8402 } },
+    { "&nLtv;", { 8810, 824 } },
+    { "&nRightarrow;", { 8655, 0 } },
+    { "&nVDash;", { 8879, 0 } },
+    { "&nVdash;", { 8878, 0 } },
+    { "&nabla;", { 8711, 0 } },
+    { "&nacute;", { 324, 0 } },
+    { "&nang;", { 8736, 8402 } },
+    { "&nap;", { 8777, 0 } },
+    { "&napE;", { 10864, 824 } },
+    { "&napid;", { 8779, 824 } },
+    { "&napos;", { 329, 0 } },
+    { "&napprox;", { 8777, 0 } },
+    { "&natur;", { 9838, 0 } },
+    { "&natural;", { 9838, 0 } },
+    { "&naturals;", { 8469, 0 } },
+    { "&nbsp;", { 160, 0 } },
+    { "&nbump;", { 8782, 824 } },
+    { "&nbumpe;", { 8783, 824 } },
+    { "&ncap;", { 10819, 0 } },
+    { "&ncaron;", { 328, 0 } },
+    { "&ncedil;", { 326, 0 } },
+    { "&ncong;", { 8775, 0 } },
+    { "&ncongdot;", { 10861, 824 } },
+    { "&ncup;", { 10818, 0 } },
+    { "&ncy;", { 1085, 0 } },
+    { "&ndash;", { 8211, 0 } },
+    { "&ne;", { 8800, 0 } },
+    { "&neArr;", { 8663, 0 } },
+    { "&nearhk;", { 10532, 0 } },
+    { "&nearr;", { 8599, 0 } },
+    { "&nearrow;", { 8599, 0 } },
+    { "&nedot;", { 8784, 824 } },
+    { "&nequiv;", { 8802, 0 } },
+    { "&nesear;", { 10536, 0 } },
+    { "&nesim;", { 8770, 824 } },
+    { "&nexist;", { 8708, 0 } },
+    { "&nexists;", { 8708, 0 } },
+    { "&nfr;", { 120107, 0 } },
+    { "&ngE;", { 8807, 824 } },
+    { "&nge;", { 8817, 0 } },
+    { "&ngeq;", { 8817, 0 } },
+    { "&ngeqq;", { 8807, 824 } },
+    { "&ngeqslant;", { 10878, 824 } },
+    { "&nges;", { 10878, 824 } },
+    { "&ngsim;", { 8821, 0 } },
+    { "&ngt;", { 8815, 0 } },
+    { "&ngtr;", { 8815, 0 } },
+    { "&nhArr;", { 8654, 0 } },
+    { "&nharr;", { 8622, 0 } },
+    { "&nhpar;", { 10994, 0 } },
+    { "&ni;", { 8715, 0 } },
+    { "&nis;", { 8956, 0 } },
+    { "&nisd;", { 8954, 0 } },
+    { "&niv;", { 8715, 0 } },
+    { "&njcy;", { 1114, 0 } },
+    { "&nlArr;", { 8653, 0 } },
+    { "&nlE;", { 8806, 824 } },
+    { "&nlarr;", { 8602, 0 } },
+    { "&nldr;", { 8229, 0 } },
+    { "&nle;", { 8816, 0 } },
+    { "&nleftarrow;", { 8602, 0 } },
+    { "&nleftrightarrow;", { 8622, 0 } },
+    { "&nleq;", { 8816, 0 } },
+    { "&nleqq;", { 8806, 824 } },
+    { "&nleqslant;", { 10877, 824 } },
+    { "&nles;", { 10877, 824 } },
+    { "&nless;", { 8814, 0 } },
+    { "&nlsim;", { 8820, 0 } },
+    { "&nlt;", { 8814, 0 } },
+    { "&nltri;", { 8938, 0 } },
+    { "&nltrie;", { 8940, 0 } },
+    { "&nmid;", { 8740, 0 } },
+    { "&nopf;", { 120159, 0 } },
+    { "&not;", { 172, 0 } },
+    { "&notin;", { 8713, 0 } },
+    { "&notinE;", { 8953, 824 } },
+    { "&notindot;", { 8949, 824 } },
+    { "&notinva;", { 8713, 0 } },
+    { "&notinvb;", { 8951, 0 } },
+    { "&notinvc;", { 8950, 0 } },
+    { "&notni;", { 8716, 0 } },
+    { "&notniva;", { 8716, 0 } },
+    { "&notnivb;", { 8958, 0 } },
+    { "&notnivc;", { 8957, 0 } },
+    { "&npar;", { 8742, 0 } },
+    { "&nparallel;", { 8742, 0 } },
+    { "&nparsl;", { 11005, 8421 } },
+    { "&npart;", { 8706, 824 } },
+    { "&npolint;", { 10772, 0 } },
+    { "&npr;", { 8832, 0 } },
+    { "&nprcue;", { 8928, 0 } },
+    { "&npre;", { 10927, 824 } },
+    { "&nprec;", { 8832, 0 } },
+    { "&npreceq;", { 10927, 824 } },
+    { "&nrArr;", { 8655, 0 } },
+    { "&nrarr;", { 8603, 0 } },
+    { "&nrarrc;", { 10547, 824 } },
+    { "&nrarrw;", { 8605, 824 } },
+    { "&nrightarrow;", { 8603, 0 } },
+    { "&nrtri;", { 8939, 0 } },
+    { "&nrtrie;", { 8941, 0 } },
+    { "&nsc;", { 8833, 0 } },
+    { "&nsccue;", { 8929, 0 } },
+    { "&nsce;", { 10928, 824 } },
+    { "&nscr;", { 120003, 0 } },
+    { "&nshortmid;", { 8740, 0 } },
+    { "&nshortparallel;", { 8742, 0 } },
+    { "&nsim;", { 8769, 0 } },
+    { "&nsime;", { 8772, 0 } },
+    { "&nsimeq;", { 8772, 0 } },
+    { "&nsmid;", { 8740, 0 } },
+    { "&nspar;", { 8742, 0 } },
+    { "&nsqsube;", { 8930, 0 } },
+    { "&nsqsupe;", { 8931, 0 } },
+    { "&nsub;", { 8836, 0 } },
+    { "&nsubE;", { 10949, 824 } },
+    { "&nsube;", { 8840, 0 } },
+    { "&nsubset;", { 8834, 8402 } },
+    { "&nsubseteq;", { 8840, 0 } },
+    { "&nsubseteqq;", { 10949, 824 } },
+    { "&nsucc;", { 8833, 0 } },
+    { "&nsucceq;", { 10928, 824 } },
+    { "&nsup;", { 8837, 0 } },
+    { "&nsupE;", { 10950, 824 } },
+    { "&nsupe;", { 8841, 0 } },
+    { "&nsupset;", { 8835, 8402 } },
+    { "&nsupseteq;", { 8841, 0 } },
+    { "&nsupseteqq;", { 10950, 824 } },
+    { "&ntgl;", { 8825, 0 } },
+    { "&ntilde;", { 241, 0 } },
+    { "&ntlg;", { 8824, 0 } },
+    { "&ntriangleleft;", { 8938, 0 } },
+    { "&ntrianglelefteq;", { 8940, 0 } },
+    { "&ntriangleright;", { 8939, 0 } },
+    { "&ntrianglerighteq;", { 8941, 0 } },
+    { "&nu;", { 957, 0 } },
+    { "&num;", { 35, 0 } },
+    { "&numero;", { 8470, 0 } },
+    { "&numsp;", { 8199, 0 } },
+    { "&nvDash;", { 8877, 0 } },
+    { "&nvHarr;", { 10500, 0 } },
+    { "&nvap;", { 8781, 8402 } },
+    { "&nvdash;", { 8876, 0 } },
+    { "&nvge;", { 8805, 8402 } },
+    { "&nvgt;", { 62, 8402 } },
+    { "&nvinfin;", { 10718, 0 } },
+    { "&nvlArr;", { 10498, 0 } },
+    { "&nvle;", { 8804, 8402 } },
+    { "&nvlt;", { 60, 8402 } },
+    { "&nvltrie;", { 8884, 8402 } },
+    { "&nvrArr;", { 10499, 0 } },
+    { "&nvrtrie;", { 8885, 8402 } },
+    { "&nvsim;", { 8764, 8402 } },
+    { "&nwArr;", { 8662, 0 } },
+    { "&nwarhk;", { 10531, 0 } },
+    { "&nwarr;", { 8598, 0 } },
+    { "&nwarrow;", { 8598, 0 } },
+    { "&nwnear;", { 10535, 0 } },
+    { "&oS;", { 9416, 0 } },
+    { "&oacute;", { 243, 0 } },
+    { "&oast;", { 8859, 0 } },
+    { "&ocir;", { 8858, 0 } },
+    { "&ocirc;", { 244, 0 } },
+    { "&ocy;", { 1086, 0 } },
+    { "&odash;", { 8861, 0 } },
+    { "&odblac;", { 337, 0 } },
+    { "&odiv;", { 10808, 0 } },
+    { "&odot;", { 8857, 0 } },
+    { "&odsold;", { 10684, 0 } },
+    { "&oelig;", { 339, 0 } },
+    { "&ofcir;", { 10687, 0 } },
+    { "&ofr;", { 120108, 0 } },
+    { "&ogon;", { 731, 0 } },
+    { "&ograve;", { 242, 0 } },
+    { "&ogt;", { 10689, 0 } },
+    { "&ohbar;", { 10677, 0 } },
+    { "&ohm;", { 937, 0 } },
+    { "&oint;", { 8750, 0 } },
+    { "&olarr;", { 8634, 0 } },
+    { "&olcir;", { 10686, 0 } },
+    { "&olcross;", { 10683, 0 } },
+    { "&oline;", { 8254, 0 } },
+    { "&olt;", { 10688, 0 } },
+    { "&omacr;", { 333, 0 } },
+    { "&omega;", { 969, 0 } },
+    { "&omicron;", { 959, 0 } },
+    { "&omid;", { 10678, 0 } },
+    { "&ominus;", { 8854, 0 } },
+    { "&oopf;", { 120160, 0 } },
+    { "&opar;", { 10679, 0 } },
+    { "&operp;", { 10681, 0 } },
+    { "&oplus;", { 8853, 0 } },
+    { "&or;", { 8744, 0 } },
+    { "&orarr;", { 8635, 0 } },
+    { "&ord;", { 10845, 0 } },
+    { "&order;", { 8500, 0 } },
+    { "&orderof;", { 8500, 0 } },
+    { "&ordf;", { 170, 0 } },
+    { "&ordm;", { 186, 0 } },
+    { "&origof;", { 8886, 0 } },
+    { "&oror;", { 10838, 0 } },
+    { "&orslope;", { 10839, 0 } },
+    { "&orv;", { 10843, 0 } },
+    { "&oscr;", { 8500, 0 } },
+    { "&oslash;", { 248, 0 } },
+    { "&osol;", { 8856, 0 } },
+    { "&otilde;", { 245, 0 } },
+    { "&otimes;", { 8855, 0 } },
+    { "&otimesas;", { 10806, 0 } },
+    { "&ouml;", { 246, 0 } },
+    { "&ovbar;", { 9021, 0 } },
+    { "&par;", { 8741, 0 } },
+    { "&para;", { 182, 0 } },
+    { "&parallel;", { 8741, 0 } },
+    { "&parsim;", { 10995, 0 } },
+    { "&parsl;", { 11005, 0 } },
+    { "&part;", { 8706, 0 } },
+    { "&pcy;", { 1087, 0 } },
+    { "&percnt;", { 37, 0 } },
+    { "&period;", { 46, 0 } },
+    { "&permil;", { 8240, 0 } },
+    { "&perp;", { 8869, 0 } },
+    { "&pertenk;", { 8241, 0 } },
+    { "&pfr;", { 120109, 0 } },
+    { "&phi;", { 966, 0 } },
+    { "&phiv;", { 981, 0 } },
+    { "&phmmat;", { 8499, 0 } },
+    { "&phone;", { 9742, 0 } },
+    { "&pi;", { 960, 0 } },
+    { "&pitchfork;", { 8916, 0 } },
+    { "&piv;", { 982, 0 } },
+    { "&planck;", { 8463, 0 } },
+    { "&planckh;", { 8462, 0 } },
+    { "&plankv;", { 8463, 0 } },
+    { "&plus;", { 43, 0 } },
+    { "&plusacir;", { 10787, 0 } },
+    { "&plusb;", { 8862, 0 } },
+    { "&pluscir;", { 10786, 0 } },
+    { "&plusdo;", { 8724, 0 } },
+    { "&plusdu;", { 10789, 0 } },
+    { "&pluse;", { 10866, 0 } },
+    { "&plusmn;", { 177, 0 } },
+    { "&plussim;", { 10790, 0 } },
+    { "&plustwo;", { 10791, 0 } },
+    { "&pm;", { 177, 0 } },
+    { "&pointint;", { 10773, 0 } },
+    { "&popf;", { 120161, 0 } },
+    { "&pound;", { 163, 0 } },
+    { "&pr;", { 8826, 0 } },
+    { "&prE;", { 10931, 0 } },
+    { "&prap;", { 10935, 0 } },
+    { "&prcue;", { 8828, 0 } },
+    { "&pre;", { 10927, 0 } },
+    { "&prec;", { 8826, 0 } },
+    { "&precapprox;", { 10935, 0 } },
+    { "&preccurlyeq;", { 8828, 0 } },
+    { "&preceq;", { 10927, 0 } },
+    { "&precnapprox;", { 10937, 0 } },
+    { "&precneqq;", { 10933, 0 } },
+    { "&precnsim;", { 8936, 0 } },
+    { "&precsim;", { 8830, 0 } },
+    { "&prime;", { 8242, 0 } },
+    { "&primes;", { 8473, 0 } },
+    { "&prnE;", { 10933, 0 } },
+    { "&prnap;", { 10937, 0 } },
+    { "&prnsim;", { 8936, 0 } },
+    { "&prod;", { 8719, 0 } },
+    { "&profalar;", { 9006, 0 } },
+    { "&profline;", { 8978, 0 } },
+    { "&profsurf;", { 8979, 0 } },
+    { "&prop;", { 8733, 0 } },
+    { "&propto;", { 8733, 0 } },
+    { "&prsim;", { 8830, 0 } },
+    { "&prurel;", { 8880, 0 } },
+    { "&pscr;", { 120005, 0 } },
+    { "&psi;", { 968, 0 } },
+    { "&puncsp;", { 8200, 0 } },
+    { "&qfr;", { 120110, 0 } },
+    { "&qint;", { 10764, 0 } },
+    { "&qopf;", { 120162, 0 } },
+    { "&qprime;", { 8279, 0 } },
+    { "&qscr;", { 120006, 0 } },
+    { "&quaternions;", { 8461, 0 } },
+    { "&quatint;", { 10774, 0 } },
+    { "&quest;", { 63, 0 } },
+    { "&questeq;", { 8799, 0 } },
+    { "&quot;", { 34, 0 } },
+    { "&rAarr;", { 8667, 0 } },
+    { "&rArr;", { 8658, 0 } },
+    { "&rAtail;", { 10524, 0 } },
+    { "&rBarr;", { 10511, 0 } },
+    { "&rHar;", { 10596, 0 } },
+    { "&race;", { 8765, 817 } },
+    { "&racute;", { 341, 0 } },
+    { "&radic;", { 8730, 0 } },
+    { "&raemptyv;", { 10675, 0 } },
+    { "&rang;", { 10217, 0 } },
+    { "&rangd;", { 10642, 0 } },
+    { "&range;", { 10661, 0 } },
+    { "&rangle;", { 10217, 0 } },
+    { "&raquo;", { 187, 0 } },
+    { "&rarr;", { 8594, 0 } },
+    { "&rarrap;", { 10613, 0 } },
+    { "&rarrb;", { 8677, 0 } },
+    { "&rarrbfs;", { 10528, 0 } },
+    { "&rarrc;", { 10547, 0 } },
+    { "&rarrfs;", { 10526, 0 } },
+    { "&rarrhk;", { 8618, 0 } },
+    { "&rarrlp;", { 8620, 0 } },
+    { "&rarrpl;", { 10565, 0 } },
+    { "&rarrsim;", { 10612, 0 } },
+    { "&rarrtl;", { 8611, 0 } },
+    { "&rarrw;", { 8605, 0 } },
+    { "&ratail;", { 10522, 0 } },
+    { "&ratio;", { 8758, 0 } },
+    { "&rationals;", { 8474, 0 } },
+    { "&rbarr;", { 10509, 0 } },
+    { "&rbbrk;", { 10099, 0 } },
+    { "&rbrace;", { 125, 0 } },
+    { "&rbrack;", { 93, 0 } },
+    { "&rbrke;", { 10636, 0 } },
+    { "&rbrksld;", { 10638, 0 } },
+    { "&rbrkslu;", { 10640, 0 } },
+    { "&rcaron;", { 345, 0 } },
+    { "&rcedil;", { 343, 0 } },
+    { "&rceil;", { 8969, 0 } },
+    { "&rcub;", { 125, 0 } },
+    { "&rcy;", { 1088, 0 } },
+    { "&rdca;", { 10551, 0 } },
+    { "&rdldhar;", { 10601, 0 } },
+    { "&rdquo;", { 8221, 0 } },
+    { "&rdquor;", { 8221, 0 } },
+    { "&rdsh;", { 8627, 0 } },
+    { "&real;", { 8476, 0 } },
+    { "&realine;", { 8475, 0 } },
+    { "&realpart;", { 8476, 0 } },
+    { "&reals;", { 8477, 0 } },
+    { "&rect;", { 9645, 0 } },
+    { "&reg;", { 174, 0 } },
+    { "&rfisht;", { 10621, 0 } },
+    { "&rfloor;", { 8971, 0 } },
+    { "&rfr;", { 120111, 0 } },
+    { "&rhard;", { 8641, 0 } },
+    { "&rharu;", { 8640, 0 } },
+    { "&rharul;", { 10604, 0 } },
+    { "&rho;", { 961, 0 } },
+    { "&rhov;", { 1009, 0 } },
+    { "&rightarrow;", { 8594, 0 } },
+    { "&rightarrowtail;", { 8611, 0 } },
+    { "&rightharpoondown;", { 8641, 0 } },
+    { "&rightharpoonup;", { 8640, 0 } },
+    { "&rightleftarrows;", { 8644, 0 } },
+    { "&rightleftharpoons;", { 8652, 0 } },
+    { "&rightrightarrows;", { 8649, 0 } },
+    { "&rightsquigarrow;", { 8605, 0 } },
+    { "&rightthreetimes;", { 8908, 0 } },
+    { "&ring;", { 730, 0 } },
+    { "&risingdotseq;", { 8787, 0 } },
+    { "&rlarr;", { 8644, 0 } },
+    { "&rlhar;", { 8652, 0 } },
+    { "&rlm;", { 8207, 0 } },
+    { "&rmoust;", { 9137, 0 } },
+    { "&rmoustache;", { 9137, 0 } },
+    { "&rnmid;", { 10990, 0 } },
+    { "&roang;", { 10221, 0 } },
+    { "&roarr;", { 8702, 0 } },
+    { "&robrk;", { 10215, 0 } },
+    { "&ropar;", { 10630, 0 } },
+    { "&ropf;", { 120163, 0 } },
+    { "&roplus;", { 10798, 0 } },
+    { "&rotimes;", { 10805, 0 } },
+    { "&rpar;", { 41, 0 } },
+    { "&rpargt;", { 10644, 0 } },
+    { "&rppolint;", { 10770, 0 } },
+    { "&rrarr;", { 8649, 0 } },
+    { "&rsaquo;", { 8250, 0 } },
+    { "&rscr;", { 120007, 0 } },
+    { "&rsh;", { 8625, 0 } },
+    { "&rsqb;", { 93, 0 } },
+    { "&rsquo;", { 8217, 0 } },
+    { "&rsquor;", { 8217, 0 } },
+    { "&rthree;", { 8908, 0 } },
+    { "&rtimes;", { 8906, 0 } },
+    { "&rtri;", { 9657, 0 } },
+    { "&rtrie;", { 8885, 0 } },
+    { "&rtrif;", { 9656, 0 } },
+    { "&rtriltri;", { 10702, 0 } },
+    { "&ruluhar;", { 10600, 0 } },
+    { "&rx;", { 8478, 0 } },
+    { "&sacute;", { 347, 0 } },
+    { "&sbquo;", { 8218, 0 } },
+    { "&sc;", { 8827, 0 } },
+    { "&scE;", { 10932, 0 } },
+    { "&scap;", { 10936, 0 } },
+    { "&scaron;", { 353, 0 } },
+    { "&sccue;", { 8829, 0 } },
+    { "&sce;", { 10928, 0 } },
+    { "&scedil;", { 351, 0 } },
+    { "&scirc;", { 349, 0 } },
+    { "&scnE;", { 10934, 0 } },
+    { "&scnap;", { 10938, 0 } },
+    { "&scnsim;", { 8937, 0 } },
+    { "&scpolint;", { 10771, 0 } },
+    { "&scsim;", { 8831, 0 } },
+    { "&scy;", { 1089, 0 } },
+    { "&sdot;", { 8901, 0 } },
+    { "&sdotb;", { 8865, 0 } },
+    { "&sdote;", { 10854, 0 } },
+    { "&seArr;", { 8664, 0 } },
+    { "&searhk;", { 10533, 0 } },
+    { "&searr;", { 8600, 0 } },
+    { "&searrow;", { 8600, 0 } },
+    { "&sect;", { 167, 0 } },
+    { "&semi;", { 59, 0 } },
+    { "&seswar;", { 10537, 0 } },
+    { "&setminus;", { 8726, 0 } },
+    { "&setmn;", { 8726, 0 } },
+    { "&sext;", { 10038, 0 } },
+    { "&sfr;", { 120112, 0 } },
+    { "&sfrown;", { 8994, 0 } },
+    { "&sharp;", { 9839, 0 } },
+    { "&shchcy;", { 1097, 0 } },
+    { "&shcy;", { 1096, 0 } },
+    { "&shortmid;", { 8739, 0 } },
+    { "&shortparallel;", { 8741, 0 } },
+    { "&shy;", { 173, 0 } },
+    { "&sigma;", { 963, 0 } },
+    { "&sigmaf;", { 962, 0 } },
+    { "&sigmav;", { 962, 0 } },
+    { "&sim;", { 8764, 0 } },
+    { "&simdot;", { 10858, 0 } },
+    { "&sime;", { 8771, 0 } },
+    { "&simeq;", { 8771, 0 } },
+    { "&simg;", { 10910, 0 } },
+    { "&simgE;", { 10912, 0 } },
+    { "&siml;", { 10909, 0 } },
+    { "&simlE;", { 10911, 0 } },
+    { "&simne;", { 8774, 0 } },
+    { "&simplus;", { 10788, 0 } },
+    { "&simrarr;", { 10610, 0 } },
+    { "&slarr;", { 8592, 0 } },
+    { "&smallsetminus;", { 8726, 0 } },
+    { "&smashp;", { 10803, 0 } },
+    { "&smeparsl;", { 10724, 0 } },
+    { "&smid;", { 8739, 0 } },
+    { "&smile;", { 8995, 0 } },
+    { "&smt;", { 10922, 0 } },
+    { "&smte;", { 10924, 0 } },
+    { "&smtes;", { 10924, 65024 } },
+    { "&softcy;", { 1100, 0 } },
+    { "&sol;", { 47, 0 } },
+    { "&solb;", { 10692, 0 } },
+    { "&solbar;", { 9023, 0 } },
+    { "&sopf;", { 120164, 0 } },
+    { "&spades;", { 9824, 0 } },
+    { "&spadesuit;", { 9824, 0 } },
+    { "&spar;", { 8741, 0 } },
+    { "&sqcap;", { 8851, 0 } },
+    { "&sqcaps;", { 8851, 65024 } },
+    { "&sqcup;", { 8852, 0 } },
+    { "&sqcups;", { 8852, 65024 } },
+    { "&sqsub;", { 8847, 0 } },
+    { "&sqsube;", { 8849, 0 } },
+    { "&sqsubset;", { 8847, 0 } },
+    { "&sqsubseteq;", { 8849, 0 } },
+    { "&sqsup;", { 8848, 0 } },
+    { "&sqsupe;", { 8850, 0 } },
+    { "&sqsupset;", { 8848, 0 } },
+    { "&sqsupseteq;", { 8850, 0 } },
+    { "&squ;", { 9633, 0 } },
+    { "&square;", { 9633, 0 } },
+    { "&squarf;", { 9642, 0 } },
+    { "&squf;", { 9642, 0 } },
+    { "&srarr;", { 8594, 0 } },
+    { "&sscr;", { 120008, 0 } },
+    { "&ssetmn;", { 8726, 0 } },
+    { "&ssmile;", { 8995, 0 } },
+    { "&sstarf;", { 8902, 0 } },
+    { "&star;", { 9734, 0 } },
+    { "&starf;", { 9733, 0 } },
+    { "&straightepsilon;", { 1013, 0 } },
+    { "&straightphi;", { 981, 0 } },
+    { "&strns;", { 175, 0 } },
+    { "&sub;", { 8834, 0 } },
+    { "&subE;", { 10949, 0 } },
+    { "&subdot;", { 10941, 0 } },
+    { "&sube;", { 8838, 0 } },
+    { "&subedot;", { 10947, 0 } },
+    { "&submult;", { 10945, 0 } },
+    { "&subnE;", { 10955, 0 } },
+    { "&subne;", { 8842, 0 } },
+    { "&subplus;", { 10943, 0 } },
+    { "&subrarr;", { 10617, 0 } },
+    { "&subset;", { 8834, 0 } },
+    { "&subseteq;", { 8838, 0 } },
+    { "&subseteqq;", { 10949, 0 } },
+    { "&subsetneq;", { 8842, 0 } },
+    { "&subsetneqq;", { 10955, 0 } },
+    { "&subsim;", { 10951, 0 } },
+    { "&subsub;", { 10965, 0 } },
+    { "&subsup;", { 10963, 0 } },
+    { "&succ;", { 8827, 0 } },
+    { "&succapprox;", { 10936, 0 } },
+    { "&succcurlyeq;", { 8829, 0 } },
+    { "&succeq;", { 10928, 0 } },
+    { "&succnapprox;", { 10938, 0 } },
+    { "&succneqq;", { 10934, 0 } },
+    { "&succnsim;", { 8937, 0 } },
+    { "&succsim;", { 8831, 0 } },
+    { "&sum;", { 8721, 0 } },
+    { "&sung;", { 9834, 0 } },
+    { "&sup1", { 185, 0 } },
+    { "&sup1;", { 185, 0 } },
+    { "&sup2", { 178, 0 } },
+    { "&sup2;", { 178, 0 } },
+    { "&sup3", { 179, 0 } },
+    { "&sup3;", { 179, 0 } },
+    { "&sup;", { 8835, 0 } },
+    { "&supE;", { 10950, 0 } },
+    { "&supdot;", { 10942, 0 } },
+    { "&supdsub;", { 10968, 0 } },
+    { "&supe;", { 8839, 0 } },
+    { "&supedot;", { 10948, 0 } },
+    { "&suphsol;", { 10185, 0 } },
+    { "&suphsub;", { 10967, 0 } },
+    { "&suplarr;", { 10619, 0 } },
+    { "&supmult;", { 10946, 0 } },
+    { "&supnE;", { 10956, 0 } },
+    { "&supne;", { 8843, 0 } },
+    { "&supplus;", { 10944, 0 } },
+    { "&supset;", { 8835, 0 } },
+    { "&supseteq;", { 8839, 0 } },
+    { "&supseteqq;", { 10950, 0 } },
+    { "&supsetneq;", { 8843, 0 } },
+    { "&supsetneqq;", { 10956, 0 } },
+    { "&supsim;", { 10952, 0 } },
+    { "&supsub;", { 10964, 0 } },
+    { "&supsup;", { 10966, 0 } },
+    { "&swArr;", { 8665, 0 } },
+    { "&swarhk;", { 10534, 0 } },
+    { "&swarr;", { 8601, 0 } },
+    { "&swarrow;", { 8601, 0 } },
+    { "&swnwar;", { 10538, 0 } },
+    { "&szlig;", { 223, 0 } },
+    { "&target;", { 8982, 0 } },
+    { "&tau;", { 964, 0 } },
+    { "&tbrk;", { 9140, 0 } },
+    { "&tcaron;", { 357, 0 } },
+    { "&tcedil;", { 355, 0 } },
+    { "&tcy;", { 1090, 0 } },
+    { "&tdot;", { 8411, 0 } },
+    { "&telrec;", { 8981, 0 } },
+    { "&tfr;", { 120113, 0 } },
+    { "&there4;", { 8756, 0 } },
+    { "&therefore;", { 8756, 0 } },
+    { "&theta;", { 952, 0 } },
+    { "&thetasym;", { 977, 0 } },
+    { "&thetav;", { 977, 0 } },
+    { "&thickapprox;", { 8776, 0 } },
+    { "&thicksim;", { 8764, 0 } },
+    { "&thinsp;", { 8201, 0 } },
+    { "&thkap;", { 8776, 0 } },
+    { "&thksim;", { 8764, 0 } },
+    { "&thorn;", { 254, 0 } },
+    { "&tilde;", { 732, 0 } },
+    { "&times;", { 215, 0 } },
+    { "&timesb;", { 8864, 0 } },
+    { "&timesbar;", { 10801, 0 } },
+    { "&timesd;", { 10800, 0 } },
+    { "&tint;", { 8749, 0 } },
+    { "&toea;", { 10536, 0 } },
+    { "&top;", { 8868, 0 } },
+    { "&topbot;", { 9014, 0 } },
+    { "&topcir;", { 10993, 0 } },
+    { "&topf;", { 120165, 0 } },
+    { "&topfork;", { 10970, 0 } },
+    { "&tosa;", { 10537, 0 } },
+    { "&tprime;", { 8244, 0 } },
+    { "&trade;", { 8482, 0 } },
+    { "&triangle;", { 9653, 0 } },
+    { "&triangledown;", { 9663, 0 } },
+    { "&triangleleft;", { 9667, 0 } },
+    { "&trianglelefteq;", { 8884, 0 } },
+    { "&triangleq;", { 8796, 0 } },
+    { "&triangleright;", { 9657, 0 } },
+    { "&trianglerighteq;", { 8885, 0 } },
+    { "&tridot;", { 9708, 0 } },
+    { "&trie;", { 8796, 0 } },
+    { "&triminus;", { 10810, 0 } },
+    { "&triplus;", { 10809, 0 } },
+    { "&trisb;", { 10701, 0 } },
+    { "&tritime;", { 10811, 0 } },
+    { "&trpezium;", { 9186, 0 } },
+    { "&tscr;", { 120009, 0 } },
+    { "&tscy;", { 1094, 0 } },
+    { "&tshcy;", { 1115, 0 } },
+    { "&tstrok;", { 359, 0 } },
+    { "&twixt;", { 8812, 0 } },
+    { "&twoheadleftarrow;", { 8606, 0 } },
+    { "&twoheadrightarrow;", { 8608, 0 } },
+    { "&uArr;", { 8657, 0 } },
+    { "&uHar;", { 10595, 0 } },
+    { "&uacute;", { 250, 0 } },
+    { "&uarr;", { 8593, 0 } },
+    { "&ubrcy;", { 1118, 0 } },
+    { "&ubreve;", { 365, 0 } },
+    { "&ucirc;", { 251, 0 } },
+    { "&ucy;", { 1091, 0 } },
+    { "&udarr;", { 8645, 0 } },
+    { "&udblac;", { 369, 0 } },
+    { "&udhar;", { 10606, 0 } },
+    { "&ufisht;", { 10622, 0 } },
+    { "&ufr;", { 120114, 0 } },
+    { "&ugrave;", { 249, 0 } },
+    { "&uharl;", { 8639, 0 } },
+    { "&uharr;", { 8638, 0 } },
+    { "&uhblk;", { 9600, 0 } },
+    { "&ulcorn;", { 8988, 0 } },
+    { "&ulcorner;", { 8988, 0 } },
+    { "&ulcrop;", { 8975, 0 } },
+    { "&ultri;", { 9720, 0 } },
+    { "&umacr;", { 363, 0 } },
+    { "&uml;", { 168, 0 } },
+    { "&uogon;", { 371, 0 } },
+    { "&uopf;", { 120166, 0 } },
+    { "&uparrow;", { 8593, 0 } },
+    { "&updownarrow;", { 8597, 0 } },
+    { "&upharpoonleft;", { 8639, 0 } },
+    { "&upharpoonright;", { 8638, 0 } },
+    { "&uplus;", { 8846, 0 } },
+    { "&upsi;", { 965, 0 } },
+    { "&upsih;", { 978, 0 } },
+    { "&upsilon;", { 965, 0 } },
+    { "&upuparrows;", { 8648, 0 } },
+    { "&urcorn;", { 8989, 0 } },
+    { "&urcorner;", { 8989, 0 } },
+    { "&urcrop;", { 8974, 0 } },
+    { "&uring;", { 367, 0 } },
+    { "&urtri;", { 9721, 0 } },
+    { "&uscr;", { 120010, 0 } },
+    { "&utdot;", { 8944, 0 } },
+    { "&utilde;", { 361, 0 } },
+    { "&utri;", { 9653, 0 } },
+    { "&utrif;", { 9652, 0 } },
+    { "&uuarr;", { 8648, 0 } },
+    { "&uuml;", { 252, 0 } },
+    { "&uwangle;", { 10663, 0 } },
+    { "&vArr;", { 8661, 0 } },
+    { "&vBar;", { 10984, 0 } },
+    { "&vBarv;", { 10985, 0 } },
+    { "&vDash;", { 8872, 0 } },
+    { "&vangrt;", { 10652, 0 } },
+    { "&varepsilon;", { 1013, 0 } },
+    { "&varkappa;", { 1008, 0 } },
+    { "&varnothing;", { 8709, 0 } },
+    { "&varphi;", { 981, 0 } },
+    { "&varpi;", { 982, 0 } },
+    { "&varpropto;", { 8733, 0 } },
+    { "&varr;", { 8597, 0 } },
+    { "&varrho;", { 1009, 0 } },
+    { "&varsigma;", { 962, 0 } },
+    { "&varsubsetneq;", { 8842, 65024 } },
+    { "&varsubsetneqq;", { 10955, 65024 } },
+    { "&varsupsetneq;", { 8843, 65024 } },
+    { "&varsupsetneqq;", { 10956, 65024 } },
+    { "&vartheta;", { 977, 0 } },
+    { "&vartriangleleft;", { 8882, 0 } },
+    { "&vartriangleright;", { 8883, 0 } },
+    { "&vcy;", { 1074, 0 } },
+    { "&vdash;", { 8866, 0 } },
+    { "&vee;", { 8744, 0 } },
+    { "&veebar;", { 8891, 0 } },
+    { "&veeeq;", { 8794, 0 } },
+    { "&vellip;", { 8942, 0 } },
+    { "&verbar;", { 124, 0 } },
+    { "&vert;", { 124, 0 } },
+    { "&vfr;", { 120115, 0 } },
+    { "&vltri;", { 8882, 0 } },
+    { "&vnsub;", { 8834, 8402 } },
+    { "&vnsup;", { 8835, 8402 } },
+    { "&vopf;", { 120167, 0 } },
+    { "&vprop;", { 8733, 0 } },
+    { "&vrtri;", { 8883, 0 } },
+    { "&vscr;", { 120011, 0 } },
+    { "&vsubnE;", { 10955, 65024 } },
+    { "&vsubne;", { 8842, 65024 } },
+    { "&vsupnE;", { 10956, 65024 } },
+    { "&vsupne;", { 8843, 65024 } },
+    { "&vzigzag;", { 10650, 0 } },
+    { "&wcirc;", { 373, 0 } },
+    { "&wedbar;", { 10847, 0 } },
+    { "&wedge;", { 8743, 0 } },
+    { "&wedgeq;", { 8793, 0 } },
+    { "&weierp;", { 8472, 0 } },
+    { "&wfr;", { 120116, 0 } },
+    { "&wopf;", { 120168, 0 } },
+    { "&wp;", { 8472, 0 } },
+    { "&wr;", { 8768, 0 } },
+    { "&wreath;", { 8768, 0 } },
+    { "&wscr;", { 120012, 0 } },
+    { "&xcap;", { 8898, 0 } },
+    { "&xcirc;", { 9711, 0 } },
+    { "&xcup;", { 8899, 0 } },
+    { "&xdtri;", { 9661, 0 } },
+    { "&xfr;", { 120117, 0 } },
+    { "&xhArr;", { 10234, 0 } },
+    { "&xharr;", { 10231, 0 } },
+    { "&xi;", { 958, 0 } },
+    { "&xlArr;", { 10232, 0 } },
+    { "&xlarr;", { 10229, 0 } },
+    { "&xmap;", { 10236, 0 } },
+    { "&xnis;", { 8955, 0 } },
+    { "&xodot;", { 10752, 0 } },
+    { "&xopf;", { 120169, 0 } },
+    { "&xoplus;", { 10753, 0 } },
+    { "&xotime;", { 10754, 0 } },
+    { "&xrArr;", { 10233, 0 } },
+    { "&xrarr;", { 10230, 0 } },
+    { "&xscr;", { 120013, 0 } },
+    { "&xsqcup;", { 10758, 0 } },
+    { "&xuplus;", { 10756, 0 } },
+    { "&xutri;", { 9651, 0 } },
+    { "&xvee;", { 8897, 0 } },
+    { "&xwedge;", { 8896, 0 } },
+    { "&yacute;", { 253, 0 } },
+    { "&yacy;", { 1103, 0 } },
+    { "&ycirc;", { 375, 0 } },
+    { "&ycy;", { 1099, 0 } },
+    { "&yen;", { 165, 0 } },
+    { "&yfr;", { 120118, 0 } },
+    { "&yicy;", { 1111, 0 } },
+    { "&yopf;", { 120170, 0 } },
+    { "&yscr;", { 120014, 0 } },
+    { "&yucy;", { 1102, 0 } },
+    { "&yuml;", { 255, 0 } },
+    { "&zacute;", { 378, 0 } },
+    { "&zcaron;", { 382, 0 } },
+    { "&zcy;", { 1079, 0 } },
+    { "&zdot;", { 380, 0 } },
+    { "&zeetrf;", { 8488, 0 } },
+    { "&zeta;", { 950, 0 } },
+    { "&zfr;", { 120119, 0 } },
+    { "&zhcy;", { 1078, 0 } },
+    { "&zigrarr;", { 8669, 0 } },
+    { "&zopf;", { 120171, 0 } },
+    { "&zscr;", { 120015, 0 } },
+    { "&zwj;", { 8205, 0 } },
+    { "&zwnj;", { 8204, 0 } }
+};
+
+
+struct entity_key {
+    const char* name;
+    size_t name_size;
+};
+
+static int
+entity_cmp(const void* p_key, const void* p_entity)
+{
+    struct entity_key* key = (struct entity_key*) p_key;
+    struct entity* ent = (struct entity*) p_entity;
+
+    return strncmp(key->name, ent->name, key->name_size);
+}
+
+const struct entity*
+entity_lookup(const char* name, size_t name_size)
+{
+    struct entity_key key = { name, name_size };
+
+    return bsearch(&key,
+                   entity_table,
+                   sizeof(entity_table) / sizeof(entity_table[0]),
+                   sizeof(struct entity),
+                   entity_cmp);
+}
diff --git a/tdemarkdown/md4c/src/entity.h b/tdemarkdown/md4c/src/entity.h
new file mode 100644
index 000000000..36395fe51
--- /dev/null
+++ b/tdemarkdown/md4c/src/entity.h
@@ -0,0 +1,42 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2019 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef MD4C_ENTITY_H
+#define MD4C_ENTITY_H
+
+#include <stdlib.h>
+
+
+/* Most entities are formed by single Unicode codepoint, few by two codepoints.
+ * Single-codepoint entities have codepoints[1] set to zero. */
+struct entity {
+    const char* name;
+    unsigned codepoints[2];
+};
+
+const struct entity* entity_lookup(const char* name, size_t name_size);
+
+
+#endif  /* MD4C_ENTITY_H */
diff --git a/tdemarkdown/md4c/src/md4c-html.c b/tdemarkdown/md4c/src/md4c-html.c
new file mode 100644
index 000000000..d604aecb0
--- /dev/null
+++ b/tdemarkdown/md4c/src/md4c-html.c
@@ -0,0 +1,573 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2019 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "md4c-html.h"
+#include "entity.h"
+
+
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199409L
+    /* C89/90 or old compilers in general may not understand "inline". */
+    #if defined __GNUC__
+        #define inline __inline__
+    #elif defined _MSC_VER
+        #define inline __inline
+    #else
+        #define inline
+    #endif
+#endif
+
+#ifdef _WIN32
+    #define snprintf _snprintf
+#endif
+
+
+
+typedef struct MD_HTML_tag MD_HTML;
+struct MD_HTML_tag {
+    void (*process_output)(const MD_CHAR*, MD_SIZE, void*);
+    void* userdata;
+    unsigned flags;
+    int image_nesting_level;
+    char escape_map[256];
+};
+
+#define NEED_HTML_ESC_FLAG   0x1
+#define NEED_URL_ESC_FLAG    0x2
+
+
+/*****************************************
+ ***  HTML rendering helper functions  ***
+ *****************************************/
+
+#define ISDIGIT(ch)     ('0' <= (ch) && (ch) <= '9')
+#define ISLOWER(ch)     ('a' <= (ch) && (ch) <= 'z')
+#define ISUPPER(ch)     ('A' <= (ch) && (ch) <= 'Z')
+#define ISALNUM(ch)     (ISLOWER(ch) || ISUPPER(ch) || ISDIGIT(ch))
+
+
+static inline void
+render_verbatim(MD_HTML* r, const MD_CHAR* text, MD_SIZE size)
+{
+    r->process_output(text, size, r->userdata);
+}
+
+/* Keep this as a macro. Most compiler should then be smart enough to replace
+ * the strlen() call with a compile-time constant if the string is a C literal. */
+#define RENDER_VERBATIM(r, verbatim)                                    \
+        render_verbatim((r), (verbatim), (MD_SIZE) (strlen(verbatim)))
+
+
+static void
+render_html_escaped(MD_HTML* r, const MD_CHAR* data, MD_SIZE size)
+{
+    MD_OFFSET beg = 0;
+    MD_OFFSET off = 0;
+
+    /* Some characters need to be escaped in normal HTML text. */
+    #define NEED_HTML_ESC(ch)   (r->escape_map[(unsigned char)(ch)] & NEED_HTML_ESC_FLAG)
+
+    while(1) {
+        /* Optimization: Use some loop unrolling. */
+        while(off + 3 < size  &&  !NEED_HTML_ESC(data[off+0])  &&  !NEED_HTML_ESC(data[off+1])
+                              &&  !NEED_HTML_ESC(data[off+2])  &&  !NEED_HTML_ESC(data[off+3]))
+            off += 4;
+        while(off < size  &&  !NEED_HTML_ESC(data[off]))
+            off++;
+
+        if(off > beg)
+            render_verbatim(r, data + beg, off - beg);
+
+        if(off < size) {
+            switch(data[off]) {
+                case '&':   RENDER_VERBATIM(r, "&amp;"); break;
+                case '<':   RENDER_VERBATIM(r, "&lt;"); break;
+                case '>':   RENDER_VERBATIM(r, "&gt;"); break;
+                case '"':   RENDER_VERBATIM(r, "&quot;"); break;
+            }
+            off++;
+        } else {
+            break;
+        }
+        beg = off;
+    }
+}
+
+static void
+render_url_escaped(MD_HTML* r, const MD_CHAR* data, MD_SIZE size)
+{
+    static const MD_CHAR hex_chars[] = "0123456789ABCDEF";
+    MD_OFFSET beg = 0;
+    MD_OFFSET off = 0;
+
+    /* Some characters need to be escaped in URL attributes. */
+    #define NEED_URL_ESC(ch)    (r->escape_map[(unsigned char)(ch)] & NEED_URL_ESC_FLAG)
+
+    while(1) {
+        while(off < size  &&  !NEED_URL_ESC(data[off]))
+            off++;
+        if(off > beg)
+            render_verbatim(r, data + beg, off - beg);
+
+        if(off < size) {
+            char hex[3];
+
+            switch(data[off]) {
+                case '&':   RENDER_VERBATIM(r, "&amp;"); break;
+                default:
+                    hex[0] = '%';
+                    hex[1] = hex_chars[((unsigned)data[off] >> 4) & 0xf];
+                    hex[2] = hex_chars[((unsigned)data[off] >> 0) & 0xf];
+                    render_verbatim(r, hex, 3);
+                    break;
+            }
+            off++;
+        } else {
+            break;
+        }
+
+        beg = off;
+    }
+}
+
+static unsigned
+hex_val(char ch)
+{
+    if('0' <= ch && ch <= '9')
+        return ch - '0';
+    if('A' <= ch && ch <= 'Z')
+        return ch - 'A' + 10;
+    else
+        return ch - 'a' + 10;
+}
+
+static void
+render_utf8_codepoint(MD_HTML* r, unsigned codepoint,
+                      void (*fn_append)(MD_HTML*, const MD_CHAR*, MD_SIZE))
+{
+    static const MD_CHAR utf8_replacement_char[] = { 0xef, 0xbf, 0xbd };
+
+    unsigned char utf8[4];
+    size_t n;
+
+    if(codepoint <= 0x7f) {
+        n = 1;
+        utf8[0] = codepoint;
+    } else if(codepoint <= 0x7ff) {
+        n = 2;
+        utf8[0] = 0xc0 | ((codepoint >>  6) & 0x1f);
+        utf8[1] = 0x80 + ((codepoint >>  0) & 0x3f);
+    } else if(codepoint <= 0xffff) {
+        n = 3;
+        utf8[0] = 0xe0 | ((codepoint >> 12) & 0xf);
+        utf8[1] = 0x80 + ((codepoint >>  6) & 0x3f);
+        utf8[2] = 0x80 + ((codepoint >>  0) & 0x3f);
+    } else {
+        n = 4;
+        utf8[0] = 0xf0 | ((codepoint >> 18) & 0x7);
+        utf8[1] = 0x80 + ((codepoint >> 12) & 0x3f);
+        utf8[2] = 0x80 + ((codepoint >>  6) & 0x3f);
+        utf8[3] = 0x80 + ((codepoint >>  0) & 0x3f);
+    }
+
+    if(0 < codepoint  &&  codepoint <= 0x10ffff)
+        fn_append(r, (char*)utf8, (MD_SIZE)n);
+    else
+        fn_append(r, utf8_replacement_char, 3);
+}
+
+/* Translate entity to its UTF-8 equivalent, or output the verbatim one
+ * if such entity is unknown (or if the translation is disabled). */
+static void
+render_entity(MD_HTML* r, const MD_CHAR* text, MD_SIZE size,
+              void (*fn_append)(MD_HTML*, const MD_CHAR*, MD_SIZE))
+{
+    if(r->flags & MD_HTML_FLAG_VERBATIM_ENTITIES) {
+        render_verbatim(r, text, size);
+        return;
+    }
+
+    /* We assume UTF-8 output is what is desired. */
+    if(size > 3 && text[1] == '#') {
+        unsigned codepoint = 0;
+
+        if(text[2] == 'x' || text[2] == 'X') {
+            /* Hexadecimal entity (e.g. "&#x1234abcd;")). */
+            MD_SIZE i;
+            for(i = 3; i < size-1; i++)
+                codepoint = 16 * codepoint + hex_val(text[i]);
+        } else {
+            /* Decimal entity (e.g. "&1234;") */
+            MD_SIZE i;
+            for(i = 2; i < size-1; i++)
+                codepoint = 10 * codepoint + (text[i] - '0');
+        }
+
+        render_utf8_codepoint(r, codepoint, fn_append);
+        return;
+    } else {
+        /* Named entity (e.g. "&nbsp;"). */
+        const struct entity* ent;
+
+        ent = entity_lookup(text, size);
+        if(ent != NULL) {
+            render_utf8_codepoint(r, ent->codepoints[0], fn_append);
+            if(ent->codepoints[1])
+                render_utf8_codepoint(r, ent->codepoints[1], fn_append);
+            return;
+        }
+    }
+
+    fn_append(r, text, size);
+}
+
+static void
+render_attribute(MD_HTML* r, const MD_ATTRIBUTE* attr,
+                 void (*fn_append)(MD_HTML*, const MD_CHAR*, MD_SIZE))
+{
+    int i;
+
+    for(i = 0; attr->substr_offsets[i] < attr->size; i++) {
+        MD_TEXTTYPE type = attr->substr_types[i];
+        MD_OFFSET off = attr->substr_offsets[i];
+        MD_SIZE size = attr->substr_offsets[i+1] - off;
+        const MD_CHAR* text = attr->text + off;
+
+        switch(type) {
+            case MD_TEXT_NULLCHAR:  render_utf8_codepoint(r, 0x0000, render_verbatim); break;
+            case MD_TEXT_ENTITY:    render_entity(r, text, size, fn_append); break;
+            default:                fn_append(r, text, size); break;
+        }
+    }
+}
+
+
+static void
+render_open_ol_block(MD_HTML* r, const MD_BLOCK_OL_DETAIL* det)
+{
+    char buf[64];
+
+    if(det->start == 1) {
+        RENDER_VERBATIM(r, "<ol>\n");
+        return;
+    }
+
+    snprintf(buf, sizeof(buf), "<ol start=\"%u\">\n", det->start);
+    RENDER_VERBATIM(r, buf);
+}
+
+static void
+render_open_li_block(MD_HTML* r, const MD_BLOCK_LI_DETAIL* det)
+{
+    if(det->is_task) {
+        RENDER_VERBATIM(r, "<li class=\"task-list-item\">"
+                          "<input type=\"checkbox\" class=\"task-list-item-checkbox\" disabled");
+        if(det->task_mark == 'x' || det->task_mark == 'X')
+            RENDER_VERBATIM(r, " checked");
+        RENDER_VERBATIM(r, ">");
+    } else {
+        RENDER_VERBATIM(r, "<li>");
+    }
+}
+
+static void
+render_open_code_block(MD_HTML* r, const MD_BLOCK_CODE_DETAIL* det)
+{
+    RENDER_VERBATIM(r, "<pre><code");
+
+    /* If known, output the HTML 5 attribute class="language-LANGNAME". */
+    if(det->lang.text != NULL) {
+        RENDER_VERBATIM(r, " class=\"language-");
+        render_attribute(r, &det->lang, render_html_escaped);
+        RENDER_VERBATIM(r, "\"");
+    }
+
+    RENDER_VERBATIM(r, ">");
+}
+
+static void
+render_open_td_block(MD_HTML* r, const MD_CHAR* cell_type, const MD_BLOCK_TD_DETAIL* det)
+{
+    RENDER_VERBATIM(r, "<");
+    RENDER_VERBATIM(r, cell_type);
+
+    switch(det->align) {
+        case MD_ALIGN_LEFT:     RENDER_VERBATIM(r, " align=\"left\">"); break;
+        case MD_ALIGN_CENTER:   RENDER_VERBATIM(r, " align=\"center\">"); break;
+        case MD_ALIGN_RIGHT:    RENDER_VERBATIM(r, " align=\"right\">"); break;
+        default:                RENDER_VERBATIM(r, ">"); break;
+    }
+}
+
+static void
+render_open_a_span(MD_HTML* r, const MD_SPAN_A_DETAIL* det)
+{
+    RENDER_VERBATIM(r, "<a href=\"");
+    render_attribute(r, &det->href, render_url_escaped);
+
+    if(det->title.text != NULL) {
+        RENDER_VERBATIM(r, "\" title=\"");
+        render_attribute(r, &det->title, render_html_escaped);
+    }
+
+    RENDER_VERBATIM(r, "\">");
+}
+
+static void
+render_open_img_span(MD_HTML* r, const MD_SPAN_IMG_DETAIL* det)
+{
+    RENDER_VERBATIM(r, "<img src=\"");
+    render_attribute(r, &det->src, render_url_escaped);
+
+    RENDER_VERBATIM(r, "\" alt=\"");
+
+    r->image_nesting_level++;
+}
+
+static void
+render_close_img_span(MD_HTML* r, const MD_SPAN_IMG_DETAIL* det)
+{
+    if(det->title.text != NULL) {
+        RENDER_VERBATIM(r, "\" title=\"");
+        render_attribute(r, &det->title, render_html_escaped);
+    }
+
+    RENDER_VERBATIM(r, (r->flags & MD_HTML_FLAG_XHTML) ? "\" />" : "\">");
+
+    r->image_nesting_level--;
+}
+
+static void
+render_open_wikilink_span(MD_HTML* r, const MD_SPAN_WIKILINK_DETAIL* det)
+{
+    RENDER_VERBATIM(r, "<x-wikilink data-target=\"");
+    render_attribute(r, &det->target, render_html_escaped);
+
+    RENDER_VERBATIM(r, "\">");
+}
+
+
+/**************************************
+ ***  HTML renderer implementation  ***
+ **************************************/
+
+static int
+enter_block_callback(MD_BLOCKTYPE type, void* detail, void* userdata)
+{
+    static const MD_CHAR* head[6] = { "<h1>", "<h2>", "<h3>", "<h4>", "<h5>", "<h6>" };
+    MD_HTML* r = (MD_HTML*) userdata;
+
+    switch(type) {
+        case MD_BLOCK_DOC:      /* noop */ break;
+        case MD_BLOCK_QUOTE:    RENDER_VERBATIM(r, "<blockquote>\n"); break;
+        case MD_BLOCK_UL:       RENDER_VERBATIM(r, "<ul>\n"); break;
+        case MD_BLOCK_OL:       render_open_ol_block(r, (const MD_BLOCK_OL_DETAIL*)detail); break;
+        case MD_BLOCK_LI:       render_open_li_block(r, (const MD_BLOCK_LI_DETAIL*)detail); break;
+        case MD_BLOCK_HR:       RENDER_VERBATIM(r, (r->flags & MD_HTML_FLAG_XHTML) ? "<hr />\n" : "<hr>\n"); break;
+        case MD_BLOCK_H:        RENDER_VERBATIM(r, head[((MD_BLOCK_H_DETAIL*)detail)->level - 1]); break;
+        case MD_BLOCK_CODE:     render_open_code_block(r, (const MD_BLOCK_CODE_DETAIL*) detail); break;
+        case MD_BLOCK_HTML:     /* noop */ break;
+        case MD_BLOCK_P:        RENDER_VERBATIM(r, "<p>"); break;
+        case MD_BLOCK_TABLE:    RENDER_VERBATIM(r, "<table>\n"); break;
+        case MD_BLOCK_THEAD:    RENDER_VERBATIM(r, "<thead>\n"); break;
+        case MD_BLOCK_TBODY:    RENDER_VERBATIM(r, "<tbody>\n"); break;
+        case MD_BLOCK_TR:       RENDER_VERBATIM(r, "<tr>\n"); break;
+        case MD_BLOCK_TH:       render_open_td_block(r, "th", (MD_BLOCK_TD_DETAIL*)detail); break;
+        case MD_BLOCK_TD:       render_open_td_block(r, "td", (MD_BLOCK_TD_DETAIL*)detail); break;
+    }
+
+    return 0;
+}
+
+static int
+leave_block_callback(MD_BLOCKTYPE type, void* detail, void* userdata)
+{
+    static const MD_CHAR* head[6] = { "</h1>\n", "</h2>\n", "</h3>\n", "</h4>\n", "</h5>\n", "</h6>\n" };
+    MD_HTML* r = (MD_HTML*) userdata;
+
+    switch(type) {
+        case MD_BLOCK_DOC:      /*noop*/ break;
+        case MD_BLOCK_QUOTE:    RENDER_VERBATIM(r, "</blockquote>\n"); break;
+        case MD_BLOCK_UL:       RENDER_VERBATIM(r, "</ul>\n"); break;
+        case MD_BLOCK_OL:       RENDER_VERBATIM(r, "</ol>\n"); break;
+        case MD_BLOCK_LI:       RENDER_VERBATIM(r, "</li>\n"); break;
+        case MD_BLOCK_HR:       /*noop*/ break;
+        case MD_BLOCK_H:        RENDER_VERBATIM(r, head[((MD_BLOCK_H_DETAIL*)detail)->level - 1]); break;
+        case MD_BLOCK_CODE:     RENDER_VERBATIM(r, "</code></pre>\n"); break;
+        case MD_BLOCK_HTML:     /* noop */ break;
+        case MD_BLOCK_P:        RENDER_VERBATIM(r, "</p>\n"); break;
+        case MD_BLOCK_TABLE:    RENDER_VERBATIM(r, "</table>\n"); break;
+        case MD_BLOCK_THEAD:    RENDER_VERBATIM(r, "</thead>\n"); break;
+        case MD_BLOCK_TBODY:    RENDER_VERBATIM(r, "</tbody>\n"); break;
+        case MD_BLOCK_TR:       RENDER_VERBATIM(r, "</tr>\n"); break;
+        case MD_BLOCK_TH:       RENDER_VERBATIM(r, "</th>\n"); break;
+        case MD_BLOCK_TD:       RENDER_VERBATIM(r, "</td>\n"); break;
+    }
+
+    return 0;
+}
+
+static int
+enter_span_callback(MD_SPANTYPE type, void* detail, void* userdata)
+{
+    MD_HTML* r = (MD_HTML*) userdata;
+
+    if(r->image_nesting_level > 0) {
+        /* We are inside a Markdown image label. Markdown allows to use any
+         * emphasis and other rich contents in that context similarly as in
+         * any link label.
+         *
+         * However, unlike in the case of links (where that contents becomes
+         * contents of the <a>...</a> tag), in the case of images the contents
+         * is supposed to fall into the attribute alt: <img alt="...">.
+         *
+         * In that context we naturally cannot output nested HTML tags. So lets
+         * suppress them and only output the plain text (i.e. what falls into
+         * text() callback).
+         *
+         * This make-it-a-plain-text approach is the recommended practice by
+         * CommonMark specification (for HTML output).
+         */
+        return 0;
+    }
+
+    switch(type) {
+        case MD_SPAN_EM:                RENDER_VERBATIM(r, "<em>"); break;
+        case MD_SPAN_STRONG:            RENDER_VERBATIM(r, "<strong>"); break;
+        case MD_SPAN_U:                 RENDER_VERBATIM(r, "<u>"); break;
+        case MD_SPAN_A:                 render_open_a_span(r, (MD_SPAN_A_DETAIL*) detail); break;
+        case MD_SPAN_IMG:               render_open_img_span(r, (MD_SPAN_IMG_DETAIL*) detail); break;
+        case MD_SPAN_CODE:              RENDER_VERBATIM(r, "<code>"); break;
+        case MD_SPAN_DEL:               RENDER_VERBATIM(r, "<del>"); break;
+        case MD_SPAN_LATEXMATH:         RENDER_VERBATIM(r, "<x-equation>"); break;
+        case MD_SPAN_LATEXMATH_DISPLAY: RENDER_VERBATIM(r, "<x-equation type=\"display\">"); break;
+        case MD_SPAN_WIKILINK:          render_open_wikilink_span(r, (MD_SPAN_WIKILINK_DETAIL*) detail); break;
+    }
+
+    return 0;
+}
+
+static int
+leave_span_callback(MD_SPANTYPE type, void* detail, void* userdata)
+{
+    MD_HTML* r = (MD_HTML*) userdata;
+
+    if(r->image_nesting_level > 0) {
+        /* Ditto as in enter_span_callback(), except we have to allow the
+         * end of the <img> tag. */
+        if(r->image_nesting_level == 1  &&  type == MD_SPAN_IMG)
+            render_close_img_span(r, (MD_SPAN_IMG_DETAIL*) detail);
+        return 0;
+    }
+
+    switch(type) {
+        case MD_SPAN_EM:                RENDER_VERBATIM(r, "</em>"); break;
+        case MD_SPAN_STRONG:            RENDER_VERBATIM(r, "</strong>"); break;
+        case MD_SPAN_U:                 RENDER_VERBATIM(r, "</u>"); break;
+        case MD_SPAN_A:                 RENDER_VERBATIM(r, "</a>"); break;
+        case MD_SPAN_IMG:               /*noop, handled above*/ break;
+        case MD_SPAN_CODE:              RENDER_VERBATIM(r, "</code>"); break;
+        case MD_SPAN_DEL:               RENDER_VERBATIM(r, "</del>"); break;
+        case MD_SPAN_LATEXMATH:         /*fall through*/
+        case MD_SPAN_LATEXMATH_DISPLAY: RENDER_VERBATIM(r, "</x-equation>"); break;
+        case MD_SPAN_WIKILINK:          RENDER_VERBATIM(r, "</x-wikilink>"); break;
+    }
+
+    return 0;
+}
+
+static int
+text_callback(MD_TEXTTYPE type, const MD_CHAR* text, MD_SIZE size, void* userdata)
+{
+    MD_HTML* r = (MD_HTML*) userdata;
+
+    switch(type) {
+        case MD_TEXT_NULLCHAR:  render_utf8_codepoint(r, 0x0000, render_verbatim); break;
+        case MD_TEXT_BR:        RENDER_VERBATIM(r, (r->image_nesting_level == 0
+                                        ? ((r->flags & MD_HTML_FLAG_XHTML) ? "<br />\n" : "<br>\n")
+                                        : " "));
+                                break;
+        case MD_TEXT_SOFTBR:    RENDER_VERBATIM(r, (r->image_nesting_level == 0 ? "\n" : " ")); break;
+        case MD_TEXT_HTML:      render_verbatim(r, text, size); break;
+        case MD_TEXT_ENTITY:    render_entity(r, text, size, render_html_escaped); break;
+        default:                render_html_escaped(r, text, size); break;
+    }
+
+    return 0;
+}
+
+static void
+debug_log_callback(const char* msg, void* userdata)
+{
+    MD_HTML* r = (MD_HTML*) userdata;
+    if(r->flags & MD_HTML_FLAG_DEBUG)
+        fprintf(stderr, "MD4C: %s\n", msg);
+}
+
+int
+md_html(const MD_CHAR* input, MD_SIZE input_size,
+        void (*process_output)(const MD_CHAR*, MD_SIZE, void*),
+        void* userdata, unsigned parser_flags, unsigned renderer_flags)
+{
+    MD_HTML render = { process_output, userdata, renderer_flags, 0, { 0 } };
+    int i;
+
+    MD_PARSER parser = {
+        0,
+        parser_flags,
+        enter_block_callback,
+        leave_block_callback,
+        enter_span_callback,
+        leave_span_callback,
+        text_callback,
+        debug_log_callback,
+        NULL
+    };
+
+    /* Build map of characters which need escaping. */
+    for(i = 0; i < 256; i++) {
+        unsigned char ch = (unsigned char) i;
+
+        if(strchr("\"&<>", ch) != NULL)
+            render.escape_map[i] |= NEED_HTML_ESC_FLAG;
+
+        if(!ISALNUM(ch)  &&  strchr("~-_.+!*(),%#@?=;:/,+$", ch) == NULL)
+            render.escape_map[i] |= NEED_URL_ESC_FLAG;
+    }
+
+    /* Consider skipping UTF-8 byte order mark (BOM). */
+    if(renderer_flags & MD_HTML_FLAG_SKIP_UTF8_BOM  &&  sizeof(MD_CHAR) == 1) {
+        static const MD_CHAR bom[3] = { 0xef, 0xbb, 0xbf };
+        if(input_size >= sizeof(bom)  &&  memcmp(input, bom, sizeof(bom)) == 0) {
+            input += sizeof(bom);
+            input_size -= sizeof(bom);
+        }
+    }
+
+    return md_parse(input, input_size, &parser, (void*) &render);
+}
+
diff --git a/tdemarkdown/md4c/src/md4c-html.h b/tdemarkdown/md4c/src/md4c-html.h
new file mode 100644
index 000000000..23d3f7396
--- /dev/null
+++ b/tdemarkdown/md4c/src/md4c-html.h
@@ -0,0 +1,68 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2017 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef MD4C_HTML_H
+#define MD4C_HTML_H
+
+#include "md4c.h"
+
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+
+/* If set, debug output from md_parse() is sent to stderr. */
+#define MD_HTML_FLAG_DEBUG                  0x0001
+#define MD_HTML_FLAG_VERBATIM_ENTITIES      0x0002
+#define MD_HTML_FLAG_SKIP_UTF8_BOM          0x0004
+#define MD_HTML_FLAG_XHTML                  0x0008
+
+
+/* Render Markdown into HTML.
+ *
+ * Note only contents of <body> tag is generated. Caller must generate
+ * HTML header/footer manually before/after calling md_html().
+ *
+ * Params input and input_size specify the Markdown input.
+ * Callback process_output() gets called with chunks of HTML output.
+ * (Typical implementation may just output the bytes to a file or append to
+ * some buffer).
+ * Param userdata is just propagated back to process_output() callback.
+ * Param parser_flags are flags from md4c.h propagated to md_parse().
+ * Param render_flags is bitmask of MD_HTML_FLAG_xxxx.
+ *
+ * Returns -1 on error (if md_parse() fails.)
+ * Returns 0 on success.
+ */
+int md_html(const MD_CHAR* input, MD_SIZE input_size,
+            void (*process_output)(const MD_CHAR*, MD_SIZE, void*),
+            void* userdata, unsigned parser_flags, unsigned renderer_flags);
+
+
+#ifdef __cplusplus
+    }  /* extern "C" { */
+#endif
+
+#endif  /* MD4C_HTML_H */
diff --git a/tdemarkdown/md4c/src/md4c-html.pc.in b/tdemarkdown/md4c/src/md4c-html.pc.in
new file mode 100644
index 000000000..504bb52ea
--- /dev/null
+++ b/tdemarkdown/md4c/src/md4c-html.pc.in
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@ HTML renderer
+Description: Markdown to HTML converter library.
+Version: @PROJECT_VERSION@
+URL: @PROJECT_URL@
+
+Requires: md4c = @PROJECT_VERSION@
+Libs: -L${libdir} -lmd4c-html
+Cflags: -I${includedir}
diff --git a/tdemarkdown/md4c/src/md4c.c b/tdemarkdown/md4c/src/md4c.c
new file mode 100644
index 000000000..3677c0e06
--- /dev/null
+++ b/tdemarkdown/md4c/src/md4c.c
@@ -0,0 +1,6410 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2020 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "md4c.h"
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/*****************************
+ ***  Miscellaneous Stuff  ***
+ *****************************/
+
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199409L
+    /* C89/90 or old compilers in general may not understand "inline". */
+    #if defined __GNUC__
+        #define inline __inline__
+    #elif defined _MSC_VER
+        #define inline __inline
+    #else
+        #define inline
+    #endif
+#endif
+
+/* Make the UTF-8 support the default. */
+#if !defined MD4C_USE_ASCII && !defined MD4C_USE_UTF8 && !defined MD4C_USE_UTF16
+    #define MD4C_USE_UTF8
+#endif
+
+/* Magic for making wide literals with MD4C_USE_UTF16. */
+#ifdef _T
+    #undef _T
+#endif
+#if defined MD4C_USE_UTF16
+    #define _T(x)           L##x
+#else
+    #define _T(x)           x
+#endif
+
+/* Misc. macros. */
+#define SIZEOF_ARRAY(a)     (sizeof(a) / sizeof(a[0]))
+
+#define STRINGIZE_(x)       #x
+#define STRINGIZE(x)        STRINGIZE_(x)
+
+#ifndef TRUE
+    #define TRUE            1
+    #define FALSE           0
+#endif
+
+#define MD_LOG(msg)                                                     \
+    do {                                                                \
+        if(ctx->parser.debug_log != NULL)                               \
+            ctx->parser.debug_log((msg), ctx->userdata);                \
+    } while(0)
+
+#ifdef DEBUG
+    #define MD_ASSERT(cond)                                             \
+            do {                                                        \
+                if(!(cond)) {                                           \
+                    MD_LOG(__FILE__ ":" STRINGIZE(__LINE__) ": "        \
+                           "Assertion '" STRINGIZE(cond) "' failed.");  \
+                    exit(1);                                            \
+                }                                                       \
+            } while(0)
+
+    #define MD_UNREACHABLE()        MD_ASSERT(1 == 0)
+#else
+    #ifdef __GNUC__
+        #define MD_ASSERT(cond)     do { if(!(cond)) __builtin_unreachable(); } while(0)
+        #define MD_UNREACHABLE()    do { __builtin_unreachable(); } while(0)
+    #elif defined _MSC_VER  &&  _MSC_VER > 120
+        #define MD_ASSERT(cond)     do { __assume(cond); } while(0)
+        #define MD_UNREACHABLE()    do { __assume(0); } while(0)
+    #else
+        #define MD_ASSERT(cond)     do {} while(0)
+        #define MD_UNREACHABLE()    do {} while(0)
+    #endif
+#endif
+
+/* For falling through case labels in switch statements. */
+#if defined __clang__ && __clang_major__ >= 12
+    #define MD_FALLTHROUGH()        __attribute__((fallthrough))
+#elif defined __GNUC__ && __GNUC__ >= 7
+    #define MD_FALLTHROUGH()        __attribute__((fallthrough))
+#else
+    #define MD_FALLTHROUGH()        ((void)0)
+#endif
+
+/* Suppress "unused parameter" warnings. */
+#define MD_UNUSED(x)                ((void)x)
+
+
+/************************
+ ***  Internal Types  ***
+ ************************/
+
+/* These are omnipresent so lets save some typing. */
+#define CHAR    MD_CHAR
+#define SZ      MD_SIZE
+#define OFF     MD_OFFSET
+
+typedef struct MD_MARK_tag MD_MARK;
+typedef struct MD_BLOCK_tag MD_BLOCK;
+typedef struct MD_CONTAINER_tag MD_CONTAINER;
+typedef struct MD_REF_DEF_tag MD_REF_DEF;
+
+
+/* During analyzes of inline marks, we need to manage some "mark chains",
+ * of (yet unresolved) openers. This structure holds start/end of the chain.
+ * The chain internals are then realized through MD_MARK::prev and ::next.
+ */
+typedef struct MD_MARKCHAIN_tag MD_MARKCHAIN;
+struct MD_MARKCHAIN_tag {
+    int head;   /* Index of first mark in the chain, or -1 if empty. */
+    int tail;   /* Index of last mark in the chain, or -1 if empty. */
+};
+
+/* Context propagated through all the parsing. */
+typedef struct MD_CTX_tag MD_CTX;
+struct MD_CTX_tag {
+    /* Immutable stuff (parameters of md_parse()). */
+    const CHAR* text;
+    SZ size;
+    MD_PARSER parser;
+    void* userdata;
+
+    /* When this is true, it allows some optimizations. */
+    int doc_ends_with_newline;
+
+    /* Helper temporary growing buffer. */
+    CHAR* buffer;
+    unsigned alloc_buffer;
+
+    /* Reference definitions. */
+    MD_REF_DEF* ref_defs;
+    int n_ref_defs;
+    int alloc_ref_defs;
+    void** ref_def_hashtable;
+    int ref_def_hashtable_size;
+
+    /* Stack of inline/span markers.
+     * This is only used for parsing a single block contents but by storing it
+     * here we may reuse the stack for subsequent blocks; i.e. we have fewer
+     * (re)allocations. */
+    MD_MARK* marks;
+    int n_marks;
+    int alloc_marks;
+
+#if defined MD4C_USE_UTF16
+    char mark_char_map[128];
+#else
+    char mark_char_map[256];
+#endif
+
+    /* For resolving of inline spans. */
+    MD_MARKCHAIN mark_chains[13];
+#define PTR_CHAIN                               (ctx->mark_chains[0])
+#define TABLECELLBOUNDARIES                     (ctx->mark_chains[1])
+#define ASTERISK_OPENERS_extraword_mod3_0       (ctx->mark_chains[2])
+#define ASTERISK_OPENERS_extraword_mod3_1       (ctx->mark_chains[3])
+#define ASTERISK_OPENERS_extraword_mod3_2       (ctx->mark_chains[4])
+#define ASTERISK_OPENERS_intraword_mod3_0       (ctx->mark_chains[5])
+#define ASTERISK_OPENERS_intraword_mod3_1       (ctx->mark_chains[6])
+#define ASTERISK_OPENERS_intraword_mod3_2       (ctx->mark_chains[7])
+#define UNDERSCORE_OPENERS                      (ctx->mark_chains[8])
+#define TILDE_OPENERS_1                         (ctx->mark_chains[9])
+#define TILDE_OPENERS_2                         (ctx->mark_chains[10])
+#define BRACKET_OPENERS                         (ctx->mark_chains[11])
+#define DOLLAR_OPENERS                          (ctx->mark_chains[12])
+#define OPENERS_CHAIN_FIRST                     1
+#define OPENERS_CHAIN_LAST                      12
+
+    int n_table_cell_boundaries;
+
+    /* For resolving links. */
+    int unresolved_link_head;
+    int unresolved_link_tail;
+
+    /* For resolving raw HTML. */
+    OFF html_comment_horizon;
+    OFF html_proc_instr_horizon;
+    OFF html_decl_horizon;
+    OFF html_cdata_horizon;
+
+    /* For block analysis.
+     * Notes:
+     *   -- It holds MD_BLOCK as well as MD_LINE structures. After each
+     *      MD_BLOCK, its (multiple) MD_LINE(s) follow.
+     *   -- For MD_BLOCK_HTML and MD_BLOCK_CODE, MD_VERBATIMLINE(s) are used
+     *      instead of MD_LINE(s).
+     */
+    void* block_bytes;
+    MD_BLOCK* current_block;
+    int n_block_bytes;
+    int alloc_block_bytes;
+
+    /* For container block analysis. */
+    MD_CONTAINER* containers;
+    int n_containers;
+    int alloc_containers;
+
+    /* Minimal indentation to call the block "indented code block". */
+    unsigned code_indent_offset;
+
+    /* Contextual info for line analysis. */
+    SZ code_fence_length;   /* For checking closing fence length. */
+    int html_block_type;    /* For checking closing raw HTML condition. */
+    int last_line_has_list_loosening_effect;
+    int last_list_item_starts_with_two_blank_lines;
+};
+
+enum MD_LINETYPE_tag {
+    MD_LINE_BLANK,
+    MD_LINE_HR,
+    MD_LINE_ATXHEADER,
+    MD_LINE_SETEXTHEADER,
+    MD_LINE_SETEXTUNDERLINE,
+    MD_LINE_INDENTEDCODE,
+    MD_LINE_FENCEDCODE,
+    MD_LINE_HTML,
+    MD_LINE_TEXT,
+    MD_LINE_TABLE,
+    MD_LINE_TABLEUNDERLINE
+};
+typedef enum MD_LINETYPE_tag MD_LINETYPE;
+
+typedef struct MD_LINE_ANALYSIS_tag MD_LINE_ANALYSIS;
+struct MD_LINE_ANALYSIS_tag {
+    MD_LINETYPE type    : 16;
+    unsigned data       : 16;
+    OFF beg;
+    OFF end;
+    unsigned indent;        /* Indentation level. */
+};
+
+typedef struct MD_LINE_tag MD_LINE;
+struct MD_LINE_tag {
+    OFF beg;
+    OFF end;
+};
+
+typedef struct MD_VERBATIMLINE_tag MD_VERBATIMLINE;
+struct MD_VERBATIMLINE_tag {
+    OFF beg;
+    OFF end;
+    OFF indent;
+};
+
+
+/*****************
+ ***  Helpers  ***
+ *****************/
+
+/* Character accessors. */
+#define CH(off)                 (ctx->text[(off)])
+#define STR(off)                (ctx->text + (off))
+
+/* Character classification.
+ * Note we assume ASCII compatibility of code points < 128 here. */
+#define ISIN_(ch, ch_min, ch_max)       ((ch_min) <= (unsigned)(ch) && (unsigned)(ch) <= (ch_max))
+#define ISANYOF_(ch, palette)           ((ch) != _T('\0')  &&  md_strchr((palette), (ch)) != NULL)
+#define ISANYOF2_(ch, ch1, ch2)         ((ch) == (ch1) || (ch) == (ch2))
+#define ISANYOF3_(ch, ch1, ch2, ch3)    ((ch) == (ch1) || (ch) == (ch2) || (ch) == (ch3))
+#define ISASCII_(ch)                    ((unsigned)(ch) <= 127)
+#define ISBLANK_(ch)                    (ISANYOF2_((ch), _T(' '), _T('\t')))
+#define ISNEWLINE_(ch)                  (ISANYOF2_((ch), _T('\r'), _T('\n')))
+#define ISWHITESPACE_(ch)               (ISBLANK_(ch) || ISANYOF2_((ch), _T('\v'), _T('\f')))
+#define ISCNTRL_(ch)                    ((unsigned)(ch) <= 31 || (unsigned)(ch) == 127)
+#define ISPUNCT_(ch)                    (ISIN_(ch, 33, 47) || ISIN_(ch, 58, 64) || ISIN_(ch, 91, 96) || ISIN_(ch, 123, 126))
+#define ISUPPER_(ch)                    (ISIN_(ch, _T('A'), _T('Z')))
+#define ISLOWER_(ch)                    (ISIN_(ch, _T('a'), _T('z')))
+#define ISALPHA_(ch)                    (ISUPPER_(ch) || ISLOWER_(ch))
+#define ISDIGIT_(ch)                    (ISIN_(ch, _T('0'), _T('9')))
+#define ISXDIGIT_(ch)                   (ISDIGIT_(ch) || ISIN_(ch, _T('A'), _T('F')) || ISIN_(ch, _T('a'), _T('f')))
+#define ISALNUM_(ch)                    (ISALPHA_(ch) || ISDIGIT_(ch))
+
+#define ISANYOF(off, palette)           ISANYOF_(CH(off), (palette))
+#define ISANYOF2(off, ch1, ch2)         ISANYOF2_(CH(off), (ch1), (ch2))
+#define ISANYOF3(off, ch1, ch2, ch3)    ISANYOF3_(CH(off), (ch1), (ch2), (ch3))
+#define ISASCII(off)                    ISASCII_(CH(off))
+#define ISBLANK(off)                    ISBLANK_(CH(off))
+#define ISNEWLINE(off)                  ISNEWLINE_(CH(off))
+#define ISWHITESPACE(off)               ISWHITESPACE_(CH(off))
+#define ISCNTRL(off)                    ISCNTRL_(CH(off))
+#define ISPUNCT(off)                    ISPUNCT_(CH(off))
+#define ISUPPER(off)                    ISUPPER_(CH(off))
+#define ISLOWER(off)                    ISLOWER_(CH(off))
+#define ISALPHA(off)                    ISALPHA_(CH(off))
+#define ISDIGIT(off)                    ISDIGIT_(CH(off))
+#define ISXDIGIT(off)                   ISXDIGIT_(CH(off))
+#define ISALNUM(off)                    ISALNUM_(CH(off))
+
+
+#if defined MD4C_USE_UTF16
+    #define md_strchr wcschr
+#else
+    #define md_strchr strchr
+#endif
+
+
+/* Case insensitive check of string equality. */
+static inline int
+md_ascii_case_eq(const CHAR* s1, const CHAR* s2, SZ n)
+{
+    OFF i;
+    for(i = 0; i < n; i++) {
+        CHAR ch1 = s1[i];
+        CHAR ch2 = s2[i];
+
+        if(ISLOWER_(ch1))
+            ch1 += ('A'-'a');
+        if(ISLOWER_(ch2))
+            ch2 += ('A'-'a');
+        if(ch1 != ch2)
+            return FALSE;
+    }
+    return TRUE;
+}
+
+static inline int
+md_ascii_eq(const CHAR* s1, const CHAR* s2, SZ n)
+{
+    return memcmp(s1, s2, n * sizeof(CHAR)) == 0;
+}
+
+static int
+md_text_with_null_replacement(MD_CTX* ctx, MD_TEXTTYPE type, const CHAR* str, SZ size)
+{
+    OFF off = 0;
+    int ret = 0;
+
+    while(1) {
+        while(off < size  &&  str[off] != _T('\0'))
+            off++;
+
+        if(off > 0) {
+            ret = ctx->parser.text(type, str, off, ctx->userdata);
+            if(ret != 0)
+                return ret;
+
+            str += off;
+            size -= off;
+            off = 0;
+        }
+
+        if(off >= size)
+            return 0;
+
+        ret = ctx->parser.text(MD_TEXT_NULLCHAR, _T(""), 1, ctx->userdata);
+        if(ret != 0)
+            return ret;
+        off++;
+    }
+}
+
+
+#define MD_CHECK(func)                                                      \
+    do {                                                                    \
+        ret = (func);                                                       \
+        if(ret < 0)                                                         \
+            goto abort;                                                     \
+    } while(0)
+
+
+#define MD_TEMP_BUFFER(sz)                                                  \
+    do {                                                                    \
+        if(sz > ctx->alloc_buffer) {                                        \
+            CHAR* new_buffer;                                               \
+            SZ new_size = ((sz) + (sz) / 2 + 128) & ~127;                   \
+                                                                            \
+            new_buffer = realloc(ctx->buffer, new_size);                    \
+            if(new_buffer == NULL) {                                        \
+                MD_LOG("realloc() failed.");                                \
+                ret = -1;                                                   \
+                goto abort;                                                 \
+            }                                                               \
+                                                                            \
+            ctx->buffer = new_buffer;                                       \
+            ctx->alloc_buffer = new_size;                                   \
+        }                                                                   \
+    } while(0)
+
+
+#define MD_ENTER_BLOCK(type, arg)                                           \
+    do {                                                                    \
+        ret = ctx->parser.enter_block((type), (arg), ctx->userdata);        \
+        if(ret != 0) {                                                      \
+            MD_LOG("Aborted from enter_block() callback.");                 \
+            goto abort;                                                     \
+        }                                                                   \
+    } while(0)
+
+#define MD_LEAVE_BLOCK(type, arg)                                           \
+    do {                                                                    \
+        ret = ctx->parser.leave_block((type), (arg), ctx->userdata);        \
+        if(ret != 0) {                                                      \
+            MD_LOG("Aborted from leave_block() callback.");                 \
+            goto abort;                                                     \
+        }                                                                   \
+    } while(0)
+
+#define MD_ENTER_SPAN(type, arg)                                            \
+    do {                                                                    \
+        ret = ctx->parser.enter_span((type), (arg), ctx->userdata);         \
+        if(ret != 0) {                                                      \
+            MD_LOG("Aborted from enter_span() callback.");                  \
+            goto abort;                                                     \
+        }                                                                   \
+    } while(0)
+
+#define MD_LEAVE_SPAN(type, arg)                                            \
+    do {                                                                    \
+        ret = ctx->parser.leave_span((type), (arg), ctx->userdata);         \
+        if(ret != 0) {                                                      \
+            MD_LOG("Aborted from leave_span() callback.");                  \
+            goto abort;                                                     \
+        }                                                                   \
+    } while(0)
+
+#define MD_TEXT(type, str, size)                                            \
+    do {                                                                    \
+        if(size > 0) {                                                      \
+            ret = ctx->parser.text((type), (str), (size), ctx->userdata);   \
+            if(ret != 0) {                                                  \
+                MD_LOG("Aborted from text() callback.");                    \
+                goto abort;                                                 \
+            }                                                               \
+        }                                                                   \
+    } while(0)
+
+#define MD_TEXT_INSECURE(type, str, size)                                   \
+    do {                                                                    \
+        if(size > 0) {                                                      \
+            ret = md_text_with_null_replacement(ctx, type, str, size);      \
+            if(ret != 0) {                                                  \
+                MD_LOG("Aborted from text() callback.");                    \
+                goto abort;                                                 \
+            }                                                               \
+        }                                                                   \
+    } while(0)
+
+
+/* If the offset falls into a gap between line, we return the following
+ * line. */
+static const MD_LINE*
+md_lookup_line(OFF off, const MD_LINE* lines, int n_lines)
+{
+    int lo, hi;
+    int pivot;
+    const MD_LINE* line;
+
+    lo = 0;
+    hi = n_lines - 1;
+    while(lo <= hi) {
+        pivot = (lo + hi) / 2;
+        line = &lines[pivot];
+
+        if(off < line->beg) {
+            hi = pivot - 1;
+            if(hi < 0  ||  lines[hi].end <= off)
+                return line;
+        } else if(off > line->end) {
+            lo = pivot + 1;
+        } else {
+            return line;
+        }
+    }
+
+    return NULL;
+}
+
+
+/*************************
+ ***  Unicode Support  ***
+ *************************/
+
+typedef struct MD_UNICODE_FOLD_INFO_tag MD_UNICODE_FOLD_INFO;
+struct MD_UNICODE_FOLD_INFO_tag {
+    unsigned codepoints[3];
+    unsigned n_codepoints;
+};
+
+
+#if defined MD4C_USE_UTF16 || defined MD4C_USE_UTF8
+    /* Binary search over sorted "map" of codepoints. Consecutive sequences
+     * of codepoints may be encoded in the map by just using the
+     * (MIN_CODEPOINT | 0x40000000) and (MAX_CODEPOINT | 0x80000000).
+     *
+     * Returns index of the found record in the map (in the case of ranges,
+     * the minimal value is used); or -1 on failure. */
+    static int
+    md_unicode_bsearch__(unsigned codepoint, const unsigned* map, size_t map_size)
+    {
+        int beg, end;
+        int pivot_beg, pivot_end;
+
+        beg = 0;
+        end = (int) map_size-1;
+        while(beg <= end) {
+            /* Pivot may be a range, not just a single value. */
+            pivot_beg = pivot_end = (beg + end) / 2;
+            if(map[pivot_end] & 0x40000000)
+                pivot_end++;
+            if(map[pivot_beg] & 0x80000000)
+                pivot_beg--;
+
+            if(codepoint < (map[pivot_beg] & 0x00ffffff))
+                end = pivot_beg - 1;
+            else if(codepoint > (map[pivot_end] & 0x00ffffff))
+                beg = pivot_end + 1;
+            else
+                return pivot_beg;
+        }
+
+        return -1;
+    }
+
+    static int
+    md_is_unicode_whitespace__(unsigned codepoint)
+    {
+#define R(cp_min, cp_max)   ((cp_min) | 0x40000000), ((cp_max) | 0x80000000)
+#define S(cp)               (cp)
+        /* Unicode "Zs" category.
+         * (generated by scripts/build_whitespace_map.py) */
+        static const unsigned WHITESPACE_MAP[] = {
+            S(0x0020), S(0x00a0), S(0x1680), R(0x2000,0x200a), S(0x202f), S(0x205f), S(0x3000)
+        };
+#undef R
+#undef S
+
+        /* The ASCII ones are the most frequently used ones, also CommonMark
+         * specification requests few more in this range. */
+        if(codepoint <= 0x7f)
+            return ISWHITESPACE_(codepoint);
+
+        return (md_unicode_bsearch__(codepoint, WHITESPACE_MAP, SIZEOF_ARRAY(WHITESPACE_MAP)) >= 0);
+    }
+
+    static int
+    md_is_unicode_punct__(unsigned codepoint)
+    {
+#define R(cp_min, cp_max)   ((cp_min) | 0x40000000), ((cp_max) | 0x80000000)
+#define S(cp)               (cp)
+        /* Unicode "Pc", "Pd", "Pe", "Pf", "Pi", "Po", "Ps" categories.
+         * (generated by scripts/build_punct_map.py) */
+        static const unsigned PUNCT_MAP[] = {
+            R(0x0021,0x0023), R(0x0025,0x002a), R(0x002c,0x002f), R(0x003a,0x003b), R(0x003f,0x0040),
+            R(0x005b,0x005d), S(0x005f), S(0x007b), S(0x007d), S(0x00a1), S(0x00a7), S(0x00ab), R(0x00b6,0x00b7),
+            S(0x00bb), S(0x00bf), S(0x037e), S(0x0387), R(0x055a,0x055f), R(0x0589,0x058a), S(0x05be), S(0x05c0),
+            S(0x05c3), S(0x05c6), R(0x05f3,0x05f4), R(0x0609,0x060a), R(0x060c,0x060d), S(0x061b), R(0x061e,0x061f),
+            R(0x066a,0x066d), S(0x06d4), R(0x0700,0x070d), R(0x07f7,0x07f9), R(0x0830,0x083e), S(0x085e),
+            R(0x0964,0x0965), S(0x0970), S(0x09fd), S(0x0a76), S(0x0af0), S(0x0c77), S(0x0c84), S(0x0df4), S(0x0e4f),
+            R(0x0e5a,0x0e5b), R(0x0f04,0x0f12), S(0x0f14), R(0x0f3a,0x0f3d), S(0x0f85), R(0x0fd0,0x0fd4),
+            R(0x0fd9,0x0fda), R(0x104a,0x104f), S(0x10fb), R(0x1360,0x1368), S(0x1400), S(0x166e), R(0x169b,0x169c),
+            R(0x16eb,0x16ed), R(0x1735,0x1736), R(0x17d4,0x17d6), R(0x17d8,0x17da), R(0x1800,0x180a),
+            R(0x1944,0x1945), R(0x1a1e,0x1a1f), R(0x1aa0,0x1aa6), R(0x1aa8,0x1aad), R(0x1b5a,0x1b60),
+            R(0x1bfc,0x1bff), R(0x1c3b,0x1c3f), R(0x1c7e,0x1c7f), R(0x1cc0,0x1cc7), S(0x1cd3), R(0x2010,0x2027),
+            R(0x2030,0x2043), R(0x2045,0x2051), R(0x2053,0x205e), R(0x207d,0x207e), R(0x208d,0x208e),
+            R(0x2308,0x230b), R(0x2329,0x232a), R(0x2768,0x2775), R(0x27c5,0x27c6), R(0x27e6,0x27ef),
+            R(0x2983,0x2998), R(0x29d8,0x29db), R(0x29fc,0x29fd), R(0x2cf9,0x2cfc), R(0x2cfe,0x2cff), S(0x2d70),
+            R(0x2e00,0x2e2e), R(0x2e30,0x2e4f), S(0x2e52), R(0x3001,0x3003), R(0x3008,0x3011), R(0x3014,0x301f),
+            S(0x3030), S(0x303d), S(0x30a0), S(0x30fb), R(0xa4fe,0xa4ff), R(0xa60d,0xa60f), S(0xa673), S(0xa67e),
+            R(0xa6f2,0xa6f7), R(0xa874,0xa877), R(0xa8ce,0xa8cf), R(0xa8f8,0xa8fa), S(0xa8fc), R(0xa92e,0xa92f),
+            S(0xa95f), R(0xa9c1,0xa9cd), R(0xa9de,0xa9df), R(0xaa5c,0xaa5f), R(0xaade,0xaadf), R(0xaaf0,0xaaf1),
+            S(0xabeb), R(0xfd3e,0xfd3f), R(0xfe10,0xfe19), R(0xfe30,0xfe52), R(0xfe54,0xfe61), S(0xfe63), S(0xfe68),
+            R(0xfe6a,0xfe6b), R(0xff01,0xff03), R(0xff05,0xff0a), R(0xff0c,0xff0f), R(0xff1a,0xff1b),
+            R(0xff1f,0xff20), R(0xff3b,0xff3d), S(0xff3f), S(0xff5b), S(0xff5d), R(0xff5f,0xff65), R(0x10100,0x10102),
+            S(0x1039f), S(0x103d0), S(0x1056f), S(0x10857), S(0x1091f), S(0x1093f), R(0x10a50,0x10a58), S(0x10a7f),
+            R(0x10af0,0x10af6), R(0x10b39,0x10b3f), R(0x10b99,0x10b9c), S(0x10ead), R(0x10f55,0x10f59),
+            R(0x11047,0x1104d), R(0x110bb,0x110bc), R(0x110be,0x110c1), R(0x11140,0x11143), R(0x11174,0x11175),
+            R(0x111c5,0x111c8), S(0x111cd), S(0x111db), R(0x111dd,0x111df), R(0x11238,0x1123d), S(0x112a9),
+            R(0x1144b,0x1144f), R(0x1145a,0x1145b), S(0x1145d), S(0x114c6), R(0x115c1,0x115d7), R(0x11641,0x11643),
+            R(0x11660,0x1166c), R(0x1173c,0x1173e), S(0x1183b), R(0x11944,0x11946), S(0x119e2), R(0x11a3f,0x11a46),
+            R(0x11a9a,0x11a9c), R(0x11a9e,0x11aa2), R(0x11c41,0x11c45), R(0x11c70,0x11c71), R(0x11ef7,0x11ef8),
+            S(0x11fff), R(0x12470,0x12474), R(0x16a6e,0x16a6f), S(0x16af5), R(0x16b37,0x16b3b), S(0x16b44),
+            R(0x16e97,0x16e9a), S(0x16fe2), S(0x1bc9f), R(0x1da87,0x1da8b), R(0x1e95e,0x1e95f)
+        };
+#undef R
+#undef S
+
+        /* The ASCII ones are the most frequently used ones, also CommonMark
+         * specification requests few more in this range. */
+        if(codepoint <= 0x7f)
+            return ISPUNCT_(codepoint);
+
+        return (md_unicode_bsearch__(codepoint, PUNCT_MAP, SIZEOF_ARRAY(PUNCT_MAP)) >= 0);
+    }
+
+    static void
+    md_get_unicode_fold_info(unsigned codepoint, MD_UNICODE_FOLD_INFO* info)
+    {
+#define R(cp_min, cp_max)   ((cp_min) | 0x40000000), ((cp_max) | 0x80000000)
+#define S(cp)               (cp)
+        /* Unicode "Pc", "Pd", "Pe", "Pf", "Pi", "Po", "Ps" categories.
+         * (generated by scripts/build_folding_map.py) */
+        static const unsigned FOLD_MAP_1[] = {
+            R(0x0041,0x005a), S(0x00b5), R(0x00c0,0x00d6), R(0x00d8,0x00de), R(0x0100,0x012e), R(0x0132,0x0136),
+            R(0x0139,0x0147), R(0x014a,0x0176), S(0x0178), R(0x0179,0x017d), S(0x017f), S(0x0181), S(0x0182),
+            S(0x0184), S(0x0186), S(0x0187), S(0x0189), S(0x018a), S(0x018b), S(0x018e), S(0x018f), S(0x0190),
+            S(0x0191), S(0x0193), S(0x0194), S(0x0196), S(0x0197), S(0x0198), S(0x019c), S(0x019d), S(0x019f),
+            R(0x01a0,0x01a4), S(0x01a6), S(0x01a7), S(0x01a9), S(0x01ac), S(0x01ae), S(0x01af), S(0x01b1), S(0x01b2),
+            S(0x01b3), S(0x01b5), S(0x01b7), S(0x01b8), S(0x01bc), S(0x01c4), S(0x01c5), S(0x01c7), S(0x01c8),
+            S(0x01ca), R(0x01cb,0x01db), R(0x01de,0x01ee), S(0x01f1), S(0x01f2), S(0x01f4), S(0x01f6), S(0x01f7),
+            R(0x01f8,0x021e), S(0x0220), R(0x0222,0x0232), S(0x023a), S(0x023b), S(0x023d), S(0x023e), S(0x0241),
+            S(0x0243), S(0x0244), S(0x0245), R(0x0246,0x024e), S(0x0345), S(0x0370), S(0x0372), S(0x0376), S(0x037f),
+            S(0x0386), R(0x0388,0x038a), S(0x038c), S(0x038e), S(0x038f), R(0x0391,0x03a1), R(0x03a3,0x03ab),
+            S(0x03c2), S(0x03cf), S(0x03d0), S(0x03d1), S(0x03d5), S(0x03d6), R(0x03d8,0x03ee), S(0x03f0), S(0x03f1),
+            S(0x03f4), S(0x03f5), S(0x03f7), S(0x03f9), S(0x03fa), R(0x03fd,0x03ff), R(0x0400,0x040f),
+            R(0x0410,0x042f), R(0x0460,0x0480), R(0x048a,0x04be), S(0x04c0), R(0x04c1,0x04cd), R(0x04d0,0x052e),
+            R(0x0531,0x0556), R(0x10a0,0x10c5), S(0x10c7), S(0x10cd), R(0x13f8,0x13fd), S(0x1c80), S(0x1c81),
+            S(0x1c82), S(0x1c83), S(0x1c84), S(0x1c85), S(0x1c86), S(0x1c87), S(0x1c88), R(0x1c90,0x1cba),
+            R(0x1cbd,0x1cbf), R(0x1e00,0x1e94), S(0x1e9b), R(0x1ea0,0x1efe), R(0x1f08,0x1f0f), R(0x1f18,0x1f1d),
+            R(0x1f28,0x1f2f), R(0x1f38,0x1f3f), R(0x1f48,0x1f4d), S(0x1f59), S(0x1f5b), S(0x1f5d), S(0x1f5f),
+            R(0x1f68,0x1f6f), S(0x1fb8), S(0x1fb9), S(0x1fba), S(0x1fbb), S(0x1fbe), R(0x1fc8,0x1fcb), S(0x1fd8),
+            S(0x1fd9), S(0x1fda), S(0x1fdb), S(0x1fe8), S(0x1fe9), S(0x1fea), S(0x1feb), S(0x1fec), S(0x1ff8),
+            S(0x1ff9), S(0x1ffa), S(0x1ffb), S(0x2126), S(0x212a), S(0x212b), S(0x2132), R(0x2160,0x216f), S(0x2183),
+            R(0x24b6,0x24cf), R(0x2c00,0x2c2e), S(0x2c60), S(0x2c62), S(0x2c63), S(0x2c64), R(0x2c67,0x2c6b),
+            S(0x2c6d), S(0x2c6e), S(0x2c6f), S(0x2c70), S(0x2c72), S(0x2c75), S(0x2c7e), S(0x2c7f), R(0x2c80,0x2ce2),
+            S(0x2ceb), S(0x2ced), S(0x2cf2), R(0xa640,0xa66c), R(0xa680,0xa69a), R(0xa722,0xa72e), R(0xa732,0xa76e),
+            S(0xa779), S(0xa77b), S(0xa77d), R(0xa77e,0xa786), S(0xa78b), S(0xa78d), S(0xa790), S(0xa792),
+            R(0xa796,0xa7a8), S(0xa7aa), S(0xa7ab), S(0xa7ac), S(0xa7ad), S(0xa7ae), S(0xa7b0), S(0xa7b1), S(0xa7b2),
+            S(0xa7b3), R(0xa7b4,0xa7be), S(0xa7c2), S(0xa7c4), S(0xa7c5), S(0xa7c6), S(0xa7c7), S(0xa7c9), S(0xa7f5),
+            R(0xab70,0xabbf), R(0xff21,0xff3a), R(0x10400,0x10427), R(0x104b0,0x104d3), R(0x10c80,0x10cb2),
+            R(0x118a0,0x118bf), R(0x16e40,0x16e5f), R(0x1e900,0x1e921)
+        };
+        static const unsigned FOLD_MAP_1_DATA[] = {
+            0x0061, 0x007a, 0x03bc, 0x00e0, 0x00f6, 0x00f8, 0x00fe, 0x0101, 0x012f, 0x0133, 0x0137, 0x013a, 0x0148,
+            0x014b, 0x0177, 0x00ff, 0x017a, 0x017e, 0x0073, 0x0253, 0x0183, 0x0185, 0x0254, 0x0188, 0x0256, 0x0257,
+            0x018c, 0x01dd, 0x0259, 0x025b, 0x0192, 0x0260, 0x0263, 0x0269, 0x0268, 0x0199, 0x026f, 0x0272, 0x0275,
+            0x01a1, 0x01a5, 0x0280, 0x01a8, 0x0283, 0x01ad, 0x0288, 0x01b0, 0x028a, 0x028b, 0x01b4, 0x01b6, 0x0292,
+            0x01b9, 0x01bd, 0x01c6, 0x01c6, 0x01c9, 0x01c9, 0x01cc, 0x01cc, 0x01dc, 0x01df, 0x01ef, 0x01f3, 0x01f3,
+            0x01f5, 0x0195, 0x01bf, 0x01f9, 0x021f, 0x019e, 0x0223, 0x0233, 0x2c65, 0x023c, 0x019a, 0x2c66, 0x0242,
+            0x0180, 0x0289, 0x028c, 0x0247, 0x024f, 0x03b9, 0x0371, 0x0373, 0x0377, 0x03f3, 0x03ac, 0x03ad, 0x03af,
+            0x03cc, 0x03cd, 0x03ce, 0x03b1, 0x03c1, 0x03c3, 0x03cb, 0x03c3, 0x03d7, 0x03b2, 0x03b8, 0x03c6, 0x03c0,
+            0x03d9, 0x03ef, 0x03ba, 0x03c1, 0x03b8, 0x03b5, 0x03f8, 0x03f2, 0x03fb, 0x037b, 0x037d, 0x0450, 0x045f,
+            0x0430, 0x044f, 0x0461, 0x0481, 0x048b, 0x04bf, 0x04cf, 0x04c2, 0x04ce, 0x04d1, 0x052f, 0x0561, 0x0586,
+            0x2d00, 0x2d25, 0x2d27, 0x2d2d, 0x13f0, 0x13f5, 0x0432, 0x0434, 0x043e, 0x0441, 0x0442, 0x0442, 0x044a,
+            0x0463, 0xa64b, 0x10d0, 0x10fa, 0x10fd, 0x10ff, 0x1e01, 0x1e95, 0x1e61, 0x1ea1, 0x1eff, 0x1f00, 0x1f07,
+            0x1f10, 0x1f15, 0x1f20, 0x1f27, 0x1f30, 0x1f37, 0x1f40, 0x1f45, 0x1f51, 0x1f53, 0x1f55, 0x1f57, 0x1f60,
+            0x1f67, 0x1fb0, 0x1fb1, 0x1f70, 0x1f71, 0x03b9, 0x1f72, 0x1f75, 0x1fd0, 0x1fd1, 0x1f76, 0x1f77, 0x1fe0,
+            0x1fe1, 0x1f7a, 0x1f7b, 0x1fe5, 0x1f78, 0x1f79, 0x1f7c, 0x1f7d, 0x03c9, 0x006b, 0x00e5, 0x214e, 0x2170,
+            0x217f, 0x2184, 0x24d0, 0x24e9, 0x2c30, 0x2c5e, 0x2c61, 0x026b, 0x1d7d, 0x027d, 0x2c68, 0x2c6c, 0x0251,
+            0x0271, 0x0250, 0x0252, 0x2c73, 0x2c76, 0x023f, 0x0240, 0x2c81, 0x2ce3, 0x2cec, 0x2cee, 0x2cf3, 0xa641,
+            0xa66d, 0xa681, 0xa69b, 0xa723, 0xa72f, 0xa733, 0xa76f, 0xa77a, 0xa77c, 0x1d79, 0xa77f, 0xa787, 0xa78c,
+            0x0265, 0xa791, 0xa793, 0xa797, 0xa7a9, 0x0266, 0x025c, 0x0261, 0x026c, 0x026a, 0x029e, 0x0287, 0x029d,
+            0xab53, 0xa7b5, 0xa7bf, 0xa7c3, 0xa794, 0x0282, 0x1d8e, 0xa7c8, 0xa7ca, 0xa7f6, 0x13a0, 0x13ef, 0xff41,
+            0xff5a, 0x10428, 0x1044f, 0x104d8, 0x104fb, 0x10cc0, 0x10cf2, 0x118c0, 0x118df, 0x16e60, 0x16e7f, 0x1e922,
+            0x1e943
+        };
+        static const unsigned FOLD_MAP_2[] = {
+            S(0x00df), S(0x0130), S(0x0149), S(0x01f0), S(0x0587), S(0x1e96), S(0x1e97), S(0x1e98), S(0x1e99),
+            S(0x1e9a), S(0x1e9e), S(0x1f50), R(0x1f80,0x1f87), R(0x1f88,0x1f8f), R(0x1f90,0x1f97), R(0x1f98,0x1f9f),
+            R(0x1fa0,0x1fa7), R(0x1fa8,0x1faf), S(0x1fb2), S(0x1fb3), S(0x1fb4), S(0x1fb6), S(0x1fbc), S(0x1fc2),
+            S(0x1fc3), S(0x1fc4), S(0x1fc6), S(0x1fcc), S(0x1fd6), S(0x1fe4), S(0x1fe6), S(0x1ff2), S(0x1ff3),
+            S(0x1ff4), S(0x1ff6), S(0x1ffc), S(0xfb00), S(0xfb01), S(0xfb02), S(0xfb05), S(0xfb06), S(0xfb13),
+            S(0xfb14), S(0xfb15), S(0xfb16), S(0xfb17)
+        };
+        static const unsigned FOLD_MAP_2_DATA[] = {
+            0x0073,0x0073, 0x0069,0x0307, 0x02bc,0x006e, 0x006a,0x030c, 0x0565,0x0582, 0x0068,0x0331, 0x0074,0x0308,
+            0x0077,0x030a, 0x0079,0x030a, 0x0061,0x02be, 0x0073,0x0073, 0x03c5,0x0313, 0x1f00,0x03b9, 0x1f07,0x03b9,
+            0x1f00,0x03b9, 0x1f07,0x03b9, 0x1f20,0x03b9, 0x1f27,0x03b9, 0x1f20,0x03b9, 0x1f27,0x03b9, 0x1f60,0x03b9,
+            0x1f67,0x03b9, 0x1f60,0x03b9, 0x1f67,0x03b9, 0x1f70,0x03b9, 0x03b1,0x03b9, 0x03ac,0x03b9, 0x03b1,0x0342,
+            0x03b1,0x03b9, 0x1f74,0x03b9, 0x03b7,0x03b9, 0x03ae,0x03b9, 0x03b7,0x0342, 0x03b7,0x03b9, 0x03b9,0x0342,
+            0x03c1,0x0313, 0x03c5,0x0342, 0x1f7c,0x03b9, 0x03c9,0x03b9, 0x03ce,0x03b9, 0x03c9,0x0342, 0x03c9,0x03b9,
+            0x0066,0x0066, 0x0066,0x0069, 0x0066,0x006c, 0x0073,0x0074, 0x0073,0x0074, 0x0574,0x0576, 0x0574,0x0565,
+            0x0574,0x056b, 0x057e,0x0576, 0x0574,0x056d
+        };
+        static const unsigned FOLD_MAP_3[] = {
+            S(0x0390), S(0x03b0), S(0x1f52), S(0x1f54), S(0x1f56), S(0x1fb7), S(0x1fc7), S(0x1fd2), S(0x1fd3),
+            S(0x1fd7), S(0x1fe2), S(0x1fe3), S(0x1fe7), S(0x1ff7), S(0xfb03), S(0xfb04)
+        };
+        static const unsigned FOLD_MAP_3_DATA[] = {
+            0x03b9,0x0308,0x0301, 0x03c5,0x0308,0x0301, 0x03c5,0x0313,0x0300, 0x03c5,0x0313,0x0301,
+            0x03c5,0x0313,0x0342, 0x03b1,0x0342,0x03b9, 0x03b7,0x0342,0x03b9, 0x03b9,0x0308,0x0300,
+            0x03b9,0x0308,0x0301, 0x03b9,0x0308,0x0342, 0x03c5,0x0308,0x0300, 0x03c5,0x0308,0x0301,
+            0x03c5,0x0308,0x0342, 0x03c9,0x0342,0x03b9, 0x0066,0x0066,0x0069, 0x0066,0x0066,0x006c
+        };
+#undef R
+#undef S
+        static const struct {
+            const unsigned* map;
+            const unsigned* data;
+            size_t map_size;
+            unsigned n_codepoints;
+        } FOLD_MAP_LIST[] = {
+            { FOLD_MAP_1, FOLD_MAP_1_DATA, SIZEOF_ARRAY(FOLD_MAP_1), 1 },
+            { FOLD_MAP_2, FOLD_MAP_2_DATA, SIZEOF_ARRAY(FOLD_MAP_2), 2 },
+            { FOLD_MAP_3, FOLD_MAP_3_DATA, SIZEOF_ARRAY(FOLD_MAP_3), 3 }
+        };
+
+        int i;
+
+        /* Fast path for ASCII characters. */
+        if(codepoint <= 0x7f) {
+            info->codepoints[0] = codepoint;
+            if(ISUPPER_(codepoint))
+                info->codepoints[0] += 'a' - 'A';
+            info->n_codepoints = 1;
+            return;
+        }
+
+        /* Try to locate the codepoint in any of the maps. */
+        for(i = 0; i < (int) SIZEOF_ARRAY(FOLD_MAP_LIST); i++) {
+            int index;
+
+            index = md_unicode_bsearch__(codepoint, FOLD_MAP_LIST[i].map, FOLD_MAP_LIST[i].map_size);
+            if(index >= 0) {
+                /* Found the mapping. */
+                unsigned n_codepoints = FOLD_MAP_LIST[i].n_codepoints;
+                const unsigned* map = FOLD_MAP_LIST[i].map;
+                const unsigned* codepoints = FOLD_MAP_LIST[i].data + (index * n_codepoints);
+
+                memcpy(info->codepoints, codepoints, sizeof(unsigned) * n_codepoints);
+                info->n_codepoints = n_codepoints;
+
+                if(FOLD_MAP_LIST[i].map[index] != codepoint) {
+                    /* The found mapping maps whole range of codepoints,
+                     * i.e. we have to offset info->codepoints[0] accordingly. */
+                    if((map[index] & 0x00ffffff)+1 == codepoints[0]) {
+                        /* Alternating type of the range. */
+                        info->codepoints[0] = codepoint + ((codepoint & 0x1) == (map[index] & 0x1) ? 1 : 0);
+                    } else {
+                        /* Range to range kind of mapping. */
+                        info->codepoints[0] += (codepoint - (map[index] & 0x00ffffff));
+                    }
+                }
+
+                return;
+            }
+        }
+
+        /* No mapping found. Map the codepoint to itself. */
+        info->codepoints[0] = codepoint;
+        info->n_codepoints = 1;
+    }
+#endif
+
+
+#if defined MD4C_USE_UTF16
+    #define IS_UTF16_SURROGATE_HI(word)     (((WORD)(word) & 0xfc00) == 0xd800)
+    #define IS_UTF16_SURROGATE_LO(word)     (((WORD)(word) & 0xfc00) == 0xdc00)
+    #define UTF16_DECODE_SURROGATE(hi, lo)  (0x10000 + ((((unsigned)(hi) & 0x3ff) << 10) | (((unsigned)(lo) & 0x3ff) << 0)))
+
+    static unsigned
+    md_decode_utf16le__(const CHAR* str, SZ str_size, SZ* p_size)
+    {
+        if(IS_UTF16_SURROGATE_HI(str[0])) {
+            if(1 < str_size && IS_UTF16_SURROGATE_LO(str[1])) {
+                if(p_size != NULL)
+                    *p_size = 2;
+                return UTF16_DECODE_SURROGATE(str[0], str[1]);
+            }
+        }
+
+        if(p_size != NULL)
+            *p_size = 1;
+        return str[0];
+    }
+
+    static unsigned
+    md_decode_utf16le_before__(MD_CTX* ctx, OFF off)
+    {
+        if(off > 2 && IS_UTF16_SURROGATE_HI(CH(off-2)) && IS_UTF16_SURROGATE_LO(CH(off-1)))
+            return UTF16_DECODE_SURROGATE(CH(off-2), CH(off-1));
+
+        return CH(off);
+    }
+
+    /* No whitespace uses surrogates, so no decoding needed here. */
+    #define ISUNICODEWHITESPACE_(codepoint) md_is_unicode_whitespace__(codepoint)
+    #define ISUNICODEWHITESPACE(off)        md_is_unicode_whitespace__(CH(off))
+    #define ISUNICODEWHITESPACEBEFORE(off)  md_is_unicode_whitespace__(CH((off)-1))
+
+    #define ISUNICODEPUNCT(off)             md_is_unicode_punct__(md_decode_utf16le__(STR(off), ctx->size - (off), NULL))
+    #define ISUNICODEPUNCTBEFORE(off)       md_is_unicode_punct__(md_decode_utf16le_before__(ctx, off))
+
+    static inline int
+    md_decode_unicode(const CHAR* str, OFF off, SZ str_size, SZ* p_char_size)
+    {
+        return md_decode_utf16le__(str+off, str_size-off, p_char_size);
+    }
+#elif defined MD4C_USE_UTF8
+    #define IS_UTF8_LEAD1(byte)     ((unsigned char)(byte) <= 0x7f)
+    #define IS_UTF8_LEAD2(byte)     (((unsigned char)(byte) & 0xe0) == 0xc0)
+    #define IS_UTF8_LEAD3(byte)     (((unsigned char)(byte) & 0xf0) == 0xe0)
+    #define IS_UTF8_LEAD4(byte)     (((unsigned char)(byte) & 0xf8) == 0xf0)
+    #define IS_UTF8_TAIL(byte)      (((unsigned char)(byte) & 0xc0) == 0x80)
+
+    static unsigned
+    md_decode_utf8__(const CHAR* str, SZ str_size, SZ* p_size)
+    {
+        if(!IS_UTF8_LEAD1(str[0])) {
+            if(IS_UTF8_LEAD2(str[0])) {
+                if(1 < str_size && IS_UTF8_TAIL(str[1])) {
+                    if(p_size != NULL)
+                        *p_size = 2;
+
+                    return (((unsigned int)str[0] & 0x1f) << 6) |
+                           (((unsigned int)str[1] & 0x3f) << 0);
+                }
+            } else if(IS_UTF8_LEAD3(str[0])) {
+                if(2 < str_size && IS_UTF8_TAIL(str[1]) && IS_UTF8_TAIL(str[2])) {
+                    if(p_size != NULL)
+                        *p_size = 3;
+
+                    return (((unsigned int)str[0] & 0x0f) << 12) |
+                           (((unsigned int)str[1] & 0x3f) << 6) |
+                           (((unsigned int)str[2] & 0x3f) << 0);
+                }
+            } else if(IS_UTF8_LEAD4(str[0])) {
+                if(3 < str_size && IS_UTF8_TAIL(str[1]) && IS_UTF8_TAIL(str[2]) && IS_UTF8_TAIL(str[3])) {
+                    if(p_size != NULL)
+                        *p_size = 4;
+
+                    return (((unsigned int)str[0] & 0x07) << 18) |
+                           (((unsigned int)str[1] & 0x3f) << 12) |
+                           (((unsigned int)str[2] & 0x3f) << 6) |
+                           (((unsigned int)str[3] & 0x3f) << 0);
+                }
+            }
+        }
+
+        if(p_size != NULL)
+            *p_size = 1;
+        return (unsigned) str[0];
+    }
+
+    static unsigned
+    md_decode_utf8_before__(MD_CTX* ctx, OFF off)
+    {
+        if(!IS_UTF8_LEAD1(CH(off-1))) {
+            if(off > 1 && IS_UTF8_LEAD2(CH(off-2)) && IS_UTF8_TAIL(CH(off-1)))
+                return (((unsigned int)CH(off-2) & 0x1f) << 6) |
+                       (((unsigned int)CH(off-1) & 0x3f) << 0);
+
+            if(off > 2 && IS_UTF8_LEAD3(CH(off-3)) && IS_UTF8_TAIL(CH(off-2)) && IS_UTF8_TAIL(CH(off-1)))
+                return (((unsigned int)CH(off-3) & 0x0f) << 12) |
+                       (((unsigned int)CH(off-2) & 0x3f) << 6) |
+                       (((unsigned int)CH(off-1) & 0x3f) << 0);
+
+            if(off > 3 && IS_UTF8_LEAD4(CH(off-4)) && IS_UTF8_TAIL(CH(off-3)) && IS_UTF8_TAIL(CH(off-2)) && IS_UTF8_TAIL(CH(off-1)))
+                return (((unsigned int)CH(off-4) & 0x07) << 18) |
+                       (((unsigned int)CH(off-3) & 0x3f) << 12) |
+                       (((unsigned int)CH(off-2) & 0x3f) << 6) |
+                       (((unsigned int)CH(off-1) & 0x3f) << 0);
+        }
+
+        return (unsigned) CH(off-1);
+    }
+
+    #define ISUNICODEWHITESPACE_(codepoint) md_is_unicode_whitespace__(codepoint)
+    #define ISUNICODEWHITESPACE(off)        md_is_unicode_whitespace__(md_decode_utf8__(STR(off), ctx->size - (off), NULL))
+    #define ISUNICODEWHITESPACEBEFORE(off)  md_is_unicode_whitespace__(md_decode_utf8_before__(ctx, off))
+
+    #define ISUNICODEPUNCT(off)             md_is_unicode_punct__(md_decode_utf8__(STR(off), ctx->size - (off), NULL))
+    #define ISUNICODEPUNCTBEFORE(off)       md_is_unicode_punct__(md_decode_utf8_before__(ctx, off))
+
+    static inline unsigned
+    md_decode_unicode(const CHAR* str, OFF off, SZ str_size, SZ* p_char_size)
+    {
+        return md_decode_utf8__(str+off, str_size-off, p_char_size);
+    }
+#else
+    #define ISUNICODEWHITESPACE_(codepoint) ISWHITESPACE_(codepoint)
+    #define ISUNICODEWHITESPACE(off)        ISWHITESPACE(off)
+    #define ISUNICODEWHITESPACEBEFORE(off)  ISWHITESPACE((off)-1)
+
+    #define ISUNICODEPUNCT(off)             ISPUNCT(off)
+    #define ISUNICODEPUNCTBEFORE(off)       ISPUNCT((off)-1)
+
+    static inline void
+    md_get_unicode_fold_info(unsigned codepoint, MD_UNICODE_FOLD_INFO* info)
+    {
+        info->codepoints[0] = codepoint;
+        if(ISUPPER_(codepoint))
+            info->codepoints[0] += 'a' - 'A';
+        info->n_codepoints = 1;
+    }
+
+    static inline unsigned
+    md_decode_unicode(const CHAR* str, OFF off, SZ str_size, SZ* p_size)
+    {
+        *p_size = 1;
+        return (unsigned) str[off];
+    }
+#endif
+
+
+/*************************************
+ ***  Helper string manipulations  ***
+ *************************************/
+
+/* Fill buffer with copy of the string between 'beg' and 'end' but replace any
+ * line breaks with given replacement character.
+ *
+ * NOTE: Caller is responsible to make sure the buffer is large enough.
+ * (Given the output is always shorter then input, (end - beg) is good idea
+ * what the caller should allocate.)
+ */
+static void
+md_merge_lines(MD_CTX* ctx, OFF beg, OFF end, const MD_LINE* lines, int n_lines,
+               CHAR line_break_replacement_char, CHAR* buffer, SZ* p_size)
+{
+    CHAR* ptr = buffer;
+    int line_index = 0;
+    OFF off = beg;
+
+    MD_UNUSED(n_lines);
+
+    while(1) {
+        const MD_LINE* line = &lines[line_index];
+        OFF line_end = line->end;
+        if(end < line_end)
+            line_end = end;
+
+        while(off < line_end) {
+            *ptr = CH(off);
+            ptr++;
+            off++;
+        }
+
+        if(off >= end) {
+            *p_size = (MD_SIZE)(ptr - buffer);
+            return;
+        }
+
+        *ptr = line_break_replacement_char;
+        ptr++;
+
+        line_index++;
+        off = lines[line_index].beg;
+    }
+}
+
+/* Wrapper of md_merge_lines() which allocates new buffer for the output string.
+ */
+static int
+md_merge_lines_alloc(MD_CTX* ctx, OFF beg, OFF end, const MD_LINE* lines, int n_lines,
+                    CHAR line_break_replacement_char, CHAR** p_str, SZ* p_size)
+{
+    CHAR* buffer;
+
+    buffer = (CHAR*) malloc(sizeof(CHAR) * (end - beg));
+    if(buffer == NULL) {
+        MD_LOG("malloc() failed.");
+        return -1;
+    }
+
+    md_merge_lines(ctx, beg, end, lines, n_lines,
+                line_break_replacement_char, buffer, p_size);
+
+    *p_str = buffer;
+    return 0;
+}
+
+static OFF
+md_skip_unicode_whitespace(const CHAR* label, OFF off, SZ size)
+{
+    SZ char_size;
+    unsigned codepoint;
+
+    while(off < size) {
+        codepoint = md_decode_unicode(label, off, size, &char_size);
+        if(!ISUNICODEWHITESPACE_(codepoint)  &&  !ISNEWLINE_(label[off]))
+            break;
+        off += char_size;
+    }
+
+    return off;
+}
+
+
+/******************************
+ ***  Recognizing raw HTML  ***
+ ******************************/
+
+/* md_is_html_tag() may be called when processing inlines (inline raw HTML)
+ * or when breaking document to blocks (checking for start of HTML block type 7).
+ *
+ * When breaking document to blocks, we do not yet know line boundaries, but
+ * in that case the whole tag has to live on a single line. We distinguish this
+ * by n_lines == 0.
+ */
+static int
+md_is_html_tag(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    int attr_state;
+    OFF off = beg;
+    OFF line_end = (n_lines > 0) ? lines[0].end : ctx->size;
+    int i = 0;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    if(off + 1 >= line_end)
+        return FALSE;
+    off++;
+
+    /* For parsing attributes, we need a little state automaton below.
+     * State -1: no attributes are allowed.
+     * State 0: attribute could follow after some whitespace.
+     * State 1: after a whitespace (attribute name may follow).
+     * State 2: after attribute name ('=' MAY follow).
+     * State 3: after '=' (value specification MUST follow).
+     * State 41: in middle of unquoted attribute value.
+     * State 42: in middle of single-quoted attribute value.
+     * State 43: in middle of double-quoted attribute value.
+     */
+    attr_state = 0;
+
+    if(CH(off) == _T('/')) {
+        /* Closer tag "</ ... >". No attributes may be present. */
+        attr_state = -1;
+        off++;
+    }
+
+    /* Tag name */
+    if(off >= line_end  ||  !ISALPHA(off))
+        return FALSE;
+    off++;
+    while(off < line_end  &&  (ISALNUM(off)  ||  CH(off) == _T('-')))
+        off++;
+
+    /* (Optional) attributes (if not closer), (optional) '/' (if not closer)
+     * and final '>'. */
+    while(1) {
+        while(off < line_end  &&  !ISNEWLINE(off)) {
+            if(attr_state > 40) {
+                if(attr_state == 41 && (ISBLANK(off) || ISANYOF(off, _T("\"'=<>`")))) {
+                    attr_state = 0;
+                    off--;  /* Put the char back for re-inspection in the new state. */
+                } else if(attr_state == 42 && CH(off) == _T('\'')) {
+                    attr_state = 0;
+                } else if(attr_state == 43 && CH(off) == _T('"')) {
+                    attr_state = 0;
+                }
+                off++;
+            } else if(ISWHITESPACE(off)) {
+                if(attr_state == 0)
+                    attr_state = 1;
+                off++;
+            } else if(attr_state <= 2 && CH(off) == _T('>')) {
+                /* End. */
+                goto done;
+            } else if(attr_state <= 2 && CH(off) == _T('/') && off+1 < line_end && CH(off+1) == _T('>')) {
+                /* End with digraph '/>' */
+                off++;
+                goto done;
+            } else if((attr_state == 1 || attr_state == 2) && (ISALPHA(off) || CH(off) == _T('_') || CH(off) == _T(':'))) {
+                off++;
+                /* Attribute name */
+                while(off < line_end && (ISALNUM(off) || ISANYOF(off, _T("_.:-"))))
+                    off++;
+                attr_state = 2;
+            } else if(attr_state == 2 && CH(off) == _T('=')) {
+                /* Attribute assignment sign */
+                off++;
+                attr_state = 3;
+            } else if(attr_state == 3) {
+                /* Expecting start of attribute value. */
+                if(CH(off) == _T('"'))
+                    attr_state = 43;
+                else if(CH(off) == _T('\''))
+                    attr_state = 42;
+                else if(!ISANYOF(off, _T("\"'=<>`"))  &&  !ISNEWLINE(off))
+                    attr_state = 41;
+                else
+                    return FALSE;
+                off++;
+            } else {
+                /* Anything unexpected. */
+                return FALSE;
+            }
+        }
+
+        /* We have to be on a single line. See definition of start condition
+         * of HTML block, type 7. */
+        if(n_lines == 0)
+            return FALSE;
+
+        i++;
+        if(i >= n_lines)
+            return FALSE;
+
+        off = lines[i].beg;
+        line_end = lines[i].end;
+
+        if(attr_state == 0  ||  attr_state == 41)
+            attr_state = 1;
+
+        if(off >= max_end)
+            return FALSE;
+    }
+
+done:
+    if(off >= max_end)
+        return FALSE;
+
+    *p_end = off+1;
+    return TRUE;
+}
+
+static int
+md_scan_for_html_closer(MD_CTX* ctx, const MD_CHAR* str, MD_SIZE len,
+                        const MD_LINE* lines, int n_lines,
+                        OFF beg, OFF max_end, OFF* p_end,
+                        OFF* p_scan_horizon)
+{
+    OFF off = beg;
+    int i = 0;
+
+    if(off < *p_scan_horizon  &&  *p_scan_horizon >= max_end - len) {
+        /* We have already scanned the range up to the max_end so we know
+         * there is nothing to see. */
+        return FALSE;
+    }
+
+    while(TRUE) {
+        while(off + len <= lines[i].end  &&  off + len <= max_end) {
+            if(md_ascii_eq(STR(off), str, len)) {
+                /* Success. */
+                *p_end = off + len;
+                return TRUE;
+            }
+            off++;
+        }
+
+        i++;
+        if(off >= max_end  ||  i >= n_lines) {
+            /* Failure. */
+            *p_scan_horizon = off;
+            return FALSE;
+        }
+
+        off = lines[i].beg;
+    }
+}
+
+static int
+md_is_html_comment(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    if(off + 4 >= lines[0].end)
+        return FALSE;
+    if(CH(off+1) != _T('!')  ||  CH(off+2) != _T('-')  ||  CH(off+3) != _T('-'))
+        return FALSE;
+    off += 4;
+
+    /* ">" and "->" must not follow the opening. */
+    if(off < lines[0].end  &&  CH(off) == _T('>'))
+        return FALSE;
+    if(off+1 < lines[0].end  &&  CH(off) == _T('-')  &&  CH(off+1) == _T('>'))
+        return FALSE;
+
+    /* HTML comment must not contain "--", so we scan just for "--" instead
+     * of "-->" and verify manually that '>' follows. */
+    if(md_scan_for_html_closer(ctx, _T("--"), 2,
+                lines, n_lines, off, max_end, p_end, &ctx->html_comment_horizon))
+    {
+        if(*p_end < max_end  &&  CH(*p_end) == _T('>')) {
+            *p_end = *p_end + 1;
+            return TRUE;
+        }
+    }
+
+    return FALSE;
+}
+
+static int
+md_is_html_processing_instruction(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    if(off + 2 >= lines[0].end)
+        return FALSE;
+    if(CH(off+1) != _T('?'))
+        return FALSE;
+    off += 2;
+
+    return md_scan_for_html_closer(ctx, _T("?>"), 2,
+                lines, n_lines, off, max_end, p_end, &ctx->html_proc_instr_horizon);
+}
+
+static int
+md_is_html_declaration(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+
+    if(off + 2 >= lines[0].end)
+        return FALSE;
+    if(CH(off+1) != _T('!'))
+        return FALSE;
+    off += 2;
+
+    /* Declaration name. */
+    if(off >= lines[0].end  ||  !ISALPHA(off))
+        return FALSE;
+    off++;
+    while(off < lines[0].end  &&  ISALPHA(off))
+        off++;
+    if(off < lines[0].end  &&  !ISWHITESPACE(off))
+        return FALSE;
+
+    return md_scan_for_html_closer(ctx, _T(">"), 1,
+                lines, n_lines, off, max_end, p_end, &ctx->html_decl_horizon);
+}
+
+static int
+md_is_html_cdata(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    static const CHAR open_str[] = _T("<![CDATA[");
+    static const SZ open_size = SIZEOF_ARRAY(open_str) - 1;
+
+    OFF off = beg;
+
+    if(off + open_size >= lines[0].end)
+        return FALSE;
+    if(memcmp(STR(off), open_str, open_size) != 0)
+        return FALSE;
+    off += open_size;
+
+    if(lines[n_lines-1].end < max_end)
+        max_end = lines[n_lines-1].end - 2;
+
+    return md_scan_for_html_closer(ctx, _T("]]>"), 3,
+                lines, n_lines, off, max_end, p_end, &ctx->html_cdata_horizon);
+}
+
+static int
+md_is_html_any(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg, OFF max_end, OFF* p_end)
+{
+    MD_ASSERT(CH(beg) == _T('<'));
+    return (md_is_html_tag(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_comment(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_processing_instruction(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_declaration(ctx, lines, n_lines, beg, max_end, p_end)  ||
+            md_is_html_cdata(ctx, lines, n_lines, beg, max_end, p_end));
+}
+
+
+/****************************
+ ***  Recognizing Entity  ***
+ ****************************/
+
+static int
+md_is_hex_entity_contents(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+    MD_UNUSED(ctx);
+
+    while(off < max_end  &&  ISXDIGIT_(text[off])  &&  off - beg <= 8)
+        off++;
+
+    if(1 <= off - beg  &&  off - beg <= 6) {
+        *p_end = off;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static int
+md_is_dec_entity_contents(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+    MD_UNUSED(ctx);
+
+    while(off < max_end  &&  ISDIGIT_(text[off])  &&  off - beg <= 8)
+        off++;
+
+    if(1 <= off - beg  &&  off - beg <= 7) {
+        *p_end = off;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static int
+md_is_named_entity_contents(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg;
+    MD_UNUSED(ctx);
+
+    if(off < max_end  &&  ISALPHA_(text[off]))
+        off++;
+    else
+        return FALSE;
+
+    while(off < max_end  &&  ISALNUM_(text[off])  &&  off - beg <= 48)
+        off++;
+
+    if(2 <= off - beg  &&  off - beg <= 48) {
+        *p_end = off;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static int
+md_is_entity_str(MD_CTX* ctx, const CHAR* text, OFF beg, OFF max_end, OFF* p_end)
+{
+    int is_contents;
+    OFF off = beg;
+
+    MD_ASSERT(text[off] == _T('&'));
+    off++;
+
+    if(off+2 < max_end  &&  text[off] == _T('#')  &&  (text[off+1] == _T('x') || text[off+1] == _T('X')))
+        is_contents = md_is_hex_entity_contents(ctx, text, off+2, max_end, &off);
+    else if(off+1 < max_end  &&  text[off] == _T('#'))
+        is_contents = md_is_dec_entity_contents(ctx, text, off+1, max_end, &off);
+    else
+        is_contents = md_is_named_entity_contents(ctx, text, off, max_end, &off);
+
+    if(is_contents  &&  off < max_end  &&  text[off] == _T(';')) {
+        *p_end = off+1;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+static inline int
+md_is_entity(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end)
+{
+    return md_is_entity_str(ctx, ctx->text, beg, max_end, p_end);
+}
+
+
+/******************************
+ ***  Attribute Management  ***
+ ******************************/
+
+typedef struct MD_ATTRIBUTE_BUILD_tag MD_ATTRIBUTE_BUILD;
+struct MD_ATTRIBUTE_BUILD_tag {
+    CHAR* text;
+    MD_TEXTTYPE* substr_types;
+    OFF* substr_offsets;
+    int substr_count;
+    int substr_alloc;
+    MD_TEXTTYPE trivial_types[1];
+    OFF trivial_offsets[2];
+};
+
+
+#define MD_BUILD_ATTR_NO_ESCAPES    0x0001
+
+static int
+md_build_attr_append_substr(MD_CTX* ctx, MD_ATTRIBUTE_BUILD* build,
+                            MD_TEXTTYPE type, OFF off)
+{
+    if(build->substr_count >= build->substr_alloc) {
+        MD_TEXTTYPE* new_substr_types;
+        OFF* new_substr_offsets;
+
+        build->substr_alloc = (build->substr_alloc > 0
+                ? build->substr_alloc + build->substr_alloc / 2
+                : 8);
+        new_substr_types = (MD_TEXTTYPE*) realloc(build->substr_types,
+                                    build->substr_alloc * sizeof(MD_TEXTTYPE));
+        if(new_substr_types == NULL) {
+            MD_LOG("realloc() failed.");
+            return -1;
+        }
+        /* Note +1 to reserve space for final offset (== raw_size). */
+        new_substr_offsets = (OFF*) realloc(build->substr_offsets,
+                                    (build->substr_alloc+1) * sizeof(OFF));
+        if(new_substr_offsets == NULL) {
+            MD_LOG("realloc() failed.");
+            free(new_substr_types);
+            return -1;
+        }
+
+        build->substr_types = new_substr_types;
+        build->substr_offsets = new_substr_offsets;
+    }
+
+    build->substr_types[build->substr_count] = type;
+    build->substr_offsets[build->substr_count] = off;
+    build->substr_count++;
+    return 0;
+}
+
+static void
+md_free_attribute(MD_CTX* ctx, MD_ATTRIBUTE_BUILD* build)
+{
+    MD_UNUSED(ctx);
+
+    if(build->substr_alloc > 0) {
+        free(build->text);
+        free(build->substr_types);
+        free(build->substr_offsets);
+    }
+}
+
+static int
+md_build_attribute(MD_CTX* ctx, const CHAR* raw_text, SZ raw_size,
+                   unsigned flags, MD_ATTRIBUTE* attr, MD_ATTRIBUTE_BUILD* build)
+{
+    OFF raw_off, off;
+    int is_trivial;
+    int ret = 0;
+
+    memset(build, 0, sizeof(MD_ATTRIBUTE_BUILD));
+
+    /* If there is no backslash and no ampersand, build trivial attribute
+     * without any malloc(). */
+    is_trivial = TRUE;
+    for(raw_off = 0; raw_off < raw_size; raw_off++) {
+        if(ISANYOF3_(raw_text[raw_off], _T('\\'), _T('&'), _T('\0'))) {
+            is_trivial = FALSE;
+            break;
+        }
+    }
+
+    if(is_trivial) {
+        build->text = (CHAR*) (raw_size ? raw_text : NULL);
+        build->substr_types = build->trivial_types;
+        build->substr_offsets = build->trivial_offsets;
+        build->substr_count = 1;
+        build->substr_alloc = 0;
+        build->trivial_types[0] = MD_TEXT_NORMAL;
+        build->trivial_offsets[0] = 0;
+        build->trivial_offsets[1] = raw_size;
+        off = raw_size;
+    } else {
+        build->text = (CHAR*) malloc(raw_size * sizeof(CHAR));
+        if(build->text == NULL) {
+            MD_LOG("malloc() failed.");
+            goto abort;
+        }
+
+        raw_off = 0;
+        off = 0;
+
+        while(raw_off < raw_size) {
+            if(raw_text[raw_off] == _T('\0')) {
+                MD_CHECK(md_build_attr_append_substr(ctx, build, MD_TEXT_NULLCHAR, off));
+                memcpy(build->text + off, raw_text + raw_off, 1);
+                off++;
+                raw_off++;
+                continue;
+            }
+
+            if(raw_text[raw_off] == _T('&')) {
+                OFF ent_end;
+
+                if(md_is_entity_str(ctx, raw_text, raw_off, raw_size, &ent_end)) {
+                    MD_CHECK(md_build_attr_append_substr(ctx, build, MD_TEXT_ENTITY, off));
+                    memcpy(build->text + off, raw_text + raw_off, ent_end - raw_off);
+                    off += ent_end - raw_off;
+                    raw_off = ent_end;
+                    continue;
+                }
+            }
+
+            if(build->substr_count == 0  ||  build->substr_types[build->substr_count-1] != MD_TEXT_NORMAL)
+                MD_CHECK(md_build_attr_append_substr(ctx, build, MD_TEXT_NORMAL, off));
+
+            if(!(flags & MD_BUILD_ATTR_NO_ESCAPES)  &&
+               raw_text[raw_off] == _T('\\')  &&  raw_off+1 < raw_size  &&
+               (ISPUNCT_(raw_text[raw_off+1]) || ISNEWLINE_(raw_text[raw_off+1])))
+                raw_off++;
+
+            build->text[off++] = raw_text[raw_off++];
+        }
+        build->substr_offsets[build->substr_count] = off;
+    }
+
+    attr->text = build->text;
+    attr->size = off;
+    attr->substr_offsets = build->substr_offsets;
+    attr->substr_types = build->substr_types;
+    return 0;
+
+abort:
+    md_free_attribute(ctx, build);
+    return -1;
+}
+
+
+/*********************************************
+ ***  Dictionary of Reference Definitions  ***
+ *********************************************/
+
+#define MD_FNV1A_BASE       2166136261U
+#define MD_FNV1A_PRIME      16777619U
+
+static inline unsigned
+md_fnv1a(unsigned base, const void* data, size_t n)
+{
+    const unsigned char* buf = (const unsigned char*) data;
+    unsigned hash = base;
+    size_t i;
+
+    for(i = 0; i < n; i++) {
+        hash ^= buf[i];
+        hash *= MD_FNV1A_PRIME;
+    }
+
+    return hash;
+}
+
+
+struct MD_REF_DEF_tag {
+    CHAR* label;
+    CHAR* title;
+    unsigned hash;
+    SZ label_size;
+    SZ title_size;
+    OFF dest_beg;
+    OFF dest_end;
+    unsigned char label_needs_free : 1;
+    unsigned char title_needs_free : 1;
+};
+
+/* Label equivalence is quite complicated with regards to whitespace and case
+ * folding. This complicates computing a hash of it as well as direct comparison
+ * of two labels. */
+
+static unsigned
+md_link_label_hash(const CHAR* label, SZ size)
+{
+    unsigned hash = MD_FNV1A_BASE;
+    OFF off;
+    unsigned codepoint;
+    int is_whitespace = FALSE;
+
+    off = md_skip_unicode_whitespace(label, 0, size);
+    while(off < size) {
+        SZ char_size;
+
+        codepoint = md_decode_unicode(label, off, size, &char_size);
+        is_whitespace = ISUNICODEWHITESPACE_(codepoint) || ISNEWLINE_(label[off]);
+
+        if(is_whitespace) {
+            codepoint = ' ';
+            hash = md_fnv1a(hash, &codepoint, sizeof(unsigned));
+            off = md_skip_unicode_whitespace(label, off, size);
+        } else {
+            MD_UNICODE_FOLD_INFO fold_info;
+
+            md_get_unicode_fold_info(codepoint, &fold_info);
+            hash = md_fnv1a(hash, fold_info.codepoints, fold_info.n_codepoints * sizeof(unsigned));
+            off += char_size;
+        }
+    }
+
+    return hash;
+}
+
+static OFF
+md_link_label_cmp_load_fold_info(const CHAR* label, OFF off, SZ size,
+                                 MD_UNICODE_FOLD_INFO* fold_info)
+{
+    unsigned codepoint;
+    SZ char_size;
+
+    if(off >= size) {
+        /* Treat end of a link label as a whitespace. */
+        goto whitespace;
+    }
+
+    codepoint = md_decode_unicode(label, off, size, &char_size);
+    off += char_size;
+    if(ISUNICODEWHITESPACE_(codepoint)) {
+        /* Treat all whitespace as equivalent */
+        goto whitespace;
+    }
+
+    /* Get real folding info. */
+    md_get_unicode_fold_info(codepoint, fold_info);
+    return off;
+
+whitespace:
+    fold_info->codepoints[0] = _T(' ');
+    fold_info->n_codepoints = 1;
+    return md_skip_unicode_whitespace(label, off, size);
+}
+
+static int
+md_link_label_cmp(const CHAR* a_label, SZ a_size, const CHAR* b_label, SZ b_size)
+{
+    OFF a_off;
+    OFF b_off;
+    MD_UNICODE_FOLD_INFO a_fi = { { 0 }, 0 };
+    MD_UNICODE_FOLD_INFO b_fi = { { 0 }, 0 };
+    OFF a_fi_off = 0;
+    OFF b_fi_off = 0;
+    int cmp;
+
+    a_off = md_skip_unicode_whitespace(a_label, 0, a_size);
+    b_off = md_skip_unicode_whitespace(b_label, 0, b_size);
+    while(a_off < a_size || a_fi_off < a_fi.n_codepoints ||
+          b_off < b_size || b_fi_off < b_fi.n_codepoints)
+    {
+        /* If needed, load fold info for next char. */
+        if(a_fi_off >= a_fi.n_codepoints) {
+            a_fi_off = 0;
+            a_off = md_link_label_cmp_load_fold_info(a_label, a_off, a_size, &a_fi);
+        }
+        if(b_fi_off >= b_fi.n_codepoints) {
+            b_fi_off = 0;
+            b_off = md_link_label_cmp_load_fold_info(b_label, b_off, b_size, &b_fi);
+        }
+
+        cmp = b_fi.codepoints[b_fi_off] - a_fi.codepoints[a_fi_off];
+        if(cmp != 0)
+            return cmp;
+
+        a_fi_off++;
+        b_fi_off++;
+    }
+
+    return 0;
+}
+
+typedef struct MD_REF_DEF_LIST_tag MD_REF_DEF_LIST;
+struct MD_REF_DEF_LIST_tag {
+    int n_ref_defs;
+    int alloc_ref_defs;
+    MD_REF_DEF* ref_defs[];  /* Valid items always  point into ctx->ref_defs[] */
+};
+
+static int
+md_ref_def_cmp(const void* a, const void* b)
+{
+    const MD_REF_DEF* a_ref = *(const MD_REF_DEF**)a;
+    const MD_REF_DEF* b_ref = *(const MD_REF_DEF**)b;
+
+    if(a_ref->hash < b_ref->hash)
+        return -1;
+    else if(a_ref->hash > b_ref->hash)
+        return +1;
+    else
+        return md_link_label_cmp(a_ref->label, a_ref->label_size, b_ref->label, b_ref->label_size);
+}
+
+static int
+md_ref_def_cmp_for_sort(const void* a, const void* b)
+{
+    int cmp;
+
+    cmp = md_ref_def_cmp(a, b);
+
+    /* Ensure stability of the sorting. */
+    if(cmp == 0) {
+        const MD_REF_DEF* a_ref = *(const MD_REF_DEF**)a;
+        const MD_REF_DEF* b_ref = *(const MD_REF_DEF**)b;
+
+        if(a_ref < b_ref)
+            cmp = -1;
+        else if(a_ref > b_ref)
+            cmp = +1;
+        else
+            cmp = 0;
+    }
+
+    return cmp;
+}
+
+static int
+md_build_ref_def_hashtable(MD_CTX* ctx)
+{
+    int i, j;
+
+    if(ctx->n_ref_defs == 0)
+        return 0;
+
+    ctx->ref_def_hashtable_size = (ctx->n_ref_defs * 5) / 4;
+    ctx->ref_def_hashtable = malloc(ctx->ref_def_hashtable_size * sizeof(void*));
+    if(ctx->ref_def_hashtable == NULL) {
+        MD_LOG("malloc() failed.");
+        goto abort;
+    }
+    memset(ctx->ref_def_hashtable, 0, ctx->ref_def_hashtable_size * sizeof(void*));
+
+    /* Each member of ctx->ref_def_hashtable[] can be:
+     *  -- NULL,
+     *  -- pointer to the MD_REF_DEF in ctx->ref_defs[], or
+     *  -- pointer to a MD_REF_DEF_LIST, which holds multiple pointers to
+     *     such MD_REF_DEFs.
+     */
+    for(i = 0; i < ctx->n_ref_defs; i++) {
+        MD_REF_DEF* def = &ctx->ref_defs[i];
+        void* bucket;
+        MD_REF_DEF_LIST* list;
+
+        def->hash = md_link_label_hash(def->label, def->label_size);
+        bucket = ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size];
+
+        if(bucket == NULL) {
+            /* The bucket is empty. Make it just point to the def. */
+            ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size] = def;
+            continue;
+        }
+
+        if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs) {
+            /* The bucket already contains one ref. def. Lets see whether it
+             * is the same label (ref. def. duplicate) or different one
+             * (hash conflict). */
+            MD_REF_DEF* old_def = (MD_REF_DEF*) bucket;
+
+            if(md_link_label_cmp(def->label, def->label_size, old_def->label, old_def->label_size) == 0) {
+                /* Duplicate label: Ignore this ref. def. */
+                continue;
+            }
+
+            /* Make the bucket complex, i.e. able to hold more ref. defs. */
+            list = (MD_REF_DEF_LIST*) malloc(sizeof(MD_REF_DEF_LIST) + 2 * sizeof(MD_REF_DEF*));
+            if(list == NULL) {
+                MD_LOG("malloc() failed.");
+                goto abort;
+            }
+            list->ref_defs[0] = old_def;
+            list->ref_defs[1] = def;
+            list->n_ref_defs = 2;
+            list->alloc_ref_defs = 2;
+            ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size] = list;
+            continue;
+        }
+
+        /* Append the def to the complex bucket list.
+         *
+         * Note in this case we ignore potential duplicates to avoid expensive
+         * iterating over the complex bucket. Below, we revisit all the complex
+         * buckets and handle it more cheaply after the complex bucket contents
+         * is sorted. */
+        list = (MD_REF_DEF_LIST*) bucket;
+        if(list->n_ref_defs >= list->alloc_ref_defs) {
+            int alloc_ref_defs = list->alloc_ref_defs + list->alloc_ref_defs / 2;
+            MD_REF_DEF_LIST* list_tmp = (MD_REF_DEF_LIST*) realloc(list,
+                        sizeof(MD_REF_DEF_LIST) + alloc_ref_defs * sizeof(MD_REF_DEF*));
+            if(list_tmp == NULL) {
+                MD_LOG("realloc() failed.");
+                goto abort;
+            }
+            list = list_tmp;
+            list->alloc_ref_defs = alloc_ref_defs;
+            ctx->ref_def_hashtable[def->hash % ctx->ref_def_hashtable_size] = list;
+        }
+
+        list->ref_defs[list->n_ref_defs] = def;
+        list->n_ref_defs++;
+    }
+
+    /* Sort the complex buckets so we can use bsearch() with them. */
+    for(i = 0; i < ctx->ref_def_hashtable_size; i++) {
+        void* bucket = ctx->ref_def_hashtable[i];
+        MD_REF_DEF_LIST* list;
+
+        if(bucket == NULL)
+            continue;
+        if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs)
+            continue;
+
+        list = (MD_REF_DEF_LIST*) bucket;
+        qsort(list->ref_defs, list->n_ref_defs, sizeof(MD_REF_DEF*), md_ref_def_cmp_for_sort);
+
+        /* Disable all duplicates in the complex bucket by forcing all such
+         * records to point to the 1st such ref. def. I.e. no matter which
+         * record is found during the lookup, it will always point to the right
+         * ref. def. in ctx->ref_defs[]. */
+        for(j = 1; j < list->n_ref_defs; j++) {
+            if(md_ref_def_cmp(&list->ref_defs[j-1], &list->ref_defs[j]) == 0)
+                list->ref_defs[j] = list->ref_defs[j-1];
+        }
+    }
+
+    return 0;
+
+abort:
+    return -1;
+}
+
+static void
+md_free_ref_def_hashtable(MD_CTX* ctx)
+{
+    if(ctx->ref_def_hashtable != NULL) {
+        int i;
+
+        for(i = 0; i < ctx->ref_def_hashtable_size; i++) {
+            void* bucket = ctx->ref_def_hashtable[i];
+            if(bucket == NULL)
+                continue;
+            if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs)
+                continue;
+            free(bucket);
+        }
+
+        free(ctx->ref_def_hashtable);
+    }
+}
+
+static const MD_REF_DEF*
+md_lookup_ref_def(MD_CTX* ctx, const CHAR* label, SZ label_size)
+{
+    unsigned hash;
+    void* bucket;
+
+    if(ctx->ref_def_hashtable_size == 0)
+        return NULL;
+
+    hash = md_link_label_hash(label, label_size);
+    bucket = ctx->ref_def_hashtable[hash % ctx->ref_def_hashtable_size];
+
+    if(bucket == NULL) {
+        return NULL;
+    } else if(ctx->ref_defs <= (MD_REF_DEF*) bucket  &&  (MD_REF_DEF*) bucket < ctx->ref_defs + ctx->n_ref_defs) {
+        const MD_REF_DEF* def = (MD_REF_DEF*) bucket;
+
+        if(md_link_label_cmp(def->label, def->label_size, label, label_size) == 0)
+            return def;
+        else
+            return NULL;
+    } else {
+        MD_REF_DEF_LIST* list = (MD_REF_DEF_LIST*) bucket;
+        MD_REF_DEF key_buf;
+        const MD_REF_DEF* key = &key_buf;
+        const MD_REF_DEF** ret;
+
+        key_buf.label = (CHAR*) label;
+        key_buf.label_size = label_size;
+        key_buf.hash = md_link_label_hash(key_buf.label, key_buf.label_size);
+
+        ret = (const MD_REF_DEF**) bsearch(&key, list->ref_defs,
+                    list->n_ref_defs, sizeof(MD_REF_DEF*), md_ref_def_cmp);
+        if(ret != NULL)
+            return *ret;
+        else
+            return NULL;
+    }
+}
+
+
+/***************************
+ ***  Recognizing Links  ***
+ ***************************/
+
+/* Note this code is partially shared between processing inlines and blocks
+ * as reference definitions and links share some helper parser functions.
+ */
+
+typedef struct MD_LINK_ATTR_tag MD_LINK_ATTR;
+struct MD_LINK_ATTR_tag {
+    OFF dest_beg;
+    OFF dest_end;
+
+    CHAR* title;
+    SZ title_size;
+    int title_needs_free;
+};
+
+
+static int
+md_is_link_label(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg,
+                 OFF* p_end, int* p_beg_line_index, int* p_end_line_index,
+                 OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+    OFF contents_beg = 0;
+    OFF contents_end = 0;
+    int line_index = 0;
+    int len = 0;
+
+    if(CH(off) != _T('['))
+        return FALSE;
+    off++;
+
+    while(1) {
+        OFF line_end = lines[line_index].end;
+
+        while(off < line_end) {
+            if(CH(off) == _T('\\')  &&  off+1 < ctx->size  &&  (ISPUNCT(off+1) || ISNEWLINE(off+1))) {
+                if(contents_end == 0) {
+                    contents_beg = off;
+                    *p_beg_line_index = line_index;
+                }
+                contents_end = off + 2;
+                off += 2;
+            } else if(CH(off) == _T('[')) {
+                return FALSE;
+            } else if(CH(off) == _T(']')) {
+                if(contents_beg < contents_end) {
+                    /* Success. */
+                    *p_contents_beg = contents_beg;
+                    *p_contents_end = contents_end;
+                    *p_end = off+1;
+                    *p_end_line_index = line_index;
+                    return TRUE;
+                } else {
+                    /* Link label must have some non-whitespace contents. */
+                    return FALSE;
+                }
+            } else {
+                unsigned codepoint;
+                SZ char_size;
+
+                codepoint = md_decode_unicode(ctx->text, off, ctx->size, &char_size);
+                if(!ISUNICODEWHITESPACE_(codepoint)) {
+                    if(contents_end == 0) {
+                        contents_beg = off;
+                        *p_beg_line_index = line_index;
+                    }
+                    contents_end = off + char_size;
+                }
+
+                off += char_size;
+            }
+
+            len++;
+            if(len > 999)
+                return FALSE;
+        }
+
+        line_index++;
+        len++;
+        if(line_index < n_lines)
+            off = lines[line_index].beg;
+        else
+            break;
+    }
+
+    return FALSE;
+}
+
+static int
+md_is_link_destination_A(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end,
+                         OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+
+    if(off >= max_end  ||  CH(off) != _T('<'))
+        return FALSE;
+    off++;
+
+    while(off < max_end) {
+        if(CH(off) == _T('\\')  &&  off+1 < max_end  &&  ISPUNCT(off+1)) {
+            off += 2;
+            continue;
+        }
+
+        if(ISNEWLINE(off)  ||  CH(off) == _T('<'))
+            return FALSE;
+
+        if(CH(off) == _T('>')) {
+            /* Success. */
+            *p_contents_beg = beg+1;
+            *p_contents_end = off;
+            *p_end = off+1;
+            return TRUE;
+        }
+
+        off++;
+    }
+
+    return FALSE;
+}
+
+static int
+md_is_link_destination_B(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end,
+                         OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+    int parenthesis_level = 0;
+
+    while(off < max_end) {
+        if(CH(off) == _T('\\')  &&  off+1 < max_end  &&  ISPUNCT(off+1)) {
+            off += 2;
+            continue;
+        }
+
+        if(ISWHITESPACE(off) || ISCNTRL(off))
+            break;
+
+        /* Link destination may include balanced pairs of unescaped '(' ')'.
+         * Note we limit the maximal nesting level by 32 to protect us from
+         * https://github.com/jgm/cmark/issues/214 */
+        if(CH(off) == _T('(')) {
+            parenthesis_level++;
+            if(parenthesis_level > 32)
+                return FALSE;
+        } else if(CH(off) == _T(')')) {
+            if(parenthesis_level == 0)
+                break;
+            parenthesis_level--;
+        }
+
+        off++;
+    }
+
+    if(parenthesis_level != 0  ||  off == beg)
+        return FALSE;
+
+    /* Success. */
+    *p_contents_beg = beg;
+    *p_contents_end = off;
+    *p_end = off;
+    return TRUE;
+}
+
+static inline int
+md_is_link_destination(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end,
+                       OFF* p_contents_beg, OFF* p_contents_end)
+{
+    if(CH(beg) == _T('<'))
+        return md_is_link_destination_A(ctx, beg, max_end, p_end, p_contents_beg, p_contents_end);
+    else
+        return md_is_link_destination_B(ctx, beg, max_end, p_end, p_contents_beg, p_contents_end);
+}
+
+static int
+md_is_link_title(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg,
+                 OFF* p_end, int* p_beg_line_index, int* p_end_line_index,
+                 OFF* p_contents_beg, OFF* p_contents_end)
+{
+    OFF off = beg;
+    CHAR closer_char;
+    int line_index = 0;
+
+    /* White space with up to one line break. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+    if(off == beg)
+        return FALSE;
+
+    *p_beg_line_index = line_index;
+
+    /* First char determines how to detect end of it. */
+    switch(CH(off)) {
+        case _T('"'):   closer_char = _T('"'); break;
+        case _T('\''):  closer_char = _T('\''); break;
+        case _T('('):   closer_char = _T(')'); break;
+        default:        return FALSE;
+    }
+    off++;
+
+    *p_contents_beg = off;
+
+    while(line_index < n_lines) {
+        OFF line_end = lines[line_index].end;
+
+        while(off < line_end) {
+            if(CH(off) == _T('\\')  &&  off+1 < ctx->size  &&  (ISPUNCT(off+1) || ISNEWLINE(off+1))) {
+                off++;
+            } else if(CH(off) == closer_char) {
+                /* Success. */
+                *p_contents_end = off;
+                *p_end = off+1;
+                *p_end_line_index = line_index;
+                return TRUE;
+            } else if(closer_char == _T(')')  &&  CH(off) == _T('(')) {
+                /* ()-style title cannot contain (unescaped '(')) */
+                return FALSE;
+            }
+
+            off++;
+        }
+
+        line_index++;
+    }
+
+    return FALSE;
+}
+
+/* Returns 0 if it is not a reference definition.
+ *
+ * Returns N > 0 if it is a reference definition. N then corresponds to the
+ * number of lines forming it). In this case the definition is stored for
+ * resolving any links referring to it.
+ *
+ * Returns -1 in case of an error (out of memory).
+ */
+static int
+md_is_link_reference_definition(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    OFF label_contents_beg;
+    OFF label_contents_end;
+    int label_contents_line_index = -1;
+    int label_is_multiline = FALSE;
+    OFF dest_contents_beg;
+    OFF dest_contents_end;
+    OFF title_contents_beg;
+    OFF title_contents_end;
+    int title_contents_line_index;
+    int title_is_multiline = FALSE;
+    OFF off;
+    int line_index = 0;
+    int tmp_line_index;
+    MD_REF_DEF* def = NULL;
+    int ret = 0;
+
+    /* Link label. */
+    if(!md_is_link_label(ctx, lines, n_lines, lines[0].beg,
+                &off, &label_contents_line_index, &line_index,
+                &label_contents_beg, &label_contents_end))
+        return FALSE;
+    label_is_multiline = (label_contents_line_index != line_index);
+
+    /* Colon. */
+    if(off >= lines[line_index].end  ||  CH(off) != _T(':'))
+        return FALSE;
+    off++;
+
+    /* Optional white space with up to one line break. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+
+    /* Link destination. */
+    if(!md_is_link_destination(ctx, off, lines[line_index].end,
+                &off, &dest_contents_beg, &dest_contents_end))
+        return FALSE;
+
+    /* (Optional) title. Note we interpret it as an title only if nothing
+     * more follows on its last line. */
+    if(md_is_link_title(ctx, lines + line_index, n_lines - line_index, off,
+                &off, &title_contents_line_index, &tmp_line_index,
+                &title_contents_beg, &title_contents_end)
+        &&  off >= lines[line_index + tmp_line_index].end)
+    {
+        title_is_multiline = (tmp_line_index != title_contents_line_index);
+        title_contents_line_index += line_index;
+        line_index += tmp_line_index;
+    } else {
+        /* Not a title. */
+        title_is_multiline = FALSE;
+        title_contents_beg = off;
+        title_contents_end = off;
+        title_contents_line_index = 0;
+    }
+
+    /* Nothing more can follow on the last line. */
+    if(off < lines[line_index].end)
+        return FALSE;
+
+    /* So, it _is_ a reference definition. Remember it. */
+    if(ctx->n_ref_defs >= ctx->alloc_ref_defs) {
+        MD_REF_DEF* new_defs;
+
+        ctx->alloc_ref_defs = (ctx->alloc_ref_defs > 0
+                ? ctx->alloc_ref_defs + ctx->alloc_ref_defs / 2
+                : 16);
+        new_defs = (MD_REF_DEF*) realloc(ctx->ref_defs, ctx->alloc_ref_defs * sizeof(MD_REF_DEF));
+        if(new_defs == NULL) {
+            MD_LOG("realloc() failed.");
+            goto abort;
+        }
+
+        ctx->ref_defs = new_defs;
+    }
+    def = &ctx->ref_defs[ctx->n_ref_defs];
+    memset(def, 0, sizeof(MD_REF_DEF));
+
+    if(label_is_multiline) {
+        MD_CHECK(md_merge_lines_alloc(ctx, label_contents_beg, label_contents_end,
+                    lines + label_contents_line_index, n_lines - label_contents_line_index,
+                    _T(' '), &def->label, &def->label_size));
+        def->label_needs_free = TRUE;
+    } else {
+        def->label = (CHAR*) STR(label_contents_beg);
+        def->label_size = label_contents_end - label_contents_beg;
+    }
+
+    if(title_is_multiline) {
+        MD_CHECK(md_merge_lines_alloc(ctx, title_contents_beg, title_contents_end,
+                    lines + title_contents_line_index, n_lines - title_contents_line_index,
+                    _T('\n'), &def->title, &def->title_size));
+        def->title_needs_free = TRUE;
+    } else {
+        def->title = (CHAR*) STR(title_contents_beg);
+        def->title_size = title_contents_end - title_contents_beg;
+    }
+
+    def->dest_beg = dest_contents_beg;
+    def->dest_end = dest_contents_end;
+
+    /* Success. */
+    ctx->n_ref_defs++;
+    return line_index + 1;
+
+abort:
+    /* Failure. */
+    if(def != NULL  &&  def->label_needs_free)
+        free(def->label);
+    if(def != NULL  &&  def->title_needs_free)
+        free(def->title);
+    return ret;
+}
+
+static int
+md_is_link_reference(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                     OFF beg, OFF end, MD_LINK_ATTR* attr)
+{
+    const MD_REF_DEF* def;
+    const MD_LINE* beg_line;
+    int is_multiline;
+    CHAR* label;
+    SZ label_size;
+    int ret;
+
+    MD_ASSERT(CH(beg) == _T('[') || CH(beg) == _T('!'));
+    MD_ASSERT(CH(end-1) == _T(']'));
+
+    beg += (CH(beg) == _T('!') ? 2 : 1);
+    end--;
+
+    /* Find lines corresponding to the beg and end positions. */
+    beg_line = md_lookup_line(beg, lines, n_lines);
+    is_multiline = (end > beg_line->end);
+
+    if(is_multiline) {
+        MD_CHECK(md_merge_lines_alloc(ctx, beg, end, beg_line,
+                 (int)(n_lines - (beg_line - lines)), _T(' '), &label, &label_size));
+    } else {
+        label = (CHAR*) STR(beg);
+        label_size = end - beg;
+    }
+
+    def = md_lookup_ref_def(ctx, label, label_size);
+    if(def != NULL) {
+        attr->dest_beg = def->dest_beg;
+        attr->dest_end = def->dest_end;
+        attr->title = def->title;
+        attr->title_size = def->title_size;
+        attr->title_needs_free = FALSE;
+    }
+
+    if(is_multiline)
+        free(label);
+
+    ret = (def != NULL);
+
+abort:
+    return ret;
+}
+
+static int
+md_is_inline_link_spec(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                       OFF beg, OFF* p_end, MD_LINK_ATTR* attr)
+{
+    int line_index = 0;
+    int tmp_line_index;
+    OFF title_contents_beg;
+    OFF title_contents_end;
+    int title_contents_line_index;
+    int title_is_multiline;
+    OFF off = beg;
+    int ret = FALSE;
+
+    while(off >= lines[line_index].end)
+        line_index++;
+
+    MD_ASSERT(CH(off) == _T('('));
+    off++;
+
+    /* Optional white space with up to one line break. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if(off >= lines[line_index].end  &&  (off >= ctx->size  ||  ISNEWLINE(off))) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+
+    /* Link destination may be omitted, but only when not also having a title. */
+    if(off < ctx->size  &&  CH(off) == _T(')')) {
+        attr->dest_beg = off;
+        attr->dest_end = off;
+        attr->title = NULL;
+        attr->title_size = 0;
+        attr->title_needs_free = FALSE;
+        off++;
+        *p_end = off;
+        return TRUE;
+    }
+
+    /* Link destination. */
+    if(!md_is_link_destination(ctx, off, lines[line_index].end,
+                        &off, &attr->dest_beg, &attr->dest_end))
+        return FALSE;
+
+    /* (Optional) title. */
+    if(md_is_link_title(ctx, lines + line_index, n_lines - line_index, off,
+                &off, &title_contents_line_index, &tmp_line_index,
+                &title_contents_beg, &title_contents_end))
+    {
+        title_is_multiline = (tmp_line_index != title_contents_line_index);
+        title_contents_line_index += line_index;
+        line_index += tmp_line_index;
+    } else {
+        /* Not a title. */
+        title_is_multiline = FALSE;
+        title_contents_beg = off;
+        title_contents_end = off;
+        title_contents_line_index = 0;
+    }
+
+    /* Optional whitespace followed with final ')'. */
+    while(off < lines[line_index].end  &&  ISWHITESPACE(off))
+        off++;
+    if (off >= lines[line_index].end  &&  (off >= ctx->size || ISNEWLINE(off))) {
+        line_index++;
+        if(line_index >= n_lines)
+            return FALSE;
+        off = lines[line_index].beg;
+    }
+    if(CH(off) != _T(')'))
+        goto abort;
+    off++;
+
+    if(title_contents_beg >= title_contents_end) {
+        attr->title = NULL;
+        attr->title_size = 0;
+        attr->title_needs_free = FALSE;
+    } else if(!title_is_multiline) {
+        attr->title = (CHAR*) STR(title_contents_beg);
+        attr->title_size = title_contents_end - title_contents_beg;
+        attr->title_needs_free = FALSE;
+    } else {
+        MD_CHECK(md_merge_lines_alloc(ctx, title_contents_beg, title_contents_end,
+                    lines + title_contents_line_index, n_lines - title_contents_line_index,
+                    _T('\n'), &attr->title, &attr->title_size));
+        attr->title_needs_free = TRUE;
+    }
+
+    *p_end = off;
+    ret = TRUE;
+
+abort:
+    return ret;
+}
+
+static void
+md_free_ref_defs(MD_CTX* ctx)
+{
+    int i;
+
+    for(i = 0; i < ctx->n_ref_defs; i++) {
+        MD_REF_DEF* def = &ctx->ref_defs[i];
+
+        if(def->label_needs_free)
+            free(def->label);
+        if(def->title_needs_free)
+            free(def->title);
+    }
+
+    free(ctx->ref_defs);
+}
+
+
+/******************************************
+ ***  Processing Inlines (a.k.a Spans)  ***
+ ******************************************/
+
+/* We process inlines in few phases:
+ *
+ * (1) We go through the block text and collect all significant characters
+ *     which may start/end a span or some other significant position into
+ *     ctx->marks[]. Core of this is what md_collect_marks() does.
+ *
+ *     We also do some very brief preliminary context-less analysis, whether
+ *     it might be opener or closer (e.g. of an emphasis span).
+ *
+ *     This speeds the other steps as we do not need to re-iterate over all
+ *     characters anymore.
+ *
+ * (2) We analyze each potential mark types, in order by their precedence.
+ *
+ *     In each md_analyze_XXX() function, we re-iterate list of the marks,
+ *     skipping already resolved regions (in preceding precedences) and try to
+ *     resolve them.
+ *
+ * (2.1) For trivial marks, which are single (e.g. HTML entity), we just mark
+ *       them as resolved.
+ *
+ * (2.2) For range-type marks, we analyze whether the mark could be closer
+ *       and, if yes, whether there is some preceding opener it could satisfy.
+ *
+ *       If not we check whether it could be really an opener and if yes, we
+ *       remember it so subsequent closers may resolve it.
+ *
+ * (3) Finally, when all marks were analyzed, we render the block contents
+ *     by calling MD_RENDERER::text() callback, interrupting by ::enter_span()
+ *     or ::close_span() whenever we reach a resolved mark.
+ */
+
+
+/* The mark structure.
+ *
+ * '\\': Maybe escape sequence.
+ * '\0': NULL char.
+ *  '*': Maybe (strong) emphasis start/end.
+ *  '_': Maybe (strong) emphasis start/end.
+ *  '~': Maybe strikethrough start/end (needs MD_FLAG_STRIKETHROUGH).
+ *  '`': Maybe code span start/end.
+ *  '&': Maybe start of entity.
+ *  ';': Maybe end of entity.
+ *  '<': Maybe start of raw HTML or autolink.
+ *  '>': Maybe end of raw HTML or autolink.
+ *  '[': Maybe start of link label or link text.
+ *  '!': Equivalent of '[' for image.
+ *  ']': Maybe end of link label or link text.
+ *  '@': Maybe permissive e-mail auto-link (needs MD_FLAG_PERMISSIVEEMAILAUTOLINKS).
+ *  ':': Maybe permissive URL auto-link (needs MD_FLAG_PERMISSIVEURLAUTOLINKS).
+ *  '.': Maybe permissive WWW auto-link (needs MD_FLAG_PERMISSIVEWWWAUTOLINKS).
+ *  'D': Dummy mark, it reserves a space for splitting a previous mark
+ *       (e.g. emphasis) or to make more space for storing some special data
+ *       related to the preceding mark (e.g. link).
+ *
+ * Note that not all instances of these chars in the text imply creation of the
+ * structure. Only those which have (or may have, after we see more context)
+ * the special meaning.
+ *
+ * (Keep this struct as small as possible to fit as much of them into CPU
+ * cache line.)
+ */
+struct MD_MARK_tag {
+    OFF beg;
+    OFF end;
+
+    /* For unresolved openers, 'prev' and 'next' form the chain of open openers
+     * of given type 'ch'.
+     *
+     * During resolving, we disconnect from the chain and point to the
+     * corresponding counterpart so opener points to its closer and vice versa.
+     */
+    int prev;
+    int next;
+    CHAR ch;
+    unsigned char flags;
+};
+
+/* Mark flags (these apply to ALL mark types). */
+#define MD_MARK_POTENTIAL_OPENER            0x01  /* Maybe opener. */
+#define MD_MARK_POTENTIAL_CLOSER            0x02  /* Maybe closer. */
+#define MD_MARK_OPENER                      0x04  /* Definitely opener. */
+#define MD_MARK_CLOSER                      0x08  /* Definitely closer. */
+#define MD_MARK_RESOLVED                    0x10  /* Resolved in any definite way. */
+
+/* Mark flags specific for various mark types (so they can share bits). */
+#define MD_MARK_EMPH_INTRAWORD              0x20  /* Helper for the "rule of 3". */
+#define MD_MARK_EMPH_MOD3_0                 0x40
+#define MD_MARK_EMPH_MOD3_1                 0x80
+#define MD_MARK_EMPH_MOD3_2                 (0x40 | 0x80)
+#define MD_MARK_EMPH_MOD3_MASK              (0x40 | 0x80)
+#define MD_MARK_AUTOLINK                    0x20  /* Distinguisher for '<', '>'. */
+#define MD_MARK_VALIDPERMISSIVEAUTOLINK     0x20  /* For permissive autolinks. */
+#define MD_MARK_HASNESTEDBRACKETS           0x20  /* For '[' to rule out invalid link labels early */
+
+static MD_MARKCHAIN*
+md_asterisk_chain(MD_CTX* ctx, unsigned flags)
+{
+    switch(flags & (MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_MASK)) {
+        case MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_0:  return &ASTERISK_OPENERS_intraword_mod3_0;
+        case MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_1:  return &ASTERISK_OPENERS_intraword_mod3_1;
+        case MD_MARK_EMPH_INTRAWORD | MD_MARK_EMPH_MOD3_2:  return &ASTERISK_OPENERS_intraword_mod3_2;
+        case MD_MARK_EMPH_MOD3_0:                           return &ASTERISK_OPENERS_extraword_mod3_0;
+        case MD_MARK_EMPH_MOD3_1:                           return &ASTERISK_OPENERS_extraword_mod3_1;
+        case MD_MARK_EMPH_MOD3_2:                           return &ASTERISK_OPENERS_extraword_mod3_2;
+        default:                                            MD_UNREACHABLE();
+    }
+    return NULL;
+}
+
+static MD_MARKCHAIN*
+md_mark_chain(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+
+    switch(mark->ch) {
+        case _T('*'):   return md_asterisk_chain(ctx, mark->flags);
+        case _T('_'):   return &UNDERSCORE_OPENERS;
+        case _T('~'):   return (mark->end - mark->beg == 1) ? &TILDE_OPENERS_1 : &TILDE_OPENERS_2;
+        case _T('!'):   MD_FALLTHROUGH();
+        case _T('['):   return &BRACKET_OPENERS;
+        case _T('|'):   return &TABLECELLBOUNDARIES;
+        default:        return NULL;
+    }
+}
+
+static MD_MARK*
+md_push_mark(MD_CTX* ctx)
+{
+    if(ctx->n_marks >= ctx->alloc_marks) {
+        MD_MARK* new_marks;
+
+        ctx->alloc_marks = (ctx->alloc_marks > 0
+                ? ctx->alloc_marks + ctx->alloc_marks / 2
+                : 64);
+        new_marks = realloc(ctx->marks, ctx->alloc_marks * sizeof(MD_MARK));
+        if(new_marks == NULL) {
+            MD_LOG("realloc() failed.");
+            return NULL;
+        }
+
+        ctx->marks = new_marks;
+    }
+
+    return &ctx->marks[ctx->n_marks++];
+}
+
+#define PUSH_MARK_()                                                    \
+        do {                                                            \
+            mark = md_push_mark(ctx);                                   \
+            if(mark == NULL) {                                          \
+                ret = -1;                                               \
+                goto abort;                                             \
+            }                                                           \
+        } while(0)
+
+#define PUSH_MARK(ch_, beg_, end_, flags_)                              \
+        do {                                                            \
+            PUSH_MARK_();                                               \
+            mark->beg = (beg_);                                         \
+            mark->end = (end_);                                         \
+            mark->prev = -1;                                            \
+            mark->next = -1;                                            \
+            mark->ch = (char)(ch_);                                     \
+            mark->flags = (flags_);                                     \
+        } while(0)
+
+
+static void
+md_mark_chain_append(MD_CTX* ctx, MD_MARKCHAIN* chain, int mark_index)
+{
+    if(chain->tail >= 0)
+        ctx->marks[chain->tail].next = mark_index;
+    else
+        chain->head = mark_index;
+
+    ctx->marks[mark_index].prev = chain->tail;
+    ctx->marks[mark_index].next = -1;
+    chain->tail = mark_index;
+}
+
+/* Sometimes, we need to store a pointer into the mark. It is quite rare
+ * so we do not bother to make MD_MARK use union, and it can only happen
+ * for dummy marks. */
+static inline void
+md_mark_store_ptr(MD_CTX* ctx, int mark_index, void* ptr)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_ASSERT(mark->ch == 'D');
+
+    /* Check only members beg and end are misused for this. */
+    MD_ASSERT(sizeof(void*) <= 2 * sizeof(OFF));
+    memcpy(mark, &ptr, sizeof(void*));
+}
+
+static inline void*
+md_mark_get_ptr(MD_CTX* ctx, int mark_index)
+{
+    void* ptr;
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_ASSERT(mark->ch == 'D');
+    memcpy(&ptr, mark, sizeof(void*));
+    return ptr;
+}
+
+static void
+md_resolve_range(MD_CTX* ctx, MD_MARKCHAIN* chain, int opener_index, int closer_index)
+{
+    MD_MARK* opener = &ctx->marks[opener_index];
+    MD_MARK* closer = &ctx->marks[closer_index];
+
+    /* Remove opener from the list of openers. */
+    if(chain != NULL) {
+        if(opener->prev >= 0)
+            ctx->marks[opener->prev].next = opener->next;
+        else
+            chain->head = opener->next;
+
+        if(opener->next >= 0)
+            ctx->marks[opener->next].prev = opener->prev;
+        else
+            chain->tail = opener->prev;
+    }
+
+    /* Interconnect opener and closer and mark both as resolved. */
+    opener->next = closer_index;
+    opener->flags |= MD_MARK_OPENER | MD_MARK_RESOLVED;
+    closer->prev = opener_index;
+    closer->flags |= MD_MARK_CLOSER | MD_MARK_RESOLVED;
+}
+
+
+#define MD_ROLLBACK_ALL         0
+#define MD_ROLLBACK_CROSSING    1
+
+/* In the range ctx->marks[opener_index] ... [closer_index], undo some or all
+ * resolvings accordingly to these rules:
+ *
+ * (1) All openers BEFORE the range corresponding to any closer inside the
+ *     range are un-resolved and they are re-added to their respective chains
+ *     of unresolved openers. This ensures we can reuse the opener for closers
+ *     AFTER the range.
+ *
+ * (2) If 'how' is MD_ROLLBACK_ALL, then ALL resolved marks inside the range
+ *     are discarded.
+ *
+ * (3) If 'how' is MD_ROLLBACK_CROSSING, only closers with openers handled
+ *     in (1) are discarded. I.e. pairs of openers and closers which are both
+ *     inside the range are retained as well as any unpaired marks.
+ */
+static void
+md_rollback(MD_CTX* ctx, int opener_index, int closer_index, int how)
+{
+    int i;
+    int mark_index;
+
+    /* Cut all unresolved openers at the mark index. */
+    for(i = OPENERS_CHAIN_FIRST; i < OPENERS_CHAIN_LAST+1; i++) {
+        MD_MARKCHAIN* chain = &ctx->mark_chains[i];
+
+        while(chain->tail >= opener_index) {
+            int same = chain->tail == opener_index;
+            chain->tail = ctx->marks[chain->tail].prev;
+            if (same) break;
+        }
+
+        if(chain->tail >= 0)
+            ctx->marks[chain->tail].next = -1;
+        else
+            chain->head = -1;
+    }
+
+    /* Go backwards so that unresolved openers are re-added into their
+     * respective chains, in the right order. */
+    mark_index = closer_index - 1;
+    while(mark_index > opener_index) {
+        MD_MARK* mark = &ctx->marks[mark_index];
+        int mark_flags = mark->flags;
+        int discard_flag = (how == MD_ROLLBACK_ALL);
+
+        if(mark->flags & MD_MARK_CLOSER) {
+            int mark_opener_index = mark->prev;
+
+            /* Undo opener BEFORE the range. */
+            if(mark_opener_index < opener_index) {
+                MD_MARK* mark_opener = &ctx->marks[mark_opener_index];
+                MD_MARKCHAIN* chain;
+
+                mark_opener->flags &= ~(MD_MARK_OPENER | MD_MARK_CLOSER | MD_MARK_RESOLVED);
+                chain = md_mark_chain(ctx, opener_index);
+                if(chain != NULL) {
+                    md_mark_chain_append(ctx, chain, mark_opener_index);
+                    discard_flag = 1;
+                }
+            }
+        }
+
+        /* And reset our flags. */
+        if(discard_flag) {
+            /* Make zero-length closer a dummy mark as that's how it was born */
+            if((mark->flags & MD_MARK_CLOSER)  &&  mark->beg == mark->end)
+                mark->ch = 'D';
+
+            mark->flags &= ~(MD_MARK_OPENER | MD_MARK_CLOSER | MD_MARK_RESOLVED);
+        }
+
+        /* Jump as far as we can over unresolved or non-interesting marks. */
+        switch(how) {
+            case MD_ROLLBACK_CROSSING:
+                if((mark_flags & MD_MARK_CLOSER)  &&  mark->prev > opener_index) {
+                    /* If we are closer with opener INSIDE the range, there may
+                     * not be any other crosser inside the subrange. */
+                    mark_index = mark->prev;
+                    break;
+                }
+                MD_FALLTHROUGH();
+            default:
+                mark_index--;
+                break;
+        }
+    }
+}
+
+static void
+md_build_mark_char_map(MD_CTX* ctx)
+{
+    memset(ctx->mark_char_map, 0, sizeof(ctx->mark_char_map));
+
+    ctx->mark_char_map['\\'] = 1;
+    ctx->mark_char_map['*'] = 1;
+    ctx->mark_char_map['_'] = 1;
+    ctx->mark_char_map['`'] = 1;
+    ctx->mark_char_map['&'] = 1;
+    ctx->mark_char_map[';'] = 1;
+    ctx->mark_char_map['<'] = 1;
+    ctx->mark_char_map['>'] = 1;
+    ctx->mark_char_map['['] = 1;
+    ctx->mark_char_map['!'] = 1;
+    ctx->mark_char_map[']'] = 1;
+    ctx->mark_char_map['\0'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_STRIKETHROUGH)
+        ctx->mark_char_map['~'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_LATEXMATHSPANS)
+        ctx->mark_char_map['$'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_PERMISSIVEEMAILAUTOLINKS)
+        ctx->mark_char_map['@'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_PERMISSIVEURLAUTOLINKS)
+        ctx->mark_char_map[':'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_PERMISSIVEWWWAUTOLINKS)
+        ctx->mark_char_map['.'] = 1;
+
+    if((ctx->parser.flags & MD_FLAG_TABLES) || (ctx->parser.flags & MD_FLAG_WIKILINKS))
+        ctx->mark_char_map['|'] = 1;
+
+    if(ctx->parser.flags & MD_FLAG_COLLAPSEWHITESPACE) {
+        int i;
+
+        for(i = 0; i < (int) sizeof(ctx->mark_char_map); i++) {
+            if(ISWHITESPACE_(i))
+                ctx->mark_char_map[i] = 1;
+        }
+    }
+}
+
+/* We limit code span marks to lower than 32 backticks. This solves the
+ * pathologic case of too many openers, each of different length: Their
+ * resolving would be then O(n^2). */
+#define CODESPAN_MARK_MAXLEN    32
+
+static int
+md_is_code_span(MD_CTX* ctx, const MD_LINE* lines, int n_lines, OFF beg,
+                OFF* p_opener_beg, OFF* p_opener_end,
+                OFF* p_closer_beg, OFF* p_closer_end,
+                OFF last_potential_closers[CODESPAN_MARK_MAXLEN],
+                int* p_reached_paragraph_end)
+{
+    OFF opener_beg = beg;
+    OFF opener_end;
+    OFF closer_beg;
+    OFF closer_end;
+    SZ mark_len;
+    OFF line_end;
+    int has_space_after_opener = FALSE;
+    int has_eol_after_opener = FALSE;
+    int has_space_before_closer = FALSE;
+    int has_eol_before_closer = FALSE;
+    int has_only_space = TRUE;
+    int line_index = 0;
+
+    line_end = lines[0].end;
+    opener_end = opener_beg;
+    while(opener_end < line_end  &&  CH(opener_end) == _T('`'))
+        opener_end++;
+    has_space_after_opener = (opener_end < line_end && CH(opener_end) == _T(' '));
+    has_eol_after_opener = (opener_end == line_end);
+
+    /* The caller needs to know end of the opening mark even if we fail. */
+    *p_opener_end = opener_end;
+
+    mark_len = opener_end - opener_beg;
+    if(mark_len > CODESPAN_MARK_MAXLEN)
+        return FALSE;
+
+    /* Check whether we already know there is no closer of this length.
+     * If so, re-scan does no sense. This fixes issue #59. */
+    if(last_potential_closers[mark_len-1] >= lines[n_lines-1].end  ||
+       (*p_reached_paragraph_end  &&  last_potential_closers[mark_len-1] < opener_end))
+        return FALSE;
+
+    closer_beg = opener_end;
+    closer_end = opener_end;
+
+    /* Find closer mark. */
+    while(TRUE) {
+        while(closer_beg < line_end  &&  CH(closer_beg) != _T('`')) {
+            if(CH(closer_beg) != _T(' '))
+                has_only_space = FALSE;
+            closer_beg++;
+        }
+        closer_end = closer_beg;
+        while(closer_end < line_end  &&  CH(closer_end) == _T('`'))
+            closer_end++;
+
+        if(closer_end - closer_beg == mark_len) {
+            /* Success. */
+            has_space_before_closer = (closer_beg > lines[line_index].beg && CH(closer_beg-1) == _T(' '));
+            has_eol_before_closer = (closer_beg == lines[line_index].beg);
+            break;
+        }
+
+        if(closer_end - closer_beg > 0) {
+            /* We have found a back-tick which is not part of the closer. */
+            has_only_space = FALSE;
+
+            /* But if we eventually fail, remember it as a potential closer
+             * of its own length for future attempts. This mitigates needs for
+             * rescans. */
+            if(closer_end - closer_beg < CODESPAN_MARK_MAXLEN) {
+                if(closer_beg > last_potential_closers[closer_end - closer_beg - 1])
+                    last_potential_closers[closer_end - closer_beg - 1] = closer_beg;
+            }
+        }
+
+        if(closer_end >= line_end) {
+            line_index++;
+            if(line_index >= n_lines) {
+                /* Reached end of the paragraph and still nothing. */
+                *p_reached_paragraph_end = TRUE;
+                return FALSE;
+            }
+            /* Try on the next line. */
+            line_end = lines[line_index].end;
+            closer_beg = lines[line_index].beg;
+        } else {
+            closer_beg = closer_end;
+        }
+    }
+
+    /* If there is a space or a new line both after and before the opener
+     * (and if the code span is not made of spaces only), consume one initial
+     * and one trailing space as part of the marks. */
+    if(!has_only_space  &&
+       (has_space_after_opener || has_eol_after_opener)  &&
+       (has_space_before_closer || has_eol_before_closer))
+    {
+        if(has_space_after_opener)
+            opener_end++;
+        else
+            opener_end = lines[1].beg;
+
+        if(has_space_before_closer)
+            closer_beg--;
+        else {
+            closer_beg = lines[line_index-1].end;
+            /* We need to eat the preceding "\r\n" but not any line trailing
+             * spaces. */
+            while(closer_beg < ctx->size  &&  ISBLANK(closer_beg))
+                closer_beg++;
+        }
+    }
+
+    *p_opener_beg = opener_beg;
+    *p_opener_end = opener_end;
+    *p_closer_beg = closer_beg;
+    *p_closer_end = closer_end;
+    return TRUE;
+}
+
+static int
+md_is_autolink_uri(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg+1;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    /* Check for scheme. */
+    if(off >= max_end  ||  !ISASCII(off))
+        return FALSE;
+    off++;
+    while(1) {
+        if(off >= max_end)
+            return FALSE;
+        if(off - beg > 32)
+            return FALSE;
+        if(CH(off) == _T(':')  &&  off - beg >= 3)
+            break;
+        if(!ISALNUM(off) && CH(off) != _T('+') && CH(off) != _T('-') && CH(off) != _T('.'))
+            return FALSE;
+        off++;
+    }
+
+    /* Check the path after the scheme. */
+    while(off < max_end  &&  CH(off) != _T('>')) {
+        if(ISWHITESPACE(off) || ISCNTRL(off) || CH(off) == _T('<'))
+            return FALSE;
+        off++;
+    }
+
+    if(off >= max_end)
+        return FALSE;
+
+    MD_ASSERT(CH(off) == _T('>'));
+    *p_end = off+1;
+    return TRUE;
+}
+
+static int
+md_is_autolink_email(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end)
+{
+    OFF off = beg + 1;
+    int label_len;
+
+    MD_ASSERT(CH(beg) == _T('<'));
+
+    /* The code should correspond to this regexp:
+            /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+
+            @[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
+            (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+     */
+
+    /* Username (before '@'). */
+    while(off < max_end  &&  (ISALNUM(off) || ISANYOF(off, _T(".!#$%&'*+/=?^_`{|}~-"))))
+        off++;
+    if(off <= beg+1)
+        return FALSE;
+
+    /* '@' */
+    if(off >= max_end  ||  CH(off) != _T('@'))
+        return FALSE;
+    off++;
+
+    /* Labels delimited with '.'; each label is sequence of 1 - 63 alnum
+     * characters or '-', but '-' is not allowed as first or last char. */
+    label_len = 0;
+    while(off < max_end) {
+        if(ISALNUM(off))
+            label_len++;
+        else if(CH(off) == _T('-')  &&  label_len > 0)
+            label_len++;
+        else if(CH(off) == _T('.')  &&  label_len > 0  &&  CH(off-1) != _T('-'))
+            label_len = 0;
+        else
+            break;
+
+        if(label_len > 63)
+            return FALSE;
+
+        off++;
+    }
+
+    if(label_len <= 0  || off >= max_end  ||  CH(off) != _T('>') ||  CH(off-1) == _T('-'))
+        return FALSE;
+
+    *p_end = off+1;
+    return TRUE;
+}
+
+static int
+md_is_autolink(MD_CTX* ctx, OFF beg, OFF max_end, OFF* p_end, int* p_missing_mailto)
+{
+    if(md_is_autolink_uri(ctx, beg, max_end, p_end)) {
+        *p_missing_mailto = FALSE;
+        return TRUE;
+    }
+
+    if(md_is_autolink_email(ctx, beg, max_end, p_end)) {
+        *p_missing_mailto = TRUE;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static int
+md_collect_marks(MD_CTX* ctx, const MD_LINE* lines, int n_lines, int table_mode)
+{
+    const MD_LINE* line_term = lines + n_lines;
+    const MD_LINE* line;
+    int ret = 0;
+    MD_MARK* mark;
+    OFF codespan_last_potential_closers[CODESPAN_MARK_MAXLEN] = { 0 };
+    int codespan_scanned_till_paragraph_end = FALSE;
+
+    for(line = lines; line < line_term; line++) {
+        OFF off = line->beg;
+        OFF line_end = line->end;
+
+        while(TRUE) {
+            CHAR ch;
+
+#ifdef MD4C_USE_UTF16
+    /* For UTF-16, mark_char_map[] covers only ASCII. */
+    #define IS_MARK_CHAR(off)   ((CH(off) < SIZEOF_ARRAY(ctx->mark_char_map))  &&  \
+                                (ctx->mark_char_map[(unsigned char) CH(off)]))
+#else
+    /* For 8-bit encodings, mark_char_map[] covers all 256 elements. */
+    #define IS_MARK_CHAR(off)   (ctx->mark_char_map[(unsigned char) CH(off)])
+#endif
+
+            /* Optimization: Use some loop unrolling. */
+            while(off + 3 < line_end  &&  !IS_MARK_CHAR(off+0)  &&  !IS_MARK_CHAR(off+1)
+                                      &&  !IS_MARK_CHAR(off+2)  &&  !IS_MARK_CHAR(off+3))
+                off += 4;
+            while(off < line_end  &&  !IS_MARK_CHAR(off+0))
+                off++;
+
+            if(off >= line_end)
+                break;
+
+            ch = CH(off);
+
+            /* A backslash escape.
+             * It can go beyond line->end as it may involve escaped new
+             * line to form a hard break. */
+            if(ch == _T('\\')  &&  off+1 < ctx->size  &&  (ISPUNCT(off+1) || ISNEWLINE(off+1))) {
+                /* Hard-break cannot be on the last line of the block. */
+                if(!ISNEWLINE(off+1)  ||  line+1 < line_term)
+                    PUSH_MARK(ch, off, off+2, MD_MARK_RESOLVED);
+                off += 2;
+                continue;
+            }
+
+            /* A potential (string) emphasis start/end. */
+            if(ch == _T('*')  ||  ch == _T('_')) {
+                OFF tmp = off+1;
+                int left_level;     /* What precedes: 0 = whitespace; 1 = punctuation; 2 = other char. */
+                int right_level;    /* What follows: 0 = whitespace; 1 = punctuation; 2 = other char. */
+
+                while(tmp < line_end  &&  CH(tmp) == ch)
+                    tmp++;
+
+                if(off == line->beg  ||  ISUNICODEWHITESPACEBEFORE(off))
+                    left_level = 0;
+                else if(ISUNICODEPUNCTBEFORE(off))
+                    left_level = 1;
+                else
+                    left_level = 2;
+
+                if(tmp == line_end  ||  ISUNICODEWHITESPACE(tmp))
+                    right_level = 0;
+                else if(ISUNICODEPUNCT(tmp))
+                    right_level = 1;
+                else
+                    right_level = 2;
+
+                /* Intra-word underscore doesn't have special meaning. */
+                if(ch == _T('_')  &&  left_level == 2  &&  right_level == 2) {
+                    left_level = 0;
+                    right_level = 0;
+                }
+
+                if(left_level != 0  ||  right_level != 0) {
+                    unsigned flags = 0;
+
+                    if(left_level > 0  &&  left_level >= right_level)
+                        flags |= MD_MARK_POTENTIAL_CLOSER;
+                    if(right_level > 0  &&  right_level >= left_level)
+                        flags |= MD_MARK_POTENTIAL_OPENER;
+                    if(left_level == 2  &&  right_level == 2)
+                        flags |= MD_MARK_EMPH_INTRAWORD;
+
+                    /* For "the rule of three" we need to remember the original
+                     * size of the mark (modulo three), before we potentially
+                     * split the mark when being later resolved partially by some
+                     * shorter closer. */
+                    switch((tmp - off) % 3) {
+                        case 0: flags |= MD_MARK_EMPH_MOD3_0; break;
+                        case 1: flags |= MD_MARK_EMPH_MOD3_1; break;
+                        case 2: flags |= MD_MARK_EMPH_MOD3_2; break;
+                    }
+
+                    PUSH_MARK(ch, off, tmp, flags);
+
+                    /* During resolving, multiple asterisks may have to be
+                     * split into independent span start/ends. Consider e.g.
+                     * "**foo* bar*". Therefore we push also some empty dummy
+                     * marks to have enough space for that. */
+                    off++;
+                    while(off < tmp) {
+                        PUSH_MARK('D', off, off, 0);
+                        off++;
+                    }
+                    continue;
+                }
+
+                off = tmp;
+                continue;
+            }
+
+            /* A potential code span start/end. */
+            if(ch == _T('`')) {
+                OFF opener_beg, opener_end;
+                OFF closer_beg, closer_end;
+                int is_code_span;
+
+                is_code_span = md_is_code_span(ctx, line, line_term - line, off,
+                                    &opener_beg, &opener_end, &closer_beg, &closer_end,
+                                    codespan_last_potential_closers,
+                                    &codespan_scanned_till_paragraph_end);
+                if(is_code_span) {
+                    PUSH_MARK(_T('`'), opener_beg, opener_end, MD_MARK_OPENER | MD_MARK_RESOLVED);
+                    PUSH_MARK(_T('`'), closer_beg, closer_end, MD_MARK_CLOSER | MD_MARK_RESOLVED);
+                    ctx->marks[ctx->n_marks-2].next = ctx->n_marks-1;
+                    ctx->marks[ctx->n_marks-1].prev = ctx->n_marks-2;
+
+                    off = closer_end;
+
+                    /* Advance the current line accordingly. */
+                    if(off > line_end) {
+                        line = md_lookup_line(off, line, line_term - line);
+                        line_end = line->end;
+                    }
+                    continue;
+                }
+
+                off = opener_end;
+                continue;
+            }
+
+            /* A potential entity start. */
+            if(ch == _T('&')) {
+                PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_OPENER);
+                off++;
+                continue;
+            }
+
+            /* A potential entity end. */
+            if(ch == _T(';')) {
+                /* We surely cannot be entity unless the previous mark is '&'. */
+                if(ctx->n_marks > 0  &&  ctx->marks[ctx->n_marks-1].ch == _T('&'))
+                    PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_CLOSER);
+
+                off++;
+                continue;
+            }
+
+            /* A potential autolink or raw HTML start/end. */
+            if(ch == _T('<')) {
+                int is_autolink;
+                OFF autolink_end;
+                int missing_mailto;
+
+                if(!(ctx->parser.flags & MD_FLAG_NOHTMLSPANS)) {
+                    int is_html;
+                    OFF html_end;
+
+                    /* Given the nature of the raw HTML, we have to recognize
+                     * it here. Doing so later in md_analyze_lt_gt() could
+                     * open can of worms of quadratic complexity. */
+                    is_html = md_is_html_any(ctx, line, line_term - line, off,
+                                    lines[n_lines-1].end, &html_end);
+                    if(is_html) {
+                        PUSH_MARK(_T('<'), off, off, MD_MARK_OPENER | MD_MARK_RESOLVED);
+                        PUSH_MARK(_T('>'), html_end, html_end, MD_MARK_CLOSER | MD_MARK_RESOLVED);
+                        ctx->marks[ctx->n_marks-2].next = ctx->n_marks-1;
+                        ctx->marks[ctx->n_marks-1].prev = ctx->n_marks-2;
+                        off = html_end;
+
+                        /* Advance the current line accordingly. */
+                        if(off > line_end) {
+                            line = md_lookup_line(off, line, line_term - line);
+                            line_end = line->end;
+                        }
+                        continue;
+                    }
+                }
+
+                is_autolink = md_is_autolink(ctx, off, lines[n_lines-1].end,
+                                    &autolink_end, &missing_mailto);
+                if(is_autolink) {
+                    PUSH_MARK((missing_mailto ? _T('@') : _T('<')), off, off+1,
+                                MD_MARK_OPENER | MD_MARK_RESOLVED | MD_MARK_AUTOLINK);
+                    PUSH_MARK(_T('>'), autolink_end-1, autolink_end,
+                                MD_MARK_CLOSER | MD_MARK_RESOLVED | MD_MARK_AUTOLINK);
+                    ctx->marks[ctx->n_marks-2].next = ctx->n_marks-1;
+                    ctx->marks[ctx->n_marks-1].prev = ctx->n_marks-2;
+                    off = autolink_end;
+                    continue;
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential link or its part. */
+            if(ch == _T('[')  ||  (ch == _T('!') && off+1 < line_end && CH(off+1) == _T('['))) {
+                OFF tmp = (ch == _T('[') ? off+1 : off+2);
+                PUSH_MARK(ch, off, tmp, MD_MARK_POTENTIAL_OPENER);
+                off = tmp;
+                /* Two dummies to make enough place for data we need if it is
+                 * a link. */
+                PUSH_MARK('D', off, off, 0);
+                PUSH_MARK('D', off, off, 0);
+                continue;
+            }
+            if(ch == _T(']')) {
+                PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_CLOSER);
+                off++;
+                continue;
+            }
+
+            /* A potential permissive e-mail autolink. */
+            if(ch == _T('@')) {
+                if(line->beg + 1 <= off  &&  ISALNUM(off-1)  &&
+                    off + 3 < line->end  &&  ISALNUM(off+1))
+                {
+                    PUSH_MARK(ch, off, off+1, MD_MARK_POTENTIAL_OPENER);
+                    /* Push a dummy as a reserve for a closer. */
+                    PUSH_MARK('D', off, off, 0);
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential permissive URL autolink. */
+            if(ch == _T(':')) {
+                static struct {
+                    const CHAR* scheme;
+                    SZ scheme_size;
+                    const CHAR* suffix;
+                    SZ suffix_size;
+                } scheme_map[] = {
+                    /* In the order from the most frequently used, arguably. */
+                    { _T("http"), 4,    _T("//"), 2 },
+                    { _T("https"), 5,   _T("//"), 2 },
+                    { _T("ftp"), 3,     _T("//"), 2 }
+                };
+                int scheme_index;
+
+                for(scheme_index = 0; scheme_index < (int) SIZEOF_ARRAY(scheme_map); scheme_index++) {
+                    const CHAR* scheme = scheme_map[scheme_index].scheme;
+                    const SZ scheme_size = scheme_map[scheme_index].scheme_size;
+                    const CHAR* suffix = scheme_map[scheme_index].suffix;
+                    const SZ suffix_size = scheme_map[scheme_index].suffix_size;
+
+                    if(line->beg + scheme_size <= off  &&  md_ascii_eq(STR(off-scheme_size), scheme, scheme_size)  &&
+                        (line->beg + scheme_size == off || ISWHITESPACE(off-scheme_size-1) || ISANYOF(off-scheme_size-1, _T("*_~([")))  &&
+                        off + 1 + suffix_size < line->end  &&  md_ascii_eq(STR(off+1), suffix, suffix_size))
+                    {
+                        PUSH_MARK(ch, off-scheme_size, off+1+suffix_size, MD_MARK_POTENTIAL_OPENER);
+                        /* Push a dummy as a reserve for a closer. */
+                        PUSH_MARK('D', off, off, 0);
+                        off += 1 + suffix_size;
+                        break;
+                    }
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential permissive WWW autolink. */
+            if(ch == _T('.')) {
+                if(line->beg + 3 <= off  &&  md_ascii_eq(STR(off-3), _T("www"), 3)  &&
+                    (line->beg + 3 == off || ISWHITESPACE(off-4) || ISANYOF(off-4, _T("*_~([")))  &&
+                    off + 1 < line_end)
+                {
+                    PUSH_MARK(ch, off-3, off+1, MD_MARK_POTENTIAL_OPENER);
+                    /* Push a dummy as a reserve for a closer. */
+                    PUSH_MARK('D', off, off, 0);
+                    off++;
+                    continue;
+                }
+
+                off++;
+                continue;
+            }
+
+            /* A potential table cell boundary or wiki link label delimiter. */
+            if((table_mode || ctx->parser.flags & MD_FLAG_WIKILINKS) && ch == _T('|')) {
+                PUSH_MARK(ch, off, off+1, 0);
+                off++;
+                continue;
+            }
+
+            /* A potential strikethrough start/end. */
+            if(ch == _T('~')) {
+                OFF tmp = off+1;
+
+                while(tmp < line_end  &&  CH(tmp) == _T('~'))
+                    tmp++;
+
+                if(tmp - off < 3) {
+                    unsigned flags = 0;
+
+                    if(tmp < line_end  &&  !ISUNICODEWHITESPACE(tmp))
+                        flags |= MD_MARK_POTENTIAL_OPENER;
+                    if(off > line->beg  &&  !ISUNICODEWHITESPACEBEFORE(off))
+                        flags |= MD_MARK_POTENTIAL_CLOSER;
+                    if(flags != 0)
+                        PUSH_MARK(ch, off, tmp, flags);
+                }
+
+                off = tmp;
+                continue;
+            }
+
+            /* A potential equation start/end */
+            if(ch == _T('$')) {
+                /* We can have at most two consecutive $ signs,
+                 * where two dollar signs signify a display equation. */
+                OFF tmp = off+1;
+
+                while(tmp < line_end && CH(tmp) == _T('$'))
+                    tmp++;
+
+                if (tmp - off <= 2)
+                    PUSH_MARK(ch, off, tmp, MD_MARK_POTENTIAL_OPENER | MD_MARK_POTENTIAL_CLOSER);
+                off = tmp;
+                continue;
+            }
+
+            /* Turn non-trivial whitespace into single space. */
+            if(ISWHITESPACE_(ch)) {
+                OFF tmp = off+1;
+
+                while(tmp < line_end  &&  ISWHITESPACE(tmp))
+                    tmp++;
+
+                if(tmp - off > 1  ||  ch != _T(' '))
+                    PUSH_MARK(ch, off, tmp, MD_MARK_RESOLVED);
+
+                off = tmp;
+                continue;
+            }
+
+            /* NULL character. */
+            if(ch == _T('\0')) {
+                PUSH_MARK(ch, off, off+1, MD_MARK_RESOLVED);
+                off++;
+                continue;
+            }
+
+            off++;
+        }
+    }
+
+    /* Add a dummy mark at the end of the mark vector to simplify
+     * process_inlines(). */
+    PUSH_MARK(127, ctx->size, ctx->size, MD_MARK_RESOLVED);
+
+abort:
+    return ret;
+}
+
+static void
+md_analyze_bracket(MD_CTX* ctx, int mark_index)
+{
+    /* We cannot really resolve links here as for that we would need
+     * more context. E.g. a following pair of brackets (reference link),
+     * or enclosing pair of brackets (if the inner is the link, the outer
+     * one cannot be.)
+     *
+     * Therefore we here only construct a list of '[' ']' pairs ordered by
+     * position of the closer. This allows us to analyze what is or is not
+     * link in the right order, from inside to outside in case of nested
+     * brackets.
+     *
+     * The resolving itself is deferred to md_resolve_links().
+     */
+
+    MD_MARK* mark = &ctx->marks[mark_index];
+
+    if(mark->flags & MD_MARK_POTENTIAL_OPENER) {
+        if(BRACKET_OPENERS.head != -1)
+            ctx->marks[BRACKET_OPENERS.tail].flags |= MD_MARK_HASNESTEDBRACKETS;
+
+        md_mark_chain_append(ctx, &BRACKET_OPENERS, mark_index);
+        return;
+    }
+
+    if(BRACKET_OPENERS.tail >= 0) {
+        /* Pop the opener from the chain. */
+        int opener_index = BRACKET_OPENERS.tail;
+        MD_MARK* opener = &ctx->marks[opener_index];
+        if(opener->prev >= 0)
+            ctx->marks[opener->prev].next = -1;
+        else
+            BRACKET_OPENERS.head = -1;
+        BRACKET_OPENERS.tail = opener->prev;
+
+        /* Interconnect the opener and closer. */
+        opener->next = mark_index;
+        mark->prev = opener_index;
+
+        /* Add the pair into chain of potential links for md_resolve_links().
+         * Note we misuse opener->prev for this as opener->next points to its
+         * closer. */
+        if(ctx->unresolved_link_tail >= 0)
+            ctx->marks[ctx->unresolved_link_tail].prev = opener_index;
+        else
+            ctx->unresolved_link_head = opener_index;
+        ctx->unresolved_link_tail = opener_index;
+        opener->prev = -1;
+    }
+}
+
+/* Forward declaration. */
+static void md_analyze_link_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                                     int mark_beg, int mark_end);
+
+static int
+md_resolve_links(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    int opener_index = ctx->unresolved_link_head;
+    OFF last_link_beg = 0;
+    OFF last_link_end = 0;
+    OFF last_img_beg = 0;
+    OFF last_img_end = 0;
+
+    while(opener_index >= 0) {
+        MD_MARK* opener = &ctx->marks[opener_index];
+        int closer_index = opener->next;
+        MD_MARK* closer = &ctx->marks[closer_index];
+        int next_index = opener->prev;
+        MD_MARK* next_opener;
+        MD_MARK* next_closer;
+        MD_LINK_ATTR attr;
+        int is_link = FALSE;
+
+        if(next_index >= 0) {
+            next_opener = &ctx->marks[next_index];
+            next_closer = &ctx->marks[next_opener->next];
+        } else {
+            next_opener = NULL;
+            next_closer = NULL;
+        }
+
+        /* If nested ("[ [ ] ]"), we need to make sure that:
+         *   - The outer does not end inside of (...) belonging to the inner.
+         *   - The outer cannot be link if the inner is link (i.e. not image).
+         *
+         * (Note we here analyze from inner to outer as the marks are ordered
+         * by closer->beg.)
+         */
+        if((opener->beg < last_link_beg  &&  closer->end < last_link_end)  ||
+           (opener->beg < last_img_beg  &&  closer->end < last_img_end)  ||
+           (opener->beg < last_link_end  &&  opener->ch == '['))
+        {
+            opener_index = next_index;
+            continue;
+        }
+
+        /* Recognize and resolve wiki links.
+         * Wiki-links maybe '[[destination]]' or '[[destination|label]]'.
+         */
+        if ((ctx->parser.flags & MD_FLAG_WIKILINKS) &&
+            (opener->end - opener->beg == 1) &&         /* not image */
+            next_opener != NULL &&                      /* double '[' opener */
+            next_opener->ch == '[' &&
+            (next_opener->beg == opener->beg - 1) &&
+            (next_opener->end - next_opener->beg == 1) &&
+            next_closer != NULL &&                      /* double ']' closer */
+            next_closer->ch == ']' &&
+            (next_closer->beg == closer->beg + 1) &&
+            (next_closer->end - next_closer->beg == 1))
+        {
+            MD_MARK* delim = NULL;
+            int delim_index;
+            OFF dest_beg, dest_end;
+
+            is_link = TRUE;
+
+            /* We don't allow destination to be longer than 100 characters.
+             * Lets scan to see whether there is '|'. (If not then the whole
+             * wiki-link has to be below the 100 characters.) */
+            delim_index = opener_index + 1;
+            while(delim_index < closer_index) {
+                MD_MARK* m = &ctx->marks[delim_index];
+                if(m->ch == '|') {
+                    delim = m;
+                    break;
+                }
+                if(m->ch != 'D'  &&  m->beg - opener->end > 100)
+                    break;
+                delim_index++;
+            }
+            dest_beg = opener->end;
+            dest_end = (delim != NULL) ? delim->beg : closer->beg;
+            if(dest_end - dest_beg == 0 || dest_end - dest_beg > 100)
+                is_link = FALSE;
+
+            /* There may not be any new line in the destination. */
+            if(is_link) {
+                OFF off;
+                for(off = dest_beg; off < dest_end; off++) {
+                    if(ISNEWLINE(off)) {
+                        is_link = FALSE;
+                        break;
+                    }
+                }
+            }
+
+            if(is_link) {
+                if(delim != NULL) {
+                    if(delim->end < closer->beg) {
+                        md_rollback(ctx, opener_index, delim_index, MD_ROLLBACK_ALL);
+                        md_rollback(ctx, delim_index, closer_index, MD_ROLLBACK_CROSSING);
+                        delim->flags |= MD_MARK_RESOLVED;
+                        opener->end = delim->beg;
+                    } else {
+                        /* The pipe is just before the closer: [[foo|]] */
+                        md_rollback(ctx, opener_index, closer_index, MD_ROLLBACK_ALL);
+                        closer->beg = delim->beg;
+                        delim = NULL;
+                    }
+                }
+
+                opener->beg = next_opener->beg;
+                opener->next = closer_index;
+                opener->flags |= MD_MARK_OPENER | MD_MARK_RESOLVED;
+
+                closer->end = next_closer->end;
+                closer->prev = opener_index;
+                closer->flags |= MD_MARK_CLOSER | MD_MARK_RESOLVED;
+
+                last_link_beg = opener->beg;
+                last_link_end = closer->end;
+
+                if(delim != NULL)
+                    md_analyze_link_contents(ctx, lines, n_lines, delim_index+1, closer_index);
+
+                opener_index = next_opener->prev;
+                continue;
+            }
+        }
+
+        if(next_opener != NULL  &&  next_opener->beg == closer->end) {
+            if(next_closer->beg > closer->end + 1) {
+                /* Might be full reference link. */
+                if(!(next_opener->flags & MD_MARK_HASNESTEDBRACKETS))
+                    is_link = md_is_link_reference(ctx, lines, n_lines, next_opener->beg, next_closer->end, &attr);
+            } else {
+                /* Might be shortcut reference link. */
+                if(!(opener->flags & MD_MARK_HASNESTEDBRACKETS))
+                    is_link = md_is_link_reference(ctx, lines, n_lines, opener->beg, closer->end, &attr);
+            }
+
+            if(is_link < 0)
+                return -1;
+
+            if(is_link) {
+                /* Eat the 2nd "[...]". */
+                closer->end = next_closer->end;
+
+                /* Do not analyze the label as a standalone link in the next
+                 * iteration. */
+                next_index = ctx->marks[next_index].prev;
+            }
+        } else {
+            if(closer->end < ctx->size  &&  CH(closer->end) == _T('(')) {
+                /* Might be inline link. */
+                OFF inline_link_end = UINT_MAX;
+
+                is_link = md_is_inline_link_spec(ctx, lines, n_lines, closer->end, &inline_link_end, &attr);
+                if(is_link < 0)
+                    return -1;
+
+                /* Check the closing ')' is not inside an already resolved range
+                 * (i.e. a range with a higher priority), e.g. a code span. */
+                if(is_link) {
+                    int i = closer_index + 1;
+
+                    while(i < ctx->n_marks) {
+                        MD_MARK* mark = &ctx->marks[i];
+
+                        if(mark->beg >= inline_link_end)
+                            break;
+                        if((mark->flags & (MD_MARK_OPENER | MD_MARK_RESOLVED)) == (MD_MARK_OPENER | MD_MARK_RESOLVED)) {
+                            if(ctx->marks[mark->next].beg >= inline_link_end) {
+                                /* Cancel the link status. */
+                                if(attr.title_needs_free)
+                                    free(attr.title);
+                                is_link = FALSE;
+                                break;
+                            }
+
+                            i = mark->next + 1;
+                        } else {
+                            i++;
+                        }
+                    }
+                }
+
+                if(is_link) {
+                    /* Eat the "(...)" */
+                    closer->end = inline_link_end;
+                }
+            }
+
+            if(!is_link) {
+                /* Might be collapsed reference link. */
+                if(!(opener->flags & MD_MARK_HASNESTEDBRACKETS))
+                    is_link = md_is_link_reference(ctx, lines, n_lines, opener->beg, closer->end, &attr);
+                if(is_link < 0)
+                    return -1;
+            }
+        }
+
+        if(is_link) {
+            /* Resolve the brackets as a link. */
+            opener->flags |= MD_MARK_OPENER | MD_MARK_RESOLVED;
+            closer->flags |= MD_MARK_CLOSER | MD_MARK_RESOLVED;
+
+            /* If it is a link, we store the destination and title in the two
+             * dummy marks after the opener. */
+            MD_ASSERT(ctx->marks[opener_index+1].ch == 'D');
+            ctx->marks[opener_index+1].beg = attr.dest_beg;
+            ctx->marks[opener_index+1].end = attr.dest_end;
+
+            MD_ASSERT(ctx->marks[opener_index+2].ch == 'D');
+            md_mark_store_ptr(ctx, opener_index+2, attr.title);
+            /* The title might or might not have been allocated for us. */
+            if(attr.title_needs_free)
+                md_mark_chain_append(ctx, &PTR_CHAIN, opener_index+2);
+            ctx->marks[opener_index+2].prev = attr.title_size;
+
+            if(opener->ch == '[') {
+                last_link_beg = opener->beg;
+                last_link_end = closer->end;
+            } else {
+                last_img_beg = opener->beg;
+                last_img_end = closer->end;
+            }
+
+            md_analyze_link_contents(ctx, lines, n_lines, opener_index+1, closer_index);
+
+            /* If the link text is formed by nothing but permissive autolink,
+             * suppress the autolink.
+             * See https://github.com/mity/md4c/issues/152 for more info. */
+            if(ctx->parser.flags & MD_FLAG_PERMISSIVEAUTOLINKS) {
+                MD_MARK* first_nested;
+                MD_MARK* last_nested;
+
+                first_nested = opener + 1;
+                while(first_nested->ch == _T('D')  &&  first_nested < closer)
+                    first_nested++;
+
+                last_nested = closer - 1;
+                while(first_nested->ch == _T('D')  &&  last_nested > opener)
+                    last_nested--;
+
+                if((first_nested->flags & MD_MARK_RESOLVED)  &&
+                   first_nested->beg == opener->end  &&
+                   ISANYOF_(first_nested->ch, _T("@:."))  &&
+                   first_nested->next == (last_nested - ctx->marks)  &&
+                   last_nested->end == closer->beg)
+                {
+                    first_nested->ch = _T('D');
+                    first_nested->flags &= ~MD_MARK_RESOLVED;
+                    last_nested->ch = _T('D');
+                    last_nested->flags &= ~MD_MARK_RESOLVED;
+                }
+            }
+        }
+
+        opener_index = next_index;
+    }
+
+    return 0;
+}
+
+/* Analyze whether the mark '&' starts a HTML entity.
+ * If so, update its flags as well as flags of corresponding closer ';'. */
+static void
+md_analyze_entity(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* opener = &ctx->marks[mark_index];
+    MD_MARK* closer;
+    OFF off;
+
+    /* Cannot be entity if there is no closer as the next mark.
+     * (Any other mark between would mean strange character which cannot be
+     * part of the entity.
+     *
+     * So we can do all the work on '&' and do not call this later for the
+     * closing mark ';'.
+     */
+    if(mark_index + 1 >= ctx->n_marks)
+        return;
+    closer = &ctx->marks[mark_index+1];
+    if(closer->ch != ';')
+        return;
+
+    if(md_is_entity(ctx, opener->beg, closer->end, &off)) {
+        MD_ASSERT(off == closer->end);
+
+        md_resolve_range(ctx, NULL, mark_index, mark_index+1);
+        opener->end = closer->end;
+    }
+}
+
+static void
+md_analyze_table_cell_boundary(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    mark->flags |= MD_MARK_RESOLVED;
+
+    md_mark_chain_append(ctx, &TABLECELLBOUNDARIES, mark_index);
+    ctx->n_table_cell_boundaries++;
+}
+
+/* Split a longer mark into two. The new mark takes the given count of
+ * characters. May only be called if an adequate number of dummy 'D' marks
+ * follows.
+ */
+static int
+md_split_emph_mark(MD_CTX* ctx, int mark_index, SZ n)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    int new_mark_index = mark_index + (mark->end - mark->beg - n);
+    MD_MARK* dummy = &ctx->marks[new_mark_index];
+
+    MD_ASSERT(mark->end - mark->beg > n);
+    MD_ASSERT(dummy->ch == 'D');
+
+    memcpy(dummy, mark, sizeof(MD_MARK));
+    mark->end -= n;
+    dummy->beg = mark->end;
+
+    return new_mark_index;
+}
+
+static void
+md_analyze_emph(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_MARKCHAIN* chain = md_mark_chain(ctx, mark_index);
+
+    /* If we can be a closer, try to resolve with the preceding opener. */
+    if(mark->flags & MD_MARK_POTENTIAL_CLOSER) {
+        MD_MARK* opener = NULL;
+        int opener_index = 0;
+
+        if(mark->ch == _T('*')) {
+            MD_MARKCHAIN* opener_chains[6];
+            int i, n_opener_chains;
+            unsigned flags = mark->flags;
+
+            /* Apply the "rule of three". */
+            n_opener_chains = 0;
+            opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_intraword_mod3_0;
+            if((flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_2)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_intraword_mod3_1;
+            if((flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_1)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_intraword_mod3_2;
+            opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_extraword_mod3_0;
+            if(!(flags & MD_MARK_EMPH_INTRAWORD)  ||  (flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_2)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_extraword_mod3_1;
+            if(!(flags & MD_MARK_EMPH_INTRAWORD)  ||  (flags & MD_MARK_EMPH_MOD3_MASK) != MD_MARK_EMPH_MOD3_1)
+                opener_chains[n_opener_chains++] = &ASTERISK_OPENERS_extraword_mod3_2;
+
+            /* Opener is the most recent mark from the allowed chains. */
+            for(i = 0; i < n_opener_chains; i++) {
+                if(opener_chains[i]->tail >= 0) {
+                    int tmp_index = opener_chains[i]->tail;
+                    MD_MARK* tmp_mark = &ctx->marks[tmp_index];
+                    if(opener == NULL  ||  tmp_mark->end > opener->end) {
+                        opener_index = tmp_index;
+                        opener = tmp_mark;
+                    }
+                }
+            }
+        } else {
+            /* Simple emph. mark */
+            if(chain->tail >= 0) {
+                opener_index = chain->tail;
+                opener = &ctx->marks[opener_index];
+            }
+        }
+
+        /* Resolve, if we have found matching opener. */
+        if(opener != NULL) {
+            SZ opener_size = opener->end - opener->beg;
+            SZ closer_size = mark->end - mark->beg;
+            MD_MARKCHAIN* opener_chain = md_mark_chain(ctx, opener_index);
+
+            if(opener_size > closer_size) {
+                opener_index = md_split_emph_mark(ctx, opener_index, closer_size);
+                md_mark_chain_append(ctx, opener_chain, opener_index);
+            } else if(opener_size < closer_size) {
+                md_split_emph_mark(ctx, mark_index, closer_size - opener_size);
+            }
+
+            md_rollback(ctx, opener_index, mark_index, MD_ROLLBACK_CROSSING);
+            md_resolve_range(ctx, opener_chain, opener_index, mark_index);
+            return;
+        }
+    }
+
+    /* If we could not resolve as closer, we may be yet be an opener. */
+    if(mark->flags & MD_MARK_POTENTIAL_OPENER)
+        md_mark_chain_append(ctx, chain, mark_index);
+}
+
+static void
+md_analyze_tilde(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* mark = &ctx->marks[mark_index];
+    MD_MARKCHAIN* chain = md_mark_chain(ctx, mark_index);
+
+    /* We attempt to be Github Flavored Markdown compatible here. GFM accepts
+     * only tildes sequences of length 1 and 2, and the length of the opener
+     * and closer has to match. */
+
+    if((mark->flags & MD_MARK_POTENTIAL_CLOSER)  &&  chain->head >= 0) {
+        int opener_index = chain->head;
+
+        md_rollback(ctx, opener_index, mark_index, MD_ROLLBACK_CROSSING);
+        md_resolve_range(ctx, chain, opener_index, mark_index);
+        return;
+    }
+
+    if(mark->flags & MD_MARK_POTENTIAL_OPENER)
+        md_mark_chain_append(ctx, chain, mark_index);
+}
+
+static void
+md_analyze_dollar(MD_CTX* ctx, int mark_index)
+{
+    /* This should mimic the way inline equations work in LaTeX, so there
+     * can only ever be one item in the chain (i.e. the dollars can't be
+     * nested). This is basically the same as the md_analyze_tilde function,
+     * except that we require matching openers and closers to be of the same
+     * length.
+     *
+     * E.g.: $abc$$def$$ => abc (display equation) def (end equation) */
+    if(DOLLAR_OPENERS.head >= 0) {
+        /* If the potential closer has a non-matching number of $, discard */
+        MD_MARK* open = &ctx->marks[DOLLAR_OPENERS.head];
+        MD_MARK* close = &ctx->marks[mark_index];
+
+        int opener_index = DOLLAR_OPENERS.head;
+        md_rollback(ctx, opener_index, mark_index, MD_ROLLBACK_ALL);
+        if (open->end - open->beg == close->end - close->beg) {
+            /* We are the matching closer */
+            md_resolve_range(ctx, &DOLLAR_OPENERS, opener_index, mark_index);
+            return;
+        }
+    }
+
+    md_mark_chain_append(ctx, &DOLLAR_OPENERS, mark_index);
+}
+
+static void
+md_analyze_permissive_url_autolink(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* opener = &ctx->marks[mark_index];
+    int closer_index = mark_index + 1;
+    MD_MARK* closer = &ctx->marks[closer_index];
+    MD_MARK* next_resolved_mark;
+    OFF off = opener->end;
+    int n_dots = FALSE;
+    int has_underscore_in_last_seg = FALSE;
+    int has_underscore_in_next_to_last_seg = FALSE;
+    int n_opened_parenthesis = 0;
+    int n_excess_parenthesis = 0;
+
+    /* Check for domain. */
+    while(off < ctx->size) {
+        if(ISALNUM(off) || CH(off) == _T('-')) {
+            off++;
+        } else if(CH(off) == _T('.')) {
+            /* We must see at least one period. */
+            n_dots++;
+            has_underscore_in_next_to_last_seg = has_underscore_in_last_seg;
+            has_underscore_in_last_seg = FALSE;
+            off++;
+        } else if(CH(off) == _T('_')) {
+            /* No underscore may be present in the last two domain segments. */
+            has_underscore_in_last_seg = TRUE;
+            off++;
+        } else {
+            break;
+        }
+    }
+    if(off > opener->end  &&  CH(off-1) == _T('.')) {
+        off--;
+        n_dots--;
+    }
+    if(off <= opener->end || n_dots == 0 || has_underscore_in_next_to_last_seg || has_underscore_in_last_seg)
+        return;
+
+    /* Check for path. */
+    next_resolved_mark = closer + 1;
+    while(next_resolved_mark->ch == 'D' || !(next_resolved_mark->flags & MD_MARK_RESOLVED))
+        next_resolved_mark++;
+    while(off < next_resolved_mark->beg  &&  CH(off) != _T('<')  &&  !ISWHITESPACE(off)  &&  !ISNEWLINE(off)) {
+        /* Parenthesis must be balanced. */
+        if(CH(off) == _T('(')) {
+            n_opened_parenthesis++;
+        } else if(CH(off) == _T(')')) {
+            if(n_opened_parenthesis > 0)
+                n_opened_parenthesis--;
+            else
+                n_excess_parenthesis++;
+        }
+
+        off++;
+    }
+
+    /* Trim a trailing punctuation from the end. */
+    while(TRUE) {
+        if(ISANYOF(off-1, _T("?!.,:*_~"))) {
+            off--;
+        } else if(CH(off-1) == ')'  &&  n_excess_parenthesis > 0) {
+            /* Unmatched ')' can be in an interior of the path but not at the
+             * of it, so the auto-link may be safely nested in a parenthesis
+             * pair. */
+            off--;
+            n_excess_parenthesis--;
+        } else {
+            break;
+        }
+    }
+
+    /* Ok. Lets call it an auto-link. Adapt opener and create closer to zero
+     * length so all the contents becomes the link text. */
+    MD_ASSERT(closer->ch == 'D' ||
+              ((ctx->parser.flags & MD_FLAG_PERMISSIVEWWWAUTOLINKS) &&
+               (closer->ch == '.' || closer->ch == ':' || closer->ch == '@')));
+    opener->end = opener->beg;
+    closer->ch = opener->ch;
+    closer->beg = off;
+    closer->end = off;
+    md_resolve_range(ctx, NULL, mark_index, closer_index);
+}
+
+/* The permissive autolinks do not have to be enclosed in '<' '>' but we
+ * instead impose stricter rules what is understood as an e-mail address
+ * here. Actually any non-alphanumeric characters with exception of '.'
+ * are prohibited both in username and after '@'. */
+static void
+md_analyze_permissive_email_autolink(MD_CTX* ctx, int mark_index)
+{
+    MD_MARK* opener = &ctx->marks[mark_index];
+    int closer_index;
+    MD_MARK* closer;
+    OFF beg = opener->beg;
+    OFF end = opener->end;
+    int dot_count = 0;
+
+    MD_ASSERT(opener->ch == _T('@'));
+
+    /* Scan for name before '@'. */
+    while(beg > 0  &&  (ISALNUM(beg-1) || ISANYOF(beg-1, _T(".-_+"))))
+        beg--;
+
+    /* Scan for domain after '@'. */
+    while(end < ctx->size  &&  (ISALNUM(end) || ISANYOF(end, _T(".-_")))) {
+        if(CH(end) == _T('.'))
+            dot_count++;
+        end++;
+    }
+    if(CH(end-1) == _T('.')) {  /* Final '.' not part of it. */
+        dot_count--;
+        end--;
+    }
+    else if(ISANYOF2(end-1, _T('-'), _T('_'))) /* These are forbidden at the end. */
+        return;
+    if(CH(end-1) == _T('@')  ||  dot_count == 0)
+        return;
+
+    /* Ok. Lets call it auto-link. Adapt opener and create closer to zero
+     * length so all the contents becomes the link text. */
+    closer_index = mark_index + 1;
+    closer = &ctx->marks[closer_index];
+    if (closer->ch != 'D') return;
+
+    opener->beg = beg;
+    opener->end = beg;
+    closer->ch = opener->ch;
+    closer->beg = end;
+    closer->end = end;
+    md_resolve_range(ctx, NULL, mark_index, closer_index);
+}
+
+static inline void
+md_analyze_marks(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                 int mark_beg, int mark_end, const CHAR* mark_chars)
+{
+    int i = mark_beg;
+    MD_UNUSED(lines);
+    MD_UNUSED(n_lines);
+
+    while(i < mark_end) {
+        MD_MARK* mark = &ctx->marks[i];
+
+        /* Skip resolved spans. */
+        if(mark->flags & MD_MARK_RESOLVED) {
+            if(mark->flags & MD_MARK_OPENER) {
+                MD_ASSERT(i < mark->next);
+                i = mark->next + 1;
+            } else {
+                i++;
+            }
+            continue;
+        }
+
+        /* Skip marks we do not want to deal with. */
+        if(!ISANYOF_(mark->ch, mark_chars)) {
+            i++;
+            continue;
+        }
+
+        /* Analyze the mark. */
+        switch(mark->ch) {
+            case '[':   /* Pass through. */
+            case '!':   /* Pass through. */
+            case ']':   md_analyze_bracket(ctx, i); break;
+            case '&':   md_analyze_entity(ctx, i); break;
+            case '|':   md_analyze_table_cell_boundary(ctx, i); break;
+            case '_':   /* Pass through. */
+            case '*':   md_analyze_emph(ctx, i); break;
+            case '~':   md_analyze_tilde(ctx, i); break;
+            case '$':   md_analyze_dollar(ctx, i); break;
+            case '.':   /* Pass through. */
+            case ':':   md_analyze_permissive_url_autolink(ctx, i); break;
+            case '@':   md_analyze_permissive_email_autolink(ctx, i); break;
+        }
+
+        i++;
+    }
+}
+
+/* Analyze marks (build ctx->marks). */
+static int
+md_analyze_inlines(MD_CTX* ctx, const MD_LINE* lines, int n_lines, int table_mode)
+{
+    int ret;
+
+    /* Reset the previously collected stack of marks. */
+    ctx->n_marks = 0;
+
+    /* Collect all marks. */
+    MD_CHECK(md_collect_marks(ctx, lines, n_lines, table_mode));
+
+    /* (1) Links. */
+    md_analyze_marks(ctx, lines, n_lines, 0, ctx->n_marks, _T("[]!"));
+    MD_CHECK(md_resolve_links(ctx, lines, n_lines));
+    BRACKET_OPENERS.head = -1;
+    BRACKET_OPENERS.tail = -1;
+    ctx->unresolved_link_head = -1;
+    ctx->unresolved_link_tail = -1;
+
+    if(table_mode) {
+        /* (2) Analyze table cell boundaries.
+         * Note we reset TABLECELLBOUNDARIES chain prior to the call md_analyze_marks(),
+         * not after, because caller may need it. */
+        MD_ASSERT(n_lines == 1);
+        TABLECELLBOUNDARIES.head = -1;
+        TABLECELLBOUNDARIES.tail = -1;
+        ctx->n_table_cell_boundaries = 0;
+        md_analyze_marks(ctx, lines, n_lines, 0, ctx->n_marks, _T("|"));
+        return ret;
+    }
+
+    /* (3) Emphasis and strong emphasis; permissive autolinks. */
+    md_analyze_link_contents(ctx, lines, n_lines, 0, ctx->n_marks);
+
+abort:
+    return ret;
+}
+
+static void
+md_analyze_link_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines,
+                         int mark_beg, int mark_end)
+{
+    int i;
+
+    md_analyze_marks(ctx, lines, n_lines, mark_beg, mark_end, _T("&"));
+    md_analyze_marks(ctx, lines, n_lines, mark_beg, mark_end, _T("*_~$@:."));
+
+    for(i = OPENERS_CHAIN_FIRST; i <= OPENERS_CHAIN_LAST; i++) {
+        ctx->mark_chains[i].head = -1;
+        ctx->mark_chains[i].tail = -1;
+    }
+}
+
+static int
+md_enter_leave_span_a(MD_CTX* ctx, int enter, MD_SPANTYPE type,
+                      const CHAR* dest, SZ dest_size, int prohibit_escapes_in_dest,
+                      const CHAR* title, SZ title_size)
+{
+    MD_ATTRIBUTE_BUILD href_build = { 0 };
+    MD_ATTRIBUTE_BUILD title_build = { 0 };
+    MD_SPAN_A_DETAIL det;
+    int ret = 0;
+
+    /* Note we here rely on fact that MD_SPAN_A_DETAIL and
+     * MD_SPAN_IMG_DETAIL are binary-compatible. */
+    memset(&det, 0, sizeof(MD_SPAN_A_DETAIL));
+    MD_CHECK(md_build_attribute(ctx, dest, dest_size,
+                    (prohibit_escapes_in_dest ? MD_BUILD_ATTR_NO_ESCAPES : 0),
+                    &det.href, &href_build));
+    MD_CHECK(md_build_attribute(ctx, title, title_size, 0, &det.title, &title_build));
+
+    if(enter)
+        MD_ENTER_SPAN(type, &det);
+    else
+        MD_LEAVE_SPAN(type, &det);
+
+abort:
+    md_free_attribute(ctx, &href_build);
+    md_free_attribute(ctx, &title_build);
+    return ret;
+}
+
+static int
+md_enter_leave_span_wikilink(MD_CTX* ctx, int enter, const CHAR* target, SZ target_size)
+{
+    MD_ATTRIBUTE_BUILD target_build = { 0 };
+    MD_SPAN_WIKILINK_DETAIL det;
+    int ret = 0;
+
+    memset(&det, 0, sizeof(MD_SPAN_WIKILINK_DETAIL));
+    MD_CHECK(md_build_attribute(ctx, target, target_size, 0, &det.target, &target_build));
+
+    if (enter)
+        MD_ENTER_SPAN(MD_SPAN_WIKILINK, &det);
+    else
+        MD_LEAVE_SPAN(MD_SPAN_WIKILINK, &det);
+
+abort:
+    md_free_attribute(ctx, &target_build);
+    return ret;
+}
+
+
+/* Render the output, accordingly to the analyzed ctx->marks. */
+static int
+md_process_inlines(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    MD_TEXTTYPE text_type;
+    const MD_LINE* line = lines;
+    MD_MARK* prev_mark = NULL;
+    MD_MARK* mark;
+    OFF off = lines[0].beg;
+    OFF end = lines[n_lines-1].end;
+    int enforce_hardbreak = 0;
+    int ret = 0;
+
+    /* Find first resolved mark. Note there is always at least one resolved
+     * mark,  the dummy last one after the end of the latest line we actually
+     * never really reach. This saves us of a lot of special checks and cases
+     * in this function. */
+    mark = ctx->marks;
+    while(!(mark->flags & MD_MARK_RESOLVED))
+        mark++;
+
+    text_type = MD_TEXT_NORMAL;
+
+    while(1) {
+        /* Process the text up to the next mark or end-of-line. */
+        OFF tmp = (line->end < mark->beg ? line->end : mark->beg);
+        if(tmp > off) {
+            MD_TEXT(text_type, STR(off), tmp - off);
+            off = tmp;
+        }
+
+        /* If reached the mark, process it and move to next one. */
+        if(off >= mark->beg) {
+            switch(mark->ch) {
+                case '\\':      /* Backslash escape. */
+                    if(ISNEWLINE(mark->beg+1))
+                        enforce_hardbreak = 1;
+                    else
+                        MD_TEXT(text_type, STR(mark->beg+1), 1);
+                    break;
+
+                case ' ':       /* Non-trivial space. */
+                    MD_TEXT(text_type, _T(" "), 1);
+                    break;
+
+                case '`':       /* Code span. */
+                    if(mark->flags & MD_MARK_OPENER) {
+                        MD_ENTER_SPAN(MD_SPAN_CODE, NULL);
+                        text_type = MD_TEXT_CODE;
+                    } else {
+                        MD_LEAVE_SPAN(MD_SPAN_CODE, NULL);
+                        text_type = MD_TEXT_NORMAL;
+                    }
+                    break;
+
+                case '_':       /* Underline (or emphasis if we fall through). */
+                    if(ctx->parser.flags & MD_FLAG_UNDERLINE) {
+                        if(mark->flags & MD_MARK_OPENER) {
+                            while(off < mark->end) {
+                                MD_ENTER_SPAN(MD_SPAN_U, NULL);
+                                off++;
+                            }
+                        } else {
+                            while(off < mark->end) {
+                                MD_LEAVE_SPAN(MD_SPAN_U, NULL);
+                                off++;
+                            }
+                        }
+                        break;
+                    }
+                    MD_FALLTHROUGH();
+
+                case '*':       /* Emphasis, strong emphasis. */
+                    if(mark->flags & MD_MARK_OPENER) {
+                        if((mark->end - off) % 2) {
+                            MD_ENTER_SPAN(MD_SPAN_EM, NULL);
+                            off++;
+                        }
+                        while(off + 1 < mark->end) {
+                            MD_ENTER_SPAN(MD_SPAN_STRONG, NULL);
+                            off += 2;
+                        }
+                    } else {
+                        while(off + 1 < mark->end) {
+                            MD_LEAVE_SPAN(MD_SPAN_STRONG, NULL);
+                            off += 2;
+                        }
+                        if((mark->end - off) % 2) {
+                            MD_LEAVE_SPAN(MD_SPAN_EM, NULL);
+                            off++;
+                        }
+                    }
+                    break;
+
+                case '~':
+                    if(mark->flags & MD_MARK_OPENER)
+                        MD_ENTER_SPAN(MD_SPAN_DEL, NULL);
+                    else
+                        MD_LEAVE_SPAN(MD_SPAN_DEL, NULL);
+                    break;
+
+                case '$':
+                    if(mark->flags & MD_MARK_OPENER) {
+                        MD_ENTER_SPAN((mark->end - off) % 2 ? MD_SPAN_LATEXMATH : MD_SPAN_LATEXMATH_DISPLAY, NULL);
+                        text_type = MD_TEXT_LATEXMATH;
+                    } else {
+                        MD_LEAVE_SPAN((mark->end - off) % 2 ? MD_SPAN_LATEXMATH : MD_SPAN_LATEXMATH_DISPLAY, NULL);
+                        text_type = MD_TEXT_NORMAL;
+                    }
+                    break;
+
+                case '[':       /* Link, wiki link, image. */
+                case '!':
+                case ']':
+                {
+                    const MD_MARK* opener = (mark->ch != ']' ? mark : &ctx->marks[mark->prev]);
+                    const MD_MARK* closer = &ctx->marks[opener->next];
+                    const MD_MARK* dest_mark;
+                    const MD_MARK* title_mark;
+
+                    if ((opener->ch == '[' && closer->ch == ']') &&
+                        opener->end - opener->beg >= 2 &&
+                        closer->end - closer->beg >= 2)
+                    {
+                        int has_label = (opener->end - opener->beg > 2);
+                        SZ target_sz;
+
+                        if(has_label)
+                            target_sz = opener->end - (opener->beg+2);
+                        else
+                            target_sz = closer->beg - opener->end;
+
+                        MD_CHECK(md_enter_leave_span_wikilink(ctx, (mark->ch != ']'),
+                                 has_label ? STR(opener->beg+2) : STR(opener->end),
+                                 target_sz));
+
+                        break;
+                    }
+
+                    dest_mark = opener+1;
+                    MD_ASSERT(dest_mark->ch == 'D');
+                    title_mark = opener+2;
+                    if (title_mark->ch != 'D') break;
+
+                    MD_CHECK(md_enter_leave_span_a(ctx, (mark->ch != ']'),
+                                (opener->ch == '!' ? MD_SPAN_IMG : MD_SPAN_A),
+                                STR(dest_mark->beg), dest_mark->end - dest_mark->beg, FALSE,
+                                md_mark_get_ptr(ctx, (int)(title_mark - ctx->marks)),
+								title_mark->prev));
+
+                    /* link/image closer may span multiple lines. */
+                    if(mark->ch == ']') {
+                        while(mark->end > line->end)
+                            line++;
+                    }
+
+                    break;
+                }
+
+                case '<':
+                case '>':       /* Autolink or raw HTML. */
+                    if(!(mark->flags & MD_MARK_AUTOLINK)) {
+                        /* Raw HTML. */
+                        if(mark->flags & MD_MARK_OPENER)
+                            text_type = MD_TEXT_HTML;
+                        else
+                            text_type = MD_TEXT_NORMAL;
+                        break;
+                    }
+                    /* Pass through, if auto-link. */
+                    MD_FALLTHROUGH();
+
+                case '@':       /* Permissive e-mail autolink. */
+                case ':':       /* Permissive URL autolink. */
+                case '.':       /* Permissive WWW autolink. */
+                {
+                    MD_MARK* opener = ((mark->flags & MD_MARK_OPENER) ? mark : &ctx->marks[mark->prev]);
+                    MD_MARK* closer = &ctx->marks[opener->next];
+                    const CHAR* dest = STR(opener->end);
+                    SZ dest_size = closer->beg - opener->end;
+
+                    /* For permissive auto-links we do not know closer mark
+                     * position at the time of md_collect_marks(), therefore
+                     * it can be out-of-order in ctx->marks[].
+                     *
+                     * With this flag, we make sure that we output the closer
+                     * only if we processed the opener. */
+                    if(mark->flags & MD_MARK_OPENER)
+                        closer->flags |= MD_MARK_VALIDPERMISSIVEAUTOLINK;
+
+                    if(opener->ch == '@' || opener->ch == '.') {
+                        dest_size += 7;
+                        MD_TEMP_BUFFER(dest_size * sizeof(CHAR));
+                        memcpy(ctx->buffer,
+                                (opener->ch == '@' ? _T("mailto:") : _T("http://")),
+                                7 * sizeof(CHAR));
+                        memcpy(ctx->buffer + 7, dest, (dest_size-7) * sizeof(CHAR));
+                        dest = ctx->buffer;
+                    }
+
+                    if(closer->flags & MD_MARK_VALIDPERMISSIVEAUTOLINK)
+                        MD_CHECK(md_enter_leave_span_a(ctx, (mark->flags & MD_MARK_OPENER),
+                                    MD_SPAN_A, dest, dest_size, TRUE, NULL, 0));
+                    break;
+                }
+
+                case '&':       /* Entity. */
+                    MD_TEXT(MD_TEXT_ENTITY, STR(mark->beg), mark->end - mark->beg);
+                    break;
+
+                case '\0':
+                    MD_TEXT(MD_TEXT_NULLCHAR, _T(""), 1);
+                    break;
+
+                case 127:
+                    goto abort;
+            }
+
+            off = mark->end;
+
+            /* Move to next resolved mark. */
+            prev_mark = mark;
+            mark++;
+            while(!(mark->flags & MD_MARK_RESOLVED)  ||  mark->beg < off)
+                mark++;
+        }
+
+        /* If reached end of line, move to next one. */
+        if(off >= line->end) {
+            /* If it is the last line, we are done. */
+            if(off >= end)
+                break;
+
+            if(text_type == MD_TEXT_CODE || text_type == MD_TEXT_LATEXMATH) {
+                OFF tmp;
+
+                MD_ASSERT(prev_mark != NULL);
+                MD_ASSERT(ISANYOF2_(prev_mark->ch, '`', '$')  &&  (prev_mark->flags & MD_MARK_OPENER));
+                MD_ASSERT(ISANYOF2_(mark->ch, '`', '$')  &&  (mark->flags & MD_MARK_CLOSER));
+
+                /* Inside a code span, trailing line whitespace has to be
+                 * outputted. */
+                tmp = off;
+                while(off < ctx->size  &&  ISBLANK(off))
+                    off++;
+                if(off > tmp)
+                    MD_TEXT(text_type, STR(tmp), off-tmp);
+
+                /* and new lines are transformed into single spaces. */
+                if(prev_mark->end < off  &&  off < mark->beg)
+                    MD_TEXT(text_type, _T(" "), 1);
+            } else if(text_type == MD_TEXT_HTML) {
+                /* Inside raw HTML, we output the new line verbatim, including
+                 * any trailing spaces. */
+                OFF tmp = off;
+
+                while(tmp < end  &&  ISBLANK(tmp))
+                    tmp++;
+                if(tmp > off)
+                    MD_TEXT(MD_TEXT_HTML, STR(off), tmp - off);
+                MD_TEXT(MD_TEXT_HTML, _T("\n"), 1);
+            } else {
+                /* Output soft or hard line break. */
+                MD_TEXTTYPE break_type = MD_TEXT_SOFTBR;
+
+                if(text_type == MD_TEXT_NORMAL) {
+                    if(enforce_hardbreak)
+                        break_type = MD_TEXT_BR;
+                    else if((CH(line->end) == _T(' ') && CH(line->end+1) == _T(' ')))
+                        break_type = MD_TEXT_BR;
+                }
+
+                MD_TEXT(break_type, _T("\n"), 1);
+            }
+
+            /* Move to the next line. */
+            line++;
+            off = line->beg;
+
+            enforce_hardbreak = 0;
+        }
+    }
+
+abort:
+    return ret;
+}
+
+
+/***************************
+ ***  Processing Tables  ***
+ ***************************/
+
+static void
+md_analyze_table_alignment(MD_CTX* ctx, OFF beg, OFF end, MD_ALIGN* align, int n_align)
+{
+    static const MD_ALIGN align_map[] = { MD_ALIGN_DEFAULT, MD_ALIGN_LEFT, MD_ALIGN_RIGHT, MD_ALIGN_CENTER };
+    OFF off = beg;
+
+    while(n_align > 0) {
+        int index = 0;  /* index into align_map[] */
+
+        while(CH(off) != _T('-'))
+            off++;
+        if(off > beg  &&  CH(off-1) == _T(':'))
+            index |= 1;
+        while(off < end  &&  CH(off) == _T('-'))
+            off++;
+        if(off < end  &&  CH(off) == _T(':'))
+            index |= 2;
+
+        *align = align_map[index];
+        align++;
+        n_align--;
+    }
+
+}
+
+/* Forward declaration. */
+static int md_process_normal_block_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines);
+
+static int
+md_process_table_cell(MD_CTX* ctx, MD_BLOCKTYPE cell_type, MD_ALIGN align, OFF beg, OFF end)
+{
+    MD_LINE line;
+    MD_BLOCK_TD_DETAIL det;
+    int ret = 0;
+
+    while(beg < end  &&  ISWHITESPACE(beg))
+        beg++;
+    while(end > beg  &&  ISWHITESPACE(end-1))
+        end--;
+
+    det.align = align;
+    line.beg = beg;
+    line.end = end;
+
+    MD_ENTER_BLOCK(cell_type, &det);
+    MD_CHECK(md_process_normal_block_contents(ctx, &line, 1));
+    MD_LEAVE_BLOCK(cell_type, &det);
+
+abort:
+    return ret;
+}
+
+static int
+md_process_table_row(MD_CTX* ctx, MD_BLOCKTYPE cell_type, OFF beg, OFF end,
+                     const MD_ALIGN* align, int col_count)
+{
+    MD_LINE line;
+    OFF* pipe_offs = NULL;
+    int i, j, k, n;
+    int ret = 0;
+
+    line.beg = beg;
+    line.end = end;
+
+    /* Break the line into table cells by identifying pipe characters who
+     * form the cell boundary. */
+    MD_CHECK(md_analyze_inlines(ctx, &line, 1, TRUE));
+
+    /* We have to remember the cell boundaries in local buffer because
+     * ctx->marks[] shall be reused during cell contents processing. */
+    n = ctx->n_table_cell_boundaries + 2;
+    pipe_offs = (OFF*) malloc(n * sizeof(OFF));
+    if(pipe_offs == NULL) {
+        MD_LOG("malloc() failed.");
+        ret = -1;
+        goto abort;
+    }
+    j = 0;
+    pipe_offs[j++] = beg;
+    for(i = TABLECELLBOUNDARIES.head; i >= 0; i = ctx->marks[i].next) {
+        MD_MARK* mark = &ctx->marks[i];
+        pipe_offs[j++] = mark->end;
+    }
+    pipe_offs[j++] = end+1;
+
+    /* Process cells. */
+    MD_ENTER_BLOCK(MD_BLOCK_TR, NULL);
+    k = 0;
+    for(i = 0; i < j-1  &&  k < col_count; i++) {
+        if(pipe_offs[i] < pipe_offs[i+1]-1)
+            MD_CHECK(md_process_table_cell(ctx, cell_type, align[k++], pipe_offs[i], pipe_offs[i+1]-1));
+    }
+    /* Make sure we call enough table cells even if the current table contains
+     * too few of them. */
+    while(k < col_count)
+        MD_CHECK(md_process_table_cell(ctx, cell_type, align[k++], 0, 0));
+    MD_LEAVE_BLOCK(MD_BLOCK_TR, NULL);
+
+abort:
+    free(pipe_offs);
+
+    /* Free any temporary memory blocks stored within some dummy marks. */
+    for(i = PTR_CHAIN.head; i >= 0; i = ctx->marks[i].next)
+        free(md_mark_get_ptr(ctx, i));
+    PTR_CHAIN.head = -1;
+    PTR_CHAIN.tail = -1;
+
+    return ret;
+}
+
+static int
+md_process_table_block_contents(MD_CTX* ctx, int col_count, const MD_LINE* lines, int n_lines)
+{
+    MD_ALIGN* align;
+    int i;
+    int ret = 0;
+
+    /* At least two lines have to be present: The column headers and the line
+     * with the underlines. */
+    MD_ASSERT(n_lines >= 2);
+
+    align = malloc(col_count * sizeof(MD_ALIGN));
+    if(align == NULL) {
+        MD_LOG("malloc() failed.");
+        ret = -1;
+        goto abort;
+    }
+
+    md_analyze_table_alignment(ctx, lines[1].beg, lines[1].end, align, col_count);
+
+    MD_ENTER_BLOCK(MD_BLOCK_THEAD, NULL);
+    MD_CHECK(md_process_table_row(ctx, MD_BLOCK_TH,
+                        lines[0].beg, lines[0].end, align, col_count));
+    MD_LEAVE_BLOCK(MD_BLOCK_THEAD, NULL);
+
+    if(n_lines > 2) {
+        MD_ENTER_BLOCK(MD_BLOCK_TBODY, NULL);
+        for(i = 2; i < n_lines; i++) {
+            MD_CHECK(md_process_table_row(ctx, MD_BLOCK_TD,
+                     lines[i].beg, lines[i].end, align, col_count));
+        }
+        MD_LEAVE_BLOCK(MD_BLOCK_TBODY, NULL);
+    }
+
+abort:
+    free(align);
+    return ret;
+}
+
+
+/**************************
+ ***  Processing Block  ***
+ **************************/
+
+#define MD_BLOCK_CONTAINER_OPENER   0x01
+#define MD_BLOCK_CONTAINER_CLOSER   0x02
+#define MD_BLOCK_CONTAINER          (MD_BLOCK_CONTAINER_OPENER | MD_BLOCK_CONTAINER_CLOSER)
+#define MD_BLOCK_LOOSE_LIST         0x04
+#define MD_BLOCK_SETEXT_HEADER      0x08
+
+struct MD_BLOCK_tag {
+    MD_BLOCKTYPE type  :  8;
+    unsigned flags     :  8;
+
+    /* MD_BLOCK_H:      Header level (1 - 6)
+     * MD_BLOCK_CODE:   Non-zero if fenced, zero if indented.
+     * MD_BLOCK_LI:     Task mark character (0 if not task list item, 'x', 'X' or ' ').
+     * MD_BLOCK_TABLE:  Column count (as determined by the table underline).
+     */
+    unsigned data      : 16;
+
+    /* Leaf blocks:     Count of lines (MD_LINE or MD_VERBATIMLINE) on the block.
+     * MD_BLOCK_LI:     Task mark offset in the input doc.
+     * MD_BLOCK_OL:     Start item number.
+     */
+    unsigned n_lines;
+};
+
+struct MD_CONTAINER_tag {
+    CHAR ch;
+    unsigned is_loose    : 8;
+    unsigned is_task     : 8;
+    unsigned start;
+    unsigned mark_indent;
+    unsigned contents_indent;
+    OFF block_byte_off;
+    OFF task_mark_off;
+};
+
+
+static int
+md_process_normal_block_contents(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
+{
+    int i;
+    int ret;
+
+    MD_CHECK(md_analyze_inlines(ctx, lines, n_lines, FALSE));
+    MD_CHECK(md_process_inlines(ctx, lines, n_lines));
+
+abort:
+    /* Free any temporary memory blocks stored within some dummy marks. */
+    for(i = PTR_CHAIN.head; i >= 0; i = ctx->marks[i].next)
+        free(md_mark_get_ptr(ctx, i));
+    PTR_CHAIN.head = -1;
+    PTR_CHAIN.tail = -1;
+
+    return ret;
+}
+
+static int
+md_process_verbatim_block_contents(MD_CTX* ctx, MD_TEXTTYPE text_type, const MD_VERBATIMLINE* lines, int n_lines)
+{
+    static const CHAR indent_chunk_str[] = _T("                ");
+    static const SZ indent_chunk_size = SIZEOF_ARRAY(indent_chunk_str) - 1;
+
+    int i;
+    int ret = 0;
+
+    for(i = 0; i < n_lines; i++) {
+        const MD_VERBATIMLINE* line = &lines[i];
+        int indent = line->indent;
+
+        MD_ASSERT(indent >= 0);
+
+        /* Output code indentation. */
+        while(indent > (int) indent_chunk_size) {
+            MD_TEXT(text_type, indent_chunk_str, indent_chunk_size);
+            indent -= indent_chunk_size;
+        }
+        if(indent > 0)
+            MD_TEXT(text_type, indent_chunk_str, indent);
+
+        /* Output the code line itself. */
+        MD_TEXT_INSECURE(text_type, STR(line->beg), line->end - line->beg);
+
+        /* Enforce end-of-line. */
+        MD_TEXT(text_type, _T("\n"), 1);
+    }
+
+abort:
+    return ret;
+}
+
+static int
+md_process_code_block_contents(MD_CTX* ctx, int is_fenced, const MD_VERBATIMLINE* lines, int n_lines)
+{
+    if(is_fenced) {
+        /* Skip the first line in case of fenced code: It is the fence.
+         * (Only the starting fence is present due to logic in md_analyze_line().) */
+        lines++;
+        n_lines--;
+    } else {
+        /* Ignore blank lines at start/end of indented code block. */
+        while(n_lines > 0  &&  lines[0].beg == lines[0].end) {
+            lines++;
+            n_lines--;
+        }
+        while(n_lines > 0  &&  lines[n_lines-1].beg == lines[n_lines-1].end) {
+            n_lines--;
+        }
+    }
+
+    if(n_lines == 0)
+        return 0;
+
+    return md_process_verbatim_block_contents(ctx, MD_TEXT_CODE, lines, n_lines);
+}
+
+static int
+md_setup_fenced_code_detail(MD_CTX* ctx, const MD_BLOCK* block, MD_BLOCK_CODE_DETAIL* det,
+                            MD_ATTRIBUTE_BUILD* info_build, MD_ATTRIBUTE_BUILD* lang_build)
+{
+    const MD_VERBATIMLINE* fence_line = (const MD_VERBATIMLINE*)(block + 1);
+    OFF beg = fence_line->beg;
+    OFF end = fence_line->end;
+    OFF lang_end;
+    CHAR fence_ch = CH(fence_line->beg);
+    int ret = 0;
+
+    /* Skip the fence itself. */
+    while(beg < ctx->size  &&  CH(beg) == fence_ch)
+        beg++;
+    /* Trim initial spaces. */
+    while(beg < ctx->size  &&  CH(beg) == _T(' '))
+        beg++;
+
+    /* Trim trailing spaces. */
+    while(end > beg  &&  CH(end-1) == _T(' '))
+        end--;
+
+    /* Build info string attribute. */
+    MD_CHECK(md_build_attribute(ctx, STR(beg), end - beg, 0, &det->info, info_build));
+
+    /* Build info string attribute. */
+    lang_end = beg;
+    while(lang_end < end  &&  !ISWHITESPACE(lang_end))
+        lang_end++;
+    MD_CHECK(md_build_attribute(ctx, STR(beg), lang_end - beg, 0, &det->lang, lang_build));
+
+    det->fence_char = fence_ch;
+
+abort:
+    return ret;
+}
+
+static int
+md_process_leaf_block(MD_CTX* ctx, const MD_BLOCK* block)
+{
+    union {
+        MD_BLOCK_H_DETAIL header;
+        MD_BLOCK_CODE_DETAIL code;
+        MD_BLOCK_TABLE_DETAIL table;
+    } det;
+    MD_ATTRIBUTE_BUILD info_build;
+    MD_ATTRIBUTE_BUILD lang_build;
+    int is_in_tight_list;
+    int clean_fence_code_detail = FALSE;
+    int ret = 0;
+
+    memset(&det, 0, sizeof(det));
+
+    if(ctx->n_containers == 0)
+        is_in_tight_list = FALSE;
+    else
+        is_in_tight_list = !ctx->containers[ctx->n_containers-1].is_loose;
+
+    switch(block->type) {
+        case MD_BLOCK_H:
+            det.header.level = block->data;
+            break;
+
+        case MD_BLOCK_CODE:
+            /* For fenced code block, we may need to set the info string. */
+            if(block->data != 0) {
+                memset(&det.code, 0, sizeof(MD_BLOCK_CODE_DETAIL));
+                clean_fence_code_detail = TRUE;
+                MD_CHECK(md_setup_fenced_code_detail(ctx, block, &det.code, &info_build, &lang_build));
+            }
+            break;
+
+        case MD_BLOCK_TABLE:
+            det.table.col_count = block->data;
+            det.table.head_row_count = 1;
+            det.table.body_row_count = block->n_lines - 2;
+            break;
+
+        default:
+            /* Noop. */
+            break;
+    }
+
+    if(!is_in_tight_list  ||  block->type != MD_BLOCK_P)
+        MD_ENTER_BLOCK(block->type, (void*) &det);
+
+    /* Process the block contents accordingly to is type. */
+    switch(block->type) {
+        case MD_BLOCK_HR:
+            /* noop */
+            break;
+
+        case MD_BLOCK_CODE:
+            MD_CHECK(md_process_code_block_contents(ctx, (block->data != 0),
+                            (const MD_VERBATIMLINE*)(block + 1), block->n_lines));
+            break;
+
+        case MD_BLOCK_HTML:
+            MD_CHECK(md_process_verbatim_block_contents(ctx, MD_TEXT_HTML,
+                            (const MD_VERBATIMLINE*)(block + 1), block->n_lines));
+            break;
+
+        case MD_BLOCK_TABLE:
+            MD_CHECK(md_process_table_block_contents(ctx, block->data,
+                            (const MD_LINE*)(block + 1), block->n_lines));
+            break;
+
+        default:
+            MD_CHECK(md_process_normal_block_contents(ctx,
+                            (const MD_LINE*)(block + 1), block->n_lines));
+            break;
+    }
+
+    if(!is_in_tight_list  ||  block->type != MD_BLOCK_P)
+        MD_LEAVE_BLOCK(block->type, (void*) &det);
+
+abort:
+    if(clean_fence_code_detail) {
+        md_free_attribute(ctx, &info_build);
+        md_free_attribute(ctx, &lang_build);
+    }
+    return ret;
+}
+
+static int
+md_process_all_blocks(MD_CTX* ctx)
+{
+    int byte_off = 0;
+    int ret = 0;
+
+    /* ctx->containers now is not needed for detection of lists and list items
+     * so we reuse it for tracking what lists are loose or tight. We rely
+     * on the fact the vector is large enough to hold the deepest nesting
+     * level of lists. */
+    ctx->n_containers = 0;
+
+    while(byte_off < ctx->n_block_bytes) {
+        MD_BLOCK* block = (MD_BLOCK*)((char*)ctx->block_bytes + byte_off);
+        union {
+            MD_BLOCK_UL_DETAIL ul;
+            MD_BLOCK_OL_DETAIL ol;
+            MD_BLOCK_LI_DETAIL li;
+        } det;
+
+        switch(block->type) {
+            case MD_BLOCK_UL:
+                det.ul.is_tight = (block->flags & MD_BLOCK_LOOSE_LIST) ? FALSE : TRUE;
+                det.ul.mark = (CHAR) block->data;
+                break;
+
+            case MD_BLOCK_OL:
+                det.ol.start = block->n_lines;
+                det.ol.is_tight =  (block->flags & MD_BLOCK_LOOSE_LIST) ? FALSE : TRUE;
+                det.ol.mark_delimiter = (CHAR) block->data;
+                break;
+
+            case MD_BLOCK_LI:
+                det.li.is_task = (block->data != 0);
+                det.li.task_mark = (CHAR) block->data;
+                det.li.task_mark_offset = (OFF) block->n_lines;
+                break;
+
+            default:
+                /* noop */
+                break;
+        }
+
+        if(block->flags & MD_BLOCK_CONTAINER) {
+            if(block->flags & MD_BLOCK_CONTAINER_CLOSER) {
+                MD_LEAVE_BLOCK(block->type, &det);
+
+                if(block->type == MD_BLOCK_UL || block->type == MD_BLOCK_OL || block->type == MD_BLOCK_QUOTE)
+                    ctx->n_containers--;
+            }
+
+            if(block->flags & MD_BLOCK_CONTAINER_OPENER) {
+                MD_ENTER_BLOCK(block->type, &det);
+
+                if(block->type == MD_BLOCK_UL || block->type == MD_BLOCK_OL) {
+                    ctx->containers[ctx->n_containers].is_loose = (block->flags & MD_BLOCK_LOOSE_LIST);
+                    ctx->n_containers++;
+                } else if(block->type == MD_BLOCK_QUOTE) {
+                    /* This causes that any text in a block quote, even if
+                     * nested inside a tight list item, is wrapped with
+                     * <p>...</p>. */
+                    ctx->containers[ctx->n_containers].is_loose = TRUE;
+                    ctx->n_containers++;
+                }
+            }
+        } else {
+            MD_CHECK(md_process_leaf_block(ctx, block));
+
+            if(block->type == MD_BLOCK_CODE || block->type == MD_BLOCK_HTML)
+                byte_off += block->n_lines * sizeof(MD_VERBATIMLINE);
+            else
+                byte_off += block->n_lines * sizeof(MD_LINE);
+        }
+
+        byte_off += sizeof(MD_BLOCK);
+    }
+
+    ctx->n_block_bytes = 0;
+
+abort:
+    return ret;
+}
+
+
+/************************************
+ ***  Grouping Lines into Blocks  ***
+ ************************************/
+
+static void*
+md_push_block_bytes(MD_CTX* ctx, int n_bytes)
+{
+    void* ptr;
+
+    if(ctx->n_block_bytes + n_bytes > ctx->alloc_block_bytes) {
+        void* new_block_bytes;
+
+        ctx->alloc_block_bytes = (ctx->alloc_block_bytes > 0
+                ? ctx->alloc_block_bytes + ctx->alloc_block_bytes / 2
+                : 512);
+        new_block_bytes = realloc(ctx->block_bytes, ctx->alloc_block_bytes);
+        if(new_block_bytes == NULL) {
+            MD_LOG("realloc() failed.");
+            return NULL;
+        }
+
+        /* Fix the ->current_block after the reallocation. */
+        if(ctx->current_block != NULL) {
+            OFF off_current_block = (OFF) ((char*) ctx->current_block - (char*) ctx->block_bytes);
+            ctx->current_block = (MD_BLOCK*) ((char*) new_block_bytes + off_current_block);
+        }
+
+        ctx->block_bytes = new_block_bytes;
+    }
+
+    ptr = (char*)ctx->block_bytes + ctx->n_block_bytes;
+    ctx->n_block_bytes += n_bytes;
+    return ptr;
+}
+
+static int
+md_start_new_block(MD_CTX* ctx, const MD_LINE_ANALYSIS* line)
+{
+    MD_BLOCK* block;
+
+    MD_ASSERT(ctx->current_block == NULL);
+
+    block = (MD_BLOCK*) md_push_block_bytes(ctx, sizeof(MD_BLOCK));
+    if(block == NULL)
+        return -1;
+
+    switch(line->type) {
+        case MD_LINE_HR:
+            block->type = MD_BLOCK_HR;
+            break;
+
+        case MD_LINE_ATXHEADER:
+        case MD_LINE_SETEXTHEADER:
+            block->type = MD_BLOCK_H;
+            break;
+
+        case MD_LINE_FENCEDCODE:
+        case MD_LINE_INDENTEDCODE:
+            block->type = MD_BLOCK_CODE;
+            break;
+
+        case MD_LINE_TEXT:
+            block->type = MD_BLOCK_P;
+            break;
+
+        case MD_LINE_HTML:
+            block->type = MD_BLOCK_HTML;
+            break;
+
+        case MD_LINE_BLANK:
+        case MD_LINE_SETEXTUNDERLINE:
+        case MD_LINE_TABLEUNDERLINE:
+        default:
+            MD_UNREACHABLE();
+            break;
+    }
+
+    block->flags = 0;
+    block->data = line->data;
+    block->n_lines = 0;
+
+    ctx->current_block = block;
+    return 0;
+}
+
+/* Eat from start of current (textual) block any reference definitions and
+ * remember them so we can resolve any links referring to them.
+ *
+ * (Reference definitions can only be at start of it as they cannot break
+ * a paragraph.)
+ */
+static int
+md_consume_link_reference_definitions(MD_CTX* ctx)
+{
+    MD_LINE* lines = (MD_LINE*) (ctx->current_block + 1);
+    int n_lines = ctx->current_block->n_lines;
+    int n = 0;
+
+    /* Compute how many lines at the start of the block form one or more
+     * reference definitions. */
+    while(n < n_lines) {
+        int n_link_ref_lines;
+
+        n_link_ref_lines = md_is_link_reference_definition(ctx,
+                                    lines + n, n_lines - n);
+        /* Not a reference definition? */
+        if(n_link_ref_lines == 0)
+            break;
+
+        /* We fail if it is the ref. def. but it could not be stored due
+         * a memory allocation error. */
+        if(n_link_ref_lines < 0)
+            return -1;
+
+        n += n_link_ref_lines;
+    }
+
+    /* If there was at least one reference definition, we need to remove
+     * its lines from the block, or perhaps even the whole block. */
+    if(n > 0) {
+        if(n == n_lines) {
+            /* Remove complete block. */
+            ctx->n_block_bytes -= n * sizeof(MD_LINE);
+            ctx->n_block_bytes -= sizeof(MD_BLOCK);
+            ctx->current_block = NULL;
+        } else {
+            /* Remove just some initial lines from the block. */
+            memmove(lines, lines + n, (n_lines - n) * sizeof(MD_LINE));
+            ctx->current_block->n_lines -= n;
+            ctx->n_block_bytes -= n * sizeof(MD_LINE);
+        }
+    }
+
+    return 0;
+}
+
+static int
+md_end_current_block(MD_CTX* ctx)
+{
+    int ret = 0;
+
+    if(ctx->current_block == NULL)
+        return ret;
+
+    /* Check whether there is a reference definition. (We do this here instead
+     * of in md_analyze_line() because reference definition can take multiple
+     * lines.) */
+    if(ctx->current_block->type == MD_BLOCK_P  ||
+       (ctx->current_block->type == MD_BLOCK_H  &&  (ctx->current_block->flags & MD_BLOCK_SETEXT_HEADER)))
+    {
+        MD_LINE* lines = (MD_LINE*) (ctx->current_block + 1);
+        if(CH(lines[0].beg) == _T('[')) {
+            MD_CHECK(md_consume_link_reference_definitions(ctx));
+            if(ctx->current_block == NULL)
+                return ret;
+        }
+    }
+
+    if(ctx->current_block->type == MD_BLOCK_H  &&  (ctx->current_block->flags & MD_BLOCK_SETEXT_HEADER)) {
+        int n_lines = ctx->current_block->n_lines;
+
+        if(n_lines > 1) {
+            /* Get rid of the underline. */
+            ctx->current_block->n_lines--;
+            ctx->n_block_bytes -= sizeof(MD_LINE);
+        } else {
+            /* Only the underline has left after eating the ref. defs.
+             * Keep the line as beginning of a new ordinary paragraph. */
+            ctx->current_block->type = MD_BLOCK_P;
+            return 0;
+        }
+    }
+
+    /* Mark we are not building any block anymore. */
+    ctx->current_block = NULL;
+
+abort:
+    return ret;
+}
+
+static int
+md_add_line_into_current_block(MD_CTX* ctx, const MD_LINE_ANALYSIS* analysis)
+{
+    MD_ASSERT(ctx->current_block != NULL);
+
+    if(ctx->current_block->type == MD_BLOCK_CODE || ctx->current_block->type == MD_BLOCK_HTML) {
+        MD_VERBATIMLINE* line;
+
+        line = (MD_VERBATIMLINE*) md_push_block_bytes(ctx, sizeof(MD_VERBATIMLINE));
+        if(line == NULL)
+            return -1;
+
+        line->indent = analysis->indent;
+        line->beg = analysis->beg;
+        line->end = analysis->end;
+    } else {
+        MD_LINE* line;
+
+        line = (MD_LINE*) md_push_block_bytes(ctx, sizeof(MD_LINE));
+        if(line == NULL)
+            return -1;
+
+        line->beg = analysis->beg;
+        line->end = analysis->end;
+    }
+    ctx->current_block->n_lines++;
+
+    return 0;
+}
+
+static int
+md_push_container_bytes(MD_CTX* ctx, MD_BLOCKTYPE type, unsigned start,
+                        unsigned data, unsigned flags)
+{
+    MD_BLOCK* block;
+    int ret = 0;
+
+    MD_CHECK(md_end_current_block(ctx));
+
+    block = (MD_BLOCK*) md_push_block_bytes(ctx, sizeof(MD_BLOCK));
+    if(block == NULL)
+        return -1;
+
+    block->type = type;
+    block->flags = flags;
+    block->data = data;
+    block->n_lines = start;
+
+abort:
+    return ret;
+}
+
+
+
+/***********************
+ ***  Line Analysis  ***
+ ***********************/
+
+static int
+md_is_hr_line(MD_CTX* ctx, OFF beg, OFF* p_end, OFF* p_killer)
+{
+    OFF off = beg + 1;
+    int n = 1;
+
+    while(off < ctx->size  &&  (CH(off) == CH(beg) || CH(off) == _T(' ') || CH(off) == _T('\t'))) {
+        if(CH(off) == CH(beg))
+            n++;
+        off++;
+    }
+
+    if(n < 3) {
+        *p_killer = off;
+        return FALSE;
+    }
+
+    /* Nothing else can be present on the line. */
+    if(off < ctx->size  &&  !ISNEWLINE(off)) {
+        *p_killer = off;
+        return FALSE;
+    }
+
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_atxheader_line(MD_CTX* ctx, OFF beg, OFF* p_beg, OFF* p_end, unsigned* p_level)
+{
+    int n;
+    OFF off = beg + 1;
+
+    while(off < ctx->size  &&  CH(off) == _T('#')  &&  off - beg < 7)
+        off++;
+    n = off - beg;
+
+    if(n > 6)
+        return FALSE;
+    *p_level = n;
+
+    if(!(ctx->parser.flags & MD_FLAG_PERMISSIVEATXHEADERS)  &&  off < ctx->size  &&
+       CH(off) != _T(' ')  &&  CH(off) != _T('\t')  &&  !ISNEWLINE(off))
+        return FALSE;
+
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+    *p_beg = off;
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_setext_underline(MD_CTX* ctx, OFF beg, OFF* p_end, unsigned* p_level)
+{
+    OFF off = beg + 1;
+
+    while(off < ctx->size  &&  CH(off) == CH(beg))
+        off++;
+
+    /* Optionally, space(s) can follow. */
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+
+    /* But nothing more is allowed on the line. */
+    if(off < ctx->size  &&  !ISNEWLINE(off))
+        return FALSE;
+
+    *p_level = (CH(beg) == _T('=') ? 1 : 2);
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_table_underline(MD_CTX* ctx, OFF beg, OFF* p_end, unsigned* p_col_count)
+{
+    OFF off = beg;
+    int found_pipe = FALSE;
+    unsigned col_count = 0;
+
+    if(off < ctx->size  &&  CH(off) == _T('|')) {
+        found_pipe = TRUE;
+        off++;
+        while(off < ctx->size  &&  ISWHITESPACE(off))
+            off++;
+    }
+
+    while(1) {
+        int delimited = FALSE;
+
+        /* Cell underline ("-----", ":----", "----:" or ":----:") */
+        if(off < ctx->size  &&  CH(off) == _T(':'))
+            off++;
+        if(off >= ctx->size  ||  CH(off) != _T('-'))
+            return FALSE;
+        while(off < ctx->size  &&  CH(off) == _T('-'))
+            off++;
+        if(off < ctx->size  &&  CH(off) == _T(':'))
+            off++;
+
+        col_count++;
+
+        /* Pipe delimiter (optional at the end of line). */
+        while(off < ctx->size  &&  ISWHITESPACE(off))
+            off++;
+        if(off < ctx->size  &&  CH(off) == _T('|')) {
+            delimited = TRUE;
+            found_pipe =  TRUE;
+            off++;
+            while(off < ctx->size  &&  ISWHITESPACE(off))
+                off++;
+        }
+
+        /* Success, if we reach end of line. */
+        if(off >= ctx->size  ||  ISNEWLINE(off))
+            break;
+
+        if(!delimited)
+            return FALSE;
+    }
+
+    if(!found_pipe)
+        return FALSE;
+
+    *p_end = off;
+    *p_col_count = col_count;
+    return TRUE;
+}
+
+static int
+md_is_opening_code_fence(MD_CTX* ctx, OFF beg, OFF* p_end)
+{
+    OFF off = beg;
+
+    while(off < ctx->size && CH(off) == CH(beg))
+        off++;
+
+    /* Fence must have at least three characters. */
+    if(off - beg < 3)
+        return FALSE;
+
+    ctx->code_fence_length = off - beg;
+
+    /* Optionally, space(s) can follow. */
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+
+    /* Optionally, an info string can follow. */
+    while(off < ctx->size  &&  !ISNEWLINE(off)) {
+        /* Backtick-based fence must not contain '`' in the info string. */
+        if(CH(beg) == _T('`')  &&  CH(off) == _T('`'))
+            return FALSE;
+        off++;
+    }
+
+    *p_end = off;
+    return TRUE;
+}
+
+static int
+md_is_closing_code_fence(MD_CTX* ctx, CHAR ch, OFF beg, OFF* p_end)
+{
+    OFF off = beg;
+    int ret = FALSE;
+
+    /* Closing fence must have at least the same length and use same char as
+     * opening one. */
+    while(off < ctx->size  &&  CH(off) == ch)
+        off++;
+    if(off - beg < ctx->code_fence_length)
+        goto out;
+
+    /* Optionally, space(s) can follow */
+    while(off < ctx->size  &&  CH(off) == _T(' '))
+        off++;
+
+    /* But nothing more is allowed on the line. */
+    if(off < ctx->size  &&  !ISNEWLINE(off))
+        goto out;
+
+    ret = TRUE;
+
+out:
+    /* Note we set *p_end even on failure: If we are not closing fence, caller
+     * would eat the line anyway without any parsing. */
+    *p_end = off;
+    return ret;
+}
+
+/* Returns type of the raw HTML block, or FALSE if it is not HTML block.
+ * (Refer to CommonMark specification for details about the types.)
+ */
+static int
+md_is_html_block_start_condition(MD_CTX* ctx, OFF beg)
+{
+    typedef struct TAG_tag TAG;
+    struct TAG_tag {
+        const CHAR* name;
+        unsigned len    : 8;
+    };
+
+    /* Type 6 is started by a long list of allowed tags. We use two-level
+     * tree to speed-up the search. */
+#ifdef X
+    #undef X
+#endif
+#define X(name)     { _T(name), (sizeof(name)-1) / sizeof(CHAR) }
+#define Xend        { NULL, 0 }
+    static const TAG t1[] = { X("pre"), X("script"), X("style"), X("textarea"), Xend };
+
+    static const TAG a6[] = { X("address"), X("article"), X("aside"), Xend };
+    static const TAG b6[] = { X("base"), X("basefont"), X("blockquote"), X("body"), Xend };
+    static const TAG c6[] = { X("caption"), X("center"), X("col"), X("colgroup"), Xend };
+    static const TAG d6[] = { X("dd"), X("details"), X("dialog"), X("dir"),
+                              X("div"), X("dl"), X("dt"), Xend };
+    static const TAG f6[] = { X("fieldset"), X("figcaption"), X("figure"), X("footer"),
+                              X("form"), X("frame"), X("frameset"), Xend };
+    static const TAG h6[] = { X("h1"), X("head"), X("header"), X("hr"), X("html"), Xend };
+    static const TAG i6[] = { X("iframe"), Xend };
+    static const TAG l6[] = { X("legend"), X("li"), X("link"), Xend };
+    static const TAG m6[] = { X("main"), X("menu"), X("menuitem"), Xend };
+    static const TAG n6[] = { X("nav"), X("noframes"), Xend };
+    static const TAG o6[] = { X("ol"), X("optgroup"), X("option"), Xend };
+    static const TAG p6[] = { X("p"), X("param"), Xend };
+    static const TAG s6[] = { X("section"), X("source"), X("summary"), Xend };
+    static const TAG t6[] = { X("table"), X("tbody"), X("td"), X("tfoot"), X("th"),
+                              X("thead"), X("title"), X("tr"), X("track"), Xend };
+    static const TAG u6[] = { X("ul"), Xend };
+    static const TAG xx[] = { Xend };
+#undef X
+
+    static const TAG* map6[26] = {
+        a6, b6, c6, d6, xx, f6, xx, h6, i6, xx, xx, l6, m6,
+        n6, o6, p6, xx, xx, s6, t6, u6, xx, xx, xx, xx, xx
+    };
+    OFF off = beg + 1;
+    int i;
+
+    /* Check for type 1: <script, <pre, or <style */
+    for(i = 0; t1[i].name != NULL; i++) {
+        if(off + t1[i].len <= ctx->size) {
+            if(md_ascii_case_eq(STR(off), t1[i].name, t1[i].len))
+                return 1;
+        }
+    }
+
+    /* Check for type 2: <!-- */
+    if(off + 3 < ctx->size  &&  CH(off) == _T('!')  &&  CH(off+1) == _T('-')  &&  CH(off+2) == _T('-'))
+        return 2;
+
+    /* Check for type 3: <? */
+    if(off < ctx->size  &&  CH(off) == _T('?'))
+        return 3;
+
+    /* Check for type 4 or 5: <! */
+    if(off < ctx->size  &&  CH(off) == _T('!')) {
+        /* Check for type 4: <! followed by uppercase letter. */
+        if(off + 1 < ctx->size  &&  ISASCII(off+1))
+            return 4;
+
+        /* Check for type 5: <![CDATA[ */
+        if(off + 8 < ctx->size) {
+            if(md_ascii_eq(STR(off), _T("![CDATA["), 8))
+                return 5;
+        }
+    }
+
+    /* Check for type 6: Many possible starting tags listed above. */
+    if(off + 1 < ctx->size  &&  (ISALPHA(off) || (CH(off) == _T('/') && ISALPHA(off+1)))) {
+        int slot;
+        const TAG* tags;
+
+        if(CH(off) == _T('/'))
+            off++;
+
+        slot = (ISUPPER(off) ? CH(off) - 'A' : CH(off) - 'a');
+        tags = map6[slot];
+
+        for(i = 0; tags[i].name != NULL; i++) {
+            if(off + tags[i].len <= ctx->size) {
+                if(md_ascii_case_eq(STR(off), tags[i].name, tags[i].len)) {
+                    OFF tmp = off + tags[i].len;
+                    if(tmp >= ctx->size)
+                        return 6;
+                    if(ISBLANK(tmp) || ISNEWLINE(tmp) || CH(tmp) == _T('>'))
+                        return 6;
+                    if(tmp+1 < ctx->size && CH(tmp) == _T('/') && CH(tmp+1) == _T('>'))
+                        return 6;
+                    break;
+                }
+            }
+        }
+    }
+
+    /* Check for type 7: any COMPLETE other opening or closing tag. */
+    if(off + 1 < ctx->size) {
+        OFF end;
+
+        if(md_is_html_tag(ctx, NULL, 0, beg, ctx->size, &end)) {
+            /* Only optional whitespace and new line may follow. */
+            while(end < ctx->size  &&  ISWHITESPACE(end))
+                end++;
+            if(end >= ctx->size  ||  ISNEWLINE(end))
+                return 7;
+        }
+    }
+
+    return FALSE;
+}
+
+/* Case sensitive check whether there is a substring 'what' between 'beg'
+ * and end of line. */
+static int
+md_line_contains(MD_CTX* ctx, OFF beg, const CHAR* what, SZ what_len, OFF* p_end)
+{
+    OFF i;
+    for(i = beg; i + what_len < ctx->size; i++) {
+        if(ISNEWLINE(i))
+            break;
+        if(memcmp(STR(i), what, what_len * sizeof(CHAR)) == 0) {
+            *p_end = i + what_len;
+            return TRUE;
+        }
+    }
+
+    *p_end = i;
+    return FALSE;
+}
+
+/* Returns type of HTML block end condition or FALSE if not an end condition.
+ *
+ * Note it fills p_end even when it is not end condition as the caller
+ * does not need to analyze contents of a raw HTML block.
+ */
+static int
+md_is_html_block_end_condition(MD_CTX* ctx, OFF beg, OFF* p_end)
+{
+    switch(ctx->html_block_type) {
+        case 1:
+        {
+            OFF off = beg;
+
+            while(off < ctx->size  &&  !ISNEWLINE(off)) {
+                if(CH(off) == _T('<')) {
+                  #define FIND_TAG_END(string, length) \
+                    if(off + length <= ctx->size && \
+                       md_ascii_case_eq(STR(off), _T(string), length)) { \
+                        *p_end = off + length; \
+                        return TRUE; \
+                    }
+                  FIND_TAG_END("</script>", 9)
+                  FIND_TAG_END("</style>", 8)
+                  FIND_TAG_END("</pre>", 6)
+                  #undef FIND_TAG_END
+                }
+
+                off++;
+            }
+            *p_end = off;
+            return FALSE;
+        }
+
+        case 2:
+            return (md_line_contains(ctx, beg, _T("-->"), 3, p_end) ? 2 : FALSE);
+
+        case 3:
+            return (md_line_contains(ctx, beg, _T("?>"), 2, p_end) ? 3 : FALSE);
+
+        case 4:
+            return (md_line_contains(ctx, beg, _T(">"), 1, p_end) ? 4 : FALSE);
+
+        case 5:
+            return (md_line_contains(ctx, beg, _T("]]>"), 3, p_end) ? 5 : FALSE);
+
+        case 6:     /* Pass through */
+        case 7:
+            *p_end = beg;
+            return (beg >= ctx->size || ISNEWLINE(beg) ? ctx->html_block_type : FALSE);
+
+        default:
+            MD_UNREACHABLE();
+    }
+    return FALSE;
+}
+
+
+static int
+md_is_container_compatible(const MD_CONTAINER* pivot, const MD_CONTAINER* container)
+{
+    /* Block quote has no "items" like lists. */
+    if(container->ch == _T('>'))
+        return FALSE;
+
+    if(container->ch != pivot->ch)
+        return FALSE;
+    if(container->mark_indent > pivot->contents_indent)
+        return FALSE;
+
+    return TRUE;
+}
+
+static int
+md_push_container(MD_CTX* ctx, const MD_CONTAINER* container)
+{
+    if(ctx->n_containers >= ctx->alloc_containers) {
+        MD_CONTAINER* new_containers;
+
+        ctx->alloc_containers = (ctx->alloc_containers > 0
+                ? ctx->alloc_containers + ctx->alloc_containers / 2
+                : 16);
+        new_containers = realloc(ctx->containers, ctx->alloc_containers * sizeof(MD_CONTAINER));
+        if(new_containers == NULL) {
+            MD_LOG("realloc() failed.");
+            return -1;
+        }
+
+        ctx->containers = new_containers;
+    }
+
+    memcpy(&ctx->containers[ctx->n_containers++], container, sizeof(MD_CONTAINER));
+    return 0;
+}
+
+static int
+md_enter_child_containers(MD_CTX* ctx, int n_children)
+{
+    int i;
+    int ret = 0;
+
+    for(i = ctx->n_containers - n_children; i < ctx->n_containers; i++) {
+        MD_CONTAINER* c = &ctx->containers[i];
+        int is_ordered_list = FALSE;
+
+        switch(c->ch) {
+            case _T(')'):
+            case _T('.'):
+                is_ordered_list = TRUE;
+                MD_FALLTHROUGH();
+
+            case _T('-'):
+            case _T('+'):
+            case _T('*'):
+                /* Remember offset in ctx->block_bytes so we can revisit the
+                 * block if we detect it is a loose list. */
+                md_end_current_block(ctx);
+                c->block_byte_off = ctx->n_block_bytes;
+
+                MD_CHECK(md_push_container_bytes(ctx,
+                                (is_ordered_list ? MD_BLOCK_OL : MD_BLOCK_UL),
+                                c->start, c->ch, MD_BLOCK_CONTAINER_OPENER));
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                                c->task_mark_off,
+                                (c->is_task ? CH(c->task_mark_off) : 0),
+                                MD_BLOCK_CONTAINER_OPENER));
+                break;
+
+            case _T('>'):
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_QUOTE, 0, 0, MD_BLOCK_CONTAINER_OPENER));
+                break;
+
+            default:
+                MD_UNREACHABLE();
+                break;
+        }
+    }
+
+abort:
+    return ret;
+}
+
+static int
+md_leave_child_containers(MD_CTX* ctx, int n_keep)
+{
+    int ret = 0;
+
+    while(ctx->n_containers > n_keep) {
+        MD_CONTAINER* c = &ctx->containers[ctx->n_containers-1];
+        int is_ordered_list = FALSE;
+
+        switch(c->ch) {
+            case _T(')'):
+            case _T('.'):
+                is_ordered_list = TRUE;
+                MD_FALLTHROUGH();
+
+            case _T('-'):
+            case _T('+'):
+            case _T('*'):
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                                c->task_mark_off, (c->is_task ? CH(c->task_mark_off) : 0),
+                                MD_BLOCK_CONTAINER_CLOSER));
+                MD_CHECK(md_push_container_bytes(ctx,
+                                (is_ordered_list ? MD_BLOCK_OL : MD_BLOCK_UL), 0,
+                                c->ch, MD_BLOCK_CONTAINER_CLOSER));
+                break;
+
+            case _T('>'):
+                MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_QUOTE, 0,
+                                0, MD_BLOCK_CONTAINER_CLOSER));
+                break;
+
+            default:
+                MD_UNREACHABLE();
+                break;
+        }
+
+        ctx->n_containers--;
+    }
+
+abort:
+    return ret;
+}
+
+static int
+md_is_container_mark(MD_CTX* ctx, unsigned indent, OFF beg, OFF* p_end, MD_CONTAINER* p_container)
+{
+    OFF off = beg;
+    OFF max_end;
+
+    if(off >= ctx->size  ||  indent >= ctx->code_indent_offset)
+        return FALSE;
+
+    /* Check for block quote mark. */
+    if(CH(off) == _T('>')) {
+        off++;
+        p_container->ch = _T('>');
+        p_container->is_loose = FALSE;
+        p_container->is_task = FALSE;
+        p_container->mark_indent = indent;
+        p_container->contents_indent = indent + 1;
+        *p_end = off;
+        return TRUE;
+    }
+
+    /* Check for list item bullet mark. */
+    if(ISANYOF(off, _T("-+*"))  &&  (off+1 >= ctx->size || ISBLANK(off+1) || ISNEWLINE(off+1))) {
+        p_container->ch = CH(off);
+        p_container->is_loose = FALSE;
+        p_container->is_task = FALSE;
+        p_container->mark_indent = indent;
+        p_container->contents_indent = indent + 1;
+        *p_end = off+1;
+        return TRUE;
+    }
+
+    /* Check for ordered list item marks. */
+    max_end = off + 9;
+    if(max_end > ctx->size)
+        max_end = ctx->size;
+    p_container->start = 0;
+    while(off < max_end  &&  ISDIGIT(off)) {
+        p_container->start = p_container->start * 10 + CH(off) - _T('0');
+        off++;
+    }
+    if(off > beg  &&
+       off < ctx->size  &&
+       (CH(off) == _T('.') || CH(off) == _T(')'))  &&
+       (off+1 >= ctx->size || ISBLANK(off+1) || ISNEWLINE(off+1)))
+    {
+        p_container->ch = CH(off);
+        p_container->is_loose = FALSE;
+        p_container->is_task = FALSE;
+        p_container->mark_indent = indent;
+        p_container->contents_indent = indent + off - beg + 1;
+        *p_end = off+1;
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
+static unsigned
+md_line_indentation(MD_CTX* ctx, unsigned total_indent, OFF beg, OFF* p_end)
+{
+    OFF off = beg;
+    unsigned indent = total_indent;
+
+    while(off < ctx->size  &&  ISBLANK(off)) {
+        if(CH(off) == _T('\t'))
+            indent = (indent + 4) & ~3;
+        else
+            indent++;
+        off++;
+    }
+
+    *p_end = off;
+    return indent - total_indent;
+}
+
+static const MD_LINE_ANALYSIS md_dummy_blank_line = { MD_LINE_BLANK, 0, 0, 0, 0 };
+
+/* Analyze type of the line and find some its properties. This serves as a
+ * main input for determining type and boundaries of a block. */
+static int
+md_analyze_line(MD_CTX* ctx, OFF beg, OFF* p_end,
+                const MD_LINE_ANALYSIS* pivot_line, MD_LINE_ANALYSIS* line)
+{
+    unsigned total_indent = 0;
+    int n_parents = 0;
+    int n_brothers = 0;
+    int n_children = 0;
+    MD_CONTAINER container = { 0 };
+    int prev_line_has_list_loosening_effect = ctx->last_line_has_list_loosening_effect;
+    OFF off = beg;
+    OFF hr_killer = 0;
+    int ret = 0;
+
+    line->indent = md_line_indentation(ctx, total_indent, off, &off);
+    total_indent += line->indent;
+    line->beg = off;
+
+    /* Given the indentation and block quote marks '>', determine how many of
+     * the current containers are our parents. */
+    while(n_parents < ctx->n_containers) {
+        MD_CONTAINER* c = &ctx->containers[n_parents];
+
+        if(c->ch == _T('>')  &&  line->indent < ctx->code_indent_offset  &&
+            off < ctx->size  &&  CH(off) == _T('>'))
+        {
+            /* Block quote mark. */
+            off++;
+            total_indent++;
+            line->indent = md_line_indentation(ctx, total_indent, off, &off);
+            total_indent += line->indent;
+
+            /* The optional 1st space after '>' is part of the block quote mark. */
+            if(line->indent > 0)
+                line->indent--;
+
+            line->beg = off;
+
+        } else if(c->ch != _T('>')  &&  line->indent >= c->contents_indent) {
+            /* List. */
+            line->indent -= c->contents_indent;
+        } else {
+            break;
+        }
+
+        n_parents++;
+    }
+
+    if(off >= ctx->size  ||  ISNEWLINE(off)) {
+        /* Blank line does not need any real indentation to be nested inside
+         * a list. */
+        if(n_brothers + n_children == 0) {
+            while(n_parents < ctx->n_containers  &&  ctx->containers[n_parents].ch != _T('>'))
+                n_parents++;
+        }
+    }
+
+    while(TRUE) {
+        /* Check whether we are fenced code continuation. */
+        if(pivot_line->type == MD_LINE_FENCEDCODE) {
+            line->beg = off;
+
+            /* We are another MD_LINE_FENCEDCODE unless we are closing fence
+             * which we transform into MD_LINE_BLANK. */
+            if(line->indent < ctx->code_indent_offset) {
+                if(md_is_closing_code_fence(ctx, CH(pivot_line->beg), off, &off)) {
+                    line->type = MD_LINE_BLANK;
+                    ctx->last_line_has_list_loosening_effect = FALSE;
+                    break;
+                }
+            }
+
+            /* Change indentation accordingly to the initial code fence. */
+            if(n_parents == ctx->n_containers) {
+                if(line->indent > pivot_line->indent)
+                    line->indent -= pivot_line->indent;
+                else
+                    line->indent = 0;
+
+                line->type = MD_LINE_FENCEDCODE;
+                break;
+            }
+        }
+
+        /* Check whether we are HTML block continuation. */
+        if(pivot_line->type == MD_LINE_HTML  &&  ctx->html_block_type > 0) {
+            if(n_parents < ctx->n_containers) {
+                /* HTML block is implicitly ended if the enclosing container
+                 * block ends. */
+                ctx->html_block_type = 0;
+            } else {
+                int html_block_type;
+
+                html_block_type = md_is_html_block_end_condition(ctx, off, &off);
+                if(html_block_type > 0) {
+                    MD_ASSERT(html_block_type == ctx->html_block_type);
+
+                    /* Make sure this is the last line of the block. */
+                    ctx->html_block_type = 0;
+
+                    /* Some end conditions serve as blank lines at the same time. */
+                    if(html_block_type == 6 || html_block_type == 7) {
+                        line->type = MD_LINE_BLANK;
+                        line->indent = 0;
+                        break;
+                    }
+                }
+
+                line->type = MD_LINE_HTML;
+                n_parents = ctx->n_containers;
+                break;
+            }
+        }
+
+        /* Check for blank line. */
+        if(off >= ctx->size  ||  ISNEWLINE(off)) {
+            if(pivot_line->type == MD_LINE_INDENTEDCODE  &&  n_parents == ctx->n_containers) {
+                line->type = MD_LINE_INDENTEDCODE;
+                if(line->indent > ctx->code_indent_offset)
+                    line->indent -= ctx->code_indent_offset;
+                else
+                    line->indent = 0;
+                ctx->last_line_has_list_loosening_effect = FALSE;
+            } else {
+                line->type = MD_LINE_BLANK;
+                ctx->last_line_has_list_loosening_effect = (n_parents > 0  &&
+                        n_brothers + n_children == 0  &&
+                        ctx->containers[n_parents-1].ch != _T('>'));
+
+    #if 1
+                /* See https://github.com/mity/md4c/issues/6
+                 *
+                 * This ugly checking tests we are in (yet empty) list item but
+                 * not its very first line (i.e. not the line with the list
+                 * item mark).
+                 *
+                 * If we are such a blank line, then any following non-blank
+                 * line which would be part of the list item actually has to
+                 * end the list because according to the specification, "a list
+                 * item can begin with at most one blank line."
+                 */
+                if(n_parents > 0  &&  ctx->containers[n_parents-1].ch != _T('>')  &&
+                   n_brothers + n_children == 0  &&  ctx->current_block == NULL  &&
+                   ctx->n_block_bytes > (int) sizeof(MD_BLOCK))
+                {
+                    MD_BLOCK* top_block = (MD_BLOCK*) ((char*)ctx->block_bytes + ctx->n_block_bytes - sizeof(MD_BLOCK));
+                    if(top_block->type == MD_BLOCK_LI)
+                        ctx->last_list_item_starts_with_two_blank_lines = TRUE;
+                }
+    #endif
+            }
+            break;
+        } else {
+    #if 1
+            /* This is the 2nd half of the hack. If the flag is set (i.e. there
+             * was a 2nd blank line at the beginning of the list item) and if
+             * we would otherwise still belong to the list item, we enforce
+             * the end of the list. */
+            ctx->last_line_has_list_loosening_effect = FALSE;
+            if(ctx->last_list_item_starts_with_two_blank_lines) {
+                if(n_parents > 0  &&  ctx->containers[n_parents-1].ch != _T('>')  &&
+                   n_brothers + n_children == 0  &&  ctx->current_block == NULL  &&
+                   ctx->n_block_bytes > (int) sizeof(MD_BLOCK))
+                {
+                    MD_BLOCK* top_block = (MD_BLOCK*) ((char*)ctx->block_bytes + ctx->n_block_bytes - sizeof(MD_BLOCK));
+                    if(top_block->type == MD_BLOCK_LI)
+                        n_parents--;
+                }
+
+                ctx->last_list_item_starts_with_two_blank_lines = FALSE;
+            }
+    #endif
+        }
+
+        /* Check whether we are Setext underline. */
+        if(line->indent < ctx->code_indent_offset  &&  pivot_line->type == MD_LINE_TEXT
+            &&  off < ctx->size  &&  ISANYOF2(off, _T('='), _T('-'))
+            &&  (n_parents == ctx->n_containers))
+        {
+            unsigned level;
+
+            if(md_is_setext_underline(ctx, off, &off, &level)) {
+                line->type = MD_LINE_SETEXTUNDERLINE;
+                line->data = level;
+                break;
+            }
+        }
+
+        /* Check for thematic break line. */
+        if(line->indent < ctx->code_indent_offset
+            &&  off < ctx->size  &&  off >= hr_killer
+            &&  ISANYOF(off, _T("-_*")))
+        {
+            if(md_is_hr_line(ctx, off, &off, &hr_killer)) {
+                line->type = MD_LINE_HR;
+                break;
+            }
+        }
+
+        /* Check for "brother" container. I.e. whether we are another list item
+         * in already started list. */
+        if(n_parents < ctx->n_containers  &&  n_brothers + n_children == 0) {
+            OFF tmp;
+
+            if(md_is_container_mark(ctx, line->indent, off, &tmp, &container)  &&
+               md_is_container_compatible(&ctx->containers[n_parents], &container))
+            {
+                pivot_line = &md_dummy_blank_line;
+
+                off = tmp;
+
+                total_indent += container.contents_indent - container.mark_indent;
+                line->indent = md_line_indentation(ctx, total_indent, off, &off);
+                total_indent += line->indent;
+                line->beg = off;
+
+                /* Some of the following whitespace actually still belongs to the mark. */
+                if(off >= ctx->size || ISNEWLINE(off)) {
+                    container.contents_indent++;
+                } else if(line->indent <= ctx->code_indent_offset) {
+                    container.contents_indent += line->indent;
+                    line->indent = 0;
+                } else {
+                    container.contents_indent += 1;
+                    line->indent--;
+                }
+
+                ctx->containers[n_parents].mark_indent = container.mark_indent;
+                ctx->containers[n_parents].contents_indent = container.contents_indent;
+
+                n_brothers++;
+                continue;
+            }
+        }
+
+        /* Check for indented code.
+         * Note indented code block cannot interrupt a paragraph. */
+        if(line->indent >= ctx->code_indent_offset  &&
+            (pivot_line->type == MD_LINE_BLANK || pivot_line->type == MD_LINE_INDENTEDCODE))
+        {
+            line->type = MD_LINE_INDENTEDCODE;
+            MD_ASSERT(line->indent >= ctx->code_indent_offset);
+            line->indent -= ctx->code_indent_offset;
+            line->data = 0;
+            break;
+        }
+
+        /* Check for start of a new container block. */
+        if(line->indent < ctx->code_indent_offset  &&
+           md_is_container_mark(ctx, line->indent, off, &off, &container))
+        {
+            if(pivot_line->type == MD_LINE_TEXT  &&  n_parents == ctx->n_containers  &&
+                        (off >= ctx->size || ISNEWLINE(off))  &&  container.ch != _T('>'))
+            {
+                /* Noop. List mark followed by a blank line cannot interrupt a paragraph. */
+            } else if(pivot_line->type == MD_LINE_TEXT  &&  n_parents == ctx->n_containers  &&
+                        ISANYOF2_(container.ch, _T('.'), _T(')'))  &&  container.start != 1)
+            {
+                /* Noop. Ordered list cannot interrupt a paragraph unless the start index is 1. */
+            } else {
+                total_indent += container.contents_indent - container.mark_indent;
+                line->indent = md_line_indentation(ctx, total_indent, off, &off);
+                total_indent += line->indent;
+
+                line->beg = off;
+                line->data = container.ch;
+
+                /* Some of the following whitespace actually still belongs to the mark. */
+                if(off >= ctx->size || ISNEWLINE(off)) {
+                    container.contents_indent++;
+                } else if(line->indent <= ctx->code_indent_offset) {
+                    container.contents_indent += line->indent;
+                    line->indent = 0;
+                } else {
+                    container.contents_indent += 1;
+                    line->indent--;
+                }
+
+                if(n_brothers + n_children == 0)
+                    pivot_line = &md_dummy_blank_line;
+
+                if(n_children == 0)
+                    MD_CHECK(md_leave_child_containers(ctx, n_parents + n_brothers));
+
+                n_children++;
+                MD_CHECK(md_push_container(ctx, &container));
+                continue;
+            }
+        }
+
+        /* Check whether we are table continuation. */
+        if(pivot_line->type == MD_LINE_TABLE  &&  n_parents == ctx->n_containers) {
+            line->type = MD_LINE_TABLE;
+            break;
+        }
+
+        /* Check for ATX header. */
+        if(line->indent < ctx->code_indent_offset  &&
+                off < ctx->size  &&  CH(off) == _T('#'))
+        {
+            unsigned level;
+
+            if(md_is_atxheader_line(ctx, off, &line->beg, &off, &level)) {
+                line->type = MD_LINE_ATXHEADER;
+                line->data = level;
+                break;
+            }
+        }
+
+        /* Check whether we are starting code fence. */
+        if(off < ctx->size  &&  ISANYOF2(off, _T('`'), _T('~'))) {
+            if(md_is_opening_code_fence(ctx, off, &off)) {
+                line->type = MD_LINE_FENCEDCODE;
+                line->data = 1;
+                break;
+            }
+        }
+
+        /* Check for start of raw HTML block. */
+        if(off < ctx->size  &&  CH(off) == _T('<')
+            &&  !(ctx->parser.flags & MD_FLAG_NOHTMLBLOCKS))
+        {
+            ctx->html_block_type = md_is_html_block_start_condition(ctx, off);
+
+            /* HTML block type 7 cannot interrupt paragraph. */
+            if(ctx->html_block_type == 7  &&  pivot_line->type == MD_LINE_TEXT)
+                ctx->html_block_type = 0;
+
+            if(ctx->html_block_type > 0) {
+                /* The line itself also may immediately close the block. */
+                if(md_is_html_block_end_condition(ctx, off, &off) == ctx->html_block_type) {
+                    /* Make sure this is the last line of the block. */
+                    ctx->html_block_type = 0;
+                }
+
+                line->type = MD_LINE_HTML;
+                break;
+            }
+        }
+
+        /* Check for table underline. */
+        if((ctx->parser.flags & MD_FLAG_TABLES)  &&  pivot_line->type == MD_LINE_TEXT
+            &&  off < ctx->size  &&  ISANYOF3(off, _T('|'), _T('-'), _T(':'))
+            &&  n_parents == ctx->n_containers)
+        {
+            unsigned col_count;
+
+            if(ctx->current_block != NULL  &&  ctx->current_block->n_lines == 1  &&
+                md_is_table_underline(ctx, off, &off, &col_count))
+            {
+                line->data = col_count;
+                line->type = MD_LINE_TABLEUNDERLINE;
+                break;
+            }
+        }
+
+        /* By default, we are normal text line. */
+        line->type = MD_LINE_TEXT;
+        if(pivot_line->type == MD_LINE_TEXT  &&  n_brothers + n_children == 0) {
+            /* Lazy continuation. */
+            n_parents = ctx->n_containers;
+        }
+
+        /* Check for task mark. */
+        if((ctx->parser.flags & MD_FLAG_TASKLISTS)  &&  n_brothers + n_children > 0  &&
+           ISANYOF_(ctx->containers[ctx->n_containers-1].ch, _T("-+*.)")))
+        {
+            OFF tmp = off;
+
+            while(tmp < ctx->size  &&  tmp < off + 3  &&  ISBLANK(tmp))
+                tmp++;
+            if(tmp + 2 < ctx->size  &&  CH(tmp) == _T('[')  &&
+               ISANYOF(tmp+1, _T("xX "))  &&  CH(tmp+2) == _T(']')  &&
+               (tmp + 3 == ctx->size  ||  ISBLANK(tmp+3)  ||  ISNEWLINE(tmp+3)))
+            {
+                MD_CONTAINER* task_container = (n_children > 0 ? &ctx->containers[ctx->n_containers-1] : &container);
+                task_container->is_task = TRUE;
+                task_container->task_mark_off = tmp + 1;
+                off = tmp + 3;
+                while(off < ctx->size && ISWHITESPACE(off))
+                    off++;
+                if (off == ctx->size) break;
+                line->beg = off;
+            }
+        }
+
+        break;
+    }
+
+    /* Scan for end of the line.
+     *
+     * Note this is quite a bottleneck of the parsing as we here iterate almost
+     * over compete document.
+     */
+#if defined __linux__ && !defined MD4C_USE_UTF16
+    /* Recent glibc versions have superbly optimized strcspn(), even using
+     * vectorization if available. */
+    if(ctx->doc_ends_with_newline  &&  off < ctx->size) {
+        while(TRUE) {
+            off += (OFF) strcspn(STR(off), "\r\n");
+
+            /* strcspn() can stop on zero terminator; but that can appear
+             * anywhere in the Markfown input... */
+            if(CH(off) == _T('\0'))
+                off++;
+            else
+                break;
+        }
+    } else
+#endif
+    {
+        /* Optimization: Use some loop unrolling. */
+        while(off + 3 < ctx->size  &&  !ISNEWLINE(off+0)  &&  !ISNEWLINE(off+1)
+                                   &&  !ISNEWLINE(off+2)  &&  !ISNEWLINE(off+3))
+            off += 4;
+        while(off < ctx->size  &&  !ISNEWLINE(off))
+            off++;
+    }
+
+    /* Set end of the line. */
+    line->end = off;
+
+    /* But for ATX header, we should exclude the optional trailing mark. */
+    if(line->type == MD_LINE_ATXHEADER) {
+        OFF tmp = line->end;
+        while(tmp > line->beg && CH(tmp-1) == _T(' '))
+            tmp--;
+        while(tmp > line->beg && CH(tmp-1) == _T('#'))
+            tmp--;
+        if(tmp == line->beg || CH(tmp-1) == _T(' ') || (ctx->parser.flags & MD_FLAG_PERMISSIVEATXHEADERS))
+            line->end = tmp;
+    }
+
+    /* Trim trailing spaces. */
+    if(line->type != MD_LINE_INDENTEDCODE  &&  line->type != MD_LINE_FENCEDCODE) {
+        while(line->end > line->beg && CH(line->end-1) == _T(' '))
+            line->end--;
+    }
+
+    /* Eat also the new line. */
+    if(off < ctx->size && CH(off) == _T('\r'))
+        off++;
+    if(off < ctx->size && CH(off) == _T('\n'))
+        off++;
+
+    *p_end = off;
+
+    /* If we belong to a list after seeing a blank line, the list is loose. */
+    if(prev_line_has_list_loosening_effect  &&  line->type != MD_LINE_BLANK  &&  n_parents + n_brothers > 0) {
+        MD_CONTAINER* c = &ctx->containers[n_parents + n_brothers - 1];
+        if(c->ch != _T('>')) {
+            MD_BLOCK* block = (MD_BLOCK*) (((char*)ctx->block_bytes) + c->block_byte_off);
+            block->flags |= MD_BLOCK_LOOSE_LIST;
+        }
+    }
+
+    /* Leave any containers we are not part of anymore. */
+    if(n_children == 0  &&  n_parents + n_brothers < ctx->n_containers)
+        MD_CHECK(md_leave_child_containers(ctx, n_parents + n_brothers));
+
+    /* Enter any container we found a mark for. */
+    if(n_brothers > 0) {
+        MD_ASSERT(n_brothers == 1);
+        MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                    ctx->containers[n_parents].task_mark_off,
+                    (ctx->containers[n_parents].is_task ? CH(ctx->containers[n_parents].task_mark_off) : 0),
+                    MD_BLOCK_CONTAINER_CLOSER));
+        MD_CHECK(md_push_container_bytes(ctx, MD_BLOCK_LI,
+                    container.task_mark_off,
+                    (container.is_task ? CH(container.task_mark_off) : 0),
+                    MD_BLOCK_CONTAINER_OPENER));
+        ctx->containers[n_parents].is_task = container.is_task;
+        ctx->containers[n_parents].task_mark_off = container.task_mark_off;
+    }
+
+    if(n_children > 0)
+        MD_CHECK(md_enter_child_containers(ctx, n_children));
+
+abort:
+    return ret;
+}
+
+static int
+md_process_line(MD_CTX* ctx, const MD_LINE_ANALYSIS** p_pivot_line, MD_LINE_ANALYSIS* line)
+{
+    const MD_LINE_ANALYSIS* pivot_line = *p_pivot_line;
+    int ret = 0;
+
+    /* Blank line ends current leaf block. */
+    if(line->type == MD_LINE_BLANK) {
+        MD_CHECK(md_end_current_block(ctx));
+        *p_pivot_line = &md_dummy_blank_line;
+        return 0;
+    }
+
+    /* Some line types form block on their own. */
+    if(line->type == MD_LINE_HR || line->type == MD_LINE_ATXHEADER) {
+        MD_CHECK(md_end_current_block(ctx));
+
+        /* Add our single-line block. */
+        MD_CHECK(md_start_new_block(ctx, line));
+        MD_CHECK(md_add_line_into_current_block(ctx, line));
+        MD_CHECK(md_end_current_block(ctx));
+        *p_pivot_line = &md_dummy_blank_line;
+        return 0;
+    }
+
+    /* MD_LINE_SETEXTUNDERLINE changes meaning of the current block and ends it. */
+    if(line->type == MD_LINE_SETEXTUNDERLINE) {
+        MD_ASSERT(ctx->current_block != NULL);
+        ctx->current_block->type = MD_BLOCK_H;
+        ctx->current_block->data = line->data;
+        ctx->current_block->flags |= MD_BLOCK_SETEXT_HEADER;
+        MD_CHECK(md_add_line_into_current_block(ctx, line));
+        MD_CHECK(md_end_current_block(ctx));
+        if(ctx->current_block == NULL) {
+            *p_pivot_line = &md_dummy_blank_line;
+        } else {
+            /* This happens if we have consumed all the body as link ref. defs.
+             * and downgraded the underline into start of a new paragraph block. */
+            line->type = MD_LINE_TEXT;
+            *p_pivot_line = line;
+        }
+        return 0;
+    }
+
+    /* MD_LINE_TABLEUNDERLINE changes meaning of the current block. */
+    if(line->type == MD_LINE_TABLEUNDERLINE) {
+        MD_ASSERT(ctx->current_block != NULL);
+        MD_ASSERT(ctx->current_block->n_lines == 1);
+        ctx->current_block->type = MD_BLOCK_TABLE;
+        ctx->current_block->data = line->data;
+        MD_ASSERT(pivot_line != &md_dummy_blank_line);
+        ((MD_LINE_ANALYSIS*)pivot_line)->type = MD_LINE_TABLE;
+        MD_CHECK(md_add_line_into_current_block(ctx, line));
+        return 0;
+    }
+
+    /* The current block also ends if the line has different type. */
+    if(line->type != pivot_line->type)
+        MD_CHECK(md_end_current_block(ctx));
+
+    /* The current line may start a new block. */
+    if(ctx->current_block == NULL) {
+        MD_CHECK(md_start_new_block(ctx, line));
+        *p_pivot_line = line;
+    }
+
+    /* In all other cases the line is just a continuation of the current block. */
+    MD_CHECK(md_add_line_into_current_block(ctx, line));
+
+abort:
+    return ret;
+}
+
+static int
+md_process_doc(MD_CTX *ctx)
+{
+    const MD_LINE_ANALYSIS* pivot_line = &md_dummy_blank_line;
+    MD_LINE_ANALYSIS line_buf[2];
+    MD_LINE_ANALYSIS* line = &line_buf[0];
+    OFF off = 0;
+    int ret = 0;
+
+    MD_ENTER_BLOCK(MD_BLOCK_DOC, NULL);
+
+    while(off < ctx->size) {
+        if(line == pivot_line)
+            line = (line == &line_buf[0] ? &line_buf[1] : &line_buf[0]);
+
+        MD_CHECK(md_analyze_line(ctx, off, &off, pivot_line, line));
+        MD_CHECK(md_process_line(ctx, &pivot_line, line));
+    }
+
+    md_end_current_block(ctx);
+
+    MD_CHECK(md_build_ref_def_hashtable(ctx));
+
+    /* Process all blocks. */
+    MD_CHECK(md_leave_child_containers(ctx, 0));
+    MD_CHECK(md_process_all_blocks(ctx));
+
+    MD_LEAVE_BLOCK(MD_BLOCK_DOC, NULL);
+
+abort:
+
+#if 0
+    /* Output some memory consumption statistics. */
+    {
+        char buffer[256];
+        sprintf(buffer, "Alloced %u bytes for block buffer.",
+                    (unsigned)(ctx->alloc_block_bytes));
+        MD_LOG(buffer);
+
+        sprintf(buffer, "Alloced %u bytes for containers buffer.",
+                    (unsigned)(ctx->alloc_containers * sizeof(MD_CONTAINER)));
+        MD_LOG(buffer);
+
+        sprintf(buffer, "Alloced %u bytes for marks buffer.",
+                    (unsigned)(ctx->alloc_marks * sizeof(MD_MARK)));
+        MD_LOG(buffer);
+
+        sprintf(buffer, "Alloced %u bytes for aux. buffer.",
+                    (unsigned)(ctx->alloc_buffer * sizeof(MD_CHAR)));
+        MD_LOG(buffer);
+    }
+#endif
+
+    return ret;
+}
+
+
+/********************
+ ***  Public API  ***
+ ********************/
+
+int
+md_parse(const MD_CHAR* text, MD_SIZE size, const MD_PARSER* parser, void* userdata)
+{
+    MD_CTX ctx;
+    int i;
+    int ret;
+
+    if(parser->abi_version != 0) {
+        if(parser->debug_log != NULL)
+            parser->debug_log("Unsupported abi_version.", userdata);
+        return -1;
+    }
+
+    /* Setup context structure. */
+    memset(&ctx, 0, sizeof(MD_CTX));
+    ctx.text = text;
+    ctx.size = size;
+    memcpy(&ctx.parser, parser, sizeof(MD_PARSER));
+    ctx.userdata = userdata;
+    ctx.code_indent_offset = (ctx.parser.flags & MD_FLAG_NOINDENTEDCODEBLOCKS) ? (OFF)(-1) : 4;
+    md_build_mark_char_map(&ctx);
+    ctx.doc_ends_with_newline = (size > 0  &&  ISNEWLINE_(text[size-1]));
+
+    /* Reset all unresolved opener mark chains. */
+    for(i = 0; i < (int) SIZEOF_ARRAY(ctx.mark_chains); i++) {
+        ctx.mark_chains[i].head = -1;
+        ctx.mark_chains[i].tail = -1;
+    }
+    ctx.unresolved_link_head = -1;
+    ctx.unresolved_link_tail = -1;
+
+    /* All the work. */
+    ret = md_process_doc(&ctx);
+
+    /* Clean-up. */
+    md_free_ref_defs(&ctx);
+    md_free_ref_def_hashtable(&ctx);
+    free(ctx.buffer);
+    free(ctx.marks);
+    free(ctx.block_bytes);
+    free(ctx.containers);
+
+    return ret;
+}
diff --git a/tdemarkdown/md4c/src/md4c.h b/tdemarkdown/md4c/src/md4c.h
new file mode 100644
index 000000000..95f78f9b9
--- /dev/null
+++ b/tdemarkdown/md4c/src/md4c.h
@@ -0,0 +1,405 @@
+/*
+ * MD4C: Markdown parser for C
+ * (http://github.com/mity/md4c)
+ *
+ * Copyright (c) 2016-2020 Martin Mitas
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef MD4C_H
+#define MD4C_H
+
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+#if defined MD4C_USE_UTF16
+    /* Magic to support UTF-16. Note that in order to use it, you have to define
+     * the macro MD4C_USE_UTF16 both when building MD4C as well as when
+     * including this header in your code. */
+    #ifdef _WIN32
+        #include <windows.h>
+        typedef WCHAR       MD_CHAR;
+    #else
+        #error MD4C_USE_UTF16 is only supported on Windows.
+    #endif
+#else
+    typedef char            MD_CHAR;
+#endif
+
+typedef unsigned MD_SIZE;
+typedef unsigned MD_OFFSET;
+
+
+/* Block represents a part of document hierarchy structure like a paragraph
+ * or list item.
+ */
+typedef enum MD_BLOCKTYPE {
+    /* <body>...</body> */
+    MD_BLOCK_DOC = 0,
+
+    /* <blockquote>...</blockquote> */
+    MD_BLOCK_QUOTE,
+
+    /* <ul>...</ul>
+     * Detail: Structure MD_BLOCK_UL_DETAIL. */
+    MD_BLOCK_UL,
+
+    /* <ol>...</ol>
+     * Detail: Structure MD_BLOCK_OL_DETAIL. */
+    MD_BLOCK_OL,
+
+    /* <li>...</li>
+     * Detail: Structure MD_BLOCK_LI_DETAIL. */
+    MD_BLOCK_LI,
+
+    /* <hr> */
+    MD_BLOCK_HR,
+
+    /* <h1>...</h1> (for levels up to 6)
+     * Detail: Structure MD_BLOCK_H_DETAIL. */
+    MD_BLOCK_H,
+
+    /* <pre><code>...</code></pre>
+     * Note the text lines within code blocks are terminated with '\n'
+     * instead of explicit MD_TEXT_BR. */
+    MD_BLOCK_CODE,
+
+    /* Raw HTML block. This itself does not correspond to any particular HTML
+     * tag. The contents of it _is_ raw HTML source intended to be put
+     * in verbatim form to the HTML output. */
+    MD_BLOCK_HTML,
+
+    /* <p>...</p> */
+    MD_BLOCK_P,
+
+    /* <table>...</table> and its contents.
+     * Detail: Structure MD_BLOCK_TABLE_DETAIL (for MD_BLOCK_TABLE),
+     *         structure MD_BLOCK_TD_DETAIL (for MD_BLOCK_TH and MD_BLOCK_TD)
+     * Note all of these are used only if extension MD_FLAG_TABLES is enabled. */
+    MD_BLOCK_TABLE,
+    MD_BLOCK_THEAD,
+    MD_BLOCK_TBODY,
+    MD_BLOCK_TR,
+    MD_BLOCK_TH,
+    MD_BLOCK_TD
+} MD_BLOCKTYPE;
+
+/* Span represents an in-line piece of a document which should be rendered with
+ * the same font, color and other attributes. A sequence of spans forms a block
+ * like paragraph or list item. */
+typedef enum MD_SPANTYPE {
+    /* <em>...</em> */
+    MD_SPAN_EM,
+
+    /* <strong>...</strong> */
+    MD_SPAN_STRONG,
+
+    /* <a href="xxx">...</a>
+     * Detail: Structure MD_SPAN_A_DETAIL. */
+    MD_SPAN_A,
+
+    /* <img src="xxx">...</a>
+     * Detail: Structure MD_SPAN_IMG_DETAIL.
+     * Note: Image text can contain nested spans and even nested images.
+     * If rendered into ALT attribute of HTML <IMG> tag, it's responsibility
+     * of the parser to deal with it.
+     */
+    MD_SPAN_IMG,
+
+    /* <code>...</code> */
+    MD_SPAN_CODE,
+
+    /* <del>...</del>
+     * Note: Recognized only when MD_FLAG_STRIKETHROUGH is enabled.
+     */
+    MD_SPAN_DEL,
+
+    /* For recognizing inline ($) and display ($$) equations
+     * Note: Recognized only when MD_FLAG_LATEXMATHSPANS is enabled.
+     */
+    MD_SPAN_LATEXMATH,
+    MD_SPAN_LATEXMATH_DISPLAY,
+
+    /* Wiki links
+     * Note: Recognized only when MD_FLAG_WIKILINKS is enabled.
+     */
+    MD_SPAN_WIKILINK,
+
+    /* <u>...</u>
+     * Note: Recognized only when MD_FLAG_UNDERLINE is enabled. */
+    MD_SPAN_U
+} MD_SPANTYPE;
+
+/* Text is the actual textual contents of span. */
+typedef enum MD_TEXTTYPE {
+    /* Normal text. */
+    MD_TEXT_NORMAL = 0,
+
+    /* NULL character. CommonMark requires replacing NULL character with
+     * the replacement char U+FFFD, so this allows caller to do that easily. */
+    MD_TEXT_NULLCHAR,
+
+    /* Line breaks.
+     * Note these are not sent from blocks with verbatim output (MD_BLOCK_CODE
+     * or MD_BLOCK_HTML). In such cases, '\n' is part of the text itself. */
+    MD_TEXT_BR,         /* <br> (hard break) */
+    MD_TEXT_SOFTBR,     /* '\n' in source text where it is not semantically meaningful (soft break) */
+
+    /* Entity.
+     * (a) Named entity, e.g. &nbsp; 
+     *     (Note MD4C does not have a list of known entities.
+     *     Anything matching the regexp /&[A-Za-z][A-Za-z0-9]{1,47};/ is
+     *     treated as a named entity.)
+     * (b) Numerical entity, e.g. &#1234;
+     * (c) Hexadecimal entity, e.g. &#x12AB;
+     *
+     * As MD4C is mostly encoding agnostic, application gets the verbatim
+     * entity text into the MD_PARSER::text_callback(). */
+    MD_TEXT_ENTITY,
+
+    /* Text in a code block (inside MD_BLOCK_CODE) or inlined code (`code`).
+     * If it is inside MD_BLOCK_CODE, it includes spaces for indentation and
+     * '\n' for new lines. MD_TEXT_BR and MD_TEXT_SOFTBR are not sent for this
+     * kind of text. */
+    MD_TEXT_CODE,
+
+    /* Text is a raw HTML. If it is contents of a raw HTML block (i.e. not
+     * an inline raw HTML), then MD_TEXT_BR and MD_TEXT_SOFTBR are not used.
+     * The text contains verbatim '\n' for the new lines. */
+    MD_TEXT_HTML,
+
+    /* Text is inside an equation. This is processed the same way as inlined code
+     * spans (`code`). */
+    MD_TEXT_LATEXMATH
+} MD_TEXTTYPE;
+
+
+/* Alignment enumeration. */
+typedef enum MD_ALIGN {
+    MD_ALIGN_DEFAULT = 0,   /* When unspecified. */
+    MD_ALIGN_LEFT,
+    MD_ALIGN_CENTER,
+    MD_ALIGN_RIGHT
+} MD_ALIGN;
+
+
+/* String attribute.
+ *
+ * This wraps strings which are outside of a normal text flow and which are
+ * propagated within various detailed structures, but which still may contain
+ * string portions of different types like e.g. entities.
+ *
+ * So, for example, lets consider this image:
+ *
+ *     ![image alt text](http://example.org/image.png 'foo &quot; bar')
+ *
+ * The image alt text is propagated as a normal text via the MD_PARSER::text()
+ * callback. However, the image title ('foo &quot; bar') is propagated as
+ * MD_ATTRIBUTE in MD_SPAN_IMG_DETAIL::title.
+ *
+ * Then the attribute MD_SPAN_IMG_DETAIL::title shall provide the following:
+ *  -- [0]: "foo "   (substr_types[0] == MD_TEXT_NORMAL; substr_offsets[0] == 0)
+ *  -- [1]: "&quot;" (substr_types[1] == MD_TEXT_ENTITY; substr_offsets[1] == 4)
+ *  -- [2]: " bar"   (substr_types[2] == MD_TEXT_NORMAL; substr_offsets[2] == 10)
+ *  -- [3]: (n/a)    (n/a                              ; substr_offsets[3] == 14)
+ *
+ * Note that these invariants are always guaranteed:
+ *  -- substr_offsets[0] == 0
+ *  -- substr_offsets[LAST+1] == size
+ *  -- Currently, only MD_TEXT_NORMAL, MD_TEXT_ENTITY, MD_TEXT_NULLCHAR
+ *     substrings can appear. This could change only of the specification
+ *     changes.
+ */
+typedef struct MD_ATTRIBUTE {
+    const MD_CHAR* text;
+    MD_SIZE size;
+    const MD_TEXTTYPE* substr_types;
+    const MD_OFFSET* substr_offsets;
+} MD_ATTRIBUTE;
+
+
+/* Detailed info for MD_BLOCK_UL. */
+typedef struct MD_BLOCK_UL_DETAIL {
+    int is_tight;           /* Non-zero if tight list, zero if loose. */
+    MD_CHAR mark;           /* Item bullet character in MarkDown source of the list, e.g. '-', '+', '*'. */
+} MD_BLOCK_UL_DETAIL;
+
+/* Detailed info for MD_BLOCK_OL. */
+typedef struct MD_BLOCK_OL_DETAIL {
+    unsigned start;         /* Start index of the ordered list. */
+    int is_tight;           /* Non-zero if tight list, zero if loose. */
+    MD_CHAR mark_delimiter; /* Character delimiting the item marks in MarkDown source, e.g. '.' or ')' */
+} MD_BLOCK_OL_DETAIL;
+
+/* Detailed info for MD_BLOCK_LI. */
+typedef struct MD_BLOCK_LI_DETAIL {
+    int is_task;            /* Can be non-zero only with MD_FLAG_TASKLISTS */
+    MD_CHAR task_mark;      /* If is_task, then one of 'x', 'X' or ' '. Undefined otherwise. */
+    MD_OFFSET task_mark_offset;  /* If is_task, then offset in the input of the char between '[' and ']'. */
+} MD_BLOCK_LI_DETAIL;
+
+/* Detailed info for MD_BLOCK_H. */
+typedef struct MD_BLOCK_H_DETAIL {
+    unsigned level;         /* Header level (1 - 6) */
+} MD_BLOCK_H_DETAIL;
+
+/* Detailed info for MD_BLOCK_CODE. */
+typedef struct MD_BLOCK_CODE_DETAIL {
+    MD_ATTRIBUTE info;
+    MD_ATTRIBUTE lang;
+    MD_CHAR fence_char;     /* The character used for fenced code block; or zero for indented code block. */
+} MD_BLOCK_CODE_DETAIL;
+
+/* Detailed info for MD_BLOCK_TABLE. */
+typedef struct MD_BLOCK_TABLE_DETAIL {
+    unsigned col_count;         /* Count of columns in the table. */
+    unsigned head_row_count;    /* Count of rows in the table header (currently always 1) */
+    unsigned body_row_count;    /* Count of rows in the table body */
+} MD_BLOCK_TABLE_DETAIL;
+
+/* Detailed info for MD_BLOCK_TH and MD_BLOCK_TD. */
+typedef struct MD_BLOCK_TD_DETAIL {
+    MD_ALIGN align;
+} MD_BLOCK_TD_DETAIL;
+
+/* Detailed info for MD_SPAN_A. */
+typedef struct MD_SPAN_A_DETAIL {
+    MD_ATTRIBUTE href;
+    MD_ATTRIBUTE title;
+} MD_SPAN_A_DETAIL;
+
+/* Detailed info for MD_SPAN_IMG. */
+typedef struct MD_SPAN_IMG_DETAIL {
+    MD_ATTRIBUTE src;
+    MD_ATTRIBUTE title;
+} MD_SPAN_IMG_DETAIL;
+
+/* Detailed info for MD_SPAN_WIKILINK. */
+typedef struct MD_SPAN_WIKILINK {
+    MD_ATTRIBUTE target;
+} MD_SPAN_WIKILINK_DETAIL;
+
+/* Flags specifying extensions/deviations from CommonMark specification.
+ *
+ * By default (when MD_PARSER::flags == 0), we follow CommonMark specification.
+ * The following flags may allow some extensions or deviations from it.
+ */
+#define MD_FLAG_COLLAPSEWHITESPACE          0x0001  /* In MD_TEXT_NORMAL, collapse non-trivial whitespace into single ' ' */
+#define MD_FLAG_PERMISSIVEATXHEADERS        0x0002  /* Do not require space in ATX headers ( ###header ) */
+#define MD_FLAG_PERMISSIVEURLAUTOLINKS      0x0004  /* Recognize URLs as autolinks even without '<', '>' */
+#define MD_FLAG_PERMISSIVEEMAILAUTOLINKS    0x0008  /* Recognize e-mails as autolinks even without '<', '>' and 'mailto:' */
+#define MD_FLAG_NOINDENTEDCODEBLOCKS        0x0010  /* Disable indented code blocks. (Only fenced code works.) */
+#define MD_FLAG_NOHTMLBLOCKS                0x0020  /* Disable raw HTML blocks. */
+#define MD_FLAG_NOHTMLSPANS                 0x0040  /* Disable raw HTML (inline). */
+#define MD_FLAG_TABLES                      0x0100  /* Enable tables extension. */
+#define MD_FLAG_STRIKETHROUGH               0x0200  /* Enable strikethrough extension. */
+#define MD_FLAG_PERMISSIVEWWWAUTOLINKS      0x0400  /* Enable WWW autolinks (even without any scheme prefix, if they begin with 'www.') */
+#define MD_FLAG_TASKLISTS                   0x0800  /* Enable task list extension. */
+#define MD_FLAG_LATEXMATHSPANS              0x1000  /* Enable $ and $$ containing LaTeX equations. */
+#define MD_FLAG_WIKILINKS                   0x2000  /* Enable wiki links extension. */
+#define MD_FLAG_UNDERLINE                   0x4000  /* Enable underline extension (and disables '_' for normal emphasis). */
+
+#define MD_FLAG_PERMISSIVEAUTOLINKS         (MD_FLAG_PERMISSIVEEMAILAUTOLINKS | MD_FLAG_PERMISSIVEURLAUTOLINKS | MD_FLAG_PERMISSIVEWWWAUTOLINKS)
+#define MD_FLAG_NOHTML                      (MD_FLAG_NOHTMLBLOCKS | MD_FLAG_NOHTMLSPANS)
+
+/* Convenient sets of flags corresponding to well-known Markdown dialects.
+ *
+ * Note we may only support subset of features of the referred dialect.
+ * The constant just enables those extensions which bring us as close as
+ * possible given what features we implement.
+ *
+ * ABI compatibility note: Meaning of these can change in time as new
+ * extensions, bringing the dialect closer to the original, are implemented.
+ */
+#define MD_DIALECT_COMMONMARK               0
+#define MD_DIALECT_GITHUB                   (MD_FLAG_PERMISSIVEAUTOLINKS | MD_FLAG_TABLES | MD_FLAG_STRIKETHROUGH | MD_FLAG_TASKLISTS)
+
+/* Parser structure.
+ */
+typedef struct MD_PARSER {
+    /* Reserved. Set to zero.
+     */
+    unsigned abi_version;
+
+    /* Dialect options. Bitmask of MD_FLAG_xxxx values.
+     */
+    unsigned flags;
+
+    /* Caller-provided rendering callbacks.
+     *
+     * For some block/span types, more detailed information is provided in a
+     * type-specific structure pointed by the argument 'detail'.
+     *
+     * The last argument of all callbacks, 'userdata', is just propagated from
+     * md_parse() and is available for any use by the application.
+     *
+     * Note any strings provided to the callbacks as their arguments or as
+     * members of any detail structure are generally not zero-terminated.
+     * Application has to take the respective size information into account.
+     *
+     * Any rendering callback may abort further parsing of the document by
+     * returning non-zero.
+     */
+    int (*enter_block)(MD_BLOCKTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+    int (*leave_block)(MD_BLOCKTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+
+    int (*enter_span)(MD_SPANTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+    int (*leave_span)(MD_SPANTYPE /*type*/, void* /*detail*/, void* /*userdata*/);
+
+    int (*text)(MD_TEXTTYPE /*type*/, const MD_CHAR* /*text*/, MD_SIZE /*size*/, void* /*userdata*/);
+
+    /* Debug callback. Optional (may be NULL).
+     *
+     * If provided and something goes wrong, this function gets called.
+     * This is intended for debugging and problem diagnosis for developers;
+     * it is not intended to provide any errors suitable for displaying to an
+     * end user.
+     */
+    void (*debug_log)(const char* /*msg*/, void* /*userdata*/);
+
+    /* Reserved. Set to NULL.
+     */
+    void (*syntax)(void);
+} MD_PARSER;
+
+
+/* For backward compatibility. Do not use in new code.
+ */
+typedef MD_PARSER MD_RENDERER;
+
+
+/* Parse the Markdown document stored in the string 'text' of size 'size'.
+ * The parser provides callbacks to be called during the parsing so the
+ * caller can render the document on the screen or convert the Markdown
+ * to another format.
+ *
+ * Zero is returned on success. If a runtime error occurs (e.g. a memory
+ * fails), -1 is returned. If the processing is aborted due any callback
+ * returning non-zero, the return value of the callback is returned.
+ */
+int md_parse(const MD_CHAR* text, MD_SIZE size, const MD_PARSER* parser, void* userdata);
+
+
+#ifdef __cplusplus
+    }  /* extern "C" { */
+#endif
+
+#endif  /* MD4C_H */
diff --git a/tdemarkdown/md4c/src/md4c.pc.in b/tdemarkdown/md4c/src/md4c.pc.in
new file mode 100644
index 000000000..cd8842dd5
--- /dev/null
+++ b/tdemarkdown/md4c/src/md4c.pc.in
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: Markdown parser library with a SAX-like callback-based interface.
+Version: @PROJECT_VERSION@
+URL: @PROJECT_URL@
+
+Requires:
+Libs: -L${libdir} -lmd4c
+Cflags: -I${includedir}
diff --git a/tdemarkdown/md4c/test/LICENSE b/tdemarkdown/md4c/test/LICENSE
new file mode 100644
index 000000000..69da849a0
--- /dev/null
+++ b/tdemarkdown/md4c/test/LICENSE
@@ -0,0 +1,64 @@
+The CommonMark spec (spec.txt) and DTD (CommonMark.dtd) are
+
+Copyright (C) 2014-16 John MacFarlane
+
+Released under the Creative Commons CC-BY-SA 4.0 license:
+<http://creativecommons.org/licenses/by-sa/4.0/>.
+
+---
+
+The test software in test/ and the programs in tools/ are
+
+Copyright (c) 2014, John MacFarlane
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS
+"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 COPYRIGHT
+OWNER OR CONTRIBUTORS 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.
+
+---
+
+The normalization code in runtests.py was derived from the
+markdowntest project, Copyright 2013 Karl Dubost:
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Karl Dubost
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tdemarkdown/md4c/test/cmark.py b/tdemarkdown/md4c/test/cmark.py
new file mode 100755
index 000000000..111086030
--- /dev/null
+++ b/tdemarkdown/md4c/test/cmark.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from ctypes import CDLL, c_char_p, c_long
+from subprocess import *
+import platform
+import os
+
+def pipe_through_prog(prog, text):
+    p1 = Popen(prog.split(), stdout=PIPE, stdin=PIPE, stderr=PIPE)
+    [result, err] = p1.communicate(input=text.encode('utf-8'))
+    return [p1.returncode, result.decode('utf-8'), err]
+
+def use_library(lib, text):
+    textbytes = text.encode('utf-8')
+    textlen = len(textbytes)
+    return [0, lib(textbytes, textlen, 0).decode('utf-8'), '']
+
+class CMark:
+    def __init__(self, prog=None, library_dir=None):
+        self.prog = prog
+        if prog:
+            self.to_html = lambda x: pipe_through_prog(prog, x)
+        else:
+            sysname = platform.system()
+            if sysname == 'Darwin':
+                libname = "libcmark.dylib"
+            elif sysname == 'Windows':
+                libname = "cmark.dll"
+            else:
+                libname = "libcmark.so"
+            if library_dir:
+                libpath = os.path.join(library_dir, libname)
+            else:
+                libpath = os.path.join("build", "src", libname)
+            cmark = CDLL(libpath)
+            markdown = cmark.cmark_markdown_to_html
+            markdown.restype = c_char_p
+            markdown.argtypes = [c_char_p, c_long]
+            self.to_html = lambda x: use_library(markdown, x)
diff --git a/tdemarkdown/md4c/test/coverage.txt b/tdemarkdown/md4c/test/coverage.txt
new file mode 100644
index 000000000..66d5cc8dc
--- /dev/null
+++ b/tdemarkdown/md4c/test/coverage.txt
@@ -0,0 +1,522 @@
+
+# Coverage
+
+This file is just a collection of unit tests not covered elsewhere.
+
+Most notably regression tests, tests improving code coverage and other useful
+things may drop here.
+
+(However any tests requiring any additional command line option, like enabling
+an extension, must be included in their respective files.)
+
+
+## GitHub Issues
+
+### [Issue 2](https://github.com/mity/md4c/issues/2)
+
+Raw HTML block:
+
+```````````````````````````````` example
+<gi att1=tok1 att2=tok2>
+.
+<gi att1=tok1 att2=tok2>
+````````````````````````````````
+
+Inline:
+
+```````````````````````````````` example
+foo <gi att1=tok1 att2=tok2> bar
+.
+<p>foo <gi att1=tok1 att2=tok2> bar</p>
+````````````````````````````````
+
+Inline with a line break:
+
+```````````````````````````````` example
+foo <gi att1=tok1
+att2=tok2> bar
+.
+<p>foo <gi att1=tok1
+att2=tok2> bar</p>
+````````````````````````````````
+
+
+### [Issue 4](https://github.com/mity/md4c/issues/4)
+
+```````````````````````````````` example
+![alt text with *entity* &copy;](img.png 'title')
+.
+<p><img src="img.png" alt="alt text with entity ©" title="title"></p>
+````````````````````````````````
+
+
+### [Issue 9](https://github.com/mity/md4c/issues/9)
+
+```````````````````````````````` example
+> [foo
+> bar]: /url
+>
+> [foo bar]
+.
+<blockquote>
+<p><a href="/url">foo
+bar</a></p>
+</blockquote>
+````````````````````````````````
+
+
+### [Issue 10](https://github.com/mity/md4c/issues/10)
+
+```````````````````````````````` example
+[x]:
+x
+- <?
+
+  x
+.
+<ul>
+<li><?
+
+x
+</li>
+</ul>
+````````````````````````````````
+
+
+### [Issue 11](https://github.com/mity/md4c/issues/11)
+
+```````````````````````````````` example
+x [link](/url "foo &ndash; bar") x
+.
+<p>x <a href="/url" title="foo – bar">link</a> x</p>
+````````````````````````````````
+
+
+### [Issue 14](https://github.com/mity/md4c/issues/14)
+
+```````````````````````````````` example
+a***b* c*
+.
+<p>a*<em><em>b</em> c</em></p>
+````````````````````````````````
+
+
+### [Issue 15](https://github.com/mity/md4c/issues/15)
+
+```````````````````````````````` example
+***b* c*
+.
+<p>*<em><em>b</em> c</em></p>
+````````````````````````````````
+
+
+### [Issue 21](https://github.com/mity/md4c/issues/21)
+
+```````````````````````````````` example
+a*b**c*
+.
+<p>a<em>b**c</em></p>
+````````````````````````````````
+
+
+### [Issue 33](https://github.com/mity/md4c/issues/33)
+
+```````````````````````````````` example
+```&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;
+.
+<pre><code class="language-&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;"></code></pre>
+````````````````````````````````
+
+
+### [Issue 36](https://github.com/mity/md4c/issues/36)
+
+```````````````````````````````` example
+__x_ _x___
+.
+<p><em><em>x</em> <em>x</em></em>_</p>
+````````````````````````````````
+
+
+### [Issue 39](https://github.com/mity/md4c/issues/39)
+
+```````````````````````````````` example
+[\\]: x
+.
+````````````````````````````````
+
+
+### [Issue 40](https://github.com/mity/md4c/issues/40)
+
+```````````````````````````````` example
+[x](url
+'title'
+)x
+.
+<p><a href="url" title="title">x</a>x</p>
+````````````````````````````````
+
+
+### [Issue 65](https://github.com/mity/md4c/issues/65)
+
+```````````````````````````````` example
+`
+.
+<p>`</p>
+````````````````````````````````
+
+
+### [Issue 74](https://github.com/mity/md4c/issues/74)
+
+```````````````````````````````` example
+[f]:
+-
+    xx
+-
+.
+<pre><code>xx
+</code></pre>
+<ul>
+<li></li>
+</ul>
+````````````````````````````````
+
+
+### [Issue 78](https://github.com/mity/md4c/issues/78)
+
+```````````````````````````````` example
+[SS ẞ]: /url
+[ẞ SS]
+.
+<p><a href="/url">ẞ SS</a></p>
+````````````````````````````````
+
+
+### [Issue 83](https://github.com/mity/md4c/issues/83)
+
+```````````````````````````````` example
+foo
+>
+.
+<p>foo</p>
+<blockquote>
+</blockquote>
+
+````````````````````````````````
+
+
+### [Issue 95](https://github.com/mity/md4c/issues/95)
+
+```````````````````````````````` example
+. foo
+.
+<p>. foo</p>
+````````````````````````````````
+
+
+### [Issue 96](https://github.com/mity/md4c/issues/96)
+
+```````````````````````````````` example
+[ab]: /foo
+[a] [ab] [abc]
+.
+<p>[a] <a href="/foo">ab</a> [abc]</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[a b]: /foo
+[a   b]
+.
+<p><a href="/foo">a   b</a></p>
+````````````````````````````````
+
+
+### [Issue 97](https://github.com/mity/md4c/issues/97)
+
+```````````````````````````````` example
+*a **b c* d**
+.
+<p><em>a <em><em>b c</em> d</em></em></p>
+
+````````````````````````````````
+
+
+### [Issue 100](https://github.com/mity/md4c/issues/100)
+
+```````````````````````````````` example
+<foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123>
+.
+<p><a href="mailto:foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123">foo@123456789012345678901234567890123456789012345678901234567890123.123456789012345678901234567890123456789012345678901234567890123</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+<foo@123456789012345678901234567890123456789012345678901234567890123x.123456789012345678901234567890123456789012345678901234567890123>
+.
+<p>&lt;foo@123456789012345678901234567890123456789012345678901234567890123x.123456789012345678901234567890123456789012345678901234567890123&gt;</p>
+````````````````````````````````
+(Note the `x` here which turns it over the max. allowed length limit.)
+
+
+### [Issue 107](https://github.com/mity/md4c/issues/107)
+
+```````````````````````````````` example
+***foo *bar baz***
+.
+<p>*<strong>foo <em>bar baz</em></strong></p>
+
+````````````````````````````````
+
+
+### [Issue 124](https://github.com/mity/md4c/issues/124)
+
+```````````````````````````````` example
+~~~
+                x
+~~~
+
+~~~
+                 x
+~~~
+.
+<pre><code>                x
+</code></pre>
+<pre><code>                 x
+</code></pre>
+````````````````````````````````
+
+
+### [Issue 131](https://github.com/mity/md4c/issues/131)
+
+```````````````````````````````` example
+[![alt][img]][link]
+
+[img]: img_url
+[link]: link_url
+.
+<p><a href="link_url"><img src="img_url" alt="alt"></a></p>
+````````````````````````````````
+
+
+### [Issue 142](https://github.com/mity/md4c/issues/142)
+
+```````````````````````````````` example
+[fooﬗ]: /url
+[fooﬕ]
+.
+<p>[fooﬕ]</p>
+````````````````````````````````
+
+
+### [Issue 149](https://github.com/mity/md4c/issues/149)
+
+```````````````````````````````` example
+- <script>
+- foo
+bar
+</script>
+.
+<ul>
+<li><script>
+</li>
+<li>foo
+bar
+</script></li>
+</ul>
+````````````````````````````````
+
+
+## Code coverage
+
+### `md_is_unicode_whitespace__()`
+
+Unicode whitespace (here U+2000) forms a word boundary so these cannot be
+resolved as emphasis span because there is no closer mark.
+
+```````````````````````````````` example
+*foo *bar
+.
+<p>*foo *bar</p>
+````````````````````````````````
+
+
+### `md_is_unicode_punct__()`
+
+Ditto for Unicode punctuation (here U+00A1).
+
+```````````````````````````````` example
+*foo¡*bar
+.
+<p>*foo¡*bar</p>
+````````````````````````````````
+
+
+### `md_get_unicode_fold_info()`
+
+```````````````````````````````` example
+[Příliš žluťoučký kůň úpěl ďábelské ódy.]
+
+[PŘÍLIŠ ŽLUŤOUČKÝ KŮŇ ÚPĚL ĎÁBELSKÉ ÓDY.]: /url
+.
+<p><a href="/url">Příliš žluťoučký kůň úpěl ďábelské ódy.</a></p>
+````````````````````````````````
+
+
+### `md_decode_utf8__()` and `md_decode_utf8_before__()`
+
+```````````````````````````````` example
+á*Á (U+00E1, i.e. two byte UTF-8 sequence)
+ *  (U+2000, i.e. three byte UTF-8 sequence)
+.
+<p>á*Á (U+00E1, i.e. two byte UTF-8 sequence)
+ *  (U+2000, i.e. three byte UTF-8 sequence)</p>
+````````````````````````````````
+
+
+### `md_is_link_destination_A()`
+
+```````````````````````````````` example
+[link](</url\.with\.escape>)
+.
+<p><a href="/url.with.escape">link</a></p>
+````````````````````````````````
+
+
+### `md_link_label_eq()`
+
+```````````````````````````````` example
+[foo bar]
+
+[foo bar]: /url
+.
+<p><a href="/url">foo bar</a></p>
+````````````````````````````````
+
+
+### `md_is_inline_link_spec()`
+
+```````````````````````````````` example
+> [link](/url 'foo
+> bar')
+.
+<blockquote>
+<p><a href="/url" title="foo
+bar">link</a></p>
+</blockquote>
+````````````````````````````````
+
+
+### `md_build_ref_def_hashtable()`
+
+All link labels in the following example all have the same FNV1a hash (after
+normalization of the label, which means after converting to a vector of Unicode
+codepoints and lowercase folding).
+
+So the example triggers quite complex code paths which are not otherwise easily
+tested.
+
+```````````````````````````````` example
+[foo]: /foo
+[qnptgbh]: /qnptgbh
+[abgbrwcv]: /abgbrwcv
+[abgbrwcv]: /abgbrwcv2
+[abgbrwcv]: /abgbrwcv3
+[abgbrwcv]: /abgbrwcv4
+[alqadfgn]: /alqadfgn
+
+[foo]
+[qnptgbh]
+[abgbrwcv]
+[alqadfgn]
+[axgydtdu]
+.
+<p><a href="/foo">foo</a>
+<a href="/qnptgbh">qnptgbh</a>
+<a href="/abgbrwcv">abgbrwcv</a>
+<a href="/alqadfgn">alqadfgn</a>
+[axgydtdu]</p>
+````````````````````````````````
+
+For the sake of completeness, the following C program was used to find the hash
+collisions by brute force:
+
+~~~
+
+#include <stdio.h>
+#include <string.h>
+
+
+static unsigned etalon;
+
+
+
+#define MD_FNV1A_BASE       2166136261
+#define MD_FNV1A_PRIME      16777619
+
+static inline unsigned
+fnv1a(unsigned base, const void* data, size_t n)
+{
+    const unsigned char* buf = (const unsigned char*) data;
+    unsigned hash = base;
+    size_t i;
+
+    for(i = 0; i < n; i++) {
+        hash ^= buf[i];
+        hash *= MD_FNV1A_PRIME;
+    }
+
+    return hash;
+}
+
+
+static unsigned
+unicode_hash(const char* data, size_t n)
+{
+    unsigned value;
+    unsigned hash = MD_FNV1A_BASE;
+    int i;
+
+    for(i = 0; i < n; i++) {
+        value = data[i];
+        hash = fnv1a(hash, &value, sizeof(unsigned));
+    }
+
+    return hash;
+}
+
+
+static void
+recurse(char* buffer, size_t off, size_t len)
+{
+    int ch;
+
+    if(off < len - 1) {
+        for(ch = 'a'; ch <= 'z'; ch++) {
+            buffer[off] = ch;
+            recurse(buffer, off+1, len);
+        }
+    } else {
+        for(ch = 'a'; ch <= 'z'; ch++) {
+            buffer[off] = ch;
+            if(unicode_hash(buffer, len) == etalon) {
+                printf("Dup: %.*s\n", (int)len, buffer);
+            }
+        }
+    }
+}
+
+int
+main(int argc, char** argv)
+{
+    char buffer[32];
+    int len;
+
+    if(argc < 2)
+        etalon = unicode_hash("foo", 3);
+    else
+        etalon = unicode_hash(argv[1], strlen(argv[1]));
+
+    for(len = 1; len <= sizeof(buffer); len++)
+        recurse(buffer, 0, len);
+
+    return 0;
+}
+~~~
diff --git a/tdemarkdown/md4c/test/fuzz-input/commonmark.md b/tdemarkdown/md4c/test/fuzz-input/commonmark.md
new file mode 100644
index 000000000..974d817ba
--- /dev/null
+++ b/tdemarkdown/md4c/test/fuzz-input/commonmark.md
@@ -0,0 +1,40 @@
+
+# h1
+## h2
+### h3
+#### h4
+##### h5
+###### h6
+
+h1
+==
+
+h2
+--
+
+--------------------
+
+    indented code
+
+```
+fenced code
+```
+
+<tag attr='val' attr2="val2">
+
+> quote
+
+* list item
+1. list item
+
+[ref]: /url
+
+paragraph
+&copy; &#1234; &#xabcd;
+`code`
+*emph* **strong** ***strong emph***
+_emph_ __strong__ ___strong emph___
+[ref] [ref][] [link](/url)
+![ref] ![ref][] ![img](/url)
+<http://example.com> <doe@example.com>
+\\ \* \. \` \
diff --git a/tdemarkdown/md4c/test/fuzz-input/gfm.md b/tdemarkdown/md4c/test/fuzz-input/gfm.md
new file mode 100644
index 000000000..dfdbc7290
--- /dev/null
+++ b/tdemarkdown/md4c/test/fuzz-input/gfm.md
@@ -0,0 +1,10 @@
+* [ ] unchecked
+* [x] checked
+
+ A | B | C
+---|--:|:-:
+aaa|bbb|ccc
+
+~del~ ~~del~~
+
+http://example.com www.example.com doe@example.com
diff --git a/tdemarkdown/md4c/test/fuzz-input/latex-math.md b/tdemarkdown/md4c/test/fuzz-input/latex-math.md
new file mode 100644
index 000000000..d17af345d
--- /dev/null
+++ b/tdemarkdown/md4c/test/fuzz-input/latex-math.md
@@ -0,0 +1 @@
+$a^2+b^2=c^2$ $$a^2+b^2=c^2$$
diff --git a/tdemarkdown/md4c/test/fuzz-input/wiki.md b/tdemarkdown/md4c/test/fuzz-input/wiki.md
new file mode 100644
index 000000000..a4239745c
--- /dev/null
+++ b/tdemarkdown/md4c/test/fuzz-input/wiki.md
@@ -0,0 +1 @@
+[[wiki]] [[wiki|label]]
diff --git a/tdemarkdown/md4c/test/fuzzers/fuzz-mdhtml.c b/tdemarkdown/md4c/test/fuzzers/fuzz-mdhtml.c
new file mode 100644
index 000000000..2d645d237
--- /dev/null
+++ b/tdemarkdown/md4c/test/fuzzers/fuzz-mdhtml.c
@@ -0,0 +1,35 @@
+
+#include <stdint.h>
+#include <stdlib.h>
+#include "md4c-html.h"
+
+
+static void
+process_output(const MD_CHAR* text, MD_SIZE size, void* userdata)
+{
+   /* This is a dummy function because we don't need to generate any output
+    * actually. */
+   return;
+}
+
+int
+LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
+{
+    unsigned parser_flags, renderer_flags;
+
+    if(size < 2 * sizeof(unsigned)) {
+        /* We interpret the 1st 8 bytes as parser flags and renderer flags. */
+        return 0;
+    }
+
+    parser_flags = *(unsigned*)data;
+    data += sizeof(unsigned); size -= sizeof(unsigned);
+
+    renderer_flags = *(unsigned*)data;
+    data += sizeof(unsigned); size -= sizeof(unsigned);
+
+    /* Allocate enough space */
+    md_html(data, size, process_output, NULL, parser_flags, renderer_flags);
+
+    return 0;
+}
diff --git a/tdemarkdown/md4c/test/latex-math.txt b/tdemarkdown/md4c/test/latex-math.txt
new file mode 100644
index 000000000..2a5774ce0
--- /dev/null
+++ b/tdemarkdown/md4c/test/latex-math.txt
@@ -0,0 +1,39 @@
+
+# LaTeX Math
+
+With the flag `MD_FLAG_LATEXMATHSPANS`, MD4C enables extension for recognition
+of LaTeX style math spans.
+
+A math span is is any text wrapped in dollars or double dollars (`$...$` or
+`$$...$$`).
+
+```````````````````````````````` example
+$a+b=c$ Hello, world!
+.
+<p><x-equation>a+b=c</x-equation> Hello, world!</p>
+````````````````````````````````
+
+If the double dollar sign is used, the math span is a display math span.
+
+```````````````````````````````` example
+This is a display equation: $$\int_a^b x dx$$.
+.
+<p>This is a display equation: <x-equation type="display">\int_a^b x dx</x-equation>.</p>
+````````````````````````````````
+
+Math spans may span multiple lines as they are normal spans:
+
+```````````````````````````````` example
+$$
+\int_a^b
+f(x) dx
+$$
+.
+<p><x-equation type="display">\int_a^b f(x) dx </x-equation></p>
+````````````````````````````````
+
+Note though that many (simple) renderers may output the math spans just as a
+verbatim text. (This includes the HTML renderer used by the `md2html` utility.)
+
+Only advanced renderers which implement LaTeX math syntax can be expected to
+provide better results.
diff --git a/tdemarkdown/md4c/test/normalize.py b/tdemarkdown/md4c/test/normalize.py
new file mode 100755
index 000000000..f8ece18d5
--- /dev/null
+++ b/tdemarkdown/md4c/test/normalize.py
@@ -0,0 +1,194 @@
+# -*- coding: utf-8 -*-
+from html.parser import HTMLParser
+import urllib
+
+try:
+    from html.parser import HTMLParseError
+except ImportError:
+    # HTMLParseError was removed in Python 3.5. It could never be
+    # thrown, so we define a placeholder instead.
+    class HTMLParseError(Exception):
+        pass
+
+from html.entities import name2codepoint
+import sys
+import re
+import html
+
+# Normalization code, adapted from
+# https://github.com/karlcow/markdown-testsuite/
+significant_attrs = ["alt", "href", "src", "title"]
+whitespace_re = re.compile('\s+')
+class MyHTMLParser(HTMLParser):
+    def __init__(self):
+        HTMLParser.__init__(self)
+        self.convert_charrefs = False
+        self.last = "starttag"
+        self.in_pre = False
+        self.output = ""
+        self.last_tag = ""
+    def handle_data(self, data):
+        after_tag = self.last == "endtag" or self.last == "starttag"
+        after_block_tag = after_tag and self.is_block_tag(self.last_tag)
+        if after_tag and self.last_tag == "br":
+            data = data.lstrip('\n')
+        if not self.in_pre:
+            data = whitespace_re.sub(' ', data)
+        if after_block_tag and not self.in_pre:
+            if self.last == "starttag":
+                data = data.lstrip()
+            elif self.last == "endtag":
+                data = data.strip()
+        self.output += data
+        self.last = "data"
+    def handle_endtag(self, tag):
+        if tag == "pre":
+            self.in_pre = False
+        elif self.is_block_tag(tag):
+            self.output = self.output.rstrip()
+        self.output += "</" + tag + ">"
+        self.last_tag = tag
+        self.last = "endtag"
+    def handle_starttag(self, tag, attrs):
+        if tag == "pre":
+            self.in_pre = True
+        if self.is_block_tag(tag):
+            self.output = self.output.rstrip()
+        self.output += "<" + tag
+        # For now we don't strip out 'extra' attributes, because of
+        # raw HTML test cases.
+        # attrs = filter(lambda attr: attr[0] in significant_attrs, attrs)
+        if attrs:
+            attrs.sort()
+            for (k,v) in attrs:
+                self.output += " " + k
+                if v in ['href','src']:
+                    self.output += ("=" + '"' +
+                            urllib.quote(urllib.unquote(v), safe='/') + '"')
+                elif v != None:
+                    self.output += ("=" + '"' + html.escape(v,quote=True) + '"')
+        self.output += ">"
+        self.last_tag = tag
+        self.last = "starttag"
+    def handle_startendtag(self, tag, attrs):
+        """Ignore closing tag for self-closing """
+        self.handle_starttag(tag, attrs)
+        self.last_tag = tag
+        self.last = "endtag"
+    def handle_comment(self, data):
+        self.output += '<!--' + data + '-->'
+        self.last = "comment"
+    def handle_decl(self, data):
+        self.output += '<!' + data + '>'
+        self.last = "decl"
+    def unknown_decl(self, data):
+        self.output += '<!' + data + '>'
+        self.last = "decl"
+    def handle_pi(self,data):
+        self.output += '<?' + data + '>'
+        self.last = "pi"
+    def handle_entityref(self, name):
+        try:
+            c = chr(name2codepoint[name])
+        except KeyError:
+            c = None
+        self.output_char(c, '&' + name + ';')
+        self.last = "ref"
+    def handle_charref(self, name):
+        try:
+            if name.startswith("x"):
+                c = chr(int(name[1:], 16))
+            else:
+                c = chr(int(name))
+        except ValueError:
+                c = None
+        self.output_char(c, '&' + name + ';')
+        self.last = "ref"
+    # Helpers.
+    def output_char(self, c, fallback):
+        if c == '<':
+            self.output += "&lt;"
+        elif c == '>':
+            self.output += "&gt;"
+        elif c == '&':
+            self.output += "&amp;"
+        elif c == '"':
+            self.output += "&quot;"
+        elif c == None:
+            self.output += fallback
+        else:
+            self.output += c
+
+    def is_block_tag(self,tag):
+        return (tag in ['article', 'header', 'aside', 'hgroup', 'blockquote',
+            'hr', 'iframe', 'body', 'li', 'map', 'button', 'object', 'canvas',
+            'ol', 'caption', 'output', 'col', 'p', 'colgroup', 'pre', 'dd',
+            'progress', 'div', 'section', 'dl', 'table', 'td', 'dt',
+            'tbody', 'embed', 'textarea', 'fieldset', 'tfoot', 'figcaption',
+            'th', 'figure', 'thead', 'footer', 'tr', 'form', 'ul',
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'video', 'script', 'style'])
+
+def normalize_html(html):
+    r"""
+    Return normalized form of HTML which ignores insignificant output
+    differences:
+
+    Multiple inner whitespaces are collapsed to a single space (except
+    in pre tags):
+
+        >>> normalize_html("<p>a  \t b</p>")
+        '<p>a b</p>'
+
+        >>> normalize_html("<p>a  \t\nb</p>")
+        '<p>a b</p>'
+
+    * Whitespace surrounding block-level tags is removed.
+
+        >>> normalize_html("<p>a  b</p>")
+        '<p>a b</p>'
+
+        >>> normalize_html(" <p>a  b</p>")
+        '<p>a b</p>'
+
+        >>> normalize_html("<p>a  b</p> ")
+        '<p>a b</p>'
+
+        >>> normalize_html("\n\t<p>\n\t\ta  b\t\t</p>\n\t")
+        '<p>a b</p>'
+
+        >>> normalize_html("<i>a  b</i> ")
+        '<i>a b</i> '
+
+    * Self-closing tags are converted to open tags.
+
+        >>> normalize_html("<br />")
+        '<br>'
+
+    * Attributes are sorted and lowercased.
+
+        >>> normalize_html('<a title="bar" HREF="foo">x</a>')
+        '<a href="foo" title="bar">x</a>'
+
+    * References are converted to unicode, except that '<', '>', '&', and
+      '"' are rendered using entities.
+
+        >>> normalize_html("&forall;&amp;&gt;&lt;&quot;")
+        '\u2200&amp;&gt;&lt;&quot;'
+
+    """
+    html_chunk_re = re.compile("(\<!\[CDATA\[.*?\]\]\>|\<[^>]*\>|[^<]+)")
+    try:
+        parser = MyHTMLParser()
+        # We work around HTMLParser's limitations parsing CDATA
+        # by breaking the input into chunks and passing CDATA chunks
+        # through verbatim.
+        for chunk in re.finditer(html_chunk_re, html):
+            if chunk.group(0)[:8] == "<![CDATA":
+                parser.output += chunk.group(0)
+            else:
+                parser.feed(chunk.group(0))
+        parser.close()
+        return parser.output
+    except HTMLParseError as e:
+        sys.stderr.write("Normalization error: " + e.msg + "\n")
+        return html  # on error, return unnormalized HTML
diff --git a/tdemarkdown/md4c/test/pathological_tests.py b/tdemarkdown/md4c/test/pathological_tests.py
new file mode 100755
index 000000000..76cb9dfc0
--- /dev/null
+++ b/tdemarkdown/md4c/test/pathological_tests.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import re
+import argparse
+import sys
+import platform
+from cmark import CMark
+from timeit import default_timer as timer
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Run cmark tests.')
+    parser.add_argument('-p', '--program', dest='program', nargs='?', default=None,
+            help='program to test')
+    parser.add_argument('--library-dir', dest='library_dir', nargs='?',
+            default=None, help='directory containing dynamic library')
+    args = parser.parse_args(sys.argv[1:])
+
+cmark = CMark(prog=args.program, library_dir=args.library_dir)
+
+# list of pairs consisting of input and a regex that must match the output.
+pathological = {
+    # note - some pythons have limit of 65535 for {num-matches} in re.
+    "U+0000":
+            ("abc\u0000de\u0000",
+            re.compile("abc\ufffd?de\ufffd?")),
+    "U+FEFF (Unicode BOM)":
+            ("\ufefffoo",
+            re.compile("<p>foo</p>")),
+    "nested strong emph":
+            (("*a **a " * 65000) + "b" + (" a** a*" * 65000),
+            re.compile("(<em>a <strong>a ){65000}b( a</strong> a</em>){65000}")),
+    "many emph closers with no openers":
+            (("a_ " * 65000),
+            re.compile("(a[_] ){64999}a_")),
+    "many emph openers with no closers":
+            (("_a " * 65000),
+            re.compile("(_a ){64999}_a")),
+    "many 3-emph openers with no closers":
+            (("a***" * 65000),
+            re.compile("(a<em><strong>a</strong></em>){32500}")),
+    "many link closers with no openers":
+            (("a]" * 65000),
+            re.compile("(a\]){65000}")),
+    "many link openers with no closers":
+            (("[a" * 65000),
+            re.compile("(\[a){65000}")),
+    "mismatched openers and closers":
+            (("*a_ " * 50000),
+            re.compile("([*]a[_] ){49999}[*]a_")),
+    "openers and closers multiple of 3":
+            (("a**b" + ("c* " * 50000)),
+            re.compile("a[*][*]b(c[*] ){49999}c[*]")),
+    "link openers and emph closers":
+            (("[ a_" * 50000),
+            re.compile("(\[ a_){50000}")),
+    "hard link/emph case":
+            ("**x [a*b**c*](d)",
+            re.compile("\\*\\*x <a href=\"d\">a<em>b\\*\\*c</em></a>")),
+    "nested brackets":
+            (("[" * 50000) + "a" + ("]" * 50000),
+            re.compile("\[{50000}a\]{50000}")),
+    "nested block quotes":
+            ((("> " * 50000) + "a"),
+            re.compile("(<blockquote>\r?\n){50000}")),
+    "backticks":
+            ("".join(map(lambda x: ("e" + "`" * x), range(1,1000))),
+            re.compile("^<p>[e`]*</p>\r?\n$")),
+    "many links":
+            ("[t](/u) " * 50000,
+            re.compile("(<a href=\"/u\">t</a> ?){50000}")),
+    "many references":
+            ("".join(map(lambda x: ("[" + str(x) + "]: u\n"), range(1,20000 * 16))) + "[0] " * 20000,
+            re.compile("(\[0\] ){19999}")),
+    "deeply nested lists":
+            ("".join(map(lambda x: ("  " * x + "* a\n"), range(0,1000))),
+            re.compile("<ul>\r?\n(<li>a<ul>\r?\n){999}<li>a</li>\r?\n</ul>\r?\n(</li>\r?\n</ul>\r?\n){999}")),
+    "many html openers and closers":
+            (("<>" * 50000),
+            re.compile("(&lt;&gt;){50000}")),
+    "many html proc. inst. openers":
+            (("x" + "<?" * 50000),
+            re.compile("x(&lt;\\?){50000}")),
+    "many html CDATA openers":
+            (("x" + "<![CDATA[" * 50000),
+            re.compile("x(&lt;!\\[CDATA\\[){50000}")),
+    "many backticks and escapes":
+            (("\\``" * 50000),
+            re.compile("(``){50000}")),
+    "many broken link titles":
+            (("[ (](" * 50000),
+            re.compile("(\[ \(\]\(){50000}")),
+    "broken thematic break":
+            (("* " * 50000 + "a"),
+            re.compile("<ul>\r?\n(<li><ul>\r?\n){49999}<li>a</li>\r?\n</ul>\r?\n(</li>\r?\n</ul>\r?\n){49999}")),
+    "nested invalid link references":
+            (("[" * 50000 + "]" * 50000 + "\n\n[a]: /b"),
+            re.compile("\[{50000}\]{50000}"))
+}
+
+whitespace_re = re.compile('/s+/')
+passed = 0
+errored = 0
+failed = 0
+
+#print("Testing pathological cases:")
+for description in pathological:
+    (inp, regex) = pathological[description]
+    start = timer()
+    [rc, actual, err] = cmark.to_html(inp)
+    end = timer()
+    if rc != 0:
+        errored += 1
+        print('{:35} [ERRORED (return code %d)]'.format(description, rc))
+        print(err)
+    elif regex.search(actual):
+        print('{:35} [PASSED] {:.3f} secs'.format(description, end-start))
+        passed += 1
+    else:
+        print('{:35} [FAILED]'.format(description))
+        print(repr(actual))
+        failed += 1
+
+print("%d passed, %d failed, %d errored" % (passed, failed, errored))
+if (failed == 0 and errored == 0):
+    exit(0)
+else:
+    exit(1)
diff --git a/tdemarkdown/md4c/test/permissive-email-autolinks.txt b/tdemarkdown/md4c/test/permissive-email-autolinks.txt
new file mode 100644
index 000000000..12e8786c9
--- /dev/null
+++ b/tdemarkdown/md4c/test/permissive-email-autolinks.txt
@@ -0,0 +1,50 @@
+
+# Permissive E-mail Autolinks
+
+With the flag `MD_FLAG_PERMISSIVEEMAILAUTOLINKS`, MD4C enables more permissive
+recognition of e-mail addresses and transforms them to autolinks, even if they
+do not exactly follow the syntax of autolink as specified in CommonMark
+specification.
+
+This is standard CommonMark e-mail autolink:
+
+```````````````````````````````` example
+E-mail: <mailto:john.doe@gmail.com>
+.
+<p>E-mail: <a href="mailto:john.doe@gmail.com">mailto:john.doe@gmail.com</a></p>
+````````````````````````````````
+
+With the permissive autolinks enabled, this is sufficient:
+
+```````````````````````````````` example
+E-mail: john.doe@gmail.com
+.
+<p>E-mail: <a href="mailto:john.doe@gmail.com">john.doe@gmail.com</a></p>
+````````````````````````````````
+
+`+` can occur before the `@`, but not after.
+
+```````````````````````````````` example
+hello@mail+xyz.example isn't valid, but hello+xyz@mail.example is.
+.
+<p>hello@mail+xyz.example isn't valid, but <a href="mailto:hello+xyz@mail.example">hello+xyz@mail.example</a> is.</p>
+````````````````````````````````
+
+`.`, `-`, and `_` can occur on both sides of the `@`, but only `.` may occur at
+the end of the email address, in which case it will not be considered part of
+the address:
+
+```````````````````````````````` example
+a.b-c_d@a.b
+
+a.b-c_d@a.b.
+
+a.b-c_d@a.b-
+
+a.b-c_d@a.b_
+.
+<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a></p>
+<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a>.</p>
+<p>a.b-c_d@a.b-</p>
+<p>a.b-c_d@a.b_</p>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/permissive-url-autolinks.txt b/tdemarkdown/md4c/test/permissive-url-autolinks.txt
new file mode 100644
index 000000000..dfd6b5d4d
--- /dev/null
+++ b/tdemarkdown/md4c/test/permissive-url-autolinks.txt
@@ -0,0 +1,99 @@
+
+# Permissive URL Autolinks
+
+With the flag `MD_FLAG_PERMISSIVEURLAUTOLINKS`, MD4C enables more permissive recognition
+of URLs and transform them to autolinks, even if they do not exactly follow the syntax
+of autolink as specified in CommonMark specification.
+
+This is a standard CommonMark autolink:
+
+```````````````````````````````` example
+Homepage: <https://github.com/mity/md4c>
+.
+<p>Homepage: <a href="https://github.com/mity/md4c">https://github.com/mity/md4c</a></p>
+````````````````````````````````
+
+With the permissive autolinks enabled, this is sufficient:
+
+```````````````````````````````` example
+Homepage: https://github.com/mity/md4c
+.
+<p>Homepage: <a href="https://github.com/mity/md4c">https://github.com/mity/md4c</a></p>
+````````````````````````````````
+
+But this permissive autolink feature can work only for very widely used URL
+schemes, in alphabetical order `ftp:`, `http:`, `https:`.
+
+That's why this is not a permissive autolink:
+
+```````````````````````````````` example
+ssh://root@example.com
+.
+<p>ssh://root@example.com</p>
+````````````````````````````````
+
+The same rules for path validation as for permissivve WWW autolinks apply.
+Therefore the final question mark here is not part of the autolink:
+
+```````````````````````````````` example
+Have you ever visited http://www.zombo.com?
+.
+<p>Have you ever visited <a href="http://www.zombo.com">http://www.zombo.com</a>?</p>
+````````````````````````````````
+
+But in contrast, in this example it is:
+
+```````````````````````````````` example
+http://www.bing.com/search?q=md4c
+.
+<p><a href="http://www.bing.com/search?q=md4c">http://www.bing.com/search?q=md4c</a></p>
+````````````````````````````````
+
+And finally one complex example:
+
+```````````````````````````````` example
+http://commonmark.org
+
+(Visit https://encrypted.google.com/search?q=Markup+(business))
+
+Anonymous FTP is available at ftp://foo.bar.baz.
+.
+<p><a href="http://commonmark.org">http://commonmark.org</a></p>
+<p>(Visit <a href="https://encrypted.google.com/search?q=Markup+(business)">https://encrypted.google.com/search?q=Markup+(business)</a>)</p>
+<p>Anonymous FTP is available at <a href="ftp://foo.bar.baz">ftp://foo.bar.baz</a>.</p>
+````````````````````````````````
+
+
+## GitHub Issues
+
+### [Issue 53](https://github.com/mity/md4c/issues/53)
+
+```````````````````````````````` example
+This is [link](http://github.com/).
+.
+<p>This is <a href="http://github.com/">link</a>.</p>
+````````````````````````````````
+
+```````````````````````````````` example
+This is [link](http://github.com/)X
+.
+<p>This is <a href="http://github.com/">link</a>X</p>
+````````````````````````````````
+
+
+## [Issue 76](https://github.com/mity/md4c/issues/76)
+
+```````````````````````````````` example
+*(http://example.com)*
+.
+<p><em>(<a href="http://example.com">http://example.com</a>)</em></p>
+````````````````````````````````
+
+
+## [Issue 152](https://github.com/mity/md4c/issues/152)
+
+```````````````````````````````` example
+[http://example.com](http://example.com)
+.
+<p><a href="http://example.com">http://example.com</a></p>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/permissive-www-autolinks.txt b/tdemarkdown/md4c/test/permissive-www-autolinks.txt
new file mode 100644
index 000000000..046de9d7a
--- /dev/null
+++ b/tdemarkdown/md4c/test/permissive-www-autolinks.txt
@@ -0,0 +1,107 @@
+
+# Permissive WWW Autolinks
+
+With the flag `MD_FLAG_PERMISSIVEWWWAUTOLINKS`, MD4C enables recognition of
+autolinks starting with `www.`, even if they do not exactly follow the syntax
+of autolink as specified in CommonMark specification.
+
+These do not have to be enclosed in `<` and `>`, and they even do not need
+any preceding scheme specification.
+
+The WWW autolink will be recognized when the text `www.` is found followed by a
+valid domain. A valid domain consists of segments of alphanumeric characters,
+underscores (`_`) and hyphens (`-`) separated by periods (`.`). There must be
+at least one period, and no underscores may be present in the last two segments
+of the domain.
+
+The scheme `http` will be inserted automatically:
+
+```````````````````````````````` example
+www.commonmark.org
+.
+<p><a href="http://www.commonmark.org">www.commonmark.org</a></p>
+````````````````````````````````
+
+After a valid domain, zero or more non-space non-`<` characters may follow:
+
+```````````````````````````````` example
+Visit www.commonmark.org/help for more information.
+.
+<p>Visit <a href="http://www.commonmark.org/help">www.commonmark.org/help</a> for more information.</p>
+````````````````````````````````
+
+We then apply extended autolink path validation as follows:
+
+Trailing punctuation (specifically, `?`, `!`, `.`, `,`, `:`, `*`, `_`, and `~`)
+will not be considered part of the autolink, though they may be included in the
+interior of the link:
+
+```````````````````````````````` example
+Visit www.commonmark.org.
+
+Visit www.commonmark.org/a.b.
+.
+<p>Visit <a href="http://www.commonmark.org">www.commonmark.org</a>.</p>
+<p>Visit <a href="http://www.commonmark.org/a.b">www.commonmark.org/a.b</a>.</p>
+````````````````````````````````
+
+When an autolink ends in `)`, we scan the entire autolink for the total number
+of parentheses.  If there is a greater number of closing parentheses than
+opening ones, we don't consider the last character part of the autolink, in
+order to facilitate including an autolink inside a parenthesis:
+
+```````````````````````````````` example
+www.google.com/search?q=Markup+(business)
+
+(www.google.com/search?q=Markup+(business))
+.
+<p><a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a></p>
+<p>(<a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a>)</p>
+````````````````````````````````
+
+This check is only done when the link ends in a closing parentheses `)`, so if
+the only parentheses are in the interior of the autolink, no special rules are
+applied:
+
+```````````````````````````````` example
+www.google.com/search?q=(business))+ok
+.
+<p><a href="http://www.google.com/search?q=(business))+ok">www.google.com/search?q=(business))+ok</a></p>
+````````````````````````````````
+
+If an autolink ends in a semicolon (`;`), we check to see if it appears to
+resemble an [entity reference][entity references]; if the preceding text is `&`
+followed by one or more alphanumeric characters.  If so, it is excluded from
+the autolink:
+
+```````````````````````````````` example
+www.google.com/search?q=commonmark&hl=en
+
+www.google.com/search?q=commonmark&hl;
+.
+<p><a href="http://www.google.com/search?q=commonmark&amp;hl=en">www.google.com/search?q=commonmark&amp;hl=en</a></p>
+<p><a href="http://www.google.com/search?q=commonmark">www.google.com/search?q=commonmark</a>&amp;hl;</p>
+````````````````````````````````
+
+`<` immediately ends an autolink.
+
+```````````````````````````````` example
+www.commonmark.org/he<lp
+.
+<p><a href="http://www.commonmark.org/he">www.commonmark.org/he</a>&lt;lp</p>
+````````````````````````````````
+
+
+## GitHub Issues
+
+### [Issue 53](https://github.com/mity/md4c/issues/53)
+```````````````````````````````` example
+This is [link](www.github.com/).
+.
+<p>This is <a href="www.github.com/">link</a>.</p>
+````````````````````````````````
+```````````````````````````````` example
+This is [link](www.github.com/)X
+.
+<p>This is <a href="www.github.com/">link</a>X</p>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/spec.txt b/tdemarkdown/md4c/test/spec.txt
new file mode 100644
index 000000000..fefb308bb
--- /dev/null
+++ b/tdemarkdown/md4c/test/spec.txt
@@ -0,0 +1,9756 @@
+---
+title: CommonMark Spec
+author: John MacFarlane
+version: '0.30'
+date: '2021-06-19'
+license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
+...
+
+# Introduction
+
+## What is Markdown?
+
+Markdown is a plain text format for writing structured documents,
+based on conventions for indicating formatting in email
+and usenet posts.  It was developed by John Gruber (with
+help from Aaron Swartz) and released in 2004 in the form of a
+[syntax description](http://daringfireball.net/projects/markdown/syntax)
+and a Perl script (`Markdown.pl`) for converting Markdown to
+HTML.  In the next decade, dozens of implementations were
+developed in many languages.  Some extended the original
+Markdown syntax with conventions for footnotes, tables, and
+other document elements.  Some allowed Markdown documents to be
+rendered in formats other than HTML.  Websites like Reddit,
+StackOverflow, and GitHub had millions of people using Markdown.
+And Markdown started to be used beyond the web, to author books,
+articles, slide shows, letters, and lecture notes.
+
+What distinguishes Markdown from many other lightweight markup
+syntaxes, which are often easier to write, is its readability.
+As Gruber writes:
+
+> The overriding design goal for Markdown's formatting syntax is
+> to make it as readable as possible. The idea is that a
+> Markdown-formatted document should be publishable as-is, as
+> plain text, without looking like it's been marked up with tags
+> or formatting instructions.
+> (<http://daringfireball.net/projects/markdown/>)
+
+The point can be illustrated by comparing a sample of
+[AsciiDoc](http://www.methods.co.nz/asciidoc/) with
+an equivalent sample of Markdown.  Here is a sample of
+AsciiDoc from the AsciiDoc manual:
+
+```
+1. List item one.
++
+List item one continued with a second paragraph followed by an
+Indented block.
++
+.................
+$ ls *.sh
+$ mv *.sh ~/tmp
+.................
++
+List item continued with a third paragraph.
+
+2. List item two continued with an open block.
++
+--
+This paragraph is part of the preceding list item.
+
+a. This list is nested and does not require explicit item
+continuation.
++
+This paragraph is part of the preceding list item.
+
+b. List item b.
+
+This paragraph belongs to item two of the outer list.
+--
+```
+
+And here is the equivalent in Markdown:
+```
+1.  List item one.
+
+    List item one continued with a second paragraph followed by an
+    Indented block.
+
+        $ ls *.sh
+        $ mv *.sh ~/tmp
+
+    List item continued with a third paragraph.
+
+2.  List item two continued with an open block.
+
+    This paragraph is part of the preceding list item.
+
+    1. This list is nested and does not require explicit item continuation.
+
+       This paragraph is part of the preceding list item.
+
+    2. List item b.
+
+    This paragraph belongs to item two of the outer list.
+```
+
+The AsciiDoc version is, arguably, easier to write. You don't need
+to worry about indentation.  But the Markdown version is much easier
+to read.  The nesting of list items is apparent to the eye in the
+source, not just in the processed document.
+
+## Why is a spec needed?
+
+John Gruber's [canonical description of Markdown's
+syntax](http://daringfireball.net/projects/markdown/syntax)
+does not specify the syntax unambiguously.  Here are some examples of
+questions it does not answer:
+
+1.  How much indentation is needed for a sublist?  The spec says that
+    continuation paragraphs need to be indented four spaces, but is
+    not fully explicit about sublists.  It is natural to think that
+    they, too, must be indented four spaces, but `Markdown.pl` does
+    not require that.  This is hardly a "corner case," and divergences
+    between implementations on this issue often lead to surprises for
+    users in real documents. (See [this comment by John
+    Gruber](http://article.gmane.org/gmane.text.markdown.general/1997).)
+
+2.  Is a blank line needed before a block quote or heading?
+    Most implementations do not require the blank line.  However,
+    this can lead to unexpected results in hard-wrapped text, and
+    also to ambiguities in parsing (note that some implementations
+    put the heading inside the blockquote, while others do not).
+    (John Gruber has also spoken [in favor of requiring the blank
+    lines](http://article.gmane.org/gmane.text.markdown.general/2146).)
+
+3.  Is a blank line needed before an indented code block?
+    (`Markdown.pl` requires it, but this is not mentioned in the
+    documentation, and some implementations do not require it.)
+
+    ``` markdown
+    paragraph
+        code?
+    ```
+
+4.  What is the exact rule for determining when list items get
+    wrapped in `<p>` tags?  Can a list be partially "loose" and partially
+    "tight"?  What should we do with a list like this?
+
+    ``` markdown
+    1. one
+
+    2. two
+    3. three
+    ```
+
+    Or this?
+
+    ``` markdown
+    1.  one
+        - a
+
+        - b
+    2.  two
+    ```
+
+    (There are some relevant comments by John Gruber
+    [here](http://article.gmane.org/gmane.text.markdown.general/2554).)
+
+5.  Can list markers be indented?  Can ordered list markers be right-aligned?
+
+    ``` markdown
+     8. item 1
+     9. item 2
+    10. item 2a
+    ```
+
+6.  Is this one list with a thematic break in its second item,
+    or two lists separated by a thematic break?
+
+    ``` markdown
+    * a
+    * * * * *
+    * b
+    ```
+
+7.  When list markers change from numbers to bullets, do we have
+    two lists or one?  (The Markdown syntax description suggests two,
+    but the perl scripts and many other implementations produce one.)
+
+    ``` markdown
+    1. fee
+    2. fie
+    -  foe
+    -  fum
+    ```
+
+8.  What are the precedence rules for the markers of inline structure?
+    For example, is the following a valid link, or does the code span
+    take precedence ?
+
+    ``` markdown
+    [a backtick (`)](/url) and [another backtick (`)](/url).
+    ```
+
+9.  What are the precedence rules for markers of emphasis and strong
+    emphasis?  For example, how should the following be parsed?
+
+    ``` markdown
+    *foo *bar* baz*
+    ```
+
+10. What are the precedence rules between block-level and inline-level
+    structure?  For example, how should the following be parsed?
+
+    ``` markdown
+    - `a long code span can contain a hyphen like this
+      - and it can screw things up`
+    ```
+
+11. Can list items include section headings?  (`Markdown.pl` does not
+    allow this, but does allow blockquotes to include headings.)
+
+    ``` markdown
+    - # Heading
+    ```
+
+12. Can list items be empty?
+
+    ``` markdown
+    * a
+    *
+    * b
+    ```
+
+13. Can link references be defined inside block quotes or list items?
+
+    ``` markdown
+    > Blockquote [foo].
+    >
+    > [foo]: /url
+    ```
+
+14. If there are multiple definitions for the same reference, which takes
+    precedence?
+
+    ``` markdown
+    [foo]: /url1
+    [foo]: /url2
+
+    [foo][]
+    ```
+
+In the absence of a spec, early implementers consulted `Markdown.pl`
+to resolve these ambiguities.  But `Markdown.pl` was quite buggy, and
+gave manifestly bad results in many cases, so it was not a
+satisfactory replacement for a spec.
+
+Because there is no unambiguous spec, implementations have diverged
+considerably.  As a result, users are often surprised to find that
+a document that renders one way on one system (say, a GitHub wiki)
+renders differently on another (say, converting to docbook using
+pandoc).  To make matters worse, because nothing in Markdown counts
+as a "syntax error," the divergence often isn't discovered right away.
+
+## About this document
+
+This document attempts to specify Markdown syntax unambiguously.
+It contains many examples with side-by-side Markdown and
+HTML.  These are intended to double as conformance tests.  An
+accompanying script `spec_tests.py` can be used to run the tests
+against any Markdown program:
+
+    python test/spec_tests.py --spec spec.txt --program PROGRAM
+
+Since this document describes how Markdown is to be parsed into
+an abstract syntax tree, it would have made sense to use an abstract
+representation of the syntax tree instead of HTML.  But HTML is capable
+of representing the structural distinctions we need to make, and the
+choice of HTML for the tests makes it possible to run the tests against
+an implementation without writing an abstract syntax tree renderer.
+
+Note that not every feature of the HTML samples is mandated by
+the spec.  For example, the spec says what counts as a link
+destination, but it doesn't mandate that non-ASCII characters in
+the URL be percent-encoded.  To use the automatic tests,
+implementers will need to provide a renderer that conforms to
+the expectations of the spec examples (percent-encoding
+non-ASCII characters in URLs).  But a conforming implementation
+can use a different renderer and may choose not to
+percent-encode non-ASCII characters in URLs.
+
+This document is generated from a text file, `spec.txt`, written
+in Markdown with a small extension for the side-by-side tests.
+The script `tools/makespec.py` can be used to convert `spec.txt` into
+HTML or CommonMark (which can then be converted into other formats).
+
+In the examples, the `→` character is used to represent tabs.
+
+# Preliminaries
+
+## Characters and lines
+
+Any sequence of [characters] is a valid CommonMark
+document.
+
+A [character](@) is a Unicode code point.  Although some
+code points (for example, combining accents) do not correspond to
+characters in an intuitive sense, all code points count as characters
+for purposes of this spec.
+
+This spec does not specify an encoding; it thinks of lines as composed
+of [characters] rather than bytes.  A conforming parser may be limited
+to a certain encoding.
+
+A [line](@) is a sequence of zero or more [characters]
+other than line feed (`U+000A`) or carriage return (`U+000D`),
+followed by a [line ending] or by the end of file.
+
+A [line ending](@) is a line feed (`U+000A`), a carriage return
+(`U+000D`) not followed by a line feed, or a carriage return and a
+following line feed.
+
+A line containing no characters, or a line containing only spaces
+(`U+0020`) or tabs (`U+0009`), is called a [blank line](@).
+
+The following definitions of character classes will be used in this spec:
+
+A [Unicode whitespace character](@) is
+any code point in the Unicode `Zs` general category, or a tab (`U+0009`),
+line feed (`U+000A`), form feed (`U+000C`), or carriage return (`U+000D`).
+
+[Unicode whitespace](@) is a sequence of one or more
+[Unicode whitespace characters].
+
+A [tab](@) is `U+0009`.
+
+A [space](@) is `U+0020`.
+
+An [ASCII control character](@) is a character between `U+0000–1F` (both
+including) or `U+007F`.
+
+An [ASCII punctuation character](@)
+is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
+`*`, `+`, `,`, `-`, `.`, `/` (U+0021–2F), 
+`:`, `;`, `<`, `=`, `>`, `?`, `@` (U+003A–0040),
+`[`, `\`, `]`, `^`, `_`, `` ` `` (U+005B–0060), 
+`{`, `|`, `}`, or `~` (U+007B–007E).
+
+A [Unicode punctuation character](@) is an [ASCII
+punctuation character] or anything in
+the general Unicode categories  `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
+
+## Tabs
+
+Tabs in lines are not expanded to [spaces].  However,
+in contexts where spaces help to define block structure,
+tabs behave as if they were replaced by spaces with a tab stop
+of 4 characters.
+
+Thus, for example, a tab can be used instead of four spaces
+in an indented code block.  (Note, however, that internal
+tabs are passed through as literal tabs, not expanded to
+spaces.)
+
+```````````````````````````````` example
+→foo→baz→→bim
+.
+<pre><code>foo→baz→→bim
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+  →foo→baz→→bim
+.
+<pre><code>foo→baz→→bim
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+    a→a
+    ὐ→a
+.
+<pre><code>a→a
+ὐ→a
+</code></pre>
+````````````````````````````````
+
+In the following example, a continuation paragraph of a list
+item is indented with a tab; this has exactly the same effect
+as indentation with four spaces would:
+
+```````````````````````````````` example
+  - foo
+
+→bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+- foo
+
+→→bar
+.
+<ul>
+<li>
+<p>foo</p>
+<pre><code>  bar
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+Normally the `>` that begins a block quote may be followed
+optionally by a space, which is not considered part of the
+content.  In the following case `>` is followed by a tab,
+which is treated as if it were expanded into three spaces.
+Since one of these spaces is considered part of the
+delimiter, `foo` is considered to be indented six spaces
+inside the block quote context, so we get an indented
+code block starting with two spaces.
+
+```````````````````````````````` example
+>→→foo
+.
+<blockquote>
+<pre><code>  foo
+</code></pre>
+</blockquote>
+````````````````````````````````
+
+```````````````````````````````` example
+-→→foo
+.
+<ul>
+<li>
+<pre><code>  foo
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    foo
+→bar
+.
+<pre><code>foo
+bar
+</code></pre>
+````````````````````````````````
+
+```````````````````````````````` example
+ - foo
+   - bar
+→ - baz
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>baz</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+#→Foo
+.
+<h1>Foo</h1>
+````````````````````````````````
+
+```````````````````````````````` example
+*→*→*→
+.
+<hr />
+````````````````````````````````
+
+
+## Insecure characters
+
+For security reasons, the Unicode character `U+0000` must be replaced
+with the REPLACEMENT CHARACTER (`U+FFFD`).
+
+
+## Backslash escapes
+
+Any ASCII punctuation character may be backslash-escaped:
+
+```````````````````````````````` example
+\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~
+.
+<p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
+````````````````````````````````
+
+
+Backslashes before other characters are treated as literal
+backslashes:
+
+```````````````````````````````` example
+\→\A\a\ \3\φ\«
+.
+<p>\→\A\a\ \3\φ\«</p>
+````````````````````````````````
+
+
+Escaped characters are treated as regular characters and do
+not have their usual Markdown meanings:
+
+```````````````````````````````` example
+\*not emphasized*
+\<br/> not a tag
+\[not a link](/foo)
+\`not code`
+1\. not a list
+\* not a list
+\# not a heading
+\[foo]: /url "not a reference"
+\&ouml; not a character entity
+.
+<p>*not emphasized*
+&lt;br/&gt; not a tag
+[not a link](/foo)
+`not code`
+1. not a list
+* not a list
+# not a heading
+[foo]: /url &quot;not a reference&quot;
+&amp;ouml; not a character entity</p>
+````````````````````````````````
+
+
+If a backslash is itself escaped, the following character is not:
+
+```````````````````````````````` example
+\\*emphasis*
+.
+<p>\<em>emphasis</em></p>
+````````````````````````````````
+
+
+A backslash at the end of the line is a [hard line break]:
+
+```````````````````````````````` example
+foo\
+bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+Backslash escapes do not work in code blocks, code spans, autolinks, or
+raw HTML:
+
+```````````````````````````````` example
+`` \[\` ``
+.
+<p><code>\[\`</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    \[\]
+.
+<pre><code>\[\]
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~
+\[\]
+~~~
+.
+<pre><code>\[\]
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://example.com?find=\*>
+.
+<p><a href="http://example.com?find=%5C*">http://example.com?find=\*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="/bar\/)">
+.
+<a href="/bar\/)">
+````````````````````````````````
+
+
+But they work in all other contexts, including URLs and link titles,
+link references, and [info strings] in [fenced code blocks]:
+
+```````````````````````````````` example
+[foo](/bar\* "ti\*tle")
+.
+<p><a href="/bar*" title="ti*tle">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /bar\* "ti\*tle"
+.
+<p><a href="/bar*" title="ti*tle">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+``` foo\+bar
+foo
+```
+.
+<pre><code class="language-foo+bar">foo
+</code></pre>
+````````````````````````````````
+
+
+## Entity and numeric character references
+
+Valid HTML entity references and numeric character references
+can be used in place of the corresponding Unicode character,
+with the following exceptions:
+
+- Entity and character references are not recognized in code
+  blocks and code spans.
+
+- Entity and character references cannot stand in place of
+  special characters that define structural elements in
+  CommonMark.  For example, although `&#42;` can be used
+  in place of a literal `*` character, `&#42;` cannot replace
+  `*` in emphasis delimiters, bullet list markers, or thematic
+  breaks.
+
+Conforming CommonMark parsers need not store information about
+whether a particular character was represented in the source
+using a Unicode character or an entity reference.
+
+[Entity references](@) consist of `&` + any of the valid
+HTML5 entity names + `;`. The
+document <https://html.spec.whatwg.org/entities.json>
+is used as an authoritative source for the valid entity
+references and their corresponding code points.
+
+```````````````````````````````` example
+&nbsp; &amp; &copy; &AElig; &Dcaron;
+&frac34; &HilbertSpace; &DifferentialD;
+&ClockwiseContourIntegral; &ngE;
+.
+<p>  &amp; © Æ Ď
+¾ ℋ ⅆ
+∲ ≧̸</p>
+````````````````````````````````
+
+
+[Decimal numeric character
+references](@)
+consist of `&#` + a string of 1--7 arabic digits + `;`. A
+numeric character reference is parsed as the corresponding
+Unicode character. Invalid Unicode code points will be replaced by
+the REPLACEMENT CHARACTER (`U+FFFD`).  For security reasons,
+the code point `U+0000` will also be replaced by `U+FFFD`.
+
+```````````````````````````````` example
+&#35; &#1234; &#992; &#0;
+.
+<p># Ӓ Ϡ �</p>
+````````````````````````````````
+
+
+[Hexadecimal numeric character
+references](@) consist of `&#` +
+either `X` or `x` + a string of 1-6 hexadecimal digits + `;`.
+They too are parsed as the corresponding Unicode character (this
+time specified with a hexadecimal numeral instead of decimal).
+
+```````````````````````````````` example
+&#X22; &#XD06; &#xcab;
+.
+<p>&quot; ആ ಫ</p>
+````````````````````````````````
+
+
+Here are some nonentities:
+
+```````````````````````````````` example
+&nbsp &x; &#; &#x;
+&#87654321;
+&#abcdef0;
+&ThisIsNotDefined; &hi?;
+.
+<p>&amp;nbsp &amp;x; &amp;#; &amp;#x;
+&amp;#87654321;
+&amp;#abcdef0;
+&amp;ThisIsNotDefined; &amp;hi?;</p>
+````````````````````````````````
+
+
+Although HTML5 does accept some entity references
+without a trailing semicolon (such as `&copy`), these are not
+recognized here, because it makes the grammar too ambiguous:
+
+```````````````````````````````` example
+&copy
+.
+<p>&amp;copy</p>
+````````````````````````````````
+
+
+Strings that are not on the list of HTML5 named entities are not
+recognized as entity references either:
+
+```````````````````````````````` example
+&MadeUpEntity;
+.
+<p>&amp;MadeUpEntity;</p>
+````````````````````````````````
+
+
+Entity and numeric character references are recognized in any
+context besides code spans or code blocks, including
+URLs, [link titles], and [fenced code block][] [info strings]:
+
+```````````````````````````````` example
+<a href="&ouml;&ouml;.html">
+.
+<a href="&ouml;&ouml;.html">
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo](/f&ouml;&ouml; "f&ouml;&ouml;")
+.
+<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /f&ouml;&ouml; "f&ouml;&ouml;"
+.
+<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+``` f&ouml;&ouml;
+foo
+```
+.
+<pre><code class="language-föö">foo
+</code></pre>
+````````````````````````````````
+
+
+Entity and numeric character references are treated as literal
+text in code spans and code blocks:
+
+```````````````````````````````` example
+`f&ouml;&ouml;`
+.
+<p><code>f&amp;ouml;&amp;ouml;</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    f&ouml;f&ouml;
+.
+<pre><code>f&amp;ouml;f&amp;ouml;
+</code></pre>
+````````````````````````````````
+
+
+Entity and numeric character references cannot be used
+in place of symbols indicating structure in CommonMark
+documents.
+
+```````````````````````````````` example
+&#42;foo&#42;
+*foo*
+.
+<p>*foo*
+<em>foo</em></p>
+````````````````````````````````
+
+```````````````````````````````` example
+&#42; foo
+
+* foo
+.
+<p>* foo</p>
+<ul>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+foo&#10;&#10;bar
+.
+<p>foo
+
+bar</p>
+````````````````````````````````
+
+```````````````````````````````` example
+&#9;foo
+.
+<p>→foo</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[a](url &quot;tit&quot;)
+.
+<p>[a](url &quot;tit&quot;)</p>
+````````````````````````````````
+
+
+
+# Blocks and inlines
+
+We can think of a document as a sequence of
+[blocks](@)---structural elements like paragraphs, block
+quotations, lists, headings, rules, and code blocks.  Some blocks (like
+block quotes and list items) contain other blocks; others (like
+headings and paragraphs) contain [inline](@) content---text,
+links, emphasized text, images, code spans, and so on.
+
+## Precedence
+
+Indicators of block structure always take precedence over indicators
+of inline structure.  So, for example, the following is a list with
+two items, not a list with one item containing a code span:
+
+```````````````````````````````` example
+- `one
+- two`
+.
+<ul>
+<li>`one</li>
+<li>two`</li>
+</ul>
+````````````````````````````````
+
+
+This means that parsing can proceed in two steps:  first, the block
+structure of the document can be discerned; second, text lines inside
+paragraphs, headings, and other block constructs can be parsed for inline
+structure.  The second step requires information about link reference
+definitions that will be available only at the end of the first
+step.  Note that the first step requires processing lines in sequence,
+but the second can be parallelized, since the inline parsing of
+one block element does not affect the inline parsing of any other.
+
+## Container blocks and leaf blocks
+
+We can divide blocks into two types:
+[container blocks](#container-blocks),
+which can contain other blocks, and [leaf blocks](#leaf-blocks),
+which cannot.
+
+# Leaf blocks
+
+This section describes the different kinds of leaf block that make up a
+Markdown document.
+
+## Thematic breaks
+
+A line consisting of optionally up to three spaces of indentation, followed by a
+sequence of three or more matching `-`, `_`, or `*` characters, each followed
+optionally by any number of spaces or tabs, forms a
+[thematic break](@).
+
+```````````````````````````````` example
+***
+---
+___
+.
+<hr />
+<hr />
+<hr />
+````````````````````````````````
+
+
+Wrong characters:
+
+```````````````````````````````` example
++++
+.
+<p>+++</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+===
+.
+<p>===</p>
+````````````````````````````````
+
+
+Not enough characters:
+
+```````````````````````````````` example
+--
+**
+__
+.
+<p>--
+**
+__</p>
+````````````````````````````````
+
+
+Up to three spaces of indentation are allowed:
+
+```````````````````````````````` example
+ ***
+  ***
+   ***
+.
+<hr />
+<hr />
+<hr />
+````````````````````````````````
+
+
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+    ***
+.
+<pre><code>***
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo
+    ***
+.
+<p>Foo
+***</p>
+````````````````````````````````
+
+
+More than three characters may be used:
+
+```````````````````````````````` example
+_____________________________________
+.
+<hr />
+````````````````````````````````
+
+
+Spaces and tabs are allowed between the characters:
+
+```````````````````````````````` example
+ - - -
+.
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+ **  * ** * ** * **
+.
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+-     -      -      -
+.
+<hr />
+````````````````````````````````
+
+
+Spaces and tabs are allowed at the end:
+
+```````````````````````````````` example
+- - - -    
+.
+<hr />
+````````````````````````````````
+
+
+However, no other characters may occur in the line:
+
+```````````````````````````````` example
+_ _ _ _ a
+
+a------
+
+---a---
+.
+<p>_ _ _ _ a</p>
+<p>a------</p>
+<p>---a---</p>
+````````````````````````````````
+
+
+It is required that all of the characters other than spaces or tabs be the same.
+So, this is not a thematic break:
+
+```````````````````````````````` example
+ *-*
+.
+<p><em>-</em></p>
+````````````````````````````````
+
+
+Thematic breaks do not need blank lines before or after:
+
+```````````````````````````````` example
+- foo
+***
+- bar
+.
+<ul>
+<li>foo</li>
+</ul>
+<hr />
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+Thematic breaks can interrupt a paragraph:
+
+```````````````````````````````` example
+Foo
+***
+bar
+.
+<p>Foo</p>
+<hr />
+<p>bar</p>
+````````````````````````````````
+
+
+If a line of dashes that meets the above conditions for being a
+thematic break could also be interpreted as the underline of a [setext
+heading], the interpretation as a
+[setext heading] takes precedence. Thus, for example,
+this is a setext heading, not a paragraph followed by a thematic break:
+
+```````````````````````````````` example
+Foo
+---
+bar
+.
+<h2>Foo</h2>
+<p>bar</p>
+````````````````````````````````
+
+
+When both a thematic break and a list item are possible
+interpretations of a line, the thematic break takes precedence:
+
+```````````````````````````````` example
+* Foo
+* * *
+* Bar
+.
+<ul>
+<li>Foo</li>
+</ul>
+<hr />
+<ul>
+<li>Bar</li>
+</ul>
+````````````````````````````````
+
+
+If you want a thematic break in a list item, use a different bullet:
+
+```````````````````````````````` example
+- Foo
+- * * *
+.
+<ul>
+<li>Foo</li>
+<li>
+<hr />
+</li>
+</ul>
+````````````````````````````````
+
+
+## ATX headings
+
+An [ATX heading](@)
+consists of a string of characters, parsed as inline content, between an
+opening sequence of 1--6 unescaped `#` characters and an optional
+closing sequence of any number of unescaped `#` characters.
+The opening sequence of `#` characters must be followed by spaces or tabs, or
+by the end of line. The optional closing sequence of `#`s must be preceded by
+spaces or tabs and may be followed by spaces or tabs only.  The opening
+`#` character may be preceded by up to three spaces of indentation.  The raw
+contents of the heading are stripped of leading and trailing space or tabs
+before being parsed as inline content.  The heading level is equal to the number
+of `#` characters in the opening sequence.
+
+Simple headings:
+
+```````````````````````````````` example
+# foo
+## foo
+### foo
+#### foo
+##### foo
+###### foo
+.
+<h1>foo</h1>
+<h2>foo</h2>
+<h3>foo</h3>
+<h4>foo</h4>
+<h5>foo</h5>
+<h6>foo</h6>
+````````````````````````````````
+
+
+More than six `#` characters is not a heading:
+
+```````````````````````````````` example
+####### foo
+.
+<p>####### foo</p>
+````````````````````````````````
+
+
+At least one space or tab is required between the `#` characters and the
+heading's contents, unless the heading is empty.  Note that many
+implementations currently do not require the space.  However, the
+space was required by the
+[original ATX implementation](http://www.aaronsw.com/2002/atx/atx.py),
+and it helps prevent things like the following from being parsed as
+headings:
+
+```````````````````````````````` example
+#5 bolt
+
+#hashtag
+.
+<p>#5 bolt</p>
+<p>#hashtag</p>
+````````````````````````````````
+
+
+This is not a heading, because the first `#` is escaped:
+
+```````````````````````````````` example
+\## foo
+.
+<p>## foo</p>
+````````````````````````````````
+
+
+Contents are parsed as inlines:
+
+```````````````````````````````` example
+# foo *bar* \*baz\*
+.
+<h1>foo <em>bar</em> *baz*</h1>
+````````````````````````````````
+
+
+Leading and trailing spaces or tabs are ignored in parsing inline content:
+
+```````````````````````````````` example
+#                  foo                     
+.
+<h1>foo</h1>
+````````````````````````````````
+
+
+Up to three spaces of indentation are allowed:
+
+```````````````````````````````` example
+ ### foo
+  ## foo
+   # foo
+.
+<h3>foo</h3>
+<h2>foo</h2>
+<h1>foo</h1>
+````````````````````````````````
+
+
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+    # foo
+.
+<pre><code># foo
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo
+    # bar
+.
+<p>foo
+# bar</p>
+````````````````````````````````
+
+
+A closing sequence of `#` characters is optional:
+
+```````````````````````````````` example
+## foo ##
+  ###   bar    ###
+.
+<h2>foo</h2>
+<h3>bar</h3>
+````````````````````````````````
+
+
+It need not be the same length as the opening sequence:
+
+```````````````````````````````` example
+# foo ##################################
+##### foo ##
+.
+<h1>foo</h1>
+<h5>foo</h5>
+````````````````````````````````
+
+
+Spaces or tabs are allowed after the closing sequence:
+
+```````````````````````````````` example
+### foo ###     
+.
+<h3>foo</h3>
+````````````````````````````````
+
+
+A sequence of `#` characters with anything but spaces or tabs following it
+is not a closing sequence, but counts as part of the contents of the
+heading:
+
+```````````````````````````````` example
+### foo ### b
+.
+<h3>foo ### b</h3>
+````````````````````````````````
+
+
+The closing sequence must be preceded by a space or tab:
+
+```````````````````````````````` example
+# foo#
+.
+<h1>foo#</h1>
+````````````````````````````````
+
+
+Backslash-escaped `#` characters do not count as part
+of the closing sequence:
+
+```````````````````````````````` example
+### foo \###
+## foo #\##
+# foo \#
+.
+<h3>foo ###</h3>
+<h2>foo ###</h2>
+<h1>foo #</h1>
+````````````````````````````````
+
+
+ATX headings need not be separated from surrounding content by blank
+lines, and they can interrupt paragraphs:
+
+```````````````````````````````` example
+****
+## foo
+****
+.
+<hr />
+<h2>foo</h2>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo bar
+# baz
+Bar foo
+.
+<p>Foo bar</p>
+<h1>baz</h1>
+<p>Bar foo</p>
+````````````````````````````````
+
+
+ATX headings can be empty:
+
+```````````````````````````````` example
+## 
+#
+### ###
+.
+<h2></h2>
+<h1></h1>
+<h3></h3>
+````````````````````````````````
+
+
+## Setext headings
+
+A [setext heading](@) consists of one or more
+lines of text, not interrupted by a blank line, of which the first line does not
+have more than 3 spaces of indentation, followed by
+a [setext heading underline].  The lines of text must be such
+that, were they not followed by the setext heading underline,
+they would be interpreted as a paragraph:  they cannot be
+interpretable as a [code fence], [ATX heading][ATX headings],
+[block quote][block quotes], [thematic break][thematic breaks],
+[list item][list items], or [HTML block][HTML blocks].
+
+A [setext heading underline](@) is a sequence of
+`=` characters or a sequence of `-` characters, with no more than 3
+spaces of indentation and any number of trailing spaces or tabs.  If a line
+containing a single `-` can be interpreted as an
+empty [list items], it should be interpreted this way
+and not as a [setext heading underline].
+
+The heading is a level 1 heading if `=` characters are used in
+the [setext heading underline], and a level 2 heading if `-`
+characters are used.  The contents of the heading are the result
+of parsing the preceding lines of text as CommonMark inline
+content.
+
+In general, a setext heading need not be preceded or followed by a
+blank line.  However, it cannot interrupt a paragraph, so when a
+setext heading comes after a paragraph, a blank line is needed between
+them.
+
+Simple examples:
+
+```````````````````````````````` example
+Foo *bar*
+=========
+
+Foo *bar*
+---------
+.
+<h1>Foo <em>bar</em></h1>
+<h2>Foo <em>bar</em></h2>
+````````````````````````````````
+
+
+The content of the header may span more than one line:
+
+```````````````````````````````` example
+Foo *bar
+baz*
+====
+.
+<h1>Foo <em>bar
+baz</em></h1>
+````````````````````````````````
+
+The contents are the result of parsing the headings's raw
+content as inlines.  The heading's raw content is formed by
+concatenating the lines and removing initial and final
+spaces or tabs.
+
+```````````````````````````````` example
+  Foo *bar
+baz*→
+====
+.
+<h1>Foo <em>bar
+baz</em></h1>
+````````````````````````````````
+
+
+The underlining can be any length:
+
+```````````````````````````````` example
+Foo
+-------------------------
+
+Foo
+=
+.
+<h2>Foo</h2>
+<h1>Foo</h1>
+````````````````````````````````
+
+
+The heading content can be preceded by up to three spaces of indentation, and
+need not line up with the underlining:
+
+```````````````````````````````` example
+   Foo
+---
+
+  Foo
+-----
+
+  Foo
+  ===
+.
+<h2>Foo</h2>
+<h2>Foo</h2>
+<h1>Foo</h1>
+````````````````````````````````
+
+
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+    Foo
+    ---
+
+    Foo
+---
+.
+<pre><code>Foo
+---
+
+Foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+The setext heading underline can be preceded by up to three spaces of
+indentation, and may have trailing spaces or tabs:
+
+```````````````````````````````` example
+Foo
+   ----      
+.
+<h2>Foo</h2>
+````````````````````````````````
+
+
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+Foo
+    ---
+.
+<p>Foo
+---</p>
+````````````````````````````````
+
+
+The setext heading underline cannot contain internal spaces or tabs:
+
+```````````````````````````````` example
+Foo
+= =
+
+Foo
+--- -
+.
+<p>Foo
+= =</p>
+<p>Foo</p>
+<hr />
+````````````````````````````````
+
+
+Trailing spaces or tabs in the content line do not cause a hard line break:
+
+```````````````````````````````` example
+Foo  
+-----
+.
+<h2>Foo</h2>
+````````````````````````````````
+
+
+Nor does a backslash at the end:
+
+```````````````````````````````` example
+Foo\
+----
+.
+<h2>Foo\</h2>
+````````````````````````````````
+
+
+Since indicators of block structure take precedence over
+indicators of inline structure, the following are setext headings:
+
+```````````````````````````````` example
+`Foo
+----
+`
+
+<a title="a lot
+---
+of dashes"/>
+.
+<h2>`Foo</h2>
+<p>`</p>
+<h2>&lt;a title=&quot;a lot</h2>
+<p>of dashes&quot;/&gt;</p>
+````````````````````````````````
+
+
+The setext heading underline cannot be a [lazy continuation
+line] in a list item or block quote:
+
+```````````````````````````````` example
+> Foo
+---
+.
+<blockquote>
+<p>Foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+> foo
+bar
+===
+.
+<blockquote>
+<p>foo
+bar
+===</p>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- Foo
+---
+.
+<ul>
+<li>Foo</li>
+</ul>
+<hr />
+````````````````````````````````
+
+
+A blank line is needed between a paragraph and a following
+setext heading, since otherwise the paragraph becomes part
+of the heading's content:
+
+```````````````````````````````` example
+Foo
+Bar
+---
+.
+<h2>Foo
+Bar</h2>
+````````````````````````````````
+
+
+But in general a blank line is not required before or after
+setext headings:
+
+```````````````````````````````` example
+---
+Foo
+---
+Bar
+---
+Baz
+.
+<hr />
+<h2>Foo</h2>
+<h2>Bar</h2>
+<p>Baz</p>
+````````````````````````````````
+
+
+Setext headings cannot be empty:
+
+```````````````````````````````` example
+
+====
+.
+<p>====</p>
+````````````````````````````````
+
+
+Setext heading text lines must not be interpretable as block
+constructs other than paragraphs.  So, the line of dashes
+in these examples gets interpreted as a thematic break:
+
+```````````````````````````````` example
+---
+---
+.
+<hr />
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+- foo
+-----
+.
+<ul>
+<li>foo</li>
+</ul>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+    foo
+---
+.
+<pre><code>foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+```````````````````````````````` example
+> foo
+-----
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+If you want a heading with `> foo` as its literal text, you can
+use backslash escapes:
+
+```````````````````````````````` example
+\> foo
+------
+.
+<h2>&gt; foo</h2>
+````````````````````````````````
+
+
+**Compatibility note:**  Most existing Markdown implementations
+do not allow the text of setext headings to span multiple lines.
+But there is no consensus about how to interpret
+
+``` markdown
+Foo
+bar
+---
+baz
+```
+
+One can find four different interpretations:
+
+1. paragraph "Foo", heading "bar", paragraph "baz"
+2. paragraph "Foo bar", thematic break, paragraph "baz"
+3. paragraph "Foo bar --- baz"
+4. heading "Foo bar", paragraph "baz"
+
+We find interpretation 4 most natural, and interpretation 4
+increases the expressive power of CommonMark, by allowing
+multiline headings.  Authors who want interpretation 1 can
+put a blank line after the first paragraph:
+
+```````````````````````````````` example
+Foo
+
+bar
+---
+baz
+.
+<p>Foo</p>
+<h2>bar</h2>
+<p>baz</p>
+````````````````````````````````
+
+
+Authors who want interpretation 2 can put blank lines around
+the thematic break,
+
+```````````````````````````````` example
+Foo
+bar
+
+---
+
+baz
+.
+<p>Foo
+bar</p>
+<hr />
+<p>baz</p>
+````````````````````````````````
+
+
+or use a thematic break that cannot count as a [setext heading
+underline], such as
+
+```````````````````````````````` example
+Foo
+bar
+* * *
+baz
+.
+<p>Foo
+bar</p>
+<hr />
+<p>baz</p>
+````````````````````````````````
+
+
+Authors who want interpretation 3 can use backslash escapes:
+
+```````````````````````````````` example
+Foo
+bar
+\---
+baz
+.
+<p>Foo
+bar
+---
+baz</p>
+````````````````````````````````
+
+
+## Indented code blocks
+
+An [indented code block](@) is composed of one or more
+[indented chunks] separated by blank lines.
+An [indented chunk](@) is a sequence of non-blank lines,
+each preceded by four or more spaces of indentation. The contents of the code
+block are the literal contents of the lines, including trailing
+[line endings], minus four spaces of indentation.
+An indented code block has no [info string].
+
+An indented code block cannot interrupt a paragraph, so there must be
+a blank line between a paragraph and a following indented code block.
+(A blank line is not needed, however, between a code block and a following
+paragraph.)
+
+```````````````````````````````` example
+    a simple
+      indented code block
+.
+<pre><code>a simple
+  indented code block
+</code></pre>
+````````````````````````````````
+
+
+If there is any ambiguity between an interpretation of indentation
+as a code block and as indicating that material belongs to a [list
+item][list items], the list item interpretation takes precedence:
+
+```````````````````````````````` example
+  - foo
+
+    bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1.  foo
+
+    - bar
+.
+<ol>
+<li>
+<p>foo</p>
+<ul>
+<li>bar</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+
+The contents of a code block are literal text, and do not get parsed
+as Markdown:
+
+```````````````````````````````` example
+    <a/>
+    *hi*
+
+    - one
+.
+<pre><code>&lt;a/&gt;
+*hi*
+
+- one
+</code></pre>
+````````````````````````````````
+
+
+Here we have three chunks separated by blank lines:
+
+```````````````````````````````` example
+    chunk1
+
+    chunk2
+  
+ 
+ 
+    chunk3
+.
+<pre><code>chunk1
+
+chunk2
+
+
+
+chunk3
+</code></pre>
+````````````````````````````````
+
+
+Any initial spaces or tabs beyond four spaces of indentation will be included in
+the content, even in interior blank lines:
+
+```````````````````````````````` example
+    chunk1
+      
+      chunk2
+.
+<pre><code>chunk1
+  
+  chunk2
+</code></pre>
+````````````````````````````````
+
+
+An indented code block cannot interrupt a paragraph.  (This
+allows hanging indents and the like.)
+
+```````````````````````````````` example
+Foo
+    bar
+
+.
+<p>Foo
+bar</p>
+````````````````````````````````
+
+
+However, any non-blank line with fewer than four spaces of indentation ends
+the code block immediately.  So a paragraph may occur immediately
+after indented code:
+
+```````````````````````````````` example
+    foo
+bar
+.
+<pre><code>foo
+</code></pre>
+<p>bar</p>
+````````````````````````````````
+
+
+And indented code can occur immediately before and after other kinds of
+blocks:
+
+```````````````````````````````` example
+# Heading
+    foo
+Heading
+------
+    foo
+----
+.
+<h1>Heading</h1>
+<pre><code>foo
+</code></pre>
+<h2>Heading</h2>
+<pre><code>foo
+</code></pre>
+<hr />
+````````````````````````````````
+
+
+The first line can be preceded by more than four spaces of indentation:
+
+```````````````````````````````` example
+        foo
+    bar
+.
+<pre><code>    foo
+bar
+</code></pre>
+````````````````````````````````
+
+
+Blank lines preceding or following an indented code block
+are not included in it:
+
+```````````````````````````````` example
+
+    
+    foo
+    
+
+.
+<pre><code>foo
+</code></pre>
+````````````````````````````````
+
+
+Trailing spaces or tabs are included in the code block's content:
+
+```````````````````````````````` example
+    foo  
+.
+<pre><code>foo  
+</code></pre>
+````````````````````````````````
+
+
+
+## Fenced code blocks
+
+A [code fence](@) is a sequence
+of at least three consecutive backtick characters (`` ` ``) or
+tildes (`~`).  (Tildes and backticks cannot be mixed.)
+A [fenced code block](@)
+begins with a code fence, preceded by up to three spaces of indentation.
+
+The line with the opening code fence may optionally contain some text
+following the code fence; this is trimmed of leading and trailing
+spaces or tabs and called the [info string](@). If the [info string] comes
+after a backtick fence, it may not contain any backtick
+characters.  (The reason for this restriction is that otherwise
+some inline code would be incorrectly interpreted as the
+beginning of a fenced code block.)
+
+The content of the code block consists of all subsequent lines, until
+a closing [code fence] of the same type as the code block
+began with (backticks or tildes), and with at least as many backticks
+or tildes as the opening code fence.  If the leading code fence is
+preceded by N spaces of indentation, then up to N spaces of indentation are
+removed from each line of the content (if present).  (If a content line is not
+indented, it is preserved unchanged.  If it is indented N spaces or less, all
+of the indentation is removed.)
+
+The closing code fence may be preceded by up to three spaces of indentation, and
+may be followed only by spaces or tabs, which are ignored.  If the end of the
+containing block (or document) is reached and no closing code fence
+has been found, the code block contains all of the lines after the
+opening code fence until the end of the containing block (or
+document).  (An alternative spec would require backtracking in the
+event that a closing code fence is not found.  But this makes parsing
+much less efficient, and there seems to be no real down side to the
+behavior described here.)
+
+A fenced code block may interrupt a paragraph, and does not require
+a blank line either before or after.
+
+The content of a code fence is treated as literal text, not parsed
+as inlines.  The first word of the [info string] is typically used to
+specify the language of the code sample, and rendered in the `class`
+attribute of the `code` tag.  However, this spec does not mandate any
+particular treatment of the [info string].
+
+Here is a simple example with backticks:
+
+```````````````````````````````` example
+```
+<
+ >
+```
+.
+<pre><code>&lt;
+ &gt;
+</code></pre>
+````````````````````````````````
+
+
+With tildes:
+
+```````````````````````````````` example
+~~~
+<
+ >
+~~~
+.
+<pre><code>&lt;
+ &gt;
+</code></pre>
+````````````````````````````````
+
+Fewer than three backticks is not enough:
+
+```````````````````````````````` example
+``
+foo
+``
+.
+<p><code>foo</code></p>
+````````````````````````````````
+
+The closing code fence must use the same character as the opening
+fence:
+
+```````````````````````````````` example
+```
+aaa
+~~~
+```
+.
+<pre><code>aaa
+~~~
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~
+aaa
+```
+~~~
+.
+<pre><code>aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+The closing code fence must be at least as long as the opening fence:
+
+```````````````````````````````` example
+````
+aaa
+```
+``````
+.
+<pre><code>aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~
+aaa
+~~~
+~~~~
+.
+<pre><code>aaa
+~~~
+</code></pre>
+````````````````````````````````
+
+
+Unclosed code blocks are closed by the end of the document
+(or the enclosing [block quote][block quotes] or [list item][list items]):
+
+```````````````````````````````` example
+```
+.
+<pre><code></code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`````
+
+```
+aaa
+.
+<pre><code>
+```
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> ```
+> aaa
+
+bbb
+.
+<blockquote>
+<pre><code>aaa
+</code></pre>
+</blockquote>
+<p>bbb</p>
+````````````````````````````````
+
+
+A code block can have all empty lines as its content:
+
+```````````````````````````````` example
+```
+
+  
+```
+.
+<pre><code>
+  
+</code></pre>
+````````````````````````````````
+
+
+A code block can be empty:
+
+```````````````````````````````` example
+```
+```
+.
+<pre><code></code></pre>
+````````````````````````````````
+
+
+Fences can be indented.  If the opening fence is indented,
+content lines will have equivalent opening indentation removed,
+if present:
+
+```````````````````````````````` example
+ ```
+ aaa
+aaa
+```
+.
+<pre><code>aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+  ```
+aaa
+  aaa
+aaa
+  ```
+.
+<pre><code>aaa
+aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   ```
+   aaa
+    aaa
+  aaa
+   ```
+.
+<pre><code>aaa
+ aaa
+aaa
+</code></pre>
+````````````````````````````````
+
+
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+    ```
+    aaa
+    ```
+.
+<pre><code>```
+aaa
+```
+</code></pre>
+````````````````````````````````
+
+
+Closing fences may be preceded by up to three spaces of indentation, and their
+indentation need not match that of the opening fence:
+
+```````````````````````````````` example
+```
+aaa
+  ```
+.
+<pre><code>aaa
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   ```
+aaa
+  ```
+.
+<pre><code>aaa
+</code></pre>
+````````````````````````````````
+
+
+This is not a closing fence, because it is indented 4 spaces:
+
+```````````````````````````````` example
+```
+aaa
+    ```
+.
+<pre><code>aaa
+    ```
+</code></pre>
+````````````````````````````````
+
+
+
+Code fences (opening and closing) cannot contain internal spaces or tabs:
+
+```````````````````````````````` example
+``` ```
+aaa
+.
+<p><code> </code>
+aaa</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~~~
+aaa
+~~~ ~~
+.
+<pre><code>aaa
+~~~ ~~
+</code></pre>
+````````````````````````````````
+
+
+Fenced code blocks can interrupt paragraphs, and can be followed
+directly by paragraphs, without a blank line between:
+
+```````````````````````````````` example
+foo
+```
+bar
+```
+baz
+.
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+<p>baz</p>
+````````````````````````````````
+
+
+Other blocks can also occur before and after fenced code blocks
+without an intervening blank line:
+
+```````````````````````````````` example
+foo
+---
+~~~
+bar
+~~~
+# baz
+.
+<h2>foo</h2>
+<pre><code>bar
+</code></pre>
+<h1>baz</h1>
+````````````````````````````````
+
+
+An [info string] can be provided after the opening code fence.
+Although this spec doesn't mandate any particular treatment of
+the info string, the first word is typically used to specify
+the language of the code block. In HTML output, the language is
+normally indicated by adding a class to the `code` element consisting
+of `language-` followed by the language name.
+
+```````````````````````````````` example
+```ruby
+def foo(x)
+  return 3
+end
+```
+.
+<pre><code class="language-ruby">def foo(x)
+  return 3
+end
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+~~~~    ruby startline=3 $%@#$
+def foo(x)
+  return 3
+end
+~~~~~~~
+.
+<pre><code class="language-ruby">def foo(x)
+  return 3
+end
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+````;
+````
+.
+<pre><code class="language-;"></code></pre>
+````````````````````````````````
+
+
+[Info strings] for backtick code blocks cannot contain backticks:
+
+```````````````````````````````` example
+``` aa ```
+foo
+.
+<p><code>aa</code>
+foo</p>
+````````````````````````````````
+
+
+[Info strings] for tilde code blocks can contain backticks and tildes:
+
+```````````````````````````````` example
+~~~ aa ``` ~~~
+foo
+~~~
+.
+<pre><code class="language-aa">foo
+</code></pre>
+````````````````````````````````
+
+
+Closing code fences cannot have [info strings]:
+
+```````````````````````````````` example
+```
+``` aaa
+```
+.
+<pre><code>``` aaa
+</code></pre>
+````````````````````````````````
+
+
+
+## HTML blocks
+
+An [HTML block](@) is a group of lines that is treated
+as raw HTML (and will not be escaped in HTML output).
+
+There are seven kinds of [HTML block], which can be defined by their
+start and end conditions.  The block begins with a line that meets a
+[start condition](@) (after up to three optional spaces of indentation).
+It ends with the first subsequent line that meets a matching
+[end condition](@), or the last line of the document, or the last line of
+the [container block](#container-blocks) containing the current HTML
+block, if no line is encountered that meets the [end condition].  If
+the first line meets both the [start condition] and the [end
+condition], the block will contain just that line.
+
+1.  **Start condition:**  line begins with the string `<pre`,
+`<script`, `<style`, or `<textarea` (case-insensitive), followed by a space,
+a tab, the string `>`, or the end of the line.\
+**End condition:**  line contains an end tag
+`</pre>`, `</script>`, `</style>`, or `</textarea>` (case-insensitive; it
+need not match the start tag).
+
+2.  **Start condition:** line begins with the string `<!--`.\
+**End condition:**  line contains the string `-->`.
+
+3.  **Start condition:** line begins with the string `<?`.\
+**End condition:** line contains the string `?>`.
+
+4.  **Start condition:** line begins with the string `<!`
+followed by an ASCII letter.\
+**End condition:** line contains the character `>`.
+
+5.  **Start condition:**  line begins with the string
+`<![CDATA[`.\
+**End condition:** line contains the string `]]>`.
+
+6.  **Start condition:** line begins the string `<` or `</`
+followed by one of the strings (case-insensitive) `address`,
+`article`, `aside`, `base`, `basefont`, `blockquote`, `body`,
+`caption`, `center`, `col`, `colgroup`, `dd`, `details`, `dialog`,
+`dir`, `div`, `dl`, `dt`, `fieldset`, `figcaption`, `figure`,
+`footer`, `form`, `frame`, `frameset`,
+`h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `head`, `header`, `hr`,
+`html`, `iframe`, `legend`, `li`, `link`, `main`, `menu`, `menuitem`,
+`nav`, `noframes`, `ol`, `optgroup`, `option`, `p`, `param`,
+`section`, `source`, `summary`, `table`, `tbody`, `td`,
+`tfoot`, `th`, `thead`, `title`, `tr`, `track`, `ul`, followed
+by a space, a tab, the end of the line, the string `>`, or
+the string `/>`.\
+**End condition:** line is followed by a [blank line].
+
+7.  **Start condition:**  line begins with a complete [open tag]
+(with any [tag name] other than `pre`, `script`,
+`style`, or `textarea`) or a complete [closing tag],
+followed by zero or more spaces and tabs, followed by the end of the line.\
+**End condition:** line is followed by a [blank line].
+
+HTML blocks continue until they are closed by their appropriate
+[end condition], or the last line of the document or other [container
+block](#container-blocks).  This means any HTML **within an HTML
+block** that might otherwise be recognised as a start condition will
+be ignored by the parser and passed through as-is, without changing
+the parser's state.
+
+For instance, `<pre>` within an HTML block started by `<table>` will not affect
+the parser state; as the HTML block was started in by start condition 6, it
+will end at any blank line. This can be surprising:
+
+```````````````````````````````` example
+<table><tr><td>
+<pre>
+**Hello**,
+
+_world_.
+</pre>
+</td></tr></table>
+.
+<table><tr><td>
+<pre>
+**Hello**,
+<p><em>world</em>.
+</pre></p>
+</td></tr></table>
+````````````````````````````````
+
+In this case, the HTML block is terminated by the blank line — the `**Hello**`
+text remains verbatim — and regular parsing resumes, with a paragraph,
+emphasised `world` and inline and block HTML following.
+
+All types of [HTML blocks] except type 7 may interrupt
+a paragraph.  Blocks of type 7 may not interrupt a paragraph.
+(This restriction is intended to prevent unwanted interpretation
+of long tags inside a wrapped paragraph as starting HTML blocks.)
+
+Some simple examples follow.  Here are some basic HTML blocks
+of type 6:
+
+```````````````````````````````` example
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+
+okay.
+.
+<table>
+  <tr>
+    <td>
+           hi
+    </td>
+  </tr>
+</table>
+<p>okay.</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ <div>
+  *hello*
+         <foo><a>
+.
+ <div>
+  *hello*
+         <foo><a>
+````````````````````````````````
+
+
+A block can also start with a closing tag:
+
+```````````````````````````````` example
+</div>
+*foo*
+.
+</div>
+*foo*
+````````````````````````````````
+
+
+Here we have two HTML blocks with a Markdown paragraph between them:
+
+```````````````````````````````` example
+<DIV CLASS="foo">
+
+*Markdown*
+
+</DIV>
+.
+<DIV CLASS="foo">
+<p><em>Markdown</em></p>
+</DIV>
+````````````````````````````````
+
+
+The tag on the first line can be partial, as long
+as it is split where there would be whitespace:
+
+```````````````````````````````` example
+<div id="foo"
+  class="bar">
+</div>
+.
+<div id="foo"
+  class="bar">
+</div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div id="foo" class="bar
+  baz">
+</div>
+.
+<div id="foo" class="bar
+  baz">
+</div>
+````````````````````````````````
+
+
+An open tag need not be closed:
+```````````````````````````````` example
+<div>
+*foo*
+
+*bar*
+.
+<div>
+*foo*
+<p><em>bar</em></p>
+````````````````````````````````
+
+
+
+A partial tag need not even be completed (garbage
+in, garbage out):
+
+```````````````````````````````` example
+<div id="foo"
+*hi*
+.
+<div id="foo"
+*hi*
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div class
+foo
+.
+<div class
+foo
+````````````````````````````````
+
+
+The initial tag doesn't even need to be a valid
+tag, as long as it starts like one:
+
+```````````````````````````````` example
+<div *???-&&&-<---
+*foo*
+.
+<div *???-&&&-<---
+*foo*
+````````````````````````````````
+
+
+In type 6 blocks, the initial tag need not be on a line by
+itself:
+
+```````````````````````````````` example
+<div><a href="bar">*foo*</a></div>
+.
+<div><a href="bar">*foo*</a></div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<table><tr><td>
+foo
+</td></tr></table>
+.
+<table><tr><td>
+foo
+</td></tr></table>
+````````````````````````````````
+
+
+Everything until the next blank line or end of document
+gets included in the HTML block.  So, in the following
+example, what looks like a Markdown code block
+is actually part of the HTML block, which continues until a blank
+line or the end of the document is reached:
+
+```````````````````````````````` example
+<div></div>
+``` c
+int x = 33;
+```
+.
+<div></div>
+``` c
+int x = 33;
+```
+````````````````````````````````
+
+
+To start an [HTML block] with a tag that is *not* in the
+list of block-level tags in (6), you must put the tag by
+itself on the first line (and it must be complete):
+
+```````````````````````````````` example
+<a href="foo">
+*bar*
+</a>
+.
+<a href="foo">
+*bar*
+</a>
+````````````````````````````````
+
+
+In type 7 blocks, the [tag name] can be anything:
+
+```````````````````````````````` example
+<Warning>
+*bar*
+</Warning>
+.
+<Warning>
+*bar*
+</Warning>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<i class="foo">
+*bar*
+</i>
+.
+<i class="foo">
+*bar*
+</i>
+````````````````````````````````
+
+
+```````````````````````````````` example
+</ins>
+*bar*
+.
+</ins>
+*bar*
+````````````````````````````````
+
+
+These rules are designed to allow us to work with tags that
+can function as either block-level or inline-level tags.
+The `<del>` tag is a nice example.  We can surround content with
+`<del>` tags in three different ways.  In this case, we get a raw
+HTML block, because the `<del>` tag is on a line by itself:
+
+```````````````````````````````` example
+<del>
+*foo*
+</del>
+.
+<del>
+*foo*
+</del>
+````````````````````````````````
+
+
+In this case, we get a raw HTML block that just includes
+the `<del>` tag (because it ends with the following blank
+line).  So the contents get interpreted as CommonMark:
+
+```````````````````````````````` example
+<del>
+
+*foo*
+
+</del>
+.
+<del>
+<p><em>foo</em></p>
+</del>
+````````````````````````````````
+
+
+Finally, in this case, the `<del>` tags are interpreted
+as [raw HTML] *inside* the CommonMark paragraph.  (Because
+the tag is not on a line by itself, we get inline HTML
+rather than an [HTML block].)
+
+```````````````````````````````` example
+<del>*foo*</del>
+.
+<p><del><em>foo</em></del></p>
+````````````````````````````````
+
+
+HTML tags designed to contain literal content
+(`pre`, `script`, `style`, `textarea`), comments, processing instructions,
+and declarations are treated somewhat differently.
+Instead of ending at the first blank line, these blocks
+end at the first line containing a corresponding end tag.
+As a result, these blocks can contain blank lines:
+
+A pre tag (type 1):
+
+```````````````````````````````` example
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+okay
+.
+<pre language="haskell"><code>
+import Text.HTML.TagSoup
+
+main :: IO ()
+main = print $ parseTags tags
+</code></pre>
+<p>okay</p>
+````````````````````````````````
+
+
+A script tag (type 1):
+
+```````````````````````````````` example
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+okay
+.
+<script type="text/javascript">
+// JavaScript example
+
+document.getElementById("demo").innerHTML = "Hello JavaScript!";
+</script>
+<p>okay</p>
+````````````````````````````````
+
+
+A textarea tag (type 1):
+
+```````````````````````````````` example
+<textarea>
+
+*foo*
+
+_bar_
+
+</textarea>
+.
+<textarea>
+
+*foo*
+
+_bar_
+
+</textarea>
+````````````````````````````````
+
+A style tag (type 1):
+
+```````````````````````````````` example
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+okay
+.
+<style
+  type="text/css">
+h1 {color:red;}
+
+p {color:blue;}
+</style>
+<p>okay</p>
+````````````````````````````````
+
+
+If there is no matching end tag, the block will end at the
+end of the document (or the enclosing [block quote][block quotes]
+or [list item][list items]):
+
+```````````````````````````````` example
+<style
+  type="text/css">
+
+foo
+.
+<style
+  type="text/css">
+
+foo
+````````````````````````````````
+
+
+```````````````````````````````` example
+> <div>
+> foo
+
+bar
+.
+<blockquote>
+<div>
+foo
+</blockquote>
+<p>bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- <div>
+- foo
+.
+<ul>
+<li>
+<div>
+</li>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+
+The end tag can occur on the same line as the start tag:
+
+```````````````````````````````` example
+<style>p{color:red;}</style>
+*foo*
+.
+<style>p{color:red;}</style>
+<p><em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<!-- foo -->*bar*
+*baz*
+.
+<!-- foo -->*bar*
+<p><em>baz</em></p>
+````````````````````````````````
+
+
+Note that anything on the last line after the
+end tag will be included in the [HTML block]:
+
+```````````````````````````````` example
+<script>
+foo
+</script>1. *bar*
+.
+<script>
+foo
+</script>1. *bar*
+````````````````````````````````
+
+
+A comment (type 2):
+
+```````````````````````````````` example
+<!-- Foo
+
+bar
+   baz -->
+okay
+.
+<!-- Foo
+
+bar
+   baz -->
+<p>okay</p>
+````````````````````````````````
+
+
+
+A processing instruction (type 3):
+
+```````````````````````````````` example
+<?php
+
+  echo '>';
+
+?>
+okay
+.
+<?php
+
+  echo '>';
+
+?>
+<p>okay</p>
+````````````````````````````````
+
+
+A declaration (type 4):
+
+```````````````````````````````` example
+<!DOCTYPE html>
+.
+<!DOCTYPE html>
+````````````````````````````````
+
+
+CDATA (type 5):
+
+```````````````````````````````` example
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+okay
+.
+<![CDATA[
+function matchwo(a,b)
+{
+  if (a < b && a < 0) then {
+    return 1;
+
+  } else {
+
+    return 0;
+  }
+}
+]]>
+<p>okay</p>
+````````````````````````````````
+
+
+The opening tag can be preceded by up to three spaces of indentation, but not
+four:
+
+```````````````````````````````` example
+  <!-- foo -->
+
+    <!-- foo -->
+.
+  <!-- foo -->
+<pre><code>&lt;!-- foo --&gt;
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+  <div>
+
+    <div>
+.
+  <div>
+<pre><code>&lt;div&gt;
+</code></pre>
+````````````````````````````````
+
+
+An HTML block of types 1--6 can interrupt a paragraph, and need not be
+preceded by a blank line.
+
+```````````````````````````````` example
+Foo
+<div>
+bar
+</div>
+.
+<p>Foo</p>
+<div>
+bar
+</div>
+````````````````````````````````
+
+
+However, a following blank line is needed, except at the end of
+a document, and except for blocks of types 1--5, [above][HTML
+block]:
+
+```````````````````````````````` example
+<div>
+bar
+</div>
+*foo*
+.
+<div>
+bar
+</div>
+*foo*
+````````````````````````````````
+
+
+HTML blocks of type 7 cannot interrupt a paragraph:
+
+```````````````````````````````` example
+Foo
+<a href="bar">
+baz
+.
+<p>Foo
+<a href="bar">
+baz</p>
+````````````````````````````````
+
+
+This rule differs from John Gruber's original Markdown syntax
+specification, which says:
+
+> The only restrictions are that block-level HTML elements —
+> e.g. `<div>`, `<table>`, `<pre>`, `<p>`, etc. — must be separated from
+> surrounding content by blank lines, and the start and end tags of the
+> block should not be indented with spaces or tabs.
+
+In some ways Gruber's rule is more restrictive than the one given
+here:
+
+- It requires that an HTML block be preceded by a blank line.
+- It does not allow the start tag to be indented.
+- It requires a matching end tag, which it also does not allow to
+  be indented.
+
+Most Markdown implementations (including some of Gruber's own) do not
+respect all of these restrictions.
+
+There is one respect, however, in which Gruber's rule is more liberal
+than the one given here, since it allows blank lines to occur inside
+an HTML block.  There are two reasons for disallowing them here.
+First, it removes the need to parse balanced tags, which is
+expensive and can require backtracking from the end of the document
+if no matching end tag is found. Second, it provides a very simple
+and flexible way of including Markdown content inside HTML tags:
+simply separate the Markdown from the HTML using blank lines:
+
+Compare:
+
+```````````````````````````````` example
+<div>
+
+*Emphasized* text.
+
+</div>
+.
+<div>
+<p><em>Emphasized</em> text.</p>
+</div>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<div>
+*Emphasized* text.
+</div>
+.
+<div>
+*Emphasized* text.
+</div>
+````````````````````````````````
+
+
+Some Markdown implementations have adopted a convention of
+interpreting content inside tags as text if the open tag has
+the attribute `markdown=1`.  The rule given above seems a simpler and
+more elegant way of achieving the same expressive power, which is also
+much simpler to parse.
+
+The main potential drawback is that one can no longer paste HTML
+blocks into Markdown documents with 100% reliability.  However,
+*in most cases* this will work fine, because the blank lines in
+HTML are usually followed by HTML block tags.  For example:
+
+```````````````````````````````` example
+<table>
+
+<tr>
+
+<td>
+Hi
+</td>
+
+</tr>
+
+</table>
+.
+<table>
+<tr>
+<td>
+Hi
+</td>
+</tr>
+</table>
+````````````````````````````````
+
+
+There are problems, however, if the inner tags are indented
+*and* separated by spaces, as then they will be interpreted as
+an indented code block:
+
+```````````````````````````````` example
+<table>
+
+  <tr>
+
+    <td>
+      Hi
+    </td>
+
+  </tr>
+
+</table>
+.
+<table>
+  <tr>
+<pre><code>&lt;td&gt;
+  Hi
+&lt;/td&gt;
+</code></pre>
+  </tr>
+</table>
+````````````````````````````````
+
+
+Fortunately, blank lines are usually not necessary and can be
+deleted.  The exception is inside `<pre>` tags, but as described
+[above][HTML blocks], raw HTML blocks starting with `<pre>`
+*can* contain blank lines.
+
+## Link reference definitions
+
+A [link reference definition](@)
+consists of a [link label], optionally preceded by up to three spaces of
+indentation, followed
+by a colon (`:`), optional spaces or tabs (including up to one
+[line ending]), a [link destination],
+optional spaces or tabs (including up to one
+[line ending]), and an optional [link
+title], which if it is present must be separated
+from the [link destination] by spaces or tabs.
+No further character may occur.
+
+A [link reference definition]
+does not correspond to a structural element of a document.  Instead, it
+defines a label which can be used in [reference links]
+and reference-style [images] elsewhere in the document.  [Link
+reference definitions] can come either before or after the links that use
+them.
+
+```````````````````````````````` example
+[foo]: /url "title"
+
+[foo]
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+   [foo]: 
+      /url  
+           'the title'  
+
+[foo]
+.
+<p><a href="/url" title="the title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[Foo*bar\]]:my_(url) 'title (with parens)'
+
+[Foo*bar\]]
+.
+<p><a href="my_(url)" title="title (with parens)">Foo*bar]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[Foo bar]:
+<my url>
+'title'
+
+[Foo bar]
+.
+<p><a href="my%20url" title="title">Foo bar</a></p>
+````````````````````````````````
+
+
+The title may extend over multiple lines:
+
+```````````````````````````````` example
+[foo]: /url '
+title
+line1
+line2
+'
+
+[foo]
+.
+<p><a href="/url" title="
+title
+line1
+line2
+">foo</a></p>
+````````````````````````````````
+
+
+However, it may not contain a [blank line]:
+
+```````````````````````````````` example
+[foo]: /url 'title
+
+with blank line'
+
+[foo]
+.
+<p>[foo]: /url 'title</p>
+<p>with blank line'</p>
+<p>[foo]</p>
+````````````````````````````````
+
+
+The title may be omitted:
+
+```````````````````````````````` example
+[foo]:
+/url
+
+[foo]
+.
+<p><a href="/url">foo</a></p>
+````````````````````````````````
+
+
+The link destination may not be omitted:
+
+```````````````````````````````` example
+[foo]:
+
+[foo]
+.
+<p>[foo]:</p>
+<p>[foo]</p>
+````````````````````````````````
+
+ However, an empty link destination may be specified using
+ angle brackets:
+
+```````````````````````````````` example
+[foo]: <>
+
+[foo]
+.
+<p><a href="">foo</a></p>
+````````````````````````````````
+
+The title must be separated from the link destination by
+spaces or tabs:
+
+```````````````````````````````` example
+[foo]: <bar>(baz)
+
+[foo]
+.
+<p>[foo]: <bar>(baz)</p>
+<p>[foo]</p>
+````````````````````````````````
+
+
+Both title and destination can contain backslash escapes
+and literal backslashes:
+
+```````````````````````````````` example
+[foo]: /url\bar\*baz "foo\"bar\baz"
+
+[foo]
+.
+<p><a href="/url%5Cbar*baz" title="foo&quot;bar\baz">foo</a></p>
+````````````````````````````````
+
+
+A link can come before its corresponding definition:
+
+```````````````````````````````` example
+[foo]
+
+[foo]: url
+.
+<p><a href="url">foo</a></p>
+````````````````````````````````
+
+
+If there are several matching definitions, the first one takes
+precedence:
+
+```````````````````````````````` example
+[foo]
+
+[foo]: first
+[foo]: second
+.
+<p><a href="first">foo</a></p>
+````````````````````````````````
+
+
+As noted in the section on [Links], matching of labels is
+case-insensitive (see [matches]).
+
+```````````````````````````````` example
+[FOO]: /url
+
+[Foo]
+.
+<p><a href="/url">Foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[ΑΓΩ]: /φου
+
+[αγω]
+.
+<p><a href="/%CF%86%CE%BF%CF%85">αγω</a></p>
+````````````````````````````````
+
+
+Whether something is a [link reference definition] is
+independent of whether the link reference it defines is
+used in the document.  Thus, for example, the following
+document contains just a link reference definition, and
+no visible content:
+
+```````````````````````````````` example
+[foo]: /url
+.
+````````````````````````````````
+
+
+Here is another one:
+
+```````````````````````````````` example
+[
+foo
+]: /url
+bar
+.
+<p>bar</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because there are
+characters other than spaces or tabs after the title:
+
+```````````````````````````````` example
+[foo]: /url "title" ok
+.
+<p>[foo]: /url &quot;title&quot; ok</p>
+````````````````````````````````
+
+
+This is a link reference definition, but it has no title:
+
+```````````````````````````````` example
+[foo]: /url
+"title" ok
+.
+<p>&quot;title&quot; ok</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because it is indented
+four spaces:
+
+```````````````````````````````` example
+    [foo]: /url "title"
+
+[foo]
+.
+<pre><code>[foo]: /url &quot;title&quot;
+</code></pre>
+<p>[foo]</p>
+````````````````````````````````
+
+
+This is not a link reference definition, because it occurs inside
+a code block:
+
+```````````````````````````````` example
+```
+[foo]: /url
+```
+
+[foo]
+.
+<pre><code>[foo]: /url
+</code></pre>
+<p>[foo]</p>
+````````````````````````````````
+
+
+A [link reference definition] cannot interrupt a paragraph.
+
+```````````````````````````````` example
+Foo
+[bar]: /baz
+
+[bar]
+.
+<p>Foo
+[bar]: /baz</p>
+<p>[bar]</p>
+````````````````````````````````
+
+
+However, it can directly follow other block elements, such as headings
+and thematic breaks, and it need not be followed by a blank line.
+
+```````````````````````````````` example
+# [Foo]
+[foo]: /url
+> bar
+.
+<h1><a href="/url">Foo</a></h1>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo]: /url
+bar
+===
+[foo]
+.
+<h1>bar</h1>
+<p><a href="/url">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo]: /url
+===
+[foo]
+.
+<p>===
+<a href="/url">foo</a></p>
+````````````````````````````````
+
+
+Several [link reference definitions]
+can occur one after another, without intervening blank lines.
+
+```````````````````````````````` example
+[foo]: /foo-url "foo"
+[bar]: /bar-url
+  "bar"
+[baz]: /baz-url
+
+[foo],
+[bar],
+[baz]
+.
+<p><a href="/foo-url" title="foo">foo</a>,
+<a href="/bar-url" title="bar">bar</a>,
+<a href="/baz-url">baz</a></p>
+````````````````````````````````
+
+
+[Link reference definitions] can occur
+inside block containers, like lists and block quotations.  They
+affect the entire document, not just the container in which they
+are defined:
+
+```````````````````````````````` example
+[foo]
+
+> [foo]: /url
+.
+<p><a href="/url">foo</a></p>
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+## Paragraphs
+
+A sequence of non-blank lines that cannot be interpreted as other
+kinds of blocks forms a [paragraph](@).
+The contents of the paragraph are the result of parsing the
+paragraph's raw content as inlines.  The paragraph's raw content
+is formed by concatenating the lines and removing initial and final
+spaces or tabs.
+
+A simple example with two paragraphs:
+
+```````````````````````````````` example
+aaa
+
+bbb
+.
+<p>aaa</p>
+<p>bbb</p>
+````````````````````````````````
+
+
+Paragraphs can contain multiple lines, but no blank lines:
+
+```````````````````````````````` example
+aaa
+bbb
+
+ccc
+ddd
+.
+<p>aaa
+bbb</p>
+<p>ccc
+ddd</p>
+````````````````````````````````
+
+
+Multiple blank lines between paragraphs have no effect:
+
+```````````````````````````````` example
+aaa
+
+
+bbb
+.
+<p>aaa</p>
+<p>bbb</p>
+````````````````````````````````
+
+
+Leading spaces or tabs are skipped:
+
+```````````````````````````````` example
+  aaa
+ bbb
+.
+<p>aaa
+bbb</p>
+````````````````````````````````
+
+
+Lines after the first may be indented any amount, since indented
+code blocks cannot interrupt paragraphs.
+
+```````````````````````````````` example
+aaa
+             bbb
+                                       ccc
+.
+<p>aaa
+bbb
+ccc</p>
+````````````````````````````````
+
+
+However, the first line may be preceded by up to three spaces of indentation.
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+   aaa
+bbb
+.
+<p>aaa
+bbb</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+    aaa
+bbb
+.
+<pre><code>aaa
+</code></pre>
+<p>bbb</p>
+````````````````````````````````
+
+
+Final spaces or tabs are stripped before inline parsing, so a paragraph
+that ends with two or more spaces will not end with a [hard line
+break]:
+
+```````````````````````````````` example
+aaa     
+bbb     
+.
+<p>aaa<br />
+bbb</p>
+````````````````````````````````
+
+
+## Blank lines
+
+[Blank lines] between block-level elements are ignored,
+except for the role they play in determining whether a [list]
+is [tight] or [loose].
+
+Blank lines at the beginning and end of the document are also ignored.
+
+```````````````````````````````` example
+  
+
+aaa
+  
+
+# aaa
+
+  
+.
+<p>aaa</p>
+<h1>aaa</h1>
+````````````````````````````````
+
+
+
+# Container blocks
+
+A [container block](#container-blocks) is a block that has other
+blocks as its contents.  There are two basic kinds of container blocks:
+[block quotes] and [list items].
+[Lists] are meta-containers for [list items].
+
+We define the syntax for container blocks recursively.  The general
+form of the definition is:
+
+> If X is a sequence of blocks, then the result of
+> transforming X in such-and-such a way is a container of type Y
+> with these blocks as its content.
+
+So, we explain what counts as a block quote or list item by explaining
+how these can be *generated* from their contents. This should suffice
+to define the syntax, although it does not give a recipe for *parsing*
+these constructions.  (A recipe is provided below in the section entitled
+[A parsing strategy](#appendix-a-parsing-strategy).)
+
+## Block quotes
+
+A [block quote marker](@),
+optionally preceded by up to three spaces of indentation,
+consists of (a) the character `>` together with a following space of
+indentation, or (b) a single character `>` not followed by a space of
+indentation.
+
+The following rules define [block quotes]:
+
+1.  **Basic case.**  If a string of lines *Ls* constitute a sequence
+    of blocks *Bs*, then the result of prepending a [block quote
+    marker] to the beginning of each line in *Ls*
+    is a [block quote](#block-quotes) containing *Bs*.
+
+2.  **Laziness.**  If a string of lines *Ls* constitute a [block
+    quote](#block-quotes) with contents *Bs*, then the result of deleting
+    the initial [block quote marker] from one or
+    more lines in which the next character other than a space or tab after the
+    [block quote marker] is [paragraph continuation
+    text] is a block quote with *Bs* as its content.
+    [Paragraph continuation text](@) is text
+    that will be parsed as part of the content of a paragraph, but does
+    not occur at the beginning of the paragraph.
+
+3.  **Consecutiveness.**  A document cannot contain two [block
+    quotes] in a row unless there is a [blank line] between them.
+
+Nothing else counts as a [block quote](#block-quotes).
+
+Here is a simple example:
+
+```````````````````````````````` example
+> # Foo
+> bar
+> baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+The space or tab after the `>` characters can be omitted:
+
+```````````````````````````````` example
+># Foo
+>bar
+> baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+The `>` characters can be preceded by up to three spaces of indentation:
+
+```````````````````````````````` example
+   > # Foo
+   > bar
+ > baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+Four spaces of indentation is too many:
+
+```````````````````````````````` example
+    > # Foo
+    > bar
+    > baz
+.
+<pre><code>&gt; # Foo
+&gt; bar
+&gt; baz
+</code></pre>
+````````````````````````````````
+
+
+The Laziness clause allows us to omit the `>` before
+[paragraph continuation text]:
+
+```````````````````````````````` example
+> # Foo
+> bar
+baz
+.
+<blockquote>
+<h1>Foo</h1>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+A block quote can contain some lazy and some non-lazy
+continuation lines:
+
+```````````````````````````````` example
+> bar
+baz
+> foo
+.
+<blockquote>
+<p>bar
+baz
+foo</p>
+</blockquote>
+````````````````````````````````
+
+
+Laziness only applies to lines that would have been continuations of
+paragraphs had they been prepended with [block quote markers].
+For example, the `> ` cannot be omitted in the second line of
+
+``` markdown
+> foo
+> ---
+```
+
+without changing the meaning:
+
+```````````````````````````````` example
+> foo
+---
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<hr />
+````````````````````````````````
+
+
+Similarly, if we omit the `> ` in the second line of
+
+``` markdown
+> - foo
+> - bar
+```
+
+then the block quote ends after the first line:
+
+```````````````````````````````` example
+> - foo
+- bar
+.
+<blockquote>
+<ul>
+<li>foo</li>
+</ul>
+</blockquote>
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+For the same reason, we can't omit the `> ` in front of
+subsequent lines of an indented or fenced code block:
+
+```````````````````````````````` example
+>     foo
+    bar
+.
+<blockquote>
+<pre><code>foo
+</code></pre>
+</blockquote>
+<pre><code>bar
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> ```
+foo
+```
+.
+<blockquote>
+<pre><code></code></pre>
+</blockquote>
+<p>foo</p>
+<pre><code></code></pre>
+````````````````````````````````
+
+
+Note that in the following case, we have a [lazy
+continuation line]:
+
+```````````````````````````````` example
+> foo
+    - bar
+.
+<blockquote>
+<p>foo
+- bar</p>
+</blockquote>
+````````````````````````````````
+
+
+To see why, note that in
+
+```markdown
+> foo
+>     - bar
+```
+
+the `- bar` is indented too far to start a list, and can't
+be an indented code block because indented code blocks cannot
+interrupt paragraphs, so it is [paragraph continuation text].
+
+A block quote can be empty:
+
+```````````````````````````````` example
+>
+.
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+>
+>  
+> 
+.
+<blockquote>
+</blockquote>
+````````````````````````````````
+
+
+A block quote can have initial or final blank lines:
+
+```````````````````````````````` example
+>
+> foo
+>  
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+````````````````````````````````
+
+
+A blank line always separates block quotes:
+
+```````````````````````````````` example
+> foo
+
+> bar
+.
+<blockquote>
+<p>foo</p>
+</blockquote>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+(Most current Markdown implementations, including John Gruber's
+original `Markdown.pl`, will parse this example as a single block quote
+with two paragraphs.  But it seems better to allow the author to decide
+whether two block quotes or one are wanted.)
+
+Consecutiveness means that if we put these block quotes together,
+we get a single block quote:
+
+```````````````````````````````` example
+> foo
+> bar
+.
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+````````````````````````````````
+
+
+To get a block quote with two paragraphs, use:
+
+```````````````````````````````` example
+> foo
+>
+> bar
+.
+<blockquote>
+<p>foo</p>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+Block quotes can interrupt paragraphs:
+
+```````````````````````````````` example
+foo
+> bar
+.
+<p>foo</p>
+<blockquote>
+<p>bar</p>
+</blockquote>
+````````````````````````````````
+
+
+In general, blank lines are not needed before or after block
+quotes:
+
+```````````````````````````````` example
+> aaa
+***
+> bbb
+.
+<blockquote>
+<p>aaa</p>
+</blockquote>
+<hr />
+<blockquote>
+<p>bbb</p>
+</blockquote>
+````````````````````````````````
+
+
+However, because of laziness, a blank line is needed between
+a block quote and a following paragraph:
+
+```````````````````````````````` example
+> bar
+baz
+.
+<blockquote>
+<p>bar
+baz</p>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> bar
+
+baz
+.
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> bar
+>
+baz
+.
+<blockquote>
+<p>bar</p>
+</blockquote>
+<p>baz</p>
+````````````````````````````````
+
+
+It is a consequence of the Laziness rule that any number
+of initial `>`s may be omitted on a continuation line of a
+nested block quote:
+
+```````````````````````````````` example
+> > > foo
+bar
+.
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar</p>
+</blockquote>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+>>> foo
+> bar
+>>baz
+.
+<blockquote>
+<blockquote>
+<blockquote>
+<p>foo
+bar
+baz</p>
+</blockquote>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+When including an indented code block in a block quote,
+remember that the [block quote marker] includes
+both the `>` and a following space of indentation.  So *five spaces* are needed
+after the `>`:
+
+```````````````````````````````` example
+>     code
+
+>    not code
+.
+<blockquote>
+<pre><code>code
+</code></pre>
+</blockquote>
+<blockquote>
+<p>not code</p>
+</blockquote>
+````````````````````````````````
+
+
+
+## List items
+
+A [list marker](@) is a
+[bullet list marker] or an [ordered list marker].
+
+A [bullet list marker](@)
+is a `-`, `+`, or `*` character.
+
+An [ordered list marker](@)
+is a sequence of 1--9 arabic digits (`0-9`), followed by either a
+`.` character or a `)` character.  (The reason for the length
+limit is that with 10 digits we start seeing integer overflows
+in some browsers.)
+
+The following rules define [list items]:
+
+1.  **Basic case.**  If a sequence of lines *Ls* constitute a sequence of
+    blocks *Bs* starting with a character other than a space or tab, and *M* is
+    a list marker of width *W* followed by 1 ≤ *N* ≤ 4 spaces of indentation,
+    then the result of prepending *M* and the following spaces to the first line
+    of Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a
+    list item with *Bs* as its contents.  The type of the list item
+    (bullet or ordered) is determined by the type of its list marker.
+    If the list item is ordered, then it is also assigned a start
+    number, based on the ordered list marker.
+
+    Exceptions:
+
+    1. When the first list item in a [list] interrupts
+       a paragraph---that is, when it starts on a line that would
+       otherwise count as [paragraph continuation text]---then (a)
+       the lines *Ls* must not begin with a blank line, and (b) if
+       the list item is ordered, the start number must be 1.
+    2. If any line is a [thematic break][thematic breaks] then
+       that line is not a list item.
+
+For example, let *Ls* be the lines
+
+```````````````````````````````` example
+A paragraph
+with two lines.
+
+    indented code
+
+> A block quote.
+.
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+````````````````````````````````
+
+
+And let *M* be the marker `1.`, and *N* = 2.  Then rule #1 says
+that the following is an ordered list item with start number 1,
+and the same contents as *Ls*:
+
+```````````````````````````````` example
+1.  A paragraph
+    with two lines.
+
+        indented code
+
+    > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+The most important thing to notice is that the position of
+the text after the list marker determines how much indentation
+is needed in subsequent blocks in the list item.  If the list
+marker takes up two spaces of indentation, and there are three spaces between
+the list marker and the next character other than a space or tab, then blocks
+must be indented five spaces in order to fall under the list
+item.
+
+Here are some examples showing how far content must be indented to be
+put under the list item:
+
+```````````````````````````````` example
+- one
+
+ two
+.
+<ul>
+<li>one</li>
+</ul>
+<p>two</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- one
+
+  two
+.
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ -    one
+
+     two
+.
+<ul>
+<li>one</li>
+</ul>
+<pre><code> two
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+ -    one
+
+      two
+.
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+It is tempting to think of this in terms of columns:  the continuation
+blocks must be indented at least to the column of the first character other than
+a space or tab after the list marker.  However, that is not quite right.
+The spaces of indentation after the list marker determine how much relative
+indentation is needed.  Which column this indentation reaches will depend on
+how the list item is embedded in other constructions, as shown by
+this example:
+
+```````````````````````````````` example
+   > > 1.  one
+>>
+>>     two
+.
+<blockquote>
+<blockquote>
+<ol>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ol>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+Here `two` occurs in the same column as the list marker `1.`,
+but is actually contained in the list item, because there is
+sufficient indentation after the last containing blockquote marker.
+
+The converse is also possible.  In the following example, the word `two`
+occurs far to the right of the initial text of the list item, `one`, but
+it is not considered part of the list item, because it is not indented
+far enough past the blockquote marker:
+
+```````````````````````````````` example
+>>- one
+>>
+  >  > two
+.
+<blockquote>
+<blockquote>
+<ul>
+<li>one</li>
+</ul>
+<p>two</p>
+</blockquote>
+</blockquote>
+````````````````````````````````
+
+
+Note that at least one space or tab is needed between the list marker and
+any following content, so these are not list items:
+
+```````````````````````````````` example
+-one
+
+2.two
+.
+<p>-one</p>
+<p>2.two</p>
+````````````````````````````````
+
+
+A list item may contain blocks that are separated by more than
+one blank line.
+
+```````````````````````````````` example
+- foo
+
+
+  bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+A list item may contain any kind of block:
+
+```````````````````````````````` example
+1.  foo
+
+    ```
+    bar
+    ```
+
+    baz
+
+    > bam
+.
+<ol>
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+<p>baz</p>
+<blockquote>
+<p>bam</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+A list item that contains an indented code block will preserve
+empty lines within the code block verbatim.
+
+```````````````````````````````` example
+- Foo
+
+      bar
+
+
+      baz
+.
+<ul>
+<li>
+<p>Foo</p>
+<pre><code>bar
+
+
+baz
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+Note that ordered list start numbers must be nine digits or less:
+
+```````````````````````````````` example
+123456789. ok
+.
+<ol start="123456789">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1234567890. not ok
+.
+<p>1234567890. not ok</p>
+````````````````````````````````
+
+
+A start number may begin with 0s:
+
+```````````````````````````````` example
+0. ok
+.
+<ol start="0">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+```````````````````````````````` example
+003. ok
+.
+<ol start="3">
+<li>ok</li>
+</ol>
+````````````````````````````````
+
+
+A start number may not be negative:
+
+```````````````````````````````` example
+-1. not ok
+.
+<p>-1. not ok</p>
+````````````````````````````````
+
+
+
+2.  **Item starting with indented code.**  If a sequence of lines *Ls*
+    constitute a sequence of blocks *Bs* starting with an indented code
+    block, and *M* is a list marker of width *W* followed by
+    one space of indentation, then the result of prepending *M* and the
+    following space to the first line of *Ls*, and indenting subsequent lines
+    of *Ls* by *W + 1* spaces, is a list item with *Bs* as its contents.
+    If a line is empty, then it need not be indented.  The type of the
+    list item (bullet or ordered) is determined by the type of its list
+    marker.  If the list item is ordered, then it is also assigned a
+    start number, based on the ordered list marker.
+
+An indented code block will have to be preceded by four spaces of indentation
+beyond the edge of the region where text will be included in the list item.
+In the following case that is 6 spaces:
+
+```````````````````````````````` example
+- foo
+
+      bar
+.
+<ul>
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+
+And in this case it is 11 spaces:
+
+```````````````````````````````` example
+  10.  foo
+
+           bar
+.
+<ol start="10">
+<li>
+<p>foo</p>
+<pre><code>bar
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+If the *first* block in the list item is an indented code block,
+then by rule #2, the contents must be preceded by *one* space of indentation
+after the list marker:
+
+```````````````````````````````` example
+    indented code
+
+paragraph
+
+    more code
+.
+<pre><code>indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1.     indented code
+
+   paragraph
+
+       more code
+.
+<ol>
+<li>
+<pre><code>indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+Note that an additional space of indentation is interpreted as space
+inside the code block:
+
+```````````````````````````````` example
+1.      indented code
+
+   paragraph
+
+       more code
+.
+<ol>
+<li>
+<pre><code> indented code
+</code></pre>
+<p>paragraph</p>
+<pre><code>more code
+</code></pre>
+</li>
+</ol>
+````````````````````````````````
+
+
+Note that rules #1 and #2 only apply to two cases:  (a) cases
+in which the lines to be included in a list item begin with a
+characer other than a space or tab, and (b) cases in which
+they begin with an indented code
+block.  In a case like the following, where the first block begins with
+three spaces of indentation, the rules do not allow us to form a list item by
+indenting the whole thing and prepending a list marker:
+
+```````````````````````````````` example
+   foo
+
+bar
+.
+<p>foo</p>
+<p>bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+-    foo
+
+  bar
+.
+<ul>
+<li>foo</li>
+</ul>
+<p>bar</p>
+````````````````````````````````
+
+
+This is not a significant restriction, because when a block is preceded by up to
+three spaces of indentation, the indentation can always be removed without
+a change in interpretation, allowing rule #1 to be applied.  So, in
+the above case:
+
+```````````````````````````````` example
+-  foo
+
+   bar
+.
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+3.  **Item starting with a blank line.**  If a sequence of lines *Ls*
+    starting with a single [blank line] constitute a (possibly empty)
+    sequence of blocks *Bs*, and *M* is a list marker of width *W*,
+    then the result of prepending *M* to the first line of *Ls*, and
+    preceding subsequent lines of *Ls* by *W + 1* spaces of indentation, is a
+    list item with *Bs* as its contents.
+    If a line is empty, then it need not be indented.  The type of the
+    list item (bullet or ordered) is determined by the type of its list
+    marker.  If the list item is ordered, then it is also assigned a
+    start number, based on the ordered list marker.
+
+Here are some list items that start with a blank line but are not empty:
+
+```````````````````````````````` example
+-
+  foo
+-
+  ```
+  bar
+  ```
+-
+      baz
+.
+<ul>
+<li>foo</li>
+<li>
+<pre><code>bar
+</code></pre>
+</li>
+<li>
+<pre><code>baz
+</code></pre>
+</li>
+</ul>
+````````````````````````````````
+
+When the list item starts with a blank line, the number of spaces
+following the list marker doesn't change the required indentation:
+
+```````````````````````````````` example
+-   
+  foo
+.
+<ul>
+<li>foo</li>
+</ul>
+````````````````````````````````
+
+
+A list item can begin with at most one blank line.
+In the following example, `foo` is not part of the list
+item:
+
+```````````````````````````````` example
+-
+
+  foo
+.
+<ul>
+<li></li>
+</ul>
+<p>foo</p>
+````````````````````````````````
+
+
+Here is an empty bullet list item:
+
+```````````````````````````````` example
+- foo
+-
+- bar
+.
+<ul>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+It does not matter whether there are spaces or tabs following the [list marker]:
+
+```````````````````````````````` example
+- foo
+-   
+- bar
+.
+<ul>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+Here is an empty ordered list item:
+
+```````````````````````````````` example
+1. foo
+2.
+3. bar
+.
+<ol>
+<li>foo</li>
+<li></li>
+<li>bar</li>
+</ol>
+````````````````````````````````
+
+
+A list may start or end with an empty list item:
+
+```````````````````````````````` example
+*
+.
+<ul>
+<li></li>
+</ul>
+````````````````````````````````
+
+However, an empty list item cannot interrupt a paragraph:
+
+```````````````````````````````` example
+foo
+*
+
+foo
+1.
+.
+<p>foo
+*</p>
+<p>foo
+1.</p>
+````````````````````````````````
+
+
+4.  **Indentation.**  If a sequence of lines *Ls* constitutes a list item
+    according to rule #1, #2, or #3, then the result of preceding each line
+    of *Ls* by up to three spaces of indentation (the same for each line) also
+    constitutes a list item with the same contents and attributes.  If a line is
+    empty, then it need not be indented.
+
+Indented one space:
+
+```````````````````````````````` example
+ 1.  A paragraph
+     with two lines.
+
+         indented code
+
+     > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indented two spaces:
+
+```````````````````````````````` example
+  1.  A paragraph
+      with two lines.
+
+          indented code
+
+      > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indented three spaces:
+
+```````````````````````````````` example
+   1.  A paragraph
+       with two lines.
+
+           indented code
+
+       > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Four spaces indent gives a code block:
+
+```````````````````````````````` example
+    1.  A paragraph
+        with two lines.
+
+            indented code
+
+        > A block quote.
+.
+<pre><code>1.  A paragraph
+    with two lines.
+
+        indented code
+
+    &gt; A block quote.
+</code></pre>
+````````````````````````````````
+
+
+
+5.  **Laziness.**  If a string of lines *Ls* constitute a [list
+    item](#list-items) with contents *Bs*, then the result of deleting
+    some or all of the indentation from one or more lines in which the
+    next character other than a space or tab after the indentation is
+    [paragraph continuation text] is a
+    list item with the same contents and attributes.  The unindented
+    lines are called
+    [lazy continuation line](@)s.
+
+Here is an example with [lazy continuation lines]:
+
+```````````````````````````````` example
+  1.  A paragraph
+with two lines.
+
+          indented code
+
+      > A block quote.
+.
+<ol>
+<li>
+<p>A paragraph
+with two lines.</p>
+<pre><code>indented code
+</code></pre>
+<blockquote>
+<p>A block quote.</p>
+</blockquote>
+</li>
+</ol>
+````````````````````````````````
+
+
+Indentation can be partially deleted:
+
+```````````````````````````````` example
+  1.  A paragraph
+    with two lines.
+.
+<ol>
+<li>A paragraph
+with two lines.</li>
+</ol>
+````````````````````````````````
+
+
+These examples show how laziness can work in nested structures:
+
+```````````````````````````````` example
+> 1. > Blockquote
+continued here.
+.
+<blockquote>
+<ol>
+<li>
+<blockquote>
+<p>Blockquote
+continued here.</p>
+</blockquote>
+</li>
+</ol>
+</blockquote>
+````````````````````````````````
+
+
+```````````````````````````````` example
+> 1. > Blockquote
+> continued here.
+.
+<blockquote>
+<ol>
+<li>
+<blockquote>
+<p>Blockquote
+continued here.</p>
+</blockquote>
+</li>
+</ol>
+</blockquote>
+````````````````````````````````
+
+
+
+6.  **That's all.** Nothing that is not counted as a list item by rules
+    #1--5 counts as a [list item](#list-items).
+
+The rules for sublists follow from the general rules
+[above][List items].  A sublist must be indented the same number
+of spaces of indentation a paragraph would need to be in order to be included
+in the list item.
+
+So, in this case we need two spaces indent:
+
+```````````````````````````````` example
+- foo
+  - bar
+    - baz
+      - boo
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>baz
+<ul>
+<li>boo</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+One is not enough:
+
+```````````````````````````````` example
+- foo
+ - bar
+  - baz
+   - boo
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+<li>baz</li>
+<li>boo</li>
+</ul>
+````````````````````````````````
+
+
+Here we need four, because the list marker is wider:
+
+```````````````````````````````` example
+10) foo
+    - bar
+.
+<ol start="10">
+<li>foo
+<ul>
+<li>bar</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+Three is not enough:
+
+```````````````````````````````` example
+10) foo
+   - bar
+.
+<ol start="10">
+<li>foo</li>
+</ol>
+<ul>
+<li>bar</li>
+</ul>
+````````````````````````````````
+
+
+A list may be the first block in a list item:
+
+```````````````````````````````` example
+- - foo
+.
+<ul>
+<li>
+<ul>
+<li>foo</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. - 2. foo
+.
+<ol>
+<li>
+<ul>
+<li>
+<ol start="2">
+<li>foo</li>
+</ol>
+</li>
+</ul>
+</li>
+</ol>
+````````````````````````````````
+
+
+A list item can contain a heading:
+
+```````````````````````````````` example
+- # Foo
+- Bar
+  ---
+  baz
+.
+<ul>
+<li>
+<h1>Foo</h1>
+</li>
+<li>
+<h2>Bar</h2>
+baz</li>
+</ul>
+````````````````````````````````
+
+
+### Motivation
+
+John Gruber's Markdown spec says the following about list items:
+
+1. "List markers typically start at the left margin, but may be indented
+   by up to three spaces. List markers must be followed by one or more
+   spaces or a tab."
+
+2. "To make lists look nice, you can wrap items with hanging indents....
+   But if you don't want to, you don't have to."
+
+3. "List items may consist of multiple paragraphs. Each subsequent
+   paragraph in a list item must be indented by either 4 spaces or one
+   tab."
+
+4. "It looks nice if you indent every line of the subsequent paragraphs,
+   but here again, Markdown will allow you to be lazy."
+
+5. "To put a blockquote within a list item, the blockquote's `>`
+   delimiters need to be indented."
+
+6. "To put a code block within a list item, the code block needs to be
+   indented twice — 8 spaces or two tabs."
+
+These rules specify that a paragraph under a list item must be indented
+four spaces (presumably, from the left margin, rather than the start of
+the list marker, but this is not said), and that code under a list item
+must be indented eight spaces instead of the usual four.  They also say
+that a block quote must be indented, but not by how much; however, the
+example given has four spaces indentation.  Although nothing is said
+about other kinds of block-level content, it is certainly reasonable to
+infer that *all* block elements under a list item, including other
+lists, must be indented four spaces.  This principle has been called the
+*four-space rule*.
+
+The four-space rule is clear and principled, and if the reference
+implementation `Markdown.pl` had followed it, it probably would have
+become the standard.  However, `Markdown.pl` allowed paragraphs and
+sublists to start with only two spaces indentation, at least on the
+outer level.  Worse, its behavior was inconsistent: a sublist of an
+outer-level list needed two spaces indentation, but a sublist of this
+sublist needed three spaces.  It is not surprising, then, that different
+implementations of Markdown have developed very different rules for
+determining what comes under a list item.  (Pandoc and python-Markdown,
+for example, stuck with Gruber's syntax description and the four-space
+rule, while discount, redcarpet, marked, PHP Markdown, and others
+followed `Markdown.pl`'s behavior more closely.)
+
+Unfortunately, given the divergences between implementations, there
+is no way to give a spec for list items that will be guaranteed not
+to break any existing documents.  However, the spec given here should
+correctly handle lists formatted with either the four-space rule or
+the more forgiving `Markdown.pl` behavior, provided they are laid out
+in a way that is natural for a human to read.
+
+The strategy here is to let the width and indentation of the list marker
+determine the indentation necessary for blocks to fall under the list
+item, rather than having a fixed and arbitrary number.  The writer can
+think of the body of the list item as a unit which gets indented to the
+right enough to fit the list marker (and any indentation on the list
+marker).  (The laziness rule, #5, then allows continuation lines to be
+unindented if needed.)
+
+This rule is superior, we claim, to any rule requiring a fixed level of
+indentation from the margin.  The four-space rule is clear but
+unnatural. It is quite unintuitive that
+
+``` markdown
+- foo
+
+  bar
+
+  - baz
+```
+
+should be parsed as two lists with an intervening paragraph,
+
+``` html
+<ul>
+<li>foo</li>
+</ul>
+<p>bar</p>
+<ul>
+<li>baz</li>
+</ul>
+```
+
+as the four-space rule demands, rather than a single list,
+
+``` html
+<ul>
+<li>
+<p>foo</p>
+<p>bar</p>
+<ul>
+<li>baz</li>
+</ul>
+</li>
+</ul>
+```
+
+The choice of four spaces is arbitrary.  It can be learned, but it is
+not likely to be guessed, and it trips up beginners regularly.
+
+Would it help to adopt a two-space rule?  The problem is that such
+a rule, together with the rule allowing up to three spaces of indentation for
+the initial list marker, allows text that is indented *less than* the
+original list marker to be included in the list item. For example,
+`Markdown.pl` parses
+
+``` markdown
+   - one
+
+  two
+```
+
+as a single list item, with `two` a continuation paragraph:
+
+``` html
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+```
+
+and similarly
+
+``` markdown
+>   - one
+>
+>  two
+```
+
+as
+
+``` html
+<blockquote>
+<ul>
+<li>
+<p>one</p>
+<p>two</p>
+</li>
+</ul>
+</blockquote>
+```
+
+This is extremely unintuitive.
+
+Rather than requiring a fixed indent from the margin, we could require
+a fixed indent (say, two spaces, or even one space) from the list marker (which
+may itself be indented).  This proposal would remove the last anomaly
+discussed.  Unlike the spec presented above, it would count the following
+as a list item with a subparagraph, even though the paragraph `bar`
+is not indented as far as the first paragraph `foo`:
+
+``` markdown
+ 10. foo
+
+   bar  
+```
+
+Arguably this text does read like a list item with `bar` as a subparagraph,
+which may count in favor of the proposal.  However, on this proposal indented
+code would have to be indented six spaces after the list marker.  And this
+would break a lot of existing Markdown, which has the pattern:
+
+``` markdown
+1.  foo
+
+        indented code
+```
+
+where the code is indented eight spaces.  The spec above, by contrast, will
+parse this text as expected, since the code block's indentation is measured
+from the beginning of `foo`.
+
+The one case that needs special treatment is a list item that *starts*
+with indented code.  How much indentation is required in that case, since
+we don't have a "first paragraph" to measure from?  Rule #2 simply stipulates
+that in such cases, we require one space indentation from the list marker
+(and then the normal four spaces for the indented code).  This will match the
+four-space rule in cases where the list marker plus its initial indentation
+takes four spaces (a common case), but diverge in other cases.
+
+## Lists
+
+A [list](@) is a sequence of one or more
+list items [of the same type].  The list items
+may be separated by any number of blank lines.
+
+Two list items are [of the same type](@)
+if they begin with a [list marker] of the same type.
+Two list markers are of the
+same type if (a) they are bullet list markers using the same character
+(`-`, `+`, or `*`) or (b) they are ordered list numbers with the same
+delimiter (either `.` or `)`).
+
+A list is an [ordered list](@)
+if its constituent list items begin with
+[ordered list markers], and a
+[bullet list](@) if its constituent list
+items begin with [bullet list markers].
+
+The [start number](@)
+of an [ordered list] is determined by the list number of
+its initial list item.  The numbers of subsequent list items are
+disregarded.
+
+A list is [loose](@) if any of its constituent
+list items are separated by blank lines, or if any of its constituent
+list items directly contain two block-level elements with a blank line
+between them.  Otherwise a list is [tight](@).
+(The difference in HTML output is that paragraphs in a loose list are
+wrapped in `<p>` tags, while paragraphs in a tight list are not.)
+
+Changing the bullet or ordered list delimiter starts a new list:
+
+```````````````````````````````` example
+- foo
+- bar
++ baz
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+</ul>
+<ul>
+<li>baz</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. foo
+2. bar
+3) baz
+.
+<ol>
+<li>foo</li>
+<li>bar</li>
+</ol>
+<ol start="3">
+<li>baz</li>
+</ol>
+````````````````````````````````
+
+
+In CommonMark, a list can interrupt a paragraph. That is,
+no blank line is needed to separate a paragraph from a following
+list:
+
+```````````````````````````````` example
+Foo
+- bar
+- baz
+.
+<p>Foo</p>
+<ul>
+<li>bar</li>
+<li>baz</li>
+</ul>
+````````````````````````````````
+
+`Markdown.pl` does not allow this, through fear of triggering a list
+via a numeral in a hard-wrapped line:
+
+``` markdown
+The number of windows in my house is
+14.  The number of doors is 6.
+```
+
+Oddly, though, `Markdown.pl` *does* allow a blockquote to
+interrupt a paragraph, even though the same considerations might
+apply.
+
+In CommonMark, we do allow lists to interrupt paragraphs, for
+two reasons.  First, it is natural and not uncommon for people
+to start lists without blank lines:
+
+``` markdown
+I need to buy
+- new shoes
+- a coat
+- a plane ticket
+```
+
+Second, we are attracted to a
+
+> [principle of uniformity](@):
+> if a chunk of text has a certain
+> meaning, it will continue to have the same meaning when put into a
+> container block (such as a list item or blockquote).
+
+(Indeed, the spec for [list items] and [block quotes] presupposes
+this principle.) This principle implies that if
+
+``` markdown
+  * I need to buy
+    - new shoes
+    - a coat
+    - a plane ticket
+```
+
+is a list item containing a paragraph followed by a nested sublist,
+as all Markdown implementations agree it is (though the paragraph
+may be rendered without `<p>` tags, since the list is "tight"),
+then
+
+``` markdown
+I need to buy
+- new shoes
+- a coat
+- a plane ticket
+```
+
+by itself should be a paragraph followed by a nested sublist.
+
+Since it is well established Markdown practice to allow lists to
+interrupt paragraphs inside list items, the [principle of
+uniformity] requires us to allow this outside list items as
+well.  ([reStructuredText](http://docutils.sourceforge.net/rst.html)
+takes a different approach, requiring blank lines before lists
+even inside other list items.)
+
+In order to solve of unwanted lists in paragraphs with
+hard-wrapped numerals, we allow only lists starting with `1` to
+interrupt paragraphs.  Thus,
+
+```````````````````````````````` example
+The number of windows in my house is
+14.  The number of doors is 6.
+.
+<p>The number of windows in my house is
+14.  The number of doors is 6.</p>
+````````````````````````````````
+
+We may still get an unintended result in cases like
+
+```````````````````````````````` example
+The number of windows in my house is
+1.  The number of doors is 6.
+.
+<p>The number of windows in my house is</p>
+<ol>
+<li>The number of doors is 6.</li>
+</ol>
+````````````````````````````````
+
+but this rule should prevent most spurious list captures.
+
+There can be any number of blank lines between items:
+
+```````````````````````````````` example
+- foo
+
+- bar
+
+
+- baz
+.
+<ul>
+<li>
+<p>foo</p>
+</li>
+<li>
+<p>bar</p>
+</li>
+<li>
+<p>baz</p>
+</li>
+</ul>
+````````````````````````````````
+
+```````````````````````````````` example
+- foo
+  - bar
+    - baz
+
+
+      bim
+.
+<ul>
+<li>foo
+<ul>
+<li>bar
+<ul>
+<li>
+<p>baz</p>
+<p>bim</p>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+To separate consecutive lists of the same type, or to separate a
+list from an indented code block that would otherwise be parsed
+as a subparagraph of the final list item, you can insert a blank HTML
+comment:
+
+```````````````````````````````` example
+- foo
+- bar
+
+<!-- -->
+
+- baz
+- bim
+.
+<ul>
+<li>foo</li>
+<li>bar</li>
+</ul>
+<!-- -->
+<ul>
+<li>baz</li>
+<li>bim</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+-   foo
+
+    notcode
+
+-   foo
+
+<!-- -->
+
+    code
+.
+<ul>
+<li>
+<p>foo</p>
+<p>notcode</p>
+</li>
+<li>
+<p>foo</p>
+</li>
+</ul>
+<!-- -->
+<pre><code>code
+</code></pre>
+````````````````````````````````
+
+
+List items need not be indented to the same level.  The following
+list items will be treated as items at the same list level,
+since none is indented enough to belong to the previous list
+item:
+
+```````````````````````````````` example
+- a
+ - b
+  - c
+   - d
+  - e
+ - f
+- g
+.
+<ul>
+<li>a</li>
+<li>b</li>
+<li>c</li>
+<li>d</li>
+<li>e</li>
+<li>f</li>
+<li>g</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+1. a
+
+  2. b
+
+   3. c
+.
+<ol>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>c</p>
+</li>
+</ol>
+````````````````````````````````
+
+Note, however, that list items may not be preceded by more than
+three spaces of indentation.  Here `- e` is treated as a paragraph continuation
+line, because it is indented more than three spaces:
+
+```````````````````````````````` example
+- a
+ - b
+  - c
+   - d
+    - e
+.
+<ul>
+<li>a</li>
+<li>b</li>
+<li>c</li>
+<li>d
+- e</li>
+</ul>
+````````````````````````````````
+
+And here, `3. c` is treated as in indented code block,
+because it is indented four spaces and preceded by a
+blank line.
+
+```````````````````````````````` example
+1. a
+
+  2. b
+
+    3. c
+.
+<ol>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+</ol>
+<pre><code>3. c
+</code></pre>
+````````````````````````````````
+
+
+This is a loose list, because there is a blank line between
+two of the list items:
+
+```````````````````````````````` example
+- a
+- b
+
+- c
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>c</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+So is this, with a empty second item:
+
+```````````````````````````````` example
+* a
+*
+
+* c
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li></li>
+<li>
+<p>c</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+These are loose lists, even though there are no blank lines between the items,
+because one of the items directly contains two block-level elements
+with a blank line between them:
+
+```````````````````````````````` example
+- a
+- b
+
+  c
+- d
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+<p>c</p>
+</li>
+<li>
+<p>d</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+- b
+
+  [ref]: /url
+- d
+.
+<ul>
+<li>
+<p>a</p>
+</li>
+<li>
+<p>b</p>
+</li>
+<li>
+<p>d</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank lines are in a code block:
+
+```````````````````````````````` example
+- a
+- ```
+  b
+
+
+  ```
+- c
+.
+<ul>
+<li>a</li>
+<li>
+<pre><code>b
+
+
+</code></pre>
+</li>
+<li>c</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank line is between two
+paragraphs of a sublist.  So the sublist is loose while
+the outer list is tight:
+
+```````````````````````````````` example
+- a
+  - b
+
+    c
+- d
+.
+<ul>
+<li>a
+<ul>
+<li>
+<p>b</p>
+<p>c</p>
+</li>
+</ul>
+</li>
+<li>d</li>
+</ul>
+````````````````````````````````
+
+
+This is a tight list, because the blank line is inside the
+block quote:
+
+```````````````````````````````` example
+* a
+  > b
+  >
+* c
+.
+<ul>
+<li>a
+<blockquote>
+<p>b</p>
+</blockquote>
+</li>
+<li>c</li>
+</ul>
+````````````````````````````````
+
+
+This list is tight, because the consecutive block elements
+are not separated by blank lines:
+
+```````````````````````````````` example
+- a
+  > b
+  ```
+  c
+  ```
+- d
+.
+<ul>
+<li>a
+<blockquote>
+<p>b</p>
+</blockquote>
+<pre><code>c
+</code></pre>
+</li>
+<li>d</li>
+</ul>
+````````````````````````````````
+
+
+A single-paragraph list is tight:
+
+```````````````````````````````` example
+- a
+.
+<ul>
+<li>a</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+  - b
+.
+<ul>
+<li>a
+<ul>
+<li>b</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+This list is loose, because of the blank line between the
+two block elements in the list item:
+
+```````````````````````````````` example
+1. ```
+   foo
+   ```
+
+   bar
+.
+<ol>
+<li>
+<pre><code>foo
+</code></pre>
+<p>bar</p>
+</li>
+</ol>
+````````````````````````````````
+
+
+Here the outer list is loose, the inner list tight:
+
+```````````````````````````````` example
+* foo
+  * bar
+
+  baz
+.
+<ul>
+<li>
+<p>foo</p>
+<ul>
+<li>bar</li>
+</ul>
+<p>baz</p>
+</li>
+</ul>
+````````````````````````````````
+
+
+```````````````````````````````` example
+- a
+  - b
+  - c
+
+- d
+  - e
+  - f
+.
+<ul>
+<li>
+<p>a</p>
+<ul>
+<li>b</li>
+<li>c</li>
+</ul>
+</li>
+<li>
+<p>d</p>
+<ul>
+<li>e</li>
+<li>f</li>
+</ul>
+</li>
+</ul>
+````````````````````````````````
+
+
+# Inlines
+
+Inlines are parsed sequentially from the beginning of the character
+stream to the end (left to right, in left-to-right languages).
+Thus, for example, in
+
+```````````````````````````````` example
+`hi`lo`
+.
+<p><code>hi</code>lo`</p>
+````````````````````````````````
+
+`hi` is parsed as code, leaving the backtick at the end as a literal
+backtick.
+
+
+
+## Code spans
+
+A [backtick string](@)
+is a string of one or more backtick characters (`` ` ``) that is neither
+preceded nor followed by a backtick.
+
+A [code span](@) begins with a backtick string and ends with
+a backtick string of equal length.  The contents of the code span are
+the characters between these two backtick strings, normalized in the
+following ways:
+
+- First, [line endings] are converted to [spaces].
+- If the resulting string both begins *and* ends with a [space]
+  character, but does not consist entirely of [space]
+  characters, a single [space] character is removed from the
+  front and back.  This allows you to include code that begins
+  or ends with backtick characters, which must be separated by
+  whitespace from the opening or closing backtick strings.
+
+This is a simple code span:
+
+```````````````````````````````` example
+`foo`
+.
+<p><code>foo</code></p>
+````````````````````````````````
+
+
+Here two backticks are used, because the code contains a backtick.
+This example also illustrates stripping of a single leading and
+trailing space:
+
+```````````````````````````````` example
+`` foo ` bar ``
+.
+<p><code>foo ` bar</code></p>
+````````````````````````````````
+
+
+This example shows the motivation for stripping leading and trailing
+spaces:
+
+```````````````````````````````` example
+` `` `
+.
+<p><code>``</code></p>
+````````````````````````````````
+
+Note that only *one* space is stripped:
+
+```````````````````````````````` example
+`  ``  `
+.
+<p><code> `` </code></p>
+````````````````````````````````
+
+The stripping only happens if the space is on both
+sides of the string:
+
+```````````````````````````````` example
+` a`
+.
+<p><code> a</code></p>
+````````````````````````````````
+
+Only [spaces], and not [unicode whitespace] in general, are
+stripped in this way:
+
+```````````````````````````````` example
+` b `
+.
+<p><code> b </code></p>
+````````````````````````````````
+
+No stripping occurs if the code span contains only spaces:
+
+```````````````````````````````` example
+` `
+`  `
+.
+<p><code> </code>
+<code>  </code></p>
+````````````````````````````````
+
+
+[Line endings] are treated like spaces:
+
+```````````````````````````````` example
+``
+foo
+bar  
+baz
+``
+.
+<p><code>foo bar   baz</code></p>
+````````````````````````````````
+
+```````````````````````````````` example
+``
+foo 
+``
+.
+<p><code>foo </code></p>
+````````````````````````````````
+
+
+Interior spaces are not collapsed:
+
+```````````````````````````````` example
+`foo   bar 
+baz`
+.
+<p><code>foo   bar  baz</code></p>
+````````````````````````````````
+
+Note that browsers will typically collapse consecutive spaces
+when rendering `<code>` elements, so it is recommended that
+the following CSS be used:
+
+    code{white-space: pre-wrap;}
+
+
+Note that backslash escapes do not work in code spans. All backslashes
+are treated literally:
+
+```````````````````````````````` example
+`foo\`bar`
+.
+<p><code>foo\</code>bar`</p>
+````````````````````````````````
+
+
+Backslash escapes are never needed, because one can always choose a
+string of *n* backtick characters as delimiters, where the code does
+not contain any strings of exactly *n* backtick characters.
+
+```````````````````````````````` example
+``foo`bar``
+.
+<p><code>foo`bar</code></p>
+````````````````````````````````
+
+```````````````````````````````` example
+` foo `` bar `
+.
+<p><code>foo `` bar</code></p>
+````````````````````````````````
+
+
+Code span backticks have higher precedence than any other inline
+constructs except HTML tags and autolinks.  Thus, for example, this is
+not parsed as emphasized text, since the second `*` is part of a code
+span:
+
+```````````````````````````````` example
+*foo`*`
+.
+<p>*foo<code>*</code></p>
+````````````````````````````````
+
+
+And this is not parsed as a link:
+
+```````````````````````````````` example
+[not a `link](/foo`)
+.
+<p>[not a <code>link](/foo</code>)</p>
+````````````````````````````````
+
+
+Code spans, HTML tags, and autolinks have the same precedence.
+Thus, this is code:
+
+```````````````````````````````` example
+`<a href="`">`
+.
+<p><code>&lt;a href=&quot;</code>&quot;&gt;`</p>
+````````````````````````````````
+
+
+But this is an HTML tag:
+
+```````````````````````````````` example
+<a href="`">`
+.
+<p><a href="`">`</p>
+````````````````````````````````
+
+
+And this is code:
+
+```````````````````````````````` example
+`<http://foo.bar.`baz>`
+.
+<p><code>&lt;http://foo.bar.</code>baz&gt;`</p>
+````````````````````````````````
+
+
+But this is an autolink:
+
+```````````````````````````````` example
+<http://foo.bar.`baz>`
+.
+<p><a href="http://foo.bar.%60baz">http://foo.bar.`baz</a>`</p>
+````````````````````````````````
+
+
+When a backtick string is not closed by a matching backtick string,
+we just have literal backticks:
+
+```````````````````````````````` example
+```foo``
+.
+<p>```foo``</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`foo
+.
+<p>`foo</p>
+````````````````````````````````
+
+The following case also illustrates the need for opening and
+closing backtick strings to be equal in length:
+
+```````````````````````````````` example
+`foo``bar``
+.
+<p>`foo<code>bar</code></p>
+````````````````````````````````
+
+
+## Emphasis and strong emphasis
+
+John Gruber's original [Markdown syntax
+description](http://daringfireball.net/projects/markdown/syntax#em) says:
+
+> Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
+> emphasis. Text wrapped with one `*` or `_` will be wrapped with an HTML
+> `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML `<strong>`
+> tag.
+
+This is enough for most users, but these rules leave much undecided,
+especially when it comes to nested emphasis.  The original
+`Markdown.pl` test suite makes it clear that triple `***` and
+`___` delimiters can be used for strong emphasis, and most
+implementations have also allowed the following patterns:
+
+``` markdown
+***strong emph***
+***strong** in emph*
+***emph* in strong**
+**in strong *emph***
+*in emph **strong***
+```
+
+The following patterns are less widely supported, but the intent
+is clear and they are useful (especially in contexts like bibliography
+entries):
+
+``` markdown
+*emph *with emph* in it*
+**strong **with strong** in it**
+```
+
+Many implementations have also restricted intraword emphasis to
+the `*` forms, to avoid unwanted emphasis in words containing
+internal underscores.  (It is best practice to put these in code
+spans, but users often do not.)
+
+``` markdown
+internal emphasis: foo*bar*baz
+no emphasis: foo_bar_baz
+```
+
+The rules given below capture all of these patterns, while allowing
+for efficient parsing strategies that do not backtrack.
+
+First, some definitions.  A [delimiter run](@) is either
+a sequence of one or more `*` characters that is not preceded or
+followed by a non-backslash-escaped `*` character, or a sequence
+of one or more `_` characters that is not preceded or followed by
+a non-backslash-escaped `_` character.
+
+A [left-flanking delimiter run](@) is
+a [delimiter run] that is (1) not followed by [Unicode whitespace],
+and either (2a) not followed by a [Unicode punctuation character], or
+(2b) followed by a [Unicode punctuation character] and
+preceded by [Unicode whitespace] or a [Unicode punctuation character].
+For purposes of this definition, the beginning and the end of
+the line count as Unicode whitespace.
+
+A [right-flanking delimiter run](@) is
+a [delimiter run] that is (1) not preceded by [Unicode whitespace],
+and either (2a) not preceded by a [Unicode punctuation character], or
+(2b) preceded by a [Unicode punctuation character] and
+followed by [Unicode whitespace] or a [Unicode punctuation character].
+For purposes of this definition, the beginning and the end of
+the line count as Unicode whitespace.
+
+Here are some examples of delimiter runs.
+
+  - left-flanking but not right-flanking:
+
+    ```
+    ***abc
+      _abc
+    **"abc"
+     _"abc"
+    ```
+
+  - right-flanking but not left-flanking:
+
+    ```
+     abc***
+     abc_
+    "abc"**
+    "abc"_
+    ```
+
+  - Both left and right-flanking:
+
+    ```
+     abc***def
+    "abc"_"def"
+    ```
+
+  - Neither left nor right-flanking:
+
+    ```
+    abc *** def
+    a _ b
+    ```
+
+(The idea of distinguishing left-flanking and right-flanking
+delimiter runs based on the character before and the character
+after comes from Roopesh Chander's
+[vfmd](http://www.vfmd.org/vfmd-spec/specification/#procedure-for-identifying-emphasis-tags).
+vfmd uses the terminology "emphasis indicator string" instead of "delimiter
+run," and its rules for distinguishing left- and right-flanking runs
+are a bit more complex than the ones given here.)
+
+The following rules define emphasis and strong emphasis:
+
+1.  A single `*` character [can open emphasis](@)
+    iff (if and only if) it is part of a [left-flanking delimiter run].
+
+2.  A single `_` character [can open emphasis] iff
+    it is part of a [left-flanking delimiter run]
+    and either (a) not part of a [right-flanking delimiter run]
+    or (b) part of a [right-flanking delimiter run]
+    preceded by a [Unicode punctuation character].
+
+3.  A single `*` character [can close emphasis](@)
+    iff it is part of a [right-flanking delimiter run].
+
+4.  A single `_` character [can close emphasis] iff
+    it is part of a [right-flanking delimiter run]
+    and either (a) not part of a [left-flanking delimiter run]
+    or (b) part of a [left-flanking delimiter run]
+    followed by a [Unicode punctuation character].
+
+5.  A double `**` [can open strong emphasis](@)
+    iff it is part of a [left-flanking delimiter run].
+
+6.  A double `__` [can open strong emphasis] iff
+    it is part of a [left-flanking delimiter run]
+    and either (a) not part of a [right-flanking delimiter run]
+    or (b) part of a [right-flanking delimiter run]
+    preceded by a [Unicode punctuation character].
+
+7.  A double `**` [can close strong emphasis](@)
+    iff it is part of a [right-flanking delimiter run].
+
+8.  A double `__` [can close strong emphasis] iff
+    it is part of a [right-flanking delimiter run]
+    and either (a) not part of a [left-flanking delimiter run]
+    or (b) part of a [left-flanking delimiter run]
+    followed by a [Unicode punctuation character].
+
+9.  Emphasis begins with a delimiter that [can open emphasis] and ends
+    with a delimiter that [can close emphasis], and that uses the same
+    character (`_` or `*`) as the opening delimiter.  The
+    opening and closing delimiters must belong to separate
+    [delimiter runs].  If one of the delimiters can both
+    open and close emphasis, then the sum of the lengths of the
+    delimiter runs containing the opening and closing delimiters
+    must not be a multiple of 3 unless both lengths are
+    multiples of 3.
+
+10. Strong emphasis begins with a delimiter that
+    [can open strong emphasis] and ends with a delimiter that
+    [can close strong emphasis], and that uses the same character
+    (`_` or `*`) as the opening delimiter.  The
+    opening and closing delimiters must belong to separate
+    [delimiter runs].  If one of the delimiters can both open
+    and close strong emphasis, then the sum of the lengths of
+    the delimiter runs containing the opening and closing
+    delimiters must not be a multiple of 3 unless both lengths
+    are multiples of 3.
+
+11. A literal `*` character cannot occur at the beginning or end of
+    `*`-delimited emphasis or `**`-delimited strong emphasis, unless it
+    is backslash-escaped.
+
+12. A literal `_` character cannot occur at the beginning or end of
+    `_`-delimited emphasis or `__`-delimited strong emphasis, unless it
+    is backslash-escaped.
+
+Where rules 1--12 above are compatible with multiple parsings,
+the following principles resolve ambiguity:
+
+13. The number of nestings should be minimized. Thus, for example,
+    an interpretation `<strong>...</strong>` is always preferred to
+    `<em><em>...</em></em>`.
+
+14. An interpretation `<em><strong>...</strong></em>` is always
+    preferred to `<strong><em>...</em></strong>`.
+
+15. When two potential emphasis or strong emphasis spans overlap,
+    so that the second begins before the first ends and ends after
+    the first ends, the first takes precedence. Thus, for example,
+    `*foo _bar* baz_` is parsed as `<em>foo _bar</em> baz_` rather
+    than `*foo <em>bar* baz</em>`.
+
+16. When there are two potential emphasis or strong emphasis spans
+    with the same closing delimiter, the shorter one (the one that
+    opens later) takes precedence. Thus, for example,
+    `**foo **bar baz**` is parsed as `**foo <strong>bar baz</strong>`
+    rather than `<strong>foo **bar baz</strong>`.
+
+17. Inline code spans, links, images, and HTML tags group more tightly
+    than emphasis.  So, when there is a choice between an interpretation
+    that contains one of these elements and one that does not, the
+    former always wins.  Thus, for example, `*[foo*](bar)` is
+    parsed as `*<a href="bar">foo*</a>` rather than as
+    `<em>[foo</em>](bar)`.
+
+These rules can be illustrated through a series of examples.
+
+Rule 1:
+
+```````````````````````````````` example
+*foo bar*
+.
+<p><em>foo bar</em></p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `*` is followed by
+whitespace, and hence not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a * foo bar*
+.
+<p>a * foo bar*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `*` is preceded
+by an alphanumeric and followed by punctuation, and hence
+not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a*"foo"*
+.
+<p>a*&quot;foo&quot;*</p>
+````````````````````````````````
+
+
+Unicode nonbreaking spaces count as whitespace, too:
+
+```````````````````````````````` example
+* a *
+.
+<p>* a *</p>
+````````````````````````````````
+
+
+Intraword emphasis with `*` is permitted:
+
+```````````````````````````````` example
+foo*bar*
+.
+<p>foo<em>bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5*6*78
+.
+<p>5<em>6</em>78</p>
+````````````````````````````````
+
+
+Rule 2:
+
+```````````````````````````````` example
+_foo bar_
+.
+<p><em>foo bar</em></p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `_` is followed by
+whitespace:
+
+```````````````````````````````` example
+_ foo bar_
+.
+<p>_ foo bar_</p>
+````````````````````````````````
+
+
+This is not emphasis, because the opening `_` is preceded
+by an alphanumeric and followed by punctuation:
+
+```````````````````````````````` example
+a_"foo"_
+.
+<p>a_&quot;foo&quot;_</p>
+````````````````````````````````
+
+
+Emphasis with `_` is not allowed inside words:
+
+```````````````````````````````` example
+foo_bar_
+.
+<p>foo_bar_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5_6_78
+.
+<p>5_6_78</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+пристаням_стремятся_
+.
+<p>пристаням_стремятся_</p>
+````````````````````````````````
+
+
+Here `_` does not generate emphasis, because the first delimiter run
+is right-flanking and the second left-flanking:
+
+```````````````````````````````` example
+aa_"bb"_cc
+.
+<p>aa_&quot;bb&quot;_cc</p>
+````````````````````````````````
+
+
+This is emphasis, even though the opening delimiter is
+both left- and right-flanking, because it is preceded by
+punctuation:
+
+```````````````````````````````` example
+foo-_(bar)_
+.
+<p>foo-<em>(bar)</em></p>
+````````````````````````````````
+
+
+Rule 3:
+
+This is not emphasis, because the closing delimiter does
+not match the opening delimiter:
+
+```````````````````````````````` example
+_foo*
+.
+<p>_foo*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the closing `*` is preceded by
+whitespace:
+
+```````````````````````````````` example
+*foo bar *
+.
+<p>*foo bar *</p>
+````````````````````````````````
+
+
+A line ending also counts as whitespace:
+
+```````````````````````````````` example
+*foo bar
+*
+.
+<p>*foo bar
+*</p>
+````````````````````````````````
+
+
+This is not emphasis, because the second `*` is
+preceded by punctuation and followed by an alphanumeric
+(hence it is not part of a [right-flanking delimiter run]:
+
+```````````````````````````````` example
+*(*foo)
+.
+<p>*(*foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with this example:
+
+```````````````````````````````` example
+*(*foo*)*
+.
+<p><em>(<em>foo</em>)</em></p>
+````````````````````````````````
+
+
+Intraword emphasis with `*` is allowed:
+
+```````````````````````````````` example
+*foo*bar
+.
+<p><em>foo</em>bar</p>
+````````````````````````````````
+
+
+
+Rule 4:
+
+This is not emphasis, because the closing `_` is preceded by
+whitespace:
+
+```````````````````````````````` example
+_foo bar _
+.
+<p>_foo bar _</p>
+````````````````````````````````
+
+
+This is not emphasis, because the second `_` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+_(_foo)
+.
+<p>_(_foo)</p>
+````````````````````````````````
+
+
+This is emphasis within emphasis:
+
+```````````````````````````````` example
+_(_foo_)_
+.
+<p><em>(<em>foo</em>)</em></p>
+````````````````````````````````
+
+
+Intraword emphasis is disallowed for `_`:
+
+```````````````````````````````` example
+_foo_bar
+.
+<p>_foo_bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_пристаням_стремятся
+.
+<p>_пристаням_стремятся</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo_bar_baz_
+.
+<p><em>foo_bar_baz</em></p>
+````````````````````````````````
+
+
+This is emphasis, even though the closing delimiter is
+both left- and right-flanking, because it is followed by
+punctuation:
+
+```````````````````````````````` example
+_(bar)_.
+.
+<p><em>(bar)</em>.</p>
+````````````````````````````````
+
+
+Rule 5:
+
+```````````````````````````````` example
+**foo bar**
+.
+<p><strong>foo bar</strong></p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening delimiter is
+followed by whitespace:
+
+```````````````````````````````` example
+** foo bar**
+.
+<p>** foo bar**</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening `**` is preceded
+by an alphanumeric and followed by punctuation, and hence
+not part of a [left-flanking delimiter run]:
+
+```````````````````````````````` example
+a**"foo"**
+.
+<p>a**&quot;foo&quot;**</p>
+````````````````````````````````
+
+
+Intraword strong emphasis with `**` is permitted:
+
+```````````````````````````````` example
+foo**bar**
+.
+<p>foo<strong>bar</strong></p>
+````````````````````````````````
+
+
+Rule 6:
+
+```````````````````````````````` example
+__foo bar__
+.
+<p><strong>foo bar</strong></p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening delimiter is
+followed by whitespace:
+
+```````````````````````````````` example
+__ foo bar__
+.
+<p>__ foo bar__</p>
+````````````````````````````````
+
+
+A line ending counts as whitespace:
+```````````````````````````````` example
+__
+foo bar__
+.
+<p>__
+foo bar__</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the opening `__` is preceded
+by an alphanumeric and followed by punctuation:
+
+```````````````````````````````` example
+a__"foo"__
+.
+<p>a__&quot;foo&quot;__</p>
+````````````````````````````````
+
+
+Intraword strong emphasis is forbidden with `__`:
+
+```````````````````````````````` example
+foo__bar__
+.
+<p>foo__bar__</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+5__6__78
+.
+<p>5__6__78</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+пристаням__стремятся__
+.
+<p>пристаням__стремятся__</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo, __bar__, baz__
+.
+<p><strong>foo, <strong>bar</strong>, baz</strong></p>
+````````````````````````````````
+
+
+This is strong emphasis, even though the opening delimiter is
+both left- and right-flanking, because it is preceded by
+punctuation:
+
+```````````````````````````````` example
+foo-__(bar)__
+.
+<p>foo-<strong>(bar)</strong></p>
+````````````````````````````````
+
+
+
+Rule 7:
+
+This is not strong emphasis, because the closing delimiter is preceded
+by whitespace:
+
+```````````````````````````````` example
+**foo bar **
+.
+<p>**foo bar **</p>
+````````````````````````````````
+
+
+(Nor can it be interpreted as an emphasized `*foo bar *`, because of
+Rule 11.)
+
+This is not strong emphasis, because the second `**` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+**(**foo)
+.
+<p>**(**foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with these examples:
+
+```````````````````````````````` example
+*(**foo**)*
+.
+<p><em>(<strong>foo</strong>)</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**Gomphocarpus (*Gomphocarpus physocarpus*, syn.
+*Asclepias physocarpa*)**
+.
+<p><strong>Gomphocarpus (<em>Gomphocarpus physocarpus</em>, syn.
+<em>Asclepias physocarpa</em>)</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo "*bar*" foo**
+.
+<p><strong>foo &quot;<em>bar</em>&quot; foo</strong></p>
+````````````````````````````````
+
+
+Intraword emphasis:
+
+```````````````````````````````` example
+**foo**bar
+.
+<p><strong>foo</strong>bar</p>
+````````````````````````````````
+
+
+Rule 8:
+
+This is not strong emphasis, because the closing delimiter is
+preceded by whitespace:
+
+```````````````````````````````` example
+__foo bar __
+.
+<p>__foo bar __</p>
+````````````````````````````````
+
+
+This is not strong emphasis, because the second `__` is
+preceded by punctuation and followed by an alphanumeric:
+
+```````````````````````````````` example
+__(__foo)
+.
+<p>__(__foo)</p>
+````````````````````````````````
+
+
+The point of this restriction is more easily appreciated
+with this example:
+
+```````````````````````````````` example
+_(__foo__)_
+.
+<p><em>(<strong>foo</strong>)</em></p>
+````````````````````````````````
+
+
+Intraword strong emphasis is forbidden with `__`:
+
+```````````````````````````````` example
+__foo__bar
+.
+<p>__foo__bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__пристаням__стремятся
+.
+<p>__пристаням__стремятся</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo__bar__baz__
+.
+<p><strong>foo__bar__baz</strong></p>
+````````````````````````````````
+
+
+This is strong emphasis, even though the closing delimiter is
+both left- and right-flanking, because it is followed by
+punctuation:
+
+```````````````````````````````` example
+__(bar)__.
+.
+<p><strong>(bar)</strong>.</p>
+````````````````````````````````
+
+
+Rule 9:
+
+Any nonempty sequence of inline elements can be the contents of an
+emphasized span.
+
+```````````````````````````````` example
+*foo [bar](/url)*
+.
+<p><em>foo <a href="/url">bar</a></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo
+bar*
+.
+<p><em>foo
+bar</em></p>
+````````````````````````````````
+
+
+In particular, emphasis and strong emphasis can be nested
+inside emphasis:
+
+```````````````````````````````` example
+_foo __bar__ baz_
+.
+<p><em>foo <strong>bar</strong> baz</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo _bar_ baz_
+.
+<p><em>foo <em>bar</em> baz</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo_ bar_
+.
+<p><em><em>foo</em> bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo *bar**
+.
+<p><em>foo <em>bar</em></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo **bar** baz*
+.
+<p><em>foo <strong>bar</strong> baz</em></p>
+````````````````````````````````
+
+```````````````````````````````` example
+*foo**bar**baz*
+.
+<p><em>foo<strong>bar</strong>baz</em></p>
+````````````````````````````````
+
+Note that in the preceding case, the interpretation
+
+``` markdown
+<p><em>foo</em><em>bar<em></em>baz</em></p>
+```
+
+
+is precluded by the condition that a delimiter that
+can both open and close (like the `*` after `foo`)
+cannot form emphasis if the sum of the lengths of
+the delimiter runs containing the opening and
+closing delimiters is a multiple of 3 unless
+both lengths are multiples of 3.
+
+
+For the same reason, we don't get two consecutive
+emphasis sections in this example:
+
+```````````````````````````````` example
+*foo**bar*
+.
+<p><em>foo**bar</em></p>
+````````````````````````````````
+
+
+The same condition ensures that the following
+cases are all strong emphasis nested inside
+emphasis, even when the interior whitespace is
+omitted:
+
+
+```````````````````````````````` example
+***foo** bar*
+.
+<p><em><strong>foo</strong> bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo **bar***
+.
+<p><em>foo <strong>bar</strong></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo**bar***
+.
+<p><em>foo<strong>bar</strong></em></p>
+````````````````````````````````
+
+
+When the lengths of the interior closing and opening
+delimiter runs are *both* multiples of 3, though,
+they can match to create emphasis:
+
+```````````````````````````````` example
+foo***bar***baz
+.
+<p>foo<em><strong>bar</strong></em>baz</p>
+````````````````````````````````
+
+```````````````````````````````` example
+foo******bar*********baz
+.
+<p>foo<strong><strong><strong>bar</strong></strong></strong>***baz</p>
+````````````````````````````````
+
+
+Indefinite levels of nesting are possible:
+
+```````````````````````````````` example
+*foo **bar *baz* bim** bop*
+.
+<p><em>foo <strong>bar <em>baz</em> bim</strong> bop</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo [*bar*](/url)*
+.
+<p><em>foo <a href="/url"><em>bar</em></a></em></p>
+````````````````````````````````
+
+
+There can be no empty emphasis or strong emphasis:
+
+```````````````````````````````` example
+** is not an empty emphasis
+.
+<p>** is not an empty emphasis</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**** is not an empty strong emphasis
+.
+<p>**** is not an empty strong emphasis</p>
+````````````````````````````````
+
+
+
+Rule 10:
+
+Any nonempty sequence of inline elements can be the contents of an
+strongly emphasized span.
+
+```````````````````````````````` example
+**foo [bar](/url)**
+.
+<p><strong>foo <a href="/url">bar</a></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo
+bar**
+.
+<p><strong>foo
+bar</strong></p>
+````````````````````````````````
+
+
+In particular, emphasis and strong emphasis can be nested
+inside strong emphasis:
+
+```````````````````````````````` example
+__foo _bar_ baz__
+.
+<p><strong>foo <em>bar</em> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo __bar__ baz__
+.
+<p><strong>foo <strong>bar</strong> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo__ bar__
+.
+<p><strong><strong>foo</strong> bar</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo **bar****
+.
+<p><strong>foo <strong>bar</strong></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo *bar* baz**
+.
+<p><strong>foo <em>bar</em> baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo*bar*baz**
+.
+<p><strong>foo<em>bar</em>baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+***foo* bar**
+.
+<p><strong><em>foo</em> bar</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo *bar***
+.
+<p><strong>foo <em>bar</em></strong></p>
+````````````````````````````````
+
+
+Indefinite levels of nesting are possible:
+
+```````````````````````````````` example
+**foo *bar **baz**
+bim* bop**
+.
+<p><strong>foo <em>bar <strong>baz</strong>
+bim</em> bop</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo [*bar*](/url)**
+.
+<p><strong>foo <a href="/url"><em>bar</em></a></strong></p>
+````````````````````````````````
+
+
+There can be no empty emphasis or strong emphasis:
+
+```````````````````````````````` example
+__ is not an empty emphasis
+.
+<p>__ is not an empty emphasis</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____ is not an empty strong emphasis
+.
+<p>____ is not an empty strong emphasis</p>
+````````````````````````````````
+
+
+
+Rule 11:
+
+```````````````````````````````` example
+foo ***
+.
+<p>foo ***</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *\**
+.
+<p>foo <em>*</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *_*
+.
+<p>foo <em>_</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo *****
+.
+<p>foo *****</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo **\***
+.
+<p>foo <strong>*</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo **_**
+.
+<p>foo <strong>_</strong></p>
+````````````````````````````````
+
+
+Note that when delimiters do not match evenly, Rule 11 determines
+that the excess literal `*` characters will appear outside of the
+emphasis, rather than inside it:
+
+```````````````````````````````` example
+**foo*
+.
+<p>*<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo**
+.
+<p><em>foo</em>*</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+***foo**
+.
+<p>*<strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+****foo*
+.
+<p>***<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**foo***
+.
+<p><strong>foo</strong>*</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo****
+.
+<p><em>foo</em>***</p>
+````````````````````````````````
+
+
+
+Rule 12:
+
+```````````````````````````````` example
+foo ___
+.
+<p>foo ___</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _\__
+.
+<p>foo <em>_</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _*_
+.
+<p>foo <em>*</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo _____
+.
+<p>foo _____</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo __\___
+.
+<p>foo <strong>_</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo __*__
+.
+<p>foo <strong>*</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo_
+.
+<p>_<em>foo</em></p>
+````````````````````````````````
+
+
+Note that when delimiters do not match evenly, Rule 12 determines
+that the excess literal `_` characters will appear outside of the
+emphasis, rather than inside it:
+
+```````````````````````````````` example
+_foo__
+.
+<p><em>foo</em>_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+___foo__
+.
+<p>_<strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo_
+.
+<p>___<em>foo</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo___
+.
+<p><strong>foo</strong>_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo____
+.
+<p><em>foo</em>___</p>
+````````````````````````````````
+
+
+Rule 13 implies that if you want emphasis nested directly inside
+emphasis, you must use different delimiters:
+
+```````````````````````````````` example
+**foo**
+.
+<p><strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*_foo_*
+.
+<p><em><em>foo</em></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__foo__
+.
+<p><strong>foo</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_*foo*_
+.
+<p><em><em>foo</em></em></p>
+````````````````````````````````
+
+
+However, strong emphasis within strong emphasis is possible without
+switching delimiters:
+
+```````````````````````````````` example
+****foo****
+.
+<p><strong><strong>foo</strong></strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+____foo____
+.
+<p><strong><strong>foo</strong></strong></p>
+````````````````````````````````
+
+
+
+Rule 13 can be applied to arbitrarily long sequences of
+delimiters:
+
+```````````````````````````````` example
+******foo******
+.
+<p><strong><strong><strong>foo</strong></strong></strong></p>
+````````````````````````````````
+
+
+Rule 14:
+
+```````````````````````````````` example
+***foo***
+.
+<p><em><strong>foo</strong></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_____foo_____
+.
+<p><em><strong><strong>foo</strong></strong></em></p>
+````````````````````````````````
+
+
+Rule 15:
+
+```````````````````````````````` example
+*foo _bar* baz_
+.
+<p><em>foo _bar</em> baz_</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo __bar *baz bim__ bam*
+.
+<p><em>foo <strong>bar *baz bim</strong> bam</em></p>
+````````````````````````````````
+
+
+Rule 16:
+
+```````````````````````````````` example
+**foo **bar baz**
+.
+<p>**foo <strong>bar baz</strong></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo *bar baz*
+.
+<p>*foo <em>bar baz</em></p>
+````````````````````````````````
+
+
+Rule 17:
+
+```````````````````````````````` example
+*[bar*](/url)
+.
+<p>*<a href="/url">bar*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_foo [bar_](/url)
+.
+<p>_foo <a href="/url">bar_</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*<img src="foo" title="*"/>
+.
+<p>*<img src="foo" title="*"/></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**<a href="**">
+.
+<p>**<a href="**"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__<a href="__">
+.
+<p>__<a href="__"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*a `*`*
+.
+<p><em>a <code>*</code></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+_a `_`_
+.
+<p><em>a <code>_</code></em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+**a<http://foo.bar/?q=**>
+.
+<p>**a<a href="http://foo.bar/?q=**">http://foo.bar/?q=**</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+__a<http://foo.bar/?q=__>
+.
+<p>__a<a href="http://foo.bar/?q=__">http://foo.bar/?q=__</a></p>
+````````````````````````````````
+
+
+
+## Links
+
+A link contains [link text] (the visible text), a [link destination]
+(the URI that is the link destination), and optionally a [link title].
+There are two basic kinds of links in Markdown.  In [inline links] the
+destination and title are given immediately after the link text.  In
+[reference links] the destination and title are defined elsewhere in
+the document.
+
+A [link text](@) consists of a sequence of zero or more
+inline elements enclosed by square brackets (`[` and `]`).  The
+following rules apply:
+
+- Links may not contain other links, at any level of nesting. If
+  multiple otherwise valid link definitions appear nested inside each
+  other, the inner-most definition is used.
+
+- Brackets are allowed in the [link text] only if (a) they
+  are backslash-escaped or (b) they appear as a matched pair of brackets,
+  with an open bracket `[`, a sequence of zero or more inlines, and
+  a close bracket `]`.
+
+- Backtick [code spans], [autolinks], and raw [HTML tags] bind more tightly
+  than the brackets in link text.  Thus, for example,
+  `` [foo`]` `` could not be a link text, since the second `]`
+  is part of a code span.
+
+- The brackets in link text bind more tightly than markers for
+  [emphasis and strong emphasis]. Thus, for example, `*[foo*](url)` is a link.
+
+A [link destination](@) consists of either
+
+- a sequence of zero or more characters between an opening `<` and a
+  closing `>` that contains no line endings or unescaped
+  `<` or `>` characters, or
+
+- a nonempty sequence of characters that does not start with `<`,
+  does not include [ASCII control characters][ASCII control character]
+  or [space] character, and includes parentheses only if (a) they are
+  backslash-escaped or (b) they are part of a balanced pair of
+  unescaped parentheses.
+  (Implementations may impose limits on parentheses nesting to
+  avoid performance issues, but at least three levels of nesting
+  should be supported.)
+
+A [link title](@)  consists of either
+
+- a sequence of zero or more characters between straight double-quote
+  characters (`"`), including a `"` character only if it is
+  backslash-escaped, or
+
+- a sequence of zero or more characters between straight single-quote
+  characters (`'`), including a `'` character only if it is
+  backslash-escaped, or
+
+- a sequence of zero or more characters between matching parentheses
+  (`(...)`), including a `(` or `)` character only if it is
+  backslash-escaped.
+
+Although [link titles] may span multiple lines, they may not contain
+a [blank line].
+
+An [inline link](@) consists of a [link text] followed immediately
+by a left parenthesis `(`, an optional [link destination], an optional
+[link title], and a right parenthesis `)`.
+These four components may be separated by spaces, tabs, and up to one line
+ending.
+If both [link destination] and [link title] are present, they *must* be
+separated by spaces, tabs, and up to one line ending.
+
+The link's text consists of the inlines contained
+in the [link text] (excluding the enclosing square brackets).
+The link's URI consists of the link destination, excluding enclosing
+`<...>` if present, with backslash-escapes in effect as described
+above.  The link's title consists of the link title, excluding its
+enclosing delimiters, with backslash-escapes in effect as described
+above.
+
+Here is a simple inline link:
+
+```````````````````````````````` example
+[link](/uri "title")
+.
+<p><a href="/uri" title="title">link</a></p>
+````````````````````````````````
+
+
+The title, the link text and even 
+the destination may be omitted:
+
+```````````````````````````````` example
+[link](/uri)
+.
+<p><a href="/uri">link</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[](./target.md)
+.
+<p><a href="./target.md"></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link]()
+.
+<p><a href="">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<>)
+.
+<p><a href="">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[]()
+.
+<p><a href=""></a></p>
+````````````````````````````````
+
+The destination can only contain spaces if it is
+enclosed in pointy brackets:
+
+```````````````````````````````` example
+[link](/my uri)
+.
+<p>[link](/my uri)</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[link](</my uri>)
+.
+<p><a href="/my%20uri">link</a></p>
+````````````````````````````````
+
+The destination cannot contain line endings,
+even if enclosed in pointy brackets:
+
+```````````````````````````````` example
+[link](foo
+bar)
+.
+<p>[link](foo
+bar)</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[link](<foo
+bar>)
+.
+<p>[link](<foo
+bar>)</p>
+````````````````````````````````
+
+The destination can contain `)` if it is enclosed
+in pointy brackets:
+
+```````````````````````````````` example
+[a](<b)c>)
+.
+<p><a href="b)c">a</a></p>
+````````````````````````````````
+
+Pointy brackets that enclose links must be unescaped:
+
+```````````````````````````````` example
+[link](<foo\>)
+.
+<p>[link](&lt;foo&gt;)</p>
+````````````````````````````````
+
+These are not links, because the opening pointy bracket
+is not matched properly:
+
+```````````````````````````````` example
+[a](<b)c
+[a](<b)c>
+[a](<b>c)
+.
+<p>[a](&lt;b)c
+[a](&lt;b)c&gt;
+[a](<b>c)</p>
+````````````````````````````````
+
+Parentheses inside the link destination may be escaped:
+
+```````````````````````````````` example
+[link](\(foo\))
+.
+<p><a href="(foo)">link</a></p>
+````````````````````````````````
+
+Any number of parentheses are allowed without escaping, as long as they are
+balanced:
+
+```````````````````````````````` example
+[link](foo(and(bar)))
+.
+<p><a href="foo(and(bar))">link</a></p>
+````````````````````````````````
+
+However, if you have unbalanced parentheses, you need to escape or use the
+`<...>` form:
+
+```````````````````````````````` example
+[link](foo(and(bar))
+.
+<p>[link](foo(and(bar))</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](foo\(and\(bar\))
+.
+<p><a href="foo(and(bar)">link</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link](<foo(and(bar)>)
+.
+<p><a href="foo(and(bar)">link</a></p>
+````````````````````````````````
+
+
+Parentheses and other symbols can also be escaped, as usual
+in Markdown:
+
+```````````````````````````````` example
+[link](foo\)\:)
+.
+<p><a href="foo):">link</a></p>
+````````````````````````````````
+
+
+A link can contain fragment identifiers and queries:
+
+```````````````````````````````` example
+[link](#fragment)
+
+[link](http://example.com#fragment)
+
+[link](http://example.com?foo=3#frag)
+.
+<p><a href="#fragment">link</a></p>
+<p><a href="http://example.com#fragment">link</a></p>
+<p><a href="http://example.com?foo=3#frag">link</a></p>
+````````````````````````````````
+
+
+Note that a backslash before a non-escapable character is
+just a backslash:
+
+```````````````````````````````` example
+[link](foo\bar)
+.
+<p><a href="foo%5Cbar">link</a></p>
+````````````````````````````````
+
+
+URL-escaping should be left alone inside the destination, as all
+URL-escaped characters are also valid URL characters. Entity and
+numerical character references in the destination will be parsed
+into the corresponding Unicode code points, as usual.  These may
+be optionally URL-escaped when written as HTML, but this spec
+does not enforce any particular policy for rendering URLs in
+HTML or other formats.  Renderers may make different decisions
+about how to escape or normalize URLs in the output.
+
+```````````````````````````````` example
+[link](foo%20b&auml;)
+.
+<p><a href="foo%20b%C3%A4">link</a></p>
+````````````````````````````````
+
+
+Note that, because titles can often be parsed as destinations,
+if you try to omit the destination and keep the title, you'll
+get unexpected results:
+
+```````````````````````````````` example
+[link]("title")
+.
+<p><a href="%22title%22">link</a></p>
+````````````````````````````````
+
+
+Titles may be in single quotes, double quotes, or parentheses:
+
+```````````````````````````````` example
+[link](/url "title")
+[link](/url 'title')
+[link](/url (title))
+.
+<p><a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a>
+<a href="/url" title="title">link</a></p>
+````````````````````````````````
+
+
+Backslash escapes and entity and numeric character references
+may be used in titles:
+
+```````````````````````````````` example
+[link](/url "title \"&quot;")
+.
+<p><a href="/url" title="title &quot;&quot;">link</a></p>
+````````````````````````````````
+
+
+Titles must be separated from the link using spaces, tabs, and up to one line
+ending.
+Other [Unicode whitespace] like non-breaking space doesn't work.
+
+```````````````````````````````` example
+[link](/url "title")
+.
+<p><a href="/url%C2%A0%22title%22">link</a></p>
+````````````````````````````````
+
+
+Nested balanced quotes are not allowed without escaping:
+
+```````````````````````````````` example
+[link](/url "title "and" title")
+.
+<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>
+````````````````````````````````
+
+
+But it is easy to work around this by using a different quote type:
+
+```````````````````````````````` example
+[link](/url 'title "and" title')
+.
+<p><a href="/url" title="title &quot;and&quot; title">link</a></p>
+````````````````````````````````
+
+
+(Note:  `Markdown.pl` did allow double quotes inside a double-quoted
+title, and its test suite included a test demonstrating this.
+But it is hard to see a good rationale for the extra complexity this
+brings, since there are already many ways---backslash escaping,
+entity and numeric character references, or using a different
+quote type for the enclosing title---to write titles containing
+double quotes.  `Markdown.pl`'s handling of titles has a number
+of other strange features.  For example, it allows single-quoted
+titles in inline links, but not reference links.  And, in
+reference links but not inline links, it allows a title to begin
+with `"` and end with `)`.  `Markdown.pl` 1.0.1 even allows
+titles with no closing quotation mark, though 1.0.2b8 does not.
+It seems preferable to adopt a simple, rational rule that works
+the same way in inline links and link reference definitions.)
+
+Spaces, tabs, and up to one line ending is allowed around the destination and
+title:
+
+```````````````````````````````` example
+[link](   /uri
+  "title"  )
+.
+<p><a href="/uri" title="title">link</a></p>
+````````````````````````````````
+
+
+But it is not allowed between the link text and the
+following parenthesis:
+
+```````````````````````````````` example
+[link] (/uri)
+.
+<p>[link] (/uri)</p>
+````````````````````````````````
+
+
+The link text may contain balanced brackets, but not unbalanced ones,
+unless they are escaped:
+
+```````````````````````````````` example
+[link [foo [bar]]](/uri)
+.
+<p><a href="/uri">link [foo [bar]]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link] bar](/uri)
+.
+<p>[link] bar](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link [bar](/uri)
+.
+<p>[link <a href="/uri">bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link \[bar](/uri)
+.
+<p><a href="/uri">link [bar</a></p>
+````````````````````````````````
+
+
+The link text may contain inline content:
+
+```````````````````````````````` example
+[link *foo **bar** `#`*](/uri)
+.
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[![moon](moon.jpg)](/uri)
+.
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+````````````````````````````````
+
+
+However, links may not contain other links, at any level of nesting.
+
+```````````````````````````````` example
+[foo [bar](/uri)](/uri)
+.
+<p>[foo <a href="/uri">bar</a>](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *[bar [baz](/uri)](/uri)*](/uri)
+.
+<p>[foo <em>[bar <a href="/uri">baz</a>](/uri)</em>](/uri)</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![[[foo](uri1)](uri2)](uri3)
+.
+<p><img src="uri3" alt="[foo](uri2)" /></p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of link text grouping over
+emphasis grouping:
+
+```````````````````````````````` example
+*[foo*](/uri)
+.
+<p>*<a href="/uri">foo*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar](baz*)
+.
+<p><a href="baz*">foo *bar</a></p>
+````````````````````````````````
+
+
+Note that brackets that *aren't* part of links do not take
+precedence:
+
+```````````````````````````````` example
+*foo [bar* baz]
+.
+<p><em>foo [bar</em> baz]</p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of HTML tags, code spans,
+and autolinks over link grouping:
+
+```````````````````````````````` example
+[foo <bar attr="](baz)">
+.
+<p>[foo <bar attr="](baz)"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo`](/uri)`
+.
+<p>[foo<code>](/uri)</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo<http://example.com/?search=](uri)>
+.
+<p>[foo<a href="http://example.com/?search=%5D(uri)">http://example.com/?search=](uri)</a></p>
+````````````````````````````````
+
+
+There are three kinds of [reference link](@)s:
+[full](#full-reference-link), [collapsed](#collapsed-reference-link),
+and [shortcut](#shortcut-reference-link).
+
+A [full reference link](@)
+consists of a [link text] immediately followed by a [link label]
+that [matches] a [link reference definition] elsewhere in the document.
+
+A [link label](@)  begins with a left bracket (`[`) and ends
+with the first right bracket (`]`) that is not backslash-escaped.
+Between these brackets there must be at least one character that is not a space,
+tab, or line ending.
+Unescaped square bracket characters are not allowed inside the
+opening and closing square brackets of [link labels].  A link
+label can have at most 999 characters inside the square
+brackets.
+
+One label [matches](@)
+another just in case their normalized forms are equal.  To normalize a
+label, strip off the opening and closing brackets,
+perform the *Unicode case fold*, strip leading and trailing
+spaces, tabs, and line endings, and collapse consecutive internal
+spaces, tabs, and line endings to a single space.  If there are multiple
+matching reference link definitions, the one that comes first in the
+document is used.  (It is desirable in such cases to emit a warning.)
+
+The link's URI and title are provided by the matching [link
+reference definition].
+
+Here is a simple example:
+
+```````````````````````````````` example
+[foo][bar]
+
+[bar]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+The rules for the [link text] are the same as with
+[inline links].  Thus:
+
+The link text may contain balanced brackets, but not unbalanced ones,
+unless they are escaped:
+
+```````````````````````````````` example
+[link [foo [bar]]][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link [foo [bar]]</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[link \[bar][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link [bar</a></p>
+````````````````````````````````
+
+
+The link text may contain inline content:
+
+```````````````````````````````` example
+[link *foo **bar** `#`*][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[![moon](moon.jpg)][ref]
+
+[ref]: /uri
+.
+<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
+````````````````````````````````
+
+
+However, links may not contain other links, at any level of nesting.
+
+```````````````````````````````` example
+[foo [bar](/uri)][ref]
+
+[ref]: /uri
+.
+<p>[foo <a href="/uri">bar</a>]<a href="/uri">ref</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar [baz][ref]*][ref]
+
+[ref]: /uri
+.
+<p>[foo <em>bar <a href="/uri">baz</a></em>]<a href="/uri">ref</a></p>
+````````````````````````````````
+
+
+(In the examples above, we have two [shortcut reference links]
+instead of one [full reference link].)
+
+The following cases illustrate the precedence of link text grouping over
+emphasis grouping:
+
+```````````````````````````````` example
+*[foo*][ref]
+
+[ref]: /uri
+.
+<p>*<a href="/uri">foo*</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo *bar][ref]*
+
+[ref]: /uri
+.
+<p><a href="/uri">foo *bar</a>*</p>
+````````````````````````````````
+
+
+These cases illustrate the precedence of HTML tags, code spans,
+and autolinks over link grouping:
+
+```````````````````````````````` example
+[foo <bar attr="][ref]">
+
+[ref]: /uri
+.
+<p>[foo <bar attr="][ref]"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo`][ref]`
+
+[ref]: /uri
+.
+<p>[foo<code>][ref]</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo<http://example.com/?search=][ref]>
+
+[ref]: /uri
+.
+<p>[foo<a href="http://example.com/?search=%5D%5Bref%5D">http://example.com/?search=][ref]</a></p>
+````````````````````````````````
+
+
+Matching is case-insensitive:
+
+```````````````````````````````` example
+[foo][BaR]
+
+[bar]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+Unicode case fold is used:
+
+```````````````````````````````` example
+[ẞ]
+
+[SS]: /url
+.
+<p><a href="/url">ẞ</a></p>
+````````````````````````````````
+
+
+Consecutive internal spaces, tabs, and line endings are treated as one space for
+purposes of determining matching:
+
+```````````````````````````````` example
+[Foo
+  bar]: /url
+
+[Baz][Foo bar]
+.
+<p><a href="/url">Baz</a></p>
+````````````````````````````````
+
+
+No spaces, tabs, or line endings are allowed between the [link text] and the
+[link label]:
+
+```````````````````````````````` example
+[foo] [bar]
+
+[bar]: /url "title"
+.
+<p>[foo] <a href="/url" title="title">bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo]
+[bar]
+
+[bar]: /url "title"
+.
+<p>[foo]
+<a href="/url" title="title">bar</a></p>
+````````````````````````````````
+
+
+This is a departure from John Gruber's original Markdown syntax
+description, which explicitly allows whitespace between the link
+text and the link label.  It brings reference links in line with
+[inline links], which (according to both original Markdown and
+this spec) cannot have whitespace after the link text.  More
+importantly, it prevents inadvertent capture of consecutive
+[shortcut reference links]. If whitespace is allowed between the
+link text and the link label, then in the following we will have
+a single reference link, not two shortcut reference links, as
+intended:
+
+``` markdown
+[foo]
+[bar]
+
+[foo]: /url1
+[bar]: /url2
+```
+
+(Note that [shortcut reference links] were introduced by Gruber
+himself in a beta version of `Markdown.pl`, but never included
+in the official syntax description.  Without shortcut reference
+links, it is harmless to allow space between the link text and
+link label; but once shortcut references are introduced, it is
+too dangerous to allow this, as it frequently leads to
+unintended results.)
+
+When there are multiple matching [link reference definitions],
+the first is used:
+
+```````````````````````````````` example
+[foo]: /url1
+
+[foo]: /url2
+
+[bar][foo]
+.
+<p><a href="/url1">bar</a></p>
+````````````````````````````````
+
+
+Note that matching is performed on normalized strings, not parsed
+inline content.  So the following does not match, even though the
+labels define equivalent inline content:
+
+```````````````````````````````` example
+[bar][foo\!]
+
+[foo!]: /url
+.
+<p>[bar][foo!]</p>
+````````````````````````````````
+
+
+[Link labels] cannot contain brackets, unless they are
+backslash-escaped:
+
+```````````````````````````````` example
+[foo][ref[]
+
+[ref[]: /uri
+.
+<p>[foo][ref[]</p>
+<p>[ref[]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo][ref[bar]]
+
+[ref[bar]]: /uri
+.
+<p>[foo][ref[bar]]</p>
+<p>[ref[bar]]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[[foo]]]
+
+[[[foo]]]: /url
+.
+<p>[[[foo]]]</p>
+<p>[[[foo]]]: /url</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[foo][ref\[]
+
+[ref\[]: /uri
+.
+<p><a href="/uri">foo</a></p>
+````````````````````````````````
+
+
+Note that in this example `]` is not backslash-escaped:
+
+```````````````````````````````` example
+[bar\\]: /uri
+
+[bar\\]
+.
+<p><a href="/uri">bar\</a></p>
+````````````````````````````````
+
+
+A [link label] must contain at least one character that is not a space, tab, or
+line ending:
+
+```````````````````````````````` example
+[]
+
+[]: /uri
+.
+<p>[]</p>
+<p>[]: /uri</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[
+ ]
+
+[
+ ]: /uri
+.
+<p>[
+]</p>
+<p>[
+]: /uri</p>
+````````````````````````````````
+
+
+A [collapsed reference link](@)
+consists of a [link label] that [matches] a
+[link reference definition] elsewhere in the
+document, followed by the string `[]`.
+The contents of the first link label are parsed as inlines,
+which are used as the link's text.  The link's URI and title are
+provided by the matching reference link definition.  Thus,
+`[foo][]` is equivalent to `[foo][foo]`.
+
+```````````````````````````````` example
+[foo][]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[*foo* bar][]
+
+[*foo* bar]: /url "title"
+.
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+[Foo][]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">Foo</a></p>
+````````````````````````````````
+
+
+
+As with full reference links, spaces, tabs, or line endings are not
+allowed between the two sets of brackets:
+
+```````````````````````````````` example
+[foo] 
+[]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a>
+[]</p>
+````````````````````````````````
+
+
+A [shortcut reference link](@)
+consists of a [link label] that [matches] a
+[link reference definition] elsewhere in the
+document and is not followed by `[]` or a link label.
+The contents of the first link label are parsed as inlines,
+which are used as the link's text.  The link's URI and title
+are provided by the matching link reference definition.
+Thus, `[foo]` is equivalent to `[foo][]`.
+
+```````````````````````````````` example
+[foo]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[*foo* bar]
+
+[*foo* bar]: /url "title"
+.
+<p><a href="/url" title="title"><em>foo</em> bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[*foo* bar]]
+
+[*foo* bar]: /url "title"
+.
+<p>[<a href="/url" title="title"><em>foo</em> bar</a>]</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+[[bar [foo]
+
+[foo]: /url
+.
+<p>[[bar <a href="/url">foo</a></p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+[Foo]
+
+[foo]: /url "title"
+.
+<p><a href="/url" title="title">Foo</a></p>
+````````````````````````````````
+
+
+A space after the link text should be preserved:
+
+```````````````````````````````` example
+[foo] bar
+
+[foo]: /url
+.
+<p><a href="/url">foo</a> bar</p>
+````````````````````````````````
+
+
+If you just want bracketed text, you can backslash-escape the
+opening bracket to avoid links:
+
+```````````````````````````````` example
+\[foo]
+
+[foo]: /url "title"
+.
+<p>[foo]</p>
+````````````````````````````````
+
+
+Note that this is a link, because a link label ends with the first
+following closing bracket:
+
+```````````````````````````````` example
+[foo*]: /url
+
+*[foo*]
+.
+<p>*<a href="/url">foo*</a></p>
+````````````````````````````````
+
+
+Full and compact references take precedence over shortcut
+references:
+
+```````````````````````````````` example
+[foo][bar]
+
+[foo]: /url1
+[bar]: /url2
+.
+<p><a href="/url2">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo][]
+
+[foo]: /url1
+.
+<p><a href="/url1">foo</a></p>
+````````````````````````````````
+
+Inline links also take precedence:
+
+```````````````````````````````` example
+[foo]()
+
+[foo]: /url1
+.
+<p><a href="">foo</a></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo](not a link)
+
+[foo]: /url1
+.
+<p><a href="/url1">foo</a>(not a link)</p>
+````````````````````````````````
+
+In the following case `[bar][baz]` is parsed as a reference,
+`[foo]` as normal text:
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url
+.
+<p>[foo]<a href="/url">bar</a></p>
+````````````````````````````````
+
+
+Here, though, `[foo][bar]` is parsed as a reference, since
+`[bar]` is defined:
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url1
+[bar]: /url2
+.
+<p><a href="/url2">foo</a><a href="/url1">baz</a></p>
+````````````````````````````````
+
+
+Here `[foo]` is not parsed as a shortcut reference, because it
+is followed by a link label (even though `[bar]` is not defined):
+
+```````````````````````````````` example
+[foo][bar][baz]
+
+[baz]: /url1
+[foo]: /url2
+.
+<p>[foo]<a href="/url1">bar</a></p>
+````````````````````````````````
+
+
+
+## Images
+
+Syntax for images is like the syntax for links, with one
+difference. Instead of [link text], we have an
+[image description](@).  The rules for this are the
+same as for [link text], except that (a) an
+image description starts with `![` rather than `[`, and
+(b) an image description may contain links.
+An image description has inline elements
+as its contents.  When an image is rendered to HTML,
+this is standardly used as the image's `alt` attribute.
+
+```````````````````````````````` example
+![foo](/url "title")
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo *bar*]
+
+[foo *bar*]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo ![bar](/url)](/url2)
+.
+<p><img src="/url2" alt="foo bar" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo [bar](/url)](/url2)
+.
+<p><img src="/url2" alt="foo bar" /></p>
+````````````````````````````````
+
+
+Though this spec is concerned with parsing, not rendering, it is
+recommended that in rendering to HTML, only the plain string content
+of the [image description] be used.  Note that in
+the above example, the alt attribute's value is `foo bar`, not `foo
+[bar](/url)` or `foo <a href="/url">bar</a>`.  Only the plain string
+content is rendered, without formatting.
+
+```````````````````````````````` example
+![foo *bar*][]
+
+[foo *bar*]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo *bar*][foobar]
+
+[FOOBAR]: train.jpg "train & tracks"
+.
+<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo](train.jpg)
+.
+<p><img src="train.jpg" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+My ![foo bar](/path/to/train.jpg  "title"   )
+.
+<p>My <img src="/path/to/train.jpg" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo](<url>)
+.
+<p><img src="url" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![](/url)
+.
+<p><img src="/url" alt="" /></p>
+````````````````````````````````
+
+
+Reference-style:
+
+```````````````````````````````` example
+![foo][bar]
+
+[bar]: /url
+.
+<p><img src="/url" alt="foo" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![foo][bar]
+
+[BAR]: /url
+.
+<p><img src="/url" alt="foo" /></p>
+````````````````````````````````
+
+
+Collapsed:
+
+```````````````````````````````` example
+![foo][]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![*foo* bar][]
+
+[*foo* bar]: /url "title"
+.
+<p><img src="/url" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+The labels are case-insensitive:
+
+```````````````````````````````` example
+![Foo][]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="Foo" title="title" /></p>
+````````````````````````````````
+
+
+As with reference links, spaces, tabs, and line endings, are not allowed
+between the two sets of brackets:
+
+```````````````````````````````` example
+![foo] 
+[]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" />
+[]</p>
+````````````````````````````````
+
+
+Shortcut:
+
+```````````````````````````````` example
+![foo]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="foo" title="title" /></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+![*foo* bar]
+
+[*foo* bar]: /url "title"
+.
+<p><img src="/url" alt="foo bar" title="title" /></p>
+````````````````````````````````
+
+
+Note that link labels cannot contain unescaped brackets:
+
+```````````````````````````````` example
+![[foo]]
+
+[[foo]]: /url "title"
+.
+<p>![[foo]]</p>
+<p>[[foo]]: /url &quot;title&quot;</p>
+````````````````````````````````
+
+
+The link labels are case-insensitive:
+
+```````````````````````````````` example
+![Foo]
+
+[foo]: /url "title"
+.
+<p><img src="/url" alt="Foo" title="title" /></p>
+````````````````````````````````
+
+
+If you just want a literal `!` followed by bracketed text, you can
+backslash-escape the opening `[`:
+
+```````````````````````````````` example
+!\[foo]
+
+[foo]: /url "title"
+.
+<p>![foo]</p>
+````````````````````````````````
+
+
+If you want a link after a literal `!`, backslash-escape the
+`!`:
+
+```````````````````````````````` example
+\![foo]
+
+[foo]: /url "title"
+.
+<p>!<a href="/url" title="title">foo</a></p>
+````````````````````````````````
+
+
+## Autolinks
+
+[Autolink](@)s are absolute URIs and email addresses inside
+`<` and `>`. They are parsed as links, with the URL or email address
+as the link label.
+
+A [URI autolink](@) consists of `<`, followed by an
+[absolute URI] followed by `>`.  It is parsed as
+a link to the URI, with the URI as the link's label.
+
+An [absolute URI](@),
+for these purposes, consists of a [scheme] followed by a colon (`:`)
+followed by zero or more characters other [ASCII control
+characters][ASCII control character], [space], `<`, and `>`.
+If the URI includes these characters, they must be percent-encoded
+(e.g. `%20` for a space).
+
+For purposes of this spec, a [scheme](@) is any sequence
+of 2--32 characters beginning with an ASCII letter and followed
+by any combination of ASCII letters, digits, or the symbols plus
+("+"), period ("."), or hyphen ("-").
+
+Here are some valid autolinks:
+
+```````````````````````````````` example
+<http://foo.bar.baz>
+.
+<p><a href="http://foo.bar.baz">http://foo.bar.baz</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://foo.bar.baz/test?q=hello&id=22&boolean>
+.
+<p><a href="http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<irc://foo.bar:2233/baz>
+.
+<p><a href="irc://foo.bar:2233/baz">irc://foo.bar:2233/baz</a></p>
+````````````````````````````````
+
+
+Uppercase is also fine:
+
+```````````````````````````````` example
+<MAILTO:FOO@BAR.BAZ>
+.
+<p><a href="MAILTO:FOO@BAR.BAZ">MAILTO:FOO@BAR.BAZ</a></p>
+````````````````````````````````
+
+
+Note that many strings that count as [absolute URIs] for
+purposes of this spec are not valid URIs, because their
+schemes are not registered or because of other problems
+with their syntax:
+
+```````````````````````````````` example
+<a+b+c:d>
+.
+<p><a href="a+b+c:d">a+b+c:d</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<made-up-scheme://foo,bar>
+.
+<p><a href="made-up-scheme://foo,bar">made-up-scheme://foo,bar</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<http://../>
+.
+<p><a href="http://../">http://../</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<localhost:5001/foo>
+.
+<p><a href="localhost:5001/foo">localhost:5001/foo</a></p>
+````````````````````````````````
+
+
+Spaces are not allowed in autolinks:
+
+```````````````````````````````` example
+<http://foo.bar/baz bim>
+.
+<p>&lt;http://foo.bar/baz bim&gt;</p>
+````````````````````````````````
+
+
+Backslash-escapes do not work inside autolinks:
+
+```````````````````````````````` example
+<http://example.com/\[\>
+.
+<p><a href="http://example.com/%5C%5B%5C">http://example.com/\[\</a></p>
+````````````````````````````````
+
+
+An [email autolink](@)
+consists of `<`, followed by an [email address],
+followed by `>`.  The link's label is the email address,
+and the URL is `mailto:` followed by the email address.
+
+An [email address](@),
+for these purposes, is anything that matches
+the [non-normative regex from the HTML5
+spec](https://html.spec.whatwg.org/multipage/forms.html#e-mail-state-(type=email)):
+
+    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
+    (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+
+Examples of email autolinks:
+
+```````````````````````````````` example
+<foo@bar.example.com>
+.
+<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<foo+special@Bar.baz-bar0.com>
+.
+<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
+````````````````````````````````
+
+
+Backslash-escapes do not work inside email autolinks:
+
+```````````````````````````````` example
+<foo\+@bar.example.com>
+.
+<p>&lt;foo+@bar.example.com&gt;</p>
+````````````````````````````````
+
+
+These are not autolinks:
+
+```````````````````````````````` example
+<>
+.
+<p>&lt;&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+< http://foo.bar >
+.
+<p>&lt; http://foo.bar &gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<m:abc>
+.
+<p>&lt;m:abc&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<foo.bar.baz>
+.
+<p>&lt;foo.bar.baz&gt;</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+http://example.com
+.
+<p>http://example.com</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo@bar.example.com
+.
+<p>foo@bar.example.com</p>
+````````````````````````````````
+
+
+## Raw HTML
+
+Text between `<` and `>` that looks like an HTML tag is parsed as a
+raw HTML tag and will be rendered in HTML without escaping.
+Tag and attribute names are not limited to current HTML tags,
+so custom tags (and even, say, DocBook tags) may be used.
+
+Here is the grammar for tags:
+
+A [tag name](@) consists of an ASCII letter
+followed by zero or more ASCII letters, digits, or
+hyphens (`-`).
+
+An [attribute](@) consists of spaces, tabs, and up to one line ending,
+an [attribute name], and an optional
+[attribute value specification].
+
+An [attribute name](@)
+consists of an ASCII letter, `_`, or `:`, followed by zero or more ASCII
+letters, digits, `_`, `.`, `:`, or `-`.  (Note:  This is the XML
+specification restricted to ASCII.  HTML5 is laxer.)
+
+An [attribute value specification](@)
+consists of optional spaces, tabs, and up to one line ending,
+a `=` character, optional spaces, tabs, and up to one line ending,
+and an [attribute value].
+
+An [attribute value](@)
+consists of an [unquoted attribute value],
+a [single-quoted attribute value], or a [double-quoted attribute value].
+
+An [unquoted attribute value](@)
+is a nonempty string of characters not
+including spaces, tabs, line endings, `"`, `'`, `=`, `<`, `>`, or `` ` ``.
+
+A [single-quoted attribute value](@)
+consists of `'`, zero or more
+characters not including `'`, and a final `'`.
+
+A [double-quoted attribute value](@)
+consists of `"`, zero or more
+characters not including `"`, and a final `"`.
+
+An [open tag](@) consists of a `<` character, a [tag name],
+zero or more [attributes], optional spaces, tabs, and up to one line ending,
+an optional `/` character, and a `>` character.
+
+A [closing tag](@) consists of the string `</`, a
+[tag name], optional spaces, tabs, and up to one line ending, and the character
+`>`.
+
+An [HTML comment](@) consists of `<!--` + *text* + `-->`,
+where *text* does not start with `>` or `->`, does not end with `-`,
+and does not contain `--`.  (See the
+[HTML5 spec](http://www.w3.org/TR/html5/syntax.html#comments).)
+
+A [processing instruction](@)
+consists of the string `<?`, a string
+of characters not including the string `?>`, and the string
+`?>`.
+
+A [declaration](@) consists of the string `<!`, an ASCII letter, zero or more
+characters not including the character `>`, and the character `>`.
+
+A [CDATA section](@) consists of
+the string `<![CDATA[`, a string of characters not including the string
+`]]>`, and the string `]]>`.
+
+An [HTML tag](@) consists of an [open tag], a [closing tag],
+an [HTML comment], a [processing instruction], a [declaration],
+or a [CDATA section].
+
+Here are some simple open tags:
+
+```````````````````````````````` example
+<a><bab><c2c>
+.
+<p><a><bab><c2c></p>
+````````````````````````````````
+
+
+Empty elements:
+
+```````````````````````````````` example
+<a/><b2/>
+.
+<p><a/><b2/></p>
+````````````````````````````````
+
+
+Whitespace is allowed:
+
+```````````````````````````````` example
+<a  /><b2
+data="foo" >
+.
+<p><a  /><b2
+data="foo" ></p>
+````````````````````````````````
+
+
+With attributes:
+
+```````````````````````````````` example
+<a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 />
+.
+<p><a foo="bar" bam = 'baz <em>"</em>'
+_boolean zoop:33=zoop:33 /></p>
+````````````````````````````````
+
+
+Custom tag names can be used:
+
+```````````````````````````````` example
+Foo <responsive-image src="foo.jpg" />
+.
+<p>Foo <responsive-image src="foo.jpg" /></p>
+````````````````````````````````
+
+
+Illegal tag names, not parsed as HTML:
+
+```````````````````````````````` example
+<33> <__>
+.
+<p>&lt;33&gt; &lt;__&gt;</p>
+````````````````````````````````
+
+
+Illegal attribute names:
+
+```````````````````````````````` example
+<a h*#ref="hi">
+.
+<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>
+````````````````````````````````
+
+
+Illegal attribute values:
+
+```````````````````````````````` example
+<a href="hi'> <a href=hi'>
+.
+<p>&lt;a href=&quot;hi'&gt; &lt;a href=hi'&gt;</p>
+````````````````````````````````
+
+
+Illegal whitespace:
+
+```````````````````````````````` example
+< a><
+foo><bar/ >
+<foo bar=baz
+bim!bop />
+.
+<p>&lt; a&gt;&lt;
+foo&gt;&lt;bar/ &gt;
+&lt;foo bar=baz
+bim!bop /&gt;</p>
+````````````````````````````````
+
+
+Missing whitespace:
+
+```````````````````````````````` example
+<a href='bar'title=title>
+.
+<p>&lt;a href='bar'title=title&gt;</p>
+````````````````````````````````
+
+
+Closing tags:
+
+```````````````````````````````` example
+</a></foo >
+.
+<p></a></foo ></p>
+````````````````````````````````
+
+
+Illegal attributes in closing tag:
+
+```````````````````````````````` example
+</a href="foo">
+.
+<p>&lt;/a href=&quot;foo&quot;&gt;</p>
+````````````````````````````````
+
+
+Comments:
+
+```````````````````````````````` example
+foo <!-- this is a
+comment - with hyphen -->
+.
+<p>foo <!-- this is a
+comment - with hyphen --></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo <!-- not a comment -- two hyphens -->
+.
+<p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>
+````````````````````````````````
+
+
+Not comments:
+
+```````````````````````````````` example
+foo <!--> foo -->
+
+foo <!-- foo--->
+.
+<p>foo &lt;!--&gt; foo --&gt;</p>
+<p>foo &lt;!-- foo---&gt;</p>
+````````````````````````````````
+
+
+Processing instructions:
+
+```````````````````````````````` example
+foo <?php echo $a; ?>
+.
+<p>foo <?php echo $a; ?></p>
+````````````````````````````````
+
+
+Declarations:
+
+```````````````````````````````` example
+foo <!ELEMENT br EMPTY>
+.
+<p>foo <!ELEMENT br EMPTY></p>
+````````````````````````````````
+
+
+CDATA sections:
+
+```````````````````````````````` example
+foo <![CDATA[>&<]]>
+.
+<p>foo <![CDATA[>&<]]></p>
+````````````````````````````````
+
+
+Entity and numeric character references are preserved in HTML
+attributes:
+
+```````````````````````````````` example
+foo <a href="&ouml;">
+.
+<p>foo <a href="&ouml;"></p>
+````````````````````````````````
+
+
+Backslash escapes do not work in HTML attributes:
+
+```````````````````````````````` example
+foo <a href="\*">
+.
+<p>foo <a href="\*"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="\"">
+.
+<p>&lt;a href=&quot;&quot;&quot;&gt;</p>
+````````````````````````````````
+
+
+## Hard line breaks
+
+A line ending (not in a code span or HTML tag) that is preceded
+by two or more spaces and does not occur at the end of a block
+is parsed as a [hard line break](@) (rendered
+in HTML as a `<br />` tag):
+
+```````````````````````````````` example
+foo  
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+For a more visible alternative, a backslash before the
+[line ending] may be used instead of two or more spaces:
+
+```````````````````````````````` example
+foo\
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+More than two spaces can be used:
+
+```````````````````````````````` example
+foo       
+baz
+.
+<p>foo<br />
+baz</p>
+````````````````````````````````
+
+
+Leading spaces at the beginning of the next line are ignored:
+
+```````````````````````````````` example
+foo  
+     bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo\
+     bar
+.
+<p>foo<br />
+bar</p>
+````````````````````````````````
+
+
+Hard line breaks can occur inside emphasis, links, and other constructs
+that allow inline content:
+
+```````````````````````````````` example
+*foo  
+bar*
+.
+<p><em>foo<br />
+bar</em></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+*foo\
+bar*
+.
+<p><em>foo<br />
+bar</em></p>
+````````````````````````````````
+
+
+Hard line breaks do not occur inside code spans
+
+```````````````````````````````` example
+`code  
+span`
+.
+<p><code>code   span</code></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+`code\
+span`
+.
+<p><code>code\ span</code></p>
+````````````````````````````````
+
+
+or HTML tags:
+
+```````````````````````````````` example
+<a href="foo  
+bar">
+.
+<p><a href="foo  
+bar"></p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+<a href="foo\
+bar">
+.
+<p><a href="foo\
+bar"></p>
+````````````````````````````````
+
+
+Hard line breaks are for separating inline content within a block.
+Neither syntax for hard line breaks works at the end of a paragraph or
+other block element:
+
+```````````````````````````````` example
+foo\
+.
+<p>foo\</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+foo  
+.
+<p>foo</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+### foo\
+.
+<h3>foo\</h3>
+````````````````````````````````
+
+
+```````````````````````````````` example
+### foo  
+.
+<h3>foo</h3>
+````````````````````````````````
+
+
+## Soft line breaks
+
+A regular line ending (not in a code span or HTML tag) that is not
+preceded by two or more spaces or a backslash is parsed as a
+[softbreak](@).  (A soft line break may be rendered in HTML either as a
+[line ending] or as a space. The result will be the same in
+browsers. In the examples here, a [line ending] will be used.)
+
+```````````````````````````````` example
+foo
+baz
+.
+<p>foo
+baz</p>
+````````````````````````````````
+
+
+Spaces at the end of the line and beginning of the next line are
+removed:
+
+```````````````````````````````` example
+foo 
+ baz
+.
+<p>foo
+baz</p>
+````````````````````````````````
+
+
+A conforming parser may render a soft line break in HTML either as a
+line ending or as a space.
+
+A renderer may also provide an option to render soft line breaks
+as hard line breaks.
+
+## Textual content
+
+Any characters not given an interpretation by the above rules will
+be parsed as plain textual content.
+
+```````````````````````````````` example
+hello $.;'there
+.
+<p>hello $.;'there</p>
+````````````````````````````````
+
+
+```````````````````````````````` example
+Foo χρῆν
+.
+<p>Foo χρῆν</p>
+````````````````````````````````
+
+
+Internal spaces are preserved verbatim:
+
+```````````````````````````````` example
+Multiple     spaces
+.
+<p>Multiple     spaces</p>
+````````````````````````````````
+
+
+<!-- END TESTS -->
+
+# Appendix: A parsing strategy
+
+In this appendix we describe some features of the parsing strategy
+used in the CommonMark reference implementations.
+
+## Overview
+
+Parsing has two phases:
+
+1. In the first phase, lines of input are consumed and the block
+structure of the document---its division into paragraphs, block quotes,
+list items, and so on---is constructed.  Text is assigned to these
+blocks but not parsed. Link reference definitions are parsed and a
+map of links is constructed.
+
+2. In the second phase, the raw text contents of paragraphs and headings
+are parsed into sequences of Markdown inline elements (strings,
+code spans, links, emphasis, and so on), using the map of link
+references constructed in phase 1.
+
+At each point in processing, the document is represented as a tree of
+**blocks**.  The root of the tree is a `document` block.  The `document`
+may have any number of other blocks as **children**.  These children
+may, in turn, have other blocks as children.  The last child of a block
+is normally considered **open**, meaning that subsequent lines of input
+can alter its contents.  (Blocks that are not open are **closed**.)
+Here, for example, is a possible document tree, with the open blocks
+marked by arrows:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+         list_item
+           paragraph
+             "Qui *quodsi iracundia*"
+      -> list_item
+        -> paragraph
+             "aliquando id"
+```
+
+## Phase 1: block structure
+
+Each line that is processed has an effect on this tree.  The line is
+analyzed and, depending on its contents, the document may be altered
+in one or more of the following ways:
+
+1. One or more open blocks may be closed.
+2. One or more new blocks may be created as children of the
+   last open block.
+3. Text may be added to the last (deepest) open block remaining
+   on the tree.
+
+Once a line has been incorporated into the tree in this way,
+it can be discarded, so input can be read in a stream.
+
+For each line, we follow this procedure:
+
+1. First we iterate through the open blocks, starting with the
+root document, and descending through last children down to the last
+open block.  Each block imposes a condition that the line must satisfy
+if the block is to remain open.  For example, a block quote requires a
+`>` character.  A paragraph requires a non-blank line.
+In this phase we may match all or just some of the open
+blocks.  But we cannot close unmatched blocks yet, because we may have a
+[lazy continuation line].
+
+2.  Next, after consuming the continuation markers for existing
+blocks, we look for new block starts (e.g. `>` for a block quote).
+If we encounter a new block start, we close any blocks unmatched
+in step 1 before creating the new block as a child of the last
+matched container block.
+
+3.  Finally, we look at the remainder of the line (after block
+markers like `>`, list markers, and indentation have been consumed).
+This is text that can be incorporated into the last open
+block (a paragraph, code block, heading, or raw HTML).
+
+Setext headings are formed when we see a line of a paragraph
+that is a [setext heading underline].
+
+Reference link definitions are detected when a paragraph is closed;
+the accumulated text lines are parsed to see if they begin with
+one or more reference link definitions.  Any remainder becomes a
+normal paragraph.
+
+We can see how this works by considering how the tree above is
+generated by four lines of Markdown:
+
+``` markdown
+> Lorem ipsum dolor
+sit amet.
+> - Qui *quodsi iracundia*
+> - aliquando id
+```
+
+At the outset, our document model is just
+
+``` tree
+-> document
+```
+
+The first line of our text,
+
+``` markdown
+> Lorem ipsum dolor
+```
+
+causes a `block_quote` block to be created as a child of our
+open `document` block, and a `paragraph` block as a child of
+the `block_quote`.  Then the text is added to the last open
+block, the `paragraph`:
+
+``` tree
+-> document
+  -> block_quote
+    -> paragraph
+         "Lorem ipsum dolor"
+```
+
+The next line,
+
+``` markdown
+sit amet.
+```
+
+is a "lazy continuation" of the open `paragraph`, so it gets added
+to the paragraph's text:
+
+``` tree
+-> document
+  -> block_quote
+    -> paragraph
+         "Lorem ipsum dolor\nsit amet."
+```
+
+The third line,
+
+``` markdown
+> - Qui *quodsi iracundia*
+```
+
+causes the `paragraph` block to be closed, and a new `list` block
+opened as a child of the `block_quote`.  A `list_item` is also
+added as a child of the `list`, and a `paragraph` as a child of
+the `list_item`.  The text is then added to the new `paragraph`:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+      -> list_item
+        -> paragraph
+             "Qui *quodsi iracundia*"
+```
+
+The fourth line,
+
+``` markdown
+> - aliquando id
+```
+
+causes the `list_item` (and its child the `paragraph`) to be closed,
+and a new `list_item` opened up as child of the `list`.  A `paragraph`
+is added as a child of the new `list_item`, to contain the text.
+We thus obtain the final tree:
+
+``` tree
+-> document
+  -> block_quote
+       paragraph
+         "Lorem ipsum dolor\nsit amet."
+    -> list (type=bullet tight=true bullet_char=-)
+         list_item
+           paragraph
+             "Qui *quodsi iracundia*"
+      -> list_item
+        -> paragraph
+             "aliquando id"
+```
+
+## Phase 2: inline structure
+
+Once all of the input has been parsed, all open blocks are closed.
+
+We then "walk the tree," visiting every node, and parse raw
+string contents of paragraphs and headings as inlines.  At this
+point we have seen all the link reference definitions, so we can
+resolve reference links as we go.
+
+``` tree
+document
+  block_quote
+    paragraph
+      str "Lorem ipsum dolor"
+      softbreak
+      str "sit amet."
+    list (type=bullet tight=true bullet_char=-)
+      list_item
+        paragraph
+          str "Qui "
+          emph
+            str "quodsi iracundia"
+      list_item
+        paragraph
+          str "aliquando id"
+```
+
+Notice how the [line ending] in the first paragraph has
+been parsed as a `softbreak`, and the asterisks in the first list item
+have become an `emph`.
+
+### An algorithm for parsing nested emphasis and links
+
+By far the trickiest part of inline parsing is handling emphasis,
+strong emphasis, links, and images.  This is done using the following
+algorithm.
+
+When we're parsing inlines and we hit either
+
+- a run of `*` or `_` characters, or
+- a `[` or `![`
+
+we insert a text node with these symbols as its literal content, and we
+add a pointer to this text node to the [delimiter stack](@).
+
+The [delimiter stack] is a doubly linked list.  Each
+element contains a pointer to a text node, plus information about
+
+- the type of delimiter (`[`, `![`, `*`, `_`)
+- the number of delimiters,
+- whether the delimiter is "active" (all are active to start), and
+- whether the delimiter is a potential opener, a potential closer,
+  or both (which depends on what sort of characters precede
+  and follow the delimiters).
+
+When we hit a `]` character, we call the *look for link or image*
+procedure (see below).
+
+When we hit the end of the input, we call the *process emphasis*
+procedure (see below), with `stack_bottom` = NULL.
+
+#### *look for link or image*
+
+Starting at the top of the delimiter stack, we look backwards
+through the stack for an opening `[` or `![` delimiter.
+
+- If we don't find one, we return a literal text node `]`.
+
+- If we do find one, but it's not *active*, we remove the inactive
+  delimiter from the stack, and return a literal text node `]`.
+
+- If we find one and it's active, then we parse ahead to see if
+  we have an inline link/image, reference link/image, compact reference
+  link/image, or shortcut reference link/image.
+
+  + If we don't, then we remove the opening delimiter from the
+    delimiter stack and return a literal text node `]`.
+
+  + If we do, then
+
+    * We return a link or image node whose children are the inlines
+      after the text node pointed to by the opening delimiter.
+
+    * We run *process emphasis* on these inlines, with the `[` opener
+      as `stack_bottom`.
+
+    * We remove the opening delimiter.
+
+    * If we have a link (and not an image), we also set all
+      `[` delimiters before the opening delimiter to *inactive*.  (This
+      will prevent us from getting links within links.)
+
+#### *process emphasis*
+
+Parameter `stack_bottom` sets a lower bound to how far we
+descend in the [delimiter stack].  If it is NULL, we can
+go all the way to the bottom.  Otherwise, we stop before
+visiting `stack_bottom`.
+
+Let `current_position` point to the element on the [delimiter stack]
+just above `stack_bottom` (or the first element if `stack_bottom`
+is NULL).
+
+We keep track of the `openers_bottom` for each delimiter
+type (`*`, `_`), indexed to the length of the closing delimiter run
+(modulo 3) and to whether the closing delimiter can also be an
+opener.  Initialize this to `stack_bottom`.
+
+Then we repeat the following until we run out of potential
+closers:
+
+- Move `current_position` forward in the delimiter stack (if needed)
+  until we find the first potential closer with delimiter `*` or `_`.
+  (This will be the potential closer closest
+  to the beginning of the input -- the first one in parse order.)
+
+- Now, look back in the stack (staying above `stack_bottom` and
+  the `openers_bottom` for this delimiter type) for the
+  first matching potential opener ("matching" means same delimiter).
+
+- If one is found:
+
+  + Figure out whether we have emphasis or strong emphasis:
+    if both closer and opener spans have length >= 2, we have
+    strong, otherwise regular.
+
+  + Insert an emph or strong emph node accordingly, after
+    the text node corresponding to the opener.
+
+  + Remove any delimiters between the opener and closer from
+    the delimiter stack.
+
+  + Remove 1 (for regular emph) or 2 (for strong emph) delimiters
+    from the opening and closing text nodes.  If they become empty
+    as a result, remove them and remove the corresponding element
+    of the delimiter stack.  If the closing node is removed, reset
+    `current_position` to the next element in the stack.
+
+- If none is found:
+
+  + Set `openers_bottom` to the element before `current_position`.
+    (We know that there are no openers for this kind of closer up to and
+    including this point, so this puts a lower bound on future searches.)
+
+  + If the closer at `current_position` is not a potential opener,
+    remove it from the delimiter stack (since we know it can't
+    be a closer either).
+
+  + Advance `current_position` to the next element in the stack.
+
+After we're done, we remove all delimiters above `stack_bottom` from the
+delimiter stack.
diff --git a/tdemarkdown/md4c/test/spec_tests.py b/tdemarkdown/md4c/test/spec_tests.py
new file mode 100755
index 000000000..c739e5f9a
--- /dev/null
+++ b/tdemarkdown/md4c/test/spec_tests.py
@@ -0,0 +1,144 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+from difflib import unified_diff
+import argparse
+import re
+import json
+from cmark import CMark
+from normalize import normalize_html
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Run cmark tests.')
+    parser.add_argument('-p', '--program', dest='program', nargs='?', default=None,
+            help='program to test')
+    parser.add_argument('-s', '--spec', dest='spec', nargs='?', default='spec.txt',
+            help='path to spec')
+    parser.add_argument('-P', '--pattern', dest='pattern', nargs='?',
+            default=None, help='limit to sections matching regex pattern')
+    parser.add_argument('--library-dir', dest='library_dir', nargs='?',
+            default=None, help='directory containing dynamic library')
+    parser.add_argument('--no-normalize', dest='normalize',
+            action='store_const', const=False, default=True,
+            help='do not normalize HTML')
+    parser.add_argument('-d', '--dump-tests', dest='dump_tests',
+            action='store_const', const=True, default=False,
+            help='dump tests in JSON format')
+    parser.add_argument('--debug-normalization', dest='debug_normalization',
+            action='store_const', const=True,
+            default=False, help='filter stdin through normalizer for testing')
+    parser.add_argument('-n', '--number', type=int, default=None,
+            help='only consider the test with the given number')
+    args = parser.parse_args(sys.argv[1:])
+
+def out(str):
+    sys.stdout.buffer.write(str.encode('utf-8')) 
+
+def print_test_header(headertext, example_number, start_line, end_line):
+    out("Example %d (lines %d-%d) %s\n" % (example_number,start_line,end_line,headertext))
+
+def do_test(test, normalize, result_counts):
+    [retcode, actual_html, err] = cmark.to_html(test['markdown'])
+    if retcode == 0:
+        expected_html = test['html']
+        unicode_error = None
+        if normalize:
+            try:
+                passed = normalize_html(actual_html) == normalize_html(expected_html)
+            except UnicodeDecodeError as e:
+                unicode_error = e
+                passed = False
+        else:
+            passed = actual_html == expected_html
+        if passed:
+            result_counts['pass'] += 1
+        else:
+            print_test_header(test['section'], test['example'], test['start_line'], test['end_line'])
+            out(test['markdown'] + '\n')
+            if unicode_error:
+                out("Unicode error: " + str(unicode_error) + '\n')
+                out("Expected: " + repr(expected_html) + '\n')
+                out("Got:      " + repr(actual_html) + '\n')
+            else:
+                expected_html_lines = expected_html.splitlines(True)
+                actual_html_lines = actual_html.splitlines(True)
+                for diffline in unified_diff(expected_html_lines, actual_html_lines,
+                                "expected HTML", "actual HTML"):
+                    out(diffline)
+            out('\n')
+            result_counts['fail'] += 1
+    else:
+        print_test_header(test['section'], test['example'], test['start_line'], test['end_line'])
+        out("program returned error code %d\n" % retcode)
+        sys.stdout.buffer.write(err)
+        result_counts['error'] += 1
+
+def get_tests(specfile):
+    line_number = 0
+    start_line = 0
+    end_line = 0
+    example_number = 0
+    markdown_lines = []
+    html_lines = []
+    state = 0  # 0 regular text, 1 markdown example, 2 html output
+    headertext = ''
+    tests = []
+
+    header_re = re.compile('#+ ')
+
+    with open(specfile, 'r', encoding='utf-8', newline='\n') as specf:
+        for line in specf:
+            line_number = line_number + 1
+            l = line.strip()
+            #if l == "`" * 32 + " example":
+            if re.match("`{32} example( [a-z]{1,})?", l):
+                state = 1
+            elif state == 2 and l == "`" * 32:
+                state = 0
+                example_number = example_number + 1
+                end_line = line_number
+                tests.append({
+                    "markdown":''.join(markdown_lines).replace('→',"\t"),
+                    "html":''.join(html_lines).replace('→',"\t"),
+                    "example": example_number,
+                    "start_line": start_line,
+                    "end_line": end_line,
+                    "section": headertext})
+                start_line = 0
+                markdown_lines = []
+                html_lines = []
+            elif l == ".":
+                state = 2
+            elif state == 1:
+                if start_line == 0:
+                    start_line = line_number - 1
+                markdown_lines.append(line)
+            elif state == 2:
+                html_lines.append(line)
+            elif state == 0 and re.match(header_re, line):
+                headertext = header_re.sub('', line).strip()
+    return tests
+
+if __name__ == "__main__":
+    if args.debug_normalization:
+        out(normalize_html(sys.stdin.read()))
+        exit(0)
+
+    all_tests = get_tests(args.spec)
+    if args.pattern:
+        pattern_re = re.compile(args.pattern, re.IGNORECASE)
+    else:
+        pattern_re = re.compile('.')
+    tests = [ test for test in all_tests if re.search(pattern_re, test['section']) and (not args.number or test['example'] == args.number) ]
+    if args.dump_tests:
+        out(json.dumps(tests, ensure_ascii=False, indent=2))
+        exit(0)
+    else:
+        skipped = len(all_tests) - len(tests)
+        cmark = CMark(prog=args.program, library_dir=args.library_dir)
+        result_counts = {'pass': 0, 'fail': 0, 'error': 0, 'skip': skipped}
+        for test in tests:
+            do_test(test, args.normalize, result_counts)
+        out("{pass} passed, {fail} failed, {error} errored, {skip} skipped\n".format(**result_counts))
+        exit(result_counts['fail'] + result_counts['error'])
diff --git a/tdemarkdown/md4c/test/strikethrough.txt b/tdemarkdown/md4c/test/strikethrough.txt
new file mode 100644
index 000000000..884ce5983
--- /dev/null
+++ b/tdemarkdown/md4c/test/strikethrough.txt
@@ -0,0 +1,75 @@
+
+# Strike-Through
+
+With the flag `MD_FLAG_STRIKETHROUGH`, MD4C enables extension for recognition
+of strike-through spans.
+
+Strike-through text is any text wrapped in one or two tildes (`~`).
+
+```````````````````````````````` example
+~Hi~ Hello, world!
+.
+<p><del>Hi</del> Hello, world!</p>
+````````````````````````````````
+
+If the length of the opener and closer doesn't match, the strike-through is
+not recognized.
+
+```````````````````````````````` example
+This ~text~~ is curious.
+.
+<p>This ~text~~ is curious.</p>
+````````````````````````````````
+
+Too long tilde sequence won't be recognized:
+
+```````````````````````````````` example
+foo ~~~bar~~~
+.
+<p>foo ~~~bar~~~</p>
+````````````````````````````````
+
+Also note the markers cannot open a strike-through span if they are followed
+with a whitespace; and similarly, then cannot close the span if they are
+preceded with a whitespace:
+
+```````````````````````````````` example
+~foo ~bar
+.
+<p>~foo ~bar</p>
+````````````````````````````````
+
+
+As with regular emphasis delimiters, a new paragraph will cause the cessation
+of parsing a strike-through:
+
+```````````````````````````````` example
+This ~~has a
+
+new paragraph~~.
+.
+<p>This ~~has a</p>
+<p>new paragraph~~.</p>
+````````````````````````````````
+
+
+## GitHub Issues
+
+### [Issue 69](https://github.com/mity/md4c/issues/69)
+```````````````````````````````` example
+~`foo`~
+.
+<p><del><code>foo</code></del></p>
+````````````````````````````````
+
+```````````````````````````````` example
+~*foo*~
+.
+<p><del><em>foo</em></del></p>
+````````````````````````````````
+
+```````````````````````````````` example
+*~foo~*
+.
+<p><em><del>foo</del></em></p>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/tables.txt b/tdemarkdown/md4c/test/tables.txt
new file mode 100644
index 000000000..b220f6685
--- /dev/null
+++ b/tdemarkdown/md4c/test/tables.txt
@@ -0,0 +1,357 @@
+
+# Tables
+
+With the flag `MD_FLAG_TABLES`, MD4C enables extension for recognition of
+tables.
+
+Basic table example of a table with two columns and three lines (when not
+counting the header) is as follows:
+
+```````````````````````````````` example
+| Column 1 | Column 2 |
+|----------|----------|
+| foo      | bar      |
+| baz      | qux      |
+| quux     | quuz     |
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+The leading and succeeding pipe characters (`|`) on each line are optional:
+
+```````````````````````````````` example
+Column 1 | Column 2 |
+---------|--------- |
+foo      | bar      |
+baz      | qux      |
+quux     | quuz     |
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+```````````````````````````````` example
+| Column 1 | Column 2
+|----------|---------
+| foo      | bar
+| baz      | qux
+| quux     | quuz
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+```````````````````````````````` example
+Column 1 | Column 2
+---------|---------
+foo      | bar
+baz      | qux
+quux     | quuz
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+However for one-column table, at least one pipe has to be used in the table
+header underline, otherwise it would be parsed as a Setext title followed by
+a paragraph.
+
+```````````````````````````````` example
+Column 1
+--------
+foo
+baz
+quux
+.
+<h2>Column 1</h2>
+<p>foo
+baz
+quux</p>
+````````````````````````````````
+
+Leading and trailing whitespace in a table cell is ignored and the columns do
+not need to be aligned.
+
+```````````````````````````````` example
+Column 1 |Column 2
+---|---
+foo | bar
+baz| qux
+quux|quuz
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+The table cannot interrupt a paragraph.
+
+```````````````````````````````` example
+Lorem ipsum dolor sit amet.
+| Column 1 | Column 2
+| ---------|---------
+| foo      | bar
+| baz      | qux
+| quux     | quuz
+.
+<p>Lorem ipsum dolor sit amet.
+| Column 1 | Column 2
+| ---------|---------
+| foo      | bar
+| baz      | qux
+| quux     | quuz</p>
+````````````````````````````````
+
+Similarly, paragraph cannot interrupt a table:
+
+```````````````````````````````` example
+Column 1 | Column 2
+---------|---------
+foo      | bar
+baz      | qux
+quux     | quuz
+Lorem ipsum dolor sit amet.
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+<tr><td>Lorem ipsum dolor sit amet.</td><td></td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+The first, the last or both the first and the last dash in each column
+underline can be replaced with a colon (`:`) to request left, right or middle
+alignment of the respective column:
+
+```````````````````````````````` example
+| Column 1 | Column 2 | Column 3 | Column 4 |
+|----------|:---------|:--------:|---------:|
+| default  | left     | center   | right    |
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th align="left">Column 2</th><th align="center">Column 3</th><th align="right">Column 4</th></tr>
+</thead>
+<tbody>
+<tr><td>default</td><td align="left">left</td><td align="center">center</td><td align="right">right</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+To include a literal pipe character in any cell, it has to be escaped.
+
+```````````````````````````````` example
+Column 1 | Column 2
+---------|---------
+foo      | bar
+baz      | qux \| xyzzy
+quux     | quuz
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td>foo</td><td>bar</td></tr>
+<tr><td>baz</td><td>qux | xyzzy</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+Contents of each cell is parsed as an inline text which may contents any
+inline Markdown spans like emphasis, strong emphasis, links etc.
+
+```````````````````````````````` example
+Column 1 | Column 2
+---------|---------
+*foo*    | bar
+**baz**  | [qux]
+quux     | [quuz](/url2)
+
+[qux]: /url
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td><em>foo</em></td><td>bar</td></tr>
+<tr><td><strong>baz</strong></td><td><a href="/url">qux</a></td></tr>
+<tr><td>quux</td><td><a href="/url2">quuz</a></td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+However pipes which are inside a code span are not recognized as cell
+boundaries.
+
+```````````````````````````````` example
+Column 1 | Column 2
+---------|---------
+`foo     | bar`
+baz      | qux
+quux     | quuz
+.
+<table>
+<thead>
+<tr><th>Column 1</th><th>Column 2</th></tr>
+</thead>
+<tbody>
+<tr><td><code>foo     | bar</code></td><td></td></tr>
+<tr><td>baz</td><td>qux</td></tr>
+<tr><td>quux</td><td>quuz</td></tr>
+</tbody>
+</table>
+````````````````````````````````
+
+
+## GitHub Issues
+
+### [Issue 41](https://github.com/mity/md4c/issues/41)
+```````````````````````````````` example
+* x|x
+---|---
+.
+<ul>
+<li>x|x
+---|---</li>
+</ul>
+````````````````````````````````
+(Not a table, because the underline has wrong indentation and is not part of the
+list item.)
+
+```````````````````````````````` example
+* x|x
+  ---|---
+x|x
+.
+<ul>
+<li><table>
+<thead>
+<tr>
+<th>x</th>
+<th>x</th>
+</tr>
+</thead>
+</table>
+</li>
+</ul>
+<p>x|x</p>
+````````````````````````````````
+(Here the underline has the right indentation so the table is detected.
+But the last line is not part of it due its indentation.)
+
+
+### [Issue 42](https://github.com/mity/md4c/issues/42)
+
+```````````````````````````````` example
+] http://x.x *x*
+
+|x|x|
+|---|---|
+|x|
+.
+<p>] http://x.x <em>x</em></p>
+<table>
+<thead>
+<tr>
+<th>x</th>
+<th>x</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>x</td>
+<td></td>
+</tr>
+</tbody>
+</table>
+````````````````````````````````
+
+
+### [Issue 104](https://github.com/mity/md4c/issues/104)
+
+```````````````````````````````` example
+A | B
+--- | ---
+[x](url)
+.
+<table>
+<thead>
+<tr>
+<th>A</th>
+<th>B</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="url">x</a></td>
+<td></td>
+</tr>
+</tbody>
+</table>
+````````````````````````````````
+
+
+### [Issue 138](https://github.com/mity/md4c/issues/138)
+
+```````````````````````````````` example
+| abc | def |
+| --- | --- |
+.
+<table>
+<thead>
+<tr>
+<th>abc</th>
+<th>def</th>
+</tr>
+</thead>
+</table>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/tasklists.txt b/tdemarkdown/md4c/test/tasklists.txt
new file mode 100644
index 000000000..aae1bf8eb
--- /dev/null
+++ b/tdemarkdown/md4c/test/tasklists.txt
@@ -0,0 +1,117 @@
+
+# Tasklists
+
+With the flag `MD_FLAG_TASKLISTS`, MD4C enables extension for recognition of
+task lists.
+
+Basic task list may look as follows:
+
+```````````````````````````````` example
+ * [x] foo
+ * [X] bar
+ * [ ] baz
+.
+<ul>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>foo</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>bar</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>baz</li>
+</ul>
+````````````````````````````````
+
+Task lists can also be in ordered lists:
+
+```````````````````````````````` example
+ 1. [x] foo
+ 2. [X] bar
+ 3. [ ] baz
+.
+<ol>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>foo</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>bar</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>baz</li>
+</ol>
+````````````````````````````````
+
+Task lists can also be nested in ordinary lists:
+
+```````````````````````````````` example
+ * xxx:
+   * [x] foo
+   * [x] bar
+   * [ ] baz
+ * yyy:
+   * [ ] qux
+   * [x] quux
+   * [ ] quuz
+.
+<ul>
+<li>xxx:
+<ul>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>foo</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>bar</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>baz</li>
+</ul></li>
+<li>yyy:
+<ul>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>qux</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>quux</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>quuz</li>
+</ul></li>
+</ul>
+````````````````````````````````
+
+Or in a parent task list:
+
+```````````````````````````````` example
+ 1. [x] xxx:
+    * [x] foo
+    * [x] bar
+    * [ ] baz
+ 2. [ ] yyy:
+    * [ ] qux
+    * [x] quux
+    * [ ] quuz
+.
+<ol>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>xxx:
+<ul>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>foo</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>bar</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>baz</li>
+</ul></li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>yyy:
+<ul>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>qux</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>quux</li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>quuz</li>
+</ul></li>
+</ol>
+````````````````````````````````
+
+Also, ordinary lists can be nested in the task lists.
+
+```````````````````````````````` example
+ * [x] xxx:
+   * foo
+   * bar
+   * baz
+ * [ ] yyy:
+   * qux
+   * quux
+   * quuz
+.
+<ul>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled checked>xxx:
+<ul>
+<li>foo</li>
+<li>bar</li>
+<li>baz</li>
+</ul></li>
+<li class="task-list-item"><input type="checkbox" class="task-list-item-checkbox" disabled>yyy:
+<ul>
+<li>qux</li>
+<li>quux</li>
+<li>quuz</li>
+</ul></li>
+</ul>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/underline.txt b/tdemarkdown/md4c/test/underline.txt
new file mode 100644
index 000000000..289e97fa1
--- /dev/null
+++ b/tdemarkdown/md4c/test/underline.txt
@@ -0,0 +1,39 @@
+
+# Underline
+
+With the flag `MD_FLAG_UNDERLINE`, MD4C sees underscore `_` rather as a mark
+denoting an underlined span rather than an ordinary emphasis (or a strong
+emphasis).
+
+```````````````````````````````` example
+_foo_
+.
+<p><u>foo</u></p>
+````````````````````````````````
+
+In sequences of multiple underscores, each single one translates into an
+underline span mark.
+
+```````````````````````````````` example
+___foo___
+.
+<p><u><u><u>foo</u></u></u></p>
+````````````````````````````````
+
+Intra-word underscores are not recognized as underline marks:
+
+```````````````````````````````` example
+foo_bar_baz
+.
+<p>foo_bar_baz</p>
+````````````````````````````````
+
+Also the parser follows the standard understanding when the underscore can
+or cannot open or close a span. Therefore there is no underline in the following
+example because no underline can be seen as a closing mark.
+
+```````````````````````````````` example
+_foo _bar
+.
+<p>_foo _bar</p>
+````````````````````````````````
diff --git a/tdemarkdown/md4c/test/wiki-links.txt b/tdemarkdown/md4c/test/wiki-links.txt
new file mode 100644
index 000000000..00d394e7f
--- /dev/null
+++ b/tdemarkdown/md4c/test/wiki-links.txt
@@ -0,0 +1,232 @@
+
+# Wiki Links
+
+With the flag `MD_FLAG_WIKILINKS`, MD4C recognizes wiki links.
+
+The simple wiki-link is a wiki-link destination enclosed in `[[` followed with
+`]]`.
+
+```````````````````````````````` example
+[[foo]]
+.
+<p><x-wikilink data-target="foo">foo</x-wikilink></p>
+````````````````````````````````
+
+However wiki-link may contain an explicit label, delimited from the destination
+with `|`.
+
+```````````````````````````````` example
+[[foo|bar]]
+.
+<p><x-wikilink data-target="foo">bar</x-wikilink></p>
+````````````````````````````````
+
+A wiki-link destination cannot be empty.
+
+```````````````````````````````` example
+[[]]
+.
+<p>[[]]</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[[|foo]]
+.
+<p>[[|foo]]</p>
+````````````````````````````````
+
+
+The wiki-link destination cannot contain a new line.
+
+```````````````````````````````` example
+[[foo
+bar]]
+.
+<p>[[foo
+bar]]</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[[foo
+bar|baz]]
+.
+<p>[[foo
+bar|baz]]</p>
+````````````````````````````````
+
+The wiki-link destination is rendered verbatim; inline markup in it is not
+recognized.
+
+```````````````````````````````` example
+[[*foo*]]
+.
+<p><x-wikilink data-target="*foo*">*foo*</x-wikilink></p>
+````````````````````````````````
+
+```````````````````````````````` example
+[[foo|![bar](bar.jpg)]]
+.
+<p><x-wikilink data-target="foo"><img src="bar.jpg" alt="bar"></x-wikilink></p>
+````````````````````````````````
+
+With multiple `|` delimiters, only the first one is recognized and the other
+ones are part of the label.
+
+```````````````````````````````` example
+[[foo|bar|baz]]
+.
+<p><x-wikilink data-target="foo">bar|baz</x-wikilink></p>
+````````````````````````````````
+
+However the delimiter `|` can be escaped with `/`.
+
+```````````````````````````````` example
+[[foo\|bar|baz]]
+.
+<p><x-wikilink data-target="foo|bar">baz</x-wikilink></p>
+````````````````````````````````
+
+The label can contain inline elements.
+
+```````````````````````````````` example
+[[foo|*bar*]]
+.
+<p><x-wikilink data-target="foo"><em>bar</em></x-wikilink></p>
+````````````````````````````````
+
+Empty explicit label is the same as using the implicit label; i.e. the verbatim
+destination string is used as the label.
+
+```````````````````````````````` example
+[[foo|]]
+.
+<p><x-wikilink data-target="foo">foo</x-wikilink></p>
+````````````````````````````````
+
+The label can span multiple lines.
+
+```````````````````````````````` example
+[[foo|foo
+bar
+baz]]
+.
+<p><x-wikilink data-target="foo">foo
+bar
+baz</x-wikilink></p>
+````````````````````````````````
+
+Wiki-links have higher priority than links.
+
+```````````````````````````````` example
+[[foo]](foo.jpg)
+.
+<p><x-wikilink data-target="foo">foo</x-wikilink>(foo.jpg)</p>
+````````````````````````````````
+
+```````````````````````````````` example
+[foo]: /url
+
+[[foo]]
+.
+<p><x-wikilink data-target="foo">foo</x-wikilink></p>
+````````````````````````````````
+
+Wiki links can be inlined in tables.
+
+```````````````````````````````` example
+| A                | B   |
+|------------------|-----|
+| [[foo|*bar*]]    | baz |
+.
+<table>
+<thead>
+<tr>
+<th>A</th>
+<th>B</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><x-wikilink data-target="foo"><em>bar</em></x-wikilink></td>
+<td>baz</td>
+</tr>
+</tbody>
+</table>
+````````````````````````````````
+
+Wiki-links are not prioritized over images.
+
+```````````````````````````````` example
+![[foo]](foo.jpg)
+.
+<p><img src="foo.jpg" alt="[foo]"></p>
+````````````````````````````````
+
+Something that may look like a wiki-link at first, but turns out not to be,
+is recognized as a normal link.
+
+```````````````````````````````` example
+[[foo]
+
+[foo]: /url
+.
+<p>[<a href="/url">foo</a></p>
+````````````````````````````````
+
+Escaping the opening `[` escapes only that one character, not the whole `[[`
+opener:
+
+```````````````````````````````` example
+\[[foo]]
+
+[foo]: /url
+.
+<p>[<a href="/url">foo</a>]</p>
+````````````````````````````````
+
+Like with other inline links, the innermost wiki-link is preferred.
+
+```````````````````````````````` example
+[[foo[[bar]]]]
+.
+<p>[[foo<x-wikilink data-target="bar">bar</x-wikilink>]]</p>
+````````````````````````````````
+
+There is limit of 100 characters for the wiki-link destination.
+
+```````````````````````````````` example
+[[12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901]]
+[[12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901|foo]]
+.
+<p>[[12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901]]
+[[12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901|foo]]</p>
+````````````````````````````````
+
+100 characters inside a wiki link target works.
+
+```````````````````````````````` example
+[[1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890]]
+[[1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890|foo]]
+.
+<p><x-wikilink data-target="1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890">1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890</x-wikilink>
+<x-wikilink data-target="1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890">foo</x-wikilink></p>
+````````````````````````````````
+
+The limit on link content does not include any characters belonging to a block
+quote, if the label spans multiple lines contained in a block quote.
+
+```````````````````````````````` example
+> [[12345678901234567890123456789012345678901234567890|1234567890
+> 1234567890
+> 1234567890
+> 1234567890
+> 123456789]]
+.
+<blockquote>
+<p><x-wikilink data-target="12345678901234567890123456789012345678901234567890">1234567890
+1234567890
+1234567890
+1234567890
+123456789</x-wikilink></p>
+</blockquote>
+````````````````````````````````
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index efb10d734..cdc35d208 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -119,7 +119,7 @@ DockContainer::~DockContainer()
     it = m_map.begin();
     KDockWidget *w=it.key();
       if (m_overlapButtons.contains(w)) {
-        (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
+        (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
         m_overlapButtons.remove(w);
       }
     m_map.remove(w);
@@ -148,7 +148,7 @@ void DockContainer::init()
   // try to restore splitter size
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
-    KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+    KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
                 parent());
     if ( sp )
       sp->setSeparatorPosX( m_separatorPos );
@@ -184,11 +184,11 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
     if (((KDockWidget*)parentWidget())->mayBeShow())
       ((KDockWidget*)parentWidget())->dockBack();
 
-    if (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))
+    if (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))
     {
       kdDebug(760)<<"*** KDockWidgetHeader has been found"<<endl;
 
-      KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader());
+      KDockWidgetHeader *hdr=::tqt_cast<KDockWidgetHeader*>(w->getHeader());
 
       KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" );
 
@@ -200,7 +200,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
       m_overlapButtons.insert(w,btn);
       btn->setOn(!isOverlapMode());
 
-      connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode()));
+      connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeOverlapMode()));
     }
 
     m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel());
@@ -209,7 +209,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
 
 //FB    m_tb->setTab(tab,true);
 
-    connect(m_tb->tab(tab),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int)));
+    connect(m_tb->tab(tab),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int)));
 
     kdDebug(760)<<"DockContainer::insertWidget()"<<endl;
 
@@ -233,7 +233,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
 
 bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 {
-    if (TQT_BASE_OBJECT(obj)==TQT_BASE_OBJECT(m_tb)) {
+    if (obj==m_tb) {
 	if ( (event->type()==TQEvent::Resize)  && (m_ws->isHidden()) ) {
 		TQSize size=((TQResizeEvent*)event)->size();
 		  if (m_vertical)
@@ -246,7 +246,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
     switch ( event->type() ){
       case TQEvent::MouseButtonPress:
 	{
-		    KDockWidget * w=m_revMap[tqt_dynamic_cast<KMultiTabBarTab*>(obj)->id()];
+		    KDockWidget * w=m_revMap[dynamic_cast<KMultiTabBarTab*>(obj)->id()];
 		    if (!w)  {
 			kdDebug()<<"NoWidget"<<endl;
 			break;
@@ -255,13 +255,13 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 				kdDebug()<<"NO HEADER"<<endl;
 				break;
 			}
-		      KDockWidgetHeader *hdr=::tqqt_cast<KDockWidgetHeader*>(w->getHeader());
+		      KDockWidgetHeader *hdr=::tqt_cast<KDockWidgetHeader*>(w->getHeader());
 			if (!hdr) {
 				kdDebug()<<"Wrong header type in DockContainer::eventFilter"<<endl;
 				break;
 			}
 			m_dockManager=w->dockManager();
-			m_dragPanel=TQT_TQOBJECT(hdr->dragPanel());
+			m_dragPanel=hdr->dragPanel();
 			if (m_dragPanel) m_movingState=WaitingForMoveStart;
 			delete m_startEvent;
 			m_startEvent=new TQMouseEvent(* ((TQMouseEvent*)event));
@@ -279,7 +279,7 @@ bool DockContainer::eventFilter( TQObject *obj, TQEvent *event )
 		if (m_movingState==WaitingForMoveStart) {
 			TQPoint p( ((TQMouseEvent*)event)->pos() - m_startEvent->pos() );
 		        if( p.manhattanLength() > TDEGlobalSettings::dndEventDelay()) {
-				m_dockManager->eventFilter(m_dragPanel,TQT_TQEVENT(m_startEvent));
+				m_dockManager->eventFilter(m_dragPanel,static_cast<TQEvent*>(m_startEvent));
 				m_dockManager->eventFilter(m_dragPanel,event);
 				m_movingState=Moving;
 			}
@@ -307,7 +307,7 @@ void DockContainer::showWidget(KDockWidget *w) {
 
 void DockContainer::changeOverlapMode()
 {
-  const KDockButton_Private *btn=tqt_dynamic_cast<const KDockButton_Private*>(sender());
+  const KDockButton_Private *btn=dynamic_cast<const KDockButton_Private*>(sender());
 
   kdDebug(760)<<"DockContainer::changeOverlapMode: button=="<<btn<<endl;
 
@@ -355,7 +355,7 @@ void DockContainer::removeWidget(KDockWidget* dwdg)
   m_map.remove(w);
   m_revMap.remove(id);
   if (m_overlapButtons.contains(w)) {
-    (::tqqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
+    (::tqt_cast<KDockWidgetHeader*>(w->getHeader()))->removeButton(m_overlapButtons[w]);
     m_overlapButtons.remove(w);
   }
   KDockContainer::removeWidget(w);
@@ -403,7 +403,7 @@ void DockContainer::tabClicked(int t)
     }
     m_ws->raiseWidget(t);
     if (m_ws->widget(t)) {
-      KDockWidget *tmpDw=::tqqt_cast<KDockWidget*>(m_ws->widget(t));
+      KDockWidget *tmpDw=::tqt_cast<KDockWidget*>(m_ws->widget(t));
       if (tmpDw) {
         if (tmpDw->getWidget()) tmpDw->getWidget()->setFocus();
       } else kdDebug(760)<<"Something really weird is going on"<<endl;
@@ -420,7 +420,7 @@ void DockContainer::tabClicked(int t)
        // try save splitter position
       if ( parentDockWidget() && parentDockWidget()->parent() )
       {
-        KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+        KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
                     parent());
         if ( sp )
           m_separatorPos = sp->separatorPos();
@@ -473,7 +473,7 @@ void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix)
   // try to save the splitter position
   if ( parentDockWidget() && parentDockWidget()->parent() )
   {
-    KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+    KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
                 parent());
     if ( sp )
       cfg->writeEntry( "separatorPosition", m_separatorPos );
@@ -573,14 +573,14 @@ void DockContainer::load(TDEConfig* cfg,const TQString& group_or_prefix)
         kapp->syncX();*/
 
         m_delayedRaise=it.data();
-        TQTimer::singleShot(0,this,TQT_SLOT(delayedRaise()));
+        TQTimer::singleShot(0,this,TQ_SLOT(delayedRaise()));
         kdDebug(760)<<"************** raising *******: "<<it.key()->name()<<endl;
         break;
       }
     }
 
   }
-  if (m_delayedRaise==-1)   TQTimer::singleShot(0,this,TQT_SLOT(init()));
+  if (m_delayedRaise==-1)   TQTimer::singleShot(0,this,TQ_SLOT(init()));
   cfg->setGroup(grp);
 
 }
@@ -612,7 +612,7 @@ void DockContainer::toggle() {
     if (m_tb->isTabRaised(oldtab)) {
         m_tb->setTab(oldtab,false);
             tabClicked(oldtab);
-        //    KMDI::MainWindow *mainFrm = tqt_dynamic_cast<KMDI::MainWindow*>(m_mainWin);
+        //    KMDI::MainWindow *mainFrm = dynamic_cast<KMDI::MainWindow*>(m_mainWin);
         //     if (mainFrm && mainFrm->activeWindow() ) // TODO
          //           mainFrm->activeWindow()->setFocus();
 
diff --git a/tdemdi/tdemdi/dockcontainer.h b/tdemdi/tdemdi/dockcontainer.h
index 57855bfa0..cbe71a944 100644
--- a/tdemdi/tdemdi/dockcontainer.h
+++ b/tdemdi/tdemdi/dockcontainer.h
@@ -38,7 +38,7 @@ namespace KMDI
 
 class DockContainer: public TQWidget, public KDockContainer
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DockContainer(TQWidget *parent, TQWidget *win, int position, int flags);
diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp
index 92a24acd5..32f0c2aea 100644
--- a/tdemdi/tdemdi/guiclient.cpp
+++ b/tdemdi/tdemdi/guiclient.cpp
@@ -57,8 +57,8 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
 {
   m_mdiMainFrm=mdiMainFrm;
 
-  connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
-           this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+  connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+           this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
 
   /* re-use an existing resource file if it exists. can happen if the user launches the
    * toolbar editor */
@@ -79,18 +79,18 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name)
   m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu");
 
   m_gotoToolDockMenu=new TDEActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu");
-  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()),
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQ_SIGNAL(toggleTop()),
   actionCollection(),"tdemdi_activate_top"));
-  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()),
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQ_SIGNAL(toggleLeft()),
   actionCollection(),"tdemdi_activate_left"));
-  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()),
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQ_SIGNAL(toggleRight()),
   actionCollection(),"tdemdi_activate_right"));
-  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()),
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQ_SIGNAL(toggleBottom()),
   actionCollection(),"tdemdi_activate_bottom"));
   m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator"));
-  m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(prevToolViewInDock()),
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQ_SLOT(prevToolViewInDock()),
   actionCollection(),"tdemdi_prev_toolview"));
-  m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,TQT_TQOBJECT(m_mdiMainFrm),TQT_SLOT(nextToolViewInDock()),
+  m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQ_SLOT(nextToolViewInDock()),
   actionCollection(),"tdemdi_next_toolview"));
 
   actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -146,12 +146,12 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva)
   cfg->setGroup( _grp );
 
   TDEAction *a=new ToggleToolViewAction(i18n("Show %1").arg(mtva->wrappedWidget()->caption()),
-    /*TQString::null*/sc,tqt_dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
+    /*TQString::null*/sc,dynamic_cast<KDockWidget*>(mtva->wrapperWidget()),
     m_mdiMainFrm,actionCollection(), aname.latin1() );
 
   ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption())));
 
-  connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*)));
+  connect(a,TQ_SIGNAL(destroyed(TQObject*)),this,TQ_SLOT(actionDeleted(TQObject*)));
 
   m_toolViewActions.append(a);
   m_toolMenu->insert(a);
@@ -181,9 +181,9 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor
 {
   if (m_dw)
   {
-    connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
-    connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));
-    connect(m_dw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWidgetDestroyed()));
+    connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool)));
+    connect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged()));
+    connect(m_dw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWidgetDestroyed()));
 
     setChecked(m_dw->mayBeHide());
   }
@@ -201,7 +201,7 @@ void ToggleToolViewAction::anDWChanged()
   else if ((!isChecked()) && m_dw->mayBeHide())
     setChecked(true);
   else if (isChecked() && (m_dw->parentDockTabGroup() &&
-          ((::tqqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
+          ((::tqt_cast<KDockWidget*>(m_dw->parentDockTabGroup()->
                   parent()))->mayBeShow())))
     setChecked(false);
 }
@@ -218,8 +218,8 @@ void ToggleToolViewAction::slotToggled(bool t)
 
 void ToggleToolViewAction::slotWidgetDestroyed()
 {
-  disconnect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));
-  disconnect(this,TQT_SIGNAL(toggled(bool)),0,0);
+  disconnect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged()));
+  disconnect(this,TQ_SIGNAL(toggled(bool)),0,0);
 
   unplugAll();
   deleteLater();
diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index d4f752d64..14ccfa10a 100644
--- a/tdemdi/tdemdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -44,7 +44,7 @@ class GUIClientPrivate;
 
 class GUIClient : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     GUIClient( KMDI::MainWindow *mdiMainFrm, const char *name = 0 );
@@ -78,7 +78,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 
 class ToggleToolViewAction:public TDEToggleAction
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut = TDEShortcut(),
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 4f23e3a9e..925f7619a 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -139,7 +139,7 @@ void MainWindow::setupMainDock ()
   setMainDockWidget(dw);
 
   // connect signals to collapse sidebars
-  connect(m_tabWidget,TQT_SIGNAL(focusInEvent()),this,TQT_SIGNAL(collapseOverlapContainers()));
+  connect(m_tabWidget,TQ_SIGNAL(focusInEvent()),this,TQ_SIGNAL(collapseOverlapContainers()));
 }
 
 void MainWindow::setupToolViews ()
@@ -153,7 +153,7 @@ void MainWindow::setupToolViews ()
   KDockWidget *w=mainDock;
 
   if (mainDock->parentDockTabGroup()) {
-    w=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()));
+    w=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
   }
 
   TQPtrList<KDockWidget> leftReparentWidgets;
@@ -162,7 +162,7 @@ void MainWindow::setupToolViews ()
   TQPtrList<KDockWidget> topReparentWidgets;
 
   if (mainDock->parentDockTabGroup()) {
-    mainDock=static_cast<KDockWidget*>(TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()));
+    mainDock=static_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
   }
 
   findToolViewsDockedToMain(&leftReparentWidgets,KDockWidget::DockLeft);
@@ -180,40 +180,40 @@ void MainWindow::setupToolViews ()
   m_leftContainer->manualDock(mainDock, KDockWidget::DockLeft,20);
   tmpDC->init();
 
-  connect (this,TQT_SIGNAL(toggleLeft()),tmpDC,TQT_SLOT(toggle()));
-  connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
-  connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
-  connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+  connect (this,TQ_SIGNAL(toggleLeft()),tmpDC,TQ_SLOT(toggle()));
+  connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+  connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+  connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
 
   m_rightContainer->setWidget(tmpDC=new DockContainer(m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode));
   m_rightContainer->setEnableDocking(KDockWidget::DockRight);
   m_rightContainer->manualDock(mainDock, KDockWidget::DockRight,80);
   tmpDC->init();
 
-  connect (this,TQT_SIGNAL(toggleRight()),tmpDC,TQT_SLOT(toggle()));
-  connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
-  connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
-  connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+  connect (this,TQ_SIGNAL(toggleRight()),tmpDC,TQ_SLOT(toggle()));
+  connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+  connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+  connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
 
   m_topContainer->setWidget(tmpDC=new DockContainer(m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode));
   m_topContainer->setEnableDocking(KDockWidget::DockTop);
   m_topContainer->manualDock(mainDock, KDockWidget::DockTop,20);
   tmpDC->init();
 
-  connect (this,TQT_SIGNAL(toggleTop()),tmpDC,TQT_SLOT(toggle()));
-  connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
-  connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
-  connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+  connect (this,TQ_SIGNAL(toggleTop()),tmpDC,TQ_SLOT(toggle()));
+  connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+  connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+  connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
 
   m_bottomContainer->setWidget(tmpDC=new DockContainer(m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode));
   m_bottomContainer->setEnableDocking(KDockWidget::DockBottom);
   m_bottomContainer->manualDock(mainDock, KDockWidget::DockBottom,80);
   tmpDC->init();
 
-  connect (this,TQT_SIGNAL(toggleBottom()),tmpDC,TQT_SLOT(toggle()));
-  connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped()));
-  connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*)));
-  connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*)));
+  connect (this,TQ_SIGNAL(toggleBottom()),tmpDC,TQ_SLOT(toggle()));
+  connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped()));
+  connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*)));
+  connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*)));
 
   m_leftContainer->setDockSite( KDockWidget::DockCenter );
   m_rightContainer->setDockSite( KDockWidget::DockCenter );
@@ -240,10 +240,10 @@ void MainWindow::setupGUIClient ()
 {
   m_guiClient = new KMDIPrivate::GUIClient (this);
 
-  connect(m_guiClient,TQT_SIGNAL(toggleTop()),this,TQT_SIGNAL(toggleTop()));
-  connect(m_guiClient,TQT_SIGNAL(toggleLeft()),this,TQT_SIGNAL(toggleLeft()));
-  connect(m_guiClient,TQT_SIGNAL(toggleRight()),this,TQT_SIGNAL(toggleRight()));
-  connect(m_guiClient,TQT_SIGNAL(toggleBottom()),this,TQT_SIGNAL(toggleBottom()));
+  connect(m_guiClient,TQ_SIGNAL(toggleTop()),this,TQ_SIGNAL(toggleTop()));
+  connect(m_guiClient,TQ_SIGNAL(toggleLeft()),this,TQ_SIGNAL(toggleLeft()));
+  connect(m_guiClient,TQ_SIGNAL(toggleRight()),this,TQ_SIGNAL(toggleRight()));
+  connect(m_guiClient,TQ_SIGNAL(toggleBottom()),this,TQ_SIGNAL(toggleBottom()));
 }
 
 TabWidget *MainWindow::tabWidget ()
@@ -311,23 +311,23 @@ void MainWindow::setToolViewStyle(int flag)
 {
   d->m_styleIDEAlMode = flag; // see KMultiTabBar for the first 3 bits
 
-  DockContainer *tmpL=::tqqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget());
+  DockContainer *tmpL=::tqt_cast<KMDI::DockContainer*>(m_leftContainer->getWidget());
   if (tmpL) tmpL->setStyle(flag);
 
-  DockContainer *tmpR=::tqqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget());
+  DockContainer *tmpR=::tqt_cast<KMDI::DockContainer*>(m_rightContainer->getWidget());
   if (tmpR) tmpR->setStyle(flag);
 
-  DockContainer *tmpT=::tqqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget());
+  DockContainer *tmpT=::tqt_cast<KMDI::DockContainer*>(m_topContainer->getWidget());
   if (tmpT) tmpT->setStyle(flag);
 
-  DockContainer *tmpB=::tqqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget());
+  DockContainer *tmpB=::tqt_cast<KMDI::DockContainer*>(m_bottomContainer->getWidget());
   if (tmpB) tmpB->setStyle(flag);
 
   d->m_toolviewStyle = flag;
   bool toolviewExists = false;
   TQMap<TQWidget*,KMDI::ToolViewAccessor*>::Iterator it;
   for (it = m_toolViews->begin(); it != m_toolViews->end(); ++it) {
-    KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>(it.data()->wrapperWidget());
+    KDockWidget *dockWidget = dynamic_cast<KDockWidget*>(it.data()->wrapperWidget());
     if (dockWidget) {
       if (flag == KMDI::IconOnly)
       {
@@ -373,18 +373,18 @@ void MainWindow::dockToolViewsIntoContainers(TQPtrList<KDockWidget>& widgetsToRe
 void MainWindow::findToolViewsDockedToMain(TQPtrList<KDockWidget>* list,KDockWidget::DockPosition dprtmw) {
   KDockWidget *mainDock=getMainDockWidget();
   if (mainDock->parentDockTabGroup()) {
-    mainDock=tqt_dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
+    mainDock=dynamic_cast<KDockWidget*>(mainDock->parentDockTabGroup()->parent());
     // FIXME: will likely crash below due to unchecked cast
   }
 
   KDockWidget* widget=mainDock->findNearestDockWidget(dprtmw);
   if (widget) {
     if (widget->parentDockTabGroup()) {
-      widget=static_cast<KDockWidget*>(TQT_TQWIDGET(widget->parentDockTabGroup()->parent()));
+      widget=static_cast<KDockWidget*>(widget->parentDockTabGroup()->parent());
     }
 
     if (widget) {
-      KDockTabGroup *tg=tqt_dynamic_cast<KDockTabGroup*>(widget->
+      KDockTabGroup *tg=dynamic_cast<KDockTabGroup*>(widget->
           getWidget());
       if (tg) {
         kdDebug(760)<<"KDockTabGroup found"<<endl;
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 133abd4a9..835093e6e 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -71,7 +71,7 @@ class TabWidget;
 
 class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KMDI::ToolViewAccessor;
 
diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp
index 01eb6d889..5dff64920 100644
--- a/tdemdi/tdemdi/tabwidget.cpp
+++ b/tdemdi/tdemdi/tabwidget.cpp
@@ -70,7 +70,7 @@ TabWidget::TabWidget(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*)));
 }
 
 TabWidget::~TabWidget()
@@ -89,9 +89,9 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
   {
     // if we lost a child we uninstall ourself as event filter for the lost
     // child and its children
-    TQObject* pLostChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
+    TQObject* pLostChild = ((TQChildEvent*)e)->child();
     if ((pLostChild != 0L) && (pLostChild->isWidgetType())) {
-       TQObjectList *list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
+       TQObjectList *list = pLostChild->queryList( "TQWidget" );
        list->insert(0, pLostChild);        // add the lost child to the list too, just to save code
        TQObjectListIt it( *list );          // iterate over all lost child widgets
        TQObject * o;
@@ -108,13 +108,13 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
     // if we got a new child and we are attached to the MDI system we
     // install ourself as event filter for the new child and its children
     // (as we did when we were added to the MDI system).
-    TQObject* pNewChild = TQT_TQOBJECT(((TQChildEvent*)e)->child());
+    TQObject* pNewChild = ((TQChildEvent*)e)->child();
     if ((pNewChild != 0L) && (pNewChild->isWidgetType()))
     {
        TQWidget* pNewWidget = (TQWidget*)pNewChild;
        if (pNewWidget->testWFlags((WFlags)(WType_Dialog | WShowModal)))
            return false;
-       TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+       TQObjectList *list = pNewWidget->queryList( "TQWidget" );
        list->insert(0, pNewChild);         // add the new child to the list too, just to save code
        TQObjectListIt it( *list );          // iterate over all new child widgets
        TQObject * o;
@@ -122,7 +122,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e )
           TQWidget* widg = (TQWidget*)o;
           ++it;
           widg->installEventFilter(this);
-          connect(widg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(childDestroyed()));
+          connect(widg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(childDestroyed()));
        }
        delete list;                        // delete the list, not the objects
     }
@@ -135,10 +135,10 @@ void TabWidget::childDestroyed()
 {
   // if we lost a child we uninstall ourself as event filter for the lost
   // child and its children
-  const TQObject* pLostChild = TQT_TQOBJECT_CONST(sender());
+  const TQObject* pLostChild = sender();
   if ((pLostChild != 0L) && (pLostChild->isWidgetType()))
   {
-     TQObjectList *list = ((TQObject*)(pLostChild))->queryList(TQWIDGET_OBJECT_NAME_STRING);
+     TQObjectList *list = ((TQObject*)(pLostChild))->queryList("TQWidget");
      list->insert(0, pLostChild);        // add the lost child to the list too, just to save code
      TQObjectListIt it( *list );          // iterate over all lost child widgets
      TQObject * obj;
diff --git a/tdemdi/tdemdi/tabwidget.h b/tdemdi/tdemdi/tabwidget.h
index dd79f92a7..ecae1ec64 100644
--- a/tdemdi/tdemdi/tabwidget.h
+++ b/tdemdi/tdemdi/tabwidget.h
@@ -55,7 +55,7 @@ namespace KMDI
 
 class KMDI_EXPORT TabWidget : public KTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TabWidget(TQWidget* parent, const char* name=0);
diff --git a/tdemdi/tdemdi/toolviewaccessor.cpp b/tdemdi/tdemdi/toolviewaccessor.cpp
index 1b640b532..24242b0df 100644
--- a/tdemdi/tdemdi/toolviewaccessor.cpp
+++ b/tdemdi/tdemdi/toolviewaccessor.cpp
@@ -37,7 +37,7 @@ ToolViewAccessor::ToolViewAccessor( KMDI::MainWindow *parent, TQWidget *widgetTo
 	mdiMainFrm=parent;
 	d=new KMDIPrivate::ToolViewAccessorPrivate();
 	if (widgetToWrap->inherits("KDockWidget")) {
-		d->widgetContainer=tqt_dynamic_cast<KDockWidget*>(widgetToWrap);
+		d->widgetContainer=dynamic_cast<KDockWidget*>(widgetToWrap);
 		d->widget=d->widgetContainer->getWidget();
 	} else {
 		d->widget=widgetToWrap;
@@ -82,7 +82,7 @@ ToolViewAccessor::~ToolViewAccessor() {
 TQWidget *ToolViewAccessor::wrapperWidget() {
 	if (!d->widgetContainer) {
 		d->widgetContainer=mdiMainFrm->createDockWidget( "ToolViewAccessor::null",TQPixmap());
-		connect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*)));
+		connect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*)));
 	}
 	return d->widgetContainer;
 }
@@ -96,7 +96,7 @@ void ToolViewAccessor::setWidgetToWrap(TQWidget *widgetToWrap, const TQString& t
 {
 	Q_ASSERT(!(d->widget));
 	Q_ASSERT(!widgetToWrap->inherits("KDockWidget"));
-	disconnect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*)));
+	disconnect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*)));
 	delete d->widget;
     d->widget=widgetToWrap;
 	KDockWidget *tmp=d->widgetContainer;
diff --git a/tdemdi/tdemdi/toolviewaccessor.h b/tdemdi/tdemdi/toolviewaccessor.h
index 2278a3931..d27a50c0f 100644
--- a/tdemdi/tdemdi/toolviewaccessor.h
+++ b/tdemdi/tdemdi/toolviewaccessor.h
@@ -39,7 +39,7 @@ class MainWindow;
 
 class ToolViewAccessor : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
    friend class KMDI::MainWindow;
    friend class KMDIPrivate::GUIClient;
diff --git a/tdemdi/tdemdichildarea.cpp b/tdemdi/tdemdichildarea.cpp
index 0cc3738cd..bebbf0b71 100644
--- a/tdemdi/tdemdichildarea.cpp
+++ b/tdemdi/tdemdichildarea.cpp
@@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent )
 	m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor();
 	m_pZ = new TQPtrList<KMdiChildFrm>;
 	m_pZ->setAutoDelete( true );
-	setFocusPolicy( TQ_ClickFocus );
+	setFocusPolicy( TQWidget::ClickFocus );
 	m_defaultChildFrmSize = TQSize( 400, 300 );
 }
 
@@ -218,12 +218,8 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ )
 		else
 			child->raise();
 		
-#ifdef USE_QT4
-		child->m_pClient->setFocus();
-#else // USE_QT4
 		TQFocusEvent::setReason( TQFocusEvent::Other );
 		child->m_pClient->setFocus();
-#endif // USE_QT4
 	}
 }
 
@@ -253,7 +249,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e )
 void KMdiChildArea::mousePressEvent( TQMouseEvent *e )
 {
 	//Popup the window menu
-	if ( e->button() & Qt::RightButton )
+	if ( e->button() & TQt::RightButton )
 		emit popupWindowMenu( mapToGlobal( e->pos() ) );
 }
 
diff --git a/tdemdi/tdemdichildarea.h b/tdemdi/tdemdichildarea.h
index a3361bc9b..a755df515 100644
--- a/tdemdi/tdemdichildarea.h
+++ b/tdemdi/tdemdichildarea.h
@@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiChildArea : public TQFrame
 	friend class KMdiChildFrmCaption;
 	friend class KMdiChildFrm;
 
-Q_OBJECT
+TQ_OBJECT
 
 	// attributes
 public:
diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp
index 4bdc98984..ba5048b87 100644
--- a/tdemdi/tdemdichildfrm.cpp
+++ b/tdemdi/tdemdichildfrm.cpp
@@ -138,10 +138,10 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 	m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" );
 	m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" );
 
-	TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
-	TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) );
-	TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) );
-	TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) );
+	TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
+	TQObject::connect( m_pMaximize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( maximizePressed() ) );
+	TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closePressed() ) );
+	TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( undockPressed() ) );
 
 	m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) );
 	if ( m_pIconButtonPixmap->isNull() )
@@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent )
 
 	redecorateButtons();
 
-	m_pWinIcon->setFocusPolicy( TQ_NoFocus );
-	m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
-	m_pClose->setFocusPolicy( TQ_NoFocus );
-	m_pMinimize->setFocusPolicy( TQ_NoFocus );
-	m_pMaximize->setFocusPolicy( TQ_NoFocus );
-	m_pUndock->setFocusPolicy( TQ_NoFocus );
+	m_pWinIcon->setFocusPolicy( TQWidget::NoFocus );
+	m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus );
+	m_pClose->setFocusPolicy( TQWidget::NoFocus );
+	m_pMinimize->setFocusPolicy( TQWidget::NoFocus );
+	m_pMaximize->setFocusPolicy( TQWidget::NoFocus );
+	m_pUndock->setFocusPolicy( TQWidget::NoFocus );
 
 	setFrameStyle( TQFrame::WinPanel | TQFrame::Raised );
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 
 	setMouseTracking( true );
 
@@ -238,19 +238,19 @@ void KMdiChildFrm::setResizeCursor( int resizeCorner )
 		break;
 	case KMDI_RESIZE_LEFT:
 	case KMDI_RESIZE_RIGHT:
-		TQApplication::setOverrideCursor( tqsizeHorCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeHorCursor, true );
 		break;
 	case KMDI_RESIZE_TOP:
 	case KMDI_RESIZE_BOTTOM:
-		TQApplication::setOverrideCursor( tqsizeVerCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeVerCursor, true );
 		break;
 	case KMDI_RESIZE_TOPLEFT:
 	case KMDI_RESIZE_BOTTOMRIGHT:
-		TQApplication::setOverrideCursor( tqsizeFDiagCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeFDiagCursor, true );
 		break;
 	case KMDI_RESIZE_BOTTOMLEFT:
 	case KMDI_RESIZE_TOPRIGHT:
-		TQApplication::setOverrideCursor( tqsizeBDiagCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeBDiagCursor, true );
 		break;
 	}
 }
@@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e )
 
 	if ( m_bResizing )
 	{
-		if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) )
+		if ( !( e->state() & TQt::RightButton ) && !( e->state() & TQt::MidButton ) )
 		{
 			// same as: if no button or left button pressed
 			TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() );
@@ -540,8 +540,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 			}
 			m_pMinimize->setPixmap( *m_pMinButtonPixmap );
 			m_pMaximize->setPixmap( *m_pMaxButtonPixmap );
-			TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) );
-			TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
+			TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) );
+			TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
 			setGeometry( m_restoredRect );
 			break;
 		case Normal:
@@ -566,8 +566,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ )
 				// reset to maximize-captionbar
 				m_pMaximize->setPixmap( *m_pRestoreButtonPixmap );
 				m_pMinimize->setPixmap( *m_pMinButtonPixmap );
-				TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) );
-				TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
+				TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) );
+				TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
 				int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER;
 				int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR +
 				                   m_pCaption->heightHint();
@@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm )
 	if ( p.width() != 18 || p.height() != 18 )
 	{
 		TQImage img = p.convertToImage();
-		p = img.smoothScale( 18, 18, TQ_ScaleMin );
+		p = img.smoothScale( 18, 18, TQImage::ScaleMin );
 	}
 	const bool do_resize = m_pIconButtonPixmap->size() != p.size();
 	*m_pIconButtonPixmap = p;
@@ -750,9 +750,9 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 	}
 
 	// memorize the focuses in a dictionary because they will get lost during reparenting
-	TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
+	TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>;
 	pFocPolDict->setAutoDelete( true );
-	TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList *list = m_pClient->queryList( "TQWidget" );
 	TQObjectListIt it( *list );          // iterate over the buttons
 	TQObject * obj;
 	int i = 1;
@@ -768,14 +768,14 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 			widg->setName( tmpStr.latin1() );
 			i++;
 		}
-		TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
+		TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy;
 		*pFocPol = widg->focusPolicy();
 		pFocPolDict->insert( widg->name(), pFocPol );
 	}
 	delete list;                        // delete the list, not the objects
 
 	//Reparent if needed
-	if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) )
+	if ( w->parent() != this )
 	{
 		//reparent to this widget , no flags , point , show it
 		TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos );
@@ -795,7 +795,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize )
 
 	linkChildren( pFocPolDict );
 
-	TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
+	TQObject::connect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) );
 
 	if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() )
 		setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER );
@@ -814,10 +814,10 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	if ( !m_pClient )
 		return ;
 
-	TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) );
+	TQObject::disconnect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) );
 
 	//reparent to desktop widget , no flags , point , show it
-	TQDict<TQ_FocusPolicy>* pFocPolDict;
+	TQDict<TQWidget::FocusPolicy>* pFocPolDict;
 	pFocPolDict = unlinkChildren();
 
 	// get name of focused child widget
@@ -833,7 +833,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	m_pClient->setMaximumSize( maxs.width(), maxs.height() );
 
 	// remember the focus policies using the dictionary and reset them
-	TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList *list = m_pClient->queryList( "TQWidget" );
 	TQObjectListIt it( *list );          // iterate over all child widgets of child frame
 	TQObject * obj;
 	TQWidget* firstFocusableChildWidget = 0;
@@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	{ // for each found object...
 		TQWidget * widg = ( TQWidget* ) obj;
 		++it;
-		TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
+		TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
 		if ( pFocPol )
 			widg->setFocusPolicy( *pFocPol );
 		
@@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 			widg->setFocus();
 
 		// get first and last focusable widget
-		if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) )
+		if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) )
 		{
 			if ( firstFocusableChildWidget == 0 )
 				firstFocusableChildWidget = widg;  // first widget
@@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 		}
 		else
 		{
-			if ( widg->focusPolicy() == TQ_WheelFocus )
+			if ( widg->focusPolicy() == TQWidget::WheelFocus )
 			{
 				if ( firstFocusableChildWidget == 0 )
 					firstFocusableChildWidget = widg;  // first widget
@@ -877,29 +877,29 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset )
 	m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget );
 
 	// reset the focus policy of the view
-	m_pClient->setFocusPolicy( TQ_ClickFocus );
+	m_pClient->setFocusPolicy( TQWidget::ClickFocus );
 
 	// lose information about the view (because it's undocked now)
 	m_pClient = 0;
 }
 
 //============== linkChildren =============//
-void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
+void KMdiChildFrm::linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict )
 {
 	// reset the focus policies for all widgets in the view (take them from the dictionary)
-	TQObjectList* list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList* list = m_pClient->queryList( "TQWidget" );
 	TQObjectListIt it( *list );          // iterate over all child widgets of child frame
 	TQObject* obj;
 	while ( ( obj = it.current() ) != 0 )
 	{ // for each found object...
 		TQWidget* widg = ( TQWidget* ) obj;
 		++it;
-		TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
+		TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent
 		
 		if ( pFocPol != 0 )
 			widg->setFocusPolicy( *pFocPol );
 		
-		if ( !( widg->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) )
+		if ( !( widg->inherits( "TQPopupMenu" ) ) )
 			widg->installEventFilter( this );
 
 	}
@@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
 	delete pFocPolDict;
 
 	// reset the focus policies for the rest
-	m_pWinIcon->setFocusPolicy( TQ_NoFocus );
-	m_pUnixIcon->setFocusPolicy( TQ_NoFocus );
-	m_pClient->setFocusPolicy( TQ_ClickFocus );
-	m_pCaption->setFocusPolicy( TQ_NoFocus );
-	m_pUndock->setFocusPolicy( TQ_NoFocus );
-	m_pMinimize->setFocusPolicy( TQ_NoFocus );
-	m_pMaximize->setFocusPolicy( TQ_NoFocus );
-	m_pClose->setFocusPolicy( TQ_NoFocus );
+	m_pWinIcon->setFocusPolicy( TQWidget::NoFocus );
+	m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus );
+	m_pClient->setFocusPolicy( TQWidget::ClickFocus );
+	m_pCaption->setFocusPolicy( TQWidget::NoFocus );
+	m_pUndock->setFocusPolicy( TQWidget::NoFocus );
+	m_pMinimize->setFocusPolicy( TQWidget::NoFocus );
+	m_pMaximize->setFocusPolicy( TQWidget::NoFocus );
+	m_pClose->setFocusPolicy( TQWidget::NoFocus );
 
 	// install the event filter (catch mouse clicks) for the rest
 	m_pWinIcon->installEventFilter( this );
@@ -930,13 +930,13 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict )
 
 //============== unlinkChildren =============//
 
-TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
+TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren()
 {
 	// memorize the focuses in a dictionary because they will get lost during reparenting
-	TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>;
+	TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>;
 	pFocPolDict->setAutoDelete( true );
 
-	TQObjectList *list = m_pClient->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList *list = m_pClient->queryList( "TQWidget" );
 	TQObjectListIt it( *list );          // iterate over all child widgets of child frame
 	TQObject * obj;
 	int i = 1;
@@ -953,7 +953,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren()
 			w->setName( tmpStr.latin1() );
 			i++;
 		}
-		TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy;
+		TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy;
 		*pFocPol = w->focusPolicy();
 		// memorize focus policy
 		pFocPolDict->insert( w->name(), pFocPol );
@@ -1085,7 +1085,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			TQObject* pObj = obj;
 			while ( ( pObj != 0L ) && !bIsChild )
 			{
-				bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) );
+				bIsChild = ( pObj == this );
 				pObj = pObj->parent();
 			}
 			// unset the resize cursor if the cursor moved from the frame into a inner widget
@@ -1095,13 +1095,13 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 		break;
 	case TQEvent::MouseButtonPress:
 		{
-			if ( !hasParent( TQT_TQOBJECT(m_pClient), obj ) )
+			if ( !hasParent( m_pClient, obj ) )
 			{
 				bool bIsSecondClick = false;
 				if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() )
 					bIsSecondClick = true;  // of a possible double click
 
-				if ( !( ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) && bIsSecondClick ) )
+				if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) )
 				{
 					// in case we didn't click on the icon button
 					TQFocusEvent focusEvent( TQFocusEvent::FocusIn );
@@ -1112,16 +1112,16 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 						m_pClient->activate();
 					}
 					
-					if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) )
+					if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) )
 					{
 						TQWidget* w = ( TQWidget* ) obj;
-						if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) )
+						if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) )
 						{
 							w->setFocus();
 						}
 					}
 				}
-				if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) )
+				if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) )
 				{
 					// in case we clicked on the icon button
 					if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() )
@@ -1154,8 +1154,8 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 		{
 			// if we lost a child we uninstall ourself as event filter for the lost
 			// child and its children
-			TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child());
-			if ( ( pLostChild != 0L )   /*&& (pLostChild->inherits(TQWIDGET_OBJECT_NAME_STRING))*/ )
+			TQObject* pLostChild = ( ( TQChildEvent* ) e )->child();
+			if ( ( pLostChild != 0L )   /*&& (pLostChild->inherits("TQWidget"))*/ )
 			{
 				TQObjectList* list = pLostChild->queryList();
 				list->insert( 0, pLostChild );        // add the lost child to the list too, just to save code
@@ -1176,11 +1176,11 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 			// if we got a new child we install ourself as event filter for the new
 			// child and its children (as we did when we got our client).
 			// XXX see linkChildren() and focus policy stuff
-			TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
-			if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) )
+			TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child();
+			if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) )
 			{
-				TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild );
-				TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+				TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild );
+				TQObjectList *list = pNewWidget->queryList( "TQWidget" );
 				list->insert( 0, pNewChild );         // add the new child to the list too, just to save code
 				TQObjectListIt it( *list );          // iterate over all new child widgets
 				TQObject * obj;
@@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e )
 				{ // for each found object...
 					TQWidget * widg = ( TQWidget* ) obj;
 					++it;
-					if ( !::tqqt_cast<TQPopupMenu*>( widg ) )
+					if ( !::tqt_cast<TQPopupMenu*>( widg ) )
 					{
 						widg->installEventFilter( this );
 					}
@@ -1234,11 +1234,11 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const
 
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
 	{
-		m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) );
-		m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) );
-		m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) );
-		m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQT_SLOT( minimizePressed() ) );
-		m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQT_SLOT( maximizePressed() ) );
+		m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) );
+		m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) );
+		m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) );
+		m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQ_SLOT( minimizePressed() ) );
+		m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQ_SLOT( maximizePressed() ) );
 		if ( state() == Normal )
 			m_pSystemMenu->setItemEnabled( m_pSystemMenu->idAt( 0 ), false );
 		else if ( state() == Maximized )
@@ -1256,20 +1256,20 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const
 	else
 	{
 		if ( state() != Normal )
-			m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) );
+			m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) );
 		if ( state() != Maximized )
-			m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQT_SLOT( maximizePressed() ) );
+			m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQ_SLOT( maximizePressed() ) );
 		if ( state() != Minimized )
-			m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQT_SLOT( minimizePressed() ) );
+			m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQ_SLOT( minimizePressed() ) );
 		if ( state() != Maximized )
-			m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) );
+			m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) );
 		if ( state() == Normal )
-			m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) );
+			m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) );
 	}
 
-	m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQT_SLOT( undockPressed() ) );
+	m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQ_SLOT( undockPressed() ) );
 	m_pSystemMenu->insertSeparator();
-	m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQT_SLOT( closePressed() ) );
+	m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQ_SLOT( closePressed() ) );
 
 	return m_pSystemMenu;
 }
@@ -1301,8 +1301,8 @@ void KMdiChildFrm::switchToMinimizeLayout()
 
 	// temporary use of minimize button for restore function
 	m_pMinimize->setPixmap( *m_pRestoreButtonPixmap );
-	TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) );
-	TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) );
+	TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) );
+	TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) );
 
 	// resizing
 	resize( 300, minimumHeight() );
diff --git a/tdemdi/tdemdichildfrm.h b/tdemdi/tdemdichildfrm.h
index 20f7ac347..8bdac6e40 100644
--- a/tdemdi/tdemdichildfrm.h
+++ b/tdemdi/tdemdichildfrm.h
@@ -51,7 +51,7 @@ class TQToolButton;
   */
 class KMDI_EXPORT KMdiWin32IconButton : public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMdiWin32IconButton( TQWidget* parent, const char* name = 0 );
 	virtual void mousePressEvent( TQMouseEvent* );
@@ -132,7 +132,7 @@ class KMDI_EXPORT KMdiChildFrm : public TQFrame
 	friend class KMdiChildArea;
 	friend class KMdiChildFrmCaption;
 
-	Q_OBJECT
+	TQ_OBJECT
 
 	// attributes
 public:
@@ -422,13 +422,13 @@ protected:
 	 * Restore the focus policies for _all_ widgets in the view using the list given as parameter.
 	 * Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
 	 */
-	void linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict );
+	void linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict );
 
 	/**
 	 * Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent.
 	 * Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter)
 	 */
-	TQDict<TQ_FocusPolicy>* unlinkChildren();
+	TQDict<TQWidget::FocusPolicy>* unlinkChildren();
 	
 	/**
 	 * Calculates the corner id for the resize cursor. The return value can be tested for:
diff --git a/tdemdi/tdemdichildfrmcaption.cpp b/tdemdi/tdemdichildfrmcaption.cpp
index 6930eaebf..e988a41f7 100644
--- a/tdemdi/tdemdichildfrmcaption.cpp
+++ b/tdemdi/tdemdichildfrmcaption.cpp
@@ -41,7 +41,7 @@
 #include <tdelocale.h>
 #include <iostream>
 
-#ifdef Q_WS_WIN 
+#ifdef TQ_WS_WIN 
 //TODO: one day gradient can be added for win98/winnt5+
 // ask system properties on windows
 #ifndef SPI_GETGRADIENTCAPTIONS
@@ -72,7 +72,7 @@ KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent )
 	m_bActive = false;
 	m_pParent = parent;
 	setBackgroundMode( NoBackground );
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 	m_bChildInDrag = false;
 }
 
@@ -85,17 +85,17 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption()
 
 void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
 {
-	if ( e->button() == Qt::LeftButton )
+	if ( e->button() == TQt::LeftButton )
 	{
 		setMouseTracking( false );
 		if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
 		{
-			TQApplication::setOverrideCursor( tqsizeAllCursor, true );
+			TQApplication::setOverrideCursor( TQt::sizeAllCursor, true );
 		}
 		m_pParent->m_bDragging = true;
 		m_offset = mapToParent( e->pos() );
 	}
-	else if ( e->button() == Qt::RightButton )
+	else if ( e->button() == TQt::RightButton )
 	{
 		m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) );
 	}
@@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e )
 
 void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e )
 {
-	if ( e->button() == Qt::LeftButton )
+	if ( e->button() == TQt::LeftButton )
 	{
 		if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
 			TQApplication::restoreOverrideCursor();
@@ -313,7 +313,7 @@ void KMdiChildFrmCaption::slot_moveViaSystemMenu()
 	grabMouse();
 	
 	if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look )
-		TQApplication::setOverrideCursor( tqsizeAllCursor, true );
+		TQApplication::setOverrideCursor( TQt::sizeAllCursor, true );
 	
 	m_pParent->m_bDragging = true;
 	m_offset = mapFromGlobal( TQCursor::pos() );
diff --git a/tdemdi/tdemdichildfrmcaption.h b/tdemdi/tdemdichildfrmcaption.h
index 7028202d8..9ae9f94e6 100644
--- a/tdemdi/tdemdichildfrmcaption.h
+++ b/tdemdi/tdemdichildfrmcaption.h
@@ -43,7 +43,7 @@ class KMdiChildFrmCaptionPrivate;
 */
 class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 * Constructor
diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp
index cbfdb04d5..be2ea32fa 100644
--- a/tdemdi/tdemdichildview.cpp
+++ b/tdemdi/tdemdichildview.cpp
@@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c
 		m_szCaption = i18n( "Unnamed" );
 	
 	m_sTabCaption = m_szCaption;
-	setFocusPolicy( TQ_ClickFocus );
+	setFocusPolicy( TQWidget::ClickFocus );
 	installEventFilter( this );
 	
 	// store the current time
@@ -88,7 +88,7 @@ KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f
 	setGeometry( 0, 0, 0, 0 );  // reset
 	m_szCaption = i18n( "Unnamed" );
 	m_sTabCaption = m_szCaption;
-	setFocusPolicy( TQ_ClickFocus );
+	setFocusPolicy( TQWidget::ClickFocus );
 	installEventFilter( this );
 
 	// store the current time
@@ -363,7 +363,7 @@ void KMdiChildView::youAreDetached()
 	if ( myIconPtr() )
 		setIcon( *( myIconPtr() ) );
 	
-	setFocusPolicy( TQ_StrongFocus );
+	setFocusPolicy( TQWidget::StrongFocus );
 
 	emit isDetachedNow();
 }
@@ -493,10 +493,10 @@ void KMdiChildView::slot_childDestroyed()
 
 	// if we lost a child we uninstall ourself as event filter for the lost
 	// child and its children
-	const TQObject * pLostChild = TQT_TQOBJECT_CONST(sender());
+	const TQObject * pLostChild = sender();
 	if ( pLostChild && ( pLostChild->isWidgetType() ) )
 	{
-		TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( TQWIDGET_OBJECT_NAME_STRING );
+		TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" );
 		list->insert( 0, pLostChild );        // add the lost child to the list too, just to save code
 		TQObjectListIt it( *list );          // iterate over all lost child widgets
 		TQObject* obj;
@@ -524,11 +524,11 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 	if ( e->type() == TQEvent::KeyPress && isAttached() )
 	{
 		TQKeyEvent* ke = ( TQKeyEvent* ) e;
-		if ( ke->key() == Qt::Key_Tab )
+		if ( ke->key() == TQt::Key_Tab )
 		{
 			TQWidget* w = ( TQWidget* ) obj;
-			TQ_FocusPolicy wfp = w->focusPolicy();
-			if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus )
+			TQWidget::FocusPolicy wfp = w->focusPolicy();
+			if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus )
 			{
 				if ( m_lastFocusableChildWidget != 0 )
 				{
@@ -545,7 +545,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 	{
 		if ( obj->isWidgetType() )
 		{
-			TQObjectList * list = queryList( TQWIDGET_OBJECT_NAME_STRING );
+			TQObjectList * list = queryList( "TQWidget" );
 			if ( list->find( obj ) != -1 )
 				m_focusedChildWidget = ( TQWidget* ) obj;
 
@@ -566,10 +566,10 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 	{
 		// if we lost a child we uninstall ourself as event filter for the lost
 		// child and its children
-		TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+		TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child();
 		if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) )
 		{
-			TQObjectList * list = pLostChild->queryList( TQWIDGET_OBJECT_NAME_STRING );
+			TQObjectList * list = pLostChild->queryList( "TQWidget" );
 			list->insert( 0, pLostChild );        // add the lost child to the list too, just to save code
 			TQObjectListIt it( *list );          // iterate over all lost child widgets
 			TQObject * o;
@@ -578,8 +578,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 				TQWidget * widg = ( TQWidget* ) o;
 				++it;
 				widg->removeEventFilter( this );
-				TQ_FocusPolicy wfp = widg->focusPolicy();
-				if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
+				TQWidget::FocusPolicy wfp = widg->focusPolicy();
+				if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus )
 				{
 					if ( m_firstFocusableChildWidget == widg )
 						m_firstFocusableChildWidget = 0L;   // reset first widget
@@ -596,13 +596,13 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 		// if we got a new child and we are attached to the MDI system we
 		// install ourself as event filter for the new child and its children
 		// (as we did when we were added to the MDI system).
-		TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child());
+		TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child();
 		if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) )
 		{
 			TQWidget * pNewWidget = ( TQWidget* ) pNewChild;
 			if ( pNewWidget->testWFlags( (WFlags)(WType_Dialog | WShowModal) ) )
 				return false;
-			TQObjectList *list = pNewWidget->queryList( TQWIDGET_OBJECT_NAME_STRING );
+			TQObjectList *list = pNewWidget->queryList( "TQWidget" );
 			list->insert( 0, pNewChild );         // add the new child to the list too, just to save code
 			TQObjectListIt it( *list );          // iterate over all new child widgets
 			TQObject * o;
@@ -611,9 +611,9 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 				TQWidget * widg = ( TQWidget* ) o;
 				++it;
 				widg->installEventFilter( this );
-				connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) );
-				TQ_FocusPolicy wfp = widg->focusPolicy();
-				if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus )
+				connect( widg, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slot_childDestroyed() ) );
+				TQWidget::FocusPolicy wfp = widg->focusPolicy();
+				if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus )
 				{
 					if ( m_firstFocusableChildWidget == 0 )
 						m_firstFocusableChildWidget = widg;  // first widge
@@ -629,14 +629,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 		if ( e->type() == TQEvent::IconChange )
 		{
 			//            tqDebug("KMDiChildView:: TQEvent:IconChange intercepted\n");
-			if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) )
+			if ( obj == this )
 				iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() );
-			else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_trackChanges) )
+			else if ( obj == m_trackChanges )
 				setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() );
 		}
 		if ( e->type() == TQEvent::CaptionChange )
 		{
-			if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) )
+			if ( obj == this )
 				captionUpdated( this, caption() );
 		}
 	}
@@ -647,7 +647,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e )
 /** Switches interposing in event loop of all current child widgets off. */
 void KMdiChildView::removeEventFilterForAllChildren()
 {
-	TQObjectList* list = queryList( TQWIDGET_OBJECT_NAME_STRING );
+	TQObjectList* list = queryList( "TQWidget" );
 	TQObjectListIt it( *list );          // iterate over all child widgets
 	TQObject* obj;
 	while ( ( obj = it.current() ) != 0 )
diff --git a/tdemdi/tdemdichildview.h b/tdemdi/tdemdichildview.h
index 0c05b5a47..4db44ed83 100644
--- a/tdemdi/tdemdichildview.h
+++ b/tdemdi/tdemdichildview.h
@@ -94,7 +94,7 @@ class KMdiChildViewPrivate;
   *     flags = KMdi::Hide;
   *   }
   *   // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels
-  *   connect( m_pParent, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(initKeyAccel(TQWidget*)) );
+  *   connect( m_pParent, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(initKeyAccel(TQWidget*)) );
   *
   *   m_pParent->addWindow( pMDICover, flags);
   *   // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses)
@@ -109,7 +109,7 @@ class KMDI_EXPORT KMdiChildView : public TQWidget
 {
 	friend class KMdiMainFrm;
 	friend class KMdiChildFrm;
-	Q_OBJECT
+	TQ_OBJECT
 
 	// attributes
 protected:
@@ -465,7 +465,7 @@ protected:
 	virtual void closeEvent( TQCloseEvent *e );
 	
 	/**
-	 * It only catches TQEvent::KeyPress events there. If a Qt::Key_Tab is pressed, the internal MDI focus
+	 * It only catches TQEvent::KeyPress events there. If a TQt::Key_Tab is pressed, the internal MDI focus
 	 * handling is called. That means if the last focusable child widget of this is called, it will jump to the
 	 * first focusable child widget of this.
 	 * See KMdiChildView::setFirstFocusableChildWidget and KMdiChildView::lastFirstFocusableChildWidget
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index 010974666..c5b3e10ee 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -140,7 +140,7 @@ KMdiDockContainer::~KMdiDockContainer()
 		KDockWidget *w = it.key();
 		if ( m_overlapButtons.contains( w ) )
 		{
-			( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[w] );
+			( ::tqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[w] );
 			m_overlapButtons.remove( w );
 		}
 		m_map.remove( w );
@@ -172,7 +172,7 @@ void KMdiDockContainer::init()
 	// try to restore splitter size
 	if ( parentDockWidget() && parentDockWidget()->parent() )
 	{
-		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->parent() );
+		KDockSplitter * sp = ::tqt_cast<KDockSplitter*>( parentDockWidget()->parent() );
 		if ( sp )
 			sp->setSeparatorPosX( m_separatorPos );
 	}
@@ -207,12 +207,12 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 		if ( ( ( KDockWidget* ) parentWidget() ) ->mayBeShow() )
 			( ( KDockWidget* ) parentWidget() ) ->dockBack();
 
-		if ( ::tqqt_cast<KDockWidgetHeader*>(w->getHeader()) )
+		if ( ::tqt_cast<KDockWidgetHeader*>(w->getHeader()) )
 		{
 			kdDebug( 760 ) << k_funcinfo << "The dockwidget we're adding has a header" << endl;
 			kdDebug( 760 ) << k_funcinfo << "Adding our overlap mode button to it" << endl;
 
-			KDockWidgetHeader *hdr = ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() );
+			KDockWidgetHeader *hdr = ::tqt_cast<KDockWidgetHeader*>( w->getHeader() );
 			KDockButton_Private *btn = new KDockButton_Private( hdr, "OverlapButton" );
 
 			TQToolTip::add( btn, i18n( "Switch between overlap and side by side mode", "Overlap" ) );
@@ -223,7 +223,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			m_overlapButtons.insert( w, btn );
 			btn->setOn( !isOverlapMode() );
 
-			connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) );
+			connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeOverlapMode() ) );
 		}
 
 		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() );
@@ -231,7 +231,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 		kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() <<
 			" to the tabbar" << endl;
 
-		connect( m_tb->tab( tab ), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( tabClicked( int ) ) );
+		connect( m_tb->tab( tab ), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( tabClicked( int ) ) );
 
 		mTabCnt++;
 		m_inserted = tab;
@@ -252,7 +252,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 	{
 	case TQEvent::MouseButtonPress:
 	{
-		KMultiTabBarTab* kmtbTab = tqt_dynamic_cast<KMultiTabBarTab*>( obj );
+		KMultiTabBarTab* kmtbTab = dynamic_cast<KMultiTabBarTab*>( obj );
 		if ( !kmtbTab )
 		{
 			kdDebug(760) << k_funcinfo << "Got a mouse button press but we have no tab" << endl;
@@ -272,7 +272,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 			break;
 		}
 
-		KDockWidgetHeader *hdr = ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() );
+		KDockWidgetHeader *hdr = ::tqt_cast<KDockWidgetHeader*>( w->getHeader() );
 		if ( !hdr )
 		{
 			kdDebug(760) << "Wrong header type in KMdiDockContainer::eventFilter" << endl;
@@ -280,7 +280,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 		}
 
 		m_dockManager = w->dockManager();
-		m_dragPanel = TQT_TQOBJECT(hdr->dragPanel());
+		m_dragPanel = hdr->dragPanel();
 
 		if ( m_dragPanel )
 			m_movingState = WaitingForMoveStart;
@@ -303,7 +303,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event )
 			TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() );
 			if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() )
 			{
-				m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) );
+				m_dockManager->eventFilter( m_dragPanel, static_cast<TQEvent*>(m_startEvent) );
 				m_dockManager->eventFilter( m_dragPanel, event );
 				m_movingState = Moving;
 			}
@@ -332,7 +332,7 @@ void KMdiDockContainer::showWidget( KDockWidget *w )
 
 void KMdiDockContainer::changeOverlapMode()
 {
-	const KDockButton_Private * btn = tqt_dynamic_cast<const KDockButton_Private*>( sender() );
+	const KDockButton_Private * btn = dynamic_cast<const KDockButton_Private*>( sender() );
 
 	if ( !btn )
 		return ;
@@ -387,7 +387,7 @@ void KMdiDockContainer::removeWidget( KDockWidget* dwdg )
 	m_revMap.remove( id );
 	if ( m_overlapButtons.contains( w ) )
 	{
-		( ::tqqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[ w ] );
+		( ::tqt_cast<KDockWidgetHeader*>( w->getHeader() ) )->removeButton( m_overlapButtons[ w ] );
 		m_overlapButtons.remove( w );
 	}
 	KDockContainer::removeWidget( w );
@@ -442,7 +442,7 @@ void KMdiDockContainer::tabClicked( int t )
 		if ( m_ws->widget( t ) )
 		{
 			m_ws->raiseWidget( t );
-			KDockWidget * tmpDw = ::tqqt_cast<KDockWidget*>( m_ws->widget( t ) );
+			KDockWidget * tmpDw = ::tqt_cast<KDockWidget*>( m_ws->widget( t ) );
 			if ( tmpDw )
 			{
 				if ( tmpDw->getWidget() )
@@ -467,7 +467,7 @@ void KMdiDockContainer::tabClicked( int t )
 		// try save splitter position
 		if ( parentDockWidget() && parentDockWidget()->parent() )
 		{
-			KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget()->parent() );
+			KDockSplitter * sp = ::tqt_cast<KDockSplitter*>( parentDockWidget()->parent() );
 			if ( sp )
 				m_separatorPos = sp->separatorPos();
 		}
@@ -613,7 +613,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 			if ( it.key() ->name() == raise )
 			{
 				m_delayedRaise = it.data();
-				TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) );
+				TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) );
 				kdDebug( 760 ) << k_funcinfo << "raising " << it.key()->name() << endl;
 				break;
 			}
@@ -621,7 +621,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl )
 
 	}
 	if ( m_delayedRaise == -1 )
-		TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( init() ) );
 }
 
 void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix )
@@ -638,7 +638,7 @@ void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix )
 	// try to save the splitter position
 	if ( parentDockWidget() && parentDockWidget() ->parent() )
 	{
-		KDockSplitter * sp = ::tqqt_cast<KDockSplitter*>( parentDockWidget() -> parent() );
+		KDockSplitter * sp = ::tqt_cast<KDockSplitter*>( parentDockWidget() -> parent() );
 		if ( sp )
 			cfg->writeEntry( "separatorPosition", m_separatorPos );
 	}
@@ -744,7 +744,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
 				        kapp->syncX();*/
 
 				m_delayedRaise = it.data();
-				TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) );
+				TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) );
 				kdDebug( 760 ) << k_funcinfo << "raising" << it.key() ->name() << endl;
 				break;
 			}
@@ -752,7 +752,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix )
 
 	}
 	if ( m_delayedRaise == -1 )
-		TQTimer::singleShot( 0, this, TQT_SLOT( init() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( init() ) );
 	cfg->setGroup( grp );
 
 }
@@ -794,7 +794,7 @@ void KMdiDockContainer::toggle()
 		kdDebug( 760 ) << k_funcinfo << "lowering tab" << endl;
 		m_tb->setTab( oldtab, false );
 		tabClicked( oldtab );
-		KMdiMainFrm *mainFrm = tqt_dynamic_cast<KMdiMainFrm*>( m_mainWin );
+		KMdiMainFrm *mainFrm = dynamic_cast<KMdiMainFrm*>( m_mainWin );
 		if ( mainFrm && mainFrm->activeWindow() )
 			mainFrm->activeWindow()->setFocus();
 	}
diff --git a/tdemdi/tdemdidockcontainer.h b/tdemdi/tdemdidockcontainer.h
index 9ef606d06..009a00901 100644
--- a/tdemdi/tdemdidockcontainer.h
+++ b/tdemdi/tdemdidockcontainer.h
@@ -36,7 +36,7 @@ class KDockButton_Private;
 
 class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags );
diff --git a/tdemdi/tdemdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp
index 824aa12c4..7ef98747f 100644
--- a/tdemdi/tdemdidocumentviewtabwidget.cpp
+++ b/tdemdi/tdemdidocumentviewtabwidget.cpp
@@ -18,7 +18,7 @@ KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const ch
 	m_visibility = KMdi::ShowWhenMoreThanOneTab;
 	tabBar() ->hide();
 	setHoverCloseButton( true );
-	connect( this, TQT_SIGNAL( closeRequest( TQWidget* ) ), this, TQT_SLOT( closeTab( TQWidget* ) ) );
+	connect( this, TQ_SIGNAL( closeRequest( TQWidget* ) ), this, TQ_SLOT( closeTab( TQWidget* ) ) );
 }
 
 KMdiDocumentViewTabWidget::~KMdiDocumentViewTabWidget()
@@ -32,28 +32,28 @@ void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, const TQString & labe
 {
 	KTabWidget::addTab( child, label );
 	showPage( child );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 }
 
 void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label )
 {
 	KTabWidget::addTab( child, iconset, label );
 	showPage( child );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 }
 
 void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, TQTab * tab )
 {
 	KTabWidget::addTab( child, tab );
 	showPage( child );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 }
 
 void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & label, int index )
 {
 	KTabWidget::insertTab( child, label, index );
 	showPage( child );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 	tabBar() ->repaint();
 }
 
@@ -61,7 +61,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet &
 {
 	KTabWidget::insertTab( child, iconset, label, index );
 	showPage( child );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 	tabBar() ->repaint();
 }
 
@@ -69,14 +69,14 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i
 {
 	KTabWidget::insertTab( child, tab, index );
 	showPage( child );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 	tabBar() ->repaint();
 }
 
 void KMdiDocumentViewTabWidget::removePage ( TQWidget * w )
 {
 	KTabWidget::removePage( w );
-	TQTimer::singleShot(0, this, TQT_SLOT(maybeShow()));
+	TQTimer::singleShot(0, this, TQ_SLOT(maybeShow()));
 }
 
 void KMdiDocumentViewTabWidget::updateIconInView( TQWidget *w, TQPixmap icon )
diff --git a/tdemdi/tdemdidocumentviewtabwidget.h b/tdemdi/tdemdidocumentviewtabwidget.h
index 1481a86a8..14b5cc7b5 100644
--- a/tdemdi/tdemdidocumentviewtabwidget.h
+++ b/tdemdi/tdemdidocumentviewtabwidget.h
@@ -22,7 +22,7 @@ class TDEPopupMenu;
 class KMDI_EXPORT KMdiDocumentViewTabWidget:
 			public KTabWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 );
 	~KMdiDocumentViewTabWidget();
diff --git a/tdemdi/tdemdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp
index dc689ae99..edabbae4d 100644
--- a/tdemdi/tdemdifocuslist.cpp
+++ b/tdemdi/tdemdifocuslist.cpp
@@ -31,19 +31,19 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
 {
 	//this method should never be called twice on the same hierarchy
 	m_list.insert( w, w->focusPolicy() );
-	w->setFocusPolicy( TQ_ClickFocus );
+	w->setFocusPolicy( TQWidget::ClickFocus );
 	kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl;
-	connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
-	TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	connect( w, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
+	TQObjectList *l = w->queryList( "TQWidget" );
 	TQObjectListIt it( *l );
 	TQObject *obj;
 	while ( ( obj = it.current() ) != 0 )
 	{
 		TQWidget * wid = ( TQWidget* ) obj;
 		m_list.insert( wid, wid->focusPolicy() );
-		wid->setFocusPolicy( TQ_ClickFocus );
+		wid->setFocusPolicy( TQWidget::ClickFocus );
 		kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl;
-		connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
+		connect( wid, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) );
 		++it;
 	}
 	delete l;
@@ -51,7 +51,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w )
 
 void KMdiFocusList::restore()
 {
-	for ( TQMap<TQWidget*, TQ_FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
+	for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it )
 	{
 		it.key() ->setFocusPolicy( it.data() );
 	}
diff --git a/tdemdi/tdemdifocuslist.h b/tdemdi/tdemdifocuslist.h
index 18749862b..d3fdc039c 100644
--- a/tdemdi/tdemdifocuslist.h
+++ b/tdemdi/tdemdifocuslist.h
@@ -25,7 +25,7 @@
 
 class KMDI_EXPORT KMdiFocusList: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMdiFocusList( TQObject *parent );
 	~KMdiFocusList();
@@ -34,7 +34,7 @@ public:
 protected slots:
 	void objectHasBeenDestroyed( TQObject* );
 private:
-	TQMap<TQWidget*, TQ_FocusPolicy> m_list;
+	TQMap<TQWidget*, TQWidget::FocusPolicy> m_list;
 
 };
 
diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp
index b4c4bc593..d10ef90bb 100644
--- a/tdemdi/tdemdiguiclient.cpp
+++ b/tdemdi/tdemdiguiclient.cpp
@@ -63,9 +63,9 @@ ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShort
 {
 	if ( m_dw )
 	{
-		connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) );
-		connect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) );
-		connect( m_dw, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotWidgetDestroyed() ) );
+		connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) );
+		connect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) );
+		connect( m_dw, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotWidgetDestroyed() ) );
 		setChecked( m_dw->mayBeHide() );
 	}
 }
@@ -83,7 +83,7 @@ void ToggleToolViewAction::anDWChanged()
 	else if ( ( !isChecked() ) && m_dw->mayBeHide() )
 		setChecked( true );
 	else if ( isChecked() && ( m_dw->parentDockTabGroup() &&
-	                           ( ( ::tqqt_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
+	                           ( ( ::tqt_cast<KDockWidget*>( m_dw->parentDockTabGroup() ->
 	                                                          parent() ) ) ->mayBeShow() ) ) )
 		setChecked( false );
 }
@@ -104,8 +104,8 @@ void ToggleToolViewAction::slotToggled( bool t )
 
 void ToggleToolViewAction::slotWidgetDestroyed()
 {
-	disconnect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) );
-	disconnect( this, TQT_SIGNAL( toggled( bool ) ), 0, 0 );
+	disconnect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) );
+	disconnect( this, TQ_SIGNAL( toggled( bool ) ), 0, 0 );
 	unplugAll();
 	deleteLater();
 }
@@ -116,8 +116,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 {
 	m_mdiMode = KMdi::ChildframeMode;
 	m_mdiMainFrm = mdiMainFrm;
-	connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
-	         this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+	connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+	         this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
 
 	/* re-use an existing resource file if it exists. can happen if the user launches the
 	 * toolbar editor */
@@ -143,27 +143,27 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c
 		TQStringList modes;
 		modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" );
 		m_mdiModeAction->setItems( modes );
-		connect( m_mdiModeAction, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( changeViewMode( int ) ) );
+		connect( m_mdiModeAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( changeViewMode( int ) ) );
 	}
 	else
 		m_mdiModeAction = 0;
 
-	connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
-	         this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
+	connect( m_mdiMainFrm, TQ_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ),
+	         this, TQ_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) );
 
 	m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" );
-	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQ_SIGNAL( toggleTop() ),
 	                            actionCollection(), "tdemdi_activate_top" ) );
-	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQ_SIGNAL( toggleLeft() ),
 	                            actionCollection(), "tdemdi_activate_left" ) );
-	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQ_SIGNAL( toggleRight() ),
 	                            actionCollection(), "tdemdi_activate_right" ) );
-	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQ_SIGNAL( toggleBottom() ),
 	                            actionCollection(), "tdemdi_activate_bottom" ) );
 	m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) );
-	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQ_SLOT( prevToolViewInDock() ),
 	                            actionCollection(), "tdemdi_prev_toolview" ) );
-	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ),
+	m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ),
 	                            actionCollection(), "tdemdi_next_toolview" ) );
 
 	actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() );
@@ -225,7 +225,7 @@ void KMDIGUIClient::setupActions()
 	//    m_toolBars = builder.toolBars();
 
 	//    m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString::null, 0,
-	//             this, TQT_SLOT(blah()),actionCollection(),"nothing"));
+	//             this, TQ_SLOT(blah()),actionCollection(),"nothing"));
 
 	TQPtrList<TDEAction> addList;
 	if ( m_toolViewActions.count() < 3 )
@@ -258,14 +258,14 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva )
 	sc = TDEShortcut( cfg->readEntry( aname, "" ) );
 	cfg->setGroup( _grp );
 	TDEAction *a = new ToggleToolViewAction( i18n( "Show %1" ).arg( mtva->wrappedWidget() ->caption() ),
-	                                       /*TQString::null*/sc, tqt_dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
+	                                       /*TQString::null*/sc, dynamic_cast<KDockWidget*>( mtva->wrapperWidget() ),
 	                                       m_mdiMainFrm, actionCollection(), aname.latin1() );
 #if KDE_IS_VERSION(3,2,90)
 
 	( ( ToggleToolViewAction* ) a ) ->setCheckedState( TQString(i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() )) );
 #endif
 
-	connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) );
+	connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) );
 	m_toolViewActions.append( a );
 	m_toolMenu->insert( a );
 	mtva->d->action = a;
diff --git a/tdemdi/tdemdiguiclient.h b/tdemdi/tdemdiguiclient.h
index ef0f8bcbf..31550a234 100644
--- a/tdemdi/tdemdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -41,7 +41,7 @@ namespace KMDIPrivate
 class KMDI_EXPORT KMDIGUIClient : public TQObject,
 			public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 
 	KMDIGUIClient( KMdiMainFrm *mdiMainFrm, bool showMDIModeAction, const char *name = 0 );
@@ -120,7 +120,7 @@ private:
  */
 class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 
 	ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index ae5f1b584..2358b73ac 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -93,7 +93,7 @@
 #include "kde2laptop_closebutton.xpm"
 #include "kde2laptop_closebutton_menu.xpm"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #ifndef NO_KDE
 #include <X11/X.h> // schroder
 #include <X11/Xlib.h> // schroder
@@ -108,7 +108,7 @@
 /* I hate the defines in the X11 header files. Get rid of one of them */
 #undef KeyPress
 #endif
-#endif // Q_WS_X11 && ! K_WS_QTONLY
+#endif // TQ_WS_X11 && ! K_WS_QTONLY
 
 using namespace KParts;
 
@@ -184,7 +184,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 	m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>;
 
 	// This seems to be needed (re-check it after Qt2.0 comed out)
-	setFocusPolicy( TQ_ClickFocus );
+	setFocusPolicy( TQWidget::ClickFocus );
 
 	// create the central widget
 	createMdiManager();
@@ -207,7 +207,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 
 	m_pWindowMenu = new TQPopupMenu( this, "window_menu" );
 	m_pWindowMenu->setCheckable( true );
-	TQObject::connect( m_pWindowMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillWindowMenu() ) );
+	TQObject::connect( m_pWindowMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillWindowMenu() ) );
 
 	m_pDockMenu = new TQPopupMenu( this, "dock_menu" );
 	m_pDockMenu->setCheckable( true );
@@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 	m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" );
 
 	d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(),
-	                                   TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close");
+	                                   this, TQ_SLOT(closeActiveView()), actionCollection(), "window_close");
 
 	// the MDI view taskbar
 	createTaskBar();
@@ -249,11 +249,11 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod
 
 	// drag end timer
 	m_pDragEndTimer = new TQTimer();
-	connect( m_pDragEndTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( dragEndTimeOut() ) );
-	connect( guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient* ) ),
-	         this, TQT_SLOT( verifyToplevelHeight() ) );
-	connect( guiFactory(), TQT_SIGNAL( clientRemoved( KXMLGUIClient* ) ),
-	         this, TQT_SLOT( verifyToplevelHeight() ) );
+	connect( m_pDragEndTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( dragEndTimeOut() ) );
+	connect( guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient* ) ),
+	         this, TQ_SLOT( verifyToplevelHeight() ) );
+	connect( guiFactory(), TQ_SIGNAL( clientRemoved( KXMLGUIClient* ) ),
+	         this, TQ_SLOT( verifyToplevelHeight() ) );
 }
 
 void KMdiMainFrm::verifyToplevelHeight()
@@ -271,21 +271,21 @@ void KMdiMainFrm::verifyToplevelHeight()
 void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu )
 {
 	m_mdiGUIClient = new KMDIPrivate::KMDIGUIClient( this, showModeMenu );
-	connect( m_mdiGUIClient, TQT_SIGNAL( toggleTop() ), this, TQT_SIGNAL( toggleTop() ) );
-	connect( m_mdiGUIClient, TQT_SIGNAL( toggleLeft() ), this, TQT_SIGNAL( toggleLeft() ) );
-	connect( m_mdiGUIClient, TQT_SIGNAL( toggleRight() ), this, TQT_SIGNAL( toggleRight() ) );
-	connect( m_mdiGUIClient, TQT_SIGNAL( toggleBottom() ), this, TQT_SIGNAL( toggleBottom() ) );
+	connect( m_mdiGUIClient, TQ_SIGNAL( toggleTop() ), this, TQ_SIGNAL( toggleTop() ) );
+	connect( m_mdiGUIClient, TQ_SIGNAL( toggleLeft() ), this, TQ_SIGNAL( toggleLeft() ) );
+	connect( m_mdiGUIClient, TQ_SIGNAL( toggleRight() ), this, TQ_SIGNAL( toggleRight() ) );
+	connect( m_mdiGUIClient, TQ_SIGNAL( toggleBottom() ), this, TQ_SIGNAL( toggleBottom() ) );
 
 	if ( m_mdiMode == KMdi::IDEAlMode )
 	{
 		if ( m_topContainer )
-			connect( this, TQT_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQT_SLOT( toggle() ) );
+			connect( this, TQ_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQ_SLOT( toggle() ) );
 		if ( m_leftContainer )
-			connect( this, TQT_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQT_SLOT( toggle() ) );
+			connect( this, TQ_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQ_SLOT( toggle() ) );
 		if ( m_rightContainer )
-			connect( this, TQT_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQT_SLOT( toggle() ) );
+			connect( this, TQ_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQ_SLOT( toggle() ) );
 		if ( m_bottomContainer )
-			connect( this, TQT_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQT_SLOT( toggle() ) );
+			connect( this, TQ_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQ_SLOT( toggle() ) );
 	}
 
 	emit mdiModeHasBeenChangedTo( m_mdiMode );
@@ -363,16 +363,16 @@ void KMdiMainFrm::createMdiManager()
 	kdDebug(760) << k_funcinfo << "creating MDI manager" << endl;
 	m_pMdi = new KMdiChildArea( this );
 	setCentralWidget( m_pMdi );
-	TQObject::connect( m_pMdi, TQT_SIGNAL( nowMaximized( bool ) ),
-	                  this, TQT_SLOT( setEnableMaximizedChildFrmMode( bool ) ) );
-	TQObject::connect( m_pMdi, TQT_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ),
-	                  this, TQT_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) );
-	TQObject::connect( m_pMdi, TQT_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ),
-	                  this, TQT_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) );
-	TQObject::connect( m_pMdi, TQT_SIGNAL( popupWindowMenu( TQPoint ) ),
-	                  this, TQT_SLOT( popupWindowMenu( TQPoint ) ) );
-	TQObject::connect( m_pMdi, TQT_SIGNAL( lastChildFrmClosed() ),
-	                  this, TQT_SIGNAL( lastChildFrmClosed() ) );
+	TQObject::connect( m_pMdi, TQ_SIGNAL( nowMaximized( bool ) ),
+	                  this, TQ_SLOT( setEnableMaximizedChildFrmMode( bool ) ) );
+	TQObject::connect( m_pMdi, TQ_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ),
+	                  this, TQ_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) );
+	TQObject::connect( m_pMdi, TQ_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ),
+	                  this, TQ_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) );
+	TQObject::connect( m_pMdi, TQ_SIGNAL( popupWindowMenu( TQPoint ) ),
+	                  this, TQ_SLOT( popupWindowMenu( TQPoint ) ) );
+	TQObject::connect( m_pMdi, TQ_SIGNAL( lastChildFrmClosed() ),
+	                  this, TQ_SIGNAL( lastChildFrmClosed() ) );
 }
 
 //============ createTaskBar ==============//
@@ -458,14 +458,14 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index )
 	d->closeWindowAction->setEnabled(true);
 
 	// common connections used when under MDI control
-	TQObject::connect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( activated( KMdiChildView* ) ), this, TQT_SIGNAL( viewActivated( KMdiChildView* ) ) );
-	TQObject::connect( pWnd, TQT_SIGNAL( deactivated( KMdiChildView* ) ), this, TQT_SIGNAL( viewDeactivated( KMdiChildView* ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( activated( KMdiChildView* ) ), this, TQ_SIGNAL( viewActivated( KMdiChildView* ) ) );
+	TQObject::connect( pWnd, TQ_SIGNAL( deactivated( KMdiChildView* ) ), this, TQ_SIGNAL( viewDeactivated( KMdiChildView* ) ) );
 	
 	if ( index == -1 )
 		m_pDocumentViews->append( pWnd );
@@ -475,7 +475,7 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index )
 	if ( m_pTaskBar )
 	{
 		KMdiTaskBarButton* but = m_pTaskBar->addWinButton( pWnd );
-		TQObject::connect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) );
+		TQObject::connect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) );
 	}
 
 	// embed the view depending on the current MDI mode
@@ -487,8 +487,8 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index )
 		
 		m_documentTabWidget->insertTab( pWnd, pixmap, pWnd->tabCaption(), index );
 
-		connect( pWnd, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
-		connect( pWnd, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
+		connect( pWnd, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
+		connect( pWnd, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
 	}
 	else
 	{
@@ -698,7 +698,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 				pWnd->setGeometry( TQRect( m_pMdi->getCascadePoint( m_pDocumentViews->count() - 1 ), defaultChildFrmSize() ) );
 			}
 		}
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		if ( mdiMode() == KMdi::ToplevelMode )
 		{
 			XSetTransientForHint( tqt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
@@ -708,7 +708,7 @@ void KMdiMainFrm::detachWindow( KMdiChildView *pWnd, bool bShow )
 		return ;
 	}
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	if ( mdiMode() == KMdi::ToplevelMode )
 	{
 		XSetTransientForHint( tqt_xdisplay(), pWnd->winId(), topLevelWidget() ->winId() );
@@ -736,19 +736,19 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd )
 	if ( m_pWinList->count() == 0 )
 		m_pCurrentWindow = 0L;
 
-	TQObject::disconnect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) );
-	TQObject::disconnect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) );
-	TQObject::disconnect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) );
-	TQObject::disconnect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
-	TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) );
-	TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) );
+	TQObject::disconnect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) );
+	TQObject::disconnect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) );
+	TQObject::disconnect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) );
+	TQObject::disconnect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) );
+	TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) );
+	TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) );
 
 	if ( m_pTaskBar )
 	{
 		KMdiTaskBarButton * but = m_pTaskBar->getButton( pWnd );
 		if ( but != 0L )
 		{
-			TQObject::disconnect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) );
+			TQObject::disconnect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) );
 		}
 		m_pTaskBar->removeWinButton( pWnd );
 	}
@@ -989,19 +989,19 @@ TQPopupMenu* KMdiMainFrm::taskBarPopup( KMdiChildView *pWnd, bool /*bIncludeWind
 	m_pTaskBarPopup->clear();
 	if ( pWnd->isAttached() )
 	{
-		m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQT_SLOT( detach() ) );
+		m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQ_SLOT( detach() ) );
 		m_pTaskBarPopup->insertSeparator();
 		if ( pWnd->isMinimized() || pWnd->isMaximized() )
-			m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQT_SLOT( restore() ) );
+			m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQ_SLOT( restore() ) );
 		if ( !pWnd->isMaximized() )
-			m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQT_SLOT( maximize() ) );
+			m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQ_SLOT( maximize() ) );
 		if ( !pWnd->isMinimized() )
-			m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQT_SLOT( minimize() ) );
+			m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQ_SLOT( minimize() ) );
 	}
 	else
-		m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQT_SLOT( attach() ) );
+		m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQ_SLOT( attach() ) );
 	m_pTaskBarPopup->insertSeparator();
-	m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQT_SLOT( close() ) );
+	m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQ_SLOT( close() ) );
 	// the window has a view...get the window popup
 	m_pTaskBarPopup->insertSeparator();
 	m_pTaskBarPopup->insertItem( i18n( "Operations" ), windowPopup( pWnd, false ) );  //alvoid recursion
@@ -1291,12 +1291,12 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis
 		KDockWidget* dockWindow = 0L; /* pDockW */
 		KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */
 		KDockWidget* undockCandidate = 0L; /* pUndockCandidate */
-		TQWidget* pW = TQT_TQWIDGET( ( *it ) );
+		TQWidget* pW = static_cast<TQWidget*>( ( *it ) );
 		
 		// find the oldest ancestor of the current dockwidget that can be undocked
 		while ( !pW->isTopLevel() )
 		{
-			if ( ::tqqt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
+			if ( ::tqt_cast<KDockWidget*>( pW ) ||  pW->inherits( "KDockWidget_Compat::KDockWidget" ) )
 			{
 				undockCandidate = static_cast<KDockWidget*>( pW );
 				if ( undockCandidate->enableDocking() != KDockWidget::DockNone )
@@ -1421,7 +1421,7 @@ void KMdiMainFrm::switchToToplevelMode()
 	TQPtrListIterator<KMdiChildView> tdemdicvit( *m_pDocumentViews );
 	for ( tdemdicvit.toFirst(); ( *tdemdicvit ); ++tdemdicvit )
 	{
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		XSetTransientForHint( tqt_xdisplay(), ( *tdemdicvit )->winId(), winId() );
 #endif
 		( *tdemdicvit )->show();
@@ -1633,7 +1633,7 @@ void KMdiMainFrm::switchToTabPageMode()
 
 	if ( m_pClose )
 	{
-		TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+		TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
 		if ( m_pDocumentViews->count() > 0 )
 			m_pClose->show();
 	}
@@ -1650,7 +1650,7 @@ void KMdiMainFrm::finishTabPageMode()
 	if ( m_mdiMode == KMdi::TabPageMode )
 	{
 		m_pClose->hide();
-		TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+		TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
 
 		TQPtrListIterator<KMdiChildView> it( *m_pDocumentViews );
 		for ( ; it.current(); ++it )
@@ -1715,7 +1715,7 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace()
 #endif
 	delete m_documentTabWidget;
 	m_documentTabWidget = new KMdiDocumentViewTabWidget( m_pDockbaseAreaOfDocumentViews );
-	connect( m_documentTabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( slotDocCurrentChanged( TQWidget* ) ) );
+	connect( m_documentTabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotDocCurrentChanged( TQWidget* ) ) );
 	m_pDockbaseAreaOfDocumentViews->setWidget( m_documentTabWidget );
 	m_documentTabWidget->show();
 	TQPtrListIterator<KMdiChildView> it4( *m_pDocumentViews );
@@ -1724,11 +1724,11 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace()
 		KMdiChildView* pView = it4.current();
 		m_documentTabWidget->addTab( pView, pView->icon() ? *( pView->icon() ) : TQPixmap(), pView->tabCaption() );
 		/*
-		   connect(pView,TQT_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)),
-		   m_documentTabWidget,TQT_SLOT(updateView(TQWidget*,TQPixmap,const TQString&)));
+		   connect(pView,TQ_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)),
+		   m_documentTabWidget,TQ_SLOT(updateView(TQWidget*,TQPixmap,const TQString&)));
 		 */
-		connect( pView, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
-		connect( pView, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
+		connect( pView, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) );
+		connect( pView, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) );
 
 	}
 }
@@ -1739,28 +1739,28 @@ void KMdiMainFrm::setIDEAlModeStyle( int flags )
 	d->m_styleIDEAlMode = flags; // see KMultiTabBar for the first 3 bits
 	if ( m_leftContainer )
 	{
-		KMdiDockContainer * tmpL = ::tqqt_cast<KMdiDockContainer*>( m_leftContainer->getWidget() );
+		KMdiDockContainer * tmpL = ::tqt_cast<KMdiDockContainer*>( m_leftContainer->getWidget() );
 		if ( tmpL )
 			tmpL->setStyle( flags );
 	}
 
 	if ( m_rightContainer )
 	{
-		KMdiDockContainer * tmpR = ::tqqt_cast<KMdiDockContainer*>( m_rightContainer->getWidget() );
+		KMdiDockContainer * tmpR = ::tqt_cast<KMdiDockContainer*>( m_rightContainer->getWidget() );
 		if ( tmpR )
 			tmpR->setStyle( flags );
 	}
 
 	if ( m_topContainer )
 	{
-		KMdiDockContainer * tmpT = ::tqqt_cast<KMdiDockContainer*>( m_topContainer->getWidget() );
+		KMdiDockContainer * tmpT = ::tqt_cast<KMdiDockContainer*>( m_topContainer->getWidget() );
 		if ( tmpT )
 			tmpT->setStyle( flags );
 	}
 
 	if ( m_bottomContainer )
 	{
-		KMdiDockContainer * tmpB = ::tqqt_cast<KMdiDockContainer*>( m_bottomContainer->getWidget() );
+		KMdiDockContainer * tmpB = ::tqt_cast<KMdiDockContainer*>( m_bottomContainer->getWidget() );
 		if ( tmpB )
 			tmpB->setStyle( flags );
 	}
@@ -1777,7 +1777,7 @@ void KMdiMainFrm::setToolviewStyle( int flag )
 	TQMap<TQWidget*, KMdiToolViewAccessor*>::Iterator it;
 	for ( it = m_pToolViews->begin(); it != m_pToolViews->end(); ++it )
 	{
-		KDockWidget *dockWidget = tqt_dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() );
+		KDockWidget *dockWidget = dynamic_cast<KDockWidget*>( it.data()->wrapperWidget() );
 		if ( dockWidget )
 		{
 			switch ( flag )
@@ -1858,7 +1858,7 @@ void KMdiMainFrm::switchToIDEAlMode()
 
 	if ( m_pClose )
 	{
-		TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+		TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
 		if ( m_pDocumentViews->count() > 0 )
 			m_pClose->show();
 	}
@@ -1886,7 +1886,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 	KDockWidget* mainDock = getMainDockWidget();
 	if ( mainDock->parentDockTabGroup() )
 	{
-		mainDock = tqt_dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
+		mainDock = dynamic_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
 		// FIXME: will likely crash below due to unchecked cast
 	}
 
@@ -1899,11 +1899,11 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 	KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw );
 	if ( widget && widget->parentDockTabGroup() )
 	{
-		widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) );
+		widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() );
 
 		if ( widget )
 		{
-			KDockTabGroup* tg = tqt_dynamic_cast<KDockTabGroup*>( widget->getWidget() );
+			KDockTabGroup* tg = dynamic_cast<KDockTabGroup*>( widget->getWidget() );
 			if ( tg )
 			{
 				kdDebug(760) << k_funcinfo << "KDockTabGroup found" << endl;
@@ -1931,7 +1931,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	KDockWidget *mainDock = getMainDockWidget();
 	KDockWidget *w = mainDock;
 	if ( mainDock->parentDockTabGroup() )
-		w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) );
+		w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() );
 
 	TQPtrList<KDockWidget> leftReparentWidgets;
 	TQPtrList<KDockWidget> rightReparentWidgets;
@@ -1939,7 +1939,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	TQPtrList<KDockWidget> topReparentWidgets;
 
 	if ( mainDock->parentDockTabGroup() )
-		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
+		mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
 
 	findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft );
 	findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight );
@@ -1956,40 +1956,40 @@ void KMdiMainFrm::setupToolViewsForIDEALMode()
 	m_leftContainer->manualDock( mainDock, KDockWidget::DockLeft, 20 );
 	tmpDC->init();
 	if ( m_mdiGUIClient )
-		connect ( this, TQT_SIGNAL( toggleLeft() ), tmpDC, TQT_SLOT( toggle() ) );
-	connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
-	connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
-	connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+		connect ( this, TQ_SIGNAL( toggleLeft() ), tmpDC, TQ_SLOT( toggle() ) );
+	connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+	connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+	connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
 
 	m_rightContainer->setWidget( tmpDC = new KMdiDockContainer( m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode ) );
 	m_rightContainer->setEnableDocking( KDockWidget::DockRight );
 	m_rightContainer->manualDock( mainDock, KDockWidget::DockRight, 80 );
 	tmpDC->init();
 	if ( m_mdiGUIClient )
-		connect ( this, TQT_SIGNAL( toggleRight() ), tmpDC, TQT_SLOT( toggle() ) );
-	connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
-	connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
-	connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+		connect ( this, TQ_SIGNAL( toggleRight() ), tmpDC, TQ_SLOT( toggle() ) );
+	connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+	connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+	connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
 
 	m_topContainer->setWidget( tmpDC = new KMdiDockContainer( m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode ) );
 	m_topContainer->setEnableDocking( KDockWidget::DockTop );
 	m_topContainer->manualDock( mainDock, KDockWidget::DockTop, 20 );
 	tmpDC->init();
 	if ( m_mdiGUIClient )
-		connect ( this, TQT_SIGNAL( toggleTop() ), tmpDC, TQT_SLOT( toggle() ) );
-	connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
-	connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
-	connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+		connect ( this, TQ_SIGNAL( toggleTop() ), tmpDC, TQ_SLOT( toggle() ) );
+	connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+	connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+	connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
 
 	m_bottomContainer->setWidget( tmpDC = new KMdiDockContainer( m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode ) );
 	m_bottomContainer->setEnableDocking( KDockWidget::DockBottom );
 	m_bottomContainer->manualDock( mainDock, KDockWidget::DockBottom, 80 );
 	tmpDC->init();
 	if ( m_mdiGUIClient )
-		connect ( this, TQT_SIGNAL( toggleBottom() ), tmpDC, TQT_SLOT( toggle() ) );
-	connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) );
-	connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
-	connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
+		connect ( this, TQ_SIGNAL( toggleBottom() ), tmpDC, TQ_SLOT( toggle() ) );
+	connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) );
+	connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) );
+	connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) );
 
 	m_leftContainer->setDockSite( KDockWidget::DockCenter );
 	m_rightContainer->setDockSite( KDockWidget::DockCenter );
@@ -2024,7 +2024,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 	{
 		assert( m_pClose );
 		m_pClose->hide();
-		TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) );
+		TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) );
 
 
 		TQStringList leftNames;
@@ -2118,7 +2118,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full )
 
 TQStringList KMdiMainFrm::prepareIdealToTabs( KDockWidget* container )
 {
-	KDockContainer * pDW = tqt_dynamic_cast<KDockContainer*>( container->getWidget() );
+	KDockContainer * pDW = dynamic_cast<KDockContainer*>( container->getWidget() );
 	TQStringList widgetNames = ( ( KMdiDockContainer* ) pDW ) ->containedWidgets();
 	for ( TQStringList::iterator it = widgetNames.begin();it != widgetNames.end();++it )
 	{
@@ -2137,7 +2137,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW
 	KDockWidget * mainDock = getMainDockWidget();
 	if ( mainDock->parentDockTabGroup() )
 	{
-		mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) );
+		mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() );
 	}
 
 	if ( widgetNames.count() > 0 )
@@ -2432,23 +2432,23 @@ void KMdiMainFrm::setEnableMaximizedChildFrmMode( bool enableMaxChildFrameMode )
 		if ( !pCurrentChild || !m_pMainMenuBar )
 			return ;
 
-		TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( undockPressed() ) );
-		TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( minimizePressed() ) );
-		TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( maximizePressed() ) );
+		TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( undockPressed() ) );
+		TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( minimizePressed() ) );
+		TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( maximizePressed() ) );
 		m_pMinimize->show();
 		m_pUndock->show();
 		m_pRestore->show();
 
 		if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook )
 		{
-			m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQT_SLOT( closePressed() ), 0, -1, 0 );
+			m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQ_SLOT( closePressed() ), 0, -1, 0 );
 		}
 		else
 		{
 			m_pMainMenuBar->insertItem( *pCurrentChild->icon(), pCurrentChild->systemMenu(), -1, 0 );
 			if ( m_pClose )
 			{
-				TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( closePressed() ) );
+				TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( closePressed() ) );
 				m_pClose->show();
 			}
 			else
@@ -2484,10 +2484,10 @@ void KMdiMainFrm::switchOffMaximizeModeForMenu( KMdiChildFrm* oldChild )
 	if ( oldChild )
 	{
 		Q_ASSERT( m_pClose );
-		TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) );
-		TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) );
-		TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) );
-		TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) );
+		TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) );
+		TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) );
+		TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) );
+		TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) );
 	}
 	m_pUndock->hide();
 	m_pMinimize->hide();
@@ -2506,7 +2506,7 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF
 	if ( newChild )
 	{
 		if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook )
-			m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQT_SLOT( closePressed() ), 0, -1, 0 );
+			m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQ_SLOT( closePressed() ), 0, -1, 0 );
 		else
 			m_pMainMenuBar->insertItem( *newChild->icon(), newChild->systemMenu(), -1, 0 );
 	}
@@ -2515,18 +2515,18 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF
 	{
 		m_pMainMenuBar->removeItem( m_pMainMenuBar->idAt( 1 ) );
 		Q_ASSERT( m_pClose );
-		TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) );
-		TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) );
-		TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) );
-		TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) );
+		TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) );
+		TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) );
+		TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) );
+		TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) );
 	}
 	if ( newChild )
 	{
 		Q_ASSERT( m_pClose );
-		TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( undockPressed() ) );
-		TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( minimizePressed() ) );
-		TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( maximizePressed() ) );
-		TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( closePressed() ) );
+		TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( undockPressed() ) );
+		TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( minimizePressed() ) );
+		TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( maximizePressed() ) );
+		TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( closePressed() ) );
 	}
 }
 
@@ -2574,7 +2574,7 @@ void KMdiMainFrm::fillWindowMenu()
 
 	d->closeWindowAction->plug(m_pWindowMenu);
 
-	int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQT_SLOT( closeAllViews() ) );
+	int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQ_SLOT( closeAllViews() ) );
 	if ( noViewOpened )
 	{
 		d->closeWindowAction->setEnabled(false);
@@ -2583,7 +2583,7 @@ void KMdiMainFrm::fillWindowMenu()
 	
 	if ( !tabPageMode && !IDEAlMode )
 	{
-		int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQT_SLOT( iconifyAllViews() ) );
+		int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQ_SLOT( iconifyAllViews() ) );
 		if ( noViewOpened )
 			m_pWindowMenu->setItemEnabled( iconifyId, false );
 	}
@@ -2591,10 +2591,10 @@ void KMdiMainFrm::fillWindowMenu()
 	m_pWindowMenu->insertSeparator();
 	m_pWindowMenu->insertItem( i18n( "&MDI Mode" ), m_pMdiModeMenu );
 	m_pMdiModeMenu->clear();
-	m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQT_SLOT( switchToToplevelMode() ) );
-	m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQT_SLOT( switchToChildframeMode() ) );
-	m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQT_SLOT( switchToTabPageMode() ) );
-	m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQT_SLOT( switchToIDEAlMode() ) );
+	m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQ_SLOT( switchToToplevelMode() ) );
+	m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQ_SLOT( switchToChildframeMode() ) );
+	m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQ_SLOT( switchToTabPageMode() ) );
+	m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQ_SLOT( switchToIDEAlMode() ) );
 	switch ( m_mdiMode )
 	{
 	case KMdi::ToplevelMode:
@@ -2618,13 +2618,13 @@ void KMdiMainFrm::fillWindowMenu()
 	{
 		int placMenuId = m_pWindowMenu->insertItem( i18n( "&Tile" ), m_pPlacingMenu );
 		m_pPlacingMenu->clear();
-		m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQT_SLOT( cascadeWindows() ) );
-		m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQT_SLOT( cascadeMaximized() ) );
-		m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQT_SLOT( expandVertical() ) );
-		m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQT_SLOT( expandHorizontal() ) );
-		m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQT_SLOT( tileAnodine() ) );
-		m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQT_SLOT( tilePragma() ) );
-		m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQT_SLOT( tileVertically() ) );
+		m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQ_SLOT( cascadeWindows() ) );
+		m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQ_SLOT( cascadeMaximized() ) );
+		m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQ_SLOT( expandVertical() ) );
+		m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQ_SLOT( expandHorizontal() ) );
+		m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQ_SLOT( tileAnodine() ) );
+		m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQ_SLOT( tilePragma() ) );
+		m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQ_SLOT( tileVertically() ) );
 		if ( m_mdiMode == KMdi::ToplevelMode )
 		{
 			m_pWindowMenu->setItemEnabled( placMenuId, false );
@@ -2686,7 +2686,7 @@ void KMdiMainFrm::fillWindowMenu()
 			}
 			if ( putHere )
 			{
-				m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount );
+				m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount );
 				if ( pView == m_pCurrentWindow )
 				{
 					m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( indx + entryCount ), true );
@@ -2694,7 +2694,7 @@ void KMdiMainFrm::fillWindowMenu()
 				pView->setWindowMenuID( i );
 				if ( !tabPageMode )
 				{
-					m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, indx );
+					m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, indx );
 					if ( pView->isAttached() )
 					{
 						m_pDockMenu->setItemChecked( m_pDockMenu->idAt( indx ), true );
@@ -2707,7 +2707,7 @@ void KMdiMainFrm::fillWindowMenu()
 		}
 		if ( !inserted )
 		{  // append it
-			m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount );
+			m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount );
 			if ( pView == m_pCurrentWindow )
 			{
 				m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( windowItemCount + entryCount ), true );
@@ -2715,7 +2715,7 @@ void KMdiMainFrm::fillWindowMenu()
 			pView->setWindowMenuID( i );
 			if ( !tabPageMode )
 			{
-				m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount );
+				m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount );
 				if ( pView->isAttached() )
 				{
 					m_pDockMenu->setItemChecked( m_pDockMenu->idAt( windowItemCount ), true );
diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h
index 22efc9e9a..780df6fc4 100644
--- a/tdemdi/tdemdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -240,7 +240,7 @@ class KMDI_EXPORT KMdiMainFrm : public KParts::DockMainWindow
 {
 	friend class KMdiChildView;
 	friend class KMdiTaskBar;
-	Q_OBJECT
+	TQ_OBJECT
 
 	friend class KMdiToolViewAccessor;
 	// attributes
diff --git a/tdemdi/tdemditaskbar.cpp b/tdemdi/tdemditaskbar.cpp
index 75c76f6fd..b2b2c0652 100644
--- a/tdemdi/tdemditaskbar.cpp
+++ b/tdemdi/tdemditaskbar.cpp
@@ -67,7 +67,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_
 	m_pWindow = win_ptr;
 	TQToolTip::add
 		( this, win_ptr->caption() );
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 }
 
 KMdiTaskBarButton::~KMdiTaskBarButton()
@@ -77,10 +77,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e )
 {
 	switch ( e->button() )
 	{
-	case Qt::LeftButton:
+	case TQt::LeftButton:
 		emit leftMouseButtonClicked( m_pWindow );
 		break;
-	case Qt::RightButton:
+	case TQt::RightButton:
 		emit rightMouseButtonClicked( m_pWindow );
 		break;
 	default:
@@ -156,7 +156,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock )
 	m_pButtonList->setAutoDelete( true );
 	//QT30   setFontPropagation(TQWidget::SameFont);
 	setMinimumWidth( 1 );
-	setFocusPolicy( TQ_NoFocus );
+	setFocusPolicy( TQWidget::NoFocus );
 	parent->moveToolBar( this, dock ); //XXX obsolete!
 }
 
@@ -175,11 +175,11 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr )
 	}
 
 	KMdiTaskBarButton *b = new KMdiTaskBarButton( this, win_ptr );
-	TQObject::connect( b, TQT_SIGNAL( clicked() ), win_ptr, TQT_SLOT( setFocus() ) );
-	TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) );
-	TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) );
-	TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
-	TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) );
+	TQObject::connect( b, TQ_SIGNAL( clicked() ), win_ptr, TQ_SLOT( setFocus() ) );
+	TQObject::connect( b, TQ_SIGNAL( clicked( KMdiChildView* ) ), this, TQ_SLOT( setActiveButton( KMdiChildView* ) ) );
+	TQObject::connect( b, TQ_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( activateView( KMdiChildView* ) ) );
+	TQObject::connect( b, TQ_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) );
+	TQObject::connect( b, TQ_SIGNAL( buttonTextChanged( int ) ), this, TQ_SLOT( layoutTaskBar( int ) ) );
 	m_pButtonList->append( b );
 	b->setToggleButton( true );
 	b->setText( win_ptr->tabCaption() );
@@ -363,7 +363,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
 			newButtonWidth = buttonAreaWidth / buttonCount;
 		else
 			newButtonWidth = 0;
-		if ( orientation() == Qt::Vertical )
+		if ( orientation() == TQt::Vertical )
 			newButtonWidth = 80;
 		if ( newButtonWidth > 0 )
 			for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
diff --git a/tdemdi/tdemditaskbar.h b/tdemdi/tdemditaskbar.h
index 17df32014..a68e2d945 100644
--- a/tdemdi/tdemditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -50,7 +50,7 @@ class KMdiTaskBarButtonPrivate;
   */
 class KMDI_EXPORT KMdiTaskBarButton : public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 	// methods
 public:
 	/**
@@ -128,7 +128,7 @@ class KMdiTaskBarPrivate;
  */
 class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Constructor (NoFocus, minimum width = 1, an internal TQPtrList of taskbar buttons (autodelete))
diff --git a/tdemdi/tdemditoolviewaccessor.cpp b/tdemdi/tdemditoolviewaccessor.cpp
index f6b6ddae0..ce5886253 100644
--- a/tdemdi/tdemditoolviewaccessor.cpp
+++ b/tdemdi/tdemditoolviewaccessor.cpp
@@ -36,7 +36,7 @@ KMdiToolViewAccessor::KMdiToolViewAccessor( KMdiMainFrm *parent, TQWidget *widge
 	d = new KMdiToolViewAccessorPrivate();
 	if ( widgetToWrap->inherits( "KDockWidget" ) )
 	{
-		d->widgetContainer = tqt_dynamic_cast<KDockWidget*>( widgetToWrap );
+		d->widgetContainer = dynamic_cast<KDockWidget*>( widgetToWrap );
 		d->widget = d->widgetContainer->getWidget();
 	}
 	else
@@ -95,7 +95,7 @@ TQWidget *KMdiToolViewAccessor::wrapperWidget()
 	if ( !d->widgetContainer )
 	{
 		d->widgetContainer = mdiMainFrm->createDockWidget( "KMdiToolViewAccessor::null", TQPixmap() );
-		connect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) );
+		connect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) );
 	}
 	return d->widgetContainer;
 }
@@ -110,7 +110,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri
 {
 	Q_ASSERT( !( d->widget ) );
 	Q_ASSERT( !widgetToWrap->inherits( "KDockWidget" ) );
-	disconnect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) );
+	disconnect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) );
 	delete d->widget;
 	d->widget = widgetToWrap;
 	KDockWidget *tmp = d->widgetContainer;
diff --git a/tdemdi/tdemditoolviewaccessor.h b/tdemdi/tdemditoolviewaccessor.h
index 85dda10cc..0d851d5bf 100644
--- a/tdemdi/tdemditoolviewaccessor.h
+++ b/tdemdi/tdemditoolviewaccessor.h
@@ -37,7 +37,7 @@ class KMDIGUIClient;
 
 class KMDI_EXPORT KMdiToolViewAccessor : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 
 	friend class KMdiMainFrm;
diff --git a/tdemdi/test/hello.cpp b/tdemdi/test/hello.cpp
index d92233ea6..0790ce491 100644
--- a/tdemdi/test/hello.cpp
+++ b/tdemdi/test/hello.cpp
@@ -22,7 +22,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget )
     : KMdiChildView(title, parentWidget), t(text), b(0)
 {
     TQTimer *timer = new TQTimer(this);
-    TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) );
+    TQObject::connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(animate()) );
     timer->start( 40 );
 
     resize( 260, 130 );
diff --git a/tdemdi/test/hello.h b/tdemdi/test/hello.h
index b6ce589a0..9af080d11 100644
--- a/tdemdi/test/hello.h
+++ b/tdemdi/test/hello.h
@@ -20,7 +20,7 @@ class TQPaintEvent;
 
 class Hello : public KMdiChildView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Hello( const char *title, const char *text, TQWidget* parentWidget = 0 );
 signals:
diff --git a/tdemdi/test/main.cpp b/tdemdi/test/main.cpp
index c89cb2faa..7d404ea8e 100644
--- a/tdemdi/test/main.cpp
+++ b/tdemdi/test/main.cpp
@@ -54,19 +54,19 @@ int main( int argc, char **argv )
 
    Hello* h1 = new Hello( "Hello1", "Click the right mouse button on the mainframe!", mainWdg);
    h1->setTabCaption("Tab changed");
-   h1->setBackgroundColor( Qt::white );
+   h1->setBackgroundColor( TQt::white );
    mainWdg->addWindow( h1);
 //   SHOW(h1->caption());
 //   SHOW(h1->tabCaption());
 
    TQWidget* w = new TQWidget(mainWdg);
-   KMdiChildView* h2 = mainWdg->createWrapper(w, "I'm a common but wrapped QWidget!", "Hello2");
+   KMdiChildView* h2 = mainWdg->createWrapper(w, "I'm a common but wrapped TQWidget!", "Hello2");
    mainWdg->addWindow( h2 );
 //   SHOW(h2->caption());
 //   SHOW(h2->tabCaption());
 
    Hello* h3 = new Hello( "Hello3", "Dock me using the taskbar button context menu!", 0);
-   h3->setBackgroundColor( Qt::white );
+   h3->setBackgroundColor( TQt::white );
    h3->setFont( TQFont("times",20,TQFont::Bold) );
    mainWdg->addWindow( h3, KMdi::Detach );  // undock this!
    h3->setGeometry( 20, 20, 400, 100);
diff --git a/tdemdi/test/mainwidget.cpp b/tdemdi/test/mainwidget.cpp
index 494a42c4f..6438ff978 100644
--- a/tdemdi/test/mainwidget.cpp
+++ b/tdemdi/test/mainwidget.cpp
@@ -90,7 +90,7 @@ MainWidget::~MainWidget()
     TQString s = doc.toString();
     TQFile f("/tmp/dc.txt");
     f.open(IO_ReadWrite);
-    f.tqwriteBlock(s.latin1(), s.length());
+    f.writeBlock(s.latin1(), s.length());
     f.close();
 }
 
@@ -114,7 +114,7 @@ RestartWidget::RestartWidget():TDEMainWindow()
     TQLabel* l = new TQLabel("This is for the testing of\nKMdiMainFrm::read/writeDockConfig().\n", this);
     TQCheckBox* b1 = new TQCheckBox("KMdiMainFrm close/restart", this);
     b1->toggle();
-    TQObject::connect(b1, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(onStateChanged(int)));
+    TQObject::connect(b1, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(onStateChanged(int)));
     bl->add(l);
     bl->add(b1);
     bl->setMargin(10);
diff --git a/tdemdi/test/mainwidget.h b/tdemdi/test/mainwidget.h
index f1635d25e..a59989f9a 100644
--- a/tdemdi/test/mainwidget.h
+++ b/tdemdi/test/mainwidget.h
@@ -29,7 +29,7 @@
   */
 class MainWidget : public KMdiMainFrm
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWidget(TQDomElement& dockConfig,KMdi::MdiMode mode);
     virtual ~MainWidget();
@@ -50,7 +50,7 @@ private:
   */
 class RestartWidget : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 // methods
 public:
     RestartWidget();
diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp
index 81450fd68..9a1cb2ee2 100644
--- a/tdenewstuff/downloaddialog.cpp
+++ b/tdenewstuff/downloaddialog.cpp
@@ -156,12 +156,12 @@ void DownloadDialog::init(Engine *engine)
   box->add(d->m_loadingLabel);
   box->addItem(new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
-  connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotPage(TQWidget*)));
+  connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), TQ_SLOT(slotPage(TQWidget*)));
 
   if(!engine)
   {
     m_loader = new ProviderLoader(this);
-    connect(m_loader, TQT_SIGNAL(providersLoaded(Provider::List*)), TQT_SLOT(slotProviders(Provider::List*)));
+    connect(m_loader, TQ_SIGNAL(providersLoaded(Provider::List*)), TQ_SLOT(slotProviders(Provider::List*)));
   }
 
   m_entries.setAutoDelete(true);
@@ -273,7 +273,7 @@ void DownloadDialog::addProvider(Provider *p)
   ctl->addTab(w_l, i18n("Latest"));
 
   m_curtab = 0;
-  connect(ctl, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(slotTab()));
+  connect(ctl, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(slotTab()));
 
   TQHBoxLayout *box = new TQHBoxLayout(frame);
   box->add(ctl);
@@ -296,9 +296,9 @@ void DownloadDialog::addProvider(Provider *p)
   d->m_lvtmp_l->addColumn(i18n("Release Date"));
   d->m_lvtmp_l->setSorting(2, false);
 
-  connect(d->m_lvtmp_r, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
-  connect(d->m_lvtmp_d, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
-  connect(d->m_lvtmp_l, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
+  connect(d->m_lvtmp_r, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
+  connect(d->m_lvtmp_d, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
+  connect(d->m_lvtmp_l, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
 
   rt = new TQTextBrowser(frame);
   rt->setMinimumWidth(150);
@@ -315,10 +315,10 @@ void DownloadDialog::addProvider(Provider *p)
   vbox->add(de);
   vbox->add(in);
 
-  connect(rt, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotEmail(const TQString&)));
+  connect(rt, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotEmail(const TQString&)));
 
-  connect(in, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall()));
-  connect(de, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()));
+  connect(in, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstall()));
+  connect(de, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()));
 
   TQVBoxLayout *box2 = new TQVBoxLayout(w_r);
   box2->add(d->m_lvtmp_r);
@@ -340,7 +340,7 @@ void DownloadDialog::addProvider(Provider *p)
 
   if(m_engine) slotPage(frame);
 
-  TQTimer::singleShot(100, this, TQT_SLOT(slotFinish()));
+  TQTimer::singleShot(100, this, TQ_SLOT(slotFinish()));
 }
 
 void DownloadDialog::slotResult(TDEIO::Job *job)
@@ -439,7 +439,7 @@ int DownloadDialog::installStatus(Entry *entry)
   if(datestring.isNull()) installed = 0;
   else
   {
-    date = TQT_TQDATE_OBJECT(TQDate::fromString(datestring, Qt::ISODate));
+    date = TQDate::fromString(datestring, TQt::ISODate);
     if(!date.isValid()) installed = 0;
     else if(date < entry->releaseDate()) installed = -1;
     else installed = 1;
@@ -583,10 +583,10 @@ void DownloadDialog::slotInstall()
   // in the direct download ability for this to even be considered.
   if (e->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) {
     TDEIO::TransferJob *job = TDEIO::get( KURL( e->payload() ), false, false );
-    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 & ) ) );
   }
   else {
     slotInstallPhase2();
@@ -616,7 +616,7 @@ void DownloadDialog::slotInstallPhase2()
     KURL dest = KURL(m_s->downloadDestination(e));
 
     TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true);
-    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotInstalled(TDEIO::Job*)));
   }
 }
 
@@ -668,7 +668,7 @@ void DownloadDialog::slotJobResult( TDEIO::Job *job )
 void DownloadDialog::install(Entry *e)
 {
   kapp->config()->setGroup("TDENewStuffStatus");
-  kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate)));
+  kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(TQt::ISODate)));
   kapp->config()->sync();
 
   TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("ok", TDEIcon::Small);
@@ -713,7 +713,7 @@ void DownloadDialog::slotInstalled(TDEIO::Job *job)
   bool ret = job && (job->error() == 0);
   if(ret)
   {
-    TDEIO::FileCopyJob *cjob = ::tqqt_cast<TDEIO::FileCopyJob*>(job);
+    TDEIO::FileCopyJob *cjob = ::tqt_cast<TDEIO::FileCopyJob*>(job);
     if(cjob)
     {
       ret = m_s->install(cjob->destURL().path());
@@ -944,9 +944,9 @@ void DownloadDialog::loadProvider(Provider *p)
     d->m_variants[variantjob] = urlvariants;
     m_data[variantjob] = "";
 
-    connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
-    connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
-      TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
+    connect(variantjob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
+    connect(variantjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+      TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
   }
 
   if(variants.count() == 0) return;
@@ -963,9 +963,9 @@ void DownloadDialog::loadProvider(Provider *p)
   //m_jobs[job] = p; // not used anymore due to variants
   m_data[job] = "";
 
-  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, 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&)));
 }
 
 void DownloadDialog::setType(TQString type)
diff --git a/tdenewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h
index 5756a4e6e..207d24fb4 100644
--- a/tdenewstuff/downloaddialog.h
+++ b/tdenewstuff/downloaddialog.h
@@ -56,7 +56,7 @@ class Engine;
  */
 class KDE_EXPORT DownloadDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     struct Private;
   public:
     /**
diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp
index 1427f7eb7..5d843afeb 100644
--- a/tdenewstuff/engine.cpp
+++ b/tdenewstuff/engine.cpp
@@ -84,8 +84,8 @@ void Engine::download()
   kdDebug() << "Engine::download()" << endl;
 
   connect( mProviderLoader,
-           TQT_SIGNAL( providersLoaded( Provider::List * ) ),
-           TQT_SLOT( getMetaInformation( Provider::List * ) ) );
+           TQ_SIGNAL( providersLoaded( Provider::List * ) ),
+           TQ_SLOT( getMetaInformation( Provider::List * ) ) );
   mProviderLoader->load( mType, mProviderList );
 }
 
@@ -106,10 +106,10 @@ void Engine::getMetaInformation( Provider::List *providers )
     if ( p->downloadUrl().isEmpty() ) continue;
 
     TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQ_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
     mNewStuffJobData.insert( job, "" );
     mProviderJobs[ job ] = p;
@@ -218,8 +218,8 @@ void Engine::download( Entry *entry )
   kdDebug() << "  DESTINATION: " << destination.url() << endl;
 
   TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
 }
 
 void Engine::slotDownloadJobResult( TDEIO::Job *job )
@@ -248,8 +248,8 @@ void Engine::upload(const TQString &fileName, const TQString &previewName )
   mPreviewFile = previewName;
 
   connect( mProviderLoader,
-           TQT_SIGNAL( providersLoaded( Provider::List * ) ),
-           TQT_SLOT( selectUploadProvider( Provider::List * ) ) );
+           TQ_SIGNAL( providersLoaded( Provider::List * ) ),
+           TQ_SLOT( selectUploadProvider( Provider::List * ) ) );
   mProviderLoader->load( mType );
 }
 
@@ -340,8 +340,8 @@ void Engine::upload( Entry *entry )
       destination.setFileName( fi.fileName() );
 
       TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
-      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-               TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
+      connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+               TQ_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
     } else {
       emit uploadFinished( false );
     }
@@ -402,8 +402,8 @@ void Engine::slotUploadPayloadJobResult( TDEIO::Job *job )
   previewDestination.setFileName( fi.fileName() );
 
   TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
-  connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
+  connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
 }
 
 void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
@@ -421,8 +421,8 @@ void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
   metaDestination.setFileName( fi.fileName() );
 
   TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
-  connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
+  connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
 }
 
 void Engine::slotUploadMetaJobResult( TDEIO::Job *job )
diff --git a/tdenewstuff/engine.h b/tdenewstuff/engine.h
index 432f3b04c..0cac342ab 100644
--- a/tdenewstuff/engine.h
+++ b/tdenewstuff/engine.h
@@ -51,7 +51,7 @@ class ProviderDialog;
  */
 class KDE_EXPORT Engine : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     struct Private;
   public:
     /**
diff --git a/tdenewstuff/entry.cpp b/tdenewstuff/entry.cpp
index 7539bb679..a1a00b723 100644
--- a/tdenewstuff/entry.cpp
+++ b/tdenewstuff/entry.cpp
@@ -332,7 +332,7 @@ void Entry::parseDomElement( const TQDomElement &element )
     if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() );
 //     if ( e.tagName() == "release" ) setRelease( e.text().toInt() );
     if ( e.tagName() == "created" ) {
-      TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate ));
+      TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), TQt::ISODate );
       setReleaseDate( date );
     }
     if ( e.tagName() == "smallpreviewpic1" ) {
@@ -366,7 +366,7 @@ TQDomElement Entry::createDomElement( TQDomDocument &doc,
   addElement( doc, entry, "downloads", TQString::number( downloads() ) );
 
   addElement( doc, entry, "created",
-              releaseDate().toString( Qt::ISODate ) );
+              releaseDate().toString( TQt::ISODate ) );
 
   addElement( doc, entry, "description", summary() );
   addElement( doc, entry, "preview", preview().url() );
diff --git a/tdenewstuff/ghns.cpp b/tdenewstuff/ghns.cpp
index 3217de80e..7a42ce098 100644
--- a/tdenewstuff/ghns.cpp
+++ b/tdenewstuff/ghns.cpp
@@ -51,7 +51,7 @@ GhnsWidget::GhnsWidget()
 
   TQPushButton *button = new TQPushButton( "Wallpapers", this );
   topLayout->addWidget( button );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( downloadWallpapers() ) );
+  connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( downloadWallpapers() ) );
 
   topLayout->addSpacing( 5 );
 
@@ -61,7 +61,7 @@ GhnsWidget::GhnsWidget()
 
   TQPushButton *closeButton = new TQPushButton( "Close", this );
   buttonLayout->addWidget( closeButton );
-  connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+  connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 }
 
 GhnsWidget::~GhnsWidget()
diff --git a/tdenewstuff/ghns.h b/tdenewstuff/ghns.h
index 7eea0c489..3cb70da65 100644
--- a/tdenewstuff/ghns.h
+++ b/tdenewstuff/ghns.h
@@ -32,7 +32,7 @@
 
 class GhnsWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     GhnsWidget();
     ~GhnsWidget();
diff --git a/tdenewstuff/knewstuff.cpp b/tdenewstuff/knewstuff.cpp
index ad4f0fb98..3fb2b72ce 100644
--- a/tdenewstuff/knewstuff.cpp
+++ b/tdenewstuff/knewstuff.cpp
@@ -69,10 +69,14 @@ void TDENewStuff::download()
   mEngine->download();
 }
 
-TQString TDENewStuff::downloadDestination( Entry * )
+TQString TDENewStuff::downloadDestination( Entry *entry )
 {
+  // Respect downloaded file's extension
+  TQString ext = entry->payload().fileName().section('.', 1);
+  if ( ! ext.isEmpty() ) ext = "." + ext;
+
   return TDEGlobal::dirs()->saveLocation( "tmp" ) +
-         TDEApplication::randomString( 10 );
+         TDEApplication::randomString( 10 ) + ext;
 }
 
 void TDENewStuff::upload()
diff --git a/tdenewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp
index 3baa83397..529573547 100644
--- a/tdenewstuff/knewstuffbutton.cpp
+++ b/tdenewstuff/knewstuffbutton.cpp
@@ -53,7 +53,7 @@ Button::Button(TQWidget* parent, const char* name)
 void Button::init()
 {
     setIconSet(SmallIconSet("knewstuff"));
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog()));
 }
 
 void Button::setButtonText(const TQString& what)
diff --git a/tdenewstuff/knewstuffbutton.h b/tdenewstuff/knewstuffbutton.h
index e4a98ae3a..7cad1b0a8 100644
--- a/tdenewstuff/knewstuffbutton.h
+++ b/tdenewstuff/knewstuffbutton.h
@@ -36,7 +36,7 @@ class DownloadDialog;
  */
 class Button : public KPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp
index 0f95c8c0c..d2c81ae35 100644
--- a/tdenewstuff/knewstuffsecure.cpp
+++ b/tdenewstuff/knewstuffsecure.cpp
@@ -37,7 +37,7 @@ TDENewStuffSecure::TDENewStuffSecure(const TQString &type,  TQWidget *parentWidg
  : TDENewStuff(type, parentWidget)
 {
   m_tempDir = 0L;
-  connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool)));
+  connect(engine(), TQ_SIGNAL(uploadFinished(bool)), TQ_SLOT(slotUploadFinished(bool)));
 }
 
 
@@ -74,7 +74,7 @@ bool TDENewStuffSecure::install(const TQString &fileName)
       else
       {
          m_tarName.prepend(m_tempDir->name());
-         connect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int)));
+         connect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int)));
          Security::ref()->checkValidity(m_tarName);
       }
   } else
@@ -154,7 +154,7 @@ void TDENewStuffSecure::slotValidated(int result)
     cfg->sync();
   }
   removeTempDirectory();
-  disconnect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int)));
+  disconnect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int)));
 }
 
 void TDENewStuffSecure::downloadResource()
@@ -173,7 +173,7 @@ bool TDENewStuffSecure::createUploadFile(const TQString &fileName)
 
 void TDENewStuffSecure::uploadResource(const TQString& fileName)
 {
-  connect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+  connect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
   removeTempDirectory();
   m_tempDir = new KTempDir();
   m_tempDir->setAutoDelete(true);
@@ -194,7 +194,7 @@ void TDENewStuffSecure::slotFileSigned(int result)
     {
       if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
       {
-        disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+        disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
         removeTempDirectory();
         return;    
       }
@@ -217,7 +217,7 @@ void TDENewStuffSecure::slotFileSigned(int result)
     tar.close();
     TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
     TDENewStuff::upload(m_signedFileName, TQString::null);
-    disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+    disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
   }
 }
 
diff --git a/tdenewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h
index 1c292a9a8..bb07a8637 100644
--- a/tdenewstuff/knewstuffsecure.h
+++ b/tdenewstuff/knewstuffsecure.h
@@ -39,7 +39,7 @@ to the standard TDENewStuff class.
 */
 class KDE_EXPORT TDENewStuffSecure : public  TQObject, public TDENewStuff
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /** Constructor.
diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp
index 022570b01..8247aa40f 100644
--- a/tdenewstuff/provider.cpp
+++ b/tdenewstuff/provider.cpp
@@ -213,10 +213,10 @@ void Provider::parseDomElement( const TQDomElement &element )
     kdDebug() << "Provider::parseDomElement(): contentTypeUrl: " << contentTypeUrl << endl;
 
     TDEIO::TransferJob *job = TDEIO::get( KURL( contentTypeUrl ), false, false );
-    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 & ) ) );
   }
 }
 
@@ -365,12 +365,12 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
   kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;
 
   TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false );
-  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, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
-           TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
+  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 & ) ) );
+  connect( job, TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
+           TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
 
 //  job->dumpObjectInfo();
 }
@@ -389,7 +389,7 @@ void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data )
 void ProviderLoader::slotJobResult( TDEIO::Job *job )
 {
   if ( job->error() ) {
-    job->showErrorDialog( TQT_TQWIDGET(parent()) );
+    job->showErrorDialog( static_cast<TQWidget*>(parent()) );
     emit error();
     return;
   }
@@ -399,7 +399,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
 
   TQDomDocument doc;
   if ( !doc.setContent( mJobData ) ) {
-    KMessageBox::error( TQT_TQWIDGET(parent()), i18n("Error parsing providers list.") );
+    KMessageBox::error( static_cast<TQWidget*>(parent()), i18n("Error parsing providers list.") );
     emit error();
     return;
   }
@@ -417,9 +417,9 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
     TQDomElement p = n.toElement();
  
     if ( p.tagName() == "provider" ) {
-      Provider* prov = new Provider( p, mContentType, TQT_TQWIDGET(parent()) );
+      Provider* prov = new Provider( p, mContentType, static_cast<TQWidget*>(parent()) );
       mProviders.append( prov );
-      connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) );
+      connect( prov, TQ_SIGNAL( providerLoaded() ), this, TQ_SLOT( providerLoaded() ) );
     }
   }
 }
diff --git a/tdenewstuff/provider.h b/tdenewstuff/provider.h
index 0a65d64fc..0c62edca1 100644
--- a/tdenewstuff/provider.h
+++ b/tdenewstuff/provider.h
@@ -46,7 +46,7 @@ namespace KNS {
  */
 class KDE_EXPORT Provider : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     typedef TQPtrList<Provider> List;
 
@@ -190,7 +190,7 @@ class KDE_EXPORT Provider : public TQObject
  */
 class KDE_EXPORT ProviderLoader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
      * Constructor.
diff --git a/tdenewstuff/providerdialog.h b/tdenewstuff/providerdialog.h
index fe7652f14..d951801bd 100644
--- a/tdenewstuff/providerdialog.h
+++ b/tdenewstuff/providerdialog.h
@@ -42,7 +42,7 @@ class Engine;
  */
 class ProviderDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
       Constructor.
diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp
index 3bca16166..6952f1ec6 100644
--- a/tdenewstuff/security.cpp
+++ b/tdenewstuff/security.cpp
@@ -50,15 +50,15 @@ void Security::readKeys()
 {
   if (m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(readKeys()));
+    TQTimer::singleShot(5, this, TQ_SLOT(readKeys()));
     return;
   }
   m_runMode = List;
   m_keys.clear();
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (!readProcess->start(TDEProcess::NotifyOnExit, true))
     KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>"));
   else
@@ -69,14 +69,14 @@ void Security::readSecretKeys()
 {
   if (m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(readSecretKeys()));
+    TQTimer::singleShot(5, this, TQ_SLOT(readSecretKeys()));
     return;
   }
   m_runMode = ListSecret;
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (readProcess->start(TDEProcess::NotifyOnExit, true))
     m_gpgRunning = true;  
 }
@@ -206,7 +206,7 @@ void Security::slotCheckValidity()
 {  
   if (!m_keysRead || m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(slotCheckValidity()));
+    TQTimer::singleShot(5, this, TQ_SLOT(slotCheckValidity()));
     return;
   }
   if (m_keys.count() == 0)
@@ -226,7 +226,7 @@ void Security::slotCheckValidity()
   if (file.open(IO_ReadOnly))
   {
      context.reset();
-     context.update(TQT_TQIODEVICE_OBJECT(file));
+     context.update(file);
      md5sum = context.hexDigest();
      file.close();
   }
@@ -248,8 +248,8 @@ void Security::slotCheckValidity()
   //verify the signature
   KProcIO *verifyProcess=new KProcIO();
   *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName;
-  connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(verifyProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(verifyProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (verifyProcess->start(TDEProcess::NotifyOnExit,true))
       m_gpgRunning = true;
   else
@@ -270,7 +270,7 @@ void Security::slotSignFile()
 {
   if (!m_keysRead || m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(slotSignFile()));
+    TQTimer::singleShot(5, this, TQ_SLOT(slotSignFile()));
     return;
   }
   
@@ -298,7 +298,7 @@ void Security::slotSignFile()
   if (file.open(IO_ReadOnly))
   {
     context.reset();
-    context.update(TQT_TQIODEVICE_OBJECT(file));
+    context.update(file);
     md5sum = context.hexDigest();
     file.close();
   }
@@ -328,8 +328,8 @@ void Security::slotSignFile()
   //verify the signature
   KProcIO *signProcess=new KProcIO();
   *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName;
-  connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(signProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(signProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *)));
   m_runMode = Sign;
   if (signProcess->start(TDEProcess::NotifyOnExit,true))
     m_gpgRunning = true;
diff --git a/tdenewstuff/security.h b/tdenewstuff/security.h
index 230821e7e..ac3f4f1a0 100644
--- a/tdenewstuff/security.h
+++ b/tdenewstuff/security.h
@@ -43,7 +43,7 @@ namespace KNS {
 
 class Security : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   static Security* const ref()
   {
diff --git a/tdenewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp
index f9fc7269f..8232e1f1e 100644
--- a/tdenewstuff/testnewstuff.cpp
+++ b/tdenewstuff/testnewstuff.cpp
@@ -72,17 +72,17 @@ MyWidget::MyWidget()
   
   TQPushButton *downloadButton = new TQPushButton( "Download", this );
   topLayout->addWidget( downloadButton );
-  connect( downloadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( download() ) );
+  connect( downloadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( download() ) );
 
   TQPushButton *uploadButton = new TQPushButton( "Upload", this );
   topLayout->addWidget( uploadButton );
-  connect( uploadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( upload() ) );
+  connect( uploadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( upload() ) );
 
   topLayout->addSpacing( 5 );
 
   TQPushButton *closeButton = new TQPushButton( "Close", this );
   topLayout->addWidget( closeButton );
-  connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+  connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 }
 
 MyWidget::~MyWidget()
diff --git a/tdenewstuff/testnewstuff.h b/tdenewstuff/testnewstuff.h
index acd9aece4..9d4f71274 100644
--- a/tdenewstuff/testnewstuff.h
+++ b/tdenewstuff/testnewstuff.h
@@ -42,7 +42,7 @@ class TestNewStuff : public TDENewStuff
 
 class MyWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     MyWidget();
     ~MyWidget();
diff --git a/tdenewstuff/uploaddialog.h b/tdenewstuff/uploaddialog.h
index 3fc068e3a..906f2ea9f 100644
--- a/tdenewstuff/uploaddialog.h
+++ b/tdenewstuff/uploaddialog.h
@@ -46,7 +46,7 @@ class Entry;
  */
 class UploadDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
       Constructor.
diff --git a/tdeparts/COMMENTS b/tdeparts/COMMENTS
index cd65e2db9..d36d98eef 100644
--- a/tdeparts/COMMENTS
+++ b/tdeparts/COMMENTS
@@ -576,7 +576,7 @@ issue compared to what's above though.
          delegation.
          It works like this:
          We have KReadOnlyPart (short KROP) and KonqyViewerExtension (short KVE). KVE is just
-	 a child of KROP that you can query with the QObject::child method.
+	 a child of KROP that you can query with the TQObject::child method.
          Views which are konquy aware feature their own implementation of KVE and konquy is
          happy :-)
          If a KROP does not feature a KVE then Konqui installs a default KVE that just ignores
diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp
index ec31eea3e..9b134819d 100644
--- a/tdeparts/browserextension.cpp
+++ b/tdeparts/browserextension.cpp
@@ -377,14 +377,14 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent,
       d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) );
   }
 
-  connect( m_part, TQT_SIGNAL( completed() ),
-           this, TQT_SLOT( slotCompleted() ) );
-  connect( this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
-           this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
-  connect( this, TQT_SIGNAL( enableAction( const char *, bool ) ),
-           this, TQT_SLOT( slotEnableAction( const char *, bool ) ) );
-  connect( this, TQT_SIGNAL( setActionText( const char *, const TQString& ) ),
-           this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) );
+  connect( m_part, TQ_SIGNAL( completed() ),
+           this, TQ_SLOT( slotCompleted() ) );
+  connect( this, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
+           this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+  connect( this, TQ_SIGNAL( enableAction( const char *, bool ) ),
+           this, TQ_SLOT( slotEnableAction( const char *, bool ) ) );
+  connect( this, TQ_SIGNAL( setActionText( const char *, const TQString& ) ),
+           this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) );
 }
 
 BrowserExtension::~BrowserExtension()
@@ -496,7 +496,7 @@ void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArg
     req.m_delayedURL = url;
     req.m_delayedArgs = args;
     d->m_requests.append( req );
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotEmitOpenURLRequestDelayed() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotEmitOpenURLRequestDelayed() ) );
 }
 
 void BrowserExtension::slotEmitOpenURLRequestDelayed()
@@ -576,19 +576,19 @@ void BrowserExtension::createActionSlotMap()
     assert(!s_actionSlotMap);
     s_actionSlotMap = actionSlotMapsd.setObject( s_actionSlotMap, new ActionSlotMap );
 
-    s_actionSlotMap->insert( "cut", TQT_SLOT( cut() ) );
-    s_actionSlotMap->insert( "copy", TQT_SLOT( copy() ) );
-    s_actionSlotMap->insert( "paste", TQT_SLOT( paste() ) );
-    s_actionSlotMap->insert( "rename", TQT_SLOT( rename() ) );
-    s_actionSlotMap->insert( "trash", TQT_SLOT( trash() ) );
-    s_actionSlotMap->insert( "del", TQT_SLOT( del() ) );
-    s_actionSlotMap->insert( "properties", TQT_SLOT( properties() ) );
-    s_actionSlotMap->insert( "editMimeType", TQT_SLOT( editMimeType() ) );
-    s_actionSlotMap->insert( "print", TQT_SLOT( print() ) );
+    s_actionSlotMap->insert( "cut", TQ_SLOT( cut() ) );
+    s_actionSlotMap->insert( "copy", TQ_SLOT( copy() ) );
+    s_actionSlotMap->insert( "paste", TQ_SLOT( paste() ) );
+    s_actionSlotMap->insert( "rename", TQ_SLOT( rename() ) );
+    s_actionSlotMap->insert( "trash", TQ_SLOT( trash() ) );
+    s_actionSlotMap->insert( "del", TQ_SLOT( del() ) );
+    s_actionSlotMap->insert( "properties", TQ_SLOT( properties() ) );
+    s_actionSlotMap->insert( "editMimeType", TQ_SLOT( editMimeType() ) );
+    s_actionSlotMap->insert( "print", TQ_SLOT( print() ) );
     // Tricky. Those aren't actions in fact, but simply methods that a browserextension
     // can have or not. No need to return them here.
-    //s_actionSlotMap->insert( "reparseConfiguration", TQT_SLOT( reparseConfiguration() ) );
-    //s_actionSlotMap->insert( "refreshMimeTypes", TQT_SLOT( refreshMimeTypes() ) );
+    //s_actionSlotMap->insert( "reparseConfiguration", TQ_SLOT( reparseConfiguration() ) );
+    //s_actionSlotMap->insert( "refreshMimeTypes", TQ_SLOT( refreshMimeTypes() ) );
     // nothing for setSaveViewPropertiesLocally either
 
     // Create the action-number map
diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h
index a84c3c837..6d1c4d144 100644
--- a/tdeparts/browserextension.h
+++ b/tdeparts/browserextension.h
@@ -257,7 +257,7 @@ class BrowserExtensionPrivate;
   * to implement the virtual methods [and the standard-actions slots, see below].
   *
   * The way to associate the BrowserExtension with the part is to simply
-  * create the BrowserExtension as a child of the part (in QObject's terms).
+  * create the BrowserExtension as a child of the part (in TQObject's terms).
   * The hosting application will look for it automatically.
   *
   * Another aspect of the browser integration is that a set of standard
@@ -307,7 +307,7 @@ class BrowserExtensionPrivate;
   */
 class TDEPARTS_EXPORT BrowserExtension : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled )
 public:
   /**
@@ -435,7 +435,7 @@ public:
   typedef TQMap<TQCString,TQCString> ActionSlotMap;
   /**
    * Returns a map containing the action names as keys and corresponding
-   * TQT_SLOT()'ified method names as data entries.
+   * TQ_SLOT()'ified method names as data entries.
    *
    * This is very useful for
    * the host component, when connecting the own signals with the
@@ -455,7 +455,7 @@ public:
    * Connecting to the slot can be done like this:
    *
    * \code
-   *   connect( yourObject, TQT_SIGNAL( yourSignal() ),
+   *   connect( yourObject, TQ_SIGNAL( yourSignal() ),
    *            extension, mapIterator.data() )
    * \endcode
    *
@@ -723,7 +723,7 @@ private:
  */
 class TDEPARTS_EXPORT BrowserHostExtension : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   BrowserHostExtension( KParts::ReadOnlyPart *parent,
                         const char *name = 0L );
@@ -791,12 +791,12 @@ private:
  */
 class TDEPARTS_EXPORT LiveConnectExtension : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   enum Type {
       TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeString
   };
-  typedef TQValueList<QPair<Type, TQString> > ArgList;
+  typedef TQValueList<TQPair<Type, TQString> > ArgList;
 
   LiveConnectExtension( KParts::ReadOnlyPart *parent, const char *name = 0L );
 
diff --git a/tdeparts/browserinterface.cpp b/tdeparts/browserinterface.cpp
index e02ae34cc..46c89e348 100644
--- a/tdeparts/browserinterface.cpp
+++ b/tdeparts/browserinterface.cpp
@@ -33,21 +33,21 @@ void BrowserInterface::callMethod( const char *name, const TQVariant &argument )
         case TQVariant::Invalid:
             break;
         case TQVariant::String:
-            static_TQUType_TQString.set( o + 1, argument.toString() );
+            static_QUType_TQString.set( o + 1, argument.toString() );
             break;
         case TQVariant::StringList:
 	    strLst = argument.toStringList();
-            static_TQUType_ptr.set( o + 1, &strLst );
+            static_QUType_ptr.set( o + 1, &strLst );
             break;
         case TQVariant::Int:
-            static_TQUType_int.set( o + 1, argument.toInt() );
+            static_QUType_int.set( o + 1, argument.toInt() );
             break;
         case TQVariant::UInt:
 	    i = argument.toUInt();
-	    static_TQUType_ptr.set( o + 1, &i );
+	    static_QUType_ptr.set( o + 1, &i );
             break;
         case TQVariant::Bool:
-	    static_TQUType_bool.set( o + 1, argument.toBool() );
+	    static_QUType_bool.set( o + 1, argument.toBool() );
             break;
         default: return;
     }
diff --git a/tdeparts/browserinterface.h b/tdeparts/browserinterface.h
index 5934c2c9c..558781bf4 100644
--- a/tdeparts/browserinterface.h
+++ b/tdeparts/browserinterface.h
@@ -37,7 +37,7 @@ namespace KParts
  */
 class TDEPARTS_EXPORT BrowserInterface : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BrowserInterface( TQObject *parent, const char *name = 0 );
     virtual ~BrowserInterface();
diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp
index c459e818e..95df76ece 100644
--- a/tdeparts/browserrun.cpp
+++ b/tdeparts/browserrun.cpp
@@ -146,10 +146,10 @@ void BrowserRun::scanFile()
 
   job->addMetaData( m_args.metaData() );
   job->setWindow( m_window );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
-           this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *)));
-  connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
-           this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &)));
+  connect( job, TQ_SIGNAL( result( TDEIO::Job *)),
+           this, TQ_SLOT( slotBrowserScanFinished(TDEIO::Job *)));
+  connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)),
+           this, TQ_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &)));
   m_job = job;
 }
 
@@ -244,8 +244,8 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString&
                 destURL.setPath( tempFile.name() );
                 TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ );
                 job->setWindow (m_window);
-                connect( job, TQT_SIGNAL( result( TDEIO::Job *)),
-                         this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) );
+                connect( job, TQ_SIGNAL( result( TDEIO::Job *)),
+                         this, TQ_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) );
                 return Delayed; // We'll continue after the job has finished
             }
         }
diff --git a/tdeparts/browserrun.h b/tdeparts/browserrun.h
index 0b7e1f514..95fb8a08b 100644
--- a/tdeparts/browserrun.h
+++ b/tdeparts/browserrun.h
@@ -41,7 +41,7 @@ namespace KParts {
      */
     class TDEPARTS_EXPORT BrowserRun : public KRun
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         /**
          * @param url the URL we're probing
diff --git a/tdeparts/componentfactory.h b/tdeparts/componentfactory.h
index 728b34efa..c0b8068f9 100644
--- a/tdeparts/componentfactory.h
+++ b/tdeparts/componentfactory.h
@@ -66,7 +66,7 @@ namespace KParts
                                                T::staticMetaObject()->className(),
                                                args );
 
-            T *result = tqt_dynamic_cast<T *>( object );
+            T *result = dynamic_cast<T *>( object );
             if ( !result )
                     delete object;
             return result;
@@ -104,7 +104,7 @@ namespace KParts
                                                         T::staticMetaObject()->className(),
                                                         args );
 
-            T *result = tqt_dynamic_cast<T *>( object );
+            T *result = dynamic_cast<T *>( object );
             if ( !result )
                 delete object;
             return result;
@@ -178,7 +178,7 @@ namespace KParts
                     *error = ErrNoFactory;
                 return 0;
             }
-            KParts::Factory *partFactory = tqt_dynamic_cast<KParts::Factory *>( factory );
+            KParts::Factory *partFactory = dynamic_cast<KParts::Factory *>( factory );
             if ( !partFactory )
             {
                 library->unload();
diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp
index 9c8d72112..e7ce785ac 100644
--- a/tdeparts/dockmainwindow.cpp
+++ b/tdeparts/dockmainwindow.cpp
@@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f )
   : KDockMainWindow( parent, name, f )
 {
   d = new DockMainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 DockMainWindow::~DockMainWindow()
@@ -89,15 +89,15 @@ void DockMainWindow::createGUI( Part * part )
 
     factory->removeClient( d->m_activePart );
 
-    disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             this, TQT_SLOT( setCaption( const TQString & ) ) );
-    disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-             this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) );
+    disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             this, TQ_SLOT( setCaption( const TQString & ) ) );
+    disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+             this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) );
   }
 
   if ( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
+    loadPlugins( this, this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
@@ -105,10 +105,10 @@ void DockMainWindow::createGUI( Part * part )
   if ( part )
   {
     // do this before sending the activate event
-    connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             this, TQT_SLOT( setCaption( const TQString & ) ) );
-    connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-             this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) );
+    connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             this, TQ_SLOT( setCaption( const TQString & ) ) );
+    connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+             this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) );
 
     factory->addClient( part );
 
diff --git a/tdeparts/dockmainwindow.h b/tdeparts/dockmainwindow.h
index 4974390de..64cd3bd35 100644
--- a/tdeparts/dockmainwindow.h
+++ b/tdeparts/dockmainwindow.h
@@ -46,7 +46,7 @@ class DockMainWindowPrivate;
  */
 class TDEPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public PartBase
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Constructor, same signature as KDockMainWindow.
diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp
index 485bd9a36..0b7d1c84c 100644
--- a/tdeparts/factory.cpp
+++ b/tdeparts/factory.cpp
@@ -63,7 +63,7 @@ const TDEInstance *Factory::partInstanceFromLibrary( const TQCString &libraryNam
     KLibFactory *factory = library->factory();
     if ( !factory )
         return 0;
-    KParts::Factory *pfactory = tqt_dynamic_cast<KParts::Factory *>( factory );
+    KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory );
     if ( !pfactory )
         return 0;
     return pfactory->partInstance();
@@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha
 TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args )
 {
   assert( !parent || parent->isWidgetType() );
-  return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args );
+  return createPart( static_cast<TQWidget*>( parent ), name, parent, name, classname, args );
 }
 #include "factory.moc"
diff --git a/tdeparts/factory.h b/tdeparts/factory.h
index 28b8cc7ad..82312ca19 100644
--- a/tdeparts/factory.h
+++ b/tdeparts/factory.h
@@ -39,7 +39,7 @@ class Part;
  */
 class TDEPARTS_EXPORT Factory : public KLibFactory
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Factory( TQObject *parent = 0, const char *name = 0 );
   virtual ~Factory();
@@ -119,7 +119,7 @@ protected:
     /**
      * Reimplemented from KLibFactory. Calls createPart()
      */
-    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() );
 
     /** This 'enum' along with the structure below is NOT part of the public API.
       * It's going to disappear in KDE 4.0 and is likely to change inbetween.
diff --git a/tdeparts/genericfactory.h b/tdeparts/genericfactory.h
index 27e76a753..0ecc72e4e 100644
--- a/tdeparts/genericfactory.h
+++ b/tdeparts/genericfactory.h
@@ -111,7 +111,7 @@ namespace KParts
 
             if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) )
             {
-                KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part );
+                KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part );
                 if ( rwp )
                     rwp->setReadWrite( false );
             }
@@ -137,11 +137,11 @@ namespace KParts
                                                                                      args );
 
             // (this cast is guaranteed to work...)
-            KParts::Part *part = tqt_dynamic_cast<KParts::Part *>( object );
+            KParts::Part *part = dynamic_cast<KParts::Part *>( object );
 
             if ( part && !qstrcmp( className, "KParts::ReadOnlyPart" ) )
             {
-                KParts::ReadWritePart *rwp = tqt_dynamic_cast<KParts::ReadWritePart *>( part );
+                KParts::ReadWritePart *rwp = dynamic_cast<KParts::ReadWritePart *>( part );
                 if ( rwp )
                     rwp->setReadWrite( false );
             }
diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp
index 9c893ae53..067895872 100644
--- a/tdeparts/historyprovider.cpp
+++ b/tdeparts/historyprovider.cpp
@@ -40,7 +40,7 @@ public:
 HistoryProvider * HistoryProvider::self()
 {
     if ( !s_self )
-	s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" );
+	s_self = new HistoryProvider( kapp, "history provider" );
     return s_self;
 }
 
diff --git a/tdeparts/historyprovider.h b/tdeparts/historyprovider.h
index 616668e99..d5f4f817d 100644
--- a/tdeparts/historyprovider.h
+++ b/tdeparts/historyprovider.h
@@ -40,7 +40,7 @@ namespace KParts {
  */
 class TDEPARTS_EXPORT HistoryProvider : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static HistoryProvider * self();
diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp
index b3245da9b..26adbd838 100644
--- a/tdeparts/mainwindow.cpp
+++ b/tdeparts/mainwindow.cpp
@@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent,  const char *name, WFlags f )
     : TDEMainWindow( parent, name, f )
 {
   d = new MainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 MainWindow::MainWindow( const char *name, WFlags f )
   : TDEMainWindow( 0L, name, f )
 {
   d = new MainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 MainWindow::MainWindow( int cflags, TQWidget* parent,  const char *name, WFlags f )
     : TDEMainWindow( cflags, parent, name, f )
 {
   d = new MainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 MainWindow::~MainWindow()
@@ -107,15 +107,15 @@ void MainWindow::createGUI( Part * part )
 
     factory->removeClient( d->m_activePart );
 
-    disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             this, TQT_SLOT( setCaption( const TQString & ) ) );
-    disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-             this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) );
+    disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             this, TQ_SLOT( setCaption( const TQString & ) ) );
+    disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+             this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) );
   }
 
   if ( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
+    loadPlugins( this, this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
@@ -123,10 +123,10 @@ void MainWindow::createGUI( Part * part )
   if ( part )
   {
     // do this before sending the activate event
-    connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ),
-             this, TQT_SLOT( setCaption( const TQString & ) ) );
-    connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ),
-             this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) );
+    connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ),
+             this, TQ_SLOT( setCaption( const TQString & ) ) );
+    connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ),
+             this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) );
 
     factory->addClient( part );
 
diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h
index f39c9f7c0..1721ecc81 100644
--- a/tdeparts/mainwindow.h
+++ b/tdeparts/mainwindow.h
@@ -46,7 +46,7 @@ class MainWindowPrivate;
  */
 class TDEPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Constructor, same signature as TDEMainWindow.
diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp
index 075b13d77..b65106ea7 100644
--- a/tdeparts/part.cpp
+++ b/tdeparts/part.cpp
@@ -146,8 +146,8 @@ Part::~Part()
   if ( m_widget )
   {
     // We need to disconnect first, to avoid calling it !
-    disconnect( m_widget, TQT_SIGNAL( destroyed() ),
-                this, TQT_SLOT( slotWidgetDestroyed() ) );
+    disconnect( m_widget, TQ_SIGNAL( destroyed() ),
+                this, TQ_SLOT( slotWidgetDestroyed() ) );
   }
 
   if ( m_manager )
@@ -195,8 +195,8 @@ void Part::setWidget( TQWidget *widget )
 {
   assert ( !m_widget ); // otherwise we get two connects
   m_widget = widget;
-  connect( m_widget, TQT_SIGNAL( destroyed() ),
-           this, TQT_SLOT( slotWidgetDestroyed() ) );
+  connect( m_widget, TQ_SIGNAL( destroyed() ),
+           this, TQ_SLOT( slotWidgetDestroyed() ) );
 
   // Tell the actionCollection() which widget its
   //  action shortcuts should be connected to.
@@ -367,7 +367,7 @@ bool ReadOnlyPart::openURL( const KURL &url )
     d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo );
     d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 );
     emit started( d->m_job );
-    connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
+    connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) );
     return true;
   }
 }
@@ -639,7 +639,7 @@ bool ReadWritePart::saveToURL()
     }
     d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ );
     d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 );
-    connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
+    connect( d->m_uploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) );
     return true;
   }
 }
@@ -690,7 +690,7 @@ bool ReadWritePart::waitSaveComplete()
   d->m_waitForSave = true;
 
   TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal));
-  dummy.setFocusPolicy( TQ_NoFocus );
+  dummy.setFocusPolicy( TQWidget::NoFocus );
   tqt_enter_modal(&dummy);
   tqApp->enter_loop();
   tqt_leave_modal(&dummy);
diff --git a/tdeparts/part.h b/tdeparts/part.h
index 90c1804c5..1c91a8d5e 100644
--- a/tdeparts/part.h
+++ b/tdeparts/part.h
@@ -180,7 +180,7 @@ private:
  */
 class TDEPARTS_EXPORT Part : public TQObject, public PartBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -337,7 +337,7 @@ class ReadOnlyPartPrivate;
  */
 class TDEPARTS_EXPORT ReadOnlyPart : public Part
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class ReadWritePart;
 public:
   /**
@@ -543,7 +543,7 @@ private:
  */
 class TDEPARTS_EXPORT ReadWritePart : public ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor.
diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp
index 777d6a77b..1ca3f9dab 100644
--- a/tdeparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -45,7 +45,7 @@ public:
     m_selectedWidget = 0;
     m_bAllowNestedParts = false;
     m_bIgnoreScrollBars = false;
-    m_activationButtonMask = Qt::LeftButton | Qt::MidButton | Qt::RightButton;
+    m_activationButtonMask = TQt::LeftButton | TQt::MidButton | TQt::RightButton;
     m_reason = PartManager::NoReason;
   }
   ~PartManagerPrivate()
@@ -55,16 +55,16 @@ public:
     switch( ev->type() ) {
     case TQEvent::MouseButtonPress:
     case TQEvent::MouseButtonDblClick: {
-      TQMouseEvent* mev = TQT_TQMOUSEEVENT( ev );
-      m_reason = mev->button() == Qt::LeftButton
+      TQMouseEvent* mev = static_cast<TQMouseEvent*>( ev );
+      m_reason = mev->button() == TQt::LeftButton
                  ? PartManager::ReasonLeftClick
-                 : ( mev->button() == Qt::MidButton
+                 : ( mev->button() == TQt::MidButton
                      ? PartManager::ReasonMidClick
                      : PartManager::ReasonRightClick );
       break;
     }
     case TQEvent::FocusIn:
-      m_reason = TQT_TQFOCUSEVENT( ev )->reason();
+      m_reason = static_cast<TQFocusEvent*>( ev )->reason();
       break;
     default:
       kdWarning(1000) << "PartManagerPrivate::setReason got unexpected ev type " << ev->type() << endl;
@@ -119,8 +119,8 @@ PartManager::~PartManager()
 {
   for ( TQPtrListIterator<TQWidget> it( d->m_managedTopLevelWidgets );
         it.current(); ++it )
-    disconnect( it.current(), TQT_SIGNAL( destroyed() ),
-                this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) );
+    disconnect( it.current(), TQ_SIGNAL( destroyed() ),
+                this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) );
 
   for ( TQPtrListIterator<Part> it( d->m_parts ); it.current(); ++it )
   {
@@ -183,7 +183,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
   if ( !obj->isWidgetType() )
     return false;
 
-  TQWidget *w = TQT_TQWIDGET( obj );
+  TQWidget *w = static_cast<TQWidget*>( obj );
 
   if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
        w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) )
@@ -192,7 +192,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
   TQMouseEvent* mev = 0L;
   if ( ev->type() == TQEvent::MouseButtonPress || ev->type() == TQEvent::MouseButtonDblClick )
   {
-      mev = TQT_TQMOUSEEVENT( ev );
+      mev = static_cast<TQMouseEvent*>( ev );
 #ifdef DEBUG_PARTMANAGER
       kdDebug(1000) << "PartManager::eventFilter button: " << mev->button() << " " << "d->m_activationButtonMask=" << d->m_activationButtonMask << endl;
 #endif
@@ -208,7 +208,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
     if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) )
       return false;
 
-    if ( d->m_bIgnoreScrollBars && w->inherits( TQSCROLLBAR_OBJECT_NAME_STRING ) )
+    if ( d->m_bIgnoreScrollBars && w->inherits( "TQScrollBar" ) )
       return false;
 
     if ( mev ) // mouse press or mouse double-click event
@@ -351,11 +351,11 @@ void PartManager::addPart( Part *part, bool setActive )
   }
 
   // Prevent focus problems
-  if ( part->widget() && part->widget()->focusPolicy() == TQ_NoFocus )
+  if ( part->widget() && part->widget()->focusPolicy() == TQWidget::NoFocus )
   {
     kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of NoFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl;
   }
-  if ( part->widget() && part->widget()->focusPolicy() == TQ_TabFocus )
+  if ( part->widget() && part->widget()->focusPolicy() == TQWidget::TabFocus )
   {
     kdWarning(1000) << "Part '" << part->name() << "' has a widget " << part->widget()->name() << " with a focus policy of TabFocus. It should have at least a ClickFocus policy, for part activation to work well." << endl;
   }
@@ -419,7 +419,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
   //tree recursively (Simon)
   if ( part && !d->m_bAllowNestedParts )
   {
-    TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory!
+    TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory!
     if ( parentPart && parentPart->inherits( "KParts::Part" ) )
     {
       KParts::Part *parPart = static_cast<KParts::Part *>( parentPart );
@@ -455,8 +455,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
     TQApplication::sendEvent( oldActivePart, &ev );
     if ( oldActiveWidget )
     {
-      disconnect( oldActiveWidget, TQT_SIGNAL( destroyed() ),
-                  this, TQT_SLOT( slotWidgetDestroyed() ) );
+      disconnect( oldActiveWidget, TQ_SIGNAL( destroyed() ),
+                  this, TQ_SLOT( slotWidgetDestroyed() ) );
       TQApplication::sendEvent( oldActiveWidget, &ev );
     }
 
@@ -473,8 +473,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
     TQApplication::sendEvent( d->m_activePart, &ev );
     if ( d->m_activeWidget )
     {
-      connect( d->m_activeWidget, TQT_SIGNAL( destroyed() ),
-               this, TQT_SLOT( slotWidgetDestroyed() ) );
+      connect( d->m_activeWidget, TQ_SIGNAL( destroyed() ),
+               this, TQ_SLOT( slotWidgetDestroyed() ) );
       TQApplication::sendEvent( d->m_activeWidget, &ev );
     }
   }
@@ -568,8 +568,8 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel )
     return;
 
   d->m_managedTopLevelWidgets.append( topLevel );
-  connect( topLevel, TQT_SIGNAL( destroyed() ),
-           this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) );
+  connect( topLevel, TQ_SIGNAL( destroyed() ),
+           this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) );
 }
 
 void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel )
diff --git a/tdeparts/partmanager.h b/tdeparts/partmanager.h
index 19e161d44..30a25e37a 100644
--- a/tdeparts/partmanager.h
+++ b/tdeparts/partmanager.h
@@ -48,7 +48,7 @@ class PartManagerPrivate;
  */
 class TDEPARTS_EXPORT PartManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_ENUMS( SelectionPolicy )
   TQ_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy )
   TQ_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts )
@@ -130,7 +130,7 @@ public:
   /**
    * Specifies which mouse buttons the partmanager should react upon.
    * By default it reacts on all mouse buttons (LMB/MMB/RMB).
-   * @param buttonMask a combination of TQt::ButtonState values e.g. Qt::LeftButton | Qt::MidButton
+   * @param buttonMask a combination of TQt::ButtonState values e.g. TQt::LeftButton | TQt::MidButton
    */
   void setActivationButtonMask( short int buttonMask );
   /**
diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h
index 6815e9f02..cdb55b00b 100644
--- a/tdeparts/plugin.h
+++ b/tdeparts/plugin.h
@@ -48,7 +48,7 @@ namespace KParts
  */
 class TDEPARTS_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Struct holding information about a plugin
diff --git a/tdeparts/statusbarextension.cpp b/tdeparts/statusbarextension.cpp
index f8e15b061..353ec733c 100644
--- a/tdeparts/statusbarextension.cpp
+++ b/tdeparts/statusbarextension.cpp
@@ -135,7 +135,7 @@ KStatusBar * StatusBarExtension::statusBar() const
 {
   if ( !m_statusBar )  {
     TQWidget* w = static_cast<KParts::ReadOnlyPart*>(parent())->widget();
-    TDEMainWindow* mw = tqt_dynamic_cast<TDEMainWindow *>( w->topLevelWidget() );
+    TDEMainWindow* mw = dynamic_cast<TDEMainWindow *>( w->topLevelWidget() );
     if ( mw )
       m_statusBar = mw->statusBar();
   }
diff --git a/tdeparts/statusbarextension.h b/tdeparts/statusbarextension.h
index da00286cf..49a165f4e 100644
--- a/tdeparts/statusbarextension.h
+++ b/tdeparts/statusbarextension.h
@@ -52,7 +52,7 @@ namespace KParts
    */
   class TDEPARTS_EXPORT StatusBarExtension : public TQObject
   {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
       StatusBarExtension( KParts::ReadOnlyPart *parent, const char *name=0L );
diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp
index fedf93ee6..e44e4c2e2 100644
--- a/tdeparts/tests/example.cpp
+++ b/tdeparts/tests/example.cpp
@@ -21,8 +21,8 @@ Shell::Shell()
   m_manager = new KParts::PartManager( this );
 
   // When the manager says the active part changes, the builder updates (recreates) the GUI
-  connect( m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ),
-           this, TQT_SLOT( createGUI( KParts::Part * ) ) );
+  connect( m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ),
+           this, TQ_SLOT( createGUI( KParts::Part * ) ) );
 
   // We can do this "switch active part" because we have a splitter with
   // two items in it.
@@ -34,13 +34,13 @@ Shell::Shell()
 
   TDEActionCollection *coll = actionCollection();
 
-  (void)new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" );
-  (void)new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
+  (void)new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" );
+  (void)new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
 
-  m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" );
-  m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
+  m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" );
+  m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
   m_paCloseEditor->setEnabled(false);
-  TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
+  TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" );
   paQuit->setIconSet(TQIconSet(BarIcon("system-log-out")));
 
   (void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" );
diff --git a/tdeparts/tests/example.h b/tdeparts/tests/example.h
index 76541437d..9264bfa25 100644
--- a/tdeparts/tests/example.h
+++ b/tdeparts/tests/example.h
@@ -10,7 +10,7 @@ class TQWidget;
 
 class Shell : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Shell();
   virtual ~Shell();
diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp
index 39af41a73..723343303 100644
--- a/tdeparts/tests/ghostview.cpp
+++ b/tdeparts/tests/ghostview.cpp
@@ -21,9 +21,9 @@ Shell::Shell()
   setXMLFile( "ghostviewtest_shell.rc" );
 
   TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this,
-    TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" );
+    TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" );
 
-  TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" );
+  TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQ_SLOT( close() ), actionCollection(), "file_quit" );
 
   // Try to find a postscript component first
   TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)");
diff --git a/tdeparts/tests/ghostview.h b/tdeparts/tests/ghostview.h
index 2974ded5e..983813f27 100644
--- a/tdeparts/tests/ghostview.h
+++ b/tdeparts/tests/ghostview.h
@@ -5,7 +5,7 @@
 
 class Shell : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Shell();
   virtual ~Shell();
diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp
index 3fe7f1a7a..eae4e80af 100644
--- a/tdeparts/tests/normalktm.cpp
+++ b/tdeparts/tests/normalktm.cpp
@@ -29,21 +29,21 @@ Shell::Shell()
   TQPopupMenu * pFile = new TQPopupMenu( this );
   menuBar()->insertItem( "File", pFile );
   TQObject * coll = this;
-  TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" );
+  TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" );
   // No XML : we need to plug our actions ourselves
   paLocal->plug( pFile );
 
-  TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
+  TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" );
   paRemote->plug( pFile );
 
-  m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" );
+  m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" );
   m_paEditFile->plug( pFile );
 
-  m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
+  m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" );
   m_paCloseEditor->setEnabled(false);
   m_paCloseEditor->plug( pFile );
 
-  TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" );
+  TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" );
   paQuit->setIconSet(TQIconSet(BarIcon("system-log-out")));
   paQuit->plug( pFile );
 
diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h
index f60d490a6..962a71cc7 100644
--- a/tdeparts/tests/normalktm.h
+++ b/tdeparts/tests/normalktm.h
@@ -10,7 +10,7 @@ class TQWidget;
 
 class Shell : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Shell();
   virtual ~Shell();
diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp
index ad81b91b3..9ab7b7d69 100644
--- a/tdeparts/tests/notepad.cpp
+++ b/tdeparts/tests/notepad.cpp
@@ -26,7 +26,7 @@ NotepadPart::NotepadPart( TQWidget* parentWidget, const char*,
   m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" );
   setWidget( m_edit );
 
-  (void)new TDEAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" );
+  (void)new TDEAction( "Search and replace", 0, this, TQ_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" );
   setXMLFile( "notepadpart.rc" );
   setReadWrite( true );
 }
@@ -39,9 +39,9 @@ void NotepadPart::setReadWrite( bool rw )
 {
     m_edit->setReadOnly( !rw );
     if (rw)
-        connect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) );
+        connect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) );
     else
-        disconnect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) );
+        disconnect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) );
 
     ReadWritePart::setReadWrite( rw );
 }
diff --git a/tdeparts/tests/notepad.h b/tdeparts/tests/notepad.h
index bd502599b..25d452fac 100644
--- a/tdeparts/tests/notepad.h
+++ b/tdeparts/tests/notepad.h
@@ -15,7 +15,7 @@ class TQMultiLineEdit;
  */
 class NotepadPart : public KParts::ReadWritePart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   NotepadPart( TQWidget*, const char* widgetName,
                TQObject* parent, const char* name,
diff --git a/tdeparts/tests/parts.h b/tdeparts/tests/parts.h
index 37af4911e..b2e8d2ee9 100644
--- a/tdeparts/tests/parts.h
+++ b/tdeparts/tests/parts.h
@@ -11,7 +11,7 @@ class GUIActivateEvent;
 
 class Part1 : public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Part1( TQObject *parent, TQWidget * parentWidget );
   virtual ~Part1();
@@ -26,7 +26,7 @@ protected:
 
 class Part2 : public KParts::Part
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Part2( TQObject *parent, TQWidget * parentWidget );
   virtual ~Part2();
diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp
index ae7af326f..927bc9123 100644
--- a/tdeparts/tests/plugin_spellcheck.cpp
+++ b/tdeparts/tests/plugin_spellcheck.cpp
@@ -11,7 +11,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name,
                                     const TQStringList& )
     : Plugin( parent, name )
 {
-    (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()),
+    (void) new TDEAction( "&Select current line (plugin)", 0, this, TQ_SLOT(slotSpellCheck()),
                         actionCollection(), "tools-check-spelling" );
 }
 
diff --git a/tdeparts/tests/plugin_spellcheck.h b/tdeparts/tests/plugin_spellcheck.h
index d27966c0c..3c7506c5c 100644
--- a/tdeparts/tests/plugin_spellcheck.h
+++ b/tdeparts/tests/plugin_spellcheck.h
@@ -5,7 +5,7 @@
 
 class PluginSpellCheck : public KParts::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PluginSpellCheck( TQObject* parent = 0, const char* name = 0, 
                       const TQStringList& = TQStringList() );
diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp
index 0fd5e8116..0e03b04a2 100644
--- a/tdeprint/cups/cupsaddsmb2.cpp
+++ b/tdeprint/cups/cupsaddsmb2.cpp
@@ -48,15 +48,15 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
 	m_state = None;
 	m_status = false;
 	m_actionindex = 0;
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(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(slotReceived(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
 
 	m_side = new SidePixmap(this);
 	m_doit = new TQPushButton(i18n("&Export"), this);
 	m_cancel = new KPushButton(KStdGuiItem::cancel(), this);
-	connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
-	connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked()));
+	connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
+	connect(m_doit, TQ_SIGNAL(clicked()), TQ_SLOT(slotActionClicked()));
 	m_bar = new TQProgressBar(this);
 	m_text = new KActiveLabel(this);
 	TQLabel	*m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this);
@@ -64,7 +64,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
 	TQFont	f(m_title->font());
 	f.setBold(true);
 	m_title->setFont(f);
-	KSeparator	*m_sep = new KSeparator(Qt::Horizontal, this);
+	KSeparator	*m_sep = new KSeparator(TQt::Horizontal, this);
 	m_textinfo = new TQLabel( this );
 	m_logined = new TQLineEdit( this );
 	m_passwded = new TQLineEdit( this );
@@ -109,7 +109,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name)
 	l1->addWidget(m_sep);
 	l1->addWidget(m_text);
 	TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 );
-	l1->addLayout( TQT_TQLAYOUT(l3) );
+	l1->addLayout( l3 );
 	l3->addWidget( m_loginlab, 1, 0 );
 	l3->addWidget( m_passwdlab, 2, 0 );
 	l3->addWidget( m_serverlab, 0, 0 );
@@ -245,7 +245,7 @@ void CupsAddSmb::checkActionStatus()
 void CupsAddSmb::nextAction()
 {
 	if (m_actionindex < (int)(m_actions.count()))
-		TQTimer::singleShot(1, this, TQT_SLOT(doNextAction()));
+		TQTimer::singleShot(1, this, TQ_SLOT(doNextAction()));
 }
 
 void CupsAddSmb::doNextAction()
diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h
index 9aeccdd4a..5fa8a3f71 100644
--- a/tdeprint/cups/cupsaddsmb2.h
+++ b/tdeprint/cups/cupsaddsmb2.h
@@ -34,7 +34,7 @@ class TQLineEdit;
 
 class CupsAddSmb : public KDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum State { None, Start, MkDir, Copy, AddDriver, AddPrinter };
diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp
index 83b4d0813..d3a137527 100644
--- a/tdeprint/cups/cupsdconf2/addressdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp
@@ -41,8 +41,8 @@ AddressDialog::AddressDialog(TQWidget *parent, const char *name)
 
 	TQGridLayout	*m1 = new TQGridLayout(w, 2, 2, 0, 5);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
 	m1->addWidget(type_, 0, 1);
 	m1->addWidget(address_, 1, 1);
 
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp
index 3268c72bc..e73dac19d 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.cpp
+++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp
@@ -49,14 +49,14 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name)
 	TQLabel	*l3 = new TQLabel(i18n("To:"), dummy);
 
 	TQGridLayout	*m1 = new TQGridLayout(dummy, 3, 2, 0, 5);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight);
 	m1->addWidget(type_, 0, 1);
 	m1->addWidget(from_, 1, 1);
 	m1->addWidget(to_, 2, 1);
 
-	connect(type_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
+	connect(type_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
 	slotTypeChanged(type_->currentItem());
 
 	setCaption(i18n("Browse Address"));
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.h b/tdeprint/cups/cupsdconf2/browsedialog.h
index 8db12bc34..cc4a12907 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.h
+++ b/tdeprint/cups/cupsdconf2/browsedialog.h
@@ -28,7 +28,7 @@ struct CupsdConf;
 
 class BrowseDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	BrowseDialog(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cups-util.c b/tdeprint/cups/cupsdconf2/cups-util.c
index 3772b35d0..907459c65 100644
--- a/tdeprint/cups/cupsdconf2/cups-util.c
+++ b/tdeprint/cups/cupsdconf2/cups-util.c
@@ -237,11 +237,11 @@ cupsGetConf(void)
 
   while ((bytes =
 #if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
-          httpRead
+          httpRead(cups_server, buffer, sizeof(buffer))
 #else
-          httpRead2
+          httpRead2(cups_server, buffer, sizeof(buffer))
 #endif
-          (cups_server, buffer, sizeof(buffer))) > 0)
+		) > 0)
   {
     write(fd, buffer, bytes);
   }
@@ -341,21 +341,22 @@ cupsPutConf(const char *name)		/* I - Name of the config file to send */
 	        break;
 	}
 	else
+	{
 #if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
-          httpWrite
+          httpWrite(cups_server, buffer, bytes);
 #else
-          httpWrite2
+          httpWrite2(cups_server, buffer, bytes);
 #endif
-              (cups_server, buffer, bytes);
+	}
 
     if (status == HTTP_CONTINUE)
     {
 #if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
-        httpWrite
+        httpWrite(cups_server, buffer, 0);
 #else
-        httpWrite2
+        httpWrite2(cups_server, buffer, 0);
 #endif
-            (cups_server, buffer, 0);
+
 	while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE);
     }
 
@@ -512,13 +513,23 @@ cups_local_auth(http_t *http)	/* I - Connection */
   * See if we are accessing localhost...
 	the struct has changed in newer versions - PiggZ (adam@piggz.co.uk)
   */
-#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
-        if (!httpAddrLocalhost(http))
+#if (CUPS_VERSION_MAJOR >= 2)
+	if (!httpAddrLocalhost(httpGetAddress(http)))
+	{
+		return (0);
+	}
+#elif CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
+	if (!httpAddrLocalhost(http))
+	{
+		return (0);
+	}
 #else
 	if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
-      strcasecmp(http->hostname, "localhost") != 0)
+	    strcasecmp(http->hostname, "localhost") != 0)
+	{
+		return (0);
+	}
 #endif
-   return (0);
 
  /*
   * Try opening a certificate file for this PID.  If that fails,
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
index e66048b73..91ef705bf 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp
@@ -79,12 +79,12 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
 	m2->addWidget(cups_);
 	m2->addWidget(slp_);
 	m2->addStretch(1);
-	m1->addWidget(l1, 1, 0, Qt::AlignRight);
-	m1->addWidget(l2, 2, 0, Qt::AlignRight);
-	m1->addWidget(l3, 3, 0, Qt::AlignRight);
-	m1->addWidget(l4, 4, 0, Qt::AlignRight|Qt::AlignTop);
-	m1->addWidget(l5, 5, 0, Qt::AlignRight);
-	m1->addWidget(l6, 6, 0, Qt::AlignRight|Qt::AlignTop);	
+	m1->addWidget(l1, 1, 0, TQt::AlignRight);
+	m1->addWidget(l2, 2, 0, TQt::AlignRight);
+	m1->addWidget(l3, 3, 0, TQt::AlignRight);
+	m1->addWidget(l4, 4, 0, TQt::AlignRight|TQt::AlignTop);
+	m1->addWidget(l5, 5, 0, TQt::AlignRight);
+	m1->addWidget(l6, 6, 0, TQt::AlignRight|TQt::AlignTop);	
 	m1->addWidget(browseport_, 1, 1);
 	m1->addWidget(browseinterval_, 2, 1);
 	m1->addWidget(browsetimeout_, 3, 1);
@@ -97,29 +97,29 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name)
 	m3->addWidget(hideimplicitmembers_, 1, 0);
 	m3->addWidget(useshortnames_, 1, 1);
 
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), cups_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), slp_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseport_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseinterval_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browsetimeout_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseaddresses_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), browseorder_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), useimplicitclasses_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), useanyclasses_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), hideimplicitmembers_, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), useshortnames_, TQT_SLOT(setEnabled(bool)));
-
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l1, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l2, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l3, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l4, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l5, TQT_SLOT(setEnabled(bool)));
-	connect(browsing_, TQT_SIGNAL(toggled(bool)), l6, TQT_SLOT(setEnabled(bool)));
-
-	connect(browseaddresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(browseaddresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(browseaddresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
-	connect(browseinterval_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), cups_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), slp_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseport_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseinterval_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browsetimeout_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseaddresses_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), browseorder_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), useimplicitclasses_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), useanyclasses_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), hideimplicitmembers_, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), useshortnames_, TQ_SLOT(setEnabled(bool)));
+
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l1, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l2, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l3, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l4, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l5, TQ_SLOT(setEnabled(bool)));
+	connect(browsing_, TQ_SIGNAL(toggled(bool)), l6, TQ_SLOT(setEnabled(bool)));
+
+	connect(browseaddresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(browseaddresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(browseaddresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
+	connect(browseinterval_, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int)));
 	browsing_->setChecked(true);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
index bdbff1844..53bc266d7 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
@@ -29,7 +29,7 @@ class TQComboBox;
 
 class CupsdBrowsingPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdBrowsingPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.h b/tdeprint/cups/cupsdconf2/cupsddialog.h
index 85eee172e..683e998d7 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.h
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.h
@@ -28,7 +28,7 @@ struct CupsdConf;
 
 class CupsdDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CupsdDialog(TQWidget *parent = 0, const char *name = 0);
 	~CupsdDialog();
@@ -52,7 +52,7 @@ protected:
 private:
 	TQPtrList<CupsdPage>	pagelist_;
 	CupsdConf		*conf_;
-	QString			filename_;
+	TQString			filename_;
 };
 
 #endif
diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
index 282657255..82848d03e 100644
--- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp
@@ -54,13 +54,13 @@ CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name)
 	TQGridLayout	*m1 = new TQGridLayout(this, 8, 2, 10, 7);
 	m1->setRowStretch(7, 1);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight|Qt::AlignTop);
-	m1->addWidget(l4, 3, 0, Qt::AlignRight);
-	m1->addWidget(l5, 4, 0, Qt::AlignRight);
-	m1->addWidget(l6, 5, 0, Qt::AlignRight);
-	m1->addWidget(l7, 6, 0, Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight|TQt::AlignTop);
+	m1->addWidget(l4, 3, 0, TQt::AlignRight);
+	m1->addWidget(l5, 4, 0, TQt::AlignRight);
+	m1->addWidget(l6, 5, 0, TQt::AlignRight);
+	m1->addWidget(l7, 6, 0, TQt::AlignRight);
 	m1->addWidget(datadir_, 0, 1);
 	m1->addWidget(documentdir_, 1, 1);
 	m1->addWidget(fontpath_, 2, 1);
diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
index e9cb1a0ad..8de8f429a 100644
--- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp
@@ -54,10 +54,10 @@ CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name)
 	TQGridLayout	*m1 = new TQGridLayout(this, 5, 2, 10, 7);
 	m1->setRowStretch(4, 1);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight);
-	m1->addWidget(l4, 3, 0, Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight);
+	m1->addWidget(l4, 3, 0, TQt::AlignRight);
 	m1->addWidget(user_, 0, 1);
 	m1->addWidget(group_, 1, 1);
 	m1->addWidget(ripcache_, 2, 1);
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
index 4fe84d769..1ac0c739b 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp
@@ -62,14 +62,14 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name)
 	m1->addWidget(keepjobhistory_, 0, 1);
 	m1->addWidget(keepjobfiles_, 1, 1);
 	m1->addWidget(autopurgejobs_, 2, 1);
-	m1->addWidget(l1, 3, 0, Qt::AlignRight);
-	m1->addWidget(l2, 4, 0, Qt::AlignRight);
-	m1->addWidget(l3, 5, 0, Qt::AlignRight);
+	m1->addWidget(l1, 3, 0, TQt::AlignRight);
+	m1->addWidget(l2, 4, 0, TQt::AlignRight);
+	m1->addWidget(l3, 5, 0, TQt::AlignRight);
 	m1->addWidget(maxjobs_, 3, 1);
 	m1->addWidget(maxjobsperprinter_, 4, 1);
 	m1->addWidget(maxjobsperuser_, 5, 1);
 
-	connect(keepjobhistory_, TQT_SIGNAL(toggled(bool)), TQT_SLOT(historyChanged(bool)));
+	connect(keepjobhistory_, TQ_SIGNAL(toggled(bool)), TQ_SLOT(historyChanged(bool)));
 	keepjobhistory_->setChecked(true);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.h b/tdeprint/cups/cupsdconf2/cupsdjobspage.h
index abbbd140d..8f6668aa3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class CupsdJobsPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdJobsPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
index 22128b39c..2052ece24 100644
--- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp
@@ -66,11 +66,11 @@ CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name)
 	TQGridLayout	*m1 = new TQGridLayout(this, 6, 2, 10, 7);
 	m1->setRowStretch(5, 1);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight);
-	m1->addWidget(l4, 3, 0, Qt::AlignRight);
-	m1->addWidget(l5, 4, 0, Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight);
+	m1->addWidget(l4, 3, 0, TQt::AlignRight);
+	m1->addWidget(l5, 4, 0, TQt::AlignRight);
 	m1->addWidget(accesslog_, 0, 1);
 	m1->addWidget(errorlog_, 1, 1);
 	m1->addWidget(pagelog_, 2, 1);
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
index e939c151f..f040f430c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp
@@ -74,12 +74,12 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
 	TQGridLayout	*m1 = new TQGridLayout(this, 8, 2, 10, 7);
 	m1->setRowStretch(7, 1);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 2, 0, Qt::AlignRight);
-	m1->addWidget(l3, 3, 0, Qt::AlignRight);
-	m1->addWidget(l4, 4, 0, Qt::AlignRight);
-	m1->addWidget(l5, 5, 0, Qt::AlignRight);
-	m1->addWidget(l6, 6, 0, Qt::AlignTop|Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 2, 0, TQt::AlignRight);
+	m1->addWidget(l3, 3, 0, TQt::AlignRight);
+	m1->addWidget(l4, 4, 0, TQt::AlignRight);
+	m1->addWidget(l5, 5, 0, TQt::AlignRight);
+	m1->addWidget(l6, 6, 0, TQt::AlignTop|TQt::AlignRight);
 	m1->addWidget(keepalive_, 1, 1);
 	m1->addWidget(hostnamelookup_, 0, 1);
 	m1->addWidget(keepalivetimeout_, 2, 1);
@@ -88,10 +88,10 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name)
 	m1->addWidget(clienttimeout_, 5, 1);
 	m1->addWidget(listen_, 6, 1);
 
-	connect(listen_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(listen_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(listen_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
-	connect(keepalive_, TQT_SIGNAL(toggled(bool)), keepalivetimeout_, TQT_SLOT(setEnabled(bool)));
+	connect(listen_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(listen_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(listen_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
+	connect(keepalive_, TQ_SIGNAL(toggled(bool)), keepalivetimeout_, TQ_SLOT(setEnabled(bool)));
 	keepalive_->setChecked(true);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h
index be46c280f..912d4bb4a 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h
@@ -30,7 +30,7 @@ class SizeWidget;
 
 class CupsdNetworkPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdNetworkPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdpage.h b/tdeprint/cups/cupsdconf2/cupsdpage.h
index aadbd54b9..9d8008d1f 100644
--- a/tdeprint/cups/cupsdconf2/cupsdpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdpage.h
@@ -26,7 +26,7 @@ struct CupsdConf;
 
 class CupsdPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CupsdPage(TQWidget *parent = 0, const char *name = 0);
 	virtual ~CupsdPage();
@@ -46,9 +46,9 @@ protected:
 
 protected:
 	CupsdConf	*conf_;
-	QString		label_;
-	QString		header_;
-	QString		pixmap_;
+	TQString		label_;
+	TQString		header_;
+	TQString		pixmap_;
 };
 
 #endif
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
index 6d6061264..1a5fa9e53 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp
@@ -55,21 +55,21 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name)
 	TQGridLayout	*m1 = new TQGridLayout(this, 6, 2, 10, 7);
 	m1->setRowStretch(5, 1);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight);
-	m1->addWidget(l4, 3, 0, Qt::AlignRight);
-	m1->addWidget(l5, 4, 0, Qt::AlignRight|Qt::AlignTop);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight);
+	m1->addWidget(l4, 3, 0, TQt::AlignRight);
+	m1->addWidget(l5, 4, 0, TQt::AlignRight|TQt::AlignTop);
 	m1->addWidget(remoteroot_, 0, 1);
 	m1->addWidget(systemgroup_, 1, 1);
 	m1->addWidget(encryptcert_, 2, 1);
 	m1->addWidget(encryptkey_, 3, 1);
 	m1->addWidget(locations_, 4, 1);
 
-	connect(locations_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(locations_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(locations_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
-	connect(locations_, TQT_SIGNAL(deleted(int)), TQT_SLOT(slotDeleted(int)));
+	connect(locations_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(locations_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(locations_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
+	connect(locations_, TQ_SIGNAL(deleted(int)), TQ_SLOT(slotDeleted(int)));
 }
 
 bool CupsdSecurityPage::loadConfig(CupsdConf *conf, TQString&)
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h
index 5e97c1cf8..ebe86b6ad 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h
@@ -30,7 +30,7 @@ struct CupsLocation;
 
 class CupsdSecurityPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdSecurityPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
index e89356af9..ac38bb19c 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp
@@ -88,7 +88,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name)
 	TQLabel *l6 = new TQLabel(i18n("Printcap file:"), this);
 	TQLabel *l7 = new TQLabel(i18n("Printcap format:"), this);
 
-	connect(classification_, TQT_SIGNAL(activated(int)), TQT_SLOT(classChanged(int)));
+	connect(classification_, TQ_SIGNAL(activated(int)), TQ_SLOT(classChanged(int)));
 	classification_->setCurrentItem(0);
 	charset_->setCurrentItem(0);
 	printcapformat_->setCurrentItem(0);
@@ -97,13 +97,13 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name)
 	TQGridLayout	*m1 = new TQGridLayout(this, 9, 2, 10, 7);
 	m1->setRowStretch(8, 1);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight);
-	m1->addWidget(l4, 4, 0, Qt::AlignRight);
-	m1->addWidget(l5, 5, 0, Qt::AlignRight);
-	m1->addWidget(l6, 6, 0, Qt::AlignRight);
-	m1->addWidget(l7, 7, 0, Qt::AlignRight);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight);
+	m1->addWidget(l4, 4, 0, TQt::AlignRight);
+	m1->addWidget(l5, 5, 0, TQt::AlignRight);
+	m1->addWidget(l6, 6, 0, TQt::AlignRight);
+	m1->addWidget(l7, 7, 0, TQt::AlignRight);
 	m1->addWidget(servername_, 0, 1);
 	m1->addWidget(serveradmin_, 1, 1);
 	m1->addWidget(charset_, 4, 1);
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.h b/tdeprint/cups/cupsdconf2/cupsdserverpage.h
index f1f9eed2f..13bac0f6e 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.h
@@ -28,7 +28,7 @@ class TQComboBox;
 
 class CupsdServerPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdServerPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
index c28329e67..52db651d3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp
@@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name)
 	TQLabel	*cupslogo_ = new TQLabel(this);
 	TQString	logopath = locate("data", TQString("tdeprint/cups_logo.png"));
 	cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
-	cupslogo_->setAlignment(Qt::AlignCenter);
+	cupslogo_->setAlignment(TQt::AlignCenter);
 	TQLabel	*kupslogo_ = new TQLabel(this);
 	logopath = locate("data", TQString("tdeprint/kde_logo.png"));
 	kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath));
-	kupslogo_->setAlignment(Qt::AlignCenter);
+	kupslogo_->setAlignment(TQt::AlignCenter);
 
 	TQLabel	*helptxt_ = new TQLabel(this);
 	helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. "
diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp
index 2e0d523f0..fd7f6b6c6 100644
--- a/tdeprint/cups/cupsdconf2/editlist.cpp
+++ b/tdeprint/cups/cupsdconf2/editlist.cpp
@@ -43,11 +43,11 @@ EditList::EditList(TQWidget *parent, const char *name)
 	m1->addWidget(delbtn_, 2, 1);
 	m1->addWidget(defbtn_, 3, 1);
 
-	connect(addbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(add()));
-	connect(editbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
-	connect(delbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete()));
-	connect(defbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(defaultList()));
-	connect(list_, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSelected(int)));
+	connect(addbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(add()));
+	connect(editbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit()));
+	connect(delbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete()));
+	connect(defbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(defaultList()));
+	connect(list_, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSelected(int)));
 	slotSelected(-1);
 }
 
diff --git a/tdeprint/cups/cupsdconf2/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h
index 19a2da8c8..45783b0e3 100644
--- a/tdeprint/cups/cupsdconf2/editlist.h
+++ b/tdeprint/cups/cupsdconf2/editlist.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class EditList : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	EditList(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp
index 0754ae573..a203f4e5e 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp
@@ -66,8 +66,8 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
 	order_->insertItem(i18n("Allow, Deny"));
 	order_->insertItem(i18n("Deny, Allow"));
 
-	connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int)));
-	connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
+	connect(authclass_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotClassChanged(int)));
+	connect(authtype_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
 
 	TQLabel	*l1 = new TQLabel(i18n("Resource:"), dummy);
 	TQLabel	*l2 = new TQLabel(i18n("Authentication:"), dummy);
@@ -80,14 +80,14 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
 
 	TQGridLayout	*m1 = new TQGridLayout(dummy, 8, 2, 0, 5);
 	m1->setColStretch(1, 1);
-	m1->addWidget(l1, 0, 0, Qt::AlignRight);
-	m1->addWidget(l2, 1, 0, Qt::AlignRight);
-	m1->addWidget(l3, 2, 0, Qt::AlignRight);
-	m1->addWidget(l4, 3, 0, Qt::AlignRight);
-	m1->addWidget(l5, 4, 0, Qt::AlignRight);
-	m1->addWidget(l6, 5, 0, Qt::AlignRight);
-	m1->addWidget(l7, 6, 0, Qt::AlignRight);
-	m1->addWidget(l8, 7, 0, Qt::AlignRight|Qt::AlignTop);
+	m1->addWidget(l1, 0, 0, TQt::AlignRight);
+	m1->addWidget(l2, 1, 0, TQt::AlignRight);
+	m1->addWidget(l3, 2, 0, TQt::AlignRight);
+	m1->addWidget(l4, 3, 0, TQt::AlignRight);
+	m1->addWidget(l5, 4, 0, TQt::AlignRight);
+	m1->addWidget(l6, 5, 0, TQt::AlignRight);
+	m1->addWidget(l7, 6, 0, TQt::AlignRight);
+	m1->addWidget(l8, 7, 0, TQt::AlignRight|TQt::AlignTop);
 	m1->addWidget(resource_, 0, 1);
 	m1->addWidget(authtype_, 1, 1);
 	m1->addWidget(authclass_, 2, 1);
@@ -104,9 +104,9 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name)
 	slotClassChanged(AUTHCLASS_ANONYMOUS);
 	encryption_->setCurrentItem(ENCRYPT_IFREQUESTED);
 
-	connect(addresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd()));
-	connect(addresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int)));
-	connect(addresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList()));
+	connect(addresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd()));
+	connect(addresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int)));
+	connect(addresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList()));
 }
 
 void LocationDialog::setInfos(CupsdConf *conf)
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.h b/tdeprint/cups/cupsdconf2/locationdialog.h
index f0c182f42..2afd3600b 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.h
+++ b/tdeprint/cups/cupsdconf2/locationdialog.h
@@ -30,7 +30,7 @@ struct CupsLocation;
 
 class LocationDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	LocationDialog(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp
index f758d5d1e..a1fc7dd00 100644
--- a/tdeprint/cups/cupsdconf2/portdialog.cpp
+++ b/tdeprint/cups/cupsdconf2/portdialog.cpp
@@ -45,9 +45,9 @@ PortDialog::PortDialog(TQWidget *parent, const char *name)
 
 	TQVBoxLayout	*m1 = new TQVBoxLayout(dummy, 0, 10);
 	TQGridLayout	*m2 = new TQGridLayout(0, 3, 2, 0, 5);
-	m1->addLayout(TQT_TQLAYOUT(m2));
-	m2->addWidget(l1, 0, 0, Qt::AlignRight);
-	m2->addWidget(l2, 1, 0, Qt::AlignRight);
+	m1->addLayout(m2);
+	m2->addWidget(l1, 0, 0, TQt::AlignRight);
+	m2->addWidget(l2, 1, 0, TQt::AlignRight);
 	m2->addMultiCellWidget(usessl_, 2, 2, 0, 1);
 	m2->addWidget(address_, 0, 1);
 	m2->addWidget(port_, 1, 1);
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
index c3a6d50d2..e82a6fba6 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp
@@ -31,7 +31,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name)
 	edit_ = new TQLineEdit(this);
 	button_ = new KPushButton(this);
 	button_->setPixmap(SmallIcon("document-open"));
-	connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked()));
+	connect(button_,TQ_SIGNAL(clicked()),TQ_SLOT(buttonClicked()));
 
 	TQHBoxLayout	*main_ = new TQHBoxLayout(this, 0, 3);
 	main_->addWidget(edit_);
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.h b/tdeprint/cups/cupsdconf2/qdirlineedit.h
index d852897c3..f682d6fbe 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.h
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class QDirLineEdit : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	QDirLineEdit(bool file, TQWidget *parent = 0, const char *name = 0);
 	~QDirLineEdit();
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
index e6cade32e..cc1392577 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp
@@ -34,14 +34,14 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
 	m_view->header()->hide();
 	m_view->addColumn("");
 	m_view->setFullWidth(true);
-	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*)));
+	connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelected(TQListViewItem*)));
 
 	m_add = new TQPushButton(this);
 	m_add->setPixmap(SmallIcon("folder-new"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked()));
 	m_remove = new TQPushButton(this);
 	m_remove->setPixmap(SmallIcon("edit-delete"));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked()));
 	m_remove->setEnabled(false);
 
 	m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2));
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
index a55f3355e..47b9530d3 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class QDirMultiLineEdit : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	QDirMultiLineEdit(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdoprint.c b/tdeprint/cups/cupsdoprint.c
index 999b5f493..3741d7509 100644
--- a/tdeprint/cups/cupsdoprint.c
+++ b/tdeprint/cups/cupsdoprint.c
@@ -146,7 +146,7 @@ int main(int argc, char* argv[])
 	char	*a;
 	cups_option_t	*options = NULL;
 	int		num_options = 0;
-	char*	files[100] = {0};
+	const char*	files[100] = {0};
 	int	num_files = 0;
 	int	jobID = 0;
 
diff --git a/tdeprint/cups/image.cpp b/tdeprint/cups/image.cpp
index ce56bb4b9..d26b01400 100644
--- a/tdeprint/cups/image.cpp
+++ b/tdeprint/cups/image.cpp
@@ -249,10 +249,10 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne
 {
 	float	mat[3][3] = {{1.0,0.0,0.0},{0.0,1.0,0.0},{0.0,0.0,1.0}};
 	int	lut[3][3][256];
-	QRgb	c;
+	TQRgb	c;
 	int	r,g,b,v,r2,g2,b2;
 	float	gam = 1.0/(float(gamma)/1000.0);
-	QImage	img(image);
+	TQImage	img(image);
 
 	saturate(mat,saturation*0.01);
 	huerotate(mat,(float)hue);
diff --git a/tdeprint/cups/imageposition.cpp b/tdeprint/cups/imageposition.cpp
index 8ff617665..436af9ac4 100644
--- a/tdeprint/cups/imageposition.cpp
+++ b/tdeprint/cups/imageposition.cpp
@@ -25,16 +25,16 @@
 static void draw3DPage(TQPainter *p, TQRect r)
 {
 	// draw white page
-	p->fillRect(r,Qt::white);
+	p->fillRect(r,TQt::white);
 	// draw 3D border
-	p->setPen(Qt::black);
+	p->setPen(TQt::black);
 	p->moveTo(r.left(),r.bottom());
 	p->lineTo(r.right(),r.bottom());
 	p->lineTo(r.right(),r.top());
-	p->setPen(Qt::darkGray);
+	p->setPen(TQt::darkGray);
 	p->lineTo(r.left(),r.top());
 	p->lineTo(r.left(),r.bottom());
-	p->setPen(Qt::gray);
+	p->setPen(TQt::gray);
 	p->moveTo(r.left()+1,r.bottom()-1);
 	p->lineTo(r.right()-1,r.bottom()-1);
 	p->lineTo(r.right()-1,r.top()+1);
diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp
index e2401d6d3..549010f44 100644
--- a/tdeprint/cups/imagepreview.cpp
+++ b/tdeprint/cups/imagepreview.cpp
@@ -55,7 +55,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga
 }
 
 void ImagePreview::paintEvent(TQPaintEvent*){
-	QImage	tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
+	TQImage	tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_);
 	int	x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2;
 
 	TQPixmap	buffer(width(), height());
diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp
index 63f0207dd..e16b38dd5 100644
--- a/tdeprint/cups/ippreportdlg.cpp
+++ b/tdeprint/cups/ippreportdlg.cpp
@@ -62,7 +62,7 @@ void IppReportDlg::slotUser1()
 			rich.draw(&painter, margin, margin, r, colorGroup());
 			TQString	s = caption() + ": " + TQString::number(page);
 			TQRect	br = painter.fontMetrics().boundingRect(s);
-			painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s);
+			painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, TQt::AlignRight|TQt::AlignTop, s);
 			r.moveBy(0, r.height()-10);
 			painter.translate(0, -(r.height()-10));
 			if (r.top() < hh)
diff --git a/tdeprint/cups/ippreportdlg.h b/tdeprint/cups/ippreportdlg.h
index e61ccd7b7..9d622562e 100644
--- a/tdeprint/cups/ippreportdlg.h
+++ b/tdeprint/cups/ippreportdlg.h
@@ -27,7 +27,7 @@ class KTextEdit;
 
 class IppReportDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	IppReportDlg(TQWidget *parent = 0, const char *name = 0);
 	static void report(IppRequest *req, int group, const TQString& caption = TQString::null);
diff --git a/tdeprint/cups/ipprequest.cpp b/tdeprint/cups/ipprequest.cpp
index 8a363152b..943eea82a 100644
--- a/tdeprint/cups/ipprequest.cpp
+++ b/tdeprint/cups/ipprequest.cpp
@@ -103,7 +103,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::
 		kdDebug(500) << s << endl;
 		attr = ippNextAttribute(req);
 	}
-#else // HAVE_CUPS_1_6
+#else
 	kdDebug(500) << "State = 0x" << TQString::number(req->state, 16) << endl;
 	kdDebug(500) << "ID = 0x" << TQString::number(req->request.status.request_id, 16) << endl;
 	if (answer)
@@ -152,7 +152,7 @@ void dumpRequest(ipp_t *req, bool answer = false, const TQString& s = TQString::
 		kdDebug(500) << s << endl;
 		attr = attr->next;
 	}
-#endif // HAVE_CUPS_1_6
+#endif
 }
 
 TQString errorString(int status)
@@ -258,9 +258,9 @@ void IppRequest::addIntegerList_p(int group, int type, const TQString& name, con
 		for (TQValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
 #ifdef HAVE_CUPS_1_6
 			ippSetInteger(request_, &attr, i, *it);
-#else // HAVE_CUPS_1_6
+#else
 			attr->values[i].integer = *it;
-#endif // HAVE_CUPS_1_6
+#endif
 	}
 }
 
@@ -278,9 +278,9 @@ void IppRequest::addBoolean(int group, const TQString& name, const TQValueList<b
 		for (TQValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
 #ifdef HAVE_CUPS_1_6
 			ippSetBoolean(request_, &attr, i, (char)(*it));
-#else // HAVE_CUPS_1_6
+#else
 			attr->values[i].boolean = (char)(*it);
-#endif // HAVE_CUPS_1_6
+#endif
 	}
 }
 
@@ -289,19 +289,19 @@ void IppRequest::setOperation(int op)
 #ifdef HAVE_CUPS_1_6
 	ippSetOperation(request_, (ipp_op_t)op);
 	ippSetRequestId(request_, 1);		// 0 is not RFC-compliant, should be at least 1
-#else // HAVE_CUPS_1_6
+#else
 	request_->request.op.operation_id = (ipp_op_t)op;
 	request_->request.op.request_id = 1;	// 0 is not RFC-compliant, should be at least 1
-#endif // HAVE_CUPS_1_6
+#endif
 }
 
 int IppRequest::status()
 {
 #ifdef HAVE_CUPS_1_6
 	return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2));
-#else // HAVE_CUPS_1_6
+#else
 	return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2));
-#endif // HAVE_CUPS_1_6
+#endif
 }
 
 TQString IppRequest::statusMessage()
@@ -330,9 +330,9 @@ bool IppRequest::integerValue_p(const TQString& name, int& value, int type)
 	{
 #ifdef HAVE_CUPS_1_6
 		value = ippGetInteger(attr, 0);
-#else // HAVE_CUPS_1_6
+#else
 		value = attr->values[0].integer;
-#endif // HAVE_CUPS_1_6
+#endif
 		return true;
 	}
 	else return false;
@@ -346,9 +346,9 @@ bool IppRequest::stringValue_p(const TQString& name, TQString& value, int type)
 	{
 #ifdef HAVE_CUPS_1_6
 		value = TQString::fromLocal8Bit(ippGetString(attr, 0, NULL));
-#else // HAVE_CUPS_1_6
+#else
 		value = TQString::fromLocal8Bit(attr->values[0].string.text);
-#endif // HAVE_CUPS_1_6
+#endif
 		return true;
 	}
 	else return false;
@@ -364,10 +364,10 @@ bool IppRequest::stringListValue_p(const TQString& name, TQStringList& values, i
 #ifdef HAVE_CUPS_1_6
 		for (int i=0;i<ippGetCount(attr);i++)
 			values.append(TQString::fromLocal8Bit(ippGetString(attr, i, NULL)));
-#else // HAVE_CUPS_1_6
+#else
 		for (int i=0;i<attr->num_values;i++)
 			values.append(TQString::fromLocal8Bit(attr->values[i].string.text));
-#endif // HAVE_CUPS_1_6
+#endif
 		return true;
 	}
 	else return false;
@@ -381,9 +381,9 @@ bool IppRequest::boolean(const TQString& name, bool& value)
 	{
 #ifdef HAVE_CUPS_1_6
 		value = (bool)ippGetBoolean(attr, 0);
-#else // HAVE_CUPS_1_6
+#else
 		value = (bool)attr->values[0].boolean;
-#endif // HAVE_CUPS_1_6
+#endif
 		return true;
 	}
 	else return false;
@@ -437,16 +437,16 @@ bool IppRequest::doFileRequest(const TQString& res, const TQString& filename)
 	/* No printers found */
 #ifdef HAVE_CUPS_1_6
 	if ( request_ && ippGetStatusCode(request_) == 0x406 )
-#else // HAVE_CUPS_1_6
+#else
 	if ( request_ && request_->request.status.status_code == 0x406 )
-#endif // HAVE_CUPS_1_6
+#endif
 		return true;
 
 #ifdef HAVE_CUPS_1_6
 	if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00))
-#else // HAVE_CUPS_1_6
+#else
 	if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
-#endif // HAVE_CUPS_1_6
+#endif
 		return false;
 
 
@@ -465,11 +465,11 @@ bool IppRequest::htmlReport(int group, TQTextStream& output)
 	ipp_attribute_t	*attr = ippFirstAttribute(request_);
 	while (attr && ippGetGroupTag(attr) != group)
 		attr = ippNextAttribute(request_);
-#else // HAVE_CUPS_1_6
+#else
 	ipp_attribute_t	*attr = request_->attrs;
 	while (attr && attr->group_tag != group)
 		attr = attr->next;
-#endif // HAVE_CUPS_1_6
+#endif
 	// print each attribute
 	const ipp_uchar_t	*d;
 	TQCString		dateStr;
@@ -542,7 +542,7 @@ bool IppRequest::htmlReport(int group, TQTextStream& output)
 		}
 		output << "</td>\n  </tr>" << endl;
 		attr = ippNextAttribute(request_);
-#else // HAVE_CUPS_1_6
+#else
 	while (attr && attr->group_tag == group)
 	{
 		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << attr->name << "</b></td>\n    <td>" << endl;
@@ -602,7 +602,7 @@ bool IppRequest::htmlReport(int group, TQTextStream& output)
 		}
 		output << "</td>\n  </tr>" << endl;
 		attr = attr->next;
-#endif // HAVE_CUPS_1_6
+#endif
 	}
 	// end table
 	output << "</table>" << endl;
@@ -670,7 +670,7 @@ TQMap<TQString,TQString> IppRequest::toMap(int group)
 				value.truncate(value.length()-1);
 			opts[TQString::fromLocal8Bit(ippGetName(attr))] = value;
 			attr = ippNextAttribute(request_);
-#else // HAVE_CUPS_1_6
+#else
 			if (group != -1 && attr->group_tag != group)
 			{
 				attr = attr->next;
@@ -719,7 +719,7 @@ TQMap<TQString,TQString> IppRequest::toMap(int group)
 				value.truncate(value.length()-1);
 			opts[TQString::fromLocal8Bit(attr->name)] = value;
 			attr = attr->next;
-#endif // HAVE_CUPS_1_6
+#endif
 		}
 	}
 	return opts;
@@ -780,7 +780,7 @@ void IppRequest::setMap(const TQMap<TQString,TQString>& opts)
 #ifdef HAVE_CUPS_1_6
 ipp_attribute_t* IppRequest::first()
 { return (request_ ? ippFirstAttribute(request_) : NULL); }
-#else // HAVE_CUPS_1_6
+#else
 ipp_attribute_t* IppRequest::first()
 { return (request_ ? request_->attrs : NULL); }
-#endif // HAVE_CUPS_1_6
+#endif
diff --git a/tdeprint/cups/ipprequest.h b/tdeprint/cups/ipprequest.h
index 84a7c5b18..8577c9b93 100644
--- a/tdeprint/cups/ipprequest.h
+++ b/tdeprint/cups/ipprequest.h
@@ -102,7 +102,7 @@ protected:
 
 private:
 	ipp_t	*request_;
-	QString	host_;
+	TQString	host_;
 	int 	port_;
 	bool	connect_;
 	int	dump_;
diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp
index 10a455226..7dd7e5abc 100644
--- a/tdeprint/cups/kmconfigcupsdir.cpp
+++ b/tdeprint/cups/kmconfigcupsdir.cpp
@@ -35,7 +35,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	setPageHeader(i18n("CUPS Folder Settings"));
 	setPagePixmap("folder");
 
-	TQGroupBox *m_dirbox = new TQGroupBox(0, Qt::Vertical, i18n("Installation Folder"), this);
+	TQGroupBox *m_dirbox = new TQGroupBox(0, TQt::Vertical, i18n("Installation Folder"), this);
 	m_installdir = new KURLRequester(m_dirbox);
 	m_installdir->setMode((KFile::Mode)(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly));
 	m_stddir = new TQCheckBox(i18n("Standard installation (/)"), m_dirbox);
@@ -44,18 +44,18 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent)
 	TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	lay0->addWidget(m_dirbox);
 	lay0->addStretch(1);
-	TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10);
+	TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10);
 	lay1->addWidget(m_stddir);
 	lay1->addWidget(m_installdir);
 
-	connect(m_stddir,TQT_SIGNAL(toggled(bool)),m_installdir,TQT_SLOT(setDisabled(bool)));
+	connect(m_stddir,TQ_SIGNAL(toggled(bool)),m_installdir,TQ_SLOT(setDisabled(bool)));
 	m_stddir->setChecked(true);
 }
 
 void KMConfigCupsDir::loadConfig(TDEConfig *conf)
 {
 	conf->setGroup("CUPS");
-	QString	dir = conf->readPathEntry("InstallDir");
+	TQString	dir = conf->readPathEntry("InstallDir");
 	m_stddir->setChecked(dir.isEmpty());
 	m_installdir->setURL(dir);
 }
diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp
index f93c1a4b3..9f05f3b16 100644
--- a/tdeprint/cups/kmcupsconfigwidget.cpp
+++ b/tdeprint/cups/kmcupsconfigwidget.cpp
@@ -41,7 +41,7 @@ public:
 };
 
 PortValidator::PortValidator(TQWidget *parent, const char *name)
-: TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name)
+: TQIntValidator(1, 65535, parent, name)
 {
 }
 
@@ -62,8 +62,8 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
 : TQWidget(parent,name)
 {
 	// widget creation
-	TQGroupBox	*m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this);
-	TQGroupBox	*m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this);
+	TQGroupBox	*m_hostbox = new TQGroupBox(0, TQt::Vertical, i18n("Server Information"), this);
+	TQGroupBox	*m_loginbox = new TQGroupBox(0, TQt::Vertical, i18n("Account Information"), this);
 	TQLabel	*m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox);
 	TQLabel	*m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox);
 	m_host = new TQLineEdit(m_hostbox);
@@ -103,9 +103,9 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name)
 	lay3->addMultiCellWidget(m_anonymous,3,3,0,1);
 
 	// connections
-	connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setDisabled(bool)));
-	connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setDisabled(bool)));
-	connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_savepwd,TQT_SLOT(setDisabled(bool)));
+	connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setDisabled(bool)));
+	connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setDisabled(bool)));
+	connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_savepwd,TQ_SLOT(setDisabled(bool)));
 }
 
 void KMCupsConfigWidget::load()
diff --git a/tdeprint/cups/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h
index 0635dd8ea..00b218c20 100644
--- a/tdeprint/cups/kmcupsjobmanager.h
+++ b/tdeprint/cups/kmcupsjobmanager.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class KMCupsJobManager : public KMJobManager
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KMCupsJobManager(TQObject *parent, const char *name, const TQStringList &/*args*/);
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index ee1c62728..3e5876451 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -292,8 +292,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p)
 	// Give 2 seconds to connect to the printer, or abort
 	KExtendedSocket *kes = new KExtendedSocket(p->uri().host(),
 	p->uri().port());
-	connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot()));
-	connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot()));
+	connect(kes, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(hostPingSlot()));
+	connect(kes, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(hostPingFailedSlot()));
 	if (kes->startAsyncConnect() != 0) {
 	delete kes;
 	m_hostSuccess = false;
@@ -938,9 +938,9 @@ TQStringList KMCupsManager::detectLocalPrinters()
 
 void KMCupsManager::createPluginActions(TDEActionCollection *coll)
 {
-	TDEAction	*act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver");
+	TDEAction	*act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQ_SLOT(exportDriver()), coll, "plugin_export_driver");
 	act->setGroup("plugin");
-	act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
+	act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQ_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report");
 	act->setGroup("plugin");
 }
 
@@ -1020,12 +1020,12 @@ void KMCupsManager::checkUpdatePossibleInternal()
 	delete m_socket;
         m_socket = new KNetwork::TDEBufferedSocket;
 	m_socket->setTimeout( 1500 );
-	connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), 
-                TQT_SLOT( slotConnectionSuccess() ) );
-	connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) );
+	connect( m_socket, TQ_SIGNAL( connected(const KResolverEntry&) ), 
+                TQ_SLOT( slotConnectionSuccess() ) );
+	connect( m_socket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) );
 
         trials = 5;
-        TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) );
+        TQTimer::singleShot( 1, this, TQ_SLOT( slotAsyncConnect() ) );
 }
 
 void KMCupsManager::slotConnectionSuccess()
@@ -1044,7 +1044,7 @@ void KMCupsManager::slotConnectionSuccess()
 		if ( trials > 0 )
 		{
 			trials--;
-			TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) );
+			TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) );
 		}
 		else
 		{
@@ -1074,7 +1074,7 @@ void KMCupsManager::slotConnectionFailed( int errcode )
 		//m_socket->cancelAsyncConnect();
 		trials--;
 		m_socket->close();
-		TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) );
+		TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) );
 		return;
 	}
 
diff --git a/tdeprint/cups/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h
index 1e7c21b19..cc4a74a85 100644
--- a/tdeprint/cups/kmcupsmanager.h
+++ b/tdeprint/cups/kmcupsmanager.h
@@ -35,7 +35,7 @@ class KMCupsManager : public KMManager
 	friend class KMWIppPrinter;
 	friend class KMCupsJobManager;
 
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMCupsManager(TQObject *parent, const char *name, const TQStringList & /*args*/);
 	virtual ~KMCupsManager();
diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp
index 03b85bb0a..8438a7c1b 100644
--- a/tdeprint/cups/kmcupsuimanager.cpp
+++ b/tdeprint/cups/kmcupsuimanager.cpp
@@ -134,7 +134,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard)
 	backend->addBackend(KMWizard::Class,i18n("Cl&ass of printers"),false,whatsThisClassOfPrinters);
 
 	IppRequest	req;
-	QString		uri;
+	TQString		uri;
 
 	req.setOperation(CUPS_GET_DEVICES);
 	uri = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
@@ -234,7 +234,7 @@ void KMCupsUiManager::setupPrintDialogPages(TQPtrList<KPrintDialogPage>* pages)
 void KMCupsUiManager::setupJobViewer(TQListView *lv)
 {
 	lv->addColumn(i18n("Priority"));
-	lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter);
+	lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter);
 	lv->addColumn(i18n("Billing Information"));
-	lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter);
+	lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter);
 }
diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp
index a8ec8d425..e2b4423d0 100644
--- a/tdeprint/cups/kmwipp.cpp
+++ b/tdeprint/cups/kmwipp.cpp
@@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name)
 	m_ID = KMWizard::IPP;
 	m_title = i18n("Remote IPP server");
 	m_nextpage = KMWizard::IPPSelect;
-	lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) );
+	lineEdit( 1 )->setValidator( new TQIntValidator( this ) );
 
 	setInfo(i18n("<p>Enter the information concerning the remote IPP server "
 		     "owning the targeted printer. This wizard will poll the server "
diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp
index f7a4f0593..bbc878055 100644
--- a/tdeprint/cups/kmwippprinter.cpp
+++ b/tdeprint/cups/kmwippprinter.cpp
@@ -70,12 +70,12 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name)
 	KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	sep->setFixedHeight(20);
 
-	connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) );
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
-	connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport()));
+	connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*)));
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) );
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) );
+	connect(m_ippreport, TQ_SIGNAL(clicked()), TQ_SLOT(slotIppReport()));
 
 	// layout
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(this, 0, 10);
diff --git a/tdeprint/cups/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h
index f578afba9..24758ab4a 100644
--- a/tdeprint/cups/kmwippprinter.h
+++ b/tdeprint/cups/kmwippprinter.h
@@ -31,7 +31,7 @@ class NetworkScanner;
 
 class KMWIppPrinter : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWIppPrinter(TQWidget *parent = 0, const char *name = 0);
 	~KMWIppPrinter();
diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp
index 497fa03c3..67707b3ea 100644
--- a/tdeprint/cups/kmwother.cpp
+++ b/tdeprint/cups/kmwother.cpp
@@ -53,7 +53,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name)
 	m_uriview->addColumn( "" );
 	m_uriview->header()->hide();
 	m_uriview->setSorting( -1 );
-	connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) );
+	connect( m_uriview, TQ_SIGNAL( pressed( TQListViewItem* ) ), TQ_SLOT( slotPressed( TQListViewItem* ) ) );
 
 	TQVBoxLayout	*lay1 = new TQVBoxLayout(this, 0, 15);
 	TQVBoxLayout	*lay2 = new TQVBoxLayout(0, 0, 5);
diff --git a/tdeprint/cups/kmwother.h b/tdeprint/cups/kmwother.h
index a650482f4..c25913a52 100644
--- a/tdeprint/cups/kmwother.h
+++ b/tdeprint/cups/kmwother.h
@@ -28,7 +28,7 @@ class TQListViewItem;
 
 class KMWOther : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWOther(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/cups/kmwquota.h b/tdeprint/cups/kmwquota.h
index d8895c80d..e63f01aa4 100644
--- a/tdeprint/cups/kmwquota.h
+++ b/tdeprint/cups/kmwquota.h
@@ -27,7 +27,7 @@ class TQComboBox;
 
 class KMWQuota : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWQuota(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMWQuota();
diff --git a/tdeprint/cups/kmwusers.h b/tdeprint/cups/kmwusers.h
index cae8844a6..82c0d8a75 100644
--- a/tdeprint/cups/kmwusers.h
+++ b/tdeprint/cups/kmwusers.h
@@ -27,7 +27,7 @@ class TQComboBox;
 
 class KMWUsers : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWUsers(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMWUsers();
diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp
index f804b249d..03271fa1c 100644
--- a/tdeprint/cups/kphpgl2page.cpp
+++ b/tdeprint/cups/kphpgl2page.cpp
@@ -110,7 +110,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
 
 	setTitle("HP-GL/2");
 
-	TQGroupBox	*box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this);
+	TQGroupBox	*box = new TQGroupBox(0, TQt::Vertical, i18n("HP-GL/2 Options"), this);
 
 	m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box);
 	  TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page);
@@ -119,7 +119,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
 	  TQWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page);
 
 	m_penwidth = new KIntNumInput(1000, box);
-	m_penwidth->setLabel(i18n("&Pen width:"), Qt::AlignLeft|Qt::AlignVCenter);
+	m_penwidth->setLabel(i18n("&Pen width:"), TQt::AlignLeft|TQt::AlignVCenter);
 	m_penwidth->setSuffix(" [um]");
 	m_penwidth->setRange(0, 10000, 100, true);
 	  TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page);
@@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name)
 	l0->addWidget(box);
 	l0->addStretch(1);
 
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10);
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), 10);
 	l1->addWidget(m_blackplot);
 	l1->addWidget(m_fitplot);
 	l1->addWidget(m_penwidth);
diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp
index 8d23fe3e0..0c6eb4770 100644
--- a/tdeprint/cups/kpimagepage.cpp
+++ b/tdeprint/cups/kpimagepage.cpp
@@ -236,11 +236,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 
 	setTitle(i18n("Image"));
 
-	TQGroupBox	*colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this);
+	TQGroupBox	*colorbox = new TQGroupBox(0, TQt::Vertical, i18n("Color Settings"), this);
 	  TQWhatsThis::add(this, whatsThisImagePage);
-	TQGroupBox	*sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this);
+	TQGroupBox	*sizebox = new TQGroupBox(0, TQt::Vertical, i18n("Image Size"), this);
 	  TQWhatsThis::add(sizebox, whatsThisSizeImagePage);
-	TQGroupBox	*positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this);
+	TQGroupBox	*positionbox = new TQGroupBox(0, TQt::Vertical, i18n("Image Position"), this);
 	  TQWhatsThis::add(positionbox, whatsThisPositionImagePage);
 
 	m_brightness = new KIntNumInput(100, colorbox);
@@ -263,10 +263,10 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	m_gamma->setRange(1, 3000, 100, true);
 	  TQWhatsThis::add(m_gamma, whatsThisGammaImagePage);
 
-	connect(m_brightness, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
-	connect(m_hue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
-	connect(m_saturation, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
-	//connect(m_gamma, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged()));
+	connect(m_brightness, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
+	connect(m_hue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
+	connect(m_saturation, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
+	//connect(m_gamma, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged()));
 
 	m_preview = new ImagePreview(colorbox);
 	bool	useColor = (driver ? driver->get("colordevice") == "1" : true);
@@ -278,11 +278,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	TQImage	img(locate("data", "tdeprint/preview.png"));
 	m_preview->setImage(img);
 
-	KSeparator	*sep = new KSeparator(Qt::Horizontal, colorbox);
+	KSeparator	*sep = new KSeparator(TQt::Horizontal, colorbox);
 
 	TQPushButton	*defbtn = new TQPushButton(i18n("&Default Settings"), colorbox);
 	  TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage);
-	connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked()));
+	connect(defbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultClicked()));
 	slotDefaultClicked();
 
 	m_sizetype = new TQComboBox(sizebox);
@@ -297,7 +297,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	m_size->setRange(1, 1200, 20, true);
 	m_size->setValue(72);
 
-	connect(m_sizetype, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeTypeChanged(int)));
+	connect(m_sizetype, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeTypeChanged(int)));
 	m_sizetype->setCurrentItem(0);
 	slotSizeTypeChanged(0);
 
@@ -342,8 +342,8 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	    m_horizgrp->insert(hcenter, 1);
 	    m_horizgrp->insert(right, 2);
 	}
-	connect(m_vertgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged()));
-	connect(m_horizgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged()));
+	connect(m_vertgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged()));
+	connect(m_horizgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged()));
 	m_vertgrp->setButton(1);
 	m_horizgrp->setButton(1);
 	slotPositionChanged();
@@ -361,7 +361,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	l1->addWidget(m_gamma, 4, 0);
 	l1->addMultiCellWidget(m_preview, 0, 3, 1, 1);
 	l1->addWidget(defbtn, 4, 1);
-	TQVBoxLayout	*l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3);
+	TQVBoxLayout	*l2 = new TQVBoxLayout(sizebox->layout(), 3);
 	l2->addStretch(1);
 	l2->addWidget(lab);
 	l2->addWidget(m_sizetype);
@@ -374,12 +374,12 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
 	l3->addLayout(l4, 0, 1);
 	l3->addLayout(l5, 1, 0);
 	l3->addWidget(m_position, 1, 1);
-	l4->addWidget(left, Qt::AlignLeft);
-	l4->addWidget(hcenter, Qt::AlignCenter);
-	l4->addWidget(right, Qt::AlignRight);
-	l5->addWidget(top, Qt::AlignTop);
-	l5->addWidget(vcenter, Qt::AlignVCenter);
-	l5->addWidget(bottom, Qt::AlignBottom);
+	l4->addWidget(left, TQt::AlignLeft);
+	l4->addWidget(hcenter, TQt::AlignCenter);
+	l4->addWidget(right, TQt::AlignRight);
+	l5->addWidget(top, TQt::AlignTop);
+	l5->addWidget(vcenter, TQt::AlignVCenter);
+	l5->addWidget(bottom, TQt::AlignBottom);
 }
 
 KPImagePage::~KPImagePage()
diff --git a/tdeprint/cups/kpimagepage.h b/tdeprint/cups/kpimagepage.h
index 1a6bc6e44..71bf31e0b 100644
--- a/tdeprint/cups/kpimagepage.h
+++ b/tdeprint/cups/kpimagepage.h
@@ -30,7 +30,7 @@ class ImagePosition;
 
 class KPImagePage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPImagePage(DrMain *driver = 0, TQWidget *parent = 0, const char *name = 0);
 	~KPImagePage();
diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp
index d7f13c8a4..0a3513c67 100644
--- a/tdeprint/cups/kpschedulepage.cpp
+++ b/tdeprint/cups/kpschedulepage.cpp
@@ -166,7 +166,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
 	TQLabel	*lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this);
         TQWhatsThis::add(lab2, whatsThisPageLabel);
 	lab2->setBuddy(m_pagelabel);
-	m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft);
+	m_priority->setLabel(i18n("&Job priority:"), TQt::AlignVCenter|TQt::AlignLeft);
         TQWhatsThis::add(m_priority, whatsThisJobPriority);
 
 	KSeparator	*sep0 = new KSeparator(this);
@@ -186,7 +186,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name)
 	l0->addMultiCellWidget(m_priority, 4, 4, 0, 1);
 	l0->setRowStretch(5, 1);
 
-	connect(m_time, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeChanged()));
+	connect(m_time, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeChanged()));
 }
 
 KPSchedulePage::~KPSchedulePage()
@@ -220,8 +220,8 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts)
 		else if (t == "third-shift") item = 7;
 		else
 		{
-			TQTime	qt = TQT_TQTIME_OBJECT(TQTime::fromString(t));
-			m_tedit->setTime(TQT_TQTIME_OBJECT(qt.addSecs(-3600 * m_gmtdiff)));
+			TQTime	qt = TQTime::fromString(t);
+			m_tedit->setTime(qt.addSecs(-3600 * m_gmtdiff));
 			item = 8;
 		}
 
diff --git a/tdeprint/cups/kpschedulepage.h b/tdeprint/cups/kpschedulepage.h
index 4be11fab9..163cdcf23 100644
--- a/tdeprint/cups/kpschedulepage.h
+++ b/tdeprint/cups/kpschedulepage.h
@@ -29,7 +29,7 @@ class KIntNumInput;
 
 class KPSchedulePage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPSchedulePage(TQWidget *parent = 0, const char *name = 0);
 	~KPSchedulePage();
diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp
index 6fb0652ce..4e990007e 100644
--- a/tdeprint/cups/kptextpage.cpp
+++ b/tdeprint/cups/kptextpage.cpp
@@ -188,31 +188,31 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	setTitle(i18n("Text"));
 	m_block = false;
 
-	TQGroupBox	*formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this);
+	TQGroupBox	*formatbox = new TQGroupBox(0, TQt::Vertical, i18n("Text Format"), this);
 	  TQWhatsThis::add(formatbox, whatsThisFormatTextPage);
-	TQGroupBox	*prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this);
+	TQGroupBox	*prettybox = new TQGroupBox(0, TQt::Vertical, i18n("Syntax Highlighting"), this);
 	  TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage);
-	TQGroupBox	*marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this);
+	TQGroupBox	*marginbox = new TQGroupBox(0, TQt::Vertical, i18n("Margins"), this);
 	  TQWhatsThis::add(marginbox, whatsThisMarginsTextPage);
 
 	m_cpi = new KIntNumInput(10, formatbox);
 	  TQWhatsThis::add(m_cpi, whatsThisCPITextPage);
-	m_cpi->setLabel(i18n("&Chars per inch:"), Qt::AlignLeft|Qt::AlignVCenter);
+	m_cpi->setLabel(i18n("&Chars per inch:"), TQt::AlignLeft|TQt::AlignVCenter);
 	m_cpi->setRange(1, 999, 1, false);
 	m_lpi = new KIntNumInput(m_cpi, 6, formatbox);
 	  TQWhatsThis::add(m_lpi, whatsThisLPITextPage);
-	m_lpi->setLabel(i18n("&Lines per inch:"), Qt::AlignLeft|Qt::AlignVCenter);
+	m_lpi->setLabel(i18n("&Lines per inch:"), TQt::AlignLeft|TQt::AlignVCenter);
 	m_lpi->setRange(1, 999, 1, false);
 	m_columns = new KIntNumInput(m_lpi, 1, formatbox);
 	  TQWhatsThis::add(m_columns, whatsThisColumnsTextPage);
-	m_columns->setLabel(i18n("C&olumns:"), Qt::AlignLeft|Qt::AlignVCenter);
+	m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter);
 	m_columns->setRange(1, 10, 1, false);
-	KSeparator	*sep = new KSeparator(Qt::Horizontal, formatbox);
-	connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int)));
+	KSeparator	*sep = new KSeparator(TQt::Horizontal, formatbox);
+	connect(m_columns, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotColumnsChanged(int)));
 
 	m_prettypix = new TQLabel(prettybox);
 	  TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage);
-	m_prettypix->setAlignment(Qt::AlignCenter);
+	m_prettypix->setAlignment(TQt::AlignCenter);
 	TQRadioButton	*off = new TQRadioButton(i18n("&Disabled"), prettybox);
 	  TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage);
 	TQRadioButton	*on = new TQRadioButton(i18n("&Enabled"), prettybox);
@@ -222,7 +222,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	m_prettyprint->insert(off, 0);
 	m_prettyprint->insert(on, 1);
 	m_prettyprint->setButton(0);
-	connect(m_prettyprint, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPrettyChanged(int)));
+	connect(m_prettyprint, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPrettyChanged(int)));
 	slotPrettyChanged(0);
 
 	m_margin = new MarginWidget(marginbox);
@@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name)
 	l0->addWidget(formatbox, 0, 0);
 	l0->addWidget(prettybox, 0, 1);
 	l0->addMultiCellWidget(marginbox, 1, 1, 0, 1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5);
+	TQVBoxLayout	*l1 = new TQVBoxLayout(formatbox->layout(), 5);
 	l1->addWidget(m_cpi);
 	l1->addWidget(m_lpi);
 	l1->addWidget(sep);
 	l1->addWidget(m_columns);
-	TQGridLayout	*l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10);
+	TQGridLayout	*l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10);
 	l2->addWidget(off, 0, 0);
 	l2->addWidget(on, 1, 0);
 	l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1);
-	TQVBoxLayout	*l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10);
+	TQVBoxLayout	*l3 = new TQVBoxLayout(marginbox->layout(), 10);
 	l3->addWidget(m_margin);
 }
 
diff --git a/tdeprint/cups/kptextpage.h b/tdeprint/cups/kptextpage.h
index 504e2d5c2..5aecfb526 100644
--- a/tdeprint/cups/kptextpage.h
+++ b/tdeprint/cups/kptextpage.h
@@ -30,7 +30,7 @@ class MarginWidget;
 
 class KPTextPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPTextPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0);
 	~KPTextPage();
diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp
index 92eb7fc84..f4a07aa88 100644
--- a/tdeprint/driver.cpp
+++ b/tdeprint/driver.cpp
@@ -66,7 +66,7 @@ void DrBase::setOptions(const TQMap<TQString,TQString>& opts)
 
 void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef)
 {
-	QString	val = valueText();
+	TQString	val = valueText();
 	if ( incldef || get( "persistent" ) == "1" || get("default") != val )
 		opts[name()] = val;
 }
@@ -455,7 +455,7 @@ DrIntegerOption::~DrIntegerOption()
 
 TQString DrIntegerOption::valueText()
 {
-	QString	s = TQString::number(m_value);
+	TQString	s = TQString::number(m_value);
 	return s;
 }
 
@@ -505,7 +505,7 @@ DrFloatOption::~DrFloatOption()
 
 TQString DrFloatOption::valueText()
 {
-	QString	s = TQString::number(m_value,'f',3);
+	TQString	s = TQString::number(m_value,'f',3);
 	return s;
 }
 
@@ -555,7 +555,7 @@ DrListOption::~DrListOption()
 
 TQString DrListOption::valueText()
 {
-	QString	s = (m_current ? m_current->name() : TQString::null);
+	TQString	s = (m_current ? m_current->name() : TQString::null);
 	return s;
 }
 
@@ -654,7 +654,7 @@ bool DrConstraint::check(DrMain *driver)
 	if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice())
 	{
 		bool	f1(false), f2(false);
-		QString	c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name());
+		TQString	c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name());
 		// check choices
 		if (m_choice1.isEmpty())
 			f1 = (c1 != "None" && c1 != "Off" && c1 != "False");
@@ -665,7 +665,7 @@ bool DrConstraint::check(DrMain *driver)
 		else
 			f2 = (c2 == m_choice2);
 		// tag options
-		QString	s((f1 && f2 ? "1" : "0"));
+		TQString	s((f1 && f2 ? "1" : "0"));
 		if (!m_option1->conflict()) m_option1->setConflict(f1 && f2);
 		if (!m_option2->conflict()) m_option2->setConflict(f1 && f2);
 		// return value
diff --git a/tdeprint/driver.h b/tdeprint/driver.h
index 813c0b7f6..9848be9a6 100644
--- a/tdeprint/driver.h
+++ b/tdeprint/driver.h
@@ -87,7 +87,7 @@ public:
 
 protected:
 	TQMap<TQString,TQString>	m_map;
-	QString			m_name;		// used as a search key, better to have defined directly
+	TQString			m_name;		// used as a search key, better to have defined directly
 	Type			m_type;
 	bool			m_conflict;
 };
@@ -212,7 +212,7 @@ public:
 	virtual void setValueText(const TQString& s);
 
 protected:
-	QString	m_value;
+	TQString	m_value;
 };
 
 /**********************************
@@ -336,8 +336,8 @@ public:
 	bool check(DrMain*);
 
 protected:
-	QString		m_opt1, m_opt2;
-	QString		m_choice1, m_choice2;
+	TQString		m_opt1, m_opt2;
+	TQString		m_choice1, m_choice2;
 	DrListOption	*m_option1, *m_option2;
 };
 
@@ -376,7 +376,7 @@ public:
 	TQSize margins() const;
 
 protected:
-	QString	m_name;
+	TQString	m_name;
 	float m_width, m_height, m_left, m_bottom, m_right, m_top;
 };
 
diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp
index 0b66c51d9..0b4266c11 100644
--- a/tdeprint/driveritem.cpp
+++ b/tdeprint/driveritem.cpp
@@ -44,7 +44,7 @@ void DriverItem::updateText()
 {
 	if (m_item)
 	{
-		QString	s(m_item->get("text"));
+		TQString	s(m_item->get("text"));
 		if (m_item->isOption())
 			s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText()));
 		if (m_item->type() == DrBase::List)
@@ -91,25 +91,25 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width,
 	if (!m_item || !m_item->isOption() || isSelected())
 	{
 		p->setPen((isSelected() ? cg.highlightedText() : (m_conflict ? red : cg.text())));
-		p->drawText(w,0,width-w,height(),Qt::AlignLeft|Qt::AlignVCenter,text(0));
+		p->drawText(w,0,width-w,height(),TQt::AlignLeft|TQt::AlignVCenter,text(0));
 	}
 	else
 	{
 		int	w1(0);
-		QString	s(m_item->get("text") + ": <");
+		TQString	s(m_item->get("text") + ": <");
 		w1 = p->fontMetrics().width(s);
 		p->setPen(cg.text());
-		p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
+		p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s);
 		w += w1;
 		p->setPen((m_conflict ? red : darkGreen));
 		s = m_item->prettyText();
 		w1 = p->fontMetrics().width(s);
-		p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
+		p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s);
 		w += w1;
 		p->setPen(cg.text());
 		s = TQString::fromLatin1(">");
 		w1 = p->fontMetrics().width(s);
-		p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s);
+		p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s);
 	}
 }
 
diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp
index fece6c40c..285a0864d 100644
--- a/tdeprint/driverview.cpp
+++ b/tdeprint/driverview.cpp
@@ -95,7 +95,7 @@ DriverView::DriverView(TQWidget *parent, const char *name)
 	m_driver = 0;
 
 	TQSplitter	*splitter = new TQSplitter(this);
-	splitter->setOrientation(Qt::Vertical);
+	splitter->setOrientation(TQt::Vertical);
 
 	TQVBoxLayout     *vbox = new TQVBoxLayout(this, 0, 10);
 	vbox->addWidget(splitter);
@@ -105,8 +105,8 @@ DriverView::DriverView(TQWidget *parent, const char *name)
 	m_optview = new DrOptionView(splitter);
 	  TQWhatsThis::add(m_optview, whatsThisOptionSettingsDriverPage);
 
-	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQT_SLOT(slotItemSelected(TQListViewItem*)));
-	connect(m_optview,TQT_SIGNAL(changed()),TQT_SLOT(slotChanged()));
+	connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_optview,TQ_SIGNAL(changed()),TQ_SLOT(slotChanged()));
 }
 
 DriverView::~DriverView()
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index 7e06648fa..5db76a0cd 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -38,7 +38,7 @@ public:
 
 class TDEPRINT_EXPORT DriverView : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	DriverView(TQWidget *parent = 0, const char *name = 0);
 	~DriverView();
diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp
index de20a62fa..d58c20863 100644
--- a/tdeprint/droptionview.cpp
+++ b/tdeprint/droptionview.cpp
@@ -56,7 +56,7 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name)
 : OptionBaseView(parent,name)
 {
 	m_edit = new TQLineEdit(this);
-	m_slider = new TQSlider(Qt::Horizontal,this);
+	m_slider = new TQSlider(TQt::Horizontal,this);
 	m_slider->setTickmarks(TQSlider::Below);
 	TQLabel	*lab = new TQLabel(i18n("Value:"),this);
 	m_minval = new TQLabel(this);
@@ -78,8 +78,8 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name)
 	sub2_->addWidget(m_slider,1);
 	sub2_->addWidget(m_maxval,0);
 
-	connect(m_slider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotSliderChanged(int)));
-	connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotEditChanged(const TQString&)));
+	connect(m_slider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotSliderChanged(int)));
+	connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotEditChanged(const TQString&)));
 }
 
 void OptionNumericView::setOption(DrBase *opt)
@@ -123,7 +123,7 @@ void OptionNumericView::slotSliderChanged(int value)
 {
 	if (blockSS) return;
 
-	QString	txt;
+	TQString	txt;
 	if (m_integer)
 		txt = TQString::number(value);
 	else
@@ -172,7 +172,7 @@ OptionStringView::OptionStringView(TQWidget *parent, const char *name)
 	main_->addWidget(m_edit,0);
 	main_->addStretch(1);
 
-	connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SIGNAL(valueChanged(const TQString&)));
+	connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SIGNAL(valueChanged(const TQString&)));
 }
 
 void OptionStringView::setOption(DrBase *opt)
@@ -196,7 +196,7 @@ OptionListView::OptionListView(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(m_list);
 
-	connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
+	connect(m_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
 }
 
 void OptionListView::setOption(DrBase *opt)
@@ -226,7 +226,7 @@ void OptionListView::slotSelectionChanged()
 {
 	if (blockSS) return;
 
-	QString	s = m_choices[m_list->currentItem()];
+	TQString	s = m_choices[m_list->currentItem()];
 	emit valueChanged(s);
 }
 
@@ -246,7 +246,7 @@ OptionBooleanView::OptionBooleanView(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(m_group);
 
-	connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int)));
+	connect(m_group,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotSelected(int)));
 }
 
 void OptionBooleanView::setOption(DrBase *opt)
@@ -283,32 +283,32 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name)
 	m_stack = new TQWidgetStack(this);
 
 	OptionBaseView	*w = new OptionListView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::List);
 
 	w = new OptionStringView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::String);
 
 	w = new OptionNumericView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::Integer);
 
 	w = new OptionBooleanView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,DrBase::Boolean);
 
 	w = new OptionBaseView(m_stack);
-	connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&)));
+	connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&)));
 	m_stack->addWidget(w,0);	// empty widget
 
 	m_stack->raiseWidget(w);
 	setTitle(i18n("No Option Selected"));
 
-	setColumnLayout(0, Qt::Vertical );
+	setColumnLayout(0, TQt::Vertical );
 	layout()->setSpacing( KDialog::spacingHint() );
 	layout()->setMargin( KDialog::marginHint() );
-	TQVBoxLayout	*main_ = new TQVBoxLayout(TQT_TQLAYOUT(layout()), KDialog::marginHint());
+	TQVBoxLayout	*main_ = new TQVBoxLayout(layout(), KDialog::marginHint());
 	main_->addWidget(m_stack);
 
 	m_item = 0;
diff --git a/tdeprint/droptionview.h b/tdeprint/droptionview.h
index 6114efcbd..9304db3b3 100644
--- a/tdeprint/droptionview.h
+++ b/tdeprint/droptionview.h
@@ -37,7 +37,7 @@ class DriverItem;
 
 class OptionBaseView : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionBaseView(TQWidget *parent = 0, const char *name = 0);
 	virtual void setOption(DrBase*);
@@ -52,7 +52,7 @@ protected:
 
 class OptionNumericView : public OptionBaseView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionNumericView(TQWidget *parent = 0, const char *name = 0);
 	void setOption(DrBase *opt);
@@ -82,7 +82,7 @@ private:
 
 class OptionListView : public OptionBaseView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionListView(TQWidget *parent = 0, const char *name = 0);
 	void setOption(DrBase *opt);
@@ -98,7 +98,7 @@ private:
 
 class OptionBooleanView : public OptionBaseView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionBooleanView(TQWidget *parent = 0, const char *name = 0);
 	void setOption(DrBase *opt);
@@ -114,7 +114,7 @@ private:
 
 class DrOptionView : public TQGroupBox
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	DrOptionView(TQWidget *parent = 0, const char *name = 0);
 	void setAllowFixed(bool on) 	{ m_allowfixed = on; }
diff --git a/tdeprint/filters/CMakeLists.txt b/tdeprint/filters/CMakeLists.txt
index 3915eee6c..74d9a04a5 100644
--- a/tdeprint/filters/CMakeLists.txt
+++ b/tdeprint/filters/CMakeLists.txt
@@ -34,4 +34,6 @@ install(
   DESTINATION ${DATA_INSTALL_DIR}/tdeprint/filters
 )
 
-install( PROGRAMS imagetops DESTINATION ${BIN_INSTALL_DIR} )
+if( WITH_IMAGETOPS_BINARY )
+  install( PROGRAMS imagetops DESTINATION ${BIN_INSTALL_DIR} )
+endif()
diff --git a/tdeprint/filters/ps2pdf.xml b/tdeprint/filters/ps2pdf.xml
index 15b1005b6..f4eb63e77 100644
--- a/tdeprint/filters/ps2pdf.xml
+++ b/tdeprint/filters/ps2pdf.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE kprintfilter>
 <kprintfilter name="ps2pdf" >
-	<filtercommand data="gs -q -dSAFER -dPARANOIDSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=%filteroutput -sPAPERSIZE=%psl %filterargs -c .setpdfwrite -f %filterinput" />
+	<filtercommand data="gs -q -dSAFER -dPARANOIDSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=%filteroutput -sPAPERSIZE=%psl %filterargs -f %filterinput" />
  <filterargs name="__root__" description="ps2pdf" >
   <filtergroup name="general" description="General" >
    <filterarg format="-dPDFSETTINGS=%value" type="list" name="targetdevice" default="/default" description="Target device" >
diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
index dd694b31b..df3949903 100644
--- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp
+++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp
@@ -35,13 +35,13 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl()
 // look for executable
 TQString KFoomaticPrinterImpl::executable()
 {
-	QString	exe = TDEStandardDirs::findExe("foomatic-printjob");
+	TQString	exe = TDEStandardDirs::findExe("foomatic-printjob");
 	return exe;
 }
 
 bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 {
-	QString		exe = executable();
+	TQString		exe = executable();
 	if (!exe.isEmpty())
 	{
 		cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies());
diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp
index e1e741003..6953be7cc 100644
--- a/tdeprint/foomatic/kmfoomaticmanager.cpp
+++ b/tdeprint/foomatic/kmfoomaticmanager.cpp
@@ -76,7 +76,7 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool)
 		return NULL;
 	}
 
-	QString	cmd = "foomatic-combo-xml -p ";
+	TQString	cmd = "foomatic-combo-xml -p ";
 	cmd += TDEProcess::quote(printer->option("printer"));
 	cmd += " -d ";
 	cmd += TDEProcess::quote(printer->option("driver"));
@@ -99,7 +99,7 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem)
 		printer->setState(KMPrinter::Idle);
 		/*if (printer->name().find('/') != -1)
 		{
-			QString	s(printer->name());
+			TQString	s(printer->name());
 			int	p = s.find('/');
 			printer->setPrinterName(s.left(p));
 			printer->setInstanceName(s.mid(p+1));
@@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 	{
 		driver->set("manufacturer", pelem.namedItem("make").toElement().text());
 		driver->set("model", pelem.namedItem("model").toElement().text());
-		QString	s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
+		TQString	s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text());
 		driver->set("description", s);
 		driver->set("text", s);
 
@@ -148,14 +148,14 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 			{
 				if (o.tagName() == "option")
 				{
-					QString	type = o.attribute("type");
+					TQString	type = o.attribute("type");
 					DrBase *dropt(0);
 
 					if (type == "bool" || type == "enum")
 					{
 						if (type == "bool") dropt = new DrBooleanOption();
 						else dropt = new DrListOption();
-						QString	defval = o.namedItem("arg_defval").toElement().text(), valuetext;
+						TQString	defval = o.namedItem("arg_defval").toElement().text(), valuetext;
 						QDomNode	val = o.namedItem("enum_vals").firstChild();
 						while (!val.isNull())
 						{
@@ -177,7 +177,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem)
 						else dropt = new DrFloatOption();
 						dropt->set("minval", o.namedItem("arg_min").toElement().text());
 						dropt->set("maxval", o.namedItem("arg_max").toElement().text());
-						QString	defval = o.namedItem("arg_defval").toElement().text();
+						TQString	defval = o.namedItem("arg_defval").toElement().text();
 						dropt->set("default", defval);
 						dropt->setValueText(defval);
 					}
diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp
index c498477fd..0856cc012 100644
--- a/tdeprint/foomatic2loader.cpp
+++ b/tdeprint/foomatic2loader.cpp
@@ -53,7 +53,7 @@ bool Foomatic2Loader::readFromFile( const TQString& filename )
 	TQFile f( filename );
 	m_foodata.clear();
 	if ( f.open( IO_ReadOnly ) )
-		return read( TQT_TQIODEVICE(&f) );
+		return read( &f );
 	return false;
 }
 
@@ -63,7 +63,7 @@ bool Foomatic2Loader::readFromBuffer( const TQString& buffer )
 	TQBuffer d( buf );
 	m_foodata.clear();
 	if ( d.open( IO_ReadOnly ) )
-		return read( TQT_TQIODEVICE(&d) );
+		return read( &d );
 	return false;
 }
 
diff --git a/tdeprint/fooscanner.cpp b/tdeprint/fooscanner.cpp
index 58edc063c..441d411da 100644
--- a/tdeprint/fooscanner.cpp
+++ b/tdeprint/fooscanner.cpp
@@ -457,10 +457,14 @@ char *yytext;
 		{ \
 			result = tdeprint_foomatic2scanner_device->readBlock( buf, max_size ); \
 			if ( result < 0 ) \
+			{ \
 				result = 0; \
+			} \
 		} \
 		else \
+		{ \
 			result = 0; \
+		} \
 	}
 
 TQIODevice* tdeprint_foomatic2scanner_device = NULL;
diff --git a/tdeprint/fooscanner.l b/tdeprint/fooscanner.l
index df8f6e778..7770f28bb 100644
--- a/tdeprint/fooscanner.l
+++ b/tdeprint/fooscanner.l
@@ -72,7 +72,7 @@ D        [[:digit:]]
 
 %%
 
-void tdeprint_foomatic2scanner_init( QIODevice *d )
+void tdeprint_foomatic2scanner_init( TQIODevice *d )
 {
 	tdeprint_foomatic2scanner_device = d;
 }
diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp
index 16ec56c32..216d4c14b 100644
--- a/tdeprint/kmfactory.cpp
+++ b/tdeprint/kmfactory.cpp
@@ -49,7 +49,7 @@
 
 #define	UNLOAD_OBJECT(x) if (x != 0) { delete x; x = 0; }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 extern void tqt_generate_epsf( bool b );
 #endif
 
@@ -101,7 +101,7 @@ KMFactory::KMFactory()
 	// This is fixed in Qt 3.0, but for Qt 2.x we need to disable it explicitly.
 	// If this is a problem for anyone, we can add a public method to set this flag.
 	// (David Faure, doing as advised by Lars Knoll)
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	tqt_generate_epsf( false );
 #endif
 #endif
diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h
index baaf48477..86aaad676 100644
--- a/tdeprint/kmfactory.h
+++ b/tdeprint/kmfactory.h
@@ -44,7 +44,7 @@ class KPReloadObject;
 
 class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 
 public:
diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp
index 9f314539e..c0974d646 100644
--- a/tdeprint/kmjob.cpp
+++ b/tdeprint/kmjob.cpp
@@ -78,7 +78,7 @@ TQString KMJob::pixmap()
 		return TQString::fromLatin1("application-x-executable");
 
 	// normal case
-	QString	str("tdeprint_job");
+	TQString	str("tdeprint_job");
 	switch (m_state)
 	{
 		case KMJob::Printing:
@@ -104,7 +104,7 @@ TQString KMJob::pixmap()
 
 TQString KMJob::stateString()
 {
-	QString	str;
+	TQString	str;
 	switch (m_state)
 	{
 		case KMJob::Printing:
diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h
index 51b4f90d1..7b9f8c3c1 100644
--- a/tdeprint/kmjob.h
+++ b/tdeprint/kmjob.h
@@ -111,9 +111,9 @@ protected:
 protected:
 	// normal members
 	int	m_ID;
-	QString	m_name;
-	QString	m_printer;
-	QString	m_owner;
+	TQString	m_name;
+	TQString	m_printer;
+	TQString	m_owner;
 	int	m_state;
 	int	m_size;
 	int	m_type;
@@ -123,7 +123,7 @@ protected:
 	bool	m_remote;
 
 	// internal members
-	QString	m_uri;
+	TQString	m_uri;
 	TQValueVector<TQString>	m_attributes;
 };
 
diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h
index fce6e61d2..e2aa01f5b 100644
--- a/tdeprint/kmjobmanager.h
+++ b/tdeprint/kmjobmanager.h
@@ -45,7 +45,7 @@ class TDEAction;
  */
 class TDEPRINT_EXPORT KMJobManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum JobType { ActiveJobs = 0, CompletedJobs = 1 };
diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp
index 19fdbc7cc..3393edc58 100644
--- a/tdeprint/kmmanager.cpp
+++ b/tdeprint/kmmanager.cpp
@@ -421,7 +421,7 @@ TQString KMManager::testPage()
 {
 	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
-	QString	tpage = conf->readPathEntry("TestPage");
+	TQString	tpage = conf->readPathEntry("TestPage");
 	if (tpage.isEmpty())
 		tpage = locate("data","tdeprint/testprint.ps");
 	return tpage;
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index d90a02d23..67cca0978 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -47,7 +47,7 @@ class PrinterFilter;
  */
 class TDEPRINT_EXPORT KMManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 friend class KMVirtualManager;
 friend class KMSpecialManager;
@@ -170,7 +170,7 @@ protected:
 	virtual void checkUpdatePossibleInternal();
 
 protected:
-	QString			m_errormsg;
+	TQString			m_errormsg;
 	KMPrinterList		m_printers, m_fprinters;	// filtered printers
 	bool 			m_hasmanagement;
 	int			m_printeroperationmask;
diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp
index c7676e382..3d28831ba 100644
--- a/tdeprint/kmprinter.cpp
+++ b/tdeprint/kmprinter.cpp
@@ -90,7 +90,7 @@ TQString KMPrinter::pixmap()
 {
 	if (!m_pixmap.isEmpty()) return m_pixmap;
 
-	QString	str("tdeprint_printer");
+	TQString	str("tdeprint_printer");
 	if (!isValid()) str.append("_defect");
 	else
 	{
@@ -133,7 +133,7 @@ int KMPrinter::compare(KMPrinter *p1, KMPrinter *p2)
 
 TQString KMPrinter::stateString() const
 {
-	QString	s;
+	TQString	s;
 	switch (state())
 	{
 		case KMPrinter::Idle: s = i18n("Idle"); break;
@@ -184,7 +184,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent)
 								true);
 			dialog->setOperationMode (KFileDialog::Saving);
 
-			QString	mimetype = option("kde-special-mimetype");
+			TQString	mimetype = option("kde-special-mimetype");
 
 			if (!mimetype.isEmpty())
 			{
diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp
index 16a0ab616..84da26fe9 100644
--- a/tdeprint/kmspecialmanager.cpp
+++ b/tdeprint/kmspecialmanager.cpp
@@ -43,7 +43,7 @@ KMSpecialManager::KMSpecialManager(KMManager *parent, const char *name)
 bool KMSpecialManager::savePrinters()
 {
 	// for root, use a global location.
-	QString	confname;
+	TQString	confname;
 	if (getuid() == 0)
 	{
 		confname = locate("data", "tdeprint/specials.desktop");
@@ -139,7 +139,7 @@ bool KMSpecialManager::loadDesktopFile(const TQString& filename)
 	int	n = conf.readNumEntry("Number",0);
 	for (int i=0;i<n;i++)
 	{
-		QString	grpname = TQString::fromLatin1("Printer %1").arg(i);
+		TQString	grpname = TQString::fromLatin1("Printer %1").arg(i);
 		if (!conf.hasGroup(grpname)) continue;
 		conf.setGroup(grpname);
 		KMPrinter	*printer = new KMPrinter;
@@ -213,7 +213,7 @@ DrMain* KMSpecialManager::loadDriver(KMPrinter *pr)
 
 TQString KMSpecialManager::setupCommand(const TQString& cmd, const TQMap<TQString,TQString>& opts)
 {
-	QString	s(cmd);
+	TQString	s(cmd);
 	if (!s.isEmpty())
 	{
 		KXmlCommand	*xmlCmd = loadCommand(cmd);
diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp
index 309da96a9..5759664c8 100644
--- a/tdeprint/kmthreadjob.cpp
+++ b/tdeprint/kmthreadjob.cpp
@@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob()
 
 TQString KMThreadJob::jobFile()
 {
-	QString	f = locateLocal("data","tdeprint/printjobs");
+	TQString	f = locateLocal("data","tdeprint/printjobs");
 	return f;
 }
 
diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp
index 4dd6966d3..c1a7a442a 100644
--- a/tdeprint/kmuimanager.cpp
+++ b/tdeprint/kmuimanager.cpp
@@ -144,7 +144,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg)
 		// retrieve the KPrinter object
 		KPrinter	*prt(0);
 		if (dlg->parent() && dlg->parent()->isA("KPrintDialog"))
-			prt = static_cast<KPrintDialog*>(TQT_TQWIDGET(dlg->parent()))->printer();
+			prt = static_cast<KPrintDialog*>(dlg->parent())->printer();
 
 		// add margin page
 		if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog )
diff --git a/tdeprint/kmuimanager.h b/tdeprint/kmuimanager.h
index e59c61e40..6b9113d33 100644
--- a/tdeprint/kmuimanager.h
+++ b/tdeprint/kmuimanager.h
@@ -35,7 +35,7 @@ class TQListView;
 
 class TDEPRINT_EXPORT KMUiManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum PrintDialogFlagType
 	{
diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp
index 9262f3e3c..4bf58b3c1 100644
--- a/tdeprint/kmvirtualmanager.cpp
+++ b/tdeprint/kmvirtualmanager.cpp
@@ -38,7 +38,7 @@
 
 static TQString instanceName(const TQString& prname, const TQString& instname)
 {
-	QString	str(prname);
+	TQString	str(prname);
 	if (!instname.isEmpty())
 		str.append("/"+instname);
 	return str;
@@ -60,7 +60,7 @@ KMPrinter* KMVirtualManager::findPrinter(const TQString& name)
 
 KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name)
 {
-	QString	instname(instanceName(p->printerName(),name));
+	TQString	instname(instanceName(p->printerName(),name));
 	return findPrinter(instname);
 }
 
@@ -96,7 +96,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag)
 
 bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
 {
-	QString	instname(instanceName(p->printerName(),name));
+	TQString	instname(instanceName(p->printerName(),name));
 	KMPrinter	*printer = findPrinter(instname);
 	if (printer)
 		return printer->isSoftDefault();
@@ -106,7 +106,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name)
 
 void KMVirtualManager::create(KMPrinter *p, const TQString& name)
 {
-	QString	instname = instanceName(p->printerName(),name);
+	TQString	instname = instanceName(p->printerName(),name);
 	if (findPrinter(instname) != NULL) return;
 	KMPrinter	*printer = new KMPrinter;
 	printer->setName(instname);
@@ -123,7 +123,7 @@ void KMVirtualManager::create(KMPrinter *p, const TQString& name)
 
 void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& name)
 {
-	QString	instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name));
+	TQString	instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name));
 	KMPrinter	*prsrc = findPrinter(instsrc);
 	if (!prsrc || findPrinter(instname) != NULL) return;
 	KMPrinter	*printer = new KMPrinter;
@@ -137,7 +137,7 @@ void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& n
 
 void KMVirtualManager::remove(KMPrinter *p, const TQString& name)
 {
-        QString	instname = instanceName(p->printerName(),name);
+        TQString	instname = instanceName(p->printerName(),name);
 	KMPrinter	*printer = findPrinter(instname);
 	if (!printer) return;
         if (name.isEmpty())
@@ -153,7 +153,7 @@ void KMVirtualManager::remove(KMPrinter *p, const TQString& name)
 
 void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget *parent)
 {
-	QString	instname(instanceName(p->printerName(),name));
+	TQString	instname(instanceName(p->printerName(),name));
 
 	if ( p->isSpecial() )
 	{
@@ -294,7 +294,7 @@ void KMVirtualManager::loadFile(const TQString& filename)
 
 void KMVirtualManager::triggerSave()
 {
-	QString	filename;
+	TQString	filename;
 	if (getuid() == 0)
 	{
 		if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups")))
diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp
index 27b647208..f0afae75b 100644
--- a/tdeprint/kpcopiespage.cpp
+++ b/tdeprint/kpcopiespage.cpp
@@ -165,7 +165,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	setId(KPrinter::CopiesPage);
 
 	// widget creation
-	TQButtonGroup	*m_pagebox = new TQButtonGroup(0, Qt::Vertical, i18n("Page Selection"), this);
+	TQButtonGroup	*m_pagebox = new TQButtonGroup(0, TQt::Vertical, i18n("Page Selection"), this);
 	TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel);
 	m_all = new TQRadioButton(i18n("&All"), m_pagebox);
 	TQWhatsThis::add(m_all, whatsThisAllPagesLabel);
@@ -175,19 +175,19 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	TQWhatsThis::add(m_range, whatsThisPageRangeLabel);
 	m_rangeedit = new TQLineEdit(m_pagebox);
 	TQWhatsThis::add(m_rangeedit, whatsThisPageRangeLabel);
-	connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus()));
+	connect(m_range, TQ_SIGNAL(clicked()), m_rangeedit, TQ_SLOT(setFocus()));
 	TQToolTip::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
 //	TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
 	//TQLabel	*m_rangeexpl = new TQLabel(m_pagebox);
 	//m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"));
-	TQGroupBox	*m_copybox = new TQGroupBox(0, Qt::Vertical, i18n("Output Settings"), this);
+	TQGroupBox	*m_copybox = new TQGroupBox(0, TQt::Vertical, i18n("Output Settings"), this);
 	TQWhatsThis::add(m_copybox, whatsThisCopiesLabel);
 	m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox);
 	TQWhatsThis::add(m_collate, whatsThisCollateLabel);
 	m_order = new TQCheckBox(i18n("Re&verse"), m_copybox);
 	TQWhatsThis::add(m_order, whatsThisReverseLabel);
 	m_collatepix = new TQLabel(m_copybox);
-	m_collatepix->setAlignment(Qt::AlignCenter);
+	m_collatepix->setAlignment(TQt::AlignCenter);
 	m_collatepix->setMinimumHeight(70);
 	TQLabel	*m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox);
 	m_copies = new TQSpinBox(m_copybox);
@@ -203,7 +203,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	TQLabel	*m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox);
 	m_pagesetlabel->setBuddy(m_pageset);
 	TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel);
-	KSeparator	*sepline = new KSeparator(Qt::Horizontal, m_pagebox);
+	KSeparator	*sepline = new KSeparator(TQt::Horizontal, m_pagebox);
 	sepline->setMinimumHeight(10);
 
 	TQWidget::setTabOrder( m_all, m_current );
@@ -221,7 +221,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	l1->setColStretch(1,1);
 	l1->addWidget(m_pagebox,0,0);
 	l1->addWidget(m_copybox,0,1);
-	TQVBoxLayout	*l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5);
+	TQVBoxLayout	*l3 = new TQVBoxLayout(m_pagebox->layout(), 5);
 	l3->addWidget(m_all);
 	l3->addWidget(m_current);
 	TQHBoxLayout	*l4 = new TQHBoxLayout(0, 0, 5);
@@ -249,9 +249,9 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name)
 	slotCollateClicked();
 
 	// connections
-	connect(m_rangeedit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotRangeEntered()));
-	connect(m_collate,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked()));
-	connect(m_order,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked()));
+	connect(m_rangeedit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotRangeEntered()));
+	connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
+	connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked()));
 
 	if (!kapp->authorize("print/copies"))
 	{
diff --git a/tdeprint/kpcopiespage.h b/tdeprint/kpcopiespage.h
index ddb2b4f2a..2011c7ade 100644
--- a/tdeprint/kpcopiespage.h
+++ b/tdeprint/kpcopiespage.h
@@ -33,7 +33,7 @@ class KPrinter;
 
 class TDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPCopiesPage(KPrinter *prt = 0, TQWidget *parent = 0, const char *name = 0);
 	~KPCopiesPage();
diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp
index 768e4b475..7ac9b146c 100644
--- a/tdeprint/kpfilterpage.cpp
+++ b/tdeprint/kpfilterpage.cpp
@@ -133,7 +133,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
 	m_view->setLineWidth(1);
 	m_view->setSorting(-1);
 	m_view->header()->hide();
-	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotItemSelected(TQListViewItem*)));
 
 	m_add = new TQToolButton(this);
 	  TQWhatsThis::add(m_add, whatsThisAddFilterButton);
@@ -160,12 +160,12 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name)
 	m_configure->setIconSet(BarIconSet("configure"));
 	TQToolTip::add(m_configure, i18n("Configure filter"));
 
-	connect(m_add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddClicked()));
-	connect(m_remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveClicked()));
-	connect(m_up,TQT_SIGNAL(clicked()),TQT_SLOT(slotUpClicked()));
-	connect(m_down,TQT_SIGNAL(clicked()),TQT_SLOT(slotDownClicked()));
-	connect(m_configure,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigureClicked()));
-	connect(m_view,TQT_SIGNAL(doubleClicked(TQListViewItem*)),TQT_SLOT(slotConfigureClicked()));
+	connect(m_add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddClicked()));
+	connect(m_remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveClicked()));
+	connect(m_up,TQ_SIGNAL(clicked()),TQ_SLOT(slotUpClicked()));
+	connect(m_down,TQ_SIGNAL(clicked()),TQ_SLOT(slotDownClicked()));
+	connect(m_configure,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigureClicked()));
+	connect(m_view,TQ_SIGNAL(doubleClicked(TQListViewItem*)),TQ_SLOT(slotConfigureClicked()));
 
 	m_info = new KActiveLabel(this);
 	  TQWhatsThis::add(m_info, whatsThisFilterInfoPane);
diff --git a/tdeprint/kpfilterpage.h b/tdeprint/kpfilterpage.h
index a5bc7f757..9845b87b8 100644
--- a/tdeprint/kpfilterpage.h
+++ b/tdeprint/kpfilterpage.h
@@ -33,7 +33,7 @@ class TQTextBrowser;
 
 class KPFilterPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPFilterPage(TQWidget *parent = 0, const char *name = 0);
 	~KPFilterPage();
diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp
index 821290704..bce57cd1f 100644
--- a/tdeprint/kpgeneralpage.cpp
+++ b/tdeprint/kpgeneralpage.cpp
@@ -262,15 +262,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 
 	// widget creation
 	TQLabel	*m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
-	m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
           TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel);
 
 	TQLabel	*m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this);
-	m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_papertypelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
           TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel);
 
 	TQLabel	*m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this);
-	m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_inputslotlabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
           TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel);
 
 	m_pagesize = new TQComboBox(this);
@@ -286,16 +286,16 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	m_papertypelabel->setBuddy(m_papertype);
 	m_inputslotlabel->setBuddy(m_inputslot);
 
-	m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this);
+	m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this);
           TQWhatsThis::add(m_orientbox, whatsThisGeneralOrientationLabel);
 
-	m_duplexbox = new TQButtonGroup(0, Qt::Vertical, i18n("Duplex Printing"), this);
+	m_duplexbox = new TQButtonGroup(0, TQt::Vertical, i18n("Duplex Printing"), this);
           TQWhatsThis::add(m_duplexbox, whatsThisGeneralDuplexLabel);
 
-	m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this);
+	m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this);
           TQWhatsThis::add(m_nupbox, whatsThisGeneralPagesPerSheetLabel);
 
-	m_bannerbox = new TQGroupBox(0, Qt::Vertical, i18n("Banners"), this);
+	m_bannerbox = new TQGroupBox(0, TQt::Vertical, i18n("Banners"), this);
           TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel);
 
 	TQRadioButton	*m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox);
@@ -305,19 +305,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 
 	m_portrait->setChecked(true);
 	m_orientpix = new TQLabel(m_orientbox);
-	m_orientpix->setAlignment(Qt::AlignCenter);
+	m_orientpix->setAlignment(TQt::AlignCenter);
 	TQRadioButton	*m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox);
 	TQRadioButton	*m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox);
 	TQRadioButton	*m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox);
 	m_dupnone->setChecked(true);
 	m_duplexpix = new TQLabel(m_duplexbox);
-	m_duplexpix->setAlignment(Qt::AlignCenter);
+	m_duplexpix->setAlignment(TQt::AlignCenter);
 	TQRadioButton	*m_nup1 = new TQRadioButton("&1", m_nupbox);
 	TQRadioButton	*m_nup2 = new TQRadioButton("&2", m_nupbox);
 	TQRadioButton	*m_nup4 = new TQRadioButton("&4", m_nupbox);
 	m_nup1->setChecked(true);
 	m_nuppix = new TQLabel(m_nupbox);
-	m_nuppix->setAlignment(Qt::AlignCenter);
+	m_nuppix->setAlignment(TQt::AlignCenter);
 	m_startbanner = new TQComboBox(m_bannerbox);
 	m_endbanner = new TQComboBox(m_bannerbox);
 	TQLabel	*m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox);
@@ -331,9 +331,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	TQGridLayout	*lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint());
 	TQGridLayout	*lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
 	lay0->addStretch(1);
-	lay0->addLayout(TQT_TQLAYOUT(lay1));
+	lay0->addLayout(lay1);
 	lay0->addStretch(1);
-	lay0->addLayout(TQT_TQLAYOUT(lay2));
+	lay0->addLayout(lay2);
 	lay0->addStretch(2);
 	lay1->addWidget(m_pagesizelabel, 0, 0);
 	lay1->addWidget(m_papertypelabel, 1, 0);
@@ -376,9 +376,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const
 	lay6->setColStretch(1, 1);
 
 	// connections (+ misc)
-	connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int)));
-	connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int)));
-	connect(m_duplexbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotDuplexChanged(int)));
+	connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int)));
+	connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int)));
+	connect(m_duplexbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotDuplexChanged(int)));
 
 	// init
 	initialize();
diff --git a/tdeprint/kpgeneralpage.h b/tdeprint/kpgeneralpage.h
index dc8eef580..eea610cdc 100644
--- a/tdeprint/kpgeneralpage.h
+++ b/tdeprint/kpgeneralpage.h
@@ -30,7 +30,7 @@ class TQLabel;
 
 class TDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent = 0, const char *name = 0);
 	~KPGeneralPage();
diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp
index 019cf34d9..d4b87994e 100644
--- a/tdeprint/kpmarginpage.cpp
+++ b/tdeprint/kpmarginpage.cpp
@@ -42,7 +42,7 @@ KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, cons
 	setTitle(i18n("Margins"));
 	m_usedriver = true;
 
-	TQGroupBox	*box = new TQGroupBox(1, Qt::Vertical, i18n("Margins"), this);
+	TQGroupBox	*box = new TQGroupBox(1, TQt::Vertical, i18n("Margins"), this);
 	m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0));
 	//m_margin->setSymetricMargins(true);
 	//if (m_printer)
@@ -75,7 +75,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
 
 	if (driver() && m_usedriver )
 	{
-		QString	pageSize(ps);
+		TQString	pageSize(ps);
 
 		if (pageSize.isEmpty())
 		{
@@ -105,7 +105,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape)
 
 void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	QString	orient = opts["orientation-requested"];
+	TQString	orient = opts["orientation-requested"];
 	bool 	land = (orient.isEmpty()? opts["kde-orientation"] == "Landscape" : orient == "4" || orient == "5");
 	TQString ps = opts[ "kde-printsize" ];
 	if ( ps.isEmpty() )
@@ -120,7 +120,7 @@ void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts)
 	initPageSize(ps, land);
 
 	bool	marginset(false);
-	QString	value;
+	TQString	value;
 	if (!(value=opts["kde-margin-top"]).isEmpty() && value.toFloat() != m_margin->top())
 	{
 		marginset = true;
diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp
index 9c0a42501..23e11a760 100644
--- a/tdeprint/kpposterpage.cpp
+++ b/tdeprint/kpposterpage.cpp
@@ -199,15 +199,15 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name )
 	m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) );
 	slotPosterSizeChanged( m_postersize->currentItem() );
 
-	connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_postercheck, TQ_SIGNAL( toggled( bool ) ), dummy, TQ_SLOT( setEnabled( bool ) ) );
 	dummy->setEnabled( false );
-	connect( m_postersize, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotPosterSizeChanged( int ) ) );
-	connect( m_cutmargin, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotMarginChanged( int ) ) );
-	connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), m_printsize, TQT_SLOT( setDisabled( bool ) ) );
+	connect( m_postersize, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotPosterSizeChanged( int ) ) );
+	connect( m_cutmargin, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotMarginChanged( int ) ) );
+	connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), m_printsize, TQ_SLOT( setDisabled( bool ) ) );
 	m_printsize->setEnabled( false );
-	connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotLockToggled( bool ) ) );
-	connect( m_selection, TQT_SIGNAL( textChanged( const TQString& ) ), m_preview, TQT_SLOT( setSelectedPages( const TQString& ) ) );
-	connect( m_preview, TQT_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQT_SLOT( setText( const TQString& ) ) );
+	connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotLockToggled( bool ) ) );
+	connect( m_selection, TQ_SIGNAL( textChanged( const TQString& ) ), m_preview, TQ_SLOT( setSelectedPages( const TQString& ) ) );
+	connect( m_preview, TQ_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQ_SLOT( setText( const TQString& ) ) );
 
 	if ( KMFactory::self()->settings()->application != KPrinter::Dialog 
 			&& KMFactory::self()->settings()->application >= 0 )
diff --git a/tdeprint/kpposterpage.h b/tdeprint/kpposterpage.h
index ce4858aa3..bd5352a51 100644
--- a/tdeprint/kpposterpage.h
+++ b/tdeprint/kpposterpage.h
@@ -32,7 +32,7 @@ class TQLineEdit;
 
 class KPPosterPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPPosterPage( TQWidget *parent = 0, const char *name = 0 );
 	~KPPosterPage();
diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp
index c0ca5656e..e6088d489 100644
--- a/tdeprint/kpqtpage.cpp
+++ b/tdeprint/kpqtpage.cpp
@@ -116,11 +116,11 @@ void KPQtPage::init()
 	m_pagesize = new TQComboBox(this);
           TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel);
 	TQLabel	*m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this);
-	m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight);
+	m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight);
 	m_pagesizelabel->setBuddy(m_pagesize);
-	m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this);
+	m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this);
           TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel);
-	m_colorbox = new TQButtonGroup(0, Qt::Vertical, i18n("Color Mode"), this);
+	m_colorbox = new TQButtonGroup(0, TQt::Vertical, i18n("Color Mode"), this);
           TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel);
 	TQRadioButton	*m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox);
           TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel);
@@ -129,7 +129,7 @@ void KPQtPage::init()
           TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel);
 
 	m_orientpix = new TQLabel(m_orientbox);
-	m_orientpix->setAlignment(Qt::AlignCenter);
+	m_orientpix->setAlignment(TQt::AlignCenter);
           TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel);
 
 	TQRadioButton	*m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox);
@@ -137,10 +137,10 @@ void KPQtPage::init()
 
 	TQRadioButton	*m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox);
 	m_colorpix = new TQLabel(m_colorbox);
-	m_colorpix->setAlignment(Qt::AlignCenter);
+	m_colorpix->setAlignment(TQt::AlignCenter);
           TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel);
 
-	m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this);
+	m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this);
         //  TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel);
 	TQRadioButton	*m_nup1 = new TQRadioButton("&1", m_nupbox);
           TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel);
@@ -152,7 +152,7 @@ void KPQtPage::init()
           TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel);
 
 	m_nuppix = new TQLabel(m_nupbox);
-	m_nuppix->setAlignment(Qt::AlignCenter);
+	m_nuppix->setAlignment(TQt::AlignCenter);
           TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel);
 
 	// layout creation
@@ -218,9 +218,9 @@ void KPQtPage::init()
 	}
 
 	// connections
-	connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int)));
-	connect(m_colorbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotColorModeChanged(int)));
-	connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int)));
+	connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int)));
+	connect(m_colorbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotColorModeChanged(int)));
+	connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int)));
 }
 
 void KPQtPage::slotOrientationChanged(int ID)
@@ -235,7 +235,7 @@ void KPQtPage::slotColorModeChanged(int ID)
 
 void KPQtPage::slotNupChanged(int ID)
 {
-	QString	pixstr;
+	TQString	pixstr;
 	switch (ID)
 	{
 		case NUP_1: pixstr = "tdeprint_nup1"; break;
@@ -256,7 +256,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts)
 	slotColorModeChanged(ID);
 	if (driver())
 	{
-		QString	val = opts["PageSize"];
+		TQString	val = opts["PageSize"];
 		if (!val.isEmpty())
 		{
 			DrListOption	*opt = static_cast<DrListOption*>(driver()->findOption("PageSize"));
diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h
index ee78ffa86..cfeefa465 100644
--- a/tdeprint/kpqtpage.h
+++ b/tdeprint/kpqtpage.h
@@ -31,7 +31,7 @@ class DrMain;
 
 class TDEPRINT_EXPORT KPQtPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPQtPage(TQWidget *parent = 0, const char *name = 0);
 	KPQtPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp
index 4a4aac597..d09997785 100644
--- a/tdeprint/kprintaction.cpp
+++ b/tdeprint/kprintaction.cpp
@@ -67,8 +67,8 @@ KPrintAction::~KPrintAction()
 
 void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget)
 {
-	connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow()));
-	connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+	connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow()));
+	connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 
 	d->type = type;
 	d->parentWidget = parentWidget;
diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h
index 94549402f..a381ac6dd 100644
--- a/tdeprint/kprintaction.h
+++ b/tdeprint/kprintaction.h
@@ -26,7 +26,7 @@ class KPrinter;
 
 class TDEPRINT_EXPORT KPrintAction : public TDEActionMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum PrinterType { All, Regular, Specials };
 
diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp
index 9df774510..25691e673 100644
--- a/tdeprint/kprintdialog.cpp
+++ b/tdeprint/kprintdialog.cpp
@@ -262,7 +262,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	setCaption(i18n("Print"));
 
 	// widget creation
-	TQGroupBox	*m_pbox = new TQGroupBox(0,Qt::Vertical,i18n("Printer"), this);
+	TQGroupBox	*m_pbox = new TQGroupBox(0,TQt::Vertical,i18n("Printer"), this);
 	d->m_type = new TQLabel(m_pbox);
 	TQWhatsThis::add(d->m_type, whatsThisPrinterType);
 	d->m_state = new TQLabel(m_pbox);
@@ -396,19 +396,19 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name)
 	l3->addMultiCellWidget(d->m_cmd,2,2,1,2);
 
 	// connections
-	connect(d->m_ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept()));
-	connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()));
-	connect(d->m_properties,TQT_SIGNAL(clicked()),TQT_SLOT(slotProperties()));
-	connect(d->m_default,TQT_SIGNAL(clicked()),TQT_SLOT(slotSetDefault()));
-	connect(d->m_printers,TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
-	connect(d->m_options,TQT_SIGNAL(clicked()),TQT_SLOT(slotOptions()));
-	connect(d->m_wizard,TQT_SIGNAL(clicked()),TQT_SLOT(slotWizard()));
-	connect(d->m_extbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotExtensionClicked()));
-	connect(d->m_filter, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
-	connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()));
-	connect(d->m_file, TQT_SIGNAL(urlSelected(const TQString&)), TQT_SLOT(slotOutputFileSelected(const TQString&)));
-	connect( d->m_file, TQT_SIGNAL( openFileDialog( KURLRequester* ) ), TQT_SLOT( slotOpenFileDialog() ) );
-	connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect(d->m_ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept()));
+	connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()));
+	connect(d->m_properties,TQ_SIGNAL(clicked()),TQ_SLOT(slotProperties()));
+	connect(d->m_default,TQ_SIGNAL(clicked()),TQ_SLOT(slotSetDefault()));
+	connect(d->m_printers,TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int)));
+	connect(d->m_options,TQ_SIGNAL(clicked()),TQ_SLOT(slotOptions()));
+	connect(d->m_wizard,TQ_SIGNAL(clicked()),TQ_SLOT(slotWizard()));
+	connect(d->m_extbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotExtensionClicked()));
+	connect(d->m_filter, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool)));
+	connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()));
+	connect(d->m_file, TQ_SIGNAL(urlSelected(const TQString&)), TQ_SLOT(slotOutputFileSelected(const TQString&)));
+	connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) );
+	connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
 	d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection");
 	d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection");
@@ -484,12 +484,12 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages)
 			d->m_pages.append(pages->take(0));
 		d->m_pages.first()->reparent(d->m_dummy, TQPoint(0,0));
 		d->m_pages.first()->show();
-		delete d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING);
+		delete d->m_dummy->child("TabWidget", "TQTabWidget");
 	}
 	else
 	{
 		// more than one page.
-		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
+		TQTabWidget	*tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
 		if (!tabs)
 		{
 			// TQTabWidget doesn't exist. Create it and reparent all
@@ -554,7 +554,7 @@ void KPrintDialog::initialize(KPrinter *printer)
 
 	if (plist)
 	{
-		QString	oldP = d->m_printers->currentText();
+		TQString	oldP = d->m_printers->currentText();
 		d->m_printers->clear();
 		TQPtrListIterator<KMPrinter>	it(*plist);
 		int 	defsoft(-1), defhard(-1), defsearch(-1);
@@ -822,7 +822,7 @@ void KPrintDialog::slotWizard()
 void KPrintDialog::reload()
 {
 	// remove printer dependent pages (usually from plugin)
-	TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
+	TQTabWidget	*tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
 	for (uint i=0; i<d->m_pages.count(); i++)
 		if (d->m_pages.at(i)->onlyRealPrinters())
 		{
@@ -841,7 +841,7 @@ void KPrintDialog::reload()
 		d->m_dummy->show();
 	// other initializations
 	setFlags(KMFactory::self()->uiManager()->dialogFlags());
-	connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 	init();
 }
 
@@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag )
 
 	if ( d->m_pages.count() > 1 )
 	{
-		TQTabWidget	*tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING)));
+		TQTabWidget	*tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget"));
 		tabs->setTabEnabled( d->m_pages.at( index ), flag );
 	}
 	else
@@ -969,8 +969,8 @@ void KPrintDialog::slotOpenFileDialog()
 	KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText());
 	if (prt)
 	{
-		QString	mimetype(prt->option("kde-special-mimetype"));
-		QString	ext(prt->option("kde-special-extension"));
+		TQString	mimetype(prt->option("kde-special-mimetype"));
+		TQString	ext(prt->option("kde-special-extension"));
 
 		if (!mimetype.isEmpty())
 		{
diff --git a/tdeprint/kprintdialog.h b/tdeprint/kprintdialog.h
index c23e9cdc1..0c14f1407 100644
--- a/tdeprint/kprintdialog.h
+++ b/tdeprint/kprintdialog.h
@@ -40,7 +40,7 @@ class KPrintDialogPage;
  */
 class TDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrintDialog(TQWidget *parent = 0, const char *name = 0);
 	~KPrintDialog();
diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h
index 46152ee13..4cddf7f13 100644
--- a/tdeprint/kprintdialogpage.h
+++ b/tdeprint/kprintdialogpage.h
@@ -89,7 +89,7 @@ class DrMain;
  */
 class TDEPRINT_EXPORT KPrintDialogPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 * Standard constructor.
@@ -144,7 +144,7 @@ public:
 	 * @returns the page title
 	 * @see setTitle()
 	 */
-	QString	title() const 			{ return m_title; }
+	TQString	title() const 			{ return m_title; }
 	/**
 	 * Set the page title. This title will be used as tab name for this page in the print
 	 * dialog.
@@ -183,7 +183,7 @@ protected:
 	KMPrinter	*m_printer;
 	DrMain		*m_driver;
 	int 		m_ID;
-	QString		m_title;
+	TQString		m_title;
 	bool		m_onlyreal;
 };
 
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp
index 010297e5a..35d0dbe20 100644
--- a/tdeprint/kprinter.cpp
+++ b/tdeprint/kprinter.cpp
@@ -101,14 +101,14 @@ public:
 	bool		m_restore;
 	bool		m_previewonly;
 	WId		m_parentId;
-	QString		m_docfilename;
+	TQString		m_docfilename;
 	TQString m_docdirectory;
 	KPrinterWrapper		*m_wrapper;
 	TQMap<TQString,TQString>	m_options;
-	QString			m_tmpbuffer;
-	QString			m_printername;
-	QString			m_searchname;
-	QString			m_errormsg;
+	TQString			m_tmpbuffer;
+	TQString			m_printername;
+	TQString			m_searchname;
+	TQString			m_errormsg;
 	bool			m_ready;
 	int		m_pagenumber;
 	DrPageSize *m_pagesize;
@@ -597,12 +597,15 @@ int KPrinter::metric(int m) const
 	return val;
 }
 
-void KPrinter::setOrientation(Orientation o)
+void KPrinter::setOrientation(Orientation o, bool locking)
 {
 	KMFactory::self()->settings()->orientation = o;
 	setOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait"));
 	d->m_impl->broadcastOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait"));
-	d->m_impl->broadcastOption( "kde-orientation-fixed", "1" );
+	if (locking)
+	{
+		d->m_impl->broadcastOption( "kde-orientation-fixed", "1" );
+	}
 }
 
 void KPrinter::setOption( const TQString& key, const TQString& value, bool broadcast )
@@ -612,11 +615,14 @@ void KPrinter::setOption( const TQString& key, const TQString& value, bool broad
 		d->m_impl->broadcastOption( key, value );
 }
 
-void KPrinter::setPageSize(PageSize s)
+void KPrinter::setPageSize(PageSize s, bool locking)
 {
 	KMFactory::self()->settings()->pageSize = s;
 	setOption("kde-pagesize",TQString::number((int)s),true);
-	d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" );
+	if (locking)
+	{
+		d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" );
+	}
 }
 
 void KPrinter::setOptions(const TQMap<TQString,TQString>& opts)
diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h
index 0ac329604..6a0cde6d0 100644
--- a/tdeprint/kprinter.h
+++ b/tdeprint/kprinter.h
@@ -289,7 +289,7 @@ public:
 	/**
 	 * See TQPrinter::setOrientation().
 	 */
-	void setOrientation(Orientation);
+	void setOrientation(Orientation, bool locking = false);
 	/**
 	 * See TQPrinter::pageOrder().
 	 */
@@ -347,7 +347,7 @@ public:
 	/**
 	 * See TQPrinter::setPageSize().
 	 */
-	void setPageSize(PageSize);
+	void setPageSize(PageSize, bool locking = false);
 	/**
 	 * See TQPrinter::printerName().
 	 */
diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp
index edd380009..171b1b524 100644
--- a/tdeprint/kprinterimpl.cpp
+++ b/tdeprint/kprinterimpl.cpp
@@ -79,7 +79,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer)
 		// Find the page size:
 		// 1) print option
 		// 2) default driver option
-		QString	psname = printer->option("PageSize");
+		TQString	psname = printer->option("PageSize");
 		if (psname.isEmpty())
 		{
 			DrListOption	*opt = (DrListOption*)driver->findOption("PageSize");
diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h
index 24da07be4..2913a1406 100644
--- a/tdeprint/kprinterimpl.h
+++ b/tdeprint/kprinterimpl.h
@@ -33,7 +33,7 @@ class KMPrinter;
 
 class TDEPRINT_EXPORT KPrinterImpl : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrinterImpl(TQObject *parent = 0, const char *name = 0);
 	virtual ~KPrinterImpl();
diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp
index c120ba843..24479daba 100644
--- a/tdeprint/kprinterpropertydialog.cpp
+++ b/tdeprint/kprinterpropertydialog.cpp
@@ -40,7 +40,7 @@ KPrinterPropertyDialog::KPrinterPropertyDialog(KMPrinter *p, TQWidget *parent, c
 	// set a margin
 	m_tw = new TQTabWidget(this);
 	m_tw->setMargin(10);
-	connect(m_tw,TQT_SIGNAL(currentChanged(TQWidget*)),TQT_SLOT(slotCurrentChanged(TQWidget*)));
+	connect(m_tw,TQ_SIGNAL(currentChanged(TQWidget*)),TQ_SLOT(slotCurrentChanged(TQWidget*)));
 	setMainWidget(m_tw);
 
 	if (m_printer)
diff --git a/tdeprint/kprinterpropertydialog.h b/tdeprint/kprinterpropertydialog.h
index e76f38212..62647fd24 100644
--- a/tdeprint/kprinterpropertydialog.h
+++ b/tdeprint/kprinterpropertydialog.h
@@ -32,7 +32,7 @@ class TQTabWidget;
 
 class TDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrinterPropertyDialog(KMPrinter *printer, TQWidget *parent = 0, const char *name = 0);
 	~KPrinterPropertyDialog();
diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp
index d4de7925d..e2642e514 100644
--- a/tdeprint/kprintpreview.cpp
+++ b/tdeprint/kprintpreview.cpp
@@ -45,7 +45,7 @@ KPreviewProc::KPreviewProc()
 : TDEProcess()
 {
 	m_bOk = false;
-	connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+	connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
 }
 
 KPreviewProc::~KPreviewProc()
@@ -129,7 +129,7 @@ static KLibFactory* componentFactory()
 
 static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOnly)
 {
-	QString	msg(msg_);
+	TQString	msg(msg_);
 	if (previewOnly)
 	{
 		KMessageBox::error(parent, msg);
@@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly)
 	// create main view and actions
 	setMainWidget(d->mainwidget_);
 	if (previewOnly)
-		KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print");
+		KStdAction::close(this, TQ_SLOT(reject()), d->actions_, "close_print");
 	else
 	{
-		new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print");
-		new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print");
+		new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQ_SLOT(accept()), d->actions_, "continue_print");
+		new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(reject()), d->actions_, "stop_print");
 	}
 
 }
@@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview()
 void KPrintPreview::initView(KLibFactory *factory)
 {
 	// load the component
-	d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart");
+	d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart");
 
 	// populate the toolbar
 	if (d->previewonly_)
@@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	conf->setGroup("General");
 	KLibFactory	*factory(0);
 	bool	externalPreview = conf->readBoolEntry("ExternalPreview", false);
-	TQWidget	*parentW = TQT_TQWIDGET(TQWidget::find(parentId));
+	TQWidget	*parentW = TQWidget::find(parentId);
 	TQString	exe;
 	if (!externalPreview && isPS && (factory = componentFactory()) != 0)
 	{
@@ -275,7 +275,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 		exe = conf->readPathEntry("PreviewCommand", "gv");
 		if (TDEStandardDirs::findExe(exe).isEmpty())
 		{
-			QString	msg = i18n("The preview program %1 cannot be found. "
+			TQString	msg = i18n("The preview program %1 cannot be found. "
 						       "Check that the program is correctly installed and "
 						       "located in a directory included in your PATH "
 						       "environment variable.").arg(exe);
@@ -314,7 +314,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId
 	// start the preview process
 	if (!proc.startPreview())
 	{
-		QString	msg = i18n("Preview failed: unable to start program %1.").arg(exe);
+		TQString	msg = i18n("Preview failed: unable to start program %1.").arg(exe);
 		return continuePrint(msg, parentW, previewOnly);
 	}
 	else if (!previewOnly)
diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h
index ae99fb405..678f74454 100644
--- a/tdeprint/kprintpreview.h
+++ b/tdeprint/kprintpreview.h
@@ -29,7 +29,7 @@ class KLibFactory;
 
 class KPrintPreview : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrintPreview(TQWidget *parent = 0, bool previewOnly = false);
 	~KPrintPreview();
@@ -49,7 +49,7 @@ private:
 
 class KPreviewProc : public TDEProcess
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPreviewProc();
 	virtual ~KPreviewProc();
diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp
index 2b0c0f6f6..13ed3f7ca 100644
--- a/tdeprint/kprintprocess.cpp
+++ b/tdeprint/kprintprocess.cpp
@@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess()
 : KShellProcess()
 {
 	// redirect everything to a single buffer
-	connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
-	connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
-	connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) );
+	connect(this,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(this,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotExited( TDEProcess* ) ) );
 	m_state = None;
 }
 
diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h
index 5ceb3835e..544dd7e1e 100644
--- a/tdeprint/kprintprocess.h
+++ b/tdeprint/kprintprocess.h
@@ -25,7 +25,7 @@
 
 class KPrintProcess : public KShellProcess
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrintProcess();
 	~KPrintProcess();
@@ -54,7 +54,7 @@ protected slots:
 	void slotExited( TDEProcess* );
 
 private:
-	QString	m_buffer;
+	TQString	m_buffer;
 	TQStringList m_tempfiles;
 	TQString m_output, m_tempoutput, m_command;
 	int m_state;
diff --git a/tdeprint/lpd/gschecker.cpp b/tdeprint/lpd/gschecker.cpp
index 99044918b..2ea194453 100644
--- a/tdeprint/lpd/gschecker.cpp
+++ b/tdeprint/lpd/gschecker.cpp
@@ -41,7 +41,7 @@ void GsChecker::loadDriverList()
 	if (proc.open("gs -h",IO_ReadOnly))
 	{
 		QTextStream	t(&proc);
-		QString	buffer, line;
+		TQString	buffer, line;
 		bool	ok(false);
 		while (!t.eof())
 		{
diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp
index 3647f0b38..843e73409 100644
--- a/tdeprint/lpd/klpdprinterimpl.cpp
+++ b/tdeprint/lpd/klpdprinterimpl.cpp
@@ -40,7 +40,7 @@ TQString KLpdPrinterImpl::executable()
 
 bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 {
-	QString	exestr = executable();
+	TQString	exestr = executable();
 	if (exestr.isEmpty())
 	{
 		printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr"));
diff --git a/tdeprint/lpd/kmlpdfactory.h b/tdeprint/lpd/kmlpdfactory.h
index ffc05af71..8748e1e19 100644
--- a/tdeprint/lpd/kmlpdfactory.h
+++ b/tdeprint/lpd/kmlpdfactory.h
@@ -29,7 +29,7 @@ public:
 	virtual ~KLpdFactory();
 
 protected:
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList());
+	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = "TQObject", const TQStringList& args = TQStringList());
 };
 
 #endif
diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp
index e72733f89..ab0a9d3dc 100644
--- a/tdeprint/lpd/kmlpdmanager.cpp
+++ b/tdeprint/lpd/kmlpdmanager.cpp
@@ -44,7 +44,7 @@
 
 // only there to allow testing on my system. Should be removed
 // when everything has proven to be working and stable
-QString	lpdprefix = "";
+TQString	lpdprefix = "";
 TQString ptPrinterType(KMPrinter*);
 
 //************************************************************************************************
@@ -83,7 +83,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer)
 	PrintcapEntry	*entry = m_entries.find(printer->name());
 	if (entry)
 	{
-		QString	type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
+		TQString	type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp"));
 		printer->setDescription(i18n("Local printer queue (%1)").arg(type.isEmpty() ? i18n("Unknown type of local printer queue", "Unknown") : type));
 		printer->setLocation(i18n("<Not available>"));
 		printer->setDriverInfo(driver.isEmpty() ? i18n("Unknown Driver", "Unknown") : driver);
@@ -221,7 +221,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer)
 bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
 {
 	KPipeProcess	proc;
-	QString		cmd = programName(0);
+	TQString		cmd = programName(0);
 	cmd += " ";
 	cmd += state ? "up" : "down";
 	cmd += " ";
@@ -229,7 +229,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state)
 	if (proc.open(cmd))
 	{
 		QTextStream	t(&proc);
-		QString		buffer;
+		TQString		buffer;
 		while (!t.eof())
 			buffer.append(t.readLine());
 		if (buffer.startsWith("?Privilege"))
@@ -287,11 +287,11 @@ TQString KMLpdManager::programName(int f)
 void KMLpdManager::checkStatus()
 {
 	KPipeProcess	proc;
-	QString		cmd = programName(0) + " status all";
+	TQString		cmd = programName(0) + " status all";
 	if (proc.open(cmd))
 	{
 		QTextStream	t(&proc);
-		QString		line;
+		TQString		line;
 		KMPrinter	*printer(0);
 		int		p(-1);
 		while (!t.eof())
@@ -326,7 +326,7 @@ void KMLpdManager::loadPrintcapFile(const TQString& filename)
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
 		QTextStream	t(&f);
-		QString		line, comment;
+		TQString		line, comment;
 		PrintcapEntry	*entry;
 		while (!t.eof())
 		{
@@ -391,7 +391,7 @@ void KMLpdManager::loadPrinttoolDb(const TQString& filename)
 
 DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry)
 {
-	QString	ptdbfilename = driverDirectory() + "/printerdb";
+	TQString	ptdbfilename = driverDirectory() + "/printerdb";
 	if (entry->file == ptdbfilename)
 	{
 		PrinttoolEntry	*ptentry = findPrinttoolEntry(entry->modelname);
@@ -419,7 +419,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config)
 		return NULL;
 
 	// check for printtool driver (only for configuration)
-	QString	sd = entry->arg("sd"), dr(entry->comment(7));
+	TQString	sd = entry->arg("sd"), dr(entry->comment(7));
 	if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty())
 	{
 		TQMap<TQString,TQString>	map = loadPrinttoolCfgFile(sd+"/postscript.cfg");
@@ -462,7 +462,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
 		QTextStream	t(&f);
-		QString		line, name, val;
+		TQString		line, name, val;
 		int 		p(-1);
 		while (!t.eof())
 		{
@@ -488,14 +488,14 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file
 bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQString& dirname, const TQMap<TQString,TQString>& options)
 {
 	// defines input and output file
-	QString	fname = TQFileInfo(templatefile).fileName();
+	TQString	fname = TQFileInfo(templatefile).fileName();
 	fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1(""));
 	QFile	fin(templatefile);
 	QFile	fout(dirname + "/" + fname);
 	if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly))
 	{
 		QTextStream	tin(&fin), tout(&fout);
-		QString		line, name;
+		TQString		line, name;
 		int		p(-1);
 		while (!tin.eof())
 		{
@@ -525,7 +525,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 {
 	// To be able to save a printer driver, a printcap entry MUST exist.
 	// We can then retrieve the spool directory from it.
-	QString	spooldir;
+	TQString	spooldir;
 	PrintcapEntry	*ent = findPrintcapEntry(printer->printerName());
 	if (!ent)
 		return false;
@@ -541,7 +541,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 		options["PS_SEND_EOF"] = "NO";
 		if (!checkGsDriver(options["GSDEVICE"]))
 			return false;
-		QString	resol(options["RESOLUTION"]), color(options["COLOR"]);
+		TQString	resol(options["RESOLUTION"]), color(options["COLOR"]);
 		// update entry comment to make printtool happy and save printcap file
 		ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15)));
 		ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter");
@@ -565,7 +565,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver)
 bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry)
 {
 	KURL	dev(printer->device());
-	QString	prot = dev.protocol(), sd(entry->arg("sd"));
+	TQString	prot = dev.protocol(), sd(entry->arg("sd"));
 	entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer));
 	if (prot == "smb" || prot == "ncp" || prot == "socket")
 	{
@@ -619,7 +619,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry)
 	// first check if it has a "sd" defined
 	if (entry->arg("sd").isEmpty())
 		entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name;
-	QString	sd = entry->arg("sd");
+	TQString	sd = entry->arg("sd");
 	if (!TDEStandardDirs::exists(sd))
 	{
 		if (!TDEStandardDirs::makeDir(sd,0750))
@@ -641,7 +641,7 @@ bool KMLpdManager::validateDbDriver(KMDBEntry *entry)
 
 TQString ptPrinterType(KMPrinter *p)
 {
-	QString	type, prot = p->device().protocol();
+	TQString	type, prot = p->device().protocol();
 	if (prot == "lpd") type = "REMOTE";
 	else if (prot == "smb") type = "SMB";
 	else if (prot == "ncp") type = "NCP";
diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp
index 54f19c405..4d45a9760 100644
--- a/tdeprint/lpd/lpdtools.cpp
+++ b/tdeprint/lpd/lpdtools.cpp
@@ -88,8 +88,8 @@ bool PrintcapEntry::readLine(const TQString& line)
 		{
 			int	p = l[i].find('=');
 			if (p == -1) p = 2;
-			QString	key = l[i].left(p);
-			QString	value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
+			TQString	key = l[i].left(p);
+			TQString	value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p));
 			m_args[key] = value;
 		}
 		return true;
@@ -114,7 +114,7 @@ void PrintcapEntry::writeEntry(TQTextStream& t)
 
 TQString PrintcapEntry::comment(int index)
 {
-	QString	w;
+	TQString	w;
 	if (m_comment.startsWith("##PRINTTOOL3##"))
 	{
 		int	p(0);
@@ -166,7 +166,7 @@ TQStringList splitPrinttoolLine(const TQString& line)
 
 bool PrinttoolEntry::readEntry(TQTextStream& t)
 {
-	QString	line;
+	TQString	line;
 	QStringList	args;
 
 	m_resolutions.setAutoDelete(true);
@@ -264,7 +264,7 @@ DrMain* PrinttoolEntry::createDriver()
 					ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi));
 				lopt->addChoice(ch);
 			}
-			QString	defval = lopt->choices()->first()->name();
+			TQString	defval = lopt->choices()->first()->name();
 			lopt->set("default",defval);
 			lopt->setValueText(defval);
 		}
@@ -290,7 +290,7 @@ DrMain* PrinttoolEntry::createDriver()
 					ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment));
 				lopt->addChoice(ch);
 			}
-			QString	defval = lopt->choices()->first()->name();
+			TQString	defval = lopt->choices()->first()->name();
 			lopt->set("default",defval);
 			lopt->setValueText(defval);
 		}
@@ -394,7 +394,7 @@ DrMain* PrinttoolEntry::createDriver()
 
 TQString getPrintcapLine(TQTextStream& t, TQString *lastcomment)
 {
-	QString	line, buffer, comm;
+	TQString	line, buffer, comm;
 	while (!t.eof())
 	{
 		buffer = t.readLine().stripWhiteSpace();
diff --git a/tdeprint/lpd/lpdtools.h b/tdeprint/lpd/lpdtools.h
index 692dd0fa2..ef28ff089 100644
--- a/tdeprint/lpd/lpdtools.h
+++ b/tdeprint/lpd/lpdtools.h
@@ -38,8 +38,8 @@ public:
 	TQString arg(const TQString& key) const 	{ return m_args[key]; }
 	TQString comment(int i);
 private:
-	QString			m_name;
-	QString			m_comment;
+	TQString			m_name;
+	TQString			m_comment;
 	TQMap<TQString,TQString>	m_args;
 };
 
@@ -48,13 +48,13 @@ private:
 struct Resolution
 {
 	int 	xdpi, ydpi;
-	QString	comment;
+	TQString	comment;
 };
 
 struct BitsPerPixel
 {
-	QString	bpp;
-	QString	comment;
+	TQString	bpp;
+	TQString	comment;
 };
 
 class PrinttoolEntry
@@ -64,7 +64,7 @@ public:
 	bool readEntry(TQTextStream& t);
 	DrMain* createDriver();
 private:
-	QString			m_name, m_gsdriver, m_description, m_about;
+	TQString			m_name, m_gsdriver, m_description, m_about;
 	TQPtrList<Resolution>	m_resolutions;
 	TQPtrList<BitsPerPixel>	m_depths;
 };
diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
index e628a1c41..fe6a6aa7b 100644
--- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp
+++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp
@@ -47,7 +47,7 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer)
 // look for executable, starting with "lpr"
 TQString KLpdUnixPrinterImpl::executable()
 {
-	QString	exe = TDEStandardDirs::findExe("lpr");
+	TQString	exe = TDEStandardDirs::findExe("lpr");
 	if (exe.isEmpty())
 		exe = TDEStandardDirs::findExe("lp");
 	return exe;
diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp
index 7a291f6df..fa20b17da 100644
--- a/tdeprint/lpdunix/kmlpdunixmanager.cpp
+++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp
@@ -186,7 +186,7 @@ void KMLpdUnixManager::parseEtcPrintcap()
 	TQFile	f(getPrintcapFileName());
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		KTextBuffer	t(TQT_TQIODEVICE(&f));
+		KTextBuffer	t(&f);
 		TQMap<TQString,TQString>	entry;
 
 		while (!t.eof())
@@ -247,7 +247,7 @@ void KMLpdUnixManager::parseEtcPrintersConf()
 	TQFile	f(getEtcPrintersConfName());
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
-		KTextBuffer	t(TQT_TQIODEVICE(&f));
+		KTextBuffer	t(&f);
 		TQMap<TQString,TQString>	entry;
 		TQString		default_printer;
 
@@ -297,7 +297,7 @@ void KMLpdUnixManager::parseEtcLpPrinters()
 		TQFile	f(it.current()->absFilePath() + "/configuration");
 		if (f.exists() && f.open(IO_ReadOnly))
 		{
-			KTextBuffer	t(TQT_TQIODEVICE(&f));
+			KTextBuffer	t(&f);
 			TQString		line, remote;
 			while (!t.eof())
 			{
@@ -358,7 +358,7 @@ void KMLpdUnixManager::parseSpoolInterface()
 		TQFile	f(it.current()->absFilePath());
 		if (f.exists() && f.open(IO_ReadOnly))
 		{
-			KTextBuffer	t(TQT_TQIODEVICE(&f));
+			KTextBuffer	t(&f);
 			TQString		line, remote;
 
 			while (!t.eof())
diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp
index bf61919c3..e70e85907 100644
--- a/tdeprint/lpr/editentrydialog.cpp
+++ b/tdeprint/lpr/editentrydialog.cpp
@@ -86,12 +86,12 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c
 	slotTypeChanged(0);
 	m_block = false;
 
-	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotItemSelected(TQListViewItem*)));
-	connect(m_string, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_boolean, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()));
-	connect(m_number, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged()));
-	connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
-	connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
+	connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotItemSelected(TQListViewItem*)));
+	connect(m_string, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_boolean, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()));
+	connect(m_number, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged()));
+	connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
+	connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
 
 	resize(500,400);
 }
diff --git a/tdeprint/lpr/editentrydialog.h b/tdeprint/lpr/editentrydialog.h
index f4359dd89..888f87eed 100644
--- a/tdeprint/lpr/editentrydialog.h
+++ b/tdeprint/lpr/editentrydialog.h
@@ -33,7 +33,7 @@ class TQWidgetStack;
 
 class EditEntryDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	EditEntryDialog(PrintcapEntry *entry, TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp
index 4dbe5e378..03a75001a 100644
--- a/tdeprint/lpr/klprprinterimpl.cpp
+++ b/tdeprint/lpr/klprprinterimpl.cpp
@@ -42,7 +42,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		return false;
 
 	cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() );
-	QString	opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
+	TQString	opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer);
 	if (!opts.isEmpty())
 		cmd += (" " + opts);
 	return true;
@@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value
 	KPrinterImpl::broadcastOption(key,value);
 	if (key == "kde-pagesize")
 	{
-		QString	pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
+		TQString	pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt()));
 		KPrinterImpl::broadcastOption("PageSize",pagename);
 	}
 }
diff --git a/tdeprint/lpr/klprprinterimpl.h b/tdeprint/lpr/klprprinterimpl.h
index 508173f1d..3d3e9a080 100644
--- a/tdeprint/lpr/klprprinterimpl.h
+++ b/tdeprint/lpr/klprprinterimpl.h
@@ -32,7 +32,7 @@ public:
 	void broadcastOption(const TQString& key, const TQString& value);
 
 private:
-	QString	m_exepath;
+	TQString	m_exepath;
 };
 
 #endif
diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp
index fed1dd17d..ffd8db77a 100644
--- a/tdeprint/lpr/kmconfiglpr.cpp
+++ b/tdeprint/lpr/kmconfiglpr.cpp
@@ -34,7 +34,7 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name)
 	setPageHeader(i18n("Spooler Settings"));
 	setPagePixmap("gear");
 
-	TQGroupBox	*m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this);
+	TQGroupBox	*m_modebox = new TQGroupBox(1, TQt::Vertical, i18n("Spooler"), this);
 
 	m_mode = new TQComboBox(m_modebox);
 	m_mode->insertItem("LPR (BSD compatible)");
diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp
index 046f082f7..f207df9ee 100644
--- a/tdeprint/lpr/kmlprmanager.cpp
+++ b/tdeprint/lpr/kmlprmanager.cpp
@@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt)
 
 void KMLprManager::createPluginActions(TDEActionCollection *coll)
 {
-	TDEAction	*act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
+	TDEAction	*act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQ_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap");
 	act->setGroup("plugin");
 }
 
diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h
index d26af4d77..c4be757b1 100644
--- a/tdeprint/lpr/kmlprmanager.h
+++ b/tdeprint/lpr/kmlprmanager.h
@@ -34,7 +34,7 @@ class KPrinter;
 
 class KMLprManager : public KMManager
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMLprManager(TQObject *parent, const char *name, const TQStringList & /*args*/);
 
diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h
index 590eafdff..2545993fc 100644
--- a/tdeprint/lpr/lprsettings.h
+++ b/tdeprint/lpr/lprsettings.h
@@ -58,9 +58,9 @@ protected:
 private:
 	static LprSettings*	m_self;
 	Mode	m_mode;
-	QString	m_printcapfile;
+	TQString	m_printcapfile;
 	bool	m_local;
-	QString	m_spooldir;
+	TQString	m_spooldir;
 	TQString m_defaultremotehost;
 };
 
diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp
index 718ffca21..8a1e1ee9a 100644
--- a/tdeprint/lpr/printcapreader.cpp
+++ b/tdeprint/lpr/printcapreader.cpp
@@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f)
 {
     if (f->isOpen())
     {
-        m_stream.setDevice(TQT_TQIODEVICE(f));
+        m_stream.setDevice(f);
         m_buffer = TQString::null;
     }
 }
diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp
index 5bddffe02..58a051370 100644
--- a/tdeprint/management/cjanuswidget.cpp
+++ b/tdeprint/management/cjanuswidget.cpp
@@ -74,7 +74,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p)
 	int	w1 = (listBox()->contentsWidth()-m_pix.width())/2;
 
 	p->drawPixmap(w1,5,m_pix);
-	p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),Qt::AlignHCenter,text());
+	p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),TQt::AlignHCenter,text());
 }
 
 //***********************************************************************************
@@ -143,7 +143,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name)
 	f = m_iconlist->font();
 	f.setBold(true);
 	m_iconlist->setFont(f);
-	connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*)));
+	connect(m_iconlist,TQ_SIGNAL(selectionChanged(TQListBoxItem*)),TQ_SLOT(slotSelected(TQListBoxItem*)));
 
 	m_empty = new TQWidget(this, "Empty");
 	m_stack->addWidget(m_empty,0);
diff --git a/tdeprint/management/cjanuswidget.h b/tdeprint/management/cjanuswidget.h
index d33be1499..5b178c824 100644
--- a/tdeprint/management/cjanuswidget.h
+++ b/tdeprint/management/cjanuswidget.h
@@ -30,7 +30,7 @@ class TQListBoxItem;
 
 class CJanusWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CJanusWidget(TQWidget *parent, const char *name);
 	~CJanusWidget();
diff --git a/tdeprint/management/jobitem.h b/tdeprint/management/jobitem.h
index 580a1b84f..66beeb7d2 100644
--- a/tdeprint/management/jobitem.h
+++ b/tdeprint/management/jobitem.h
@@ -40,7 +40,7 @@ public:
 private:
 	KMJob	*m_job;
 	int	m_ID;
-	QString	m_uri;
+	TQString	m_uri;
 };
 
 inline int JobItem::jobID() const
diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp
index 984d2c128..132ca990c 100644
--- a/tdeprint/management/kiconselectaction.cpp
+++ b/tdeprint/management/kiconselectaction.cpp
@@ -76,7 +76,7 @@ void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList&
 int TDEIconSelectAction::plug(TQWidget* widget, int index)
 {
 	int	value(-1);
-	if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING))
+	if (widget->inherits("TQPopupMenu"))
 	{
 		createPopupMenu();
 		value = TDESelectAction::plug(widget, index);
@@ -94,7 +94,7 @@ int TDEIconSelectAction::plug(TQWidget* widget, int index)
 		bar->getButton(id)->setPopup(d->m_menu, true);
 		bar->setItemEnabled(id, isEnabled());
 		addContainer(bar, id);
-		connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed()));
+		connect(bar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotDestroyed()));
 
 		value = containerCount()-1;
 	}
diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h
index 26e703fbf..7403d311a 100644
--- a/tdeprint/management/kiconselectaction.h
+++ b/tdeprint/management/kiconselectaction.h
@@ -26,7 +26,7 @@ class TDEIconSelectActionPrivate;
 
 class TDEIconSelectAction : public TDESelectAction
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0);
 	virtual ~TDEIconSelectAction();
diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp
index 971f8cce5..3c82c8663 100644
--- a/tdeprint/management/kmconfigcommand.cpp
+++ b/tdeprint/management/kmconfigcommand.cpp
@@ -34,7 +34,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
 	setPageHeader(i18n("Command Settings"));
 	setPagePixmap("application-x-executable");
 
-	TQGroupBox	*gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this);
+	TQGroupBox	*gb = new TQGroupBox(0, TQt::Horizontal, i18n("Edit/Create Commands"), this);
 	TQLabel	*lab = new TQLabel(i18n(
 				"<p>Command objects perform a conversion from input to output.<br>"
                 "They are used as the basis to build both print filters "
@@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name)
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(gb);
 	l0->addStretch(1);
-	TQVBoxLayout	*l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint());
 	l2->addWidget(lab);
 	l2->addWidget(sel);
 }
diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h
index 6a47995cc..30dd2b2ef 100644
--- a/tdeprint/management/kmconfigdialog.h
+++ b/tdeprint/management/kmconfigdialog.h
@@ -27,7 +27,7 @@
 
 class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigDialog(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp
index b7be0a1e6..18354839d 100644
--- a/tdeprint/management/kmconfigfilter.cpp
+++ b/tdeprint/management/kmconfigfilter.cpp
@@ -41,7 +41,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 	setPageHeader(i18n("Printer Filtering Settings"));
 	setPagePixmap("filter");
 
-	TQGroupBox	*box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this);
+	TQGroupBox	*box = new TQGroupBox(0, TQt::Vertical, i18n("Printer Filter"), this);
 
 	m_list1 = new TDEListBox(box);
 	m_list1->setSelectionMode(TDEListBox::Extended);
@@ -63,10 +63,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box, 1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(lab);
 	TQGridLayout	*l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint());
-	l1->addLayout(TQT_TQLAYOUT(l2));
+	l1->addLayout(l2);
 	l2->setRowStretch(0, 1);
 	l2->setRowStretch(3, 1);
 	l2->setColStretch(0, 1);
@@ -80,10 +80,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name)
 	l3->addWidget(lab1, 0);
 	l3->addWidget(m_locationre, 1);
 
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked()));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
-	connect(m_list1, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
-	connect(m_list2, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked()));
+	connect(m_list1, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
+	connect(m_list2, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
 	m_add->setEnabled(false);
 	m_remove->setEnabled(false);
 }
diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h
index 8338ebd6f..1e0f6e2c9 100644
--- a/tdeprint/management/kmconfigfilter.h
+++ b/tdeprint/management/kmconfigfilter.h
@@ -28,7 +28,7 @@ class TQLineEdit;
 
 class KMConfigFilter : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigFilter(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp
index 4d9854774..7107bc74d 100644
--- a/tdeprint/management/kmconfigfonts.cpp
+++ b/tdeprint/management/kmconfigfonts.cpp
@@ -43,8 +43,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	setPageHeader(i18n("Font Settings"));
 	setPagePixmap("fonts");
 
-	TQGroupBox	*box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this);
-	TQGroupBox	*box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this);
+	TQGroupBox	*box = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Embedding"), this);
+	TQGroupBox	*box2 = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Path"), this);
 
 	m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box);
 	m_fontpath = new TDEListView(box2);
@@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 	TQLabel	*lab0 = new TQLabel(i18n("Additional director&y:"), box2);
 	lab0->setBuddy(m_addpath);
 
-	TQVBoxLayout	*l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l0->addWidget(m_embedfonts);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint());
 	l1->addWidget(m_fontpath);
 	TQHBoxLayout	*l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	l1->addLayout(l2);
@@ -91,12 +91,12 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name)
 			     "font path is used, so adding those directories is not needed. The default "
 			     "search path should be sufficient in most cases."));
 
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
-	connect(m_fontpath, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelected()));
-	connect(m_addpath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&)));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));
+	connect(m_fontpath, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelected()));
+	connect(m_addpath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged(const TQString&)));
 	m_add->setEnabled(false);
 	m_remove->setEnabled(false);
 	m_up->setEnabled(false);
diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h
index 8bd285f38..9ac9a43f5 100644
--- a/tdeprint/management/kmconfigfonts.h
+++ b/tdeprint/management/kmconfigfonts.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class KMConfigFonts : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigFonts(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp
index edf8902bf..1b21dbca6 100644
--- a/tdeprint/management/kmconfiggeneral.cpp
+++ b/tdeprint/management/kmconfiggeneral.cpp
@@ -45,7 +45,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	setPageHeader(i18n("General Settings"));
 	setPagePixmap("document-print");
 
-	TQGroupBox	*m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this);
+	TQGroupBox	*m_timerbox = new TQGroupBox(0, TQt::Vertical, i18n("Refresh Interval"), this);
 	m_timer = new KIntNumInput(m_timerbox,"Timer");
 	m_timer->setRange(0,30);
     m_timer->setSuffix( i18n( " sec" ) );
@@ -54,19 +54,19 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 			              "<b>TDE Print</b> components like the print manager "
 				      "and the job viewer."));
 
-	TQGroupBox	*m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this);
+	TQGroupBox	*m_testpagebox = new TQGroupBox(0, TQt::Vertical, i18n("Test Page"), this);
 	m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck");
 	m_testpage = new KURLRequester(m_testpagebox,"TestPage");
 	m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox);
-	connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool)));
-	connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool)));
-	connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview()));
-        connect(m_testpage->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(testPageChanged(const TQString & )));
+	connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),m_testpage,TQ_SLOT(setEnabled(bool)));
+	connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabledPreviewButton(bool)));
+	connect(m_preview,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestPagePreview()));
+        connect(m_testpage->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(testPageChanged(const TQString & )));
 	m_testpage->setDisabled(true);
 	m_preview->setDisabled(true);
 	m_defaulttestpage->setCursor(KCursor::handCursor());
 
-	TQGroupBox	*m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this);
+	TQGroupBox	*m_statusbox = new TQGroupBox(0, TQt::Vertical, i18n("Miscellaneous"), this);
 	m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox);
 	m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox);
 
@@ -76,10 +76,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	lay0->addWidget(m_testpagebox);
 	lay0->addWidget(m_statusbox);
 	lay0->addStretch(1);
-	TQVBoxLayout	*lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()),
+	TQVBoxLayout	*lay1 = new TQVBoxLayout(m_timerbox->layout(),
 		KDialog::spacingHint());
 	lay1->addWidget(m_timer);
-	TQVBoxLayout	*lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()),
+	TQVBoxLayout	*lay2 = new TQVBoxLayout(m_testpagebox->layout(),
 		KDialog::spacingHint());
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 0);
 	lay2->addWidget(m_defaulttestpage);
@@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent)
 	lay2->addLayout(lay3);
 	lay3->addStretch(1);
 	lay3->addWidget(m_preview);
-	TQVBoxLayout	*lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()),
+	TQVBoxLayout	*lay4 = new TQVBoxLayout(m_statusbox->layout(),
 		KDialog::spacingHint());
 	lay4->addWidget(m_statusmsg);
 	lay4->addWidget(m_uselast);
diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h
index b82a91daa..190b4f38a 100644
--- a/tdeprint/management/kmconfiggeneral.h
+++ b/tdeprint/management/kmconfiggeneral.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 class TQPushButton;
 class KMConfigGeneral : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigGeneral(TQWidget *parent = 0);
 
diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp
index 1c712de3d..39b783d48 100644
--- a/tdeprint/management/kmconfigjobs.cpp
+++ b/tdeprint/management/kmconfigjobs.cpp
@@ -34,7 +34,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 	setPageHeader(i18n("Print Job Settings"));
 	setPagePixmap("application-x-executable");
 
-	TQGroupBox	*box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this);
+	TQGroupBox	*box = new TQGroupBox(0, TQt::Vertical, i18n("Jobs Shown"), this);
 
 	m_limit = new KIntNumInput(box);
 	m_limit->setRange(0, 9999, 1, true);
@@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name)
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box, 0);
 	l0->addStretch(1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(m_limit);
 }
 
diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h
index 29818d68a..0edab1056 100644
--- a/tdeprint/management/kmconfigjobs.h
+++ b/tdeprint/management/kmconfigjobs.h
@@ -26,7 +26,7 @@ class KIntNumInput;
 
 class KMConfigJobs : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigJobs(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index f29b8a23e..533ff80f4 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -28,7 +28,7 @@ class TDEConfig;
 
 class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigPage(TQWidget *parent = 0, const char *name = 0);
 
@@ -45,9 +45,9 @@ protected:
 	void setPagePixmap(const TQString& s)	{ m_pixmap = s; }
 
 protected:
-	QString	m_name;
-	QString	m_header;
-	QString	m_pixmap;
+	TQString	m_name;
+	TQString	m_header;
+	TQString	m_pixmap;
 };
 
 #endif
diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp
index 2fdcbcb4b..b3c8aa39e 100644
--- a/tdeprint/management/kmconfigpreview.cpp
+++ b/tdeprint/management/kmconfigpreview.cpp
@@ -36,7 +36,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	setPageHeader(i18n("Preview Settings"));
 	setPagePixmap("filefind");
 
-	TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this);
+	TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Preview Program"), this);
 
 	m_useext = new TQCheckBox(i18n("&Use external preview program"), box);
 	m_program = new KURLRequester(box);
@@ -50,12 +50,12 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name)
 	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	l0->addWidget(box);
 	l0->addStretch(1);
-	TQVBoxLayout	*l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint());
+	TQVBoxLayout	*l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint());
 	l1->addWidget(lab);
 	l1->addWidget(m_useext);
 	l1->addWidget(m_program);
 
-	connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool)));
+	connect(m_useext, TQ_SIGNAL(toggled(bool)), m_program, TQ_SLOT(setEnabled(bool)));
 	m_program->setEnabled(false);
 }
 
diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp
index 6154ebea2..720b213a3 100644
--- a/tdeprint/management/kmdbcreator.cpp
+++ b/tdeprint/management/kmdbcreator.cpp
@@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name)
 	m_dlg = 0;
 	m_status = true;
 
-	connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(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(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(&m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*)));
 }
 
 KMDBCreator::~KMDBCreator()
@@ -112,7 +112,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena
 			m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true);
 			m_dlg->setLabelText(i18n("Please wait while TDE rebuilds a driver database."));
 			m_dlg->setCaption(i18n("Driver Database"));
-			connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled()));
+			connect(m_dlg,TQ_SIGNAL(canceled()),TQ_SLOT(slotCancelled()));
 		}
 		m_dlg->setMinimumDuration(0);	// always show the dialog
 		m_dlg->setProgress(0);		// to force showing
diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h
index 4b1983ae6..1aadc5026 100644
--- a/tdeprint/management/kmdbcreator.h
+++ b/tdeprint/management/kmdbcreator.h
@@ -30,7 +30,7 @@ class TQProgressDialog;
 
 class KMDBCreator : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMDBCreator(TQObject *parent = 0, const char *name = 0);
 	~KMDBCreator();
diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp
index 5a172281b..80c44a5a8 100644
--- a/tdeprint/management/kmdriverdb.cpp
+++ b/tdeprint/management/kmdriverdb.cpp
@@ -47,7 +47,7 @@ KMDriverDB::KMDriverDB(TQObject *parent, const char *name)
 : TQObject(parent,name)
 {
 	m_creator = new KMDBCreator(this,"db-creator");
-	connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated()));
+	connect(m_creator,TQ_SIGNAL(dbCreated()),TQ_SLOT(slotDbCreated()));
 
 	m_entries.setAutoDelete(true);
 	m_pnpentries.setAutoDelete(true);
diff --git a/tdeprint/management/kmdriverdb.h b/tdeprint/management/kmdriverdb.h
index c5af6d53e..8dec3e8f0 100644
--- a/tdeprint/management/kmdriverdb.h
+++ b/tdeprint/management/kmdriverdb.h
@@ -31,7 +31,7 @@ class KMDBCreator;
 
 class KMDriverDB : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	static KMDriverDB* self();
 
diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp
index 7223dbcd3..c49af544a 100644
--- a/tdeprint/management/kmdriverdbwidget.cpp
+++ b/tdeprint/management/kmdriverdbwidget.cpp
@@ -62,7 +62,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	TQGridLayout	*sub1_ = new TQGridLayout(0, 2, 3, 0, 0);
 	TQHBoxLayout	*sub2_ = new TQHBoxLayout(0, 0, 10);
-	main_->addLayout(TQT_TQLAYOUT(sub1_));
+	main_->addLayout(sub1_);
 	main_->addLayout(sub2_);
 	main_->addWidget(m_raw);
 	sub1_->addWidget(l1,0,0);
@@ -74,19 +74,19 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name)
 	sub2_->addWidget(m_other,0);
 
 	// build connections
-	connect(KMDriverDB::self(),TQT_SIGNAL(dbLoaded(bool)),TQT_SLOT(slotDbLoaded(bool)));
-	connect(KMDriverDB::self(), TQT_SIGNAL(error(const TQString&)), TQT_SLOT(slotError(const TQString&)));
-	connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),TQT_SLOT(slotManufacturerSelected(const TQString&)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool)));
-	connect(m_raw,TQT_SIGNAL(toggled(bool)),m_postscript,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_raw,TQT_SLOT(setDisabled(bool)));
-	connect(m_postscript,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotPostscriptToggled(bool)));
-	connect(m_other,TQT_SIGNAL(clicked()),TQT_SLOT(slotOtherClicked()));
+	connect(KMDriverDB::self(),TQ_SIGNAL(dbLoaded(bool)),TQ_SLOT(slotDbLoaded(bool)));
+	connect(KMDriverDB::self(), TQ_SIGNAL(error(const TQString&)), TQ_SLOT(slotError(const TQString&)));
+	connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),TQ_SLOT(slotManufacturerSelected(const TQString&)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool)));
+	connect(m_raw,TQ_SIGNAL(toggled(bool)),m_postscript,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_raw,TQ_SLOT(setDisabled(bool)));
+	connect(m_postscript,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotPostscriptToggled(bool)));
+	connect(m_other,TQ_SIGNAL(clicked()),TQ_SLOT(slotOtherClicked()));
 }
 
 KMDriverDbWidget::~KMDriverDbWidget()
@@ -240,7 +240,7 @@ void KMDriverDbWidget::slotOtherClicked()
 				if (driver)
 				{
 					m_external = filename;
-					disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&)));
+					disconnect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&)));
 					m_manu->clear();
 					m_model->clear();
 					TQString	s = driver->get("manufacturer");
@@ -264,7 +264,7 @@ void KMDriverDbWidget::slotOtherClicked()
 	else
 	{
 		m_external = TQString::null;
-		connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&)));
+		connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&)));
 		m_other->setText(i18n("Other"));
 		m_desc = TQString::null;
 		slotDbLoaded(true);
diff --git a/tdeprint/management/kmdriverdbwidget.h b/tdeprint/management/kmdriverdbwidget.h
index 05b50536d..2841fd51f 100644
--- a/tdeprint/management/kmdriverdbwidget.h
+++ b/tdeprint/management/kmdriverdbwidget.h
@@ -29,7 +29,7 @@ class TQPushButton;
 
 class KMDriverDbWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMDriverDbWidget(TQWidget *parent = 0, const char *name = 0);
 	~KMDriverDbWidget();
diff --git a/tdeprint/management/kmdriverdialog.h b/tdeprint/management/kmdriverdialog.h
index 8b7b01c45..3a62619ed 100644
--- a/tdeprint/management/kmdriverdialog.h
+++ b/tdeprint/management/kmdriverdialog.h
@@ -27,7 +27,7 @@ class DrMain;
 
 class KMDriverDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMDriverDialog(TQWidget *parent = 0, const char *name = 0);
 	~KMDriverDialog();
diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp
index 5cd37c948..bfc34570d 100644
--- a/tdeprint/management/kmiconview.cpp
+++ b/tdeprint/management/kmiconview.cpp
@@ -129,8 +129,8 @@ KMIconView::KMIconView(TQWidget *parent, const char *name)
 	m_items.setAutoDelete(false);
 	setViewMode(KMIconView::Big);
 
-	connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&)));
-	connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
+	connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&)));
+	connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
 }
 
 KMIconView::~KMIconView()
diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h
index 1c8cb197e..ba56cabb1 100644
--- a/tdeprint/management/kmiconview.h
+++ b/tdeprint/management/kmiconview.h
@@ -40,14 +40,14 @@ protected:
 
 private:
 	int		m_mode;
-	QString		m_pixmap;
+	TQString		m_pixmap;
 	char		m_state;
 	bool		m_isclass;
 };
 
 class KMIconView : public TDEIconView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum ViewMode { Big, Small };
 
diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp
index bae2b6ad6..06b37713d 100644
--- a/tdeprint/management/kminfopage.cpp
+++ b/tdeprint/management/kminfopage.cpp
@@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
 {
 	m_title = new TQLabel(this);
 	m_titlepixmap = new TQLabel(this);
-	m_titlepixmap->setAlignment(Qt::AlignCenter);
+	m_titlepixmap->setAlignment(TQt::AlignCenter);
         KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	m_type = new TQLabel(this);
 	m_description = new TQLabel(this);
@@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name)
 	m_uri = new TQLabel(this);
 	m_device = new TQLabel(this);
 	TQLabel	*m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this);
-	m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_loclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	TQLabel	*m_desclabel = new TQLabel(i18n("Description:"), this);
-	m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_desclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	TQLabel	*m_typelabel = new TQLabel(i18n("Type:"), this);
-	m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_typelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	TQLabel	*m_statelabel = new TQLabel(i18n("Status", "State:"), this);
-	m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_statelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	TQLabel	*m_urilabel = new TQLabel(i18n("URI:"), this);
-	m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_urilabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	m_devlabel = new TQLabel(i18n("Device:"), this);
-	m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_devlabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 	TQLabel	*m_modellabel = new TQLabel(i18n("Model:"), this);
-	m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+	m_modellabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter);
 
 	TQGridLayout	*lay0 = new TQGridLayout(this, 11, 2, 0, 5);
 	TQHBoxLayout	*lay1 = new TQHBoxLayout(0, 0, 10);
@@ -125,7 +125,7 @@ void KMInfoPage::setPrinter(KMPrinter *p)
 		m_uri->setText(p->uri().prettyURL());
 		if (p->isClass(false))
 		{
-			QString	s;
+			TQString	s;
 			for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it)
 				s.append(KURL(*it).prettyURL() + ", ");
 			s.truncate(s.length()-2);
diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp
index 45030a587..411f86325 100644
--- a/tdeprint/management/kminstancepage.cpp
+++ b/tdeprint/management/kminstancepage.cpp
@@ -78,20 +78,20 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons
 	btn->setText(txt);
 	btn->setIconSet(BarIconSet(pixmap));
 	btn->setFlat(true);
-	connect(btn, TQT_SIGNAL(clicked()), receiver);
+	connect(btn, TQ_SIGNAL(clicked()), receiver);
 	m_buttons.append(btn);
 }
 
 void KMInstancePage::initActions()
 {
-	addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew()));
-	addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy()));
-	addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove()));
+	addButton(i18n("New..."), "document-new", TQ_SLOT(slotNew()));
+	addButton(i18n("Copy..."), "edit-copy", TQ_SLOT(slotCopy()));
+	addButton(i18n("Remove"), "edittrash", TQ_SLOT(slotRemove()));
 	m_buttons.append(0);
-	addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault()));
-	addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings()));
+	addButton(i18n("Set as Default"), "application-x-executable", TQ_SLOT(slotDefault()));
+	addButton(i18n("Settings"), "configure", TQ_SLOT(slotSettings()));
 	m_buttons.append(0);
-	addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest()));
+	addButton(i18n("Test..."), "document-print", TQ_SLOT(slotTest()));
 }
 
 void KMInstancePage::setPrinter(KMPrinter *p)
diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h
index 56b045fe2..67bef455e 100644
--- a/tdeprint/management/kminstancepage.h
+++ b/tdeprint/management/kminstancepage.h
@@ -30,7 +30,7 @@ class TQButton;
 
 class KMInstancePage : public TQWidget, public KMPrinterPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMInstancePage(TQWidget *parent = 0, const char *name = 0);
 	~KMInstancePage();
diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp
index 70a6c6e85..c64f765a8 100644
--- a/tdeprint/management/kmjobviewer.cpp
+++ b/tdeprint/management/kmjobviewer.cpp
@@ -105,7 +105,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name)
 		resize( conf->readSizeEntry( "Size", &defSize ) );
 	}
 
-	connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated()));
+	connect(KMFactory::self()->manager(), TQ_SIGNAL(printerListUpdated()),TQ_SLOT(slotPrinterListUpdated()));
 }
 
 KMJobViewer::~KMJobViewer()
@@ -240,18 +240,18 @@ void KMJobViewer::init()
 		m_view->addColumn(i18n("Status", "State"));
 		m_view->addColumn(i18n("Size (KB)"));
 		m_view->addColumn(i18n("Page(s)"));
-		m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter);
-		connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
+		m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter);
+		connect( m_view, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) );
 		//m_view->addColumn(i18n("Printer"));
-		//m_view->setColumnAlignment(6,Qt::AlignRight|Qt::AlignVCenter);
+		//m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter);
 		KMFactory::self()->uiManager()->setupJobViewer(m_view);
 		m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken);
 		m_view->setLineWidth(1);
 		m_view->setSorting(0);
 		m_view->setAllColumnsShowFocus(true);
 		m_view->setSelectionMode(TQListView::Extended);
-		connect(m_view,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
-		connect(m_view,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int)));
+		connect(m_view,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
+		connect(m_view,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int)));
 		setCentralWidget(m_view);
 	}
 
@@ -261,26 +261,26 @@ void KMJobViewer::init()
 void KMJobViewer::initActions()
 {
 	// job actions
-	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold");
-	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume");
-	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove");
-	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart");
+	TDEAction	*hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQ_SLOT(slotHold()),actionCollection(),"job_hold");
+	TDEAction	*ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQ_SLOT(slotResume()),actionCollection(),"job_resume");
+	TDEAction	*dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQ_SLOT(slotRemove()),actionCollection(),"job_remove");
+	TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQ_SLOT(slotRestart()),actionCollection(),"job_restart");
 	TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move");
 	mact->setDelayed(false);
-	connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int)));
-	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-	connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
-	connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu()));
+	connect(mact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotMove(int)));
+	connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+	connect(mact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
+	connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowMoveMenu()));
 	TDEToggleAction	*tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed");
 	tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted);
-	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool)));
+	connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowCompleted(bool)));
 	TDEToggleAction	*uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs");
 	uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal"));
-	connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool)));
+	connect(uact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUserOnly(bool)));
 	m_userfield = new TQLineEdit(0);
 	m_userfield->setText(getenv("USER"));
-	connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged()));
-	connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool)));
+	connect(m_userfield, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotUserChanged()));
+	connect(uact, TQ_SIGNAL(toggled(bool)), m_userfield, TQ_SLOT(setEnabled(bool)));
 	m_userfield->setEnabled(false);
 	m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
 	KWidgetAction	*ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username");
@@ -288,8 +288,8 @@ void KMJobViewer::initActions()
 	if (!m_pop)
 	{
 		m_pop = new TQPopupMenu(this);
-		connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-		connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
+		connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+		connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
 		hact->plug(m_pop);
 		ract->plug(m_pop);
 		m_pop->insertSeparator();
@@ -302,10 +302,10 @@ void KMJobViewer::initActions()
 	// Filter actions
 	TDEActionMenu	*fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify");
 	fact->setDelayed(false);
-	connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int)));
-	connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-	connect(fact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
-	connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowPrinterMenu()));
+	connect(fact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int)));
+	connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+	connect(fact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
+	connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowPrinterMenu()));
 
 	if (!m_standalone)
 	{
@@ -324,12 +324,12 @@ void KMJobViewer::initActions()
 	}
 	else
 	{// stand-alone application
-		KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection());
-		KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection());
-		KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
+		KStdAction::quit(kapp,TQ_SLOT(quit()),actionCollection());
+		KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection());
+		KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection());
 
 		// refresh action
-		new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh");
+		new TDEAction(i18n("Refresh"),"reload",0,this,TQ_SLOT(slotRefresh()),actionCollection(),"refresh");
 
 		// create status bar
 		KStatusBar	*statusbar = statusBar();
@@ -338,7 +338,7 @@ void KMJobViewer::initActions()
 		TDEConfig *conf = KMFactory::self()->printConfig();
 		conf->setGroup("Jobs");
 		m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false));
-		connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool)));
+		connect(m_stickybox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeepWindowChange(bool)));
 		statusbar->addWidget( m_stickybox, 1, false );
 		statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true);
 		statusbar->setItemFixed(0);
@@ -617,7 +617,7 @@ void KMJobViewer::loadPluginActions()
 	for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it)
 	{
 		// connect the action to this
-		connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int)));
+		connect((*it), TQ_SIGNAL(activated(int)), TQ_SLOT(pluginActionActivated(int)));
 
 		// should add it to the toolbar and menubar
 		(*it)->plug(toolBar(), toolbarindex++);
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index f9e6ffb80..38db6c16c 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -48,7 +48,7 @@ class TQCheckBox;
  */
 class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMJobViewer(TQWidget *parent = 0, const char *name = 0);
 	~KMJobViewer();
diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp
index 806cc0d9f..09c89d915 100644
--- a/tdeprint/management/kmlistview.cpp
+++ b/tdeprint/management/kmlistview.cpp
@@ -81,7 +81,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p)
 		int	st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay);
 		m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0));
 		update = (oldstate != m_state);
-		QString	name = (p->isVirtual() ? p->instanceName() : p->name());
+		TQString	name = (p->isVirtual() ? p->instanceName() : p->name());
 		if (name != text(0))
 			setText(0, name);
 		setPixmap(0, SmallIcon(p->pixmap(), 0, st));
@@ -117,10 +117,10 @@ KMListView::KMListView(TQWidget *parent, const char *name)
 	setLineWidth(1);
 	setSorting(0);
 
-	connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int)));
-	connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged()));
-	connect(this,TQT_SIGNAL(onItem(TQListViewItem*)),TQT_SLOT(slotOnItem(TQListViewItem*)));
-	connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport()));
+	connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int)));
+	connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged()));
+	connect(this,TQ_SIGNAL(onItem(TQListViewItem*)),TQ_SLOT(slotOnItem(TQListViewItem*)));
+	connect(this,TQ_SIGNAL(onViewport()),TQ_SLOT(slotOnViewport()));
 
 	m_root = new KMListViewItem(this,i18n("Print System"));
 	m_root->setPixmap(0,SmallIcon("tdeprint_printer"));
diff --git a/tdeprint/management/kmlistview.h b/tdeprint/management/kmlistview.h
index 20ddc5731..472f0d2cc 100644
--- a/tdeprint/management/kmlistview.h
+++ b/tdeprint/management/kmlistview.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class KMListView : public TQListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMListView(TQWidget *parent = 0, const char *name = 0);
 	~KMListView();
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index ce3f356d8..af03b68d7 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -111,12 +111,12 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection *
 	m_layout->addWidget(m_plugin, 0);
 
 	// connections
-	connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer()));
-	connect(m_printerview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
-	connect(m_printerview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&)));
-	connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold()));
-	connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release()));
-	connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect(KMTimer::self(),TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer()));
+	connect(m_printerview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&)));
+	connect(m_printerview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&)));
+	connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold()));
+	connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release()));
+	connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
 	// actions
     if (coll)
@@ -148,7 +148,7 @@ void KMMainView::restoreSettings()
 	TDEConfig	*conf = KMFactory::self()->printConfig();
 	conf->setGroup("General");
 	setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons));
-	setOrientation(conf->readNumEntry("Orientation", Qt::Vertical));
+	setOrientation(conf->readNumEntry("Orientation", TQt::Vertical));
 	bool 	view = conf->readBoolEntry("ViewToolBar",false);
 	slotToggleToolBar(view);
 	((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view);
@@ -179,57 +179,57 @@ void KMMainView::initActions()
 	iconlst << "view_icon" << "view_detailed" << "view_tree";
 	vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst);
 	vact->setCurrentItem(0);
-	connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int)));
+	connect(vact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeView(int)));
 
 	TDEActionMenu	*stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
-	stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
+	stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_start"));
+	stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_stop"));
 
 	stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change");
 	stateAct->setDelayed(false);
-	stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
-	stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
-
-	new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove");
-	new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure");
-	new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add");
-	new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
-	new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
-	new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
-	new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test");
-	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
-	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh");
+	stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_enable"));
+	stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_disable"));
+
+	new TDEAction(i18n("&Remove"),"edittrash",0,this,TQ_SLOT(slotRemove()),m_actions,"printer_remove");
+	new TDEAction(i18n("&Configure..."),"configure",0,this,TQ_SLOT(slotConfigure()),m_actions,"printer_configure");
+	new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQ_SLOT(slotAdd()),m_actions,"printer_add");
+	new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQ_SLOT(slotAddSpecial()),m_actions,"printer_add_special");
+	new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQ_SLOT(slotHardDefault()),m_actions,"printer_hard_default");
+	new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQ_SLOT(slotSoftDefault()),m_actions,"printer_soft_default");
+	new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQ_SLOT(slotTest()),m_actions,"printer_test");
+	new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQ_SLOT(slotManagerConfigure()),m_actions,"manager_configure");
+	new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQ_SLOT(slotInit()),m_actions,"view_refresh");
 
 	TDEIconSelectAction	*dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change");
 	iconlst.clear();
 	iconlst << "view_top_bottom" << "view_left_right";
 	dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst);
 	dact->setCurrentItem(0);
-	connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int)));
+	connect(dact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeDirection(int)));
 
-	new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart");
-	new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure");
-	new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
+	new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQ_SLOT(slotServerRestart()),m_actions,"server_restart");
+	new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigure()),m_actions,"server_configure");
+	new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure");
 
 	TDEToggleAction	*tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar");
 	tact->setCheckedState(i18n("Hide &Toolbar"));
-	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool)));
+	connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotToggleToolBar(bool)));
 	tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" );
 	tact->setCheckedState(i18n("Hide Me&nu Toolbar"));
-	connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) );
+	connect( tact, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggleMenuBar( bool ) ) );
 	tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos");
 	tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos"));
 	tact->setChecked(true);
-	connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool)));
+	connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowPrinterInfos(bool)));
 
 	tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter");
 	tact->setChecked(KMManager::self()->isFilterEnabled());
-	connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool)));
+	connect(tact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool)));
 
 	TDEActionMenu	*mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool");
 	mact->setDelayed(false);
-	connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int)));
+	connect(mact->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotToolSelected(int)));
 	TQStringList	files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop");
 	for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it)
 	{
@@ -493,7 +493,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p
 
 void KMMainView::slotChangePrinterState()
 {
-	TQString	opname = TQT_TQOBJECT_CONST(sender())->name();
+	TQString	opname = sender()->name();
 	if (m_current && opname.startsWith("printer_"))
 	{
 		opname = opname.mid(8);
@@ -608,13 +608,13 @@ void KMMainView::slotSoftDefault()
 
 void KMMainView::setOrientation(int o)
 {
-	int 	ID = (o == Qt::Horizontal ? 1 : 0);
+	int 	ID = (o == TQt::Horizontal ? 1 : 0);
 	((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID);
 	slotChangeDirection(ID);
 }
 
 int KMMainView::orientation() const
-{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical);  }
+{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? TQt::Horizontal : TQt::Vertical);  }
 
 void KMMainView::slotChangeDirection(int d)
 {
@@ -776,7 +776,7 @@ void KMMainView::reload()
 	loadPluginActions();
 
 	// redo the connection as the old manager object has been removed
-	connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) );
+	connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) );
 
 	// We must delay the refresh such that all objects has been
 	// correctly reloaded (otherwise, crash in KMJobViewer).
@@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID)
 		{
 			TQStringList	args;
 			args << m_current->device() << m_current->printerName();
-			KDialogBase	*dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args)));
+			KDialogBase	*dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args));
 			if (dlg)
 				dlg->exec();
 			delete dlg;
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index b35e7ef0f..9c55fe433 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -52,7 +52,7 @@ class TQMenuBar;
  */
 class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0);
 	~KMMainView();
diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp
index d311f75c3..c937d3875 100644
--- a/tdeprint/management/kmprinterview.cpp
+++ b/tdeprint/management/kmprinterview.cpp
@@ -39,12 +39,12 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name)
 	m_current = TQString();
 	m_listset = false;
 
-	connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
-	connect(m_listview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
-	connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&)));
-	connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&)));
-	connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
-	connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&)));
+	connect(m_iconview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
+	connect(m_listview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)));
+	connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&)));
+	connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&)));
+	connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&)));
+	connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&)));
 
 	setViewType(m_type);
 	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
@@ -85,7 +85,7 @@ void KMPrinterView::setViewType(ViewType t)
 		default:
 			break;
 	}
-	QString	oldcurrent = m_current;
+	TQString	oldcurrent = m_current;
 	if ( m_listset )
 		setPrinterList(KMManager::self()->printerList(false));
 	if (m_type == KMPrinterView::Tree)
diff --git a/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h
index 14354a3b5..b73bc46da 100644
--- a/tdeprint/management/kmprinterview.h
+++ b/tdeprint/management/kmprinterview.h
@@ -30,7 +30,7 @@ class TQIconViewItem;
 
 class KMPrinterView : public TQWidgetStack
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum ViewType { Icons = 0, List, Tree };
 
@@ -55,7 +55,7 @@ private:
 	KMIconView	*m_iconview;
 	KMListView	*m_listview;
 	ViewType	m_type;
-	QString		m_current;
+	TQString		m_current;
 	bool m_listset;
 };
 
diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp
index c94838098..b1a993893 100644
--- a/tdeprint/management/kmpropcontainer.cpp
+++ b/tdeprint/management/kmpropcontainer.cpp
@@ -53,9 +53,9 @@ void KMPropContainer::setWidget(KMPropWidget *w)
 	{
 		m_widget = w;
 		m_widget->reparent(this,TQPoint(0,0));
-		connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange()));
-		connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool)));
-		connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool)));
+		connect(m_button,TQ_SIGNAL(clicked()),m_widget,TQ_SLOT(slotChange()));
+		connect(m_widget,TQ_SIGNAL(enable(bool)),TQ_SIGNAL(enable(bool)));
+		connect(m_widget,TQ_SIGNAL(enableChange(bool)),TQ_SLOT(slotEnableChange(bool)));
 		TQVBoxLayout	*lay = dynamic_cast<TQVBoxLayout*>(layout());
 		if (lay)
 		{
diff --git a/tdeprint/management/kmpropcontainer.h b/tdeprint/management/kmpropcontainer.h
index d191dfeb6..eadcde1e3 100644
--- a/tdeprint/management/kmpropcontainer.h
+++ b/tdeprint/management/kmpropcontainer.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class KMPropContainer : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMPropContainer(TQWidget *parent = 0, const char *name = 0);
 	~KMPropContainer();
diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp
index 6f20494fc..7fc31d977 100644
--- a/tdeprint/management/kmpropdriver.cpp
+++ b/tdeprint/management/kmpropdriver.cpp
@@ -44,7 +44,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name)
 	main_->setRowStretch(3,1);
 	main_->addWidget(l1,0,0);
 	main_->addWidget(l2,1,0);
-	main_->addWidget(l3,2,0,Qt::AlignTop|Qt::AlignLeft);
+	main_->addWidget(l3,2,0,TQt::AlignTop|TQt::AlignLeft);
 	main_->addWidget(m_manufacturer,0,1);
 	main_->addWidget(m_model,1,1);
 	main_->addWidget(m_driverinfo,2,1);
diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp
index c38b399c6..eefa38372 100644
--- a/tdeprint/management/kmpropertypage.cpp
+++ b/tdeprint/management/kmpropertypage.cpp
@@ -55,7 +55,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w)
 		m_widgets.append(w);
 		KMPropContainer	*ctn = new KMPropContainer(this,"Container");
 		ctn->setWidget(w);
-		connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool)));
+		connect(ctn,TQ_SIGNAL(enable(bool)),TQ_SLOT(slotEnable(bool)));
 
 		TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon(
 		                                                           w->pixmap(),
diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h
index 5acee87fd..c54011d25 100644
--- a/tdeprint/management/kmpropertypage.h
+++ b/tdeprint/management/kmpropertypage.h
@@ -31,7 +31,7 @@ class KMPrinter;
 
 class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMPropertyPage(TQWidget *parent = 0, const char *name = 0);
 	~KMPropertyPage();
diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp
index 50c1a75e8..c38b4c186 100644
--- a/tdeprint/management/kmpropwidget.cpp
+++ b/tdeprint/management/kmpropwidget.cpp
@@ -34,7 +34,7 @@ KMPropWidget::KMPropWidget(TQWidget *parent, const char *name)
 	m_printer = 0;
 	m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement());
 
-	connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool)));
+	connect(this,TQ_SIGNAL(enable(bool)),this,TQ_SIGNAL(enableChange(bool)));
 }
 
 KMPropWidget::~KMPropWidget()
diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h
index 9d418066a..3c8d0050d 100644
--- a/tdeprint/management/kmpropwidget.h
+++ b/tdeprint/management/kmpropwidget.h
@@ -29,7 +29,7 @@ class KMWizard;
 
 class TDEPRINT_EXPORT KMPropWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMPropWidget(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMPropWidget();
@@ -53,9 +53,9 @@ protected:
 	virtual void configureWizard(KMWizard*);
 
 protected:
-	QString		m_pixmap;
-	QString		m_title;
-	QString		m_header;
+	TQString		m_pixmap;
+	TQString		m_title;
+	TQString		m_header;
 	KMPrinter	*m_printer;
 	bool 		m_canchange;
 };
diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp
index db6dc1486..3f2a22a75 100644
--- a/tdeprint/management/kmspecialprinterdlg.cpp
+++ b/tdeprint/management/kmspecialprinterdlg.cpp
@@ -50,7 +50,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 
 	// widget creation
 	m_name = new TQLineEdit(dummy);
-	connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & )));
+	connect(m_name, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotTextChanged(const TQString & )));
 	m_description = new TQLineEdit(dummy);
 	m_location = new TQLineEdit(dummy);
 	TQLabel	*m_namelabel = new TQLabel(i18n("&Name:"), dummy);
@@ -63,10 +63,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	KSeparator* sep = new KSeparator( KSeparator::HLine, dummy);
 
 	sep->setFixedHeight(10);
-	TQGroupBox	*m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy);
+	TQGroupBox	*m_gb = new TQGroupBox(1, TQt::Horizontal, i18n("Command &Settings"), dummy);
 	m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this);
 
-	TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy );
+	TQGroupBox *m_outfile_gb = new TQGroupBox( 0, TQt::Horizontal, i18n( "Outp&ut File" ), dummy );
 
 	m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb);
 
@@ -92,10 +92,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	m_icon->setIcon("document-print");
 	m_icon->setFixedSize(TQSize(48,48));
 
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) );
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extension, TQT_SLOT( setEnabled( bool ) ) );
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQT_SLOT( setEnabled( bool ) ) );
-	connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extensionlabel, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetype, TQ_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extension, TQ_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQ_SLOT( setEnabled( bool ) ) );
+	connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extensionlabel, TQ_SLOT( setEnabled( bool ) ) );
 	m_mimetypelabel->setEnabled( false );
 	m_mimetype->setEnabled( false );
 	m_extensionlabel->setEnabled( false );
@@ -125,10 +125,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name)
 	// layout creation
 	TQVBoxLayout	*l0 = new TQVBoxLayout(dummy, 0, 10);
 	TQGridLayout	*l1 = new TQGridLayout(0, 3, 3, 0, 5);
-	l0->addLayout(TQT_TQLAYOUT(l1));
+	l0->addLayout(l1);
 	l1->setColStretch(2,1);
 	l1->addColSpacing(0,60);
-	l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, Qt::AlignCenter);
+	l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter);
 	l1->addWidget(m_namelabel, 0, 1);
 	l1->addWidget(m_desclabel, 1, 1);
 	l1->addWidget(m_loclabel, 2, 1);
diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h
index 3d334c7fd..efa927474 100644
--- a/tdeprint/management/kmspecialprinterdlg.h
+++ b/tdeprint/management/kmspecialprinterdlg.h
@@ -31,7 +31,7 @@ class KXmlCommandSelector;
 
 class KMSpecialPrinterDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMSpecialPrinterDlg(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp
index a0b1aa78d..a8ef55ee0 100644
--- a/tdeprint/management/kmtimer.cpp
+++ b/tdeprint/management/kmtimer.cpp
@@ -37,7 +37,7 @@ KMTimer* KMTimer::self()
 KMTimer::KMTimer(TQObject *parent, const char *name)
 : TQTimer(parent, name), m_count(0)
 {
-	connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+	connect(this, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 }
 
 KMTimer::~KMTimer()
diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h
index 0c2e0169a..d64c9c091 100644
--- a/tdeprint/management/kmtimer.h
+++ b/tdeprint/management/kmtimer.h
@@ -36,7 +36,7 @@
  */
 class TDEPRINT_EXPORT KMTimer : public TQTimer
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	void delay(int t);
 	~KMTimer();
diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp
index e04467632..e7ff0faff 100644
--- a/tdeprint/management/kmwclass.cpp
+++ b/tdeprint/management/kmwclass.cpp
@@ -46,8 +46,8 @@ KMWClass::KMWClass(TQWidget *parent, const char *name)
 	TQToolButton	*remove = new TQToolButton(this);
 	add->setIconSet(BarIcon("forward"));
 	remove->setIconSet(BarIcon("back"));
-	connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd()));
-	connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove()));
+	connect(add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAdd()));
+	connect(remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemove()));
 
 	TQLabel	*l1 = new TQLabel(i18n("Available printers:"), this);
 	TQLabel	*l2 = new TQLabel(i18n("Class printers:"), this);
diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h
index a74f20117..286f930e7 100644
--- a/tdeprint/management/kmwclass.h
+++ b/tdeprint/management/kmwclass.h
@@ -26,7 +26,7 @@ class TDEListBox;
 
 class KMWClass : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWClass(TQWidget *parent = 0, const char *name = 0);
 	~KMWClass();
diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp
index cc52f1015..8d4e1e802 100644
--- a/tdeprint/management/kmwdriverselect.cpp
+++ b/tdeprint/management/kmwdriverselect.cpp
@@ -44,7 +44,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name)
 			 "you want to use. You will have the opportunity to test it as well as to "
 			 "change it if necessary.</p>"));
 	m_drivercomment = new KPushButton(i18n("Driver Information"), this);
-	connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment()));
+	connect(m_drivercomment, TQ_SIGNAL(clicked()), TQ_SLOT(slotDriverComment()));
 
 	TQVBoxLayout	*main_ = new TQVBoxLayout(this, 0, 10);
 	main_->addWidget(l1,0);
diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h
index 9c78008c1..6419232dd 100644
--- a/tdeprint/management/kmwdriverselect.h
+++ b/tdeprint/management/kmwdriverselect.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class KMWDriverSelect : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWDriverSelect(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp
index 73871988a..dcc83d661 100644
--- a/tdeprint/management/kmwdrivertest.cpp
+++ b/tdeprint/management/kmwdrivertest.cpp
@@ -65,14 +65,14 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 	TQGridLayout	*lay2 = new TQGridLayout(0, 3, 3, 0, 0);
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 10);
 	lay1->addWidget(l0,0);
-	lay1->addLayout(TQT_TQLAYOUT(lay2),0);
+	lay1->addLayout(lay2,0);
 	lay1->addLayout(lay3,0);
 	lay1->addStretch(1);
 	lay2->setColStretch(2,1);
 	lay2->addColSpacing(1,10);
 	lay2->addWidget(l1,0,0);
 	lay2->addWidget(l2,1,0);
-	lay2->addWidget(l3,2,0,Qt::AlignLeft|Qt::AlignTop);
+	lay2->addWidget(l3,2,0,TQt::AlignLeft|TQt::AlignTop);
 	lay2->addWidget(m_manufacturer,0,2);
 	lay2->addWidget(m_model,1,2);
 	lay2->addWidget(m_driverinfo,2,2);
@@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name)
 	lay3->addWidget(m_settings,0);
 	lay3->addStretch(1);
 
-	connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest()));
-	connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings()));
+	connect(m_test,TQ_SIGNAL(clicked()),TQ_SLOT(slotTest()));
+	connect(m_settings,TQ_SIGNAL(clicked()),TQ_SLOT(slotSettings()));
 }
 
 KMWDriverTest::~KMWDriverTest()
diff --git a/tdeprint/management/kmwdrivertest.h b/tdeprint/management/kmwdrivertest.h
index 5c1aefaee..4bf68f06a 100644
--- a/tdeprint/management/kmwdrivertest.h
+++ b/tdeprint/management/kmwdrivertest.h
@@ -28,7 +28,7 @@ class DrMain;
 
 class KMWDriverTest : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWDriverTest(TQWidget *parent = 0, const char *name = 0);
 	~KMWDriverTest();
diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp
index bc894c478..87f2e21f2 100644
--- a/tdeprint/management/kmwizard.cpp
+++ b/tdeprint/management/kmwizard.cpp
@@ -74,10 +74,10 @@ KMWizard::KMWizard(TQWidget *parent, const char *name)
 	KSeparator* sep2 = new KSeparator( KSeparator::HLine, this);
 	TQPushButton	*m_help = new KPushButton(KStdGuiItem::help(), this);
 
-	connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject()));
-	connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext()));
-	connect(m_prev,TQT_SIGNAL(clicked()),TQT_SLOT(slotPrev()));
-	connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()));
+	connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject()));
+	connect(m_next,TQ_SIGNAL(clicked()),TQ_SLOT(slotNext()));
+	connect(m_prev,TQ_SIGNAL(clicked()),TQ_SLOT(slotPrev()));
+	connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()));
 
 	m_side = new SidePixmap(this);
 	if (!m_side->isValid())
diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h
index 171158b37..63849c5bb 100644
--- a/tdeprint/management/kmwizard.h
+++ b/tdeprint/management/kmwizard.h
@@ -36,7 +36,7 @@ class SidePixmap;
 
 class TDEPRINT_EXPORT KMWizard : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum PageType {
 		Start   = 0,
diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h
index b02dbe9fe..f2a2565d6 100644
--- a/tdeprint/management/kmwizardpage.h
+++ b/tdeprint/management/kmwizardpage.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class TDEPRINT_EXPORT KMWizardPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWizardPage(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMWizardPage();
@@ -43,7 +43,7 @@ public:
         bool needsInitOnBack()          { return m_needsinitonback; }
 
 protected:
-	QString	m_title;
+	TQString	m_title;
 	int	m_ID;
 	int	m_nextpage;
         bool    m_needsinitonback;
diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp
index a3180000f..dce5fef41 100644
--- a/tdeprint/management/kmwlocal.cpp
+++ b/tdeprint/management/kmwlocal.cpp
@@ -50,10 +50,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name)
 	TQListViewItem	*root = new TQListViewItem(m_ports, i18n("Local System"));
 	root->setPixmap(0, SmallIcon("tdeprint_computer"));
 	root->setOpen(true);
-	connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*)));
+	connect(m_ports, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotPortSelected(TQListViewItem*)));
 	TQLabel	*l1 = new TQLabel(i18n("URI:"), this);
 	m_localuri = new TQLineEdit(this);
-	connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) );
+	connect( m_localuri, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) );
 	m_parents[0] = new TQListViewItem(root, i18n("Parallel"));
 	m_parents[1] = new TQListViewItem(root, m_parents[0], i18n("Serial"));
 	m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB"));
diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h
index e65128747..0216fae8f 100644
--- a/tdeprint/management/kmwlocal.h
+++ b/tdeprint/management/kmwlocal.h
@@ -30,7 +30,7 @@ class TQListViewItem;
 
 class KMWLocal : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWLocal(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp
index 3c4794ad1..631d4253b 100644
--- a/tdeprint/management/kmwlpd.cpp
+++ b/tdeprint/management/kmwlpd.cpp
@@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg)
 
 void KMWLpd::updatePrinter(KMPrinter *p)
 {
-	QString	dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
+	TQString	dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1));
 	p->setDevice(dev);
 }
 
@@ -81,12 +81,12 @@ bool checkLpdQueue(const char *host, const char *queue)
 
 	char	res[64] = {0};
 	snprintf(res,64,"%c%s\n",(char)4,queue);
-	if (sock.tqwriteBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
+	if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
 		return false;
 
 	char	buf[1024] = {0};
 	int	n, tot(1);
-	while ((n = sock.tqreadBlock(res, 63)) > 0)
+	while ((n = sock.readBlock(res, 63)) > 0)
 	{
 		res[n] = 0;
 		tot += n;
diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp
index e8378371a..88f8fb416 100644
--- a/tdeprint/management/kmwname.cpp
+++ b/tdeprint/management/kmwname.cpp
@@ -50,7 +50,7 @@ bool KMWName::isValid(TQString& msg)
 	}
 	else if (text(0).find(TQRegExp("\\s")) != -1)
 	{
-		QString	conv = text(0);
+		TQString	conv = text(0);
 		conv.replace(TQRegExp("\\s"), "");
 		int result = KMessageBox::warningYesNoCancel(this,
 					i18n("It is usually not a good idea to include spaces "
diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp
index 3cd71aadd..f7340b71b 100644
--- a/tdeprint/management/kmwpassword.cpp
+++ b/tdeprint/management/kmwpassword.cpp
@@ -63,8 +63,8 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
 
 	m_login->setEnabled(false);
 	m_password->setEnabled(false);
-	connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool)));
-	connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool)));
+	connect(btn3,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setEnabled(bool)));
+	connect(btn3,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setEnabled(bool)));
 
 	// layout
 	TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 );
@@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name)
 	main_->addSpacing( 10 );
 	main_->addWidget( m_btngroup );
 	TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 );
-	main_->addLayout( TQT_TQLAYOUT(l1) );
+	main_->addLayout( l1 );
 	main_->addStretch( 1 );
 	l1->setColSpacing( 0, 35 );
 	l1->setColStretch( 2, 1 );
diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp
index 44b2f493c..94bffc2b8 100644
--- a/tdeprint/management/kmwsmb.cpp
+++ b/tdeprint/management/kmwsmb.cpp
@@ -51,7 +51,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
 	TQVBoxLayout	*lay0 = new TQVBoxLayout(this, 0, 10);
 	TQGridLayout	*lay1 = new TQGridLayout(0, 3, 2, 0, 10);
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(0, 0, 10);
-	lay0->addLayout(TQT_TQLAYOUT(lay1),0);
+	lay0->addLayout(lay1,0);
 	lay0->addWidget(m_view,1);
 	lay0->addLayout(lay3,0);
 	lay0->addSpacing(10);
@@ -67,10 +67,10 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name)
 	lay3->addWidget(m_scan);
 	lay3->addWidget(m_abort);
 
-	connect(m_scan,TQT_SIGNAL(clicked()),TQT_SLOT(slotScan()));
-	connect(m_abort,TQT_SIGNAL(clicked()),TQT_SLOT(slotAbort()));
-	connect(m_view,TQT_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&)));
-	connect(m_view,TQT_SIGNAL(running(bool)),m_abort,TQT_SLOT(setEnabled(bool)));
+	connect(m_scan,TQ_SIGNAL(clicked()),TQ_SLOT(slotScan()));
+	connect(m_abort,TQ_SIGNAL(clicked()),TQ_SLOT(slotAbort()));
+	connect(m_view,TQ_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&)));
+	connect(m_view,TQ_SIGNAL(running(bool)),m_abort,TQ_SLOT(setEnabled(bool)));
 }
 
 bool KMWSmb::isValid(TQString& msg)
diff --git a/tdeprint/management/kmwsmb.h b/tdeprint/management/kmwsmb.h
index 695379a79..e8c5361ec 100644
--- a/tdeprint/management/kmwsmb.h
+++ b/tdeprint/management/kmwsmb.h
@@ -28,7 +28,7 @@ class TQLabel;
 
 class KMWSmb : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWSmb(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp
index a3fb71b3d..6692d8785 100644
--- a/tdeprint/management/kmwsocket.cpp
+++ b/tdeprint/management/kmwsocket.cpp
@@ -60,11 +60,11 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name)
 	KSeparator* sep = new KSeparator( KSeparator::HLine, this);
 	sep->setFixedHeight(40);
 
-	connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) );
-	connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) );
-	connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) );
+	connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*)));
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) );
+	connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) );
+	connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) );
 
 	// layout
 	TQHBoxLayout	*lay3 = new TQHBoxLayout(this, 0, 10);
diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h
index 7489d6ec7..b765c594d 100644
--- a/tdeprint/management/kmwsocket.h
+++ b/tdeprint/management/kmwsocket.h
@@ -29,7 +29,7 @@ class NetworkScanner;
 
 class KMWSocket : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWSocket(TQWidget *parent = 0, const char *name = 0);
 	~KMWSocket();
diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp
index 02b0a6b69..27c7bba47 100644
--- a/tdeprint/management/kmwsocketutil.cpp
+++ b/tdeprint/management/kmwsocketutil.cpp
@@ -58,7 +58,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na
 	mm->setFixedWidth(fontMetrics().width(mm->text())+10);
 
 	mask_ = new TQLineEdit(dummy);
-	mask_->setAlignment(Qt::AlignRight);
+	mask_->setAlignment(TQt::AlignRight);
 	port_ = new TQComboBox(true,dummy);
         if ( port_->lineEdit() )
             port_->lineEdit()->setValidator( val );
diff --git a/tdeprint/management/kmwsocketutil.h b/tdeprint/management/kmwsocketutil.h
index dfb9f490e..a0194e5c9 100644
--- a/tdeprint/management/kmwsocketutil.h
+++ b/tdeprint/management/kmwsocketutil.h
@@ -26,8 +26,8 @@
 
 struct SocketInfo
 {
-	QString	IP;
-	QString	Name;
+	TQString	IP;
+	TQString	Name;
 	int	Port;
 };
 
@@ -39,7 +39,7 @@ class KMWSocketUtil;
 class SocketConfig : public KDialogBase
 {
 	friend class KMWSocketUtil;
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SocketConfig(KMWSocketUtil *util, TQWidget *parent = 0, const char *name = 0);
 	~SocketConfig();
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 1fe9a51f2..1b0ecb183 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -125,7 +125,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	m_commandlab->setBuddy(m_command);
 	m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy );
 
-	TQGroupBox	*gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy);
+	TQGroupBox	*gb = new TQGroupBox(0, TQt::Horizontal, i18n("Va&lues"), m_dummy);
 	m_stack = new TQWidgetStack(gb);
 	TQWidget	*w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack);
 	m_stack->addWidget(w1, 1);
@@ -159,8 +159,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 
 	KSeparator	*sep1 = new KSeparator(KSeparator::HLine, m_dummy);
 
-	TQGroupBox	*gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this);
-	TQGroupBox	*gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this);
+	TQGroupBox	*gb_input = new TQGroupBox(0, TQt::Horizontal, i18n("&Input From"), this);
+	TQGroupBox	*gb_output = new TQGroupBox(0, TQt::Horizontal, i18n("O&utput To"), this);
 	TQLabel	*m_inputfilelab = new TQLabel(i18n("File:"), gb_input);
 	TQLabel	*m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input);
 	TQLabel	*m_outputfilelab = new TQLabel(i18n("File:"), gb_output);
@@ -184,7 +184,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	TQHBoxLayout	*l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	TQGridLayout	*l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint());
 	l2->addLayout(l0, 1);
-	l0->addLayout(TQT_TQLAYOUT(l10));
+	l0->addLayout(l10);
 	l10->addMultiCellWidget(m_view, 0, 0, 0, 1);
 	l10->addWidget(gb_input, 1, 0);
 	l10->addWidget(gb_output, 1, 1);
@@ -201,16 +201,16 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l7->addStretch(1);
 	l0->addWidget(m_dummy, 1);
 	TQGridLayout	*l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint());
-	l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter);
+	l1->addWidget(m_desclab, 0, 0, TQt::AlignRight|TQt::AlignVCenter);
 	l1->addWidget(m_desc, 0, 1);
 	l1->addMultiCellWidget(sep1, 1, 1, 0, 1);
-	l1->addWidget(m_namelab, 2, 0, Qt::AlignRight|Qt::AlignVCenter);
+	l1->addWidget(m_namelab, 2, 0, TQt::AlignRight|TQt::AlignVCenter);
 	l1->addWidget(m_name, 2, 1);
-	l1->addWidget(m_typelab, 3, 0, Qt::AlignRight|Qt::AlignVCenter);
+	l1->addWidget(m_typelab, 3, 0, TQt::AlignRight|TQt::AlignVCenter);
 	l1->addWidget(m_type, 3, 1);
-	l1->addWidget(m_formatlab, 4, 0, Qt::AlignRight|Qt::AlignVCenter);
+	l1->addWidget(m_formatlab, 4, 0, TQt::AlignRight|TQt::AlignVCenter);
 	l1->addWidget(m_format, 4, 1);
-	l1->addWidget(m_defaultlab, 5, 0, Qt::AlignRight|Qt::AlignVCenter);
+	l1->addWidget(m_defaultlab, 5, 0, TQt::AlignRight|TQt::AlignVCenter);
 	l1->addWidget(m_default, 5, 1);
 	l1->addWidget( m_persistent, 6, 1 );
 	l1->addMultiCellWidget(gb, 7, 7, 0, 1);
@@ -225,8 +225,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l6->addStretch(1);
 	TQGridLayout	*l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint());
 	l5->setRowStretch(2, 1);
-	l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter);
-	l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter);
+	l5->addWidget(m_editlab1, 0, 0, TQt::AlignRight|TQt::AlignVCenter);
+	l5->addWidget(m_editlab2, 1, 0, TQt::AlignRight|TQt::AlignVCenter);
 	l5->addWidget(m_edit1, 0, 1);
 	l5->addWidget(m_edit2, 1, 1);
 
@@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l9->addWidget(m_outputfile, 0, 1);
 	l9->addWidget(m_outputpipe, 1, 1);
 
-	TQVBoxLayout	*l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()));
+	TQVBoxLayout	*l11 = new TQVBoxLayout(gb->layout());
 	l11->addWidget(m_stack);
 
 	TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 );
@@ -252,29 +252,29 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	l12->addWidget( m_commentlab );
 	l12->addWidget( m_comment );
 
-	connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
-	connect(m_values, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotValueSelected(TQListViewItem*)));
-	connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int)));
-	connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddValue()));
-	connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveValue()));
-	connect(m_apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyChanges()));
-	connect(m_addgrp, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup()));
-	connect(m_addopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddOption()));
-	connect(m_delopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveItem()));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown()));
-	connect(m_command, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCommandChanged(const TQString&)));
-	connect(m_view, TQT_SIGNAL(itemRenamed(TQListViewItem*,int)), TQT_SLOT(slotOptionRenamed(TQListViewItem*,int)));
-	connect(m_desc, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_format, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_default, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_edit1, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_edit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged()));
-	connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged()));
-	connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
-	connect( m_persistent, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) );
+	connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
+	connect(m_values, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotValueSelected(TQListViewItem*)));
+	connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int)));
+	connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddValue()));
+	connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveValue()));
+	connect(m_apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyChanges()));
+	connect(m_addgrp, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup()));
+	connect(m_addopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddOption()));
+	connect(m_delopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveItem()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown()));
+	connect(m_command, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCommandChanged(const TQString&)));
+	connect(m_view, TQ_SIGNAL(itemRenamed(TQListViewItem*,int)), TQ_SLOT(slotOptionRenamed(TQListViewItem*,int)));
+	connect(m_desc, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_format, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_default, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_edit1, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_edit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged()));
+	connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged()));
+	connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged()));
+	connect( m_persistent, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) );
 	m_dummy->setEnabled(false);
 	viewItem(0);
 
@@ -836,8 +836,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	TQWidget	*dummy = new TQWidget(this, "TopDetail");
 	TQWidget	*topmain = new TQWidget(this, "TopMain");
 
-	TQGroupBox	*m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy);
-	TQGroupBox	*m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain);
+	TQGroupBox	*m_gb1 = new TQGroupBox(0, TQt::Horizontal, i18n("Supported &Input Formats"), dummy);
+	TQGroupBox	*m_gb2 = new TQGroupBox(0, TQt::Horizontal, i18n("Requirements"), topmain);
 
 	m_description = new TQLineEdit(topmain);
 	m_idname = new TQLabel(topmain);
@@ -877,7 +877,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 
 	TQVBoxLayout	*l0 = new TQVBoxLayout(topmain, 0, 10);
 	TQGridLayout	*l5 = new TQGridLayout(0, 2, 2, 0, 5);
-	l0->addLayout(TQT_TQLAYOUT(l5));
+	l0->addLayout(l5);
 	l5->addWidget(m_idnamelab, 0, 0);
 	l5->addWidget(m_idname, 0, 1);
 	l5->addWidget(m_desclab, 1, 0);
@@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	l6->addWidget(m_mimetypelab, 0);
 	l6->addWidget(m_mimetype, 1);
 	l7->addWidget(m_gb1);
-	TQGridLayout	*l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10);
+	TQGridLayout	*l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10);
 	l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2);
 	l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0);
 	l2->addWidget(m_addmime, 1, 1);
 	l2->addWidget(m_removemime, 2, 1);
 	l2->setRowStretch(0, 1);
 	l2->setRowStretch(3, 1);
-	TQHBoxLayout	*l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10);
+	TQHBoxLayout	*l4 = new TQHBoxLayout(m_gb2->layout(), 10);
 	l4->addWidget(m_requirements);
 	TQVBoxLayout	*l8 = new TQVBoxLayout(0, 0, 0);
 	l4->addLayout(l8);
@@ -910,14 +910,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name)
 	l8->addWidget(m_removereq);
 	l8->addStretch(1);
 
-	connect(m_addmime, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddMime()));
-	connect(m_removemime, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveMime()));
-	connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand()));
-	connect(m_requirements, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReqSelected(TQListViewItem*)));
-	connect(m_availablemime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotAvailableSelected(TQListBoxItem*)));
-	connect(m_selectedmime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotSelectedSelected(TQListBoxItem*)));
-	connect(m_addreq, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddReq()));
-	connect(m_removereq, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveReq()));
+	connect(m_addmime, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddMime()));
+	connect(m_removemime, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveMime()));
+	connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand()));
+	connect(m_requirements, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReqSelected(TQListViewItem*)));
+	connect(m_availablemime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotAvailableSelected(TQListBoxItem*)));
+	connect(m_selectedmime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotSelectedSelected(TQListBoxItem*)));
+	connect(m_addreq, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddReq()));
+	connect(m_removereq, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveReq()));
 
 	KMimeType::List	list = KMimeType::allMimeTypes();
 	for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it)
diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h
index d69c19e62..d4c574514 100644
--- a/tdeprint/management/kxmlcommanddlg.h
+++ b/tdeprint/management/kxmlcommanddlg.h
@@ -42,7 +42,7 @@ class KXmlCommand;
 
 class KXmlCommandAdvancedDlg : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KXmlCommandAdvancedDlg(TQWidget *parent = 0, const char *name = 0);
 	~KXmlCommandAdvancedDlg();
@@ -93,7 +93,7 @@ private:
 
 class KXmlCommandDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KXmlCommandDlg(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp
index 95f2b94a7..71ae148c3 100644
--- a/tdeprint/management/kxmlcommandselector.cpp
+++ b/tdeprint/management/kxmlcommandselector.cpp
@@ -44,19 +44,19 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 : TQWidget(parent, name)
 {
 	m_cmd = new TQComboBox(this);
-	connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int)));
+	connect(m_cmd, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCommandSelected(int)));
 	TQPushButton	*m_add = new KPushButton(this);
 	TQPushButton	*m_edit = new KPushButton(this);
 	m_add->setPixmap(SmallIcon("document-new"));
 	m_edit->setPixmap(SmallIcon("configure"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand()));
-	connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddCommand()));
+	connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand()));
 	TQToolTip::add(m_add, i18n("New command"));
 	TQToolTip::add(m_edit, i18n("Edit command"));
 	m_shortinfo = new TQLabel(this);
 	m_helpbtn = new KPushButton( this );
 	m_helpbtn->setIconSet( SmallIconSet( "help" ) );
-	connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) );
+	connect( m_helpbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHelpCommand() ) );
 	TQToolTip::add( m_helpbtn, i18n( "Information" ) );
         m_helpbtn->setEnabled( false );
 
@@ -71,14 +71,14 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 		m_line = new TQLineEdit(this);
 		m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this);
 		m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this);
-		connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse()));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_browse, TQT_SLOT(setDisabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_cmd, TQT_SLOT(setEnabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_add, TQT_SLOT(setEnabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_edit, TQT_SLOT(setEnabled(bool)));
-		connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_shortinfo, TQT_SLOT(setEnabled(bool)));
-		connect( m_usefilter, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotXmlCommandToggled( bool ) ) );
+		connect(m_browse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse()));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_line, TQ_SLOT(setDisabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_browse, TQ_SLOT(setDisabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_cmd, TQ_SLOT(setEnabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_add, TQ_SLOT(setEnabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_edit, TQ_SLOT(setEnabled(bool)));
+		connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_shortinfo, TQ_SLOT(setEnabled(bool)));
+		connect( m_usefilter, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotXmlCommandToggled( bool ) ) );
 		m_usefilter->setChecked(true);
 		m_usefilter->setChecked(false);
 		//setFocusProxy(m_line);
@@ -91,7 +91,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 		l1->addWidget(m_line);
 		l1->addWidget(m_browse);
 
-		KSeparator	*sep = new KSeparator(Qt::Horizontal, this);
+		KSeparator	*sep = new KSeparator(TQt::Horizontal, this);
 		l0->addWidget(sep);
 	}
 	else
@@ -99,7 +99,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 
 	TQGridLayout	*l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5);
 	int	c(0);
-	l0->addLayout(TQT_TQLAYOUT(l2));
+	l0->addLayout(l2);
 	if (m_usefilter)
 	{
 		l2->addWidget(m_usefilter, 0, c++);
@@ -115,7 +115,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const
 	l3->addWidget(m_edit);
 
 	if ( dlg )
-		connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) );
+		connect( this, TQ_SIGNAL( commandValid( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) );
 
 	loadCommands();
 }
diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h
index 5b2d109ea..40b8f4bd3 100644
--- a/tdeprint/management/kxmlcommandselector.h
+++ b/tdeprint/management/kxmlcommandselector.h
@@ -34,7 +34,7 @@ class KDialogBase;
 
 class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KXmlCommandSelector(bool canBeNull = true, TQWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0);
 
diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp
index ec859dc63..f9d7e585f 100644
--- a/tdeprint/management/networkscanner.cpp
+++ b/tdeprint/management/networkscanner.cpp
@@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name )
 	d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this );
 	d->timer = new TQTimer( this );
 #ifdef USE_QSOCKET
-	d->socket = new TQSocket( TQT_TQOBJECT(this) );
+	d->socket = new TQSocket( this );
 #else
 	d->socket = new KExtendedSocket();
 #endif
@@ -118,15 +118,15 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name )
 	l0->addWidget( d->settings, 3, 0 );
 	l0->addWidget( d->scan, 3, 1 );
 
-	connect( d->timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
-	connect( d->settings, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSettingsClicked() ) );
-	connect( d->scan, TQT_SIGNAL( clicked() ), TQT_SLOT( slotScanClicked() ) );
+	connect( d->timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
+	connect( d->settings, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSettingsClicked() ) );
+	connect( d->scan, TQ_SIGNAL( clicked() ), TQ_SLOT( slotScanClicked() ) );
 #ifdef USE_QSOCKET
-	connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) );
-	connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) );
+	connect( d->socket, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnectionSuccess() ) );
+	connect( d->socket, TQ_SIGNAL( error( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) );
 #else
-	connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) );
-	connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) );
+	connect( d->socket, TQ_SIGNAL( connectionSuccess() ), TQ_SLOT( slotConnectionSuccess() ) );
+	connect( d->socket, TQ_SIGNAL( connectionFailed( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) );
 #endif
 }
 
@@ -219,7 +219,7 @@ void NetworkScanner::next()
 	else
 	{
 		d->bar->setProgress( d->currentaddress );
-		TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( slotNext() ) );
 	}
 }
 
@@ -344,7 +344,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *
 	mm->setFixedWidth(fontMetrics().width(mm->text())+10);
 
 	mask_ = new TQLineEdit(dummy);
-	mask_->setAlignment(Qt::AlignRight);
+	mask_->setAlignment(TQt::AlignRight);
 	port_ = new TQComboBox(true,dummy);
         if ( port_->lineEdit() )
             port_->lineEdit()->setValidator( val );
diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h
index 80a017676..7218472a5 100644
--- a/tdeprint/management/networkscanner.h
+++ b/tdeprint/management/networkscanner.h
@@ -27,7 +27,7 @@
 
 class TDEPRINT_EXPORT NetworkScanner : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NetworkScanner( int port = 9100, TQWidget *parent = 0, const char *name = 0 );
@@ -77,7 +77,7 @@ class TQComboBox;
 
 class NetworkScannerConfig : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NetworkScannerConfig(NetworkScanner *scanner, const char *name = 0);
diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp
index 377a28217..3a19b6262 100644
--- a/tdeprint/management/pluginaction.cpp
+++ b/tdeprint/management/pluginaction.cpp
@@ -23,7 +23,7 @@
 PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name)
 : TDEAction(txt, icon, accel, parent, name), m_id(ID)
 {
-	connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated()));
+	connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActivated()));
 }
 
 void PluginAction::slotActivated()
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index 0f87460fd..d8aa98ca6 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -24,7 +24,7 @@
 
 class TDEPRINT_EXPORT PluginAction : public TDEAction
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp
index f5977bfb0..0363c6338 100644
--- a/tdeprint/management/smbview.cpp
+++ b/tdeprint/management/smbview.cpp
@@ -52,9 +52,9 @@ SmbView::SmbView(TQWidget *parent, const char *name)
 	m_proc = new TDEProcess();
 	m_proc->setUseShell(true);
 	m_passwdFile = 0;
-	connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*)));
-	connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
+	connect(m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*)));
+	connect(m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 }
 
 SmbView::~SmbView()
diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h
index 51193254e..7eb7623cb 100644
--- a/tdeprint/management/smbview.h
+++ b/tdeprint/management/smbview.h
@@ -27,7 +27,7 @@ class KTempFile;
 
 class SmbView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SmbView(TQWidget *parent = 0, const char *name = 0);
 	~SmbView();
diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp
index 45f70b7f1..20fa3574b 100644
--- a/tdeprint/marginpreview.cpp
+++ b/tdeprint/marginpreview.cpp
@@ -37,16 +37,16 @@
 static void draw3DPage(TQPainter *p, TQRect r)
 {
 	// draw white page
-	p->fillRect(r,Qt::white);
+	p->fillRect(r,TQt::white);
 	// draw 3D border
-	p->setPen(Qt::black);
+	p->setPen(TQt::black);
 	p->moveTo(r.left(),r.bottom());
 	p->lineTo(r.right(),r.bottom());
 	p->lineTo(r.right(),r.top());
-	p->setPen(Qt::darkGray);
+	p->setPen(TQt::darkGray);
 	p->lineTo(r.left(),r.top());
 	p->lineTo(r.left(),r.bottom());
-	p->setPen(Qt::gray);
+	p->setPen(TQt::gray);
 	p->moveTo(r.left()+1,r.bottom()-1);
 	p->lineTo(r.right()-1,r.bottom()-1);
 	p->lineTo(r.right()-1,r.top()+1);
@@ -189,7 +189,7 @@ void MarginPreview::mouseMoveEvent(TQMouseEvent *e)
 	if (nopreview_ || state_ == Fixed)
 		return;
 	int	pos = locateMouse(e->pos());
-	if (state_ == None && e->button() == Qt::NoButton)
+	if (state_ == None && e->button() == TQt::NoButton)
 	{
 		switch (pos)
 		{
@@ -262,7 +262,7 @@ void MarginPreview::drawTempLine(TQPainter *p)
 
 void MarginPreview::mousePressEvent(TQMouseEvent *e)
 {
-	if (e->button() != Qt::LeftButton || state_ != None)
+	if (e->button() != TQt::LeftButton || state_ != None)
 		return;
 	int	mpos = locateMouse(e->pos());
 	if (mpos)
diff --git a/tdeprint/marginpreview.h b/tdeprint/marginpreview.h
index e0ed3e775..6c01bde73 100644
--- a/tdeprint/marginpreview.h
+++ b/tdeprint/marginpreview.h
@@ -24,7 +24,7 @@
 
 class MarginPreview : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MarginPreview(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/marginvaluewidget.cpp b/tdeprint/marginvaluewidget.cpp
index e4f1365c6..fc43b8bef 100644
--- a/tdeprint/marginvaluewidget.cpp
+++ b/tdeprint/marginvaluewidget.cpp
@@ -31,7 +31,7 @@ MarginValueWidget::MarginValueWidget(KNumInput *below, double value, TQWidget *p
 	m_margin = ( float )value;
 	setMode(m_mode);
 	setRange(0, 999, 1, false);
-	connect(this, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotValueChanged(double)));
+	connect(this, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotValueChanged(double)));
 }
 
 float MarginValueWidget::margin()
diff --git a/tdeprint/marginvaluewidget.h b/tdeprint/marginvaluewidget.h
index 97f1409c1..1e9266d0e 100644
--- a/tdeprint/marginvaluewidget.h
+++ b/tdeprint/marginvaluewidget.h
@@ -24,7 +24,7 @@
 
 class MarginValueWidget : public KDoubleNumInput
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum Mode { Pixels = 0, IN, CM, MM };
 	MarginValueWidget(KNumInput *below, double value = 18.0, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp
index c483be123..d46cd8e2f 100644
--- a/tdeprint/marginwidget.cpp
+++ b/tdeprint/marginwidget.cpp
@@ -155,10 +155,10 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU
 	  TQWhatsThis::add(m_left, whatsThisLeftMarginWidget);
 	m_right = new MarginValueWidget(m_left, 0.0, this);
 	  TQWhatsThis::add(m_right, whatsThisRightMarginWidget);
-	m_top->setLabel(i18n("&Top:"), Qt::AlignLeft|Qt::AlignVCenter);
-	m_bottom->setLabel(i18n("&Bottom:"), Qt::AlignLeft|Qt::AlignVCenter);
-	m_left->setLabel(i18n("Le&ft:"), Qt::AlignLeft|Qt::AlignVCenter);
-	m_right->setLabel(i18n("&Right:"), Qt::AlignLeft|Qt::AlignVCenter);
+	m_top->setLabel(i18n("&Top:"), TQt::AlignLeft|TQt::AlignVCenter);
+	m_bottom->setLabel(i18n("&Bottom:"), TQt::AlignLeft|TQt::AlignVCenter);
+	m_left->setLabel(i18n("Le&ft:"), TQt::AlignLeft|TQt::AlignVCenter);
+	m_right->setLabel(i18n("&Right:"), TQt::AlignLeft|TQt::AlignVCenter);
 	m_units = new TQComboBox(this);
 	  TQWhatsThis::add(m_units, whatsThisMeasurementUnitMarginWidget);
 	m_units->insertItem(i18n("Pixels (1/72nd in)"));
@@ -169,25 +169,25 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU
 		m_units->insertItem( i18n( "Millimeters (mm)" ) );
 	}
 	m_units->setCurrentItem(0);
-	connect(m_units, TQT_SIGNAL(activated(int)), m_top, TQT_SLOT(setMode(int)));
-	connect(m_units, TQT_SIGNAL(activated(int)), m_bottom, TQT_SLOT(setMode(int)));
-	connect(m_units, TQT_SIGNAL(activated(int)), m_left, TQT_SLOT(setMode(int)));
-	connect(m_units, TQT_SIGNAL(activated(int)), m_right, TQT_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_top, TQ_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_bottom, TQ_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_left, TQ_SLOT(setMode(int)));
+	connect(m_units, TQ_SIGNAL(activated(int)), m_right, TQ_SLOT(setMode(int)));
 	m_preview = new MarginPreview(this);
 	  TQWhatsThis::add(m_preview, whatsThisDragAndPreviewMarginWidget);
 	m_preview->setMinimumSize(60, 80);
 	m_preview->setPageSize(m_pagesize[ 0 ], m_pagesize[ 1 ]);
-	connect(m_preview, TQT_SIGNAL(marginChanged(int,float)), TQT_SLOT(slotMarginPreviewChanged(int,float)));
-	connect(m_top, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
-	connect(m_bottom, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
-	connect(m_left, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
-	connect(m_right, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged()));
+	connect(m_preview, TQ_SIGNAL(marginChanged(int,float)), TQ_SLOT(slotMarginPreviewChanged(int,float)));
+	connect(m_top, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
+	connect(m_bottom, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
+	connect(m_left, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
+	connect(m_right, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged()));
 	slotMarginValueChanged();
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), m_top, TQT_SLOT(setEnabled(bool)));
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), m_left, TQT_SLOT(setEnabled(bool)));
-	//connect(m_custom, TQT_SIGNAL(toggled(bool)), m_units, TQT_SLOT(setEnabled(bool)));
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCustomMarginsToggled(bool)));
-	connect(m_custom, TQT_SIGNAL(toggled(bool)), m_preview, TQT_SLOT(enableRubberBand(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), m_top, TQ_SLOT(setEnabled(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), m_left, TQ_SLOT(setEnabled(bool)));
+	//connect(m_custom, TQ_SIGNAL(toggled(bool)), m_units, TQ_SLOT(setEnabled(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCustomMarginsToggled(bool)));
+	connect(m_custom, TQ_SIGNAL(toggled(bool)), m_preview, TQ_SLOT(enableRubberBand(bool)));
 	m_top->setEnabled(false);
 	m_bottom->setEnabled(false);
 	m_left->setEnabled(false);
@@ -237,8 +237,8 @@ void MarginWidget::setSymetricMargins(bool on)
 	m_right->setEnabled(on && m_custom->isChecked());
 	if (on)
 	{
-		connect(m_top, TQT_SIGNAL(marginChanged(float)), m_bottom, TQT_SLOT(setMargin(float)));
-		connect(m_left, TQT_SIGNAL(marginChanged(float)), m_right, TQT_SLOT(setMargin(float)));
+		connect(m_top, TQ_SIGNAL(marginChanged(float)), m_bottom, TQ_SLOT(setMargin(float)));
+		connect(m_left, TQ_SIGNAL(marginChanged(float)), m_right, TQ_SLOT(setMargin(float)));
 		m_bottom->setMargin(m_top->margin());
 		m_right->setMargin(m_left->margin());
 	}
diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h
index 0668beeb2..89e2e1af4 100644
--- a/tdeprint/marginwidget.h
+++ b/tdeprint/marginwidget.h
@@ -32,7 +32,7 @@ class TQComboBox;
 
 class TDEPRINT_EXPORT MarginWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	MarginWidget(TQWidget *parent = 0, const char *name = 0, bool allowMetricUnit = true);
 	~MarginWidget();
diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp
index 7f642896e..ba3d69c8b 100644
--- a/tdeprint/messagewindow.cpp
+++ b/tdeprint/messagewindow.cpp
@@ -50,7 +50,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent,
 	if ( delay == 0 )
 		slotTimer();
 	else
-		TQTimer::singleShot( delay, this, TQT_SLOT( slotTimer() ) );
+		TQTimer::singleShot( delay, this, TQ_SLOT( slotTimer() ) );
 }
 
 MessageWindow::~MessageWindow()
diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h
index 26de652db..7c64c0c5c 100644
--- a/tdeprint/messagewindow.h
+++ b/tdeprint/messagewindow.h
@@ -29,7 +29,7 @@ class TQLabel;
 
 class TDEPRINT_EXPORT MessageWindow : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	~MessageWindow();
diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp
index b2a686f6e..22383ff98 100644
--- a/tdeprint/plugincombobox.cpp
+++ b/tdeprint/plugincombobox.cpp
@@ -63,7 +63,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name)
 		m_pluginlist.append((*it).name);
 	}
 
-	connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+	connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
 	configChanged();
 }
 
diff --git a/tdeprint/plugincombobox.h b/tdeprint/plugincombobox.h
index fc217667b..247a20b53 100644
--- a/tdeprint/plugincombobox.h
+++ b/tdeprint/plugincombobox.h
@@ -30,7 +30,7 @@ class TQLabel;
 
 class TDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PluginComboBox(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp
index 80f9b1f81..2f7109477 100644
--- a/tdeprint/posterpreview.cpp
+++ b/tdeprint/posterpreview.cpp
@@ -54,8 +54,8 @@ PosterPreview::~PosterPreview()
 void PosterPreview::init()
 {
 	m_process = new TDEProcess;
-	connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) );
-	connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
+	connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) );
+	connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
 
 	m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0;
 	m_dirty = false;
@@ -83,7 +83,7 @@ void PosterPreview::setDirty()
 	if ( !m_dirty )
 	{
 		m_dirty = true;
-		TQTimer::singleShot( 1, this, TQT_SLOT( updatePoster() ) );
+		TQTimer::singleShot( 1, this, TQ_SLOT( updatePoster() ) );
 	}
 }
 
@@ -144,9 +144,9 @@ void PosterPreview::drawContents( TQPainter *painter )
 					if ( pw > 0 && ph > 0 )
 						p->fillRect( x+m_mw+px, y+m_mh+py, TQMIN( pw, m_pw-2*m_mw-px ), TQMIN( ph, m_ph-2*m_mh-py ),
 								( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) );
-					p->setPen( Qt::DotLine );
+					p->setPen( TQt::DotLine );
 					p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh );
-					p->setPen( Qt::SolidLine );
+					p->setPen( TQt::SolidLine );
 
 					pw -= m_pw-2*m_mw-px;
 					px = 0;
@@ -177,7 +177,7 @@ void PosterPreview::mouseMoveEvent( TQMouseEvent *e )
 
 void PosterPreview::mousePressEvent( TQMouseEvent *e )
 {
-	if ( e->button() == Qt::LeftButton && m_boundingrect.isValid() )
+	if ( e->button() == TQt::LeftButton && m_boundingrect.isValid() )
 	{
 		if ( m_boundingrect.contains( e->pos() ) )
 		{
diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h
index d9a23cb59..e5970dc9f 100644
--- a/tdeprint/posterpreview.h
+++ b/tdeprint/posterpreview.h
@@ -27,7 +27,7 @@ class TDEProcess;
 
 class PosterPreview : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PosterPreview( TQWidget *parent = 0, const char *name = 0 );
 	PosterPreview( const TQString& postersize, const TQString& mediasize, TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdeprint/ppdparser.cpp b/tdeprint/ppdparser.cpp
index 30df9195d..e54fea840 100644
--- a/tdeprint/ppdparser.cpp
+++ b/tdeprint/ppdparser.cpp
@@ -578,13 +578,17 @@ while (0)
 # define YYDPRINTF(Args)			\
 do {						\
   if (yydebug)					\
+	{ \
     YYFPRINTF Args;				\
+	} \
 } while (0)
 
 # define YYDSYMPRINT(Args)			\
 do {						\
   if (yydebug)					\
+	{ \
     yysymprint Args;				\
+	} \
 } while (0)
 
 # define YYDSYMPRINTF(Title, Token, Value, Location)		\
diff --git a/tdeprint/ppdparser.y b/tdeprint/ppdparser.y
index f750d9316..99677e65f 100644
--- a/tdeprint/ppdparser.y
+++ b/tdeprint/ppdparser.y
@@ -74,7 +74,7 @@ imgarea:   IMGAREA OPTION ':' QUOTED                 { builder->putImageableArea
 	     | IMGAREA OPTION '/' TRANSLATION ':' QUOTED { builder->putImageableArea($2[0], $6[0]); }
 ;
 
-openui:   OPENUI OPTION ':' string                  { builder->openUi($2[0], QString::null, $4[0]); }
+openui:   OPENUI OPTION ':' string                  { builder->openUi($2[0], TQString::null, $4[0]); }
 	    | OPENUI OPTION '/' TRANSLATION ':' string  { builder->openUi($2[0], $4[0], $6[0]); }
 ;
 
@@ -82,7 +82,7 @@ endui:   CLOSEUI ':' string     { builder->endUi($3[0]); }
 	   | CLOSEUI string         { builder->endUi($2[0]); }
 ;
 
-opengroup:   OPENGROUP ':' string                  { builder->openGroup($3.join(" "), QString::null); }
+opengroup:   OPENGROUP ':' string                  { builder->openGroup($3.join(" "), TQString::null); }
 		   | OPENGROUP ':' string '/' TRANSLATION  { builder->openGroup($3.join(" "), $5[0]); }
 ;
 
@@ -91,15 +91,15 @@ endgroup:   CLOSEGROUP ':' string                  { builder->endGroup($3.join("
 ;
 
 constraint:   CONSTRAINT ':' KEYWORD OPTION KEYWORD OPTION { builder->putConstraint($3[0], $5[0], $4[0], $6[0]); }
-		    | CONSTRAINT ':' KEYWORD OPTION KEYWORD        { builder->putConstraint($3[0], $5[0], $4[0], QString::null); }
-			| CONSTRAINT ':' KEYWORD KEYWORD OPTION        { builder->putConstraint($3[0], $4[0], QString::null, $5[0]); }
-			| CONSTRAINT ':' KEYWORD KEYWORD               { builder->putConstraint($3[0], $4[0], QString::null, QString::null); }
+		    | CONSTRAINT ':' KEYWORD OPTION KEYWORD        { builder->putConstraint($3[0], $5[0], $4[0], TQString::null); }
+			| CONSTRAINT ':' KEYWORD KEYWORD OPTION        { builder->putConstraint($3[0], $4[0], TQString::null, $5[0]); }
+			| CONSTRAINT ':' KEYWORD KEYWORD               { builder->putConstraint($3[0], $4[0], TQString::null, TQString::null); }
 ;
 
 ppdelement:   KEYWORD ':' value                          { builder->putStatement2($1[0], $3[0]); }
-		    | KEYWORD OPTION ':' value                   { builder->putStatement($1[0], $2[0], QString::null, $4); }
+		    | KEYWORD OPTION ':' value                   { builder->putStatement($1[0], $2[0], TQString::null, $4); }
 			| KEYWORD OPTION '/' TRANSLATION ':' value   { builder->putStatement($1[0], $2[0], $4[0], $6); }
-			| KEYWORD OPTION '/' ':' value               { builder->putStatement($1[0], $2[0], QString::null, $4); }
+			| KEYWORD OPTION '/' ':' value               { builder->putStatement($1[0], $2[0], TQString::null, $4); }
 			| DEFAULT ':' string                         { builder->putDefault($1[0], $3[0]); }
 			| DEFAULT ':' string '/' TRANSLATION         { builder->putDefault($1[0], $3[0]); }
 			| openui
diff --git a/tdeprint/ppdscanner.cpp b/tdeprint/ppdscanner.cpp
index ebfea8d53..4b37737c0 100644
--- a/tdeprint/ppdscanner.cpp
+++ b/tdeprint/ppdscanner.cpp
@@ -552,10 +552,14 @@ TQIODevice *tdeprint_ppdscanner_device = NULL;
 		{ \
 			result = tdeprint_ppdscanner_device->readBlock(buf,max_size); \
 			if (result < 0) \
+			{ \
 				result = 0; \
+			} \
 		} \
 		else \
+		{ \
 			result = 0; \
+		} \
 	}
 int tdeprint_ppdscanner_lno = 0;
 
diff --git a/tdeprint/ppdscanner.l b/tdeprint/ppdscanner.l
index 168e3a535..361f94317 100644
--- a/tdeprint/ppdscanner.l
+++ b/tdeprint/ppdscanner.l
@@ -25,7 +25,7 @@
 
 #define yylval tdeprint_ppdlval
 
-QIODevice *tdeprint_ppdscanner_device = NULL;
+TQIODevice *tdeprint_ppdscanner_device = NULL;
 #define YY_INPUT(buf,result,max_size) \
 	{ \
 		if (tdeprint_ppdscanner_device) \
@@ -122,7 +122,7 @@ L        [[:alnum:]]
 
 %%
 
-void tdeprint_ppdscanner_init(QIODevice *d)
+void tdeprint_ppdscanner_init(TQIODevice *d)
 {
 	tdeprint_ppdscanner_device = d;
 	tdeprint_ppdscanner_lno = 1;
diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp
index 870da43c4..38f914faf 100644
--- a/tdeprint/rlpr/kmproxywidget.cpp
+++ b/tdeprint/rlpr/kmproxywidget.cpp
@@ -29,7 +29,7 @@
 #include <kcursor.h>
 
 KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
-: TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name)
+: TQGroupBox(0, TQt::Vertical, i18n("Proxy Settings"), parent, name)
 {
 	TQLabel	*m_hostlabel = new TQLabel(i18n("&Host:"), this);
 	TQLabel	*m_portlabel = new TQLabel(i18n("&Port:"), this);
@@ -37,12 +37,12 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name)
 	m_useproxy->setCursor(KCursor::handCursor());
 	m_proxyhost = new TQLineEdit(this);
 	m_proxyport = new TQLineEdit(this);
-	m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport)));
+	m_proxyport->setValidator(new TQIntValidator(m_proxyport));
 	m_hostlabel->setBuddy(m_proxyhost);
 	m_portlabel->setBuddy(m_proxyport);
 	
-	connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyhost,TQT_SLOT(setEnabled(bool)));
-	connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyport,TQT_SLOT(setEnabled(bool)));
+	connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyhost,TQ_SLOT(setEnabled(bool)));
+	connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyport,TQ_SLOT(setEnabled(bool)));
 	m_proxyhost->setEnabled(false);
 	m_proxyport->setEnabled(false);
 
diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp
index 056cba1f0..1cb156342 100644
--- a/tdeprint/rlpr/kmwrlpr.cpp
+++ b/tdeprint/rlpr/kmwrlpr.cpp
@@ -63,7 +63,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name)
 	TQLabel	*m_queuelabel = new TQLabel(i18n("Queue:"), this);
 	m_hostlabel->setBuddy(m_host);
 	m_queuelabel->setBuddy(m_queue);
-	connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*)));
+	connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*)));
 
 	TQHBoxLayout	*lay0 = new TQHBoxLayout(this, 0, 10);
 	TQVBoxLayout	*lay1 = new TQVBoxLayout(0, 0, 5);
diff --git a/tdeprint/rlpr/kmwrlpr.h b/tdeprint/rlpr/kmwrlpr.h
index dc375303d..916390471 100644
--- a/tdeprint/rlpr/kmwrlpr.h
+++ b/tdeprint/rlpr/kmwrlpr.h
@@ -28,7 +28,7 @@ class TQListViewItem;
 
 class KMWRlpr : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWRlpr(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp
index 4ef5ebe1e..09653930c 100644
--- a/tdeprint/rlpr/krlprprinterimpl.cpp
+++ b/tdeprint/rlpr/krlprprinterimpl.cpp
@@ -44,10 +44,10 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 	if (!rpr)
 		return false;
 
-	QString	host(rpr->option("host")), queue(rpr->option("queue"));
+	TQString	host(rpr->option("host")), queue(rpr->option("queue"));
 	if (!host.isEmpty() && !queue.isEmpty())
 	{
-		QString		exestr = TDEStandardDirs::findExe("rlpr");
+		TQString		exestr = TDEStandardDirs::findExe("rlpr");
 		if (exestr.isEmpty())
 		{
 			printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr"));
@@ -59,7 +59,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer)
 		// proxy settings
 		TDEConfig	*conf = KMFactory::self()->printConfig();
 		conf->setGroup("RLPR");
-		QString	host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
+		TQString	host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null);
 		if (!host.isEmpty())
 		{
 			cmd.append(" -X ").append(quote(host));
diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp
index 311950e02..602329f33 100644
--- a/tdeprint/tdefilelist.cpp
+++ b/tdeprint/tdefilelist.cpp
@@ -107,38 +107,38 @@ KFileList::KFileList(TQWidget *parent, const char *name)
 	m_files->setSelectionMode(TQListView::Extended);
 	m_files->header()->setStretchEnabled(true, 2);
 	TQWhatsThis::add(m_files, whatsThisFileSelectionListview);
-	connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
+	connect(m_files, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged()));
 
 	m_add = new TQToolButton(this);
 	m_add->setIconSet(SmallIconSet("document-open"));
-	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile()));
+	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFile()));
 	TQToolTip::add(m_add, i18n("Add file"));
 	TQWhatsThis::add(m_add, whatsThisAddFileButton);
 
 	m_remove = new TQToolButton(this);
 	m_remove->setIconSet(SmallIconSet("remove"));
-	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFile()));
+	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFile()));
 	TQToolTip::add(m_remove, i18n("Remove file"));
 	TQWhatsThis::add(m_remove, whatsThisRemoveFileButton);
 	m_remove->setEnabled(false);
 
 	m_open = new TQToolButton(this);
 	m_open->setIconSet(SmallIconSet("filefind"));
-	connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile()));
+	connect(m_open, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenFile()));
 	TQToolTip::add(m_open, i18n("Open file"));
 	TQWhatsThis::add(m_open, whatsThisOpenFileButton);
 	m_open->setEnabled(false);
 
 	m_up = new TQToolButton(this);
 	m_up->setIconSet(SmallIconSet("go-up"));
-	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp()));
+	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp()));
 	TQToolTip::add(m_up, i18n("Move up"));
 	TQWhatsThis::add(m_up, whatsThisMoveFileUpButton);
 	m_up->setEnabled(false);
 
 	m_down = new TQToolButton(this);
 	m_down->setIconSet(SmallIconSet("go-down"));
-	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown()));
+	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));
 	TQToolTip::add(m_down, i18n("Move down"));
 	TQWhatsThis::add(m_down, whatsThisMoveFileDownButton);
 	m_down->setEnabled(false);
diff --git a/tdeprint/tdefilelist.h b/tdeprint/tdefilelist.h
index 912abd07a..0c36657ba 100644
--- a/tdeprint/tdefilelist.h
+++ b/tdeprint/tdefilelist.h
@@ -30,7 +30,7 @@ class TQListViewItem;
 
 class KFileList : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KFileList(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KFileList();
diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp
index a1985e804..36cc935ec 100644
--- a/tdeprint/tdeprintcheck.cpp
+++ b/tdeprint/tdeprintcheck.cpp
@@ -74,7 +74,7 @@ bool KdeprintChecker::check(const TQStringList& uris)
 
 bool KdeprintChecker::checkURL(const KURL& url)
 {
-	QString	prot(url.protocol());
+	TQString	prot(url.protocol());
 	if (prot == "config")
 		return checkConfig(url);
 	else if (prot == "exec")
@@ -89,7 +89,7 @@ bool KdeprintChecker::checkURL(const KURL& url)
 bool KdeprintChecker::checkConfig(const KURL& url)
 {
 	// get the config filename (may contain a path)
-	QString	f(url.path().mid(1));
+	TQString	f(url.path().mid(1));
 	bool	state(false);
 
 	// first check for standard KDE config file
@@ -116,13 +116,13 @@ bool KdeprintChecker::checkConfig(const KURL& url)
 
 bool KdeprintChecker::checkExec(const KURL& url)
 {
-	QString	execname(url.path().mid(1));
+	TQString	execname(url.path().mid(1));
 	return !(TDEStandardDirs::findExe(execname).isEmpty());
 }
 
 bool KdeprintChecker::checkService(const KURL& url)
 {
-	QString	serv(url.path().mid(1));
+	TQString	serv(url.path().mid(1));
 	KExtendedSocket	sock;
 
 	bool	ok;
diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp
index 754f67c3c..c3e1e474c 100644
--- a/tdeprint/tdeprintd.cpp
+++ b/tdeprint/tdeprintd.cpp
@@ -78,7 +78,7 @@ StatusWindow::StatusWindow(int pid)
 	l0->addMultiCellWidget(m_label, 0, 0, 1, 2);
 	l0->addWidget(m_button, 1, 2);
 	l0->addMultiCellWidget(m_icon, 0, 1, 0, 0);
-	connect(m_button, TQT_SIGNAL(clicked()), TQT_SLOT(hide()));
+	connect(m_button, TQ_SIGNAL(clicked()), TQ_SLOT(hide()));
 	resize(200, 50);
 }
 
@@ -115,8 +115,8 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla
 	TQString	command(cmd);
 	TQRegExp re( "\\$out\\{([^}]*)\\}" );
 
-	connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*)));
-	connect(proc,TQT_SIGNAL(printError(KPrintProcess*,const TQString&)),TQT_SLOT(slotPrintError(KPrintProcess*,const TQString&)));
+	connect(proc,TQ_SIGNAL(printTerminated(KPrintProcess*)),TQ_SLOT(slotPrintTerminated(KPrintProcess*)));
+	connect(proc,TQ_SIGNAL(printError(KPrintProcess*,const TQString&)),TQ_SLOT(slotPrintError(KPrintProcess*,const TQString&)));
 	proc->setCommand( command );
 	if ( re.search( command ) != -1 )
 	{
@@ -200,7 +200,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN
 			w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")"));
 		else
 			w->setCaption(i18n("Printing Status - %1").arg(appName));
-		connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed()));
+		connect(w, TQ_SIGNAL(destroyed()), TQ_SLOT(slotClosed()));
 		w->show();
 		m_windows.insert(pid, w);
 	}
@@ -242,7 +242,7 @@ TQString KDEPrintd::requestPassword( const TQString& user, const TQString& host,
 	req->transaction = callingDcopClient()->beginTransaction();
 	m_requestsPending.append( req );
 	if ( m_requestsPending.count() == 1 )
-		TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) );
 	return "::";
 }
 
@@ -291,7 +291,7 @@ void KDEPrintd::processRequest()
 
 	m_requestsPending.remove( ( unsigned int )0 );
 	if ( m_requestsPending.count() > 0 )
-		TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) );
+		TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) );
 }
 
 void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, const TQString& host, int port )
diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h
index 4ef54b894..e8a5fe51f 100644
--- a/tdeprint/tdeprintd.h
+++ b/tdeprint/tdeprintd.h
@@ -33,7 +33,7 @@ class StatusWindow;
 
 class KDEPrintd : public KDEDModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 
 public:
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index e60aae845..8c44543d9 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -28,7 +28,7 @@ void drawColorWheel( TQPainter *p )
 {
     TQFont f( "times", 18, TQFont::Bold );
     p->setFont( f );
-    p->setPen( Qt::black );
+    p->setPen( TQt::black );
     p->setWindow( 0, 0, 500, 500 );		// defines coordinate system
 
     for ( int i=0; i<36; i++ ) {		// draws 36 rotated rectangles
@@ -83,12 +83,12 @@ void drawFonts( TQPainter *p )
 
 void drawShapes( TQPainter *p )
 {
-    TQBrush b1( Qt::blue );
-    TQBrush b2( Qt::green, Qt::Dense6Pattern );		// green 12% fill
-    TQBrush b3( Qt::NoBrush );				// void brush
-    TQBrush b4( Qt::CrossPattern );			// black cross pattern
+    TQBrush b1( TQt::blue );
+    TQBrush b2( TQt::green, TQt::Dense6Pattern );		// green 12% fill
+    TQBrush b3( TQt::NoBrush );				// void brush
+    TQBrush b4( TQt::CrossPattern );			// black cross pattern
 
-    p->setPen( Qt::red );
+    p->setPen( TQt::red );
     p->setBrush( b1 );
     p->drawRect( 10, 10, 200, 100 );
     p->setBrush( b2 );
@@ -133,7 +133,7 @@ DrawView::DrawView()
     // Create a button group to contain all buttons
     bgroup = new TQButtonGroup( this );
     bgroup->resize( 200, 200 );
-    connect( bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateIt(int)) );
+    connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) );
 
     // Calculate the size for the radio buttons
     int maxwidth = 80;
@@ -164,7 +164,7 @@ DrawView::DrawView()
     print = new TQPushButton( "Print...", bgroup );
     print->resize( 80, 30 );
     print->move( maxwidth/2 - print->width()/2, maxindex*30+20 );
-    connect( print, TQT_SIGNAL(clicked()), TQT_SLOT(printIt()) );
+    connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) );
 
     bgroup->resize( maxwidth, print->y()+print->height()+10 );
 
diff --git a/tdeprint/tests/drawdemo.h b/tdeprint/tests/drawdemo.h
index 963da64db..13f1df77a 100644
--- a/tdeprint/tests/drawdemo.h
+++ b/tdeprint/tests/drawdemo.h
@@ -8,7 +8,7 @@
 
 class DrawView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DrawView();
     ~DrawView();
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 2f172acc0..c9188c25f 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -48,26 +48,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
     browser = new TQTextBrowser( this );
     browser->mimeSourceFactory()->setFilePath( _path );
     browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-    connect( browser, TQT_SIGNAL( textChanged() ),
-	     this, TQT_SLOT( textChanged() ) );
+    connect( browser, TQ_SIGNAL( textChanged() ),
+	     this, TQ_SLOT( textChanged() ) );
 
     setCentralWidget( browser );
 
     if ( !home_.isEmpty() )
 	browser->setSource( home_ );
 
-    connect( browser, TQT_SIGNAL( highlighted( const TQString&) ),
-	     statusBar(), TQT_SLOT( message( const TQString&)) );
+    connect( browser, TQ_SIGNAL( highlighted( const TQString&) ),
+	     statusBar(), TQ_SLOT( message( const TQString&)) );
 
     resize( 640,700 );
 
     TQPopupMenu* file = new TQPopupMenu( this );
-    file->insertItem( "&New Window", this, TQT_SLOT( newWindow() ), ALT | Key_N );
-    file->insertItem( "&Open File", this, TQT_SLOT( openFile() ), ALT | Key_O );
-    file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P );
+    file->insertItem( "&New Window", this, TQ_SLOT( newWindow() ), ALT | Key_N );
+    file->insertItem( "&Open File", this, TQ_SLOT( openFile() ), ALT | Key_O );
+    file->insertItem( "&Print", this, TQ_SLOT( print() ), ALT | Key_P );
     file->insertSeparator();
-    file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q );
-    file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X );
+    file->insertItem( "&Close", this, TQ_SLOT( close() ), ALT | Key_Q );
+    file->insertItem( "E&xit", tqApp, TQ_SLOT( closeAllWindows() ), ALT | Key_X );
 
     // The same three icons are used twice each.
     TQIconSet icon_back( TQPixmap("back.xpm") );
@@ -76,33 +76,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 
     TQPopupMenu* go = new TQPopupMenu( this );
     backwardId = go->insertItem( icon_back,
-				 "&Backward", browser, TQT_SLOT( backward() ),
+				 "&Backward", browser, TQ_SLOT( backward() ),
 				 ALT | Key_Left );
     forwardId = go->insertItem( icon_forward,
-				"&Forward", browser, TQT_SLOT( forward() ),
+				"&Forward", browser, TQ_SLOT( forward() ),
 				ALT | Key_Right );
-    go->insertItem( icon_home, "&Home", browser, TQT_SLOT( home() ) );
+    go->insertItem( icon_home, "&Home", browser, TQ_SLOT( home() ) );
 
     TQPopupMenu* help = new TQPopupMenu( this );
-    help->insertItem( "&About ...", this, TQT_SLOT( about() ) );
-    help->insertItem( "About &Qt ...", this, TQT_SLOT( aboutQt() ) );
+    help->insertItem( "&About ...", this, TQ_SLOT( about() ) );
+    help->insertItem( "About &Qt ...", this, TQ_SLOT( aboutQt() ) );
 
     hist = new TQPopupMenu( this );
     TQStringList::Iterator it = history.begin();
     for ( ; it != history.end(); ++it )
 	mHistory[ hist->insertItem( *it ) ] = *it;
-    connect( hist, TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( histChosen( int ) ) );
+    connect( hist, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( histChosen( int ) ) );
 
     bookm = new TQPopupMenu( this );
-    bookm->insertItem( tr( "Add Bookmark" ), this, TQT_SLOT( addBookmark() ) );
+    bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) );
     bookm->insertSeparator();
 
     TQStringList::Iterator it2 = bookmarks.begin();
     for ( ; it2 != bookmarks.end(); ++it2 )
 	mBookmarks[ bookm->insertItem( *it2 ) ] = *it2;
-    connect( bookm, TQT_SIGNAL( activated( int ) ),
-	     this, TQT_SLOT( bookmChosen( int ) ) );
+    connect( bookm, TQ_SIGNAL( activated( int ) ),
+	     this, TQ_SLOT( bookmChosen( int ) ) );
 
     menuBar()->insertItem( tr("&File"), file );
     menuBar()->insertItem( tr("&Go"), go );
@@ -113,29 +113,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path,
 
     menuBar()->setItemEnabled( forwardId, false);
     menuBar()->setItemEnabled( backwardId, false);
-    connect( browser, TQT_SIGNAL( backwardAvailable( bool ) ),
-	     this, TQT_SLOT( setBackwardAvailable( bool ) ) );
-    connect( browser, TQT_SIGNAL( forwardAvailable( bool ) ),
-	     this, TQT_SLOT( setForwardAvailable( bool ) ) );
+    connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ),
+	     this, TQ_SLOT( setBackwardAvailable( bool ) ) );
+    connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ),
+	     this, TQ_SLOT( setForwardAvailable( bool ) ) );
 
 
     TQToolBar* toolbar = new TQToolBar( this );
     addToolBar( toolbar, "Toolbar");
     TQToolButton* button;
 
-    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQT_SLOT(backward()), toolbar );
-    connect( browser, TQT_SIGNAL( backwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) );
+    button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar );
+    connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) );
     button->setEnabled( false );
-    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQT_SLOT(forward()), toolbar );
-    connect( browser, TQT_SIGNAL( forwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) );
+    button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar );
+    connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) );
     button->setEnabled( false );
-    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQT_SLOT(home()), toolbar );
+    button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar );
 
     toolbar->addSeparator();
 
     pathCombo = new TQComboBox( true, toolbar );
-    connect( pathCombo, TQT_SIGNAL( activated( const TQString & ) ),
-	     this, TQT_SLOT( pathSelected( const TQString & ) ) );
+    connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ),
+	     this, TQ_SLOT( pathSelected( const TQString & ) ) );
     toolbar->setStretchableWidget( pathCombo );
     setRightJustification( true );
     setDockEnabled( DockLeft, false );
diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h
index 2ff3d3649..53a424d1b 100644
--- a/tdeprint/tests/helpwindow.h
+++ b/tdeprint/tests/helpwindow.h
@@ -22,7 +22,7 @@ class TQPopupMenu;
 
 class HelpWindow : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HelpWindow( const TQString& home_,  const TQString& path, TQWidget* parent = 0, const char *name=0 );
     ~HelpWindow();
diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp
index c91cd23a7..0405fafe3 100644
--- a/tdeprint/tests/main.cpp
+++ b/tdeprint/tests/main.cpp
@@ -34,8 +34,8 @@ int main( int argc, char ** argv )
     else
 	help->showMaximized();
 
-    TQObject::connect( &a, TQT_SIGNAL(lastWindowClosed()),
-                      &a, TQT_SLOT(quit()) );
+    TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()),
+                      &a, TQ_SLOT(quit()) );
 
     return a.exec();
 }
diff --git a/tdeprint/tests/richpage.cpp b/tdeprint/tests/richpage.cpp
index f12040b71..4abc71ea2 100644
--- a/tdeprint/tests/richpage.cpp
+++ b/tdeprint/tests/richpage.cpp
@@ -57,7 +57,7 @@ RichPage::~RichPage()
 
 void RichPage::setOptions(const TQMap<TQString,TQString>& opts)
 {
-	QString	value;
+	TQString	value;
 
 	value = opts["app-rich-margin"];
 	if (!value.isEmpty())
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp
index 901d509c9..8ba04447a 100644
--- a/tdeprint/tools/escputil/escpwidget.cpp
+++ b/tdeprint/tools/escputil/escpwidget.cpp
@@ -39,17 +39,17 @@ class EscpFactory : public KLibFactory
 public:
 	EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {}
 protected:
-	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList())
+	TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList())
 	{
                Q_UNUSED(className);
-		KDialogBase	*dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
+		KDialogBase	*dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close);
 		EscpWidget	*w = new EscpWidget(dlg);
 		if (args.count() > 0)
 			w->setDevice(args[0]);
 		if (args.count() > 1)
 			w->setPrinterName(args[1]);
 		dlg->setMainWidget(w);
-		return TQT_TQOBJECT(dlg);
+		return dlg;
 	}
 };
 
@@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 {
 	m_hasoutput = false;
 
-	connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
-	connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
-	connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
+	connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int)));
+	connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int)));
 
 	TQPushButton	*cleanbtn = new TQPushButton(this, "-c");
 	cleanbtn->setPixmap(DesktopIcon("application-x-executable"));
@@ -90,11 +90,11 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name)
 	m_device->setFont(f);
 	m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this);
 
-	connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
-	connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked()));
+	connect(cleanbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(nozzlebtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(alignbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(inkbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
+	connect(identbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked()));
 
 	TQLabel	*printerlab = new TQLabel(i18n("Printer:"), this);
 	printerlab->setAlignment(AlignRight|AlignVCenter);
@@ -243,7 +243,7 @@ void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len)
 
 void EscpWidget::slotButtonClicked()
 {
-	TQString	arg = TQT_TQOBJECT_CONST(sender())->name();
+	TQString	arg = sender()->name();
 	startCommand(arg);
 }
 
diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h
index 4ad284d00..21441091f 100644
--- a/tdeprint/tools/escputil/escpwidget.h
+++ b/tdeprint/tools/escputil/escpwidget.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class EscpWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	EscpWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp
index 5cee0cacc..1cbbb0c72 100644
--- a/tdeprint/treecombobox.cpp
+++ b/tdeprint/treecombobox.cpp
@@ -123,7 +123,7 @@ void TreeListBoxItem::paint(TQPainter *p)
 		p->drawPixmap(xo, yo, *pix);
 		xo += (pix->width() + 2);
 	}
-	p->drawText(xo, 0, r.width()-xo, height(listBox()), Qt::AlignLeft, m_path[m_depth]);
+	p->drawText(xo, 0, r.width()-xo, height(listBox()), TQt::AlignLeft, m_path[m_depth]);
 }
 
 //-----------------------------------------------------------------------------------------
diff --git a/tderandr/CMakeLists.txt b/tderandr/CMakeLists.txt
index e52da4c17..fd269a65c 100644
--- a/tderandr/CMakeLists.txt
+++ b/tderandr/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES
 set( target tderandr )
 
 set( ${target}_SRCS
-  randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
+  randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tderandr/Makefile.am b/tderandr/Makefile.am
index 9a8e1cf37..433a30c57 100644
--- a/tderandr/Makefile.am
+++ b/tderandr/Makefile.am
@@ -9,7 +9,7 @@ libtderandrincludedir = $(includedir)/libtderandr
 libtderandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libtderandr.h
 
 lib_LTLIBRARIES = libtderandr.la
-libtderandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
+libtderandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cpp
 METASOURCES = AUTO
 
 libtderandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
diff --git a/tderandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp
index eba497372..766d4ae50 100644
--- a/tderandr/ktimerdialog.cpp
+++ b/tderandr/ktimerdialog.cpp
@@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent,
     if ( buttonMask & Cancel )
         buttonOnTimeout = Cancel;
 
-    connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) );
-    connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) );
+    connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) );
+    connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) );
 
     // create the widgets
     mainWidget = new TQVBox( this, "mainWidget" );
@@ -98,7 +98,7 @@ void KTimerDialog::setMainWidget( TQWidget *widget )
     if ( widget->parentWidget() != mainWidget ) {
         widget->reparent( newWidget, 0, TQPoint(0,0) );
     } else {
-        newWidget->insertChild( TQT_TQOBJECT(widget) );
+        newWidget->insertChild( widget );
     }
 
     timerWidget->reparent( newWidget, 0, TQPoint(0, 0) );
diff --git a/tderandr/ktimerdialog.h b/tderandr/ktimerdialog.h
index 965a72393..0d844a27f 100644
--- a/tderandr/ktimerdialog.h
+++ b/tderandr/ktimerdialog.h
@@ -44,7 +44,7 @@ class TQLabel;
  */
 class KTimerDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/tderandr/libtderandr.cc b/tderandr/libtderandr.cpp
index 39e9c5b70..50c7a1673 100644
--- a/tderandr/libtderandr.cc
+++ b/tderandr/libtderandr.cpp
@@ -1,4 +1,4 @@
-/*  libtderandr.cc     - class KRandr that makes it easy to use XRandr in KDE
+/*  libtderandr.cpp     - class KRandr that makes it easy to use XRandr in KDE
     This file is part of KRandr 0.9.5
     Copyright (C) 2010  Timothy Pearson
     LibKRandr's homepage : http://www.trinitydesktop.org
diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp
index d00641154..412e4d195 100644
--- a/tderandr/randr.cpp
+++ b/tderandr/randr.cpp
@@ -274,8 +274,8 @@ KDE_EXPORT bool RandRScreen::confirm()
 	KDialog::centerOnScreen(&acceptDialog, m_screen);
 
 	m_shownDialog = &acceptDialog;
-	connect( m_shownDialog, TQT_SIGNAL( destroyed()), this, TQT_SLOT( shownDialogDestroyed()));
-	connect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized()));
+	connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed()));
+	connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 
         return acceptDialog.exec();
 }
@@ -283,7 +283,7 @@ KDE_EXPORT bool RandRScreen::confirm()
 KDE_EXPORT void RandRScreen::shownDialogDestroyed()
 {
     m_shownDialog = NULL;
-    disconnect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized()));
+    disconnect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 }
 
 KDE_EXPORT void RandRScreen::desktopResized()
@@ -866,8 +866,8 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog()
 	KDialog::centerOnScreen(&acceptDialog, 0);
 
 	m_shownDialog = &acceptDialog;
-	connect( m_shownDialog, TQT_SIGNAL( destroyed()), this, TQT_SLOT( shownDialogDestroyed()));
-	connect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized()));
+	connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed()));
+	connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized()));
 
         return acceptDialog.exec();
 }
diff --git a/tderandr/randr.h b/tderandr/randr.h
index ee00b2065..36e87badd 100644
--- a/tderandr/randr.h
+++ b/tderandr/randr.h
@@ -100,7 +100,7 @@ class TDERANDR_EXPORT SingleScreenData {
 
 class RandRScreen : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum orientations {
@@ -297,8 +297,8 @@ private:
 	ScreenList		m_screens;
 
 	bool			m_valid;
-	QString			m_errorCode;
-	QString			m_version;
+	TQString			m_errorCode;
+	TQString			m_version;
 
 	int				m_eventBase;
 	int				m_errorBase;
diff --git a/tderesources/configdialog.cpp b/tderesources/configdialog.cpp
index 4eb528835..a2520380b 100644
--- a/tderesources/configdialog.cpp
+++ b/tderesources/configdialog.cpp
@@ -46,7 +46,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
 
   TQVBoxLayout *mainLayout = new TQVBoxLayout( main, 0, spacingHint() );
 
-  TQGroupBox *generalGroupBox = new TQGroupBox( 2, Qt::Horizontal, main );
+  TQGroupBox *generalGroupBox = new TQGroupBox( 2, TQt::Horizontal, main );
   generalGroupBox->layout()->setSpacing( spacingHint() );
   generalGroupBox->setTitle( i18n( "General Settings" ) );
 
@@ -61,7 +61,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
 
   mainLayout->addWidget( generalGroupBox );
 
-  TQGroupBox *resourceGroupBox = new TQGroupBox( 2, Qt::Horizontal,  main );
+  TQGroupBox *resourceGroupBox = new TQGroupBox( 2, TQt::Horizontal,  main );
   resourceGroupBox->layout()->setSpacing( spacingHint() );
   resourceGroupBox->setTitle( i18n( "%1 Resource Settings" )
                               .arg( factory->typeName( resource->type() ) ) );
@@ -74,12 +74,12 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
     mConfigWidget->setInEditMode( false );
     mConfigWidget->loadSettings( mResource );
     mConfigWidget->show();
-    connect( mConfigWidget, TQT_SIGNAL( setReadOnly( bool ) ),
-        TQT_SLOT( setReadOnly( bool ) ) );
+    connect( mConfigWidget, TQ_SIGNAL( setReadOnly( bool ) ),
+        TQ_SLOT( setReadOnly( bool ) ) );
   }
 
-  connect( mName, TQT_SIGNAL( textChanged(const TQString &)),
-      TQT_SLOT( slotNameChanged(const TQString &)));
+  connect( mName, TQ_SIGNAL( textChanged(const TQString &)),
+      TQ_SLOT( slotNameChanged(const TQString &)));
 
   slotNameChanged( mName->text() );
   setMinimumSize( sizeHint() );
diff --git a/tderesources/configdialog.h b/tderesources/configdialog.h
index 94f5ab107..37b1bf166 100644
--- a/tderesources/configdialog.h
+++ b/tderesources/configdialog.h
@@ -34,7 +34,7 @@ namespace KRES {
 
 class TDERESOURCES_EXPORT ConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     // Resource=0: create new resource
     ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index 4ba33cc83..8b1443168 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -105,7 +105,7 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
 
   TQGroupBox *groupBox = new TQGroupBox( i18n( "Resources" ), this );
-  groupBox->setColumnLayout(0, Qt::Vertical );
+  groupBox->setColumnLayout(0, TQt::Vertical );
   groupBox->layout()->setSpacing( 6 );
   groupBox->layout()->setMargin( 11 );
   TQGridLayout *groupBoxLayout = new TQGridLayout( groupBox->layout(), 2, 2 );
@@ -121,14 +121,14 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
   mListView->addColumn( i18n( "Standard" ) );
 
   groupBoxLayout->addWidget( mListView, 1, 0 );
-  connect(  mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) );
-  KButtonBox *buttonBox = new KButtonBox( groupBox, Qt::Vertical );
-  mAddButton = buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT(slotAdd()) );
-  mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), TQT_TQOBJECT(this), TQT_SLOT(slotRemove()) );
+  connect(  mListView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( slotEdit() ) );
+  KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical );
+  mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT(slotAdd()) );
+  mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT(slotRemove()) );
   mRemoveButton->setEnabled( false );
-  mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT(slotEdit()) );
+  mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT(slotEdit()) );
   mEditButton->setEnabled( false );
-  mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), TQT_TQOBJECT(this), TQT_SLOT(slotStandard()) );
+  mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQ_SLOT(slotStandard()) );
   mStandardButton->setEnabled( false );
   buttonBox->layout();
 
@@ -136,12 +136,12 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name )
 
   mainLayout->addWidget( groupBox );
 
-  connect( mFamilyCombo, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( slotFamilyChanged( int ) ) );
-  connect( mListView, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelectionChanged() ) );
-  connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-           TQT_SLOT( slotItemClicked( TQListViewItem * ) ) );
+  connect( mFamilyCombo, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( slotFamilyChanged( int ) ) );
+  connect( mListView, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelectionChanged() ) );
+  connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+           TQ_SLOT( slotItemClicked( TQListViewItem * ) ) );
 
   mLastItem = 0;
 
diff --git a/tderesources/configpage.h b/tderesources/configpage.h
index 789735d5e..a9bd37ada 100644
--- a/tderesources/configpage.h
+++ b/tderesources/configpage.h
@@ -51,7 +51,7 @@ class ConfigViewItem;
 
 class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource>
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ConfigPage( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/configwidget.h b/tderesources/configwidget.h
index a9d20aa8b..e8014090d 100644
--- a/tderesources/configwidget.h
+++ b/tderesources/configwidget.h
@@ -32,7 +32,7 @@ namespace KRES {
 
 class TDERESOURCES_EXPORT ConfigWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     ConfigWidget( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp
index 60eda28b2..a5c8cdc2e 100644
--- a/tderesources/kcmtderesources.cpp
+++ b/tderesources/kcmtderesources.cpp
@@ -38,7 +38,7 @@ KCMTDEResources::KCMTDEResources( TQWidget *parent, const char *name, const TQSt
   TQVBoxLayout *layout = new TQVBoxLayout( this );
   mConfigPage = new KRES::ConfigPage( this );
   layout->addWidget( mConfigPage );
-  connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) );
+  connect( mConfigPage, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) );
   setButtons( Help | Apply );
   TDEAboutData *about =
    new TDEAboutData( I18N_NOOP( "kcmtderesources" ),
diff --git a/tderesources/kcmtderesources.h b/tderesources/kcmtderesources.h
index 4c6b99214..75a2b92c0 100644
--- a/tderesources/kcmtderesources.h
+++ b/tderesources/kcmtderesources.h
@@ -26,7 +26,7 @@
 
 class TDERESOURCES_EXPORT KCMTDEResources : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KCMTDEResources( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/tderesources/resource.h b/tderesources/resource.h
index 5c05ea4e0..3c5383799 100644
--- a/tderesources/resource.h
+++ b/tderesources/resource.h
@@ -128,7 +128,7 @@ extern "C"
 
 class ResourceExampleConfig : public KRES::ResourceConfigWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     ResourceExampleConfig( TQWidget *parent = 0, const char *name = 0 );
 
@@ -257,7 +257,7 @@ class TDERESOURCES_EXPORT Resource : public TQObject
     friend class Factory;
     friend class ManagerImpl;
 
-    Q_OBJECT
+    TQ_OBJECT
   public:
     typedef TQValueList<Resource *> List;
 
diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp
index c8009ae47..baba01039 100644
--- a/tderesources/selectdialog.cpp
+++ b/tderesources/selectdialog.cpp
@@ -45,7 +45,7 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
   TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
   mainLayout->setMargin( marginHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal,  this );
+  TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal,  this );
   groupBox->setTitle( i18n( "Resources" ) );
 
   mResourceId = new TDEListBox( groupBox );
@@ -57,8 +57,8 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
   KButtonBox *buttonBox = new KButtonBox( this );
 
   buttonBox->addStretch();
-  buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) );
-  buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) );
+  buttonBox->addButton( KStdGuiItem::ok(), this, TQ_SLOT( accept() ) );
+  buttonBox->addButton( KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) );
   buttonBox->layout();
 
   mainLayout->addWidget( buttonBox );
@@ -75,10 +75,10 @@ SelectDialog::SelectDialog( TQPtrList<Resource> list, TQWidget *parent,
   }
 
   mResourceId->setCurrentItem( 0 );
-  connect( mResourceId, TQT_SIGNAL(returnPressed(TQListBoxItem*)),
-           TQT_SLOT(accept()) );
-  connect( mResourceId, TQT_SIGNAL( executed( TQListBoxItem* ) ),
-           TQT_SLOT( accept() ) );
+  connect( mResourceId, TQ_SIGNAL(returnPressed(TQListBoxItem*)),
+           TQ_SLOT(accept()) );
+  connect( mResourceId, TQ_SIGNAL( executed( TQListBoxItem* ) ),
+           TQ_SLOT( accept() ) );
 }
 
 Resource *SelectDialog::resource()
diff --git a/tdersync/rsyncconfigdialog.cpp b/tdersync/rsyncconfigdialog.cpp
index 675044140..00c55922f 100644
--- a/tdersync/rsyncconfigdialog.cpp
+++ b/tdersync/rsyncconfigdialog.cpp
@@ -126,7 +126,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
     layout->addWidget(mLabel);
 
     // Create an exclusive button group
-    TQButtonGroup *layoutg = new TQButtonGroup( 1, Qt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
+    TQButtonGroup *layoutg = new TQButtonGroup( 1, TQt::Horizontal, i18n("Synchronization Method")+TQString(":"), mainWidget);
     layout->addWidget( layoutg );
     layoutg->setExclusive( TRUE );
 
@@ -146,7 +146,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
     //(void)new TQRadioButton( "Ra&diobutton 3", layoutg );
 
     // Create an exclusive button group
-    TQButtonGroup *layoutm = new TQButtonGroup( 1, Qt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
+    TQButtonGroup *layoutm = new TQButtonGroup( 1, TQt::Horizontal, i18n("Remote Folder")+TQString(":"), mainWidget);
     layout->addWidget( layoutm );
     layoutg->setExclusive( TRUE );
 
@@ -156,7 +156,7 @@ RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name,
     }
 
     // Create an exclusive button group
-    TQButtonGroup *layouta = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget);
+    TQButtonGroup *layouta = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Synchronization")+TQString(":"), mainWidget);
     layout->addWidget( layouta );
     layouta->setExclusive( FALSE );
 
diff --git a/tdersync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 2ce05b8db..1427866f2 100644
--- a/tdersync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
@@ -37,7 +37,7 @@
 
 class RsyncConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp
index 7ffa150d0..828b4ce71 100644
--- a/tdersync/tdersync.cpp
+++ b/tdersync/tdersync.cpp
@@ -479,7 +479,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_
                     m_progressDialog->setAutoClose(true);
                     m_progressDialog->progressBar()->setTotalSteps(2);
                     m_progressDialog->progressBar()->setValue(1);
-                    connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotRsyncCancelled()));
+                    connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotRsyncCancelled()));
                     if (m_bInSpecialSync) m_progressDialog->move(0,0);
                     m_progressDialog->show();
                     m_progressDialogExists = true;
@@ -602,7 +602,7 @@ KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset
                     m_progressDialog->progressBar()->setFormat("%v / %m");
                     m_progressDialog->progressBar()->setTotalSteps(0);
                     m_progressDialog->setAutoClose(true);
-                    connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotUnisonCancelled()));
+                    connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotUnisonCancelled()));
                     if (m_bInSpecialSync) m_progressDialog->move(0,0);
                     m_progressDialog->show();
                     m_progressDialogExists = true;
@@ -977,8 +977,8 @@ KDE_EXPORT void KRsync::slotSetup()
 
 	m_configDialog->show();
 
-	connect (m_configDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSetupOK()));
-	connect (m_configDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotSetupCancelled()));
+	connect (m_configDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSetupOK()));
+	connect (m_configDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotSetupCancelled()));
 }
 
 KDE_EXPORT void KRsync::slotSetupOK()
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index 54d3090ed..25bcb8e01 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -84,7 +84,7 @@ namespace KParts
 
 class KRsync : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am
index 455b1f5c5..6e6549f5b 100644
--- a/tdespell2/Makefile.am
+++ b/tdespell2/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libtdespell2base.la
 
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
 
 tdespell2baseincludedir = $(includedir)/tdespell2
 
diff --git a/tdespell2/README b/tdespell2/README
index 53d6f4e27..bca8de6a4 100644
--- a/tdespell2/README
+++ b/tdespell2/README
@@ -52,7 +52,7 @@ Broker::Ptr broker = Broker::openBroker( someKSettingsObject );
 Dictionary *enDict = broker->dictionary( "en_US" );
 Dictionary *deDict = broker->dictionary( "de_DE" );
 
-void someFunc( const QString& word )
+void someFunc( const TQString& word )
 {
     if ( enDict->check( word ) ) {
         kdDebug()<<"Word \""<<word<<"\" is misspelled." <<endl;
diff --git a/tdespell2/backgroundchecker.cpp b/tdespell2/backgroundchecker.cpp
index 799edf120..954ad8f64 100644
--- a/tdespell2/backgroundchecker.cpp
+++ b/tdespell2/backgroundchecker.cpp
@@ -46,10 +46,10 @@ BackgroundChecker::BackgroundChecker( const Broker::Ptr& broker, TQObject* paren
     //d->thread.setBroker( broker );
     d->engine = new BackgroundEngine( this );
     d->engine->setBroker( broker );
-    connect( d->engine, TQT_SIGNAL(misspelling( const TQString&, int )),
-             TQT_SIGNAL(misspelling( const TQString&, int )) );
-    connect( d->engine, TQT_SIGNAL(done()),
-             TQT_SLOT(slotEngineDone()) );
+    connect( d->engine, TQ_SIGNAL(misspelling( const TQString&, int )),
+             TQ_SIGNAL(misspelling( const TQString&, int )) );
+    connect( d->engine, TQ_SIGNAL(done()),
+             TQ_SLOT(slotEngineDone()) );
 }
 
 BackgroundChecker::~BackgroundChecker()
diff --git a/tdespell2/backgroundchecker.h b/tdespell2/backgroundchecker.h
index 84deea5c8..6f9163b26 100644
--- a/tdespell2/backgroundchecker.h
+++ b/tdespell2/backgroundchecker.h
@@ -48,7 +48,7 @@ namespace KSpell2
      */
     class KDE_EXPORT BackgroundChecker : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         BackgroundChecker( const Broker::Ptr& broker, TQObject *parent =0,
                            const char *name =0 );
diff --git a/tdespell2/backgroundengine.cpp b/tdespell2/backgroundengine.cpp
index 9eafe1b2e..21ab03478 100644
--- a/tdespell2/backgroundengine.cpp
+++ b/tdespell2/backgroundengine.cpp
@@ -87,7 +87,7 @@ void BackgroundEngine::setFilter( Filter *filter )
 
 void BackgroundEngine::start()
 {
-    TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) );
 }
 
 void BackgroundEngine::stop()
@@ -96,7 +96,7 @@ void BackgroundEngine::stop()
 
 void BackgroundEngine::continueChecking()
 {
-    TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) );
 }
 
 void BackgroundEngine::checkNext()
diff --git a/tdespell2/backgroundengine.h b/tdespell2/backgroundengine.h
index 9ddbe7289..365d3ebbf 100644
--- a/tdespell2/backgroundengine.h
+++ b/tdespell2/backgroundengine.h
@@ -33,7 +33,7 @@ namespace KSpell2
     class Dictionary;
     class BackgroundEngine : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         BackgroundEngine( TQObject *parent );
         ~BackgroundEngine();
diff --git a/tdespell2/broker.h b/tdespell2/broker.h
index f4029c487..2ccc63635 100644
--- a/tdespell2/broker.h
+++ b/tdespell2/broker.h
@@ -47,7 +47,7 @@ namespace KSpell2
     class KDE_EXPORT Broker : public TQObject,
                    public TDEShared
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         typedef TDESharedPtr<Broker> Ptr;
         /**
diff --git a/tdespell2/client.h b/tdespell2/client.h
index 07f6fce6e..c115b3847 100644
--- a/tdespell2/client.h
+++ b/tdespell2/client.h
@@ -39,7 +39,7 @@ namespace KSpell2
      */
     class KDE_EXPORT Client : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Client( TQObject *parent = 0, const char *name=0 );
 
diff --git a/tdespell2/defaultdictionary.cpp b/tdespell2/defaultdictionary.cpp
index 39b80e7cf..d501012fd 100644
--- a/tdespell2/defaultdictionary.cpp
+++ b/tdespell2/defaultdictionary.cpp
@@ -39,8 +39,8 @@ DefaultDictionary::DefaultDictionary( const TQString& lang, Broker *broker )
     d = new Private;
     d->dict = broker->dictionary();
     d->broker = broker;
-    connect( broker, TQT_SIGNAL(configurationChanged()),
-             TQT_SLOT(defaultConfigurationChanged()) );
+    connect( broker, TQ_SIGNAL(configurationChanged()),
+             TQ_SLOT(defaultConfigurationChanged()) );
 }
 
 DefaultDictionary::~DefaultDictionary()
diff --git a/tdespell2/defaultdictionary.h b/tdespell2/defaultdictionary.h
index 1a0090751..f3ee83339 100644
--- a/tdespell2/defaultdictionary.h
+++ b/tdespell2/defaultdictionary.h
@@ -32,7 +32,7 @@ namespace KSpell2
     class DefaultDictionary : public TQObject,
                               public Dictionary
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         DefaultDictionary( const TQString& lang, Broker *broker );
         ~DefaultDictionary();
diff --git a/tdespell2/plugins/aspell/tdespell_aspellclient.h b/tdespell2/plugins/aspell/tdespell_aspellclient.h
index 1384b0242..9a71bfa69 100644
--- a/tdespell2/plugins/aspell/tdespell_aspellclient.h
+++ b/tdespell2/plugins/aspell/tdespell_aspellclient.h
@@ -33,7 +33,7 @@ using KSpell2::Dictionary;
 
 class ASpellClient : public KSpell2::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ASpellClient( TQObject *parent, const char *name, const TQStringList & /* args */  );
     ~ASpellClient();
diff --git a/tdespell2/plugins/hspell/tdespell_hspellclient.h b/tdespell2/plugins/hspell/tdespell_hspellclient.h
index 00a89749e..a18928900 100644
--- a/tdespell2/plugins/hspell/tdespell_hspellclient.h
+++ b/tdespell2/plugins/hspell/tdespell_hspellclient.h
@@ -37,7 +37,7 @@ using KSpell2::Dictionary;
 
 class HSpellClient : public KSpell2::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HSpellClient( TQObject *parent, const char *name, const TQStringList & /* args */  );
     ~HSpellClient();
diff --git a/tdespell2/plugins/ispell/makedent.cpp b/tdespell2/plugins/ispell/makedent.cpp
index 407d5e2fb..5ed72215a 100644
--- a/tdespell2/plugins/ispell/makedent.cpp
+++ b/tdespell2/plugins/ispell/makedent.cpp
@@ -233,7 +233,7 @@ ichar_t *	icharcpy P ((ichar_t * out, ichar_t * in));
 int		icharlen P ((ichar_t * str));
 int		icharcmp P ((ichar_t * s1, ichar_t * s2));
 int		icharncmp P ((ichar_t * s1, ichar_t * s2, int n));
-#endif /* ICHAR_IS_CHAR */
+#endif
 
 /*static int  	has_marker;*/
 
@@ -343,7 +343,7 @@ int ISpellChecker::addvheader ( struct dent *dp)
     dp->flagfield |= (ALLCAPS | MOREVARIANTS);
     return 0;
 }
-#endif /* NO_CAPITALIZATION_SUPPORT */
+#endif
 
 /*
 ** Combine and resolve the entries describing two capitalizations of the same
@@ -500,7 +500,7 @@ ISpellChecker::stringcharlen (char *bufp, int canonical)
 #ifdef SLOWMULTIPLY
     static char *	sp[MAXSTRINGCHARS];
     static int		inited = 0;
-#endif /* SLOWMULTIPLY */
+#endif
     char *	bufcur;
     char *	stringcur;
     int	stringno;
@@ -515,7 +515,7 @@ ISpellChecker::stringcharlen (char *bufp, int canonical)
 		for (stringno = 0;  stringno < MAXSTRINGCHARS;  stringno++)
 			sp[stringno] = &hashheader.stringchars[stringno][0];
 	}
-#endif /* SLOWMULTIPLY */
+#endif
     lowstringno = 0;
     highstringno = m_hashheader.nstrchars - 1;
     dupwanted = canonical ? 0 : m_defdupchar;
@@ -524,17 +524,17 @@ ISpellChecker::stringcharlen (char *bufp, int canonical)
 		stringno = (lowstringno + highstringno) >> 1;
 #ifdef SLOWMULTIPLY
 		stringcur = sp[stringno];
-#else /* SLOWMULTIPLY */
+#else
 		stringcur = &m_hashheader.stringchars[stringno][0];
-#endif /* SLOWMULTIPLY */
+#endif
 		bufcur = bufp;
 		while (*stringcur)
 	    {
 #ifdef NO8BIT
 			if (((*bufcur++ ^ *stringcur) & 0x7F) != 0)
-#else /* NO8BIT */
+#else
 			if (*bufcur++ != *stringcur)
-#endif /* NO8BIT */
+#endif
 				break;
 			/*
 			** We can't use autoincrement above because of the
@@ -550,9 +550,9 @@ ISpellChecker::stringcharlen (char *bufp, int canonical)
 				m_laststringch = m_hashheader.stringdups[stringno];
 #ifdef SLOWMULTIPLY
 				return stringcur - sp[stringno];
-#else /* SLOWMULTIPLY */
+#else
 				return stringcur - &m_hashheader.stringchars[stringno][0];
-#endif /* SLOWMULTIPLY */
+#endif
 			}
 			else
 				--stringcur;
@@ -563,12 +563,12 @@ ISpellChecker::stringcharlen (char *bufp, int canonical)
 			highstringno = stringno - 1;
 		else if ((*bufcur & 0x7F) > (*stringcur & 0x7F))
 			lowstringno = stringno + 1;
-#else /* NO8BIT */
+#else
 		if (*--bufcur < *stringcur)
 			highstringno = stringno - 1;
 		else if (*bufcur > *stringcur)
 			lowstringno = stringno + 1;
-#endif /* NO8BIT */
+#endif
 		else if (dupwanted < m_hashheader.dupnos[stringno])
 			highstringno = stringno - 1;
 		else
@@ -846,7 +846,7 @@ icharncmp (ichar_t *s1, ichar_t *s2, int n)
 		return *s1 - *s2;
 }
 
-#endif /* ICHAR_IS_CHAR */
+#endif
 
 /*
  * \param istate
diff --git a/tdespell2/plugins/ispell/tdespell_ispellclient.h b/tdespell2/plugins/ispell/tdespell_ispellclient.h
index 7deee7de8..b15453bd3 100644
--- a/tdespell2/plugins/ispell/tdespell_ispellclient.h
+++ b/tdespell2/plugins/ispell/tdespell_ispellclient.h
@@ -33,7 +33,7 @@ using KSpell2::Dictionary;
 
 class ISpellClient : public KSpell2::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ISpellClient( TQObject *parent, const char *name, const TQStringList & /* args */  );
     ~ISpellClient();
diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am
index fc94843b5..c33439d68 100644
--- a/tdespell2/tests/Makefile.am
+++ b/tdespell2/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
 METASOURCES = AUTO
 
 
diff --git a/tdespell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp
index 92c7e7792..79ba20331 100644
--- a/tdespell2/tests/backgroundtest.cpp
+++ b/tdespell2/tests/backgroundtest.cpp
@@ -134,10 +134,10 @@ BackgroundTest::BackgroundTest()
     : TQObject( 0 )
 {
     m_checker = new BackgroundChecker( Broker::openBroker(), this );
-    connect( m_checker, TQT_SIGNAL(done()),
-             TQT_SLOT(slotDone()) );
-    connect( m_checker, TQT_SIGNAL(misspelling(const TQString&, int)),
-             TQT_SLOT(slotMisspelling(const TQString&, int)) );
+    connect( m_checker, TQ_SIGNAL(done()),
+             TQ_SLOT(slotDone()) );
+    connect( m_checker, TQ_SIGNAL(misspelling(const TQString&, int)),
+             TQ_SLOT(slotMisspelling(const TQString&, int)) );
     m_len = strlen( text );
     m_checker->checkText( text );
     m_timer.start();
diff --git a/tdespell2/tests/backgroundtest.h b/tdespell2/tests/backgroundtest.h
index 2f08e9ce0..1fb16fd60 100644
--- a/tdespell2/tests/backgroundtest.h
+++ b/tdespell2/tests/backgroundtest.h
@@ -28,7 +28,7 @@
 
 class BackgroundTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BackgroundTest();
 
diff --git a/tdespell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp
index d6441bde6..a84aeaf30 100644
--- a/tdespell2/tests/test_dialog.cpp
+++ b/tdespell2/tests/test_dialog.cpp
@@ -40,8 +40,8 @@ void TestDialog::check( const TQString& buffer )
     KSpell2::Dialog *dlg = new KSpell2::Dialog(
         new BackgroundChecker( Broker::openBroker(), this, "checker" ),
         0, "my dialog" );
-    connect( dlg, TQT_SIGNAL(done(const TQString&)),
-             TQT_SLOT(doneChecking(const TQString&)) );
+    connect( dlg, TQ_SIGNAL(done(const TQString&)),
+             TQ_SLOT(doneChecking(const TQString&)) );
     dlg->setBuffer( buffer );
     dlg->show();
 }
diff --git a/tdespell2/tests/test_dialog.h b/tdespell2/tests/test_dialog.h
index e8a6cf970..924c1281b 100644
--- a/tdespell2/tests/test_dialog.h
+++ b/tdespell2/tests/test_dialog.h
@@ -28,7 +28,7 @@
 
 class TestDialog : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestDialog();
 
diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am
index a2d3757d3..42837ec1f 100644
--- a/tdespell2/ui/Makefile.am
+++ b/tdespell2/ui/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdespell2.la
 # Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
 noinst_LTLIBRARIES = libtdespell2_noinst.la
 
-KDE_CXXFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT
+KDE_CXXFLAGS = -DKDE_NO_COMPAT
 INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes)
 
 tdespell2includedir = $(includedir)/tdespell2
diff --git a/tdespell2/ui/configdialog.h b/tdespell2/ui/configdialog.h
index 43a785490..4147c2f84 100644
--- a/tdespell2/ui/configdialog.h
+++ b/tdespell2/ui/configdialog.h
@@ -28,7 +28,7 @@ namespace KSpell2
     class Broker;
     class ConfigDialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         ConfigDialog( Broker *broker,
                       TQWidget *parent );
diff --git a/tdespell2/ui/configui.ui b/tdespell2/ui/configui.ui
index 94b0061cd..6fe99759a 100644
--- a/tdespell2/ui/configui.ui
+++ b/tdespell2/ui/configui.ui
@@ -102,13 +102,9 @@
 <customwidgets>
 </customwidgets>
 <includes>
-    <include location="global" impldecl="in implementation">keditlistbox.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">keditlistbox.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>keditlistbox.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
 </UI>
diff --git a/tdespell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp
index 2317f7307..8efaddb04 100644
--- a/tdespell2/ui/configwidget.cpp
+++ b/tdespell2/ui/configwidget.cpp
@@ -71,7 +71,7 @@ void ConfigWidget::init( Broker *broker )
     d->ui->m_ignoreListBox->insertStringList( ignoreList );
     d->ui->m_bgSpellCB->setChecked( d->broker->settings()->backgroundCheckerEnabled() );
     d->ui->m_bgSpellCB->hide();//hidden by default
-    connect( d->ui->m_ignoreListBox, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) );
+    connect( d->ui->m_ignoreListBox, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) );
 
     layout->addWidget( d->ui );
 }
diff --git a/tdespell2/ui/configwidget.h b/tdespell2/ui/configwidget.h
index 2f65ed20e..071e83272 100644
--- a/tdespell2/ui/configwidget.h
+++ b/tdespell2/ui/configwidget.h
@@ -29,7 +29,7 @@ namespace KSpell2
     class Broker;
     class KDE_EXPORT ConfigWidget : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         ConfigWidget( Broker *broker, TQWidget *parent, const char *name =0 );
         ~ConfigWidget();
diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp
index 0c45f3cd1..9eb592a5c 100644
--- a/tdespell2/ui/dialog.cpp
+++ b/tdespell2/ui/dialog.cpp
@@ -69,7 +69,7 @@ Dialog::Dialog( BackgroundChecker *checker,
 
     initGui();
     initConnections();
-    setMainWidget( TQT_TQWIDGET(d->ui) );
+    setMainWidget( static_cast<TQWidget*>(d->ui) );
 }
 
 Dialog::~Dialog()
@@ -79,35 +79,35 @@ Dialog::~Dialog()
 
 void Dialog::initConnections()
 {
-    connect( TQT_TQOBJECT(d->ui->m_addBtn), TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotAddWord()) );
-    connect( TQT_TQOBJECT(d->ui->m_replaceBtn), TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotReplaceWord()) );
-    connect( TQT_TQOBJECT(d->ui->m_replaceAllBtn), TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotReplaceAll()) );
-    connect( TQT_TQOBJECT(d->ui->m_skipBtn), TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotSkip()) );
-    connect( TQT_TQOBJECT(d->ui->m_skipAllBtn), TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotSkipAll()) );
-    connect( TQT_TQOBJECT(d->ui->m_suggestBtn), TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotSuggest()) );
-    connect( TQT_TQOBJECT(d->ui->m_language), TQT_SIGNAL(activated(const TQString&)),
-             TQT_SLOT(slotChangeLanguage(const TQString&)) );
-    connect( TQT_TQOBJECT(d->ui->m_suggestions), TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-             TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
-    connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)),
-             TQT_SIGNAL(misspelling(const TQString&, int)) );
-    connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(misspelling(const TQString&, int)),
-             TQT_SLOT(slotMisspelling(const TQString&, int)) );
-    connect( TQT_TQOBJECT(d->checker), TQT_SIGNAL(done()),
-             TQT_SLOT(slotDone()) );
-    connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),
-             TQT_SLOT( slotReplaceWord() ) );
-    connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotFinished()) );
-    connect( this, TQT_SIGNAL(cancelClicked()),this, TQT_SLOT(slotCancel()) );
-    connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) );
-    connect( d->ui->m_autoCorrect, TQT_SIGNAL(clicked()),
-             TQT_SLOT(slotAutocorrect()) );
+    connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotAddWord()) );
+    connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotReplaceWord()) );
+    connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotReplaceAll()) );
+    connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotSkip()) );
+    connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotSkipAll()) );
+    connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotSuggest()) );
+    connect( d->ui->m_language, TQ_SIGNAL(activated(const TQString&)),
+             TQ_SLOT(slotChangeLanguage(const TQString&)) );
+    connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+             TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
+    connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)),
+             TQ_SIGNAL(misspelling(const TQString&, int)) );
+    connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)),
+             TQ_SLOT(slotMisspelling(const TQString&, int)) );
+    connect( d->checker, TQ_SIGNAL(done()),
+             TQ_SLOT(slotDone()) );
+    connect( d->ui->m_suggestions, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)),
+             TQ_SLOT( slotReplaceWord() ) );
+    connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotFinished()) );
+    connect( this, TQ_SIGNAL(cancelClicked()),this, TQ_SLOT(slotCancel()) );
+    connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReplaceWord()) );
+    connect( d->ui->m_autoCorrect, TQ_SIGNAL(clicked()),
+             TQ_SLOT(slotAutocorrect()) );
     // button use by kword/kpresenter
     // hide by default
     d->ui->m_autoCorrect->hide();
diff --git a/tdespell2/ui/dialog.h b/tdespell2/ui/dialog.h
index d07ddacce..a531408bf 100644
--- a/tdespell2/ui/dialog.h
+++ b/tdespell2/ui/dialog.h
@@ -29,7 +29,7 @@ namespace KSpell2
     class BackgroundChecker;
     class KDE_EXPORT Dialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Dialog( BackgroundChecker *checker,
                 TQWidget *parent, const char *name=0 );
diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp
index 32970f9e4..080737dae 100644
--- a/tdespell2/ui/highlighter.cpp
+++ b/tdespell2/ui/highlighter.cpp
@@ -87,7 +87,7 @@ int Highlighter::highlightParagraph( const TQString& text,
             w = d->filter->nextWord();
         }
     }
-    //TQTimer::singleShot( 0, this, TQT_SLOT(checkWords()) );
+    //TQTimer::singleShot( 0, this, TQ_SLOT(checkWords()) );
 
     return 0;
 }
@@ -127,12 +127,12 @@ void Highlighter::setCurrentLanguage( const TQString& lang )
 
 void Highlighter::setMisspelled( int start, int count )
 {
-    setFormat( start , count, Qt::red );
+    setFormat( start , count, TQt::red );
 }
 
 void Highlighter::unsetMisspelled( int start, int count )
 {
-    setFormat( start, count, Qt::black );
+    setFormat( start, count, TQt::black );
 }
 
 /*
@@ -142,7 +142,7 @@ void Highlighter::checkWords()
     if ( !w.end ) {
         if ( !d->dict->check( w.word ) ) {
             setFormat( w.start, w.word.length(),
-                       Qt::red );
+                       TQt::red );
         }
     }
 }*/
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp
index 7119af5a8..768bceb05 100644
--- a/tdestyles/asteroid/asteroid.cpp
+++ b/tdestyles/asteroid/asteroid.cpp
@@ -46,8 +46,6 @@
 
 #include "asteroid.h"
 
-// #define MINIMUM_PUSHBUTTON_WIDTH 75;
-// #define MINIMUM_PUSHBUTTON_HEIGHT 23;
 #define MINIMUM_PUSHBUTTON_WIDTH 73;
 #define MINIMUM_PUSHBUTTON_HEIGHT 21;
 
@@ -56,15 +54,6 @@
 
 #define SPINBOX_BUTTON_WIDTH 12
 
-//#define POPUPMENUITEM_TEXT_ETCH_CONDITIONS ( etchtext && !enabled && !active )
-#define POPUPMENUITEM_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-
-#define PUSHBUTTON_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define HEADER_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define TABBAR_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define CHECKBOX_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-#define RADIOBUTTON_TEXT_ETCH_CONDITIONS ( etchtext && !enabled )
-
 /* Hackery to make metasources work */
 #include "asteroid.moc"
 
@@ -94,7 +83,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin);
 AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency)
 {
 	if (tqApp->inherits("TDEApplication")) {
-		connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
+		connect(tqApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
 	}
 
 	backwards = TQApplication::reverseLayout();
@@ -108,7 +97,7 @@ AsteroidStyle::~AsteroidStyle()
 
 void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
 /*		Screwing with the palette is fun! and required in order to make it feel
 		authentic. -clee */
@@ -118,7 +107,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 		wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150));	// Which GUI element(s) does this correspond to?
 	
 		bool isProtectedObject = false;
-		TQObject *curparent = TQT_TQOBJECT(w);
+		TQObject *curparent = w;
 		while (curparent) {
 			if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem")
 				|| curparent->inherits("KJanusWidget")
@@ -135,7 +124,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme
 		}
 	}
 
-	if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQPushButton")) {
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
 	}
 	else {
@@ -294,7 +283,7 @@ void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp,
 	}
 }
 
-int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
+int AsteroidStyle::styleHint( StyleHint stylehint,
                                    const TQStyleControlElementData &ceData,
                                    ControlElementFlags elementFlags,
                                    const TQStyleOption &option,
@@ -324,7 +313,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint,
 	}
 }
 
-void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
+void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
                                   TQPainter *p,
                                   const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
@@ -918,7 +907,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
 				}
 			}
 
-			if (p->pen() == Qt::NoPen) {
+			if (p->pen() == TQt::NoPen) {
 				p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light());
 			}
 
@@ -980,7 +969,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe,
 	}
 }
 
-void AsteroidStyle::drawControl(TQ_ControlElement ce,
+void AsteroidStyle::drawControl(ControlElement ce,
                                 TQPainter *p,
                                 const TQStyleControlElementData &ceData,
                                 ControlElementFlags elementFlags,
@@ -1138,7 +1127,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 		tr.setWidth(tr.width()+4);	// Compensate for text appearing too far to the left
 //		TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height());
 		TQRect tr_offset = TQRect(tr.x()+0, tr.y()+0, tr.width(), tr.height());
-		if TABBAR_TEXT_ETCH_CONDITIONS {
+		if ( etchtext && !enabled ) {
 			TQPen savePen = p->pen();
 			p->setPen( cg.light() );
 			TQColorGroup etchedcg = cg;
@@ -1185,7 +1174,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 
 		//TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
 		TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height());
-		if CHECKBOX_TEXT_ETCH_CONDITIONS {
+		if ( etchtext && !enabled ) {
 			TQPen savePen = p->pen();
 			p->setPen( cg.light() );
 			TQColorGroup etchedcg = cg;
@@ -1234,7 +1223,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 
 //		TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
 		TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height());
-		if RADIOBUTTON_TEXT_ETCH_CONDITIONS {
+		if ( etchtext && !enabled ) {
 			TQPen savePen = p->pen();
 			p->setPen( cg.light() );
 			TQColorGroup etchedcg = cg;
@@ -1417,9 +1406,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 				}
 			}
 
-			p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.foreground() );
+			p->setPen( ( etchtext && !enabled )?cg.dark():cg.foreground() );
 			TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
-			if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+			if ( etchtext && !enabled ) {
 				TQPen savePen = p->pen();
 				p->setPen( cg.light() );
 				p->drawText(r_offset, text_flags, o.menuItem()->text());
@@ -1473,13 +1462,13 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 			}
 
 			if (!pb->text().isNull()) {
-				p->setPen(POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText()));
+				p->setPen(( etchtext && !enabled )?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText()));
 				if (pb->iconSet() && !pb->iconSet()->isNull()) {
 					TQRect tpr(dx, r.y(), r.width()-dx, r.height());
 					TQRect tr(p->boundingRect(tpr, text_flags, pb->text()));
 
 					TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height());
-					if PUSHBUTTON_TEXT_ETCH_CONDITIONS {
+					if ( etchtext && !enabled ) {
 						TQPen savePen = p->pen();
 						p->setPen( cg.light() );
 						p->drawText(tr_offset, text_flags, pb->text());
@@ -1488,7 +1477,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 					p->drawText(tr, text_flags, pb->text());
 				} else {
 					TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
-					if PUSHBUTTON_TEXT_ETCH_CONDITIONS {
+					if ( etchtext && !enabled ) {
 						TQPen savePen = p->pen();
 						p->setPen( cg.light() );
 						p->drawText(r_offset, text_flags, pb->text());
@@ -1515,7 +1504,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 				p->drawPixmap(pr.topLeft(), pm);
 				pr = TQRect(pr.width(), r.top(), r.width() - pr.width(), r.height());
 				TQRect pr_offset = TQRect(pr.x()+ETCH_X_OFFSET, pr.y()+ETCH_Y_OFFSET, pr.width(), pr.height());
-				if HEADER_TEXT_ETCH_CONDITIONS {
+				if ( etchtext && !enabled ) {
 					p->setPen( cg.dark()) ;
 					TQPen savePen = p->pen();
 					p->setPen( cg.light() );
@@ -1524,9 +1513,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 				}
 				p->drawText(pr, text_flags, ceData.textLabel);
 			} else {
-				p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.buttonText() );
+				p->setPen( ( etchtext && !enabled )?cg.dark():cg.buttonText() );
 				TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height());
-				if HEADER_TEXT_ETCH_CONDITIONS {
+				if ( etchtext && !enabled ) {
 					TQPen savePen = p->pen();
 					p->setPen( cg.light() );
 					p->drawText(r_offset, text_flags, ceData.textLabel);
@@ -1611,8 +1600,8 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 
 			if (mi->custom()) {
 				int m = itemVMargin;
-				p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.foreground() );
-				if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+				p->setPen( ( etchtext && !enabled )?cg.dark():cg.foreground() );
+				if ( etchtext && !enabled ) {
 					TQPen savePen = p->pen();
 					p->setPen( cg.light() );
 					TQColorGroup etchedcg = cg;
@@ -1656,7 +1645,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 							rr_offset = visualRect(rr_offset, r);
 						}
 
-						if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+						if ( etchtext && !enabled ) {
 							p->setPen(cg.dark());
 							TQPen savePen = p->pen();
 							p->setPen( cg.light() );
@@ -1675,7 +1664,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 						text_flags |= AlignRight;
 					}
 
-					if POPUPMENUITEM_TEXT_ETCH_CONDITIONS {
+					if ( etchtext && !enabled ) {
 						p->setPen(cg.dark());
 						TQPen savePen = p->pen();
 						p->setPen( cg.light() );
@@ -1686,11 +1675,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 				} else if (mi->pixmap()) {
 					TQPixmap *pixmap = mi->pixmap();
 					if (pixmap->depth() == 1) {
-						p->setBackgroundMode(Qt::OpaqueMode);
+						p->setBackgroundMode(TQt::OpaqueMode);
 					}
 					p->drawPixmap(xpos, y, *pixmap);
 					if (pixmap->depth() == 1) {
-						p->setBackgroundMode(Qt::TransparentMode);
+						p->setBackgroundMode(TQt::TransparentMode);
 					}
 				}
 			}
@@ -1721,7 +1710,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
 	}
 }
 
-void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
+void AsteroidStyle::drawControlMask(ControlElement ce,
                                     TQPainter *p,
                                     const TQStyleControlElementData &ceData,
                                     ControlElementFlags elementFlags,
@@ -1768,7 +1757,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
 	}
 }
 
-void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControl(ComplexControl cc,
                                        TQPainter *p,
                                        const TQStyleControlElementData &ceData,
                                        ControlElementFlags elementFlags,
@@ -1894,7 +1883,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 				int i;
 				for( i=0; i<64; i++ )
 					a.setPoint( i, 0, i*2+1 );
-				p.setPen( Qt::color1 );
+				p.setPen( TQt::color1 );
 				p.drawPoints( a );
 				p.end();
 				TQApplication::flushX();
@@ -1902,7 +1891,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 				p.begin( horizontalLine );
 				for( i=0; i<64; i++ )
 					a.setPoint( i, i*2+1, 0 );
-				p.setPen( Qt::color1 );
+				p.setPen( TQt::color1 );
 				p.drawPoints( a );
 				p.end();
 				TQApplication::flushX();
@@ -1996,7 +1985,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 			p->drawRect(hr);
 
 			bool draw_skinny_frame = false;
-// 			if (!ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING)) draw_skinny_frame = true;
+// 			if (!ceData.widgetObjectTypes.contains("TQComboBox")) draw_skinny_frame = true;
 			if (ceData.comboBoxListBoxFlags & CEF_IsVisible) draw_skinny_frame = true;
 			if (draw_skinny_frame) {
 				p->setPen(cg.mid());
@@ -2184,7 +2173,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
 	}
 }
 
-void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControlMask(ComplexControl cc,
                                            TQPainter *p,
                                            const TQStyleControlElementData &ceData,
                                            const ControlElementFlags elementFlags,
@@ -2300,7 +2289,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &
 		}
 
 		case PM_DefaultFrameWidth: {
-			if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+			if (ceData.widgetObjectTypes.contains("TQPopupMenu")) {
 				return 3;
 			} else {
 				return TDEStyle::pixelMetric(pm, ceData, elementFlags, w);
@@ -2384,7 +2373,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
 	}
 }
 
-TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
+TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc,
                                             const TQStyleControlElementData &ceData,
                                             ControlElementFlags elementFlags,
                                             SubControl sc,
@@ -2629,7 +2618,7 @@ bool AsteroidStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 	/*	Win2K has this interesting behaviour where it sets the current
 		default button to whatever pushbutton the user presses the mouse
 		on. I _think_ this emulates that properly. -clee */
-	if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQPushButton")) {
 		if (e->type() == TQEvent::MouseButtonPress) {
 			widgetActionRequest(ceData, elementFlags, source, WAR_SetDefault);
 		}
diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h
index d6be130aa..8cea936c0 100644
--- a/tdestyles/asteroid/asteroid.h
+++ b/tdestyles/asteroid/asteroid.h
@@ -11,7 +11,7 @@
 
 class AsteroidStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	AsteroidStyle();
@@ -44,12 +44,12 @@ public:
 	                         const TQStyleOption & = TQStyleOption::Default,
 	                         const TQWidget * = 0) const;
 
-	int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+	int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 			    const TQStyleOption & = TQStyleOption::Default,
 			    TQStyleHintReturn * = 0,
 			    const TQWidget * = 0 ) const;
 
-	void drawPrimitive(TQ_PrimitiveElement,
+	void drawPrimitive(PrimitiveElement,
 	                   TQPainter *,
 	                   const TQStyleControlElementData &ceData,
 	                   ControlElementFlags elementFlags,
@@ -58,7 +58,7 @@ public:
 	                   SFlags = Style_Default,
 	                   const TQStyleOption & = TQStyleOption::Default) const;
 
-	void drawControl(TQ_ControlElement,
+	void drawControl(ControlElement,
 	                 TQPainter *,
 	                 const TQStyleControlElementData &ceData,
 	                 ControlElementFlags elementFlags,
@@ -68,7 +68,7 @@ public:
 	                 const TQStyleOption & = TQStyleOption::Default,
 	                 const TQWidget * = 0) const;
 
-	void drawControlMask(TQ_ControlElement,
+	void drawControlMask(ControlElement,
 	                     TQPainter *,
 	                     const TQStyleControlElementData &ceData,
 	                     ControlElementFlags elementFlags,
@@ -76,7 +76,7 @@ public:
 	                     const TQStyleOption &,
 	                     const TQWidget * = 0) const;
 
-	void drawComplexControl(TQ_ComplexControl,
+	void drawComplexControl(ComplexControl,
 	                        TQPainter *,
 	                        const TQStyleControlElementData &ceData,
 	                        ControlElementFlags elementFlags,
@@ -88,7 +88,7 @@ public:
 	                        const TQStyleOption & = TQStyleOption::Default,
 	                        const TQWidget * = 0) const;
 
-	void drawComplexControlMask(TQ_ComplexControl,
+	void drawComplexControlMask(ComplexControl,
 	                            TQPainter *,
 	                            const TQStyleControlElementData &ceData,
 	                            const ControlElementFlags elementFlags,
@@ -102,7 +102,7 @@ public:
 
 	TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-	TQRect querySubControlMetrics(TQ_ComplexControl,
+	TQRect querySubControlMetrics(ComplexControl,
 	                             const TQStyleControlElementData &ceData,
 	                             ControlElementFlags elementFlags,
 	                             SubControl,
diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp
index d1666406f..9cf26d102 100644
--- a/tdestyles/highcolor/highcolor.cpp
+++ b/tdestyles/highcolor/highcolor.cpp
@@ -190,19 +190,19 @@ HighColorStyle::~HighColorStyle()
 
 void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 		// Put in order of highest occurrence to maximise hit rate
-		if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+		if (widget->inherits("TQPushButton")) {
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
-		} else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+		} else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) {
 			widget->setBackgroundMode(TQWidget::NoBackground);
-		} else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
+		} else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) {
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		} else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) {
 			widget->setBackgroundMode( NoBackground );	// We paint the whole background.
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
-		} else if (widget->inherits(TQTOOLBOXBUTTON_OBJECT_NAME_STRING)) {
+		} else if (widget->inherits("TQToolBoxButton")) {
 			TQFont font = widget->font();
 			font.setBold(true);
 			widget->setFont(font);
@@ -215,14 +215,14 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem
 
 void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
-		if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) {
+		if (widget->inherits("TQPushButton")) {
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
-		else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+		else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) {
 			widget->setBackgroundMode(TQWidget::PaletteBackground);
-		} else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
+		} else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) {
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		} else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) {
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
@@ -240,7 +240,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg
 {
 	TQColor col = cg.button();
 
-#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals
+#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals
 	if ( TQPaintDevice::x11AppDepth() >= 24 )
 		KPixmapEffect::gradient( pix, col.light(120), col.dark(115),
 				KPixmapEffect::HorizontalGradient );
@@ -251,7 +251,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg
 
 
 // This function draws primitive elements as well as their masks.
-void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void HighColorStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
 									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
@@ -430,7 +430,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
 			if (p && p->device()->devType() == TQInternal::Widget) {
 				TQHeader* hdr = dynamic_cast<TQHeader*>(p->device());
 				if (hdr)
-					horizontal = hdr->orientation() == Qt::Horizontal;
+					horizontal = hdr->orientation() == TQt::Horizontal;
 			}
 
 			int x,y,w,h;
@@ -730,7 +730,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe,
 				maskBmp.setMask(maskBmp);
 			}
 				
-			p->setPen(Qt::color1);
+			p->setPen(TQt::color1);
 			p->drawPixmap(r.x(), r.y(), maskBmp);
 			break;
 		}
@@ -1144,7 +1144,7 @@ void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 }
 
 
-void HighColorStyle::drawControl( TQ_ControlElement element,
+void HighColorStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
@@ -1480,20 +1480,20 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
 
 					// Draw the pixmap
 					if ( pixmap->depth() == 1 )
-						p->setBackgroundMode( Qt::OpaqueMode );
+						p->setBackgroundMode( TQt::OpaqueMode );
 
 					int diffw = ( ( w - pixmap->width() ) / 2 )
 									+ ( ( w - pixmap->width() ) % 2 );
 					p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
 					
 					if ( pixmap->depth() == 1 )
-						p->setBackgroundMode( Qt::TransparentMode );
+						p->setBackgroundMode( TQt::TransparentMode );
 				}
 			}
 
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
-				TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
 				int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags);
 				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
@@ -1520,7 +1520,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
 }
 
 
-void HighColorStyle::drawControlMask( TQ_ControlElement element,
+void HighColorStyle::drawControlMask( ControlElement element,
 								  	  TQPainter *p,
 								  	  const TQStyleControlElementData &ceData,
 								  	  ControlElementFlags elementFlags,
@@ -1548,7 +1548,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element,
 }
 
 
-void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          ControlElementFlags elementFlags,
@@ -1683,22 +1683,22 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
 				}
 				else if (!ceData.parentWidgetData.widgetObjectTypes.isEmpty())
 				{
-					if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
+					if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
 					{
 						TQToolBar* parent = (TQToolBar*)widget->parent();
 						TQRect pr = parent->rect();
 
 						renderGradient( p, r, cg.button(),
-									parent->orientation() == Qt::Vertical,
+									parent->orientation() == TQt::Vertical,
 									r.x(), r.y(), pr.width()-2, pr.height()-2);
 					}
-					else if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING))
+					else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget"))
 					{
 						TQWidget* parent = (TQWidget*)widget->parent();
 						TQToolBar* toolbar = (TQToolBar*)parent->parent();
 						TQRect tr = toolbar->rect();
 
-						if ( toolbar->orientation() == Qt::Horizontal ) {
+						if ( toolbar->orientation() == TQt::Horizontal ) {
 							renderGradient( p, r, cg.button(), false, r.x(), r.y(),
 									r.width(), tr.height() );
 						} else {
@@ -1735,7 +1735,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
 }
 
 
-void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControlMask( ComplexControl control,
 											 TQPainter *p,
 											 const TQStyleControlElementData &ceData,
 											 const ControlElementFlags elementFlags,
@@ -2016,7 +2016,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
 
 	TQToolBar* toolbar;
 
-	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING))
+	if (ceData.widgetObjectTypes.contains("TQObject"))
 	{
 		TQObject* object = reinterpret_cast<TQObject*>(source);
 
@@ -2032,14 +2032,14 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
 
 				// Find the top-level toolbar of this widget, since it may be nested in other
 				// widgets that are on the toolbar.
-				TQWidget *widget = TQT_TQWIDGET(object);
-				TQWidget *parent = TQT_TQWIDGET(object->parent());
+				TQWidget *widget = static_cast<TQWidget*>(object);
+				TQWidget *parent = static_cast<TQWidget*>(object->parent());
 				int x_offset = ceData.rect.x(), y_offset = ceData.rect.y();
 				while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) )
 				{
 					x_offset += parent->x();
 					y_offset += parent->y();
-					parent = TQT_TQWIDGET(parent->parent());
+					parent = static_cast<TQWidget*>(parent->parent());
 				}
 	
 				TQRect r  = ceData.rect;
@@ -2048,7 +2048,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
 	
 				// Check if the parent is a QToolbar, and use its orientation, else guess.
 				TQToolBar* tb = dynamic_cast<TQToolBar*>(parent);
-				if (tb) horiz_grad = tb->orientation() == Qt::Vertical;
+				if (tb) horiz_grad = tb->orientation() == TQt::Vertical;
 	
 				TQPainter p( widget );
 				renderGradient(&p, r, parent->colorGroup().button(), horiz_grad,
@@ -2067,15 +2067,15 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData
 	
 			if ( event->type() == TQEvent::Paint ) {
 
-				TQWidget *widget = TQT_TQWIDGET(object);
+				TQWidget *widget = static_cast<TQWidget*>(object);
 				TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect;
 				TQPainter p( widget );
 				renderGradient(&p, wr, toolbar->colorGroup().button(),
-						toolbar->orientation() == Qt::Vertical,
+						toolbar->orientation() == TQt::Vertical,
 						wr.x(), wr.y(), tr.width() - 2, tr.height() - 2);
 				
 				p.setPen( toolbar->colorGroup().dark() );
-				if ( toolbar->orientation() == Qt::Horizontal )
+				if ( toolbar->orientation() == TQt::Horizontal )
 					p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
 				else
 					p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 );
diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h
index d8b7251db..4019dc10b 100644
--- a/tdestyles/highcolor/highcolor.h
+++ b/tdestyles/highcolor/highcolor.h
@@ -57,7 +57,7 @@ class TQPopupMenu;
 
 class HighColorStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		enum StyleType { HighColor = 0, Default, B3 };
@@ -81,7 +81,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 		
-		void drawPrimitive( TQ_PrimitiveElement pe,
+		void drawPrimitive( PrimitiveElement pe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -90,7 +90,7 @@ class HighColorStyle : public TDEStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void drawControl( TQ_ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -100,7 +100,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawControlMask( TQ_ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -108,7 +108,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 		
-		void drawComplexControl( TQ_ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -120,7 +120,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawComplexControlMask( TQ_ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					const ControlElementFlags elementFlags,
@@ -158,7 +158,7 @@ class HighColorStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+		int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 				const TQStyleOption & = TQStyleOption::Default,
 				TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
 
diff --git a/tdestyles/highcontrast/config/highcontrastconfig.cpp b/tdestyles/highcontrast/config/highcontrastconfig.cpp
index 8d8df0e79..a570a6eab 100644
--- a/tdestyles/highcontrast/config/highcontrastconfig.cpp
+++ b/tdestyles/highcontrast/config/highcontrastconfig.cpp
@@ -57,7 +57,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
             "/highcontraststyle/Settings/wideLines", false);
     wideLinesBox->setChecked(originalWideLinesState);
 
-    connect(wideLinesBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateChanged()));
+    connect(wideLinesBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateChanged()));
 }
 
 HighContrastStyleConfig::~HighContrastStyleConfig()
diff --git a/tdestyles/highcontrast/config/highcontrastconfig.h b/tdestyles/highcontrast/config/highcontrastconfig.h
index d52a22b47..0f0a5ca09 100644
--- a/tdestyles/highcontrast/config/highcontrastconfig.h
+++ b/tdestyles/highcontrast/config/highcontrastconfig.h
@@ -31,7 +31,7 @@ class TQCheckBox;
 
 class HighContrastStyleConfig: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	HighContrastStyleConfig(TQWidget* parent);
 	~HighContrastStyleConfig();
diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp
index 0d67fd94b..5ef1f36d6 100644
--- a/tdestyles/highcontrast/highcontrast.cpp
+++ b/tdestyles/highcontrast/highcontrast.cpp
@@ -154,14 +154,14 @@ void HighContrastStyle::polish( TQPalette& pal )
 
 void HighContrastStyle::polish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
-		if (widget->inherits (TQBUTTON_OBJECT_NAME_STRING)
-			|| widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING)
-			|| widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING)
-			|| widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING)
-			|| widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING))
+		if (widget->inherits ("TQButton")
+			|| widget->inherits ("TQComboBox")
+			|| widget->inherits ("TQSpinWidget")
+			|| widget->inherits ("TQLineEdit")
+			|| widget->inherits ("TQTextEdit"))
 		{
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 	
@@ -181,9 +181,9 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control
 
 void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
-		if (widget->inherits (TQWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING) || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING) || widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING)) {
+		if (widget->inherits ("TQWidget") || widget->inherits ("TQComboBox") || widget->inherits ("TQSpinWidget") || widget->inherits ("TQLineEdit") || widget->inherits ("TQTextEdit")) {
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	}
@@ -219,12 +219,12 @@ void HighContrastStyle::setColorsByState (TQPainter* p, const TQColorGroup& cg,
 
 	if ((flags & Style_Enabled) && (flags & highlight))
 	{
-		p->setPen  (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine));
+		p->setPen  (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine));
 		p->setBackgroundColor (cg.highlight());
 	}
 	else
 	{
-		p->setPen  (TQPen (fg, basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine));
+		p->setPen  (TQPen (fg, basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine));
 		p->setBackgroundColor (bg);
 	}
 
@@ -253,7 +253,7 @@ void HighContrastStyle::drawRoundRect (TQPainter* p, TQRect r, int offset, bool
 		addOffset (&r3, lineWidth);
 
 		p->save();
-		p->setPen (Qt::NoPen);
+		p->setPen (TQt::NoPen);
 		if (filled)
 			p->fillRect (r3, p->backgroundColor());
 		p->drawRect (r3);
@@ -286,7 +286,7 @@ void HighContrastStyle::drawEllipse (TQPainter* p, TQRect r, int offset, bool fi
 	p->drawRoundRect (r, 99, 99);
 }
 
-void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset) const
+void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset) const
 {
 	p->save();
 	addOffset (&r, offset);
@@ -337,7 +337,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement a
 }
 
 // This function draws primitive elements
-void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
+void HighContrastStyle::drawPrimitive (PrimitiveElement pe,
 								TQPainter *p,
 								const TQStyleControlElementData &ceData,
 								ControlElementFlags elementFlags,
@@ -371,9 +371,9 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 		case PE_FocusRect: {
 			p->save();
 			p->setBrush (TQBrush ());
-			p->setPen (TQPen (cg.highlight(), basicLineWidth, Qt::SolidLine));
+			p->setPen (TQPen (cg.highlight(), basicLineWidth, TQt::SolidLine));
 			drawRoundRect (p, r, basicLineWidth, false);
-			p->setPen (TQPen (cg.highlightedText(), basicLineWidth, Qt::DashLine));
+			p->setPen (TQPen (cg.highlightedText(), basicLineWidth, TQt::DashLine));
 			drawRoundRect (p, r, basicLineWidth, false);
 			p->restore();
 			break;
@@ -472,7 +472,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 
 		
 		case PE_ProgressBarChunk: {
-			p->fillRect (r, Qt::color1);
+			p->fillRect (r, TQt::color1);
 			break;
 		}
 
@@ -506,7 +506,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 			break;
 		}
 		case PE_IndicatorMask: {
-			p->fillRect (r, Qt::color1);
+			p->fillRect (r, TQt::color1);
 			break;
 		}
 		case PE_CheckMark: {
@@ -535,10 +535,10 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 			break;
 		}
 		case PE_ExclusiveIndicatorMask: {
-			p->fillRect (r, Qt::color0);
-			p->setBackgroundColor (Qt::color1);
-			p->setPen (Qt::NoPen);
-			p->setBrush (Qt::color1);
+			p->fillRect (r, TQt::color0);
+			p->setBackgroundColor (TQt::color1);
+			p->setPen (TQt::NoPen);
+			p->setBrush (TQt::color1);
 			p->drawEllipse (r);
 			break;
 		}
@@ -551,7 +551,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe,
 			setColorsButton (p, cg, flags);
 			p->fillRect (r, p->backgroundColor());
 			
-			p->setPen (TQPen (p->pen().color(), 1, Qt::DashLine));
+			p->setPen (TQPen (p->pen().color(), 1, TQt::DashLine));
 			if (flags & Style_Horizontal)
 				p->drawLine (r.center().x(), r.top(), r.center().x(), r.bottom());
 			else
@@ -713,7 +713,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 		{
 			setColorsButton (p, cg);
 			p->fillRect (r, p->backgroundColor());
-			p->setBrush (TQBrush (p->pen().color(), Qt::BDiagPattern));
+			p->setBrush (TQBrush (p->pen().color(), TQt::BDiagPattern));
 			drawRoundRect (p, r);
 			break;
 		}
@@ -724,7 +724,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 		case KPE_SliderGroove: {
 			setColorsText (p, cg, flags);
 			TQRect r2 (r);
-			if (ceData.widgetObjectTypes.contains(TQSLIDER_OBJECT_NAME_STRING))
+			if (ceData.widgetObjectTypes.contains("TQSlider"))
 			{
 				if (ceData.orientation == TQt::Horizontal)
 				{
@@ -764,7 +764,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 			// Probably it would be better to add a KPM_ListViewExpander metric
 			// to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle
 			// drawComplexControl handle it.
-			TQ_PrimitiveElement direction;
+			PrimitiveElement direction;
 			if (flags & Style_On) { // Collapsed = On
 				direction = PE_ArrowRight;
 
@@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
 }
 
 
-void HighContrastStyle::drawControl (TQ_ControlElement element,
+void HighContrastStyle::drawControl (ControlElement element,
 								TQPainter *p,
 								const TQStyleControlElementData &ceData,
 								ControlElementFlags elementFlags,
@@ -1133,20 +1133,20 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
 
 					// Draw the pixmap
 					if ( pixmap->depth() == 1 )
-						p->setBackgroundMode( Qt::OpaqueMode );
+						p->setBackgroundMode( TQt::OpaqueMode );
 
 					int diffw = ( ( w - pixmap->width() ) / 2 )
 									+ ( ( w - pixmap->width() ) % 2 );
 					p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
 
 					if ( pixmap->depth() == 1 )
-						p->setBackgroundMode( Qt::TransparentMode );
+						p->setBackgroundMode( TQt::TransparentMode );
 				}
 			}
 
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
-				TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
 				int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags);
 				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
@@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
 	}
 }
 
-void HighContrastStyle::drawControlMask (TQ_ControlElement element,
+void HighContrastStyle::drawControlMask (ControlElement element,
 										TQPainter *p,
 										const TQStyleControlElementData &ceData,
 										ControlElementFlags elementFlags,
@@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
     return sibling;
 }
 
-void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
+void HighContrastStyle::drawComplexControl (ComplexControl control,
 									TQPainter *p,
 									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
@@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 			setColorsButton (p, cg, flags);
 			// Draw arrows if required
 			if (controls & SC_SpinWidgetDown) {
-				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
+				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
 				drawRoundRect (p, r2);
 				drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
 			}
 			if (controls & SC_SpinWidgetUp) {
-				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
+				TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
 				drawRoundRect (p, r2);
 				drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
 			}
@@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
 	}
 }
 
-void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c,
+void HighContrastStyle::drawComplexControlMask(ComplexControl c,
 											   TQPainter *p,
 											   const TQStyleControlElementData &ceData,
 											   const ControlElementFlags elementFlags,
@@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
 	p->restore();
 }
 
-TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
 								  SubControl subcontrol,
@@ -1622,7 +1622,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat
 		}
 
 		case PM_DefaultFrameWidth: {
-			if (widget && (ceData.widgetObjectTypes.contains (TQLINEEDIT_OBJECT_NAME_STRING) || ceData.widgetObjectTypes.contains (TQTEXTEDIT_OBJECT_NAME_STRING)))
+			if (widget && (ceData.widgetObjectTypes.contains ("TQLineEdit") || ceData.widgetObjectTypes.contains ("TQTextEdit")))
 				return 2*basicLineWidth;
 			else 
 				return basicLineWidth;
diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h
index 30d498b96..688742fb6 100644
--- a/tdestyles/highcontrast/highcontrast.h
+++ b/tdestyles/highcontrast/highcontrast.h
@@ -48,7 +48,7 @@ class TQPopupMenu;
 
 class HighContrastStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		HighContrastStyle();
@@ -69,7 +69,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget* widget = 0 ) const;
 
-		void drawPrimitive( TQ_PrimitiveElement pe,
+		void drawPrimitive( PrimitiveElement pe,
 					TQPainter* p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle
 					SFlags flags = Style_Default,
 					const TQStyleOption& = TQStyleOption::Default ) const;
 
-		void drawControl( TQ_ControlElement element,
+		void drawControl( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawControlMask( TQ_ControlElement element,
+		void drawControlMask( ControlElement element,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawComplexControl( TQ_ComplexControl control,
+		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
@@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		void drawComplexControlMask( TQ_ComplexControl control,
+		void drawComplexControlMask( ComplexControl control,
 					TQPainter *p,
 					const TQStyleControlElementData &ceData,
 					const ControlElementFlags elementFlags,
@@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle
 					const TQStyleOption& = TQStyleOption::Default,
 					const TQWidget *widget = 0 ) const;
 
-		TQRect querySubControlMetrics( TQ_ComplexControl control,
+		TQRect querySubControlMetrics( ComplexControl control,
 					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					SubControl subcontrol,
@@ -149,7 +149,7 @@ class HighContrastStyle : public TDEStyle
 
 		TQRect subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const;
 
-		int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+		int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					const TQStyleOption & = TQStyleOption::Default,
 					TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
 
@@ -166,7 +166,7 @@ class HighContrastStyle : public TDEStyle
 		void drawRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
 		void drawRoundRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
 		void drawEllipse (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const;
-		void drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset = 0) const;
+		void drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset = 0) const;
 
 		int basicLineWidth;
 		// Disable copy constructor and = operator
diff --git a/tdestyles/keramik/genembed.cpp b/tdestyles/keramik/genembed.cpp
index c816b2a0f..cbbecae65 100644
--- a/tdestyles/keramik/genembed.cpp
+++ b/tdestyles/keramik/genembed.cpp
@@ -227,7 +227,7 @@ int main(int argc, char** argv)
 
 		for (int pos=0; pos<size; pos++)
 		{
-			QRgb basePix = (QRgb)*read;
+			TQRgb basePix = (TQRgb)*read;
 
 			if (tqAlpha(basePix) != 255)
 				reallySolid = false;
@@ -245,7 +245,7 @@ int main(int argc, char** argv)
 		read  = reinterpret_cast< TQ_UINT32* >(input.bits() );
 		for (int pos=0; pos<size; pos++)
 		{
-			QRgb basePix = (QRgb)*read;
+			TQRgb basePix = (TQRgb)*read;
 			//cout<<(r*destAlpha.alphas[pos])<<"\n";
 			//cout<<(int)destAlpha.alphas[pos]<<"\n";
 			TQColor clr(basePix);
diff --git a/tdestyles/keramik/gradients.cpp b/tdestyles/keramik/gradients.cpp
index ca89abd61..a113d7a3c 100644
--- a/tdestyles/keramik/gradients.cpp
+++ b/tdestyles/keramik/gradients.cpp
@@ -35,7 +35,7 @@ namespace
 	struct GradientCacheEntry
 	{
 		TQPixmap* m_pixmap;
-		QRgb     m_color;
+		TQRgb     m_color;
 		bool     m_menu;
 		int      m_width;
 		int      m_height;
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index 2b7213eee..65603b30f 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -123,7 +123,7 @@ namespace
 
 namespace
 {
-	void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled)
+	void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled)
 	{
 		TQPointArray a;
 
@@ -179,7 +179,7 @@ void KeramikStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg,
 {
 	TQColor col = cg.button();
 
-#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals
+#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals
 	if ( TQPaintDevice::x11AppDepth() >= 24 )
 		KPixmapEffect::gradient( pix, col.light(120), col.dark(115),
 				KPixmapEffect::HorizontalGradient );
@@ -251,20 +251,20 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap,
     switch (stylepixmap) {
 		case SP_TitleBarMinButton:
 			return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify,
-				Qt::black, Qt::black, false, false);
+				TQt::black, TQt::black, false, false);
 			//return qpixmap_from_bits( iconify_bits, "title-iconify.png" );
 		case SP_TitleBarMaxButton:
 			return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize,
-				Qt::black, Qt::black, false, false);
+				TQt::black, TQt::black, false, false);
 		case SP_TitleBarCloseButton:
 			if (widget && widget->inherits("KDockWidgetHeader"))
 				return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny,
-				Qt::black, Qt::black, false, false);
+				TQt::black, TQt::black, false, false);
 			else	return Keramik::PixmapLoader::the().pixmap(keramik_title_close,
-				Qt::black, Qt::black, false, false);
+				TQt::black, TQt::black, false, false);
 		case SP_TitleBarNormalButton:
 			return Keramik::PixmapLoader::the().pixmap(keramik_title_restore,
-				Qt::black, Qt::black, false, false);
+				TQt::black, TQt::black, false, false);
 		default:
 			break;
 	}
@@ -290,7 +290,7 @@ KeramikStyle::KeramikStyle()
 	if (animateProgressBar)
 	{
 		animationTimer = new TQTimer( this );
-		connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) );
+		connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) );
 	}
 	
 	firstComboPopupRelease = false;
@@ -329,7 +329,7 @@ KeramikStyle::~KeramikStyle()
 
 void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
 {
-    if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQApplication")) {
 		TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
 		if (!qstrcmp(app->argv()[0], "kicker")) {
 			kickerMode = true;
@@ -339,28 +339,28 @@ void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co
 
 void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
 		// Put in order of highest occurrence to maximise hit rate
-		if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING )  || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) || widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) )
+		if ( widget->inherits( "TQPushButton" )  || widget->inherits( "TQComboBox" ) || widget->inherits("TQToolButton") )
 		{
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
-			if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+			if ( widget->inherits( "TQComboBox" ) )
 				widget->setBackgroundMode( NoBackground );
 		}
-		else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+		else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) )
 			widget->setBackgroundMode( NoBackground );
 	
 		else if ( widget->parentWidget() &&
-				( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
+				( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) ||
 					widget->inherits( "TDECompletionBox" ) ) ) {
 			TQListBox* listbox = (TQListBox*) widget;
 			listbox->setLineWidth( 4 );
 			listbox->setBackgroundMode( NoBackground );
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 	
-		} else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
+		} else if (widget->inherits("TQToolBarExtensionWidget")) {
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 			//widget->setBackgroundMode( NoBackground );
 		}
@@ -369,11 +369,11 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 	
-		if (animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget))
+		if (animateProgressBar && ::tqt_cast<TQProgressBar*>(widget))
 		{
 			installObjectEventHandler(ceData, elementFlags, ptr, this);
 			progAnimWidgets[static_cast<TQProgressBar*>(widget)] = 0;
-			connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*)));
+			connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*)));
 			if (!animationTimer->isActive())
 				animationTimer->start( 50, false );
 		}
@@ -384,35 +384,35 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 
 void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
 		//### TODO: This needs major cleanup (and so does polish() )
-		if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING  ) )
+		if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox"  ) )
 		{
-			if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) )
+			if ( widget->inherits( "TQComboBox" ) )
 				widget->setBackgroundMode( PaletteButton );
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
-		else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+		else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) )
 			widget->setBackgroundMode( PaletteBackground );
 	
 		else if ( widget->parentWidget() &&
-				( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) ||
+				( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) ||
 					widget->inherits( "TDECompletionBox" ) ) ) {
 			TQListBox* listbox = (TQListBox*) widget;
 			listbox->setLineWidth( 1 );
 			listbox->setBackgroundMode( PaletteBackground );
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 			widget->clearMask();
-		} else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) {
+		} else if (widget->inherits("TQToolBarExtensionWidget")) {
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
 		else if ( !qstrcmp( widget->name(), kdeToolbarWidget ) ) {
 			widget->setBackgroundMode( PaletteBackground );
 			removeObjectEventHandler(ceData, elementFlags, ptr, this);
 		}
-		else if ( ::tqqt_cast<TQProgressBar*>(widget) )
+		else if ( ::tqt_cast<TQProgressBar*>(widget) )
 		{
 			progAnimWidgets.remove(static_cast<TQProgressBar*>(widget));
 		}
@@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 
 void KeramikStyle::progressBarDestroyed(TQObject* obj)
 {
-	progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj)));
+	progAnimWidgets.remove(static_cast<TQProgressBar*>(obj));
 }
 
 
@@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr
 
 	// Find the top-level toolbar of this widget, since it may be nested in other
 	// widgets that are on the toolbar.
-	TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL;
+	TQWidget *parent = (widget)?widget->parentWidget():NULL;
 	int x_offset = ceData.rect.x(), y_offset = ceData.rect.y();
 	while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) )
 	{
 		x_offset += parent->x();
 		y_offset += parent->y();
-		parent = TQT_TQWIDGET(parent->parent());
+		parent = static_cast<TQWidget*>(parent->parent());
 	}
 
 	TQRect pr = ceData.parentWidgetData.rect;
@@ -543,7 +543,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr
 }
 
 // This function draws primitive elements as well as their masks.
-void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
+void KeramikStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
 									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
@@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 			if (kickerMode)
 			{
 				if (p->device() && p->device()->devType() == TQInternal::Widget &&
-											 TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame" )
+											 TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" )
 				{
 					int x2 = x + r.width() - 1;
 					int y2 = y + r.height() - 1;
@@ -1107,7 +1107,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe,
 			TQWidget*  paintWidget = dynamic_cast<TQWidget*>(p->device());
 			TQToolBar* parent      = 0;
 			if (paintWidget)
-				parent = ::tqqt_cast<TQToolBar*>(paintWidget->parentWidget());
+				parent = ::tqt_cast<TQToolBar*>(paintWidget->parentWidget());
 
 			renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) );
 			if ( !(flags & Style_Horizontal) )
@@ -1267,10 +1267,10 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 
 				if (horizontal)
 					Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl,
-						Qt::black,  disabled, Keramik::TilePainter::PaintFullBlend );
+						TQt::black,  disabled, Keramik::TilePainter::PaintFullBlend );
 				else
 					Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl,
-						Qt::black,  disabled, Keramik::TilePainter::PaintFullBlend );
+						TQt::black,  disabled, Keramik::TilePainter::PaintFullBlend );
 				break;
 			}
 
@@ -1283,8 +1283,8 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 			
 			TQToolBar* parent = 0;
 			
-			if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING))
-				parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent()));
+			if (widget && widget->parent() && widget->parent()->inherits("TQToolBar"))
+				parent = static_cast<TQToolBar*>(widget->parent());
 				
 			renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal));
 			if (flags & Style_Horizontal) {
@@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
 	return false;
 }
 
-void KeramikStyle::drawControl( TQ_ControlElement element,
+void KeramikStyle::drawControl( ControlElement element,
 								  TQPainter *p,
 								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
@@ -1414,7 +1414,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 			}
 			else
 			{
-				if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
+				if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"))
 					toolbarBlendWidget = widget;
 
 				drawPrimitive( PE_ButtonCommand, p, ceData, elementFlags, r, cg, flags );
@@ -1520,7 +1520,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 
 		case CE_ToolButtonLabel:
 		{
-			bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAR_OBJECT_NAME_STRING );
+			bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBar" );
 			TQRect nr = r;
 
 			if (!onToolbar)
@@ -1588,7 +1588,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 		case CE_DockWindowEmptyArea:
 		{
 			TQRect pr = r;
-			if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING))
+			if (ceData.widgetObjectTypes.contains("TQToolBar"))
 			{
 				const TQToolBar* tb = static_cast<const TQToolBar*>(widget);
 				if (tb->place() == TQDockWindow::OutsideDock)
@@ -1600,10 +1600,10 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 					//toolbar we normally paint over.
 				}
 				Keramik::GradientPainter::renderGradient( p, pr, cg.button(),
-										 tb->orientation() == Qt::Horizontal);
+										 tb->orientation() == TQt::Horizontal);
 			}
 			else
-				TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
+				TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
 					r, cg, flags, opt, widget );
 			break;
 		}
@@ -1818,20 +1818,20 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 
 					// Draw the pixmap
 					if ( pixmap->depth() == 1 )
-						p->setBackgroundMode( Qt::OpaqueMode );
+						p->setBackgroundMode( TQt::OpaqueMode );
 
 					int diffw = ( ( w - pixmap->width() ) / 2 )
 									+ ( ( w - pixmap->width() ) % 2 );
 					p->drawPixmap( x+diffw, y+itemFrame, *pixmap );
 
 					if ( pixmap->depth() == 1 )
-						p->setBackgroundMode( Qt::TransparentMode );
+						p->setBackgroundMode( TQt::TransparentMode );
 				}
 			}
 
 			// Does the menu item have a submenu?
 			if ( mi->popup() ) {
-				TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+				PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
 				int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - itemFrame;
 				TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim,
 							y + h / 2 - dim / 2, dim, dim), r );
@@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
 	}
 }
 
-void KeramikStyle::drawControlMask( TQ_ControlElement element,
+void KeramikStyle::drawControlMask( ControlElement element,
 								    TQPainter *p,
 								    const TQStyleControlElementData &ceData,
 								    ControlElementFlags elementFlags,
@@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat
 	}
 }
 
-void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          ControlElementFlags elementFlags,
@@ -2029,7 +2029,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 			if (controls == SC_All)
 			{
 				//Double-buffer only when we are in the slower full-blend mode
-				if ( ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING) || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) )
+				if ( ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar") || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) )
 				{
 					buf = new TQPixmap( r.width(), r.height() );
 					br.setX(0);
@@ -2100,7 +2100,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 					p2->setPen( cg.buttonText() );
 					p2->drawLineSegments( a );
 	
-					Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), Qt::black, disabled, Keramik::TilePainter::PaintFullBlend );
+					Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), TQt::black, disabled, Keramik::TilePainter::PaintFullBlend );
 				}
 				else //Size-constrained combo -- loose the ripple.
 				{
@@ -2125,7 +2125,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 					p2->fillRect( er, cg.base() );
 					drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg );
 					Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(),
-						Qt::black, false, pmodeFullBlend() );
+						TQt::black, false, pmodeFullBlend() );
 				}
 				else if ( elementFlags & CEF_HasFocus )
 				{
@@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 		case CC_SpinWidget:
 		{
 			const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
-			TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
+			TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
 			if ( controls & SC_SpinWidgetButtonField )
 			{
 				Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2257,10 +2257,10 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 		// TOOLBUTTON
 		// -------------------------------------------------------------------
 		case CC_ToolButton: {
-			bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING);
+			bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar");
 			bool onExtender = !onToolbar &&
-				ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING) &&
-				widget && widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING );
+				ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBarExtensionWidget") &&
+				widget && widget->parentWidget()->parentWidget()->inherits( "TQToolBar" );
 
 			bool onControlButtons = false;
 			if (!onToolbar && !onExtender && !ceData.parentWidgetData.widgetObjectTypes.isEmpty() &&
@@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 				{
 					// This assumes floating toolbars can't have extenders,
 					//(so if we're on an extender, we're not floating)
-					TQWidget*  parent  = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent()));
-					TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent()));
+					TQWidget*  parent  = static_cast<TQWidget*> (static_cast<TQWidget*>(widget->parent()));
+					TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent());
 					TQRect tr    = ceData.parentWidgetData.rect;
 					bool  horiz = ceData.toolBarData.orientation == TQt::Horizontal;
 
@@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
 	}
 }
 
-void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControlMask( ComplexControl control,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          const ControlElementFlags elementFlags,
@@ -2437,7 +2437,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
 			
 		case PM_TabBarTabShiftVertical:
 		{
-			if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING))
+			if (ceData.widgetObjectTypes.contains("TQTabBar"))
 			{
 				if (ceData.tabBarData.shape == TQTabBar::RoundedBelow || 
 					ceData.tabBarData.shape == TQTabBar::TriangularBelow)
@@ -2492,7 +2492,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 
 		case CT_ToolButton:
 		{
-			bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING );
+			bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" );
 			if (!onToolbar) //Behaves like a button, so scale appropriately to the border
 			{
 				int w = contentSize.width();
@@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
 }
 
 
-TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
                                                   const TQStyleControlElementData &ceData,
                                                   ControlElementFlags elementFlags,
                                                   const TQPoint& point,
@@ -2585,7 +2585,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
 	if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine )
 	{
 		TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget );
-		if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal )
+		if ( static_cast< const TQScrollBar* >( widget )->orientation() == TQt::Horizontal )
 		{
 			if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine;
 		}
@@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
 	return result;
 }
 
-TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
 	                              const TQStyleControlElementData &ceData,
 	                              ControlElementFlags elementFlags,
 	                              SubControl subcontrol,
@@ -2778,7 +2778,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
 
 #include <config.h>
 
-#if !defined Q_WS_X11 || defined K_WS_QTONLY
+#if !defined TQ_WS_X11 || defined K_WS_QTONLY
 #undef HAVE_X11_EXTENSIONS_SHAPE_H
 #endif 
 
@@ -2795,29 +2795,29 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
 
-	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+	if (ceData.widgetObjectTypes.contains("TQObject")) {
 		TQObject* object = reinterpret_cast<TQObject*>(source);
 
 		if ( !object->isWidgetType() ) return false;
 	
 		//Combo line edits get special frames
-		if ( event->type() == TQEvent::Paint && ::tqqt_cast<TQLineEdit*>(object) )
+		if ( event->type() == TQEvent::Paint && ::tqt_cast<TQLineEdit*>(object) )
 		{
 			static bool recursion = false;
 			if (recursion )
 				return false;
 	
 			recursion = true;
-			object->event( TQT_TQPAINTEVENT( event ) );
-			TQWidget* widget = TQT_TQWIDGET( object );
+			object->event( static_cast<TQPaintEvent*>( event ) );
+			TQWidget* widget = static_cast<TQWidget*>( object );
 			TQPainter p( widget );
 			Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect,
-				widget->palette().color( TQPalette::Normal, TQColorGroup::Button ),
-				Qt::black, false, Keramik::TilePainter::PaintFullBlend);
+				widget->palette().color( TQPalette::Active, TQColorGroup::Button ),
+				TQt::black, false, Keramik::TilePainter::PaintFullBlend);
 			recursion = false;
 			return true;
 		}
-		else if ( ::tqqt_cast<TQListBox*>(object) ) 
+		else if ( ::tqt_cast<TQListBox*>(object) ) 
 		{
 			//Handle combobox drop downs
 			switch (event->type())
@@ -2826,8 +2826,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 				//Combo dropdowns are shaped	
 				case TQEvent::Resize:
 				{
-					TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object));
-					TQResizeEvent* resize = TQT_TQRESIZEEVENT(event);
+					TQListBox* listbox = static_cast<TQListBox*>(object);
+					TQResizeEvent* resize = static_cast<TQResizeEvent*>(event);
 					if (resize->size().height() < 6)
 						return false;
 			
@@ -2859,8 +2859,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 					{
 						TQPainter p( listbox );
 						Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(),
-								listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ),
-								listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) );
+								listbox->palette().color( TQPalette::Active, TQColorGroup::Button ),
+								listbox->palette().color( TQPalette::Active, TQColorGroup::Background ) );
 			
 						TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() );
 						recursion = true;
@@ -2891,8 +2891,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 					{
 						firstComboPopupRelease = false;
 	
-						TQMouseEvent* mev = TQT_TQMOUSEEVENT(event);
-						TQListBox*    box = static_cast<TQListBox*>(TQT_TQWIDGET(object));
+						TQMouseEvent* mev = static_cast<TQMouseEvent*>(event);
+						TQListBox*    box = static_cast<TQListBox*>(object);
 						
 						TQWidget* parent = box->parentWidget();
 						if (!parent)
@@ -2919,24 +2919,24 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 		{
 			// Draw a gradient background for custom widgets in the toolbar
 			// that have specified a "tde toolbar widget" name.
-			renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object));
+			renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast<TQWidget*>(object));
 	
 			return false;	// Now draw the contents
 		}
 #if 0	// FIXME
 		// This does not work on modern systems
 		// Rather than resorting to hacks like this, which can stop working at any time, the required functionality should simply be added to TQt3!
-		else if (event->type() == TQEvent::Paint  &&  object->parent() && ::tqqt_cast<TQToolBar*>(object->parent()) 
-				&& !::tqqt_cast<TQPopupMenu*>(object) )
+		else if (event->type() == TQEvent::Paint  &&  object->parent() && ::tqt_cast<TQToolBar*>(object->parent()) 
+				&& !::tqt_cast<TQPopupMenu*>(object) )
 		{
 			// We need to override the paint event to draw a
 			// gradient on a QToolBarExtensionWidget.
-			TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent()));
-			TQWidget* widget = TQT_TQWIDGET(object);
+			TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent());
+			TQWidget* widget = static_cast<TQWidget*>(object);
 			TQRect wr = widget->rect (), tr = toolbar->rect();
 			TQPainter p( widget );
 	
-			if ( toolbar->orientation() == Qt::Horizontal )
+			if ( toolbar->orientation() == TQt::Horizontal )
 			{
 				Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(),
 														true /*horizontal*/, false /*not a menu*/,
@@ -2952,7 +2952,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 			
 			//Draw terminator line, too
 			p.setPen( toolbar->colorGroup().mid() );
-			if ( toolbar->orientation() == Qt::Horizontal )
+			if ( toolbar->orientation() == TQt::Horizontal )
 				p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 );
 			else
 				p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 );
@@ -2961,7 +2961,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 		}
 #endif
 		// Track show events for progress bars
-		if ( animateProgressBar && ::tqqt_cast<TQProgressBar*>(object) )
+		if ( animateProgressBar && ::tqt_cast<TQProgressBar*>(object) )
 		{
 			if ((event->type() == TQEvent::Show) && !animationTimer->isActive())
 			{
diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h
index 3792027e3..23cc0d044 100644
--- a/tdestyles/keramik/keramik.h
+++ b/tdestyles/keramik/keramik.h
@@ -41,7 +41,7 @@ class TQProgressBar;
 
 class KeramikStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KeramikStyle();
@@ -65,7 +65,7 @@ public:
 	                          const TQStyleOption& = TQStyleOption::Default,
 	                          const TQWidget* widget = 0 ) const;
 
-	void drawPrimitive( TQ_PrimitiveElement pe,
+	void drawPrimitive( PrimitiveElement pe,
 	                    TQPainter* p,
 	                    const TQStyleControlElementData &ceData,
 	                    ControlElementFlags elementFlags,
@@ -74,7 +74,7 @@ public:
 	                    SFlags flags = Style_Default,
 	                    const TQStyleOption& = TQStyleOption::Default ) const;
 
-	void drawControl( TQ_ControlElement element,
+	void drawControl( ControlElement element,
 	                  TQPainter* p,
 	                  const TQStyleControlElementData &ceData,
 	                  ControlElementFlags elementFlags,
@@ -84,7 +84,7 @@ public:
 	                  const TQStyleOption& opt = TQStyleOption::Default,
 	                  const TQWidget* widget = 0 ) const;
 
-	void drawControlMask( TQ_ControlElement element,
+	void drawControlMask( ControlElement element,
 	                      TQPainter* p,
 	                      const TQStyleControlElementData &ceData,
 	                      ControlElementFlags elementFlags,
@@ -92,7 +92,7 @@ public:
 	                      const TQStyleOption& opt = TQStyleOption::Default,
 	                      const TQWidget* widget = 0 ) const;
 
-	void drawComplexControl( TQ_ComplexControl control,
+	void drawComplexControl( ComplexControl control,
 	                         TQPainter* p,
 	                         const TQStyleControlElementData &ceData,
 	                         ControlElementFlags elementFlags,
@@ -104,7 +104,7 @@ public:
 	                         const TQStyleOption& = TQStyleOption::Default,
 	                         const TQWidget* widget = 0 ) const;
 
-	void drawComplexControlMask( TQ_ComplexControl control,
+	void drawComplexControlMask( ComplexControl control,
 	                             TQPainter* p,
 	                             const TQStyleControlElementData &ceData,
 	                             const ControlElementFlags elementFlags,
@@ -121,21 +121,21 @@ public:
 	                        const TQStyleOption& opt,
 	                        const TQWidget* widget = 0 ) const;
 
-	SubControl querySubControl( TQ_ComplexControl control,
+	SubControl querySubControl( ComplexControl control,
 	                            const TQStyleControlElementData &ceData,
 	                            ControlElementFlags elementFlags,
 	                            const TQPoint& point,
 						        const TQStyleOption& opt = TQStyleOption::Default,
 	                            const TQWidget* widget = 0 ) const;
 
-	TQRect querySubControlMetrics( TQ_ComplexControl control,
+	TQRect querySubControlMetrics( ComplexControl control,
 	                              const TQStyleControlElementData &ceData,
 	                              ControlElementFlags elementFlags,
 	                              SubControl subcontrol,
 	                              const TQStyleOption& opt = TQStyleOption::Default,
 	                              const TQWidget* widget = 0 ) const;
 
-	int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+	int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 			const TQStyleOption & = TQStyleOption::Default,
 			TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
 
diff --git a/tdestyles/keramik/pixmaploader.cpp b/tdestyles/keramik/pixmaploader.cpp
index 73d7eb8d9..b506f9300 100644
--- a/tdestyles/keramik/pixmaploader.cpp
+++ b/tdestyles/keramik/pixmaploader.cpp
@@ -316,7 +316,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 {
 	if (mode == PaintTrivialMask)
 	{
-		p->fillRect(x, y, width, height, Qt::color1);
+		p->fillRect(x, y, width, height, TQt::color1);
 		return;
 	}
 
@@ -425,12 +425,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 						const TQBitmap* mask  = scale( col, row, w, h, color,  bg, disabled, false ).mask();
 						if (mask)
 						{
-							p->setBackgroundColor(Qt::color0);
-							p->setPen(Qt::color1);
+							p->setBackgroundColor(TQt::color0);
+							p->setPen(TQt::color1);
 							p->drawTiledPixmap( xpos, ypos, realW, realH, *mask);
 						}
 						else
-							p->fillRect ( xpos, ypos, realW, realH, Qt::color1);
+							p->fillRect ( xpos, ypos, realW, realH, TQt::color1);
 					}
 				}
 				else
@@ -445,12 +445,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 						const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask();
 						if (mask)
 						{
-							p->setBackgroundColor(Qt::color0);
-							p->setPen(Qt::color1);
+							p->setBackgroundColor(TQt::color0);
+							p->setPen(TQt::color1);
 							p->drawTiledPixmap( xpos, ypos, realW, realH, *mask);
 						}
 						else
-							p->fillRect ( xpos, ypos, realW, realH, Qt::color1);
+							p->fillRect ( xpos, ypos, realW, realH, TQt::color1);
 
 					}
 				}
diff --git a/tdestyles/keramik/pixmaploader.h b/tdestyles/keramik/pixmaploader.h
index b03cf3800..3bfcd2d1b 100644
--- a/tdestyles/keramik/pixmaploader.h
+++ b/tdestyles/keramik/pixmaploader.h
@@ -67,8 +67,8 @@ namespace Keramik
 			int m_id;
 			int m_width;
 			int m_height;
-			QRgb m_colorCode;
-			QRgb m_bgCode;
+			TQRgb m_colorCode;
+			TQRgb m_bgCode;
 			bool    m_disabled;
 			bool    m_blended;
 
diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp
index 8daf82c06..1dcfadf56 100644
--- a/tdestyles/klegacy/klegacystyle.cpp
+++ b/tdestyles/klegacy/klegacystyle.cpp
@@ -81,7 +81,6 @@
 #include <tqregexp.h>
 #include <tqscrollbar.h>
 #include <tqscrollview.h>
-#include <tqsemimodal.h>
 #include <tqsizegrip.h>
 #include <tqslider.h>
 #include <tqspinbox.h>
@@ -387,7 +386,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
 	// draw the image
 	bool mask = image->hasAlphaBuffer();
 	TQBitmap bm(width, height);
-	bm.fill(Qt::color1);
+	bm.fill(TQt::color1);
 
 	TQImage nimage[3][3];
 	int xx = -1, yy = -1;
@@ -404,12 +403,12 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
 		if (nimage[yy][xx].isNull()) continue;
 
 		bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx],
-		       0, 0, w2[xx], h2[yy], Qt::CopyROP);
+		       0, 0, w2[xx], h2[yy], TQt::CopyROP);
 
 		if (mask) {
                     TQImage am = nimage[yy][xx].createAlphaMask();
 		    bitBlt(&bm, x2[xx], y2[yy], &am,
-			   0, 0, w2[xx], h2[yy], Qt::CopyROP);
+			   0, 0, w2[xx], h2[yy], TQt::CopyROP);
                 }
 	    }
 	}
@@ -419,14 +418,14 @@ static TQPixmap *drawImage(TQImage *image, int width, int height,
     } else {
 	for (int y = 0; y < height; y += image->height())
 	    for (int x = 0; x < width; x += image->width())
-		bitBlt(pixmap, x, y, image, 0, 0, -1, -1, Qt::CopyROP);
+		bitBlt(pixmap, x, y, image, 0, 0, -1, -1, TQt::CopyROP);
 
 	if (image->hasAlphaBuffer()) {
 	    TQImage mask = image->createAlphaMask();
 
 	    if (! mask.isNull() && mask.depth() == 1) {
 		TQBitmap bm(width, height);
-		bm.fill(Qt::color1);
+		bm.fill(TQt::color1);
 		bm = mask;
 		pixmap->setMask(bm);
 	    }
@@ -707,7 +706,6 @@ static GtkObject *initialize(TQPtrDict<GtkObject> &dict) {
     dict.insert(TQRadioButton::staticMetaObject(), myGtkRadioButton);
     dict.insert(TQScrollBar::staticMetaObject(), myGtkScrollbar);
     dict.insert(TQScrollView::staticMetaObject(), myGtkViewport);
-    dict.insert(TQSemiModal::staticMetaObject(), myGtkDialog);
     dict.insert(TQSizeGrip::staticMetaObject(), myGtkWidget);
     dict.insert(TQSlider::staticMetaObject(), myGtkScale);
     dict.insert(TQSpinBox::staticMetaObject(), myGtkSpinButton);
@@ -1210,13 +1208,13 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
 	    if (equals.isNull() || parameter.isNull() || equals != "=") continue;
 
 	    if (parameter == "UP")
-		imagedata->key.data.arrowDirection = Qt::UpArrow + 1;
+		imagedata->key.data.arrowDirection = TQt::UpArrow + 1;
 	    else if (parameter == "DOWN")
-		imagedata->key.data.arrowDirection = Qt::DownArrow + 1;
+		imagedata->key.data.arrowDirection = TQt::DownArrow + 1;
 	    else if (parameter == "LEFT")
-		imagedata->key.data.arrowDirection = Qt::LeftArrow + 1;
+		imagedata->key.data.arrowDirection = TQt::LeftArrow + 1;
 	    else if (parameter == "RIGHT")
-		imagedata->key.data.arrowDirection = Qt::RightArrow + 1;
+		imagedata->key.data.arrowDirection = TQt::RightArrow + 1;
 	} else if (next == "border") {
 	    filestream >> equals;
 	    filestream >> parameter;
@@ -1323,9 +1321,9 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) {
 	    if (equals.isNull() || parameter.isNull() || equals != "=") continue;
 
 	    if (parameter == "VERTICAL")
-		imagedata->key.data.orientation = Qt::Vertical + 1;
+		imagedata->key.data.orientation = TQt::Vertical + 1;
 	    else if (parameter == "HORIZONTAL")
-		imagedata->key.data.orientation = Qt::Horizontal + 1;
+		imagedata->key.data.orientation = TQt::Horizontal + 1;
 	} else if (next == "overlay_border") {
 	    filestream >> equals;
 	    filestream >> parameter;
@@ -1821,9 +1819,9 @@ void KLegacyStyle::polish(TQApplication *app) {
 	brush.setColor(gobj->backColor(KLegacy::Active));
 	pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush);
 
-	brush = pal.brush(TQPalette::Normal, TQColorGroup::Button);
+	brush = pal.brush(TQPalette::Active, TQColorGroup::Button);
 	brush.setColor(gobj->backColor(KLegacy::Normal));
-	pal.setBrush(TQPalette::Normal, TQColorGroup::Button, brush);
+	pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush);
 
 	brush = pal.brush(TQPalette::Disabled, TQColorGroup::Button);
 	brush.setColor(gobj->backColor(KLegacy::Insensitive));
@@ -1898,23 +1896,23 @@ void KLegacyStyle::polish(TQWidget *widget) {
     bool immediateRender = false;
     bool bgPixmap = false;
 
-    if (widget->inherits(TQBUTTON_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQButton")) {
 	metaobject = TQButton::staticMetaObject();
 	eventFilter = true;
     }
 
-    if (widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQComboBox")) {
 	metaobject = TQComboBox::staticMetaObject();
 	eventFilter = true;
     }
 
-    if (widget->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQScrollBar")) {
 	metaobject = TQScrollBar::staticMetaObject();
 	eventFilter = true;
 	mouseTrack = true;
     }
 
-    if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQMenuBar")) {
 	eventFilter = true;
 	immediateRender = true;
 
@@ -1930,7 +1928,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
 	widget->setBackgroundMode(TQWidget::PaletteBackground);
     }
 
-    if (widget->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQToolBar")) {
 	metaobject = TQToolBar::staticMetaObject();
 
 	eventFilter = true;
@@ -1944,7 +1942,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
 	widget->setBackgroundMode(TQWidget::PaletteBackground);
     }
 
-    if (widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQLineEdit")) {
 	metaobject = TQLineEdit::staticMetaObject();
 
 	eventFilter = true;
@@ -1968,7 +1966,7 @@ void KLegacyStyle::polish(TQWidget *widget) {
 	detail = "base";
     }
 
-    if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) {
+    if (widget->inherits("TQPopupMenu")) {
 	tqDebug("polishing popup '%s'", widget->className());
 	metaobject = TQPopupMenu::staticMetaObject();
 	widget->setBackgroundMode(TQWidget::PaletteBackground);
@@ -2216,7 +2214,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) {
 	key.data.shadow = KLegacy::In;
     } else {
 	key.data.state = ((btn->isEnabled()) ?
-			  ((static_cast<TQWidget *>( btn ) == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) :
+			  ((btn == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) :
 			  KLegacy::Insensitive);
 	key.data.shadow = ((btn->isOn() || btn->isDown()) ?
 			   KLegacy::In : KLegacy::Out);
@@ -2544,7 +2542,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h,
     key.data.state = KLegacy::Normal;
     key.data.shadow = KLegacy::Out;
 
-    if (priv->lastWidget && priv->lastWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING))
+    if (priv->lastWidget && priv->lastWidget->inherits("TQComboBox"))
 	key.data.state = KLegacy::Prelight;
 
     TQPixmap *pix = gobj->draw(key, w, h, "optionmenu");
@@ -3081,7 +3079,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	{
 	    TQWidget *w = (TQWidget *) obj;
 
-	    if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && w->width() < 700) {
+	    if (w->inherits("TQPopupMenu") && w->width() < 700) {
 		GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject());
 
 		if (gobj) {
@@ -3151,7 +3149,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 		    if (p && (! p->isNull()))
 			w->setBackgroundPixmap(*p);
 		}
-	    } else if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) {
+	    } else if (w->inherits("TQLineEdit")) {
 		GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject());
 
 		if (gobj) {
@@ -3191,8 +3189,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 			w->setPalette(pal);
 		    }
 		}
-	    } else if (w->inherits(TQMENUBAR_OBJECT_NAME_STRING) ||
-		       w->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
+	    } else if (w->inherits("TQMenuBar") ||
+		       w->inherits("TQToolBar")) {
 		GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject());
 
 		if (gobj) {
@@ -3256,13 +3254,13 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 
     case TQEvent::Enter:
 	{
-	    if (obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) ||
-		obj->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) ||
-		obj->inherits(TQSLIDER_OBJECT_NAME_STRING) ||
-		obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) {
+	    if (obj->inherits("TQPushButton") ||
+		obj->inherits("TQComboBox") ||
+		obj->inherits("TQSlider") ||
+		obj->inherits("TQScrollBar")) {
 		priv->lastWidget = (TQWidget *) obj;
 		priv->lastWidget->repaint(false);
-	    } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) {
+	    } else if (obj->inherits("TQRadioButton")) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel() && w->isEnabled()) {
@@ -3277,11 +3275,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 
 			if (pix && (! pix->isNull())) {
 			    TQPalette pal = w->palette();
-			    TQBrush brush = pal.brush(TQPalette::Normal,
+			    TQBrush brush = pal.brush(TQPalette::Active,
 						     TQColorGroup::Background);
 
 			    brush.setPixmap(*pix);
-			    pal.setBrush(TQPalette::Normal,
+			    pal.setBrush(TQPalette::Active,
 					 TQColorGroup::Background, brush);
 
 			    w->setPalette(pal);
@@ -3290,7 +3288,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 			}
 		    }
 		}
-	    } else if (obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) {
+	    } else if (obj->inherits("TQCheckBox")) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel() && w->isEnabled()) {
@@ -3305,11 +3303,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 
 			if (pix && (! pix->isNull())) {
 			    TQPalette pal = w->palette();
-			    TQBrush brush = pal.brush(TQPalette::Normal,
+			    TQBrush brush = pal.brush(TQPalette::Active,
 						     TQColorGroup::Background);
 
 			    brush.setPixmap(*pix);
-			    pal.setBrush(TQPalette::Normal,
+			    pal.setBrush(TQPalette::Active,
 					 TQColorGroup::Background, brush);
 
 			    w->setPalette(pal);
@@ -3328,8 +3326,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	    if (obj == priv->lastWidget) {
 		priv->lastWidget = 0;
 		((TQWidget *) obj)->repaint(false);
-	    } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) ||
-		       obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) {
+	    } else if (obj->inherits("TQRadioButton") ||
+		       obj->inherits("TQCheckBox")) {
 		TQWidget *w = (TQWidget *) obj;
 
 		if (! w->isTopLevel()) {
@@ -3346,7 +3344,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) {
 	{
 	    TQMouseEvent *me = (TQMouseEvent *) e;
 	    priv->mousePos = me->pos();
-	    if (obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING) &&
+	    if (obj->inherits("TQScrollBar") &&
 		(! (me->state() & (LeftButton | MidButton | RightButton)))) {
 		priv->hovering = true;
 		((TQWidget *) obj)->repaint(false);
diff --git a/tdestyles/klegacy/klegacystyle.h b/tdestyles/klegacy/klegacystyle.h
index f82fd5d0a..dccf6cae1 100644
--- a/tdestyles/klegacy/klegacystyle.h
+++ b/tdestyles/klegacy/klegacystyle.h
@@ -31,8 +31,8 @@
 class KLegacyStylePrivate;
 
 
-class Q_EXPORT KLegacyStyle : public TDEStyle {
-    Q_OBJECT
+class TQ_EXPORT KLegacyStyle : public TDEStyle {
+    TQ_OBJECT
 public:
     KLegacyStyle(void);
     virtual ~KLegacyStyle(void);
diff --git a/tdestyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp
index 8e1f5605f..c666e2c86 100644
--- a/tdestyles/kthemestyle/kthemebase.cpp
+++ b/tdestyles/kthemestyle/kthemebase.cpp
@@ -231,7 +231,7 @@ union kthemeKey{
     unsigned int cacheKey;
 };
 
-#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x)))
+#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))
 
 void KThemeBase::generateBorderPix( int i )
 {
@@ -243,42 +243,42 @@ void KThemeBase::generateBorderPix( int i )
         TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
         TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
 
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, 0, pbWidth[ i ], pbWidth[ i ],
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ],
                 TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ],
                     TQt::CopyROP, false );
             tmp.setMask( destMask );
         }
         pbPixmaps[ i ] ->setBorder( KThemePixmap::TopLeft, tmp );
 
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0,
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], 0,
                 pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
                     0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
             tmp.setMask( destMask );
         }
         pbPixmaps[ i ] ->setBorder( KThemePixmap::TopRight, tmp );
 
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
                 pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ],
                     pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false );
             tmp.setMask( destMask );
         }
         pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomLeft, tmp );
 
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ],
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
                 pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ],
                 TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
                     pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ],
                     TQt::CopyROP, false );
             tmp.setMask( destMask );
@@ -287,23 +287,23 @@ void KThemeBase::generateBorderPix( int i )
 
         tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] );
         destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] );
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], 0,
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], 0,
                 pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0,
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0,
                     pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ],
                     TQt::CopyROP, false );
             tmp.setMask( destMask );
         }
         pbPixmaps[ i ] ->setBorder( KThemePixmap::Top, tmp );
 
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ],
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ],
                 pbPixmaps[ i ] ->height() - pbWidth[ i ],
                 pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ],
                     pbPixmaps[ i ] ->height() - pbWidth[ i ],
                     pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false );
             tmp.setMask( destMask );
@@ -312,23 +312,23 @@ void KThemeBase::generateBorderPix( int i )
 
         tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 );
         destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 );
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbWidth[ i ], pbWidth[ i ],
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbWidth[ i ], pbWidth[ i ],
                 pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ],
                     pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false );
             tmp.setMask( destMask );
         }
 
         pbPixmaps[ i ] ->setBorder( KThemePixmap::Left, tmp );
 
-        bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ],
+        bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
                 pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
                 TQt::CopyROP, false );
         if ( srcMask )
         {
-            bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
+            bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ],
                     pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
                     TQt::CopyROP, false );
             tmp.setMask( destMask );
@@ -439,7 +439,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ )
     {
         if ( config.entryList( configFileName + widgetEntries[ i ] ).size() )
             applyResourceGroup( &config, i );
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
 
         else
         {
@@ -617,7 +617,7 @@ void KThemeBase::applyConfigFile( TQSettings& config )
         d->overrideWindowForeground = false;
 
 
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
 
     for ( int input = 0; input < WIDGETS; ++input )
     {
@@ -813,10 +813,10 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         const TQBitmap *srcMask = tmp->mask();
         int bdWidth = tmp->width();
 
-        bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth,
+        bitBlt( pixmap, 0, 0, tmp, 0, 0, bdWidth, bdWidth,
                 TQt::CopyROP, false );
         if ( srcMask )
-            bitBlt( TQT_TQPAINTDEVICE(&mask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth,
+            bitBlt( &mask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth,
                     TQt::CopyROP, false );
         else
             mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 );
@@ -824,30 +824,30 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight );
         srcMask = tmp->mask();
-        bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth,
+        bitBlt( pixmap, w - bdWidth, 0, tmp, 0, 0, bdWidth,
                 bdWidth, TQt::CopyROP, false );
         if ( srcMask )
-            bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth,
+            bitBlt( &mask, w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth,
                     bdWidth, TQt::CopyROP, false );
         else
             mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft );
         srcMask = tmp->mask();
-        bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth,
+        bitBlt( pixmap, 0, h - bdWidth, tmp, 0, 0, bdWidth,
                 bdWidth, TQt::CopyROP, false );
         if ( srcMask )
-            bitBlt( TQT_TQPAINTDEVICE(&mask), 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth,
+            bitBlt( &mask, 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth,
                     bdWidth, TQt::CopyROP, false );
         else
             mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight );
         srcMask = tmp->mask();
-        bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0,
+        bitBlt( pixmap, w - bdWidth, h - bdWidth, tmp, 0, 0,
                 bdWidth, bdWidth, TQt::CopyROP, false );
         if ( srcMask )
-            bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
+            bitBlt( &mask, w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
                     bdWidth, bdWidth, TQt::CopyROP, false );
         else
             mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 );
@@ -860,7 +860,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp );
             if ( srcMask )
-                bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
+                bitBlt( &mask, bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
                         w - bdWidth * 2, bdWidth, TQt::CopyROP, false );
             else
                 mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 );
@@ -870,7 +870,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
                                *tmp );
             if ( srcMask )
-                bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
+                bitBlt( &mask, bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
                         w - bdWidth * 2, bdWidth, TQt::CopyROP, false );
             else
                 mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
@@ -882,7 +882,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             srcMask = tmp->mask();
             p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp );
             if ( srcMask )
-                bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
+                bitBlt( &mask, 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
                         bdWidth, h - bdWidth * 2, TQt::CopyROP, false );
             else
                 mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 );
@@ -892,7 +892,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2,
                                *tmp );
             if ( srcMask )
-                bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
+                bitBlt( &mask, w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
                         bdWidth, h - bdWidth * 2, TQt::CopyROP, false );
             else
                 mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 );
@@ -1111,7 +1111,7 @@ TQColorGroup* KThemeBase::makeColorGroup( const TQColor &fg, const TQColor &bg,
 
 void KThemeBase::applyMiscResourceGroup( TQSettings *config )
 {
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
     d->props.erase( "Misc" ); // clear the old property
 
     TQString base = configFileName + "Misc/";
@@ -1181,7 +1181,7 @@ static TQColor readColorEntry( Prop& prop, TQString setting, const TQColor& def
 
 void KThemeBase::readMiscResourceGroup()
 {
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
     Prop & prop = d->props[ "Misc" ];
 
     sbPlacement = ( SButton ) readNumEntry( prop, "SButtonPosition",
@@ -1198,7 +1198,7 @@ void KThemeBase::readMiscResourceGroup()
 
 void KThemeBase::applyResourceGroup( TQSettings *config, int i )
 {
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
     TQString tmpStr;
     int tmpVal;
 
@@ -1357,7 +1357,7 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i )
 void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdnames,
                                     bool *loadArray )
 {
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
     if ( loadArray[ i ] == true )
     {
         return ; // already been preloaded.
@@ -1636,7 +1636,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal )
         disfg = disfg.light( highlightVal );
     else
         // black fg - use darkgray disabled fg
-        disfg = Qt::darkGray;
+        disfg = TQt::darkGray;
 
 
     TQColorGroup disabledgrp( disfg, background,   //TODO:Convert this to the new ctor.
@@ -1738,7 +1738,7 @@ KThemeCache::KThemeCache( int maxSize, TQObject *parent, const char *name )
     cache.setMaxCost( maxSize * 1024 );
     cache.setAutoDelete( true );
     flushTimer.start( 300000 ); // 5 minutes
-    connect( &flushTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( flushTimeout() ) );
+    connect( &flushTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( flushTimeout() ) );
 }
 
 void KThemeCache::flushTimeout()
diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h
index 01ecab138..5317c806c 100644
--- a/tdestyles/kthemestyle/kthemebase.h
+++ b/tdestyles/kthemestyle/kthemebase.h
@@ -122,7 +122,7 @@ inline bool KThemePixmap::isOld()
  */
 class KThemeCache : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * The scale hints supported by the cache. Note that Tiled is not here
@@ -213,7 +213,7 @@ class KThemeBasePrivate;
  */
 class KThemeBase: public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a new KThemeBase object.
@@ -517,12 +517,12 @@ protected:
                                  SFlags flags = Style_Default,
                                  const TQStyleOption& option = TQStyleOption::Default ) const
     {
-        TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
+        TDEStyle::drawPrimitive ( pe, p, ceData, elementFlags, r, cg,
                                 flags, option );
     }
 
 
-    virtual void drawControl( TQ_ControlElement element,
+    virtual void drawControl( ControlElement element,
                               TQPainter *p,
                               const TQStyleControlElementData &ceData,
                               ControlElementFlags elementFlags,
@@ -536,7 +536,7 @@ protected:
                              r, cg, how, opt, widget );
     }
 
-    virtual void drawControlMask( TQ_ControlElement element,
+    virtual void drawControlMask( ControlElement element,
                                   TQPainter *p,
                                   const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
@@ -548,7 +548,7 @@ protected:
     }
 
 
-    virtual void drawComplexControl( TQ_ComplexControl control,
+    virtual void drawComplexControl( ComplexControl control,
                                      TQPainter *p,
                                      const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp
index a3e83e8f7..0316ded89 100644
--- a/tdestyles/kthemestyle/kthemestyle.cpp
+++ b/tdestyles/kthemestyle/kthemestyle.cpp
@@ -422,7 +422,7 @@ KThemeStyle::~KThemeStyle()
 
 void KThemeStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr )
 {
-    if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQApplication")) {
         TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
         if (!qstrcmp(app->argv()[0], "kicker")) {
             kickerMode = true;
@@ -450,7 +450,7 @@ void KThemeStyle::polish( TQPalette &p )
 
     if ( isPixmap( Background ) )
     {
-        TQBrush bgBrush( p.color( TQPalette::Normal,
+        TQBrush bgBrush( p.color( TQPalette::Active,
                                 TQColorGroup::Background ),
                                 *uncached( Background ) );
         brushHandle = uncached( Background )->handle();
@@ -470,7 +470,7 @@ void KThemeStyle::paletteChanged()
 
 void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr )
 {
-    if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQApplication")) {
         TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
         app->setPalette( oldPalette, true );
     }
@@ -478,7 +478,7 @@ void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData,
 
 bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
-    if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQObject")) {
         TQObject* object = reinterpret_cast<TQObject*>(source);
 
         if( object->inherits("KActiveLabel"))
@@ -486,7 +486,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
             if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize ||
                 event->type() == TQEvent::Show)
             {
-                TQWidget *w = TQT_TQWIDGET(object);
+                TQWidget *w = static_cast<TQWidget*>(object);
                 TQPoint pos(0, 0);
                 pos = w->mapTo(w->topLevelWidget(), pos);
                 TQPixmap pix(uncached( Background )->size());
@@ -499,16 +499,16 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
                                 pos.x(), pos.y());
                 p.end();
                 TQPalette pal(w->palette());
-                TQBrush brush( pal.color( TQPalette::Normal,
+                TQBrush brush( pal.color( TQPalette::Active,
                                                         TQColorGroup::Background),
                                     pix );
                 pal.setBrush(TQColorGroup::Base, brush);
                 w->setPalette(pal);
             }
         }
-        if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits(TQLABEL_OBJECT_NAME_STRING))
+        if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel"))
         {
-            TQWidget* lb = TQT_TQWIDGET(object);
+            TQWidget* lb = static_cast<TQWidget*>(object);
             if (lb->backgroundMode() == TQt::PaletteButton)
                 lb->setBackgroundMode(TQt::PaletteBackground);
             removeObjectEventHandler(ceData, elementFlags, source, this);
@@ -520,13 +520,13 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C
 
 void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-    if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQWidget")) {
         TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
 
-        if (::tqqt_cast<TQStatusBar*>(w))
-            w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background));
+        if (::tqt_cast<TQStatusBar*>(w))
+            w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Active, TQColorGroup::Background));
 
-        if (::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget"))
+        if (::tqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget"))
             installObjectEventHandler(ceData, elementFlags, ptr, this);
 
         if (w->backgroundPixmap() && !w->isTopLevel() && 
@@ -550,9 +550,9 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         {
             polishLock = true;
 
-            TQColorGroup clrGroup( Qt::black, TQColor( 255, 255, 220 ),
-                                TQColor( 96, 96, 96 ), Qt::black, Qt::black,
-                                Qt::black, TQColor( 255, 255, 220 ) );
+            TQColorGroup clrGroup( TQt::black, TQColor( 255, 255, 220 ),
+                                TQColor( 96, 96, 96 ), TQt::black, TQt::black,
+                                TQt::black, TQColor( 255, 255, 220 ) );
             TQPalette toolTip ( clrGroup, clrGroup, clrGroup );
 
             TQToolTip::setPalette( toolTip );
@@ -565,7 +565,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
             return ;
         }
 
-        if ( ::tqqt_cast<TQMenuBar*>(w) )
+        if ( ::tqt_cast<TQMenuBar*>(w) )
         {
             w->setBackgroundMode( TQWidget::NoBackground );
         }
@@ -573,7 +573,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
         {
             w->setBackgroundMode( TQWidget::PaletteBackground );
         }
-        else if ( ::tqqt_cast<TQPopupMenu*>(w) )
+        else if ( ::tqt_cast<TQPopupMenu*>(w) )
         {
             popupPalette = w->palette();
             if ( isColor( MenuItem ) || isColor( MenuItemDown ) )
@@ -593,7 +593,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
 
             w->setBackgroundMode( TQWidget::NoBackground );
         }
-        else if ( ::tqqt_cast<TQCheckBox*>(w) )
+        else if ( ::tqt_cast<TQCheckBox*>(w) )
         {
             if ( isColor( IndicatorOff ) || isColor( IndicatorOn ) )
             {
@@ -608,7 +608,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
                 w->setPalette( newPal );
             }
         }
-        else if ( ::tqqt_cast<TQRadioButton*>(w) )
+        else if ( ::tqt_cast<TQRadioButton*>(w) )
         {
             if ( isColor( ExIndicatorOff ) || isColor( ExIndicatorOn ) )
             {
@@ -631,7 +631,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen
 
 void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-    if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQWidget")) {
         TQWidget *w = reinterpret_cast<TQWidget*>(ptr);
 
         if (w->backgroundPixmap() && !w->isTopLevel())
@@ -644,21 +644,21 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem
         }
 
         //Toolbar labels should nornally be PaletteButton
-        if ( ::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget"))
+        if ( ::tqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget"))
             w->setBackgroundMode( TQWidget::PaletteButton );
 
         //The same for menu bars, popup menus
-        else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQPopupMenu*>(w) )
+        else if ( ::tqt_cast<TQMenuBar*>(w) || ::tqt_cast<TQPopupMenu*>(w) )
             w->setBackgroundMode( TQWidget::PaletteButton );
 
-        //For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class)
+        //For toolbar internal separators, return to button, too (can't use tqt_cast here since don't have access to the class)
         else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) )
             w->setBackgroundMode( TQWidget::PaletteButton );
 
         //For scrollbars, we don't do much, since the widget queries the style on the switch
 
         //Drop some custom palettes. ### this really should check the serial number to be 100% correct.
-        if ( ::tqqt_cast<TQPopupMenu*>(w) || ::tqqt_cast<TQCheckBox*>(w) || ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQStatusBar*>(w) )
+        if ( ::tqt_cast<TQPopupMenu*>(w) || ::tqt_cast<TQCheckBox*>(w) || ::tqt_cast<TQRadioButton*>(w) || ::tqt_cast<TQStatusBar*>(w) )
          w->unsetPalette();
     }
 
@@ -677,7 +677,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h,
     if ( gradientHint( type ) == GrReverseBevel )
     {
         int i;
-        bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h,
+        bitBlt( p->device(), x, y, scalePixmap( w, h, type ), 0, 0, w, h,
                 TQt::CopyROP, true );
         p->setPen( g.text() );
         for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 )
@@ -717,7 +717,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h,
         }
         if ( borderPixmap( type ) )
         {
-            bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h,
+            bitBlt( p->device(), x, y, scaleBorder( w, h, type ), 0, 0, w, h,
                     TQt::CopyROP, false );
         }
         else
@@ -927,7 +927,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt
                     const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask();
                     if ( mask )
                     {
-                        p->setPen( Qt::color1 );
+                        p->setPen( TQt::color1 );
                         p->drawPixmap( x, y, *mask );
                     }
                     else
@@ -945,7 +945,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt
                                                      IndicatorOff ) ->mask();
                     if ( mask )
                     {
-                        p->setPen( Qt::color1 );
+                        p->setPen( TQt::color1 );
                         p->drawPixmap( x, y, *mask );
                     }
                     else
@@ -1686,14 +1686,14 @@ void KThemeStyle::drawControl( ControlElement element,
 
                         // Draw the pixmap
                         if ( pixmap->depth() == 1 )
-                            p->setBackgroundMode( Qt::OpaqueMode );
+                            p->setBackgroundMode( TQt::OpaqueMode );
 
                         int diffw = ( ( w - pixmap->width() ) / 2 )
                                     + ( ( w - pixmap->width() ) % 2 );
                         p->drawPixmap( x + diffw, y + itemFrame, *pixmap );
 
                         if ( pixmap->depth() == 1 )
-                            p->setBackgroundMode( Qt::TransparentMode );
+                            p->setBackgroundMode( TQt::TransparentMode );
                     }
                 }
 
@@ -1851,7 +1851,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                 if ( !roundSlider() )
                 {
                     const TQSlider * slider = ( const TQSlider* ) widget;
-                    bool horizontal = slider->orientation() == Qt::Horizontal;
+                    bool horizontal = slider->orientation() == TQt::Horizontal;
                     if ( horizontal )
                     {
                         drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true,
@@ -1867,7 +1867,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                 {
                     //This code is from HighColorDefault..
                     const TQSlider* slider = ( const TQSlider* ) widget;
-                    bool horizontal = slider->orientation() == Qt::Horizontal;
+                    bool horizontal = slider->orientation() == TQt::Horizontal;
                     int gcenter = ( horizontal ? r.height() : r.width() ) / 2;
 
                     TQRect gr;
@@ -1903,7 +1903,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                 if ( isPixmap( Slider ) )
                 {
                     const TQSlider * slider = ( const TQSlider* ) widget;
-                    bool horizontal = slider->orientation() == Qt::Horizontal;
+                    bool horizontal = slider->orientation() == TQt::Horizontal;
                     if ( horizontal )
                     {
                         bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2,
@@ -1928,7 +1928,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
                     //This code again from HighColor..
                     //...except sans the gradient..
                     const TQSlider* slider = ( const TQSlider* ) widget;
-                    bool horizontal = slider->orientation() == Qt::Horizontal;
+                    bool horizontal = slider->orientation() == TQt::Horizontal;
                     int x, y, w, h;
                     r.rect( &x, &y, &w, &h );
                     int x2 = x + w - 1;
@@ -2013,7 +2013,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 
 
 
-void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
                                        const TQRect & r, const TQColorGroup & g, SFlags how ,
                                        SCFlags controls, SCFlags active,
                                        const TQStyleOption & opt, const TQWidget * widget ) const
@@ -2115,7 +2115,7 @@ void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p,
             {
                 const TQScrollBar *sb = ( const TQScrollBar* ) widget;
                 bool maxedOut = ( sb->minValue() == sb->maxValue() );
-                bool horizontal = ( sb->orientation() == Qt::Horizontal );
+                bool horizontal = ( sb->orientation() == TQt::Horizontal );
                 SFlags sflags = ( ( horizontal ? Style_Horizontal : Style_Default ) |
                                   ( maxedOut ? Style_Default : Style_Enabled ) );
 
@@ -2374,7 +2374,7 @@ void KThemeStyle::drawShade( TQPainter *p, int x, int y, int w, int h,
             ++x, ++y;
             --x2, --y2;
         }
-        p->setPen( Qt::black );
+        p->setPen( TQt::black );
         p->drawPoints( bPntArray );
         p->drawLineSegments( bLineArray );
         p->setPen( highPen );
diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h
index ca112ed14..029301aae 100644
--- a/tdestyles/kthemestyle/kthemestyle.h
+++ b/tdestyles/kthemestyle/kthemestyle.h
@@ -67,7 +67,7 @@ Copyright (C) 2000 Daniel M. Duley   <mosfet@kde.org>
 
 class KThemeStyle: public KThemeBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a new KThemeStyle object.
@@ -104,7 +104,7 @@ public:
                                   const TQWidget *widget = 0 ) const;
 
 
-    virtual void drawComplexControl( TQ_ComplexControl control,
+    virtual void drawComplexControl( ComplexControl control,
                                      TQPainter *p,
                                      const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
@@ -227,7 +227,7 @@ protected:
     mutable TQPixmap* menuCache;
     mutable TQPixmap* vsliderCache;
 
-    Qt::HANDLE brushHandle;
+    TQt::HANDLE brushHandle;
     bool brushHandleSet;
     bool kickerMode;
 
diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp
index 35b7cc813..fbf197b88 100644
--- a/tdestyles/light/lightstyle-v2.cpp
+++ b/tdestyles/light/lightstyle-v2.cpp
@@ -129,7 +129,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg
     if (fill) p->fillRect(br, *fill);
 }
 
-void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
+void LightStyleV2::drawPrimitive( PrimitiveElement pe,
 				TQPainter *p,
 				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
@@ -298,7 +298,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
 	    if ( p && p->device()->devType() == TQInternal::Widget ) {
 		TQWidget *w = (TQWidget *) p->device();
 		TQWidget *p = w->parentWidget();
-		if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
+		if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) {
 		    drawTitle = true;
 		    title = p->caption();
 		}
@@ -447,7 +447,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarSubLine:
 	{
 	    TQRect fr = r, ar = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen(cg.dark());
 	    if (flags & Style_Horizontal) {
@@ -472,7 +472,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarAddLine:
 	{
 	    TQRect fr = r, ar = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen(cg.dark());
 	    if (flags & Style_Horizontal) {
@@ -642,7 +642,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe,
     }
 }
 
-void LightStyleV2::drawControl( TQ_ControlElement control,
+void LightStyleV2::drawControl( ControlElement control,
 			      TQPainter *p,
 			      const TQStyleControlElementData &ceData,
 			      ControlElementFlags elementFlags,
@@ -948,10 +948,10 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
 	    } else if (mi->pixmap()) {
 		TQPixmap pixmap = *mi->pixmap();
 		if (pixmap.depth() == 1)
-		    p->setBackgroundMode(Qt::OpaqueMode);
+		    p->setBackgroundMode(TQt::OpaqueMode);
 		p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap);
 		if (pixmap.depth() == 1)
-		    p->setBackgroundMode(Qt::TransparentMode);
+		    p->setBackgroundMode(TQt::TransparentMode);
 	    }
 
 	    if (mi->popup())
@@ -999,7 +999,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
     }
 }
 
-void LightStyleV2::drawControlMask( TQ_ControlElement control,
+void LightStyleV2::drawControlMask( ControlElement control,
 				  TQPainter *p,
 				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
@@ -1045,7 +1045,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &c
     return rect;
 }
 
-void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
+void LightStyleV2::drawComplexControl( ComplexControl control,
 				     TQPainter* p,
 				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
@@ -1119,7 +1119,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
 	    const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
 	    TQRect frame, up, down;
 
-	    frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags,
+	    frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
 					   SC_SpinWidgetFrame, data, widget);
 	    up = ceData.spinWidgetData.upRect;
 	    down = ceData.spinWidgetData.downRect;
@@ -1129,7 +1129,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
 			       &cg.brush(TQColorGroup::Base));
 
 	    if ((controls & SC_SpinWidgetUp) && up.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetUp;
+		PrimitiveElement pe = PE_SpinWidgetUp;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetPlus;
 
@@ -1162,7 +1162,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
 	    }
 
 	    if ((controls & SC_SpinWidgetDown) && down.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetDown;
+		PrimitiveElement pe = PE_SpinWidgetDown;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetMinus;
 
@@ -1329,7 +1329,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
     }
 }
 
-TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
+TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
 					  const TQStyleControlElementData &ceData,
 					  ControlElementFlags elementFlags,
 					  SubControl sc,
@@ -1424,7 +1424,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
     return ret;
 }
 
-TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control,
 						const TQStyleControlElementData &ceData,
 						ControlElementFlags elementFlags,
 						const TQPoint &pos,
@@ -1625,7 +1625,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents,
     return ret;
 }
 
-int LightStyleV2::styleHint( TQ_StyleHint stylehint,
+int LightStyleV2::styleHint( StyleHint stylehint,
 			   const TQStyleControlElementData &ceData,
 			   ControlElementFlags elementFlags,
 			   const TQStyleOption &option,
diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h
index 90b3e89c9..17240ac88 100644
--- a/tdestyles/light/lightstyle-v2.h
+++ b/tdestyles/light/lightstyle-v2.h
@@ -30,13 +30,13 @@
 #ifdef QT_PLUGIN
 #  define Q_EXPORT_STYLE_LIGHT_V2
 #else
-#  define Q_EXPORT_STYLE_LIGHT_V2 Q_EXPORT
+#  define Q_EXPORT_STYLE_LIGHT_V2 TQ_EXPORT
 #endif // QT_PLUGIN
 
 
 class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LightStyleV2();
@@ -44,27 +44,27 @@ public:
 
     void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
 
-    void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+    void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
-    void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
 		     const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-    void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
 
     TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-    void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
 			    const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
+    TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
 				 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
+    SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
 			       const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
     int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
@@ -72,7 +72,7 @@ public:
     TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &,
 			   const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+    int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 		  const TQStyleOption & = TQStyleOption::Default,
 		  TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
 
diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp
index 92b0d04da..790c03d79 100644
--- a/tdestyles/light/lightstyle-v3.cpp
+++ b/tdestyles/light/lightstyle-v3.cpp
@@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p,
 	p->fillRect( br, *fill );
 }
 
-void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
+void LightStyleV3::drawPrimitive( PrimitiveElement pe,
 				TQPainter *p,
 				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
@@ -430,7 +430,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
 	    if ( p && p->device()->devType() == TQInternal::Widget ) {
 		TQWidget *w = (TQWidget *) p->device();
 		TQWidget *p = w->parentWidget();
-		if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
+		if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) {
 		    drawTitle = true;
 		    title = p->caption();
 		}
@@ -590,7 +590,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarSubLine:
 	{
 	    TQRect br = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen( cg.background() );
 	    if (flags & Style_Horizontal) {
@@ -624,7 +624,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
     case PE_ScrollBarAddLine:
 	{
 	    TQRect br = r;
-	    TQ_PrimitiveElement pe;
+	    PrimitiveElement pe;
 
 	    p->setPen( cg.background() );
 	    if (flags & Style_Horizontal) {
@@ -830,7 +830,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe,
     }
 }
 
-void LightStyleV3::drawControl( TQ_ControlElement control,
+void LightStyleV3::drawControl( ControlElement control,
 			      TQPainter *p,
 			      const TQStyleControlElementData &ceData,
 			      ControlElementFlags elementFlags,
@@ -1068,10 +1068,10 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
 	    } else if (mi->pixmap()) {
 		TQPixmap pixmap = *mi->pixmap();
 		if (pixmap.depth() == 1)
-		    p->setBackgroundMode(Qt::OpaqueMode);
+		    p->setBackgroundMode(TQt::OpaqueMode);
 		p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap);
 		if (pixmap.depth() == 1)
-		    p->setBackgroundMode(Qt::TransparentMode);
+		    p->setBackgroundMode(TQt::TransparentMode);
 	    }
 
 	    if (mi->popup())
@@ -1114,7 +1114,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
     }
 }
 
-void LightStyleV3::drawControlMask( TQ_ControlElement control,
+void LightStyleV3::drawControlMask( ControlElement control,
 				  TQPainter *p,
 				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
@@ -1178,7 +1178,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &c
     return rect;
 }
 
-void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
+void LightStyleV3::drawComplexControl( ComplexControl control,
 				     TQPainter* p,
 				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
@@ -1248,7 +1248,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
 	    const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
 	    TQRect frame, up, down;
 
-	    frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags,
+	    frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
 					   SC_SpinWidgetFrame, data, widget);
 	    up = ceData.spinWidgetData.upRect;
 	    down = ceData.spinWidgetData.downRect;
@@ -1257,7 +1257,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
 		drawPrimitive( PE_Panel, p, ceData, elementFlags, frame, cg, flags | Style_Sunken );
 
 	    if ((controls & SC_SpinWidgetUp) && up.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetUp;
+		PrimitiveElement pe = PE_SpinWidgetUp;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetPlus;
 
@@ -1275,7 +1275,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
 	    }
 
 	    if ((controls & SC_SpinWidgetDown) && down.isValid()) {
-		TQ_PrimitiveElement pe = PE_SpinWidgetDown;
+		PrimitiveElement pe = PE_SpinWidgetDown;
 		if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus )
 		    pe = PE_SpinWidgetMinus;
 
@@ -1455,7 +1455,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
     }
 }
 
-TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
+TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
 					  const TQStyleControlElementData &ceData,
 					  ControlElementFlags elementFlags,
 					  SubControl sc,
@@ -1606,7 +1606,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
     return ret;
 }
 
-TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control,
 						const TQStyleControlElementData &ceData,
 						ControlElementFlags elementFlags,
 						const TQPoint &pos,
@@ -1854,7 +1854,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents,
     return ret;
 }
 
-int LightStyleV3::styleHint( TQ_StyleHint stylehint,
+int LightStyleV3::styleHint( StyleHint stylehint,
 			   const TQStyleControlElementData &ceData,
 			   ControlElementFlags elementFlags,
 			   const TQStyleOption &option,
diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h
index 0330c8f87..8f03cca74 100644
--- a/tdestyles/light/lightstyle-v3.h
+++ b/tdestyles/light/lightstyle-v3.h
@@ -33,13 +33,13 @@
 #ifdef QT_PLUGIN
 #  define Q_EXPORT_STYLE_LIGHT_V3
 #else
-#  define Q_EXPORT_STYLE_LIGHT_V3 Q_EXPORT
+#  define Q_EXPORT_STYLE_LIGHT_V3 TQ_EXPORT
 #endif // QT_PLUGIN
 
 
 class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQStyle *basestyle;
 
 public:
@@ -48,27 +48,27 @@ public:
 
     void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
 
-    void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+    void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
 		       SFlags = Style_Default,
 		       const TQStyleOption & = TQStyleOption::Default ) const;
 
-    void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 		     const TQColorGroup &, SFlags = Style_Default,
 		     const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-    void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
 
     TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
 
-    void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+    void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
 			    const TQColorGroup &, SFlags = Style_Default,
 			    SCFlags = SC_All, SCFlags = SC_None,
 			    const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
+    TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
 				 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
+    SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
 			       const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
     int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
@@ -76,7 +76,7 @@ public:
     TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &,
 			   const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
 
-    int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+    int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 		  const TQStyleOption & = TQStyleOption::Default,
 		  TQStyleHintReturn * = 0,
 		  const TQWidget * = 0 ) const;
diff --git a/tdestyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp
index 4900f708e..35dd2a1b2 100644
--- a/tdestyles/plastik/config/plastikconf.cpp
+++ b/tdestyles/plastik/config/plastikconf.cpp
@@ -118,19 +118,19 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
 	origCheckMarkColor = s.readEntry("/plastikstyle/Settings/checkMarkColor", "black");
 	checkMarkColor->setColor(origCheckMarkColor);
 
-// 	connect(scrollBarLines, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(drawToolBarSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(drawToolBarItemSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-// 	connect(drawFocusRect, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(drawTriangularExpander, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(inputFocusHighlight, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(customOverHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(overHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) );
-	connect(customFocusHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(focusHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) );
-	connect(customCheckMarkColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) );
-	connect(checkMarkColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) );
+// 	connect(scrollBarLines, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(drawToolBarSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(drawToolBarItemSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+// 	connect(drawFocusRect, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(drawTriangularExpander, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(inputFocusHighlight, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(customOverHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(overHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
+	connect(customFocusHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(focusHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
+	connect(customCheckMarkColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) );
+	connect(checkMarkColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) );
 	if ( customOverHighlightColor->isChecked() )
 	 overHighlightColor->setEnabled(true);
 	else
diff --git a/tdestyles/plastik/config/plastikconf.h b/tdestyles/plastik/config/plastikconf.h
index 512ad6f2e..6973a0d0b 100644
--- a/tdestyles/plastik/config/plastikconf.h
+++ b/tdestyles/plastik/config/plastikconf.h
@@ -31,7 +31,7 @@ class TQCheckBox;
 
 class PlastikStyleConfig: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PlastikStyleConfig(TQWidget* parent);
 	~PlastikStyleConfig();
diff --git a/tdestyles/plastik/misc.cpp b/tdestyles/plastik/misc.cpp
index d1a52d61e..48918306e 100644
--- a/tdestyles/plastik/misc.cpp
+++ b/tdestyles/plastik/misc.cpp
@@ -23,8 +23,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/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp
index 0db70b8a9..5ff3b8619 100644
--- a/tdestyles/plastik/plastik.cpp
+++ b/tdestyles/plastik/plastik.cpp
@@ -184,7 +184,7 @@ PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrol
     if ( _animateProgressBar )
     {
         animationTimer = new TQTimer( this );
-        connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) );
+        connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) );
     }
 }
 
@@ -197,7 +197,7 @@ void PlastikStyle::updateProgressPos()
     bool visible = false;
     for (iter = progAnimWidgets.begin(); iter != progAnimWidgets.end(); ++iter)
     {   
-        if ( !::tqqt_cast<TQProgressBar*>(iter.key()) )
+        if ( !::tqt_cast<TQProgressBar*>(iter.key()) )
             continue;
         
         pb = dynamic_cast<TQProgressBar*>(iter.key());
@@ -225,7 +225,7 @@ PlastikStyle::~PlastikStyle()
 
 void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
 {
-    if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQApplication")) {
 	TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
 
 	if (!qstrcmp(app->argv()[0], "kicker"))
@@ -237,39 +237,39 @@ void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co
 
 void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-    if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQWidget")) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
 	if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
 		tdehtmlWidgets[widget] = true;
-		connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*)));
+		connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(tdehtmlWidgetDestroyed(TQObject*)));
 	}
 	
-	// use tqqt_cast where possible to check if the widget inheits one of the classes. might improve
+	// use tqt_cast where possible to check if the widget inheits one of the classes. might improve
 	// performance compared to TQObject::inherits()
-	if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) ||
-		::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) ||
-		::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) ||
-		::tqqt_cast<TQToolButton*>(widget) || widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) )
+	if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) ||
+		::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) ||
+		::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) ||
+		::tqt_cast<TQToolButton*>(widget) || widget->inherits("TQSplitterHandle") )
 	{
 	//         widget->setBackgroundMode(PaletteBackground);
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
-	} else if (::tqqt_cast<TQLineEdit*>(widget)) {
+	} else if (::tqt_cast<TQLineEdit*>(widget)) {
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
-	} else if (::tqqt_cast<TQTabBar*>(widget)) {
+	} else if (::tqt_cast<TQTabBar*>(widget)) {
 		widget->setMouseTracking(true);
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
-	} else if (::tqqt_cast<TQPopupMenu*>(widget)) {
+	} else if (::tqt_cast<TQPopupMenu*>(widget)) {
 		widget->setBackgroundMode( NoBackground );
 	} else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) {
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
 	}
 	
-	if( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget) )
+	if( _animateProgressBar && ::tqt_cast<TQProgressBar*>(widget) )
 	{
 		installObjectEventHandler(ceData, elementFlags, ptr, this);
 		progAnimWidgets[widget] = 0;
-		connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*)));
+		connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*)));
 		if (!animationTimer->isActive())
 		animationTimer->start( 50, false );
 	}
@@ -280,32 +280,32 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen
 
 void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
-    if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQWidget")) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
 	if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...?
 		tdehtmlWidgets.remove(widget);
 	}
 	
-	// use tqqt_cast to check if the widget inheits one of the classes.
-	if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) ||
-		::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) ||
-		::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) ||
-		::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) ||
-		widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) )
+	// use tqt_cast to check if the widget inheits one of the classes.
+	if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) ||
+		::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) ||
+		::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) ||
+		::tqt_cast<TQToolButton*>(widget) || ::tqt_cast<TQLineEdit*>(widget) ||
+		widget->inherits("TQSplitterHandle") )
 	{
 		removeObjectEventHandler(ceData, elementFlags, ptr, this);
 	}
-	else if (::tqqt_cast<TQTabBar*>(widget)) {
+	else if (::tqt_cast<TQTabBar*>(widget)) {
 		widget->setMouseTracking(false);
 		removeObjectEventHandler(ceData, elementFlags, ptr, this);
-	} else if (::tqqt_cast<TQPopupMenu*>(widget)) {
+	} else if (::tqt_cast<TQPopupMenu*>(widget)) {
 		widget->setBackgroundMode( PaletteBackground );
 	} else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) {
 		removeObjectEventHandler(ceData, elementFlags, ptr, this);
 	}
 	
-	if ( ::tqqt_cast<TQProgressBar*>(widget) )
+	if ( ::tqt_cast<TQProgressBar*>(widget) )
 	{
 		progAnimWidgets.remove(widget);
 	}
@@ -316,12 +316,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem
 
 void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj)
 {
-    tdehtmlWidgets.remove(TQT_TQWIDGET(obj));
+    tdehtmlWidgets.remove(static_cast<TQWidget*>(obj));
 }
 
 void PlastikStyle::progressBarDestroyed(TQObject* obj)
 {
-    progAnimWidgets.remove(TQT_TQWIDGET(obj));
+    progAnimWidgets.remove(static_cast<TQWidget*>(obj));
 }
 
 void PlastikStyle::renderContour(TQPainter *p,
@@ -664,7 +664,7 @@ void PlastikStyle::renderPixel(TQPainter *p,
     if(fullAlphaBlend)
     // full alpha blend: paint into an image with alpha buffer and convert to a pixmap ...
     {
-        QRgb rgb = color.rgb();
+        TQRgb rgb = color.rgb();
         // generate a quite unique key -- use the unused width field to store the alpha value.
         CacheEntry search(cAlphaDot, alpha, 0, rgb);
         int key = search.key();
@@ -697,8 +697,8 @@ void PlastikStyle::renderPixel(TQPainter *p,
     } else
     // don't use an alpha buffer: calculate the resulting color from the alpha value, the fg- and the bg-color.
     {
-        QRgb rgb_a = color.rgb();
-        QRgb rgb_b = background.rgb();
+        TQRgb rgb_a = color.rgb();
+        TQRgb rgb_b = background.rgb();
         int a = alpha;
         if(a>255) a = 255;
         if(a<0) a = 0;
@@ -827,7 +827,7 @@ void PlastikStyle::renderGradient(TQPainter *painter,
     int r_w = result->rect().width();
     int r_h = result->rect().height();
     int r_x, r_y, r_x2, r_y2;
-    TQT_TQRECT_OBJECT(result->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+    result->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
 
     int rDiff, gDiff, bDiff;
     int rc, gc, bc;
@@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p,
 
     if (kickerMode &&
             p->device() && p->device()->devType() == TQInternal::Widget &&
-            TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame") {
+            TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame") {
     //  Stolen wholesale from Keramik. I don't like it, but oh well.
         if (sunken) {
             const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y };
@@ -1451,7 +1451,7 @@ void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
 }
 
 
-void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
+void PlastikStyle::drawPrimitive(PrimitiveElement pe,
                                 TQPainter *p,
                                 const TQStyleControlElementData &ceData,
                                 ControlElementFlags elementFlags,
@@ -2159,7 +2159,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
                     a.translate(0, 0);
             }
 
-            if (p->pen() == Qt::NoPen) {
+            if (p->pen() == TQt::NoPen) {
                 if (flags & Style_Enabled) {
                     p->setPen(cg.buttonText());
                 } else {
@@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe,
 }
 
 
-void PlastikStyle::drawControl(TQ_ControlElement element,
+void PlastikStyle::drawControl(ControlElement element,
                               TQPainter *p,
                               const TQStyleControlElementData &ceData,
                               ControlElementFlags elementFlags,
@@ -2682,20 +2682,20 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
 
                     // Draw the pixmap
                     if ( pixmap->depth() == 1 )
-                        p->setBackgroundMode( Qt::OpaqueMode );
+                        p->setBackgroundMode( TQt::OpaqueMode );
 
                     int diffw = ( ( r.width() - pixmap->width() ) / 2 )
                                     + ( ( r.width() - pixmap->width() ) % 2 );
                     p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap );
 
                     if ( pixmap->depth() == 1 )
-                        p->setBackgroundMode( Qt::TransparentMode );
+                        p->setBackgroundMode( TQt::TransparentMode );
                 }
             }
 
             // Does the menu item have a submenu?
             if ( mi->popup() ) {
-                TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
+                PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight;
                 int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - 1;
                 TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim,
                             r.y() + r.height() / 2 - dim / 2, dim, dim), r );
@@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
     }
 }
 
-void PlastikStyle::drawControlMask(TQ_ControlElement element,
+void PlastikStyle::drawControlMask(ControlElement element,
                                   TQPainter *p,
                                   const TQStyleControlElementData &ceData,
                                   ControlElementFlags elementFlags,
@@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element,
     }
 }
 
-void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
+void PlastikStyle::drawComplexControlMask(ComplexControl c,
                                          TQPainter *p,
                                          const TQStyleControlElementData &ceData,
                                          const ControlElementFlags elementFlags,
@@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
     }
 }
 
-void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
+void PlastikStyle::drawComplexControl(ComplexControl control,
                                      TQPainter *p,
                                      const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
@@ -3013,7 +3013,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
 
             const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget);
             SFlags sflags = flags;
-            TQ_PrimitiveElement pe;
+            PrimitiveElement pe;
 
             bool hasFocus = false;
             if (sw)
@@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
     }
 }
 
-TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
+TQRect PlastikStyle::querySubControlMetrics(ComplexControl control,
                                           const TQStyleControlElementData &ceData,
                                           ControlElementFlags elementFlags,
                                           SubControl subcontrol,
@@ -3346,7 +3346,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce
             return 1;
 
         case PM_DefaultFrameWidth: {
-            if(widget && ::tqqt_cast<TQPopupMenu*>(widget))
+            if(widget && ::tqt_cast<TQPopupMenu*>(widget))
                 return 1;
             else
                 return 2;
@@ -3452,7 +3452,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
 
         case CT_ToolButton:
         {
-            if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) )
+            if(widget->parent() && ::tqt_cast<TQToolBar*>(widget->parent()) )
                 return TQSize( s.width()+2*4, s.height()+2*4 );
             else
                 return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
@@ -3465,7 +3465,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t,
     return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget);
 }
 
-int PlastikStyle::styleHint( TQ_StyleHint stylehint,
+int PlastikStyle::styleHint( StyleHint stylehint,
                                    const TQStyleControlElementData &ceData,
                                    ControlElementFlags elementFlags,
                                    const TQStyleOption &option,
@@ -3497,13 +3497,13 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
     if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) )
         return true;
 
-    if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
+    if (ceData.widgetObjectTypes.contains("TQObject")) {
 	TQObject* obj = reinterpret_cast<TQObject*>(source);
 
 	if (!obj->isWidgetType() ) return false;
 
 	// Track show events for progress bars
-	if ( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(obj) )
+	if ( _animateProgressBar && ::tqt_cast<TQProgressBar*>(obj) )
 	{
 		if ((ev->type() == TQEvent::Show) && !animationTimer->isActive())
 		{
@@ -3512,7 +3512,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData,
 	}
 	if ( !qstrcmp(obj->name(), "tde toolbar widget") )
 	{
-		TQWidget* lb = TQT_TQWIDGET(obj);
+		TQWidget* lb = static_cast<TQWidget*>(obj);
 		if (lb->backgroundMode() == TQt::PaletteButton)
 		lb->setBackgroundMode(TQt::PaletteBackground);
 		removeObjectEventHandler(ceData, elementFlags, source, this);
diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h
index 68f707d79..89946fd48 100644
--- a/tdestyles/plastik/plastik.h
+++ b/tdestyles/plastik/plastik.h
@@ -56,7 +56,7 @@ class TQTimer;
 
 class PlastikStyle : public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PlastikStyle();
@@ -76,7 +76,7 @@ public:
                              const TQStyleOption& = TQStyleOption::Default,
                              const TQWidget* widget = 0 ) const;
 
-    void drawPrimitive(TQ_PrimitiveElement pe,
+    void drawPrimitive(PrimitiveElement pe,
                        TQPainter *p,
                        const TQStyleControlElementData &ceData,
                        ControlElementFlags elementFlags,
@@ -85,7 +85,7 @@ public:
                        SFlags flags = Style_Default,
                        const TQStyleOption &opt = TQStyleOption::Default ) const;
 
-    void drawControl(TQ_ControlElement element,
+    void drawControl(ControlElement element,
                      TQPainter *p,
                      const TQStyleControlElementData &ceData,
                      ControlElementFlags elementFlags,
@@ -95,9 +95,9 @@ public:
                      const TQStyleOption& = TQStyleOption::Default,
                      const TQWidget *widget = 0 ) const;
 
-    void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
+    void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
 
-    void drawComplexControl(TQ_ComplexControl control,
+    void drawComplexControl(ComplexControl control,
                             TQPainter *p,
                             const TQStyleControlElementData &ceData,
                             ControlElementFlags elementFlags,
@@ -115,14 +115,14 @@ public:
     TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags,
                   const TQWidget *widget ) const;
 
-    TQRect querySubControlMetrics(TQ_ComplexControl control,
+    TQRect querySubControlMetrics(ComplexControl control,
                                  const TQStyleControlElementData &ceData,
                                  ControlElementFlags elementFlags,
                                  SubControl subcontrol,
                                  const TQStyleOption &opt = TQStyleOption::Default,
                                  const TQWidget *widget = 0 ) const;
 
-    void drawComplexControlMask(TQStyle::TQ_ComplexControl c,
+    void drawComplexControlMask(TQStyle::ComplexControl c,
                                 TQPainter *p,
                                 const TQStyleControlElementData &ceData,
                                 const ControlElementFlags elementFlags,
@@ -137,7 +137,7 @@ public:
                            const TQStyleOption &o,
                            const TQWidget *w = 0) const;
 
-    int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+    int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
                   const TQStyleOption & = TQStyleOption::Default,
                   TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
 
@@ -317,13 +317,13 @@ private:
         CacheEntryType type;
         int width;
         int height;
-        QRgb c1Rgb;
-        QRgb c2Rgb;
+        TQRgb c1Rgb;
+        TQRgb c2Rgb;
         bool horizontal;
 
         TQPixmap* pixmap;
 
-        CacheEntry(CacheEntryType t, int w, int h, QRgb c1, QRgb c2 = 0,
+        CacheEntry(CacheEntryType t, int w, int h, TQRgb c1, TQRgb c2 = 0,
                    bool hor = false, TQPixmap* p = 0 ):
             type(t), width(w), height(h), c1Rgb(c1), c2Rgb(c2), horizontal(hor), pixmap(p)
         {}
diff --git a/tdestyles/web/webstyle.cpp b/tdestyles/web/webstyle.cpp
index 073a46368..cce42ed15 100644
--- a/tdestyles/web/webstyle.cpp
+++ b/tdestyles/web/webstyle.cpp
@@ -60,7 +60,7 @@ static TQColor contrastingForeground(const TQColor & fg, const TQColor & bg)
 
   if ((diff > -72) && (diff < 72))
   {
-    return (vbg < 128) ? Qt::white : Qt::black;
+    return (vbg < 128) ? TQt::white : TQt::black;
   }
   else
   {
@@ -250,10 +250,10 @@ WebStyle::unPolish(TQApplication *)
   void
 WebStyle::polish(TQWidget * w)
 {
-  if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+  if (w->inherits("TQPushButton"))
     w->installEventFilter(this);
 
-  else if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING) || w->inherits(TQFRAME_OBJECT_NAME_STRING))
+  else if (w->inherits("TQGroupBox") || w->inherits("TQFrame"))
   {
     TQFrame * f(static_cast<TQFrame *>(w));
 
@@ -282,7 +282,7 @@ WebStyle::polish(TQWidget * w)
   void
 WebStyle::unPolish(TQWidget * w)
 {
-  if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+  if (w->inherits("TQPushButton"))
     w->removeEventFilter(this);
 
   else if (w == _currentFrame)
@@ -471,8 +471,8 @@ WebStyle::drawScrollBarControls
     p->setBrush(g.button());
     p->drawRect(rAdd);
 
-    Qt::ArrowType t =
-      sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow;
+    TQt::ArrowType t =
+      sb->orientation() == Horizontal ? TQt::RightArrow : TQt::DownArrow;
 
     // Is it me or is TDEStyle::drawArrow broken ?
 
@@ -500,8 +500,8 @@ WebStyle::drawScrollBarControls
     p->setBrush(g.button());
     p->drawRect(rSub);
 
-    Qt::ArrowType t =
-      sb->orientation() == Horizontal ? Qt::LeftArrow : Qt::UpArrow;
+    TQt::ArrowType t =
+      sb->orientation() == Horizontal ? TQt::LeftArrow : TQt::UpArrow;
 
     drawArrow
       (
@@ -785,7 +785,7 @@ WebStyle::drawIndicatorMask
  int /* state */
 )
 {
-  p->fillRect(x, y, w, h, Qt::color1);
+  p->fillRect(x, y, w, h, TQt::color1);
 }
 
   void
@@ -805,8 +805,8 @@ WebStyle::drawExclusiveIndicatorMask
   if (0 == h % 2)
     --h;
 
-  p->setPen(Qt::color1);
-  p->setBrush(Qt::color1);
+  p->setPen(TQt::color1);
+  p->setBrush(TQt::color1);
   p->drawEllipse(x, y, w, h);
 }
 
@@ -866,7 +866,7 @@ WebStyle::drawComboButton
   p->drawPoint(w - 6, h - 10);
 
   if (editable)
-    p->fillRect(comboButtonFocusRect(x, y, w, h), Qt::red);
+    p->fillRect(comboButtonFocusRect(x, y, w, h), TQt::red);
 
   p->restore();
 }
@@ -904,12 +904,12 @@ WebStyle::drawSliderGroove
 {
   p->save();
 
-  p->setPen(TQPen(g.dark(), 0, Qt::DotLine));
+  p->setPen(TQPen(g.dark(), 0, TQt::DotLine));
 
-  if( o == Qt::Horizontal )
+  if( o == TQt::Horizontal )
     p->drawLine(x, y + h / 2, w, y + h / 2);
   else
-  if( o == Qt::Vertical )
+  if( o == TQt::Vertical )
     p->drawLine(x + w / 2, y, x + w / 2, h);
 
   p->restore();
@@ -919,7 +919,7 @@ WebStyle::drawSliderGroove
 WebStyle::drawArrow
 (
  TQPainter * p,
- Qt::ArrowType type,
+ TQt::ArrowType type,
  bool down,
  int x,
  int y,
@@ -955,10 +955,10 @@ WebStyle::drawSlider
 
   int sl = sliderLength();
 
-  if( o == Qt::Horizontal )
+  if( o == TQt::Horizontal )
     p->drawEllipse(x, y + h / 2 - sl / 2, sl, sl);
   else
-  if( o == Qt::Vertical )
+  if( o == TQt::Vertical )
     p->drawEllipse(x + w / 2 - sl / 2, y, sl, sl);
 
   p->restore();
@@ -1046,7 +1046,7 @@ WebStyle::drawTDEToolBarButton
 {
   bool toggleAndOn = false;
 
-  if (button->inherits(TQBUTTON_OBJECT_NAME_STRING))
+  if (button->inherits("TQButton"))
   {
     TQButton * b = static_cast<TQButton *>(button);
     toggleAndOn = b->isToggleButton() && b->isOn();
@@ -1495,7 +1495,7 @@ WebStyle::drawTabMask
  bool
 )
 {
-  p->fillRect(tab->rect(), Qt::color1);
+  p->fillRect(tab->rect(), TQt::color1);
 }
 
   void
@@ -1641,7 +1641,7 @@ WebStyle::drawKickerTaskButton
       p->setPen(contrastingForeground(g.text(), bg));
     }
 
-    p->setPen(Qt::white);
+    p->setPen(TQt::white);
 
     p->drawText
       (
@@ -1655,7 +1655,7 @@ WebStyle::drawKickerTaskButton
   }
 
   p->restore();
-  p->setPen(Qt::white);
+  p->setPen(TQt::white);
 }
 
   int
diff --git a/tdestyles/web/webstyle.h b/tdestyles/web/webstyle.h
index 0e4c59dbd..ab8742691 100644
--- a/tdestyles/web/webstyle.h
+++ b/tdestyles/web/webstyle.h
@@ -186,7 +186,7 @@ class WebStyle : public TDEStyle
     void drawArrow
       (
        TQPainter *,
-       Qt::ArrowType, 
+       TQt::ArrowType, 
        bool down,
        int x, 
        int y, 
@@ -406,7 +406,7 @@ class WebStyle : public TDEStyle
 
     int popupMenuItemHeight(bool, TQMenuItem *, const TQFontMetrics &);
 
-    GUIStyle guiStyle() const { return Qt::MotifStyle; }
+    GUIStyle guiStyle() const { return TQt::MotifStyle; }
 
     bool eventFilter(TQObject *, TQEvent *);
 };
diff --git a/tdesu/client.cpp b/tdesu/client.cpp
index fe5733ee7..8cde02067 100644
--- a/tdesu/client.cpp
+++ b/tdesu/client.cpp
@@ -19,6 +19,9 @@
 #include <pwd.h>
 #include <errno.h>
 #include <string.h>
+#ifdef HAVE_UCRED_H
+#include <ucred.h>
+#endif /* HAVE_UCRED_H */
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -50,7 +53,7 @@ public:
 TDEsuClient::TDEsuClient()
 {
     sockfd = -1;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQCString display(getenv("DISPLAY"));
     if (display.isEmpty())
     {
@@ -146,6 +149,21 @@ int TDEsuClient::connect()
 	return -1;
     }
 # endif
+#elif defined(HAVE_GETPEERUCRED)
+    ucred_t *cred = nullptr;
+
+    if (getpeerucred(sockfd, &cred) == 0) {
+        uid_t peer_uid = ucred_geteuid(cred);
+
+        ucred_free(cred);
+        if (peer_uid != getuid()) {
+            kdWarning(900) << "socket not owned by me! socket uid = " << peer_uid << endl;
+            close(sockfd); sockfd = -1;
+            return -1;
+        }
+    }
+    if (cred != nullptr)
+        ucred_free(cred);
 #else
     struct ucred cred;
     socklen_t siz = sizeof(cred);
diff --git a/tdesu/kcookie.cpp b/tdesu/kcookie.cpp
index 63013dae0..038715c8d 100644
--- a/tdesu/kcookie.cpp
+++ b/tdesu/kcookie.cpp
@@ -33,7 +33,7 @@
 
 KCookie::KCookie()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     getXCookie();
 #endif
     setDcopTransport("local");
@@ -85,7 +85,7 @@ void KCookie::getXCookie()
     char buf[1024];
     FILE *f;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     m_Display = getenv("DISPLAY");
 #else
     m_Display = getenv("QWS_DISPLAY");
@@ -95,7 +95,7 @@ void KCookie::getXCookie()
 	kdError(900) << k_lineinfo << "$DISPLAY is not set.\n";
 	return;
     }
-#ifdef Q_WS_X11 // No need to mess with X Auth stuff
+#ifdef TQ_WS_X11 // No need to mess with X Auth stuff
     TQCString disp = m_Display;
     if (!memcmp(disp.data(), "localhost:", 10))
        disp.remove(0, 9);
diff --git a/tdesu/kcookie.h b/tdesu/kcookie.h
index eb097a2a2..9c93be2a2 100644
--- a/tdesu/kcookie.h
+++ b/tdesu/kcookie.h
@@ -34,7 +34,7 @@ public:
      */
     TQCString display() { return m_Display; }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     /**
      * Returns the X11 magic cookie, if available.
      */
@@ -74,7 +74,7 @@ private:
     bool m_bHaveICECookies;
 
     TQCString m_Display;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQCString m_DisplayAuth;
 #endif
     TQCString m_DCOPSrv;
diff --git a/tdesu/process.cpp b/tdesu/process.cpp
index ffc0cabf3..1d56128da 100644
--- a/tdesu/process.cpp
+++ b/tdesu/process.cpp
@@ -359,6 +359,7 @@ int PtyProcess::exec(const TQCString &command, const QCStringList &args)
         putenv(const_cast<TQCString&>(*it).data());
     }
     unsetenv("TDE_FULL_SESSION");
+    unsetenv("XDG_RUNTIME_DIR");
     
     // set temporarily LC_ALL to C, for su (to be able to parse "Password:")
     const char* old_lc_all = getenv( "LC_ALL" );
diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
index 721dceddb..cc4222358 100644
--- a/tdesu/stub.cpp
+++ b/tdesu/stub.cpp
@@ -95,7 +95,7 @@ int StubProcess::ConverseStub(int check)
 	} else if (line == "display") {
 	    writeLine(display());
 	} else if (line == "display_auth") {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	    writeLine(displayAuth());
 #else
 	    writeLine("");
diff --git a/tdesu/stub.h b/tdesu/stub.h
index f4216d7f4..e4d2bed4b 100644
--- a/tdesu/stub.h
+++ b/tdesu/stub.h
@@ -98,7 +98,7 @@ protected:
      * desired. By default, it returns the value returned by KCookie.
      */
     virtual TQCString display() { return m_pCookie->display(); }
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     /**
      * See display.
      */
diff --git a/tdeui/kaboutdialog_private.h b/tdeui/kaboutdialog_private.h
index 7a6245a81..057e8a6c1 100644
--- a/tdeui/kaboutdialog_private.h
+++ b/tdeui/kaboutdialog_private.h
@@ -34,7 +34,7 @@ class TQVBoxLayout;
  */
 class KImageTrackLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum MouseMode
@@ -68,7 +68,7 @@ class TDEAboutContainerBasePrivate;
  */
 class TDEAboutContainerBase : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum LayoutType
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp
index 0e5abc5ad..2e7af38c3 100644
--- a/tdeui/kactivelabel.cpp
+++ b/tdeui/kactivelabel.cpp
@@ -44,23 +44,23 @@ void KActiveLabel::init()
    setVScrollBarMode(TQScrollView::AlwaysOff);
    setHScrollBarMode(TQScrollView::AlwaysOff);
    setFrameStyle(TQFrame::NoFrame);
-   setFocusPolicy( TQ_TabFocus );
+   setFocusPolicy( TQWidget::TabFocus );
    paletteChanged();
 
-   connect(this, TQT_SIGNAL(linkClicked(const TQString &)),
-           this, TQT_SLOT(openLink(const TQString &)));
+   connect(this, TQ_SIGNAL(linkClicked(const TQString &)),
+           this, TQ_SLOT(openLink(const TQString &)));
    if (kapp)
    {
-      connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()),
-              this, TQT_SLOT(paletteChanged()));
+      connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()),
+              this, TQ_SLOT(paletteChanged()));
    }
 }
 
 void KActiveLabel::paletteChanged()
 {
    TQPalette p = kapp ? kapp->palette() : palette();
-   p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
-   p.setColor(TQColorGroup::Text, p.color(TQPalette::Normal, TQColorGroup::Foreground));
+   p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
+   p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
    setPalette(p);
 }
 
diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h
index 5832a4fa1..9f49dd05c 100644
--- a/tdeui/kactivelabel.h
+++ b/tdeui/kactivelabel.h
@@ -36,7 +36,7 @@ class KActiveLabelPrivate;
   */
 class TDEUI_EXPORT KActiveLabel : public TQTextBrowser
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructor.
diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp
index 1805714f2..25a0b6847 100644
--- a/tdeui/kanimwidget.cpp
+++ b/tdeui/kanimwidget.cpp
@@ -43,10 +43,10 @@ KAnimWidget::KAnimWidget( const TQString& icons, int size, TQWidget *parent,
   : TQFrame( parent, name ),
     d( new KAnimWidgetPrivate )
 {
-  connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerUpdate()));
+  connect( &d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerUpdate()));
 
   if (parent && parent->inherits( "TDEToolBar" ))
-    connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(updateIcons()));
+    connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(updateIcons()));
 
   d->loadingCompleted = false;
   d->size = size;
@@ -140,7 +140,7 @@ void KAnimWidget::mousePressEvent( TQMouseEvent *e )
 
 void KAnimWidget::mouseReleaseEvent( TQMouseEvent *e )
 {
-  if ( e->button() == Qt::LeftButton &&
+  if ( e->button() == TQt::LeftButton &&
        rect().contains( e->pos() ) )
     emit clicked();
 
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index 77abf837a..046522d01 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -54,7 +54,7 @@ class KAnimWidgetPrivate;
  */
 class TDEUI_EXPORT KAnimWidget : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int size READ size WRITE setSize )
   TQ_PROPERTY( TQString icons READ icons WRITE setIcons )
 
diff --git a/tdeui/karrowbutton.cpp b/tdeui/karrowbutton.cpp
index 4dbbe5bab..c02e4a028 100644
--- a/tdeui/karrowbutton.cpp
+++ b/tdeui/karrowbutton.cpp
@@ -24,10 +24,10 @@
 class KArrowButtonPrivate
 {
 	public:
-		Qt::ArrowType arrow;
+		TQt::ArrowType arrow;
 };
 
-KArrowButton::KArrowButton(TQWidget *parent, Qt::ArrowType arrow,
+KArrowButton::KArrowButton(TQWidget *parent, TQt::ArrowType arrow,
 		const char *name)
 	: TQPushButton(parent, name)
 {
@@ -45,14 +45,14 @@ TQSize KArrowButton::sizeHint() const
 	return TQSize( 12, 12 );
 }
 
-void KArrowButton::setArrowType(Qt::ArrowType a)
+void KArrowButton::setArrowType(TQt::ArrowType a)
 {
 	if (d->arrow != a) {
 		d->arrow = a;
 		repaint();
 	}
 }
-Qt::ArrowType KArrowButton::arrowType() const
+TQt::ArrowType KArrowButton::arrowType() const
 {
 	return d->arrow;
 }
@@ -63,7 +63,7 @@ void KArrowButton::drawButton(TQPainter *p)
 	const unsigned int margin = 2;
 	
         p->fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
-	style().tqdrawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
+	style().drawPrimitive( TQStyle::PE_Panel, p, TQRect( 0, 0, width(), height() ),
 			       colorGroup(), 
 			       isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Default,
 			       TQStyleOption( 2, 0 ) );
@@ -95,15 +95,15 @@ void KArrowButton::drawButton(TQPainter *p)
 	TQStyle::PrimitiveElement e = TQStyle::PE_ArrowLeft;
 	switch (d->arrow)
 	{
-		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;
 	if ( isDown() )
 		flags |= TQStyle::Style_Down;
-	style().tqdrawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
+	style().drawPrimitive( e, p, TQRect( TQPoint( x, y ), TQSize( arrowSize, arrowSize ) ),
 			       colorGroup(), flags );
 }
 
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index c490c8aab..a1843ad18 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -37,7 +37,7 @@ class KArrowButtonPrivate;
  */
 class TDEUI_EXPORT KArrowButton : public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 	TQ_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
 
 	public:
@@ -48,7 +48,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
 		 * @param arrow The direction the arrrow should be pointing in
 		 * @param name An internal name for this widget
 		 */
-		KArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow,
+		KArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow,
 			const char *name = 0);
 
 		/**
@@ -65,11 +65,11 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
 		* Returns the arrow type
 		* @since 3.4
 		*/
-		Qt::ArrowType arrowType() const;
+		TQt::ArrowType arrowType() const;
 
 		// hacks for moc braindamages with enums
 		int arrowTp() const { return (int) arrowType(); }
-		void setArrowTp( int tp ) { setArrowType( (Qt::ArrowType) tp ); }
+		void setArrowTp( int tp ) { setArrowType( (TQt::ArrowType) tp ); }
 	public slots:
 		/**
 		 * Defines in what direction the arrow is pointing to. Will repaint the
@@ -77,7 +77,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
 		 *
 		 * @param a The direction this arrow should be pointing in
 		 */
-		void setArrowType(Qt::ArrowType a);
+		void setArrowType(TQt::ArrowType a);
 
 	protected:
 		/**
diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h
index 3aad21dba..697182483 100644
--- a/tdeui/kauthicon.h
+++ b/tdeui/kauthicon.h
@@ -46,7 +46,7 @@ class KAuthIconPrivate;
  */
 class TDEUI_EXPORT KAuthIcon : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -102,7 +102,7 @@ class KRootPermsIconPrivate;
  */
 class TDEUI_EXPORT KRootPermsIcon : public KAuthIcon
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KRootPermsIcon(TQWidget *parent = 0, const char *name = 0);
@@ -134,7 +134,7 @@ class KWritePermsIconPrivate;
  */
 class TDEUI_EXPORT KWritePermsIcon : public KAuthIcon
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 44243715d..dca2efc46 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -120,9 +120,9 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
     // Configure email button
     m_configureEmail = new TQPushButton( i18n("Configure Email..."),
                                         parent );
-    connect( m_configureEmail, TQT_SIGNAL( clicked() ), this,
-             TQT_SLOT( slotConfigureEmail() ) );
-    glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, (TQ_Alignment)(AlignTop|AlignRight) );
+    connect( m_configureEmail, TQ_SIGNAL( clicked() ), this,
+             TQ_SLOT( slotConfigureEmail() ) );
+    glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, TQt::AlignTop|TQt::AlignRight );
 
     // To
     qwtstr = i18n( "The email address this bug report is sent to." );
@@ -152,7 +152,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
   d->appcombo = new KComboBox( false, parent, "app");
   TQWhatsThis::add( d->appcombo, qwtstr );
   d->appcombo->insertStrList((const char**)packages);
-  connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int)));
+  connect(d->appcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(appChanged(int)));
   d->appname = TQString::fromLatin1( m_aboutData
                                     ? m_aboutData->productName()
                                     : tqApp->name() );
@@ -241,7 +241,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
     lay->addWidget( label );
 
     // 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*/ );
@@ -272,8 +272,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou
     lay->addWidget( d->submitBugButton );
     lay->addSpacing(10);
 
-    connect( d->submitBugButton, TQT_SIGNAL(clicked()),
-             this, TQT_SLOT(slotOk()));
+    connect( d->submitBugButton, TQ_SIGNAL(clicked()),
+             this, TQ_SLOT(slotOk()));
   }
 }
 
@@ -321,7 +321,7 @@ void KBugReport::slotConfigureEmail()
   if (m_process) return;
   m_process = new TDEProcess;
   *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount");
-  connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom()));
+  connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotSetFrom()));
   if (!m_process->start())
   {
     kdDebug() << "Couldn't start tdecmshell.." << endl;
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index 3110d3dd6..3720f7031 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -42,7 +42,7 @@ class KBugReportPrivate;
  */
 class TDEUI_EXPORT KBugReport : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Creates a bug-report dialog.
diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp
index faa26e95e..54329412e 100644
--- a/tdeui/kbuttonbox.cpp
+++ b/tdeui/kbuttonbox.cpp
@@ -130,7 +130,7 @@ KButtonBox::addButton(
   TQPushButton * pb = addButton(text, noexpand);
 
   if ((0 != receiver) && (0 != slot))
-    TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot);
+    TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot);
 
   return pb;
 }
@@ -146,7 +146,7 @@ KButtonBox::addButton(
   TQPushButton * pb = addButton(guiitem, noexpand);
 
   if ((0 != receiver) && (0 != slot))
-    TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot);
+    TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot);
 
   return pb;
 }
@@ -183,7 +183,7 @@ void KButtonBox::layout() {
 
 void KButtonBox::placeButtons() {
 
-  if(data->orientation == Qt::Horizontal) {
+  if(data->orientation == TQt::Horizontal) {
     // calculate free size and stretches
     int fs = width() - 2 * data->border;
     int stretch = 0;
@@ -323,7 +323,7 @@ TQSize KButtonBox::sizeHint() const {
 	else
 	  s = bs;
 
-	if(data->orientation == Qt::Horizontal)
+	if(data->orientation == TQt::Horizontal)
 	  dw += s.width();
 	else
 	  dw += s.height();
@@ -335,7 +335,7 @@ TQSize KButtonBox::sizeHint() const {
       ++itr;
     }
 
-    if(data->orientation == Qt::Horizontal)
+    if(data->orientation == TQt::Horizontal)
 	return TQSize(dw, bs.height() + 2 * data->border);
     else
 	return TQSize(bs.width() + 2 * data->border, dw);
@@ -344,7 +344,7 @@ TQSize KButtonBox::sizeHint() const {
 
 TQSizePolicy KButtonBox::sizePolicy() const
 {
-    return data->orientation == Qt::Horizontal?
+    return data->orientation == TQt::Horizontal?
         TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) :
         TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 }
diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h
index 6044bdb53..5e0ce32fa 100644
--- a/tdeui/kbuttonbox.h
+++ b/tdeui/kbuttonbox.h
@@ -41,7 +41,7 @@ class KButtonBoxPrivate;
 
 class TDEUI_EXPORT KButtonBox : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -51,7 +51,7 @@ public:
     * addButton() are laid out from top to bottom, otherwise they
     * are laid out from left to right.
     */
-  KButtonBox(TQWidget *parent, Orientation _orientation = Qt::Horizontal,
+  KButtonBox(TQWidget *parent, Orientation _orientation = TQt::Horizontal,
 	     int border = 0, int _autoborder = 6);
 
   /**
diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp
index 5561e5883..064e905d2 100644
--- a/tdeui/kcharselect.cpp
+++ b/tdeui/kcharselect.cpp
@@ -78,7 +78,7 @@ KCharSelectTable::KCharSelectTable( TQWidget *parent, const char *name, const TQ
     
     setToolTips();
 
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     setBackgroundMode( TQWidget::NoBackground );
 }
 
@@ -173,7 +173,7 @@ void KCharSelectTable::paintCell( class TQPainter* p, int row, int col )
     }
 
     if ( c == focusItem.unicode() && hasFocus() ) {
-	style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
+	style().drawPrimitive( TQStyle::PE_FocusRect, p, TQRect( 2, 2, w - 4, h - 4 ), 
 			       colorGroup() );
 	focusPos = TQPoint( col, row );
     }
@@ -382,32 +382,32 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
 
     TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar );
     lFont->resize( lFont->sizeHint() );
-    lFont->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    lFont->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
     lFont->setMaximumWidth( lFont->sizeHint().width() );
 
     fontCombo = new TQComboBox( true, bar );
     fillFontCombo();
     fontCombo->resize( fontCombo->sizeHint() );
 
-    connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) );
+    connect( fontCombo, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( fontSelected( const TQString & ) ) );
 
     TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar );
     lTable->resize( lTable->sizeHint() );
-    lTable->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    lTable->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
     lTable->setMaximumWidth( lTable->sizeHint().width() );
 
     tableSpinBox = new TQSpinBox( 0, 255, 1, bar );
     tableSpinBox->resize( tableSpinBox->sizeHint() );
 
-    connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) );
+    connect( tableSpinBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( tableChanged( int ) ) );
 
     TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar );
     lUnicode->resize( lUnicode->sizeHint() );
-    lUnicode->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+    lUnicode->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
     lUnicode->setMaximumWidth( lUnicode->sizeHint().width() );
 
     const TQRegExp rx( "[a-fA-F0-9]{1,4}" );
-    TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) );
+    TQValidator* const validator = new TQRegExpValidator( rx, this );
 
     d->unicodeLine = new KLineEdit( bar );
     d->unicodeLine->setValidator(validator);
@@ -415,7 +415,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
     d->unicodeLine->resize( d->unicodeLine->sizeHint() );
     slotUpdateUnicode(_chr);
 
-    connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
+    connect( d->unicodeLine, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotUnicodeEntered() ) );
 
     charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum );
     const TQSize sz( charTable->contentsWidth()  +  4 ,
@@ -429,20 +429,20 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
     setFont( _font.isEmpty() ? TQString(TQVBox::font().family()) : _font );
     setTableNum( _tableNum );
 
-    connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( slotUpdateUnicode( const TQChar & ) ) );
-    connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( charHighlighted( const TQChar & ) ) );
-    connect( charTable, TQT_SIGNAL( highlighted() ), this, TQT_SLOT( charHighlighted() ) );
-    connect( charTable, TQT_SIGNAL( activated( const TQChar & ) ), this, TQT_SLOT( charActivated( const TQChar & ) ) );
-    connect( charTable, TQT_SIGNAL( activated() ), this, TQT_SLOT( charActivated() ) );
-    connect( charTable, TQT_SIGNAL( focusItemChanged( const TQChar & ) ),
-	     this, TQT_SLOT( charFocusItemChanged( const TQChar & ) ) );
-    connect( charTable, TQT_SIGNAL( focusItemChanged() ), this, TQT_SLOT( charFocusItemChanged() ) );
-    connect( charTable, TQT_SIGNAL( tableUp() ), this, TQT_SLOT( charTableUp() ) );
-    connect( charTable, TQT_SIGNAL( tableDown() ), this, TQT_SLOT( charTableDown() ) );
+    connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( slotUpdateUnicode( const TQChar & ) ) );
+    connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( charHighlighted( const TQChar & ) ) );
+    connect( charTable, TQ_SIGNAL( highlighted() ), this, TQ_SLOT( charHighlighted() ) );
+    connect( charTable, TQ_SIGNAL( activated( const TQChar & ) ), this, TQ_SLOT( charActivated( const TQChar & ) ) );
+    connect( charTable, TQ_SIGNAL( activated() ), this, TQ_SLOT( charActivated() ) );
+    connect( charTable, TQ_SIGNAL( focusItemChanged( const TQChar & ) ),
+	     this, TQ_SLOT( charFocusItemChanged( const TQChar & ) ) );
+    connect( charTable, TQ_SIGNAL( focusItemChanged() ), this, TQ_SLOT( charFocusItemChanged() ) );
+    connect( charTable, TQ_SIGNAL( tableUp() ), this, TQ_SLOT( charTableUp() ) );
+    connect( charTable, TQ_SIGNAL( tableDown() ), this, TQ_SLOT( charTableDown() ) );
 
-    connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked()));
+    connect( charTable, TQ_SIGNAL(doubleClicked()),this,TQ_SLOT(slotDoubleClicked()));
 
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     setFocusProxy( charTable );
 }
 
diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h
index a434154f0..4db7056f5 100644
--- a/tdeui/kcharselect.h
+++ b/tdeui/kcharselect.h
@@ -50,7 +50,7 @@ class KCharSelectPrivate;
 
 class TDEUI_EXPORT KCharSelectTable : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font,
@@ -139,7 +139,7 @@ private:
 
 class TDEUI_EXPORT KCharSelect : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString fontFamily READ font WRITE setFont )
     TQ_PROPERTY( int tableNum READ tableNum WRITE setTableNum )
     TQ_PROPERTY( bool fontComboEnabled READ isFontComboEnabled WRITE enableFontCombo )
diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp
index 60e250575..90cf47e2a 100644
--- a/tdeui/kcmenumngr.cpp
+++ b/tdeui/kcmenumngr.cpp
@@ -59,7 +59,7 @@ void KContextMenuManager::insert( TQWidget* widget, TQPopupMenu* popup )
     if ( !manager )
 	manager = new KContextMenuManager;
     
-    manager->connect( widget, TQT_SIGNAL( destroyed() ), manager, TQT_SLOT( widgetDestroyed() ) );
+    manager->connect( widget, TQ_SIGNAL( destroyed() ), manager, TQ_SLOT( widgetDestroyed() ) );
     manager->menus.insert( widget, popup );
     widget->installEventFilter( manager );
 }
@@ -70,7 +70,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e)
     TQPoint pos;
     switch ( e->type() ) {
     case TQEvent::MouseButtonPress:
-	if (((TQMouseEvent*) e )->button() != Qt::RightButton )
+	if (((TQMouseEvent*) e )->button() != TQt::RightButton )
 	    break;
 	if ( !showOnPress )
 	    return true; // eat event for safety
@@ -78,7 +78,7 @@ bool KContextMenuManager::eventFilter( TQObject *o, TQEvent * e)
 	pos = ((TQMouseEvent*) e )->globalPos();
 	break;
     case TQEvent::MouseButtonRelease:
-	if ( showOnPress  || ((TQMouseEvent*) e )->button() != Qt::RightButton )
+	if ( showOnPress  || ((TQMouseEvent*) e )->button() != TQt::RightButton )
 	    break;
 	popup = menus[o];	
 	pos = ((TQMouseEvent*) e )->globalPos();
diff --git a/tdeui/kcmenumngr.h b/tdeui/kcmenumngr.h
index f59ec8286..4483fae92 100644
--- a/tdeui/kcmenumngr.h
+++ b/tdeui/kcmenumngr.h
@@ -77,7 +77,7 @@ the position of the micro focus hint of the widget ( TQWidget::microFocusHint()
 
 class TDEUI_EXPORT KContextMenuManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp
index 5a42406a0..8f34024d8 100644
--- a/tdeui/kcolorbutton.cpp
+++ b/tdeui/kcolorbutton.cpp
@@ -47,7 +47,7 @@ KColorButton::KColorButton( TQWidget *parent, const char *name )
   setAcceptDrops( true);
 
   // 2000-10-15 (putzer): fixes broken keyboard usage
-  connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor()));
+  connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor()));
 }
 
 KColorButton::KColorButton( const TQColor &c, TQWidget *parent,
@@ -60,7 +60,7 @@ KColorButton::KColorButton( const TQColor &c, TQWidget *parent,
   setAcceptDrops( true);
 
   // 2000-10-15 (putzer): fixes broken keyboard usage
-  connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor()));
+  connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor()));
 }
 
 KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWidget *parent,
@@ -73,7 +73,7 @@ KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWid
   setAcceptDrops( true);
 
   // 2000-10-15 (putzer): fixes broken keyboard usage
-  connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor()));
+  connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor()));
 }
 
 KColorButton::~KColorButton()
@@ -126,13 +126,13 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
 
   if ( hasFocus() ) {
     TQRect focusRect = style().subRect( TQStyle::SR_PushButtonFocusRect, this );
-    style().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+    style().drawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
   }
 }
 
 TQSize KColorButton::sizeHint() const
 {
-  return style().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
+  return style().sizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
 	  	expandedTo(TQApplication::globalStrut());
 }
 
@@ -174,7 +174,7 @@ void KColorButton::mousePressEvent( TQMouseEvent *e)
 
 void KColorButton::mouseMoveEvent( TQMouseEvent *e)
 {
-  if( (e->state() & Qt::LeftButton) &&
+  if( (e->state() & TQt::LeftButton) &&
     (e->pos()-mPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() )
   {
     // Drag color object
diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h
index a9ca78ea8..d2ccc61b9 100644
--- a/tdeui/kcolorbutton.h
+++ b/tdeui/kcolorbutton.h
@@ -36,7 +36,7 @@ class KColorButtonPrivate;
 */
 class TDEUI_EXPORT KColorButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQColor color READ color WRITE setColor )
     TQ_PROPERTY( TQColor defaultColor READ defaultColor WRITE setDefaultColor )
 
diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp
index 87d5de32a..fd43ddcff 100644
--- a/tdeui/kcolorcombo.cpp
+++ b/tdeui/kcolorcombo.cpp
@@ -79,23 +79,23 @@ static void createStandardPalette()
 
     int i = 0;
 
-    standardPalette[i++] = Qt::red;
-    standardPalette[i++] = Qt::green;
-    standardPalette[i++] = Qt::blue;
-    standardPalette[i++] = Qt::cyan;
-    standardPalette[i++] = Qt::magenta;
-    standardPalette[i++] = Qt::yellow;
-    standardPalette[i++] = Qt::darkRed;
-    standardPalette[i++] = Qt::darkGreen;
-    standardPalette[i++] = Qt::darkBlue;
-    standardPalette[i++] = Qt::darkCyan;
-    standardPalette[i++] = Qt::darkMagenta;
-    standardPalette[i++] = Qt::darkYellow;
-    standardPalette[i++] = Qt::white;
-    standardPalette[i++] = Qt::lightGray;
-    standardPalette[i++] = Qt::gray;
-    standardPalette[i++] = Qt::darkGray;
-    standardPalette[i++] = Qt::black;
+    standardPalette[i++] = TQt::red;
+    standardPalette[i++] = TQt::green;
+    standardPalette[i++] = TQt::blue;
+    standardPalette[i++] = TQt::cyan;
+    standardPalette[i++] = TQt::magenta;
+    standardPalette[i++] = TQt::yellow;
+    standardPalette[i++] = TQt::darkRed;
+    standardPalette[i++] = TQt::darkGreen;
+    standardPalette[i++] = TQt::darkBlue;
+    standardPalette[i++] = TQt::darkCyan;
+    standardPalette[i++] = TQt::darkMagenta;
+    standardPalette[i++] = TQt::darkYellow;
+    standardPalette[i++] = TQt::white;
+    standardPalette[i++] = TQt::lightGray;
+    standardPalette[i++] = TQt::gray;
+    standardPalette[i++] = TQt::darkGray;
+    standardPalette[i++] = TQt::black;
 }
 #endif
 
@@ -121,8 +121,8 @@ KColorCombo::KColorCombo( TQWidget *parent, const char *name )
 
 	addColors();
 
-	connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) );
-	connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) );
+	connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) );
+	connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) );
 }
 
 
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index bade8efcb..084537441 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -38,7 +38,7 @@ class KColorComboInternal;
  */
 class TDEUI_EXPORT KColorCombo : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQColor color READ color WRITE setColor )
 
 public:
diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp
index b37bcf42c..8296c8319 100644
--- a/tdeui/kcolordialog.cpp
+++ b/tdeui/kcolordialog.cpp
@@ -68,7 +68,7 @@
 #include "config.h"
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h> 
 
 // defined in qapplication_x11.cpp
@@ -191,23 +191,23 @@ static void createStandardPalette()
 
     int i = 0;
 
-    standardPalette[i++] = Qt::red;
-    standardPalette[i++] = Qt::green;
-    standardPalette[i++] = Qt::blue;
-    standardPalette[i++] = Qt::cyan;
-    standardPalette[i++] = Qt::magenta;
-    standardPalette[i++] = Qt::yellow;
-    standardPalette[i++] = Qt::darkRed;
-    standardPalette[i++] = Qt::darkGreen;
-    standardPalette[i++] = Qt::darkBlue;
-    standardPalette[i++] = Qt::darkCyan;
-    standardPalette[i++] = Qt::darkMagenta;
-    standardPalette[i++] = Qt::darkYellow;
-    standardPalette[i++] = Qt::white;
-    standardPalette[i++] = Qt::lightGray;
-    standardPalette[i++] = Qt::gray;
-    standardPalette[i++] = Qt::darkGray;
-    standardPalette[i++] = Qt::black;
+    standardPalette[i++] = TQt::red;
+    standardPalette[i++] = TQt::green;
+    standardPalette[i++] = TQt::blue;
+    standardPalette[i++] = TQt::cyan;
+    standardPalette[i++] = TQt::magenta;
+    standardPalette[i++] = TQt::yellow;
+    standardPalette[i++] = TQt::darkRed;
+    standardPalette[i++] = TQt::darkGreen;
+    standardPalette[i++] = TQt::darkBlue;
+    standardPalette[i++] = TQt::darkCyan;
+    standardPalette[i++] = TQt::darkMagenta;
+    standardPalette[i++] = TQt::darkYellow;
+    standardPalette[i++] = TQt::white;
+    standardPalette[i++] = TQt::lightGray;
+    standardPalette[i++] = TQt::gray;
+    standardPalette[i++] = TQt::darkGray;
+    standardPalette[i++] = TQt::black;
 }
 
 
@@ -263,7 +263,7 @@ void KHSSelector::drawPalette( TQPixmap *pixmap )
 //-----------------------------------------------------------------------------
 
 KValueSelector::KValueSelector( TQWidget *parent, const char *name )
-	: TDESelector( Qt::Vertical, parent, name ), _hue(0), _sat(0)
+	: TDESelector( TQt::Vertical, parent, name ), _hue(0), _sat(0)
 {
 	setRange( 0, 255 );
 	pixmap.setOptimization( TQPixmap::BestOptim );
@@ -298,9 +298,9 @@ void KValueSelector::drawPalette( TQPixmap *pixmap )
 	TQImage image( xSize, ySize, 32 );
 	TQColor col;
 	uint *p;
-	QRgb rgb;
+	TQRgb rgb;
 
-	if ( orientation() == Qt::Horizontal )
+	if ( orientation() == TQt::Horizontal )
 	{
 		for ( int v = 0; v < ySize; v++ )
 		{
@@ -315,7 +315,7 @@ void KValueSelector::drawPalette( TQPixmap *pixmap )
 		}
 	}
 
-	if( orientation() == Qt::Vertical )
+	if( orientation() == TQt::Vertical )
 	{
 		for ( int v = 0; v < ySize; v++ )
 		{
@@ -429,7 +429,7 @@ int KColorCells::posToCell(const TQPoint &pos, bool ignoreBorders)
 
 void KColorCells::mouseMoveEvent( TQMouseEvent *e )
 {
-    if( !(e->state() & Qt::LeftButton)) return;
+    if( !(e->state() & TQt::LeftButton)) return;
 
     if(inMouse) {
         int delay = TDEGlobalSettings::dndEventDelay();
@@ -533,7 +533,7 @@ void KColorPatch::drawContents( TQPainter *painter )
 void KColorPatch::mouseMoveEvent( TQMouseEvent *e )
 {
         // Drag color object
-        if( !(e->state() & Qt::LeftButton)) return;
+        if( !(e->state() & TQt::LeftButton)) return;
 	KColorDrag *d = new KColorDrag( color, this);
 	d->dragCopy();
 }
@@ -597,12 +597,12 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols)
   mNamedColorList->setFixedSize(minSize);
   mNamedColorList->hide();
   layout->addWidget(mNamedColorList);
-  connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )),
-	   this, TQT_SLOT( slotColorTextSelected( const TQString & )) );
+  connect( mNamedColorList, TQ_SIGNAL(highlighted( const TQString & )),
+	   this, TQ_SLOT( slotColorTextSelected( const TQString & )) );
 
   setFixedSize( sizeHint());
-  connect( combo, TQT_SIGNAL(activated(const TQString &)),
-	this, TQT_SLOT(slotSetPalette( const TQString &)));
+  connect( combo, TQ_SIGNAL(activated(const TQString &)),
+	this, TQ_SLOT(slotSetPalette( const TQString &)));
 }
 
 KPaletteTable::~KPaletteTable()
@@ -704,7 +704,7 @@ KPaletteTable::readNamedColor( void )
     // preventing the real dialog to become visible until the
     // error dialog box is removed (== bad UI).
     //
-    TQTimer::singleShot( 10, this, TQT_SLOT(slotShowNamedColorReadError()) );
+    TQTimer::singleShot( 10, this, TQ_SLOT(slotShowNamedColorReadError()) );
   }
 }
 
@@ -831,10 +831,10 @@ KPaletteTable::setPalette( const TQString &_paletteName )
       {
         cells->setColor( i, mPalette->color(i) );
       }
-      connect( cells, TQT_SIGNAL( colorSelected( int ) ),
-	       TQT_SLOT( slotColorCellSelected( int ) ) );
-      connect( cells, TQT_SIGNAL( colorDoubleClicked( int ) ),
-	       TQT_SLOT( slotColorCellDoubleClicked( int ) ) );
+      connect( cells, TQ_SIGNAL( colorSelected( int ) ),
+	       TQ_SLOT( slotColorCellSelected( int ) ) );
+      connect( cells, TQ_SIGNAL( colorDoubleClicked( int ) ),
+	       TQ_SLOT( slotColorCellDoubleClicked( int ) ) );
       sv->addChild( cells );
       cells->show();
       sv->updateScrollBars();
@@ -930,7 +930,7 @@ public:
     TQCheckBox *cbDefaultColor;
     KColor defaultColor;
     KColor selColor;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     QX11EventFilter oldfilter;
 #endif
 };
@@ -944,12 +944,12 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   d = new KColorDialogPrivate;
   d->bRecursion = true;
   d->bColorPicking = false;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   d->oldfilter = 0;
 #endif
   d->cbDefaultColor = 0L;
-  connect( this, TQT_SIGNAL(okClicked(void)),this,TQT_SLOT(slotWriteSettings(void)));
-  connect( this, TQT_SIGNAL(closeClicked(void)),this,TQT_SLOT(slotWriteSettings(void)));
+  connect( this, TQ_SIGNAL(okClicked(void)),this,TQ_SLOT(slotWriteSettings(void)));
+  connect( this, TQ_SIGNAL(closeClicked(void)),this,TQ_SLOT(slotWriteSettings(void)));
 
   TQLabel *label;
 
@@ -981,7 +981,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   l_left->addSpacing(10);
 
   TQGridLayout *l_lbot = new TQGridLayout(3, 6);
-  l_left->addLayout(TQT_TQLAYOUT(l_lbot));
+  l_left->addLayout(l_lbot);
 
   //
   // the palette and value selector go into the H-box
@@ -989,14 +989,14 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   d->hsSelector = new KHSSelector( page );
   d->hsSelector->setMinimumSize(140, 70);
   l_ltop->addWidget(d->hsSelector, 8);
-  connect( d->hsSelector, TQT_SIGNAL( valueChanged( int, int ) ),
-	   TQT_SLOT( slotHSChanged( int, int ) ) );
+  connect( d->hsSelector, TQ_SIGNAL( valueChanged( int, int ) ),
+	   TQ_SLOT( slotHSChanged( int, int ) ) );
 
   d->valuePal = new KValueSelector( page );
   d->valuePal->setMinimumSize(26, 70);
   l_ltop->addWidget(d->valuePal, 1);
-  connect( d->valuePal, TQT_SIGNAL( valueChanged( int ) ),
-	   TQT_SLOT( slotVChanged( int ) ) );
+  connect( d->valuePal, TQ_SIGNAL( valueChanged( int ) ),
+	   TQ_SLOT( slotVChanged( int ) ) );
 
 
   //
@@ -1006,28 +1006,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 0, 2);
   d->hedit = new KColorSpinBox( 0, 359, 1, page );
-  d->hedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->hedit) ) );
+  d->hedit->setValidator( new TQIntValidator( d->hedit ) );
   l_lbot->addWidget(d->hedit, 0, 3);
-  connect( d->hedit, TQT_SIGNAL( valueChanged(int) ),
-  	TQT_SLOT( slotHSVChanged() ) );
+  connect( d->hedit, TQ_SIGNAL( valueChanged(int) ),
+  	TQ_SLOT( slotHSVChanged() ) );
 
   label = new TQLabel( i18n("S:"), page );
   label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 1, 2);
   d->sedit = new KColorSpinBox( 0, 255, 1, page );
-  d->sedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->sedit) ) );
+  d->sedit->setValidator( new TQIntValidator( d->sedit ) );
   l_lbot->addWidget(d->sedit, 1, 3);
-  connect( d->sedit, TQT_SIGNAL( valueChanged(int) ),
-  	TQT_SLOT( slotHSVChanged() ) );
+  connect( d->sedit, TQ_SIGNAL( valueChanged(int) ),
+  	TQ_SLOT( slotHSVChanged() ) );
 
   label = new TQLabel( i18n("V:"), page );
   label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 2, 2);
   d->vedit = new KColorSpinBox( 0, 255, 1, page );
-  d->vedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->vedit) ) );
+  d->vedit->setValidator( new TQIntValidator( d->vedit ) );
   l_lbot->addWidget(d->vedit, 2, 3);
-  connect( d->vedit, TQT_SIGNAL( valueChanged(int) ),
-  	TQT_SLOT( slotHSVChanged() ) );
+  connect( d->vedit, TQ_SIGNAL( valueChanged(int) ),
+  	TQ_SLOT( slotHSVChanged() ) );
 
   //
   // add the RGB fields
@@ -1036,28 +1036,28 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 0, 4);
   d->redit = new KColorSpinBox( 0, 255, 1, page );
-  d->redit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->redit) ) );
+  d->redit->setValidator( new TQIntValidator( d->redit ) );
   l_lbot->addWidget(d->redit, 0, 5);
-  connect( d->redit, TQT_SIGNAL( valueChanged(int) ),
-  	TQT_SLOT( slotRGBChanged() ) );
+  connect( d->redit, TQ_SIGNAL( valueChanged(int) ),
+  	TQ_SLOT( slotRGBChanged() ) );
 
   label = new TQLabel( i18n("G:"), page );
   label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget( label, 1, 4);
   d->gedit = new KColorSpinBox( 0, 255,1, page );
-  d->gedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->gedit) ) );
+  d->gedit->setValidator( new TQIntValidator( d->gedit ) );
   l_lbot->addWidget(d->gedit, 1, 5);
-  connect( d->gedit, TQT_SIGNAL( valueChanged(int) ),
-  	TQT_SLOT( slotRGBChanged() ) );
+  connect( d->gedit, TQ_SIGNAL( valueChanged(int) ),
+  	TQ_SLOT( slotRGBChanged() ) );
 
   label = new TQLabel( i18n("B:"), page );
   label->setAlignment(AlignRight | AlignVCenter);
   l_lbot->addWidget(label, 2, 4);
   d->bedit = new KColorSpinBox( 0, 255, 1, page );
-  d->bedit->setValidator( new TQIntValidator( TQT_TQOBJECT(d->bedit) ) );
+  d->bedit->setValidator( new TQIntValidator( d->bedit ) );
   l_lbot->addWidget(d->bedit, 2, 5);
-  connect( d->bedit, TQT_SIGNAL( valueChanged(int) ),
-  	TQT_SLOT( slotRGBChanged() ) );
+  connect( d->bedit, TQ_SIGNAL( valueChanged(int) ),
+  	TQ_SLOT( slotRGBChanged() ) );
 
   //
   // the entry fields should be wide enough to hold 8888888
@@ -1083,13 +1083,13 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   d->table = new KPaletteTable( page );
   d->l_right->addWidget(d->table, 10);
 
-  connect( d->table, TQT_SIGNAL( colorSelected( const TQColor &, const TQString & ) ),
-	   TQT_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) );
+  connect( d->table, TQ_SIGNAL( colorSelected( const TQColor &, const TQString & ) ),
+	   TQ_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) );
 
   connect(
     d->table,
-    TQT_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ),
-    TQT_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) )
+    TQ_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ),
+    TQ_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) )
   );
   // Store the default value for saving time.
   d->originalPalette = d->table->palette();
@@ -1107,7 +1107,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   TQPushButton *button = new TQPushButton( page );
   button->setText(i18n("&Add to Custom Colors"));
   l_hbox->addWidget(button, 0, AlignLeft);
-  connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotAddToCustomColors()));
+  connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotAddToCustomColors()));
 
   //
   // The color picker button
@@ -1115,7 +1115,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
   button = new TQPushButton( page );
   button->setPixmap( BarIcon("colorpicker"));
   l_hbox->addWidget(button, 0, AlignHCenter );
-  connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotColorPicker()));
+  connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotColorPicker()));
 
   //
   // a little space between
@@ -1131,30 +1131,30 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
 
   label = new TQLabel( page );
   label->setText(i18n("Name:"));
-  l_grid->addWidget(TQT_TQWIDGET(label), 0, 1, Qt::AlignLeft);
+  l_grid->addWidget(label, 0, 1, TQt::AlignLeft);
 
   d->colorName = new TQLabel( page );
-  l_grid->addWidget(TQT_TQWIDGET(d->colorName), 0, 2, Qt::AlignLeft);
+  l_grid->addWidget(d->colorName, 0, 2, TQt::AlignLeft);
 
   label = new TQLabel( page );
   label->setText(i18n("HTML:"));
-  l_grid->addWidget(TQT_TQWIDGET(label), 1, 1, Qt::AlignLeft);
+  l_grid->addWidget(label, 1, 1, TQt::AlignLeft);
 
   d->htmlName = new KLineEdit( page );
   d->htmlName->setMaxLength( 13 ); // Qt's TQColor allows 12 hexa-digits
   d->htmlName->setText("#FFFFFF"); // But HTML uses only 6, so do not worry about the size
   w = d->htmlName->fontMetrics().width(TQString::fromLatin1("#DDDDDDD"));
   d->htmlName->setFixedWidth(w);
-  l_grid->addWidget(TQT_TQWIDGET(d->htmlName), 1, 2, Qt::AlignLeft);
+  l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft);
 
-  connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ),
-      TQT_SLOT( slotHtmlChanged() ) );
+  connect( d->htmlName, TQ_SIGNAL( textChanged(const TQString &) ),
+      TQ_SLOT( slotHtmlChanged() ) );
 
   d->patch = new KColorPatch( page );
   d->patch->setFixedSize(48, 48);
-  l_grid->addMultiCellWidget(TQT_TQWIDGET(d->patch), 0, 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter);
-  connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)),
-	   TQT_SLOT( setColor( const TQColor&)));
+  l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter);
+  connect( d->patch, TQ_SIGNAL( colorChanged( const TQColor&)),
+	   TQ_SLOT( setColor( const TQColor&)));
 
   tl_layout->activate();
   page->setMinimumSize( page->sizeHint() );
@@ -1177,7 +1177,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
 
 KColorDialog::~KColorDialog()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (d->bColorPicking)
         tqt_set_x11_event_filter(d->oldfilter);
 #endif
@@ -1187,7 +1187,7 @@ KColorDialog::~KColorDialog()
 bool
 KColorDialog::eventFilter( TQObject *obj, TQEvent *ev )
 {
-    if ((TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->htmlName)) || (TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->hsSelector)))
+    if ((obj == d->htmlName) || (obj == d->hsSelector))
     switch(ev->type())
     {
       case TQEvent::DragEnter:
@@ -1226,7 +1226,7 @@ KColorDialog::setDefaultColor( const TQColor& col )
         mainWidget()->setMinimumSize( mainWidget()->sizeHint() );
         disableResize();
 
-        connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) );
+        connect( d->cbDefaultColor, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDefaultColorClicked() ) );
     }
 
     d->defaultColor = col;
@@ -1486,7 +1486,7 @@ void KColorDialog::showColor( const KColor &color, const TQString &name )
 
 static TQWidget *kde_color_dlg_widget = 0;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static int kde_color_dlg_handler(XEvent *event)
 {
     if (event->type == ButtonRelease)
@@ -1503,11 +1503,11 @@ void
 KColorDialog::slotColorPicker()
 {
     d->bColorPicking = true;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     d->oldfilter = tqt_set_x11_event_filter(kde_color_dlg_handler);
 #endif
     kde_color_dlg_widget = this;
-    grabMouse( tqcrossCursor );
+    grabMouse( TQt::crossCursor );
     grabKeyboard();
 }
 
@@ -1517,7 +1517,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e )
   if (d->bColorPicking)
   {
      d->bColorPicking = false;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
      tqt_set_x11_event_filter(d->oldfilter);
      d->oldfilter = 0;
 #endif
@@ -1532,7 +1532,7 @@ KColorDialog::mouseReleaseEvent( TQMouseEvent *e )
 TQColor
 KColorDialog::grabColor(const TQPoint &p)
 {
-    TQWidget *desktop = TQT_TQWIDGET(TQApplication::desktop());
+    TQWidget *desktop = TQApplication::desktop();
     TQPixmap pm = TQPixmap::grabWindow( desktop->winId(), p.x(), p.y(), 1, 1);
     TQImage i = pm.convertToImage();
     return i.pixel(0,0);
@@ -1546,7 +1546,7 @@ KColorDialog::keyPressEvent( TQKeyEvent *e )
      if (e->key() == Key_Escape)
      {
         d->bColorPicking = false;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         tqt_set_x11_event_filter(d->oldfilter);
         d->oldfilter = 0;
 #endif
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index e580ad582..a2ea4b52f 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -25,7 +25,7 @@
 #ifndef KDELIBS_KCOLORDIALOG_H
 #define KDELIBS_KCOLORDIALOG_H
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
 // FIXME(E): Do we need the KColorDialog extra functionality in Qt Embedded?
 #include <tqcolordialog.h>
 #define KColorDialog QColorDialog
@@ -57,7 +57,7 @@ class KColorCells;
 */
 class TDEUI_EXPORT KHSSelector : public KXYSelector
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -101,7 +101,7 @@ class KValueSelectorPrivate;
  */
 class TDEUI_EXPORT KValueSelector : public TDESelector
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -197,7 +197,7 @@ private:
  **/
 class TDEUI_EXPORT KPaletteTable : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KPaletteTable( TQWidget *parent, int minWidth=210, int cols = 16);
   ~KPaletteTable();
@@ -252,7 +252,7 @@ private:
 */
 class TDEUI_EXPORT KColorCells : public TQGridView
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KColorCells( TQWidget *parent, int rows, int cols );
   ~KColorCells();
@@ -310,7 +310,7 @@ private:
  */
 class TDEUI_EXPORT KColorPatch : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KColorPatch( TQWidget *parent );
   virtual ~KColorPatch();
@@ -376,7 +376,7 @@ private:
  **/
 class TDEUI_EXPORT KColorDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -491,6 +491,6 @@ class TDEUI_EXPORT KColorDialog : public KDialogBase
     KColorDialogPrivate *d;
 };
 
-#endif		// !Q_WS_QWS
+#endif		// !TQ_WS_QWS
 #endif		// KDELIBS_KCOLORDIALOG_H
 
diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h
index 289938b00..7c46faf2d 100644
--- a/tdeui/kcolordrag.h
+++ b/tdeui/kcolordrag.h
@@ -34,7 +34,7 @@ class KColorDragPrivate;
  * See the Qt drag'n'drop documentation.
  */
 class TDEUI_EXPORT KColorDrag : public TQStoredDrag {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index 3b2b770ee..bcde35467 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -249,7 +249,7 @@ void KComboBox::wheelEvent( TQWheelEvent *ev )
 void KComboBox::setLineEdit( TQLineEdit *edit )
 {
     if ( !editable() && edit &&
-         !qstrcmp( edit->className(), TQLINEEDIT_OBJECT_NAME_STRING ) )
+         !qstrcmp( edit->className(), "TQLineEdit" ) )
     {
         // uic generates code that creates a read-only KComboBox and then
         // calls combo->setEditable( true ), which causes TQComboBox to set up
@@ -261,12 +261,12 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
     }
 
     TQComboBox::setLineEdit( edit );
-    d->klineEdit = tqt_dynamic_cast<KLineEdit*>( edit );
+    d->klineEdit = dynamic_cast<KLineEdit*>( edit );
     setDelegate( d->klineEdit );
 
     // Connect the returnPressed signal for both Q[K]LineEdits'
     if (edit)
-        connect( edit, TQT_SIGNAL( returnPressed() ), TQT_SIGNAL( returnPressed() ));
+        connect( edit, TQ_SIGNAL( returnPressed() ), TQ_SIGNAL( returnPressed() ));
 
     if ( d->klineEdit )
     {
@@ -274,32 +274,32 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
         // lineedit without us noticing. And TDECompletionBase::delegate would
         // be a dangling pointer then, so prevent that. Note: only do this
         // when it is a KLineEdit!
-        connect( edit, TQT_SIGNAL( destroyed() ), TQT_SLOT( lineEditDeleted() ));
+        connect( edit, TQ_SIGNAL( destroyed() ), TQ_SLOT( lineEditDeleted() ));
 
-        connect( d->klineEdit, TQT_SIGNAL( returnPressed( const TQString& )),
-                 TQT_SIGNAL( returnPressed( const TQString& ) ));
+        connect( d->klineEdit, TQ_SIGNAL( returnPressed( const TQString& )),
+                 TQ_SIGNAL( returnPressed( const TQString& ) ));
 
-        connect( d->klineEdit, TQT_SIGNAL( completion( const TQString& )),
-                 TQT_SIGNAL( completion( const TQString& )) );
+        connect( d->klineEdit, TQ_SIGNAL( completion( const TQString& )),
+                 TQ_SIGNAL( completion( const TQString& )) );
 
-        connect( d->klineEdit, TQT_SIGNAL( substringCompletion( const TQString& )),
-                 TQT_SIGNAL( substringCompletion( const TQString& )) );
+        connect( d->klineEdit, TQ_SIGNAL( substringCompletion( const TQString& )),
+                 TQ_SIGNAL( substringCompletion( const TQString& )) );
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )),
-                 TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) );
+                 TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )),
+                 TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) );
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )),
-                 TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion)));
+                 TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )),
+                 TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion)));
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )),
-                 TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) );
+                 TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )),
+                 TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) );
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( completionBoxActivated( const TQString& )),
-                 TQT_SIGNAL( activated( const TQString& )) );
+                 TQ_SIGNAL( completionBoxActivated( const TQString& )),
+                 TQ_SIGNAL( activated( const TQString& )) );
     }
 }
 
@@ -390,10 +390,10 @@ void KHistoryCombo::init( bool useCompletion )
     if ( histControl == "ignoredups" || histControl == "ignoreboth" )
         setDuplicatesEnabled( false );
 
-    connect( this, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)),
-             TQT_SLOT(addContextMenuItems(TQPopupMenu*)) );
-    connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotReset() ));
-    connect( this, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT(slotReset()));
+    connect( this, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)),
+             TQ_SLOT(addContextMenuItems(TQPopupMenu*)) );
+    connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotReset() ));
+    connect( this, TQ_SIGNAL( returnPressed(const TQString&) ), TQ_SLOT(slotReset()));
 }
 
 KHistoryCombo::~KHistoryCombo()
@@ -455,10 +455,10 @@ void KHistoryCombo::addContextMenuItems( TQPopupMenu* menu )
     {
         menu->insertSeparator();
         if (d->bHistoryEditorEnabled) {
-           int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQT_SLOT( slotEdit()) );
+           int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQ_SLOT( slotEdit()) );
            menu->setItemEnabled(idedit, count());
         }
-        int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQT_SLOT( slotClear()));
+        int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQ_SLOT( slotClear()));
         if (!count())
            menu->setItemEnabled(id, false);
     }
@@ -697,7 +697,7 @@ void KHistoryCombo::slotClear()
 void KHistoryCombo::slotEdit()
 {
     KHistoryComboEditor dlg( historyItems(), this );
-    connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) );
+    connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) );
     dlg.exec();
 }
 
@@ -747,7 +747,7 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget
     TQLabel* slbl = new TQLabel(i18n("&Search:"), searchbox);
     TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchbox);
     slbl->setBuddy(listViewSearch);
-    connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
+    connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
 
     // Add ListView
     m_pListView = new TDEListView( box );
@@ -766,8 +766,8 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget
 
     m_pListView->setMinimumSize( m_pListView->sizeHint() );
 
-    connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-             this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
+    connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+             this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
 
     enableButton( KDialogBase::User1, false );
 
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index e0c2e2704..8e6afbbe4 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -114,7 +114,7 @@ class KURL;
  * KComboBox *combo = new KComboBox( true, this, "mywidget" );
  * TDECompletion *comp = combo->completionObject();
  * // Connect to the return pressed signal - optional
- * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
+ * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&)));
  *
  * // Provide the to be completed strings. Note that those are separate from the combo's
  * // contents.
@@ -128,7 +128,7 @@ class KURL;
  * KURLCompletion *comp = new KURLCompletion();
  * combo->setCompletionObject( comp );
  * // Connect to the return pressed signal - optional
- * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
+ * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&)));
  * \endcode
  *
  * Note that you have to either delete the allocated completion object
@@ -141,7 +141,7 @@ class KURL;
  * // Tell the widget not to handle completion and rotation
  * combo->setHandleSignals( false );
  * // Set your own completion key for manual completions.
- * combo->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End );
+ * combo->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End );
  * // Hide the context (popup) menu
  * combo->setContextMenuEnabled( false );
  * \endcode
@@ -150,7 +150,7 @@ class KURL;
  */
 class TDEUI_EXPORT KComboBox : public TQComboBox, public TDECompletionBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
   TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
   TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
@@ -539,7 +539,7 @@ class KPixmapProvider;
  */
 class TDEUI_EXPORT KHistoryCombo : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems )
 
 public:
@@ -553,8 +553,8 @@ public:
      * use
      *
      * \code
-     * connect( combo, TQT_SIGNAL( activated( const TQString& )),
-     *          combo, TQT_SLOT( addToHistory( const TQString& )));
+     * connect( combo, TQ_SIGNAL( activated( const TQString& )),
+     *          combo, TQ_SLOT( addToHistory( const TQString& )));
      * \endcode
      *
      * Use TQComboBox::setMaxCount() to limit the history.
@@ -798,7 +798,7 @@ private:
 
 class TDEUI_EXPORT KHistoryComboEditor : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KHistoryComboEditor( const TQStringList& entries, TQWidget *parent = 0L );
diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp
index 5357e557a..cd30b861b 100644
--- a/tdeui/kcommand.cpp
+++ b/tdeui/kcommand.cpp
@@ -84,25 +84,25 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi
     if (withMenus)
     {
         TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo",
-                                          TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ),
+                                          TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQ_SLOT( undo() ),
                                           actionCollection, KStdAction::stdName( KStdAction::Undo ) );
-        connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) );
-        connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) );
+        connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) );
+        connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) );
         m_undo = undo;
         m_undoPopup = undo->popupMenu();
 
         TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo",
-                                          TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ),
+                                          TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQ_SLOT( redo() ),
                                           actionCollection, KStdAction::stdName( KStdAction::Redo ) );
-        connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) );
-        connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) );
+        connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) );
+        connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) );
         m_redo = redo;
         m_redoPopup = redo->popupMenu();
     }
     else
     {
-        m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection );
-        m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection );
+        m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection );
+        m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection );
         m_undoPopup = 0L;
         m_redoPopup = 0L;
     }
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index e27e5178b..f043afe00 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -154,7 +154,7 @@ protected:
  * to the name of the command.
  */
 class TDEUI_EXPORT KCommandHistory : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Creates a command history, to store commands.
diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp
index 17f523d86..ae0a83935 100644
--- a/tdeui/kcursor.cpp
+++ b/tdeui/kcursor.cpp
@@ -49,7 +49,7 @@ TQCursor KCursor::handCursor()
                 TDEConfig *config = TDEGlobal::config();
                 TDEConfigGroupSaver saver( config, "General" );
 
-#ifndef Q_WS_WIN // this mask doesn't work too well on win32
+#ifndef TQ_WS_WIN // this mask doesn't work too well on win32
                 if ( config->readEntry("handCursorStyle", "Windows") == "Windows" )
                 {
                         static const unsigned char HAND_BITS[] = {
@@ -74,7 +74,7 @@ TQCursor KCursor::handCursor()
                         hand_cursor->handle();
                 }
                 else
-#endif //! Q_WS_WIN
+#endif //! TQ_WS_WIN
                         hand_cursor = new TQCursor(PointingHandCursor);
         }
 
@@ -145,72 +145,72 @@ TQCursor KCursor::workingCursor()
  */
 TQCursor KCursor::arrowCursor()
 {
-    return tqarrowCursor;
+    return TQt::arrowCursor;
 }
 
 
 TQCursor KCursor::upArrowCursor()
 {
-    return tqupArrowCursor;
+    return TQt::upArrowCursor;
 }
 
 
 TQCursor KCursor::crossCursor()
 {
-    return tqcrossCursor;
+    return TQt::crossCursor;
 }
 
 
 TQCursor KCursor::waitCursor()
 {
-    return tqwaitCursor;
+    return TQt::waitCursor;
 }
 
 
 TQCursor KCursor::ibeamCursor()
 {
-    return tqibeamCursor;
+    return TQt::ibeamCursor;
 }
 
 
 TQCursor KCursor::sizeVerCursor()
 {
-    return tqsizeVerCursor;
+    return TQt::sizeVerCursor;
 }
 
 
 TQCursor KCursor::sizeHorCursor()
 {
-    return tqsizeHorCursor;
+    return TQt::sizeHorCursor;
 }
 
 
 TQCursor KCursor::sizeBDiagCursor()
 {
-    return tqsizeBDiagCursor;
+    return TQt::sizeBDiagCursor;
 }
 
 
 TQCursor KCursor::sizeFDiagCursor()
 {
-    return tqsizeFDiagCursor;
+    return TQt::sizeFDiagCursor;
 }
 
 
 TQCursor KCursor::sizeAllCursor()
 {
-    return tqsizeAllCursor;
+    return TQt::sizeAllCursor;
 }
 
 
 TQCursor KCursor::blankCursor()
 {
-    return tqblankCursor;
+    return TQt::blankCursor;
 }
 
 TQCursor KCursor::whatsThisCursor()
 {
-    return tqwhatsThisCursor;
+    return TQt::whatsThisCursor;
 }
 
 // auto-hide cursor stuff
@@ -250,8 +250,8 @@ KCursorPrivateAutoHideEventFilter::KCursorPrivateAutoHideEventFilter( TQWidget*
     , m_isOwnCursor( false )
 {
     m_widget->setMouseTracking( true );
-    connect( &m_autoHideTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( hideCursor() ) );
+    connect( &m_autoHideTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( hideCursor() ) );
 }
 
 KCursorPrivateAutoHideEventFilter::~KCursorPrivateAutoHideEventFilter()
@@ -294,7 +294,7 @@ void KCursorPrivateAutoHideEventFilter::unhideCursor()
 
     TQWidget* w = actualWidget();
 
-    if ( w->cursor().shape() != Qt::BlankCursor ) // someone messed with the cursor already
+    if ( w->cursor().shape() != TQt::BlankCursor ) // someone messed with the cursor already
 	return;
 
     if ( m_isOwnCursor )
@@ -308,7 +308,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const
     TQWidget* w = m_widget;
 
     // Is w a scrollview ? Call setCursor on the viewport in that case.
-    TQScrollView * sv = tqt_dynamic_cast<TQScrollView *>( w );
+    TQScrollView * sv = dynamic_cast<TQScrollView *>( w );
     if ( sv )
         w = sv->viewport();
 
@@ -317,7 +317,7 @@ TQWidget* KCursorPrivateAutoHideEventFilter::actualWidget() const
 
 bool KCursorPrivateAutoHideEventFilter::eventFilter( TQObject *o, TQEvent *e )
 {
-    Q_ASSERT( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_widget) );
+    Q_ASSERT( o == m_widget );
 
     switch ( e->type() )
     {
@@ -392,8 +392,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve
         m_eventFilters.insert( w, filter );
         if ( !customEventFilter )
             w->installEventFilter( filter );
-        connect( w, TQT_SIGNAL( destroyed(TQObject*) ),
-                 this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) );
+        connect( w, TQ_SIGNAL( destroyed(TQObject*) ),
+                 this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) );
     }
     else
     {
@@ -402,8 +402,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve
             return;
         w->removeEventFilter( filter );
         delete filter;
-        disconnect( w, TQT_SIGNAL( destroyed(TQObject*) ),
-                    this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) );
+        disconnect( w, TQ_SIGNAL( destroyed(TQObject*) ),
+                    this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) );
     }
 }
 
diff --git a/tdeui/kcursor_private.h b/tdeui/kcursor_private.h
index 0ed1789e6..999280f74 100644
--- a/tdeui/kcursor_private.h
+++ b/tdeui/kcursor_private.h
@@ -38,7 +38,7 @@ class TQWidget;
 */
 class KCursorPrivateAutoHideEventFilter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCursorPrivateAutoHideEventFilter( TQWidget* widget );
@@ -71,7 +71,7 @@ private:
 class KCursorPrivate : public TQObject
 {
     friend class KCursor; // to shut up the compiler
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static KCursorPrivate *self();
diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp
index f29e32762..0622cbc1a 100644
--- a/tdeui/kdatepicker.cpp
+++ b/tdeui/kdatepicker.cpp
@@ -92,7 +92,7 @@ void KDatePicker::fillWeeksCombo(const TQDate &date)
     // make sure that the week of the lastDay is always inserted: in Chinese calendar
     // system, this is not always the case
     if(day < lastDay && day.daysTo(lastDay) < 7 && calendar->weekNumber(day) != calendar->weekNumber(lastDay))
-      day = TQT_TQDATE_OBJECT(lastDay.addDays(-7));
+      day = lastDay.addDays(-7);
   }
 }
 
@@ -187,17 +187,17 @@ void KDatePicker::init( const TQDate &dt )
       monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow")));
       monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow")));
   }
-  connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate)));
-  connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot()));
-  connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked()));
-  connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked()));
-  connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked()));
-  connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked()));
-  connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int)));
-  connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked()));
-  connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked()));
-  connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked()));
-  connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed()));
+  connect(table, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(dateChangedSlot(TQDate)));
+  connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot()));
+  connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked()));
+  connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked()));
+  connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked()));
+  connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked()));
+  connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int)));
+  connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked()));
+  connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked()));
+  connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked()));
+  connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed()));
   table->setFocus();
 
 
@@ -225,8 +225,8 @@ KDatePicker::eventFilter(TQObject *o, TQEvent *e )
 
       if ( (k->key() == TQt::Key_Prior) ||
            (k->key() == TQt::Key_Next)  ||
-           (k->key() == Qt::Key_Up)    ||
-           (k->key() == Qt::Key_Down) )
+           (k->key() == TQt::Key_Up)    ||
+           (k->key() == TQt::Key_Down) )
        {
           TQApplication::sendEvent( table, e );
           table->setFocus();
@@ -371,7 +371,7 @@ KDatePicker::selectMonthClicked()
   int day = calendar->day(date);
   // ----- construct a valid date in this month:
   calendar->setYMD(date, calendar->year(date), month, 1);
-  date = TQT_TQDATE_OBJECT(date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1));
+  date = date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1);
   // ----- set this month
   setDate(date);
 }
@@ -394,7 +394,7 @@ KDatePicker::selectYearClicked()
   picker->setYear( table->getDate().year() );
   picker->selectAll();
   popup->setMainWidget(picker);
-  connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int)));
+  connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int)));
   picker->setFocus();
   if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height()))))
     {
@@ -416,7 +416,7 @@ KDatePicker::selectYearClicked()
     }
 
   delete popup;
-  TQTimer::singleShot(0, this, TQT_SLOT(ensureSelectYearIsUp()));
+  TQTimer::singleShot(0, this, TQ_SLOT(ensureSelectYearIsUp()));
 }
 
 void
@@ -507,7 +507,7 @@ KDatePicker::setFontSize(int s)
       maxMonthRect.setHeight(TQMAX(r.height(),  maxMonthRect.height()));
     }
 
-  TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton,
+  TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton,
                                                selectMonth,
                                                maxMonthRect);
   selectMonth->setMinimumSize(metricBound);
@@ -528,8 +528,8 @@ KDatePicker::setCloseButton( bool enable )
         d->navigationLayout->addWidget(d->closeButton);
         TQToolTip::add(d->closeButton, i18n("Close"));
         d->closeButton->setPixmap( SmallIcon("remove") );
-        connect( d->closeButton, TQT_SIGNAL( clicked() ),
-                 topLevelWidget(), TQT_SLOT( close() ) );
+        connect( d->closeButton, TQ_SIGNAL( clicked() ),
+                 topLevelWidget(), TQ_SLOT( close() ) );
     }
     else {
         delete d->closeButton;
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index 4e13f860e..32455144d 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -50,7 +50,7 @@ class KDateTable;
  **/
 class TDEUI_EXPORT KDatePicker: public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQDate date READ date WRITE setDate)
   TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton )
   TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp
index ec5a1a132..7d76c3fc1 100644
--- a/tdeui/kdatetbl.cpp
+++ b/tdeui/kdatetbl.cpp
@@ -84,7 +84,7 @@ public:
 
 
 KDateValidator::KDateValidator(TQWidget* parent, const char* name)
-    : TQValidator(TQT_TQOBJECT(parent), name)
+    : TQValidator(parent, name)
 {
 }
 
@@ -124,7 +124,7 @@ KDateTable::KDateTable(TQWidget *parent, TQDate date_, const char* name, WFlags
       kdDebug() << "KDateTable ctor: WARNING: Given date is invalid, using current date." << endl;
       date_=TQDate::currentDate();
     }
-  setFocusPolicy( TQ_StrongFocus );
+  setFocusPolicy( TQWidget::StrongFocus );
   setNumRows(7); // 6 weeks max + headline
   setNumCols(7); // 7 days a week
   setHScrollBarMode(AlwaysOff);
@@ -140,7 +140,7 @@ KDateTable::KDateTable(TQWidget *parent, const char* name, WFlags f)
 {
   d = new KDateTablePrivate;
   setFontSize(10);
-  setFocusPolicy( TQ_StrongFocus );
+  setFocusPolicy( TQWidget::StrongFocus );
   setNumRows(7); // 6 weeks max + headline
   setNumCols(7); // 7 days a week
   setHScrollBarMode(AlwaysOff);
@@ -158,12 +158,12 @@ KDateTable::~KDateTable()
 void KDateTable::initAccels()
 {
   TDEAccel* accel = new TDEAccel(this, "date table accel");
-  accel->insert(TDEStdAccel::Next, TQT_TQOBJECT(this), TQT_SLOT(nextMonth()));
-  accel->insert(TDEStdAccel::Prior, TQT_TQOBJECT(this), TQT_SLOT(previousMonth()));
-  accel->insert(TDEStdAccel::Home, TQT_TQOBJECT(this), TQT_SLOT(beginningOfMonth()));
-  accel->insert(TDEStdAccel::End, TQT_TQOBJECT(this), TQT_SLOT(endOfMonth()));
-  accel->insert(TDEStdAccel::BeginningOfLine, TQT_TQOBJECT(this), TQT_SLOT(beginningOfWeek()));
-  accel->insert(TDEStdAccel::EndOfLine, TQT_TQOBJECT(this), TQT_SLOT(endOfWeek()));
+  accel->insert(TDEStdAccel::Next, this, TQ_SLOT(nextMonth()));
+  accel->insert(TDEStdAccel::Prior, this, TQ_SLOT(previousMonth()));
+  accel->insert(TDEStdAccel::Home, this, TQ_SLOT(beginningOfMonth()));
+  accel->insert(TDEStdAccel::End, this, TQ_SLOT(endOfMonth()));
+  accel->insert(TDEStdAccel::BeginningOfLine, this, TQ_SLOT(beginningOfWeek()));
+  accel->insert(TDEStdAccel::EndOfLine, this, TQ_SLOT(endOfWeek()));
   accel->readSettings();
 }
 
@@ -351,22 +351,22 @@ void KDateTable::previousMonth()
 
 void KDateTable::beginningOfMonth()
 {
-  setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.day())));
+  setDate(date.addDays(1 - date.day()));
 }
 
 void KDateTable::endOfMonth()
 {
-  setDate(TQT_TQDATE_OBJECT(date.addDays(date.daysInMonth() - date.day())));
+  setDate(date.addDays(date.daysInMonth() - date.day()));
 }
 
 void KDateTable::beginningOfWeek()
 {
-  setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.dayOfWeek())));
+  setDate(date.addDays(1 - date.dayOfWeek()));
 }
 
 void KDateTable::endOfWeek()
 {
-  setDate(TQT_TQDATE_OBJECT(date.addDays(7 - date.dayOfWeek())));
+  setDate(date.addDays(7 - date.dayOfWeek()));
 }
 
 void
@@ -374,22 +374,22 @@ KDateTable::keyPressEvent( TQKeyEvent *e )
 {
     switch( e->key() ) {
     case Key_Up:
-            setDate(TQT_TQDATE_OBJECT(date.addDays(-7)));
+            setDate(date.addDays(-7));
         break;
     case Key_Down:
-            setDate(TQT_TQDATE_OBJECT(date.addDays(7)));
+            setDate(date.addDays(7));
         break;
     case Key_Left:
-            setDate(TQT_TQDATE_OBJECT(date.addDays(-1)));
+            setDate(date.addDays(-1));
         break;
     case Key_Right:
-            setDate(TQT_TQDATE_OBJECT(date.addDays(1)));
+            setDate(date.addDays(1));
         break;
     case Key_Minus:
-        setDate(TQT_TQDATE_OBJECT(date.addDays(-1)));
+        setDate(date.addDays(-1));
 	break;
     case Key_Plus:
-        setDate(TQT_TQDATE_OBJECT(date.addDays(1)));
+        setDate(date.addDays(1));
 	break;
     case Key_N:
         setDate(TQDate::currentDate());
@@ -447,7 +447,7 @@ KDateTable::setFontSize(int size)
 void
 KDateTable::wheelEvent ( TQWheelEvent * e )
 {
-    setDate(TQT_TQDATE_OBJECT(date.addMonths( -(int)(e->delta()/120)) ));
+    setDate(date.addMonths( -(int)(e->delta()/120)) );
     e->accept();
 }
 
@@ -497,7 +497,7 @@ KDateTable::contentsMousePressEvent(TQMouseEvent *e)
 
   emit tableClicked();
 
-  if (  e->button() == Qt::RightButton && d->popupMenuEnabled )
+  if (  e->button() == TQt::RightButton && d->popupMenuEnabled )
   {
         TDEPopupMenu *menu = new TDEPopupMenu();
         menu->insertTitle( TDEGlobal::locale()->formatDate(clickedDate) );
@@ -609,7 +609,7 @@ void KDateTable::unsetCustomDatePainting( const TQDate &date )
 KDateInternalWeekSelector::KDateInternalWeekSelector
 (TQWidget* parent, const char* name)
   : TQLineEdit(parent, name),
-    val(new TQIntValidator(TQT_TQOBJECT(this))),
+    val(new TQIntValidator(this)),
     result(0)
 {
   TQFont font;
@@ -618,7 +618,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector
   setFont(font);
   setFrameStyle(TQFrame::NoFrame);
   setValidator(val);
-  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot()));
+  connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot()));
 }
 
 void
@@ -756,7 +756,7 @@ KDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col)
 void
 KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e)
 {
-  if(!isEnabled() || e->button() != Qt::LeftButton)
+  if(!isEnabled() || e->button() != TQt::LeftButton)
     {
       KNotifyClient::beep();
       return;
@@ -783,7 +783,7 @@ KDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e)
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e)
 {
-  if (e->state() & Qt::LeftButton)
+  if (e->state() & TQt::LeftButton)
     {
       int row, col;
       TQPoint mouseCoord;
@@ -850,7 +850,7 @@ KDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e)
 KDateInternalYearSelector::KDateInternalYearSelector
 (TQWidget* parent, const char* name)
   : TQLineEdit(parent, name),
-    val(new TQIntValidator(TQT_TQOBJECT(this))),
+    val(new TQIntValidator(this)),
     result(0)
 {
   TQFont font;
@@ -861,7 +861,7 @@ KDateInternalYearSelector::KDateInternalYearSelector
   // we have to respect the limits of TQDate here, I fear:
   val->setRange(0, 8000);
   setValidator(val);
-  connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot()));
+  connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot()));
 }
 
 void
@@ -1008,7 +1008,7 @@ TDEPopupFrame::exec(TQPoint pos)
   popup(pos);
   repaint();
   d->exec = true;
-  const TQGuardedPtr<TQObject> that = TQT_TQOBJECT(this);
+  const TQGuardedPtr<TQObject> that = this;
   tqApp->enter_loop();
   if ( !that )
     return TQDialog::Rejected;
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 4bc1444ca..2b3b3b93f 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -39,7 +39,7 @@ class TDEPopupMenu;
 */
 class TDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   TQIntValidator *val;
   int result;
@@ -66,7 +66,7 @@ private:
 */
 class TDEUI_EXPORT KDateInternalMonthPicker : public TQGridView
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
@@ -139,7 +139,7 @@ private:
 */
 class TDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   TQIntValidator *val;
   int result;
@@ -165,7 +165,7 @@ private:
  */
 class TDEUI_EXPORT TDEPopupFrame : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   /**
    * The result. It is returned from exec() when the popup window closes.
@@ -186,7 +186,7 @@ public slots:
    */
   void close(int r);
   /**
-   * Hides the widget. Reimplemented from QWidget
+   * Hides the widget. Reimplemented from TQWidget
    */
   void hide();
 
@@ -262,7 +262,7 @@ public:
  */
 class TDEUI_EXPORT KDateTable : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQDate date READ getDate WRITE setDate )
     TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled )
 
diff --git a/tdeui/kdatetimewidget.cpp b/tdeui/kdatetimewidget.cpp
index d7b677af9..1aa9332be 100644
--- a/tdeui/kdatetimewidget.cpp
+++ b/tdeui/kdatetimewidget.cpp
@@ -44,16 +44,16 @@ void KDateTimeWidget::init()
   d->dateWidget = new KDateWidget(this);
   d->timeWidget = new KTimeWidget(this);
 
-  connect(d->dateWidget, TQT_SIGNAL(changed(TQDate)),
-          TQT_SLOT(slotValueChanged()));
-  connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)),
-          TQT_SLOT(slotValueChanged()));
+  connect(d->dateWidget, TQ_SIGNAL(changed(TQDate)),
+          TQ_SLOT(slotValueChanged()));
+  connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)),
+          TQ_SLOT(slotValueChanged()));
 }
 
 void KDateTimeWidget::setDateTime(const TQDateTime & datetime)
 {
-  d->dateWidget->setDate(TQT_TQDATE_OBJECT(datetime.date()));
-  d->timeWidget->setTime(TQT_TQTIME_OBJECT(datetime.time()));
+  d->dateWidget->setDate(datetime.date());
+  d->timeWidget->setTime(datetime.time());
 }
 
 TQDateTime KDateTimeWidget::dateTime() const
diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h
index 26c3cf670..d2b0b4e31 100644
--- a/tdeui/kdatetimewidget.h
+++ b/tdeui/kdatetimewidget.h
@@ -39,7 +39,7 @@
  */
 class TDEUI_EXPORT KDateTimeWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp
index 2fc9dda0a..8a7206d4a 100644
--- a/tdeui/kdatewidget.cpp
+++ b/tdeui/kdatewidget.cpp
@@ -88,9 +88,9 @@ void KDateWidget::init()
   d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(),
 				     locale->calendar()->maxValidYear(), this);
 
-  connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
-  connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged()));
-  connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
+  connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
+  connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged()));
+  connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
 }
 
 void KDateWidget::init(const TQDate& date)
@@ -112,9 +112,9 @@ void KDateWidget::init(const TQDate& date)
   d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(),
 				     locale->calendar()->maxValidYear(), this);
 
-  connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
-  connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged()));
-  connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged()));
+  connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
+  connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged()));
+  connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged()));
 }
 
 KDateWidget::~KDateWidget()
diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h
index c89b382c1..3f68dc0da 100644
--- a/tdeui/kdatewidget.h
+++ b/tdeui/kdatewidget.h
@@ -35,7 +35,7 @@
 */
 class TDEUI_EXPORT KDateWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQDate date READ date WRITE setDate )
 
 public:
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index d0e7a84cf..5a90b5af9 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -32,8 +32,8 @@
 KDETrayProxy::KDETrayProxy()
     :   selection( makeSelectionAtom())
     {
-    connect( &selection, TQT_SIGNAL( newOwner( Window )), TQT_SLOT( newOwner( Window )));
-    connect( &module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
+    connect( &selection, TQ_SIGNAL( newOwner( Window )), TQ_SLOT( newOwner( Window )));
+    connect( &module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId )));
     selection.owner();
     for( TQValueList< WId >::ConstIterator it = module.windows().begin();
          it != module.windows().end();
@@ -143,7 +143,7 @@ void KDETrayProxy::dockWindow( Window w, Window owner )
     ev.xclient.window = owner;
     ev.xclient.message_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 ] = 0; // SYSTEM_TRAY_REQUEST_DOCK
     ev.xclient.data.l[ 2 ] = w;
     ev.xclient.data.l[ 3 ] = 0; // unused
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h
index 9331aad5c..2231be9ab 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.h
+++ b/tdeui/kdetrayproxy/kdetrayproxy.h
@@ -28,7 +28,7 @@
 class KDETrayProxy
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KDETrayProxy();
     public slots:
diff --git a/tdeui/kdetrayproxy/module.h b/tdeui/kdetrayproxy/module.h
index 67ed1a29d..5ce759eb4 100644
--- a/tdeui/kdetrayproxy/module.h
+++ b/tdeui/kdetrayproxy/module.h
@@ -28,7 +28,7 @@
 class KDETrayModule
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     public:
         KDETrayModule( const TQCString& obj );
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp
index 72925525c..68471847d 100644
--- a/tdeui/kdialog.cpp
+++ b/tdeui/kdialog.cpp
@@ -41,7 +41,7 @@
 #include <tqpushbutton.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <netwm.h>
 #endif
 
@@ -130,7 +130,7 @@ void KDialog::setPlainCaption( const TQString &caption )
 {
   TQDialog::setCaption( caption );
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
   NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 );
   info.setName( caption.utf8().data() );
 #endif
@@ -141,7 +141,7 @@ void KDialog::resizeLayout( TQWidget *w, int margin, int spacing )
 {
   if( w->layout() )
   {
-    resizeLayout( TQT_TQLAYOUTITEM(w->layout()), margin, spacing );
+    resizeLayout( w->layout(), margin, spacing );
   }
 
   if( !w->childrenListObject().isEmpty() )
@@ -295,7 +295,7 @@ void KDialogQueue::queueDialog(TQDialog *dialog)
 {
    KDialogQueue *_this = self();
    _this->d->queue.append(dialog);
-   TQTimer::singleShot(0, _this, TQT_SLOT(slotShowQueuedDialog()));
+   TQTimer::singleShot(0, _this, TQ_SLOT(slotShowQueuedDialog()));
 }
 
 void KDialogQueue::slotShowQueuedDialog()
@@ -317,7 +317,7 @@ void KDialogQueue::slotShowQueuedDialog()
    delete dialog;
 
    if (!d->queue.isEmpty())
-      TQTimer::singleShot(20, this, TQT_SLOT(slotShowQueuedDialog()));
+      TQTimer::singleShot(20, this, TQ_SLOT(slotShowQueuedDialog()));
    else
       ksdkdq.destructObject(); // Suicide.
 }
@@ -326,7 +326,7 @@ void KDialog::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent)
-  : TQWidget( parent, "", Qt::WDestructiveClose )
+  : TQWidget( parent, "", TQt::WDestructiveClose )
 {
 	TQVBoxLayout* vbox = new TQVBoxLayout( this );
 
@@ -375,7 +375,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent)
 
 	TQWidget* swidget = new TQWidget( frame );
 	swidget->resize(2, frame->sizeHint().width());
-	swidget->setBackgroundColor(Qt::black);
+	swidget->setBackgroundColor(TQt::black);
 	seperatorbox->addWidget( swidget, AlignCenter );
 
 	TQLabel* label = new TQLabel( i18n("Trinity Desktop Environment"), frame );
@@ -396,7 +396,7 @@ KSMModalDialogHeader::~KSMModalDialogHeader()
 }
 
 KSMModalDialog::KSMModalDialog(TQWidget* parent)
-  : TQWidget( 0, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WType_Dialog | Qt::WStyle_Title | Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false)
+  : TQWidget( 0, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WType_Dialog | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false)
 
 {
 	// Signal that we do not want any window controls to be shown at all
@@ -461,7 +461,7 @@ void KSMModalDialog::keepMeOnTop()
 {
 	if (!m_keepOnTopTimer) {
 		m_keepOnTopTimer = new TQTimer();
-		connect(m_keepOnTopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(keepMeOnTop()));
+		connect(m_keepOnTopTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(keepMeOnTop()));
 		m_keepOnTopTimer->start(100, FALSE);
 	}
 	setActiveWindow();
diff --git a/tdeui/kdialog.h b/tdeui/kdialog.h
index ad48693fe..1e19ca365 100644
--- a/tdeui/kdialog.h
+++ b/tdeui/kdialog.h
@@ -51,7 +51,7 @@ class TQLayoutItem;
  */
 class TDEUI_EXPORT KDialog : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -188,7 +188,7 @@ class TDEUI_EXPORT KDialog : public TQDialog
 class KDialogQueuePrivate;
 class TDEUI_EXPORT KDialogQueue : public TQObject
 {
-      Q_OBJECT
+      TQ_OBJECT
 
 public:
 
@@ -217,7 +217,7 @@ protected:
   */
 class TDEUI_EXPORT KSMModalDialogHeader : public TQWidget
 {
-      Q_OBJECT
+      TQ_OBJECT
 
 public:
       KSMModalDialogHeader( TQWidget* parent );
@@ -240,7 +240,7 @@ class TQFrame;
 class TQGridLayout;
 class TDEUI_EXPORT KSMModalDialog : public TQWidget
 {
-      Q_OBJECT
+      TQ_OBJECT
 
 public:
       KSMModalDialog( TQWidget* parent );
diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp
index 1f7fbd5e3..d1cec7389 100644
--- a/tdeui/kdialogbase.cpp
+++ b/tdeui/kdialogbase.cpp
@@ -104,12 +104,12 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal,
   :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ),
    mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
    mIsActivated(false), mShowTile(false), mMessageBoxMode(false),
-   mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate)
+   mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate)
 {
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) );
 
   enableButtonSeparator( separator );
   makeButtonBox( buttonMask, defaultButton, user1, user2, user3 );
@@ -126,16 +126,16 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption,
   :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ),
    mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
    mIsActivated(false), mShowTile(false), mMessageBoxMode(false),
-   mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate)
+   mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate)
 {
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) );
 
   mJanus = new KJanusWidget( this, "janus", dialogFace );
-  connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)),
-          this, TQT_SIGNAL(aboutToShowPage(TQWidget *)));
+  connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)),
+          this, TQ_SIGNAL(aboutToShowPage(TQWidget *)));
 
   if( !mJanus || !mJanus->isValid() ) { return; }
 
@@ -155,16 +155,16 @@ KDialogBase::KDialogBase(  KDialogBase::DialogType dialogFace, WFlags f, TQWidge
   :KDialog( parent, name, modal, f ),
    mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
    mIsActivated(false), mShowTile(false), mMessageBoxMode(false),
-   mButtonOrientation(Qt::Horizontal), d(new KDialogBasePrivate)
+   mButtonOrientation(TQt::Horizontal), d(new KDialogBasePrivate)
 {
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) );
 
   mJanus = new KJanusWidget( this, "janus", dialogFace );
-  connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)),
-          this, TQT_SIGNAL(aboutToShowPage(TQWidget *)));
+  connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)),
+          this, TQ_SIGNAL(aboutToShowPage(TQWidget *)));
 
   if( !mJanus || !mJanus->isValid() ) { return; }
 
@@ -183,13 +183,13 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask,
   :KDialog( parent, name, modal, (WFlags)WStyle_DialogBorder ),
    mTopLayout(0), mMainWidget(0), mUrlHelp(0), mJanus(0), mActionSep(0),
    mIsActivated(false), mShowTile(false), mMessageBoxMode(true),
-   mButtonOrientation(Qt::Horizontal),mEscapeButton(escapeButton),
+   mButtonOrientation(TQt::Horizontal),mEscapeButton(escapeButton),
    d(new KDialogBasePrivate)
 {
   setCaption( caption );
 
   makeRelay();
-  connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) );
+  connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) );
 
   enableButtonSeparator( separator );
 
@@ -235,7 +235,7 @@ void SButton::resize( bool sameWidth, int margin,
     if( s.width() > w ) { w = s.width(); }
   }
 
-  if( orientation == Qt::Horizontal )
+  if( orientation == TQt::Horizontal )
   {
     for( p = list.first(); p; p =  list.next() )
     {
@@ -281,7 +281,7 @@ KDialogBase::delayedDestruct()
 {
    if (isVisible())
       hide();
-   TQTimer::singleShot( 0, this, TQT_SLOT(slotDelayedDestruct()));
+   TQTimer::singleShot( 0, this, TQ_SLOT(slotDelayedDestruct()));
 }
 
 void
@@ -299,7 +299,7 @@ void KDialogBase::setupLayout()
   // mTopLayout = new TQVBoxLayout( this, marginHint(), spacingHint() );
 
 
-  if( mButtonOrientation == Qt::Horizontal )
+  if( mButtonOrientation == TQt::Horizontal )
   {
     mTopLayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom,
 				 marginHint(), spacingHint() );
@@ -349,10 +349,10 @@ void KDialogBase::setButtonBoxOrientation( int orientation )
     mButtonOrientation = orientation;
     if( mActionSep )
     {
-      mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ?
+      mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ?
 				  TQFrame::HLine : TQFrame::VLine );
     }
-    if( mButtonOrientation == Qt::Vertical )
+    if( mButtonOrientation == TQt::Vertical )
     {
       enableLinkedHelp(false); // 2000-06-18 Espen: No support for this yet.
     }
@@ -373,15 +373,15 @@ void KDialogBase::makeRelay()
 {
   if( mTile )
   {
-    connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) );
+    connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) );
     return;
   }
 
   mTile = new KDialogBaseTile;
   if( mTile )
   {
-    connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) );
-    connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) );
+    connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) );
+    connect( tqApp, TQ_SIGNAL(aboutToQuit()), mTile, TQ_SLOT(cleanup()) );
   }
 }
 
@@ -395,8 +395,8 @@ void KDialogBase::enableButtonSeparator( bool state )
       return;
     }
     mActionSep = new KSeparator( this );
-    mActionSep->setFocusPolicy(TQ_NoFocus);
-    mActionSep->setOrientation( mButtonOrientation == Qt::Horizontal ?
+    mActionSep->setFocusPolicy(TQWidget::NoFocus);
+    mActionSep->setOrientation( mButtonOrientation == TQt::Horizontal ?
 				TQFrame::HLine : TQFrame::VLine );
     mActionSep->show();
   }
@@ -506,7 +506,7 @@ TQSize KDialogBase::minimumSizeHint() const
   if( d->mButton.box )
   {
     s2 = d->mButton.box->minimumSize();
-    if( mButtonOrientation == Qt::Horizontal )
+    if( mButtonOrientation == TQt::Horizontal )
     {
       s1.rwidth()   = TQMAX( s1.rwidth(), s2.rwidth() );
       s1.rheight() += s2.rheight();
@@ -576,35 +576,35 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton,
   {
     KPushButton *pb = d->mButton.append( Help, KStdGuiItem::help() );
 
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) );
   }
   if( d->mButton.mask & Default )
   {
     KPushButton *pb = d->mButton.append( Default, KStdGuiItem::defaults() );
 
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefault()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefault()) );
   }
   if( d->mButton.mask & Details )
   {
     KPushButton *pb = d->mButton.append( Details, TQString() );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()) );
     setDetails(false);
   }
   if( d->mButton.mask & User3 )
   {
     KPushButton *pb = d->mButton.append( User3, user3 );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser3()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser3()) );
   }
   if( d->mButton.mask & User2 )
   {
     KPushButton *pb = d->mButton.append( User2, user2 );
     if( mMessageBoxMode )
     {
-      connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotYes()) );
+      connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotYes()) );
     }
     else
     {
-      connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUser2()) );
+      connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUser2()) );
     }
   }
   if( d->mButton.mask & User1 )
@@ -612,39 +612,39 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton,
     KPushButton *pb = d->mButton.append( User1, user1 );
     if( mMessageBoxMode )
     {
-      connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNo()) );
+      connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNo()) );
     }
     else
     {
-      connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser1()) );
+      connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser1()) );
     }
   }
   if( d->mButton.mask & Ok )
   {
     KPushButton *pb = d->mButton.append( Ok, KStdGuiItem::ok() );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotOk()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotOk()) );
   }
   if( d->mButton.mask & Apply )
   {
     KPushButton *pb = d->mButton.append( Apply, KStdGuiItem::apply() );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotApply()) );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(applyPressed()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotApply()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(applyPressed()) );
   }
   if( d->mButton.mask & Try )
   {
     KPushButton *pb = d->mButton.append( Try,
                            i18n( "&Try" ) );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotTry()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotTry()) );
   }
   if( d->mButton.mask & Cancel )
   {
     KPushButton *pb = d->mButton.append( Cancel, KStdGuiItem::cancel() );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel()) );
   }
   if( d->mButton.mask & Close )
   {
     KPushButton *pb = d->mButton.append( Close, KStdGuiItem::close() );
-    connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose()) );
+    connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotClose()) );
   }
 
   if( defaultButton != NoDefault )
@@ -686,7 +686,7 @@ void KDialogBase::setButtonStyle( int style )
     layoutMax = 6;
     layout = layoutRule[ d->mButton.style ];
   }
-  else if (mButtonOrientation == Qt::Horizontal)
+  else if (mButtonOrientation == TQt::Horizontal)
   {
     static const unsigned int layoutRule[5][10] =
     {
@@ -720,7 +720,7 @@ void KDialogBase::setButtonStyle( int style )
   }
 
   TQBoxLayout *lay;
-  if( mButtonOrientation == Qt::Horizontal )
+  if( mButtonOrientation == TQt::Horizontal )
   {
     lay = new TQBoxLayout( d->mButton.box, TQBoxLayout::LeftToRight, 0,
 			  spacingHint());
@@ -1256,8 +1256,8 @@ void KDialogBase::enableLinkedHelp( bool state )
       mUrlHelp->setBackgroundPixmap(*mTile->get());
     }
     mUrlHelp->setMinimumHeight( fontMetrics().height() + marginHint() );
-    connect(mUrlHelp,TQT_SIGNAL(leftClickedURL(const TQString &)),
-	    TQT_SLOT(helpClickedSlot(const TQString &)));
+    connect(mUrlHelp,TQ_SIGNAL(leftClickedURL(const TQString &)),
+	    TQ_SLOT(helpClickedSlot(const TQString &)));
     mUrlHelp->show();
   }
   else
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index 1bc910fd6..25f4613ae 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -190,7 +190,7 @@ class KDialogBaseTile;
  */
 class TDEUI_EXPORT KDialogBase : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -575,9 +575,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      * toplevel widget for this particular page. The widget contains a
      * TQGridLayout layout so the widget children are  positioned in a grid.
      *
-     * @param n Specifies the number of columns if @p dir is Qt::Horizontal
-     *          or the number of rows if @p dir is Qt::Vertical.
-     * @param dir Can be Qt::Horizontal or Qt::Vertical.
+     * @param n Specifies the number of columns if @p dir is TQt::Horizontal
+     *          or the number of rows if @p dir is TQt::Vertical.
+     * @param dir Can be TQt::Horizontal or TQt::Vertical.
      * @param itemName String used in the list or as tab item name.
      * @param header Header text use in the list modes @p Ignored in @p Tabbed
      *        mode. If empty, the item text is used instead.
@@ -673,9 +673,9 @@ class TDEUI_EXPORT KDialogBase : public KDialog
      * constructor where you define the face (Plain, Swallow, Tabbed,
      * TreeList, IconList).
      *
-     * @param n Specifies the number of columns if 'dir' is Qt::Horizontal
-     *          or the number of rows if 'dir' is Qt::Vertical.
-     * @param dir Can be Qt::Horizontal or Qt::Vertical.
+     * @param n Specifies the number of columns if 'dir' is TQt::Horizontal
+     *          or the number of rows if 'dir' is TQt::Vertical.
+     * @param dir Can be TQt::Horizontal or TQt::Vertical.
      *
      * @return The main widget or 0 if any of the rules described above
      *         were broken.
diff --git a/tdeui/kdialogbase_priv.h b/tdeui/kdialogbase_priv.h
index 84db3b84f..59cef2f25 100644
--- a/tdeui/kdialogbase_priv.h
+++ b/tdeui/kdialogbase_priv.h
@@ -30,7 +30,7 @@
  */
 class TDEUI_EXPORT KDialogBaseButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KDialogBaseButton( const KGuiItem &text, int key, TQWidget *parent=0,
@@ -47,7 +47,7 @@ class TDEUI_EXPORT KDialogBaseButton : public KPushButton
  */
 class TDEUI_EXPORT KDialogBaseTile : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KDialogBaseTile( TQObject *parent=0, const char *name=0 );
diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp
index bf99c6801..8e8b924c2 100644
--- a/tdeui/kdockwidget.cpp
+++ b/tdeui/kdockwidget.cpp
@@ -43,7 +43,7 @@
 #include <tdeglobalsettings.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #endif
@@ -122,7 +122,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw )
 void KDockMainWindow::setView( TQWidget *view )
 {
   if ( view->isA("KDockWidget") ){
-    if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this );
+    if ( view->parent() != this ) ((KDockWidget*)view)->applyToWidget( this );
   }
 
 #ifndef NO_KDE2
@@ -203,7 +203,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
+  style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -219,7 +219,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
 #ifdef BORDERLESS_WINDOWS
   setCursor(TQCursor(ArrowCursor));
 #endif
-  d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) );
+  d = new KDockWidgetHeaderPrivate( this );
 
   layout = new TQHBoxLayout( this );
   layout->setResizeMode( TQLayout::Minimum );
@@ -230,28 +230,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name )
   TQToolTip::add( closeButton, i18n("Close") );
   closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this));
   closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
-  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
+  connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked()));
+  connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock()));
 
   stayButton = new KDockButton_Private( this, "DockStayButton" );
   TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") );
   stayButton->setToggleButton( true );
   stayButton->setPixmap( const_cast< const char** >(not_close_xpm) );
   stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked()));
+  connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked()));
 
   dockbackButton = new KDockButton_Private( this, "DockbackButton" );
   TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") );
   dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm));
   dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked()));
-  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack()));
+  connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked()));
+  connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack()));
 
   d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" );
   TQToolTip::add( d->toDesktopButton, i18n("Detach") );
   d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm));
   d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height());
-  connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
+  connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop()));
   stayButton->hide();
 
   d->dummy = new TQWidget( this );
@@ -498,7 +498,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
   layout->setResizeMode( TQLayout::Minimum );
 
   manager = dockManager;
-  manager->childDock->append( TQT_TQOBJECT(this) );
+  manager->childDock->append( this );
   installEventFilter( manager );
 
   eDocking = DockFullDocking;
@@ -522,7 +522,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP
   setIcon( pixmap);
   widget = 0L;
 
-  TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
+  TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) );
   applyToWidget( parent, TQPoint(0,0) );
 }
 
@@ -535,7 +535,7 @@ void KDockWidget::setPixmap(const TQPixmap& pixmap) {
 		dtg->changeTab(this,pixmap,dtg->tabLabel(this));
 	 TQWidget *contWid=parentDockContainer();
          if (contWid) {
-         	KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid);
+         	KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
                 if (x) {
                         x->setPixmap(this,pixmap);
                 }
@@ -556,14 +556,14 @@ KDockWidget::~KDockWidget()
   }
 
   if (latestKDockContainer()) {
-    KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer());
+    KDockContainer *x = dynamic_cast<KDockContainer*>(latestKDockContainer());
     if (x) {
       x->removeWidget(this);
     }
   }
   emit iMBeingClosed();
-  if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this));
-  manager->childDock->remove(TQT_TQOBJECT(this));
+  if (manager->d) manager->d->containerDocks.remove(this);
+  manager->childDock->remove(this);
   delete pix;
   delete d; // destroy private data
   d=0;
@@ -574,7 +574,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe)
 	TQWidget::paintEvent(pe);
         TQPainter paint;
         paint.begin( this );
-        style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
+        style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup());
         paint.end();
 }
 
@@ -719,7 +719,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container)
 {
 	if (container)
 	{
-		if (tqt_dynamic_cast<KDockContainer*>(container))
+		if (dynamic_cast<KDockContainer*>(container))
 			d->container=container;
 		else
 			d->container=0;
@@ -729,7 +729,7 @@ void KDockWidget::setLatestKDockContainer(TQWidget* container)
 TQWidget* KDockWidget::latestKDockContainer()
 {
 	if (!(d->container)) return 0;
-	if (tqt_dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container;
+	if (dynamic_cast<KDockContainer*>(d->container.operator->())) return d->container;
 	return 0;
 }
 
@@ -778,11 +778,11 @@ void KDockWidget::updateHeader()
       setCursor(TQCursor(ArrowCursor));
 #endif
 
-    if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){
+    if ( (parent() == manager->main) || isGroup || (eDocking == KDockWidget::DockNone) ){
       header->hide();
     } else {
       header->setTopLevel( false );
-      if (widget && tqt_dynamic_cast<KDockContainer*>(widget))
+      if (widget && dynamic_cast<KDockContainer*>(widget))
         header->hide();
       else
         header->show();
@@ -799,7 +799,7 @@ void KDockWidget::updateHeader()
 
 void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 {
-  if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) )
+  if ( parent() != s )
   {
     hide();
     reparent(s, 0, TQPoint(0,0), false);
@@ -818,7 +818,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
     move(p);
 
 #ifndef NO_KDE2
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (d->transient && d->_parent)
       XSetTransientForHint( tqt_xdisplay(), winId(), d->_parent->winId() );
 
@@ -828,7 +828,7 @@ void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 #else
     KWin::setType( winId(), d->windowType );
 #endif // BORDERLESS_WINDOW
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 #endif
 
   }
@@ -921,7 +921,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 {
 	if (!parent()) return 0;
 	if (!parent()->inherits("KDockSplitter")) return 0;
-	Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? Qt::Vertical:Qt::Horizontal;
+	Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ? TQt::Vertical:TQt::Horizontal;
 		if (((KDockSplitter*)(parent()))->orientation()==orientation)
 		{
 			KDockWidget *neighbor=
@@ -930,15 +930,15 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos)
 				static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast());
 
 			if (neighbor==this)
-			return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
+			return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
 			else
-			if (neighbor->getWidget() && (::tqqt_cast<KDockTabGroup*>(neighbor->getWidget())))
+			if (neighbor->getWidget() && (::tqt_cast<KDockTabGroup*>(neighbor->getWidget())))
 				return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0));
 			else
 			return neighbor;
 		}
 		else
-		return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos));
+		return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos));
 
 	return 0;
 }
@@ -999,7 +999,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
    * dock tab group, and our parent isn't a KDockContainer, and we have no explicit
    * parent dock container...we can't do much yet */
   if ( parent() && !parent()->inherits("KDockSplitter") && !parentDockTabGroup() &&
-  	!(tqt_dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){
+  	!(dynamic_cast<KDockContainer*>(parent())) && !parentDockContainer()){
 //  kdDebug(282)<<"KDockWidget::manualDock(): success = false (3)"<<endl;
 //  kdDebug(282)<<parent()->name()<<endl;
     success = false;
@@ -1064,11 +1064,11 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
 	  if (!contWid) contWid=target->widget;
 	  if (contWid)
 	  {
-	  	KDockContainer *cont=tqt_dynamic_cast<KDockContainer*>(contWid);
+	  	KDockContainer *cont=dynamic_cast<KDockContainer*>(contWid);
 		  if (cont)
 		  {
 			if (latestKDockContainer() && (latestKDockContainer()!=contWid)) {
-				KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(latestKDockContainer());
+				KDockContainer* dc = dynamic_cast<KDockContainer*>(latestKDockContainer());
 				if (dc) {
 					dc->removeWidget(this);
 				}
@@ -1124,7 +1124,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
   if ( dockPos == KDockWidget::DockCenter )
   {
     KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab");
-    TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*)));
+    TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*)));
     newDock->setWidget( tab );
 
     target->applyToWidget( tab );
@@ -1161,13 +1161,13 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos,
     // if to dock not to the center of the target dockwidget,
     // dock to newDock
     KDockSplitter* panner = 0L;
-    if ( dockPos == KDockWidget::DockTop  || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Horizontal, spliPos );
-    if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight  ) panner = new KDockSplitter( newDock, "_dock_split_", Qt::Vertical , spliPos );
+    if ( dockPos == KDockWidget::DockTop  || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Horizontal, spliPos );
+    if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight  ) panner = new KDockSplitter( newDock, "_dock_split_", TQt::Vertical , spliPos );
     newDock->setWidget( panner );
 
     panner->setOpaqueResize(manager->splitterOpaqueResize());
     panner->setKeepSize(manager->splitterKeepSize());
-    panner->setFocusPolicy( TQ_NoFocus );
+    panner->setFocusPolicy( TQWidget::NoFocus );
     target->applyToWidget( panner );
     applyToWidget( panner );
     target->formerDockPos = target->currentDockPos;
@@ -1227,7 +1227,7 @@ TQWidget *KDockWidget::parentDockContainer() const
 {
   if (!parent()) return 0L;
   TQWidget* candidate = parentWidget()->parentWidget();
-  if (candidate && tqt_dynamic_cast<KDockContainer*>(candidate)) return candidate;
+  if (candidate && dynamic_cast<KDockContainer*>(candidate)) return candidate;
   return 0L;
 }
 
@@ -1238,7 +1238,7 @@ void KDockWidget::setForcedFixedWidth(int w)
 	setFixedWidth(w);
 	if (!parent()) return;
 	if (parent()->inherits("KDockSplitter"))
-		::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w);
+		::tqt_cast<KDockSplitter*>(parent())->setForcedFixedWidth(this,w);
 }
 
 void KDockWidget::setForcedFixedHeight(int h)
@@ -1247,7 +1247,7 @@ void KDockWidget::setForcedFixedHeight(int h)
 	setFixedHeight(h);
 	if (!parent()) return;
 	if (parent()->inherits("KDockSplitter"))
-		::tqqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h);
+		::tqt_cast<KDockSplitter*>(parent())->setForcedFixedHeight(this,h);
 }
 
 int KDockWidget::forcedFixedWidth()
@@ -1270,7 +1270,7 @@ void KDockWidget::restoreFromForcedFixedSize()
 	setMaximumHeight(32000);
 	if (!parent()) return;
 	if (parent()->inherits("KDockSplitter"))
-		::tqqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this);
+		::tqt_cast<KDockSplitter*>(parent())->restoreFromForcedFixedSize(this);
 }
 
 void KDockWidget::toDesktop()
@@ -1347,13 +1347,13 @@ void KDockWidget::undock()
           split->deactivate();
           if ( split->getFirst() == parentOfTab ){
             split->activate( lastTab );
-            if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical )
+            if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical )
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft );
             else
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop );
           } else {
             split->activate( 0L, lastTab );
-            if ( ((KDockWidget*)split->parent())->splitterOrientation == Qt::Vertical )
+            if ( ((KDockWidget*)split->parent())->splitterOrientation == TQt::Vertical )
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight );
             else
               emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom );
@@ -1382,7 +1382,7 @@ void KDockWidget::undock()
   {
 //	  kdDebug(282)<<"undocked from dockcontainer"<<endl;
 	  undockedFromContainer=true;
-	  KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(d->container.operator->());
+	  KDockContainer* dc = dynamic_cast<KDockContainer*>(d->container.operator->());
 	  if (dc) {
 		  dc->undockWidget(this);
 		  setFormerBrotherDockWidget(dc->parentDockWidget());
@@ -1449,7 +1449,7 @@ void KDockWidget::setWidget( TQWidget* mw )
 {
   if ( !mw ) return;
 
-  if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){
+  if ( mw->parent() != this ){
     mw->reparent(this, 0, TQPoint(0,0), false);
   }
 
@@ -1462,11 +1462,11 @@ void KDockWidget::setWidget( TQWidget* mw )
   layout = new TQVBoxLayout( this );
   layout->setResizeMode( TQLayout::Minimum );
 
-  KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(widget);
+  KDockContainer* dc = dynamic_cast<KDockContainer*>(widget);
   if (dc)
   {
     d->isContainer=true;
-    manager->d->containerDocks.append(TQT_TQOBJECT(this));
+    manager->d->containerDocks.append(this);
   }
   else
   {
@@ -1505,13 +1505,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab )
 
 bool KDockWidget::mayBeHide() const
 {
-  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (parent() != manager->main);
   return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) );
 }
 
 bool KDockWidget::mayBeShow() const
 {
-  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (parent() != manager->main);
   return ( !isGroup && !isTabGroup && f && !isVisible() );
 }
 
@@ -1538,7 +1538,7 @@ void KDockWidget::makeDockVisible()
   }
   if (parentDockContainer()) {
     TQWidget *contWid=parentDockContainer();
-    KDockContainer *x = tqt_dynamic_cast<KDockContainer*>(contWid);
+    KDockContainer *x = dynamic_cast<KDockContainer*>(contWid);
     if (x) {
       x->showWidget(this);
     }
@@ -1560,15 +1560,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget)
 {
   formerBrotherDockWidget = dockWidget;
   if( formerBrotherDockWidget )
-    TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
-                      this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+    TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+                      this, TQ_SLOT(loseFormerBrotherDockWidget()) );
 }
 
 void KDockWidget::loseFormerBrotherDockWidget()
 {
   if( formerBrotherDockWidget )
-    TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()),
-                         this, TQT_SLOT(loseFormerBrotherDockWidget()) );
+    TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()),
+                         this, TQ_SLOT(loseFormerBrotherDockWidget()) );
   formerBrotherDockWidget = 0L;
   repaint();
 }
@@ -1658,8 +1658,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name )
   menu = new TQPopupMenu();
 #endif
 
-  connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) );
-  connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) );
+  connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) );
+  connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) );
 
   childDock = new TQObjectList();
   childDock->setAutoDelete( false );
@@ -1699,7 +1699,7 @@ void KDockManager::activate()
         obj->show();
     }
   }
-  if ( !main->inherits(TQDIALOG_OBJECT_NAME_STRING) ) main->show();
+  if ( !main->inherits("TQDialog") ) main->show();
 }
 
 bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
@@ -1719,7 +1719,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
         break;
 
       case TQEvent::MouseButtonPress:
-        if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+        if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
           if ( curdw->eDocking != (int)KDockWidget::DockNone ){
             dropCancel = true;
             curdw->setFocus();
@@ -1744,7 +1744,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
         }
         break;
       case TQEvent::MouseButtonRelease:
-        if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){
+        if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){
           if ( dragging ){
             if ( !dropCancel )
               drop();
@@ -1822,7 +1822,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event )
           if (d->readyToDrag) {
             d->readyToDrag = false;
           }
-          if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) &&
+          if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) &&
                (curdw->eDocking != (int)KDockWidget::DockNone) ) {
             startDrag( curdw);
           }
@@ -1860,9 +1860,9 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos )
     }
     w = p;
   }
-  if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L;
-  if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L;
-  if (tqt_dynamic_cast<KDockContainer*>(w)) return 0L;
+  if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L;
+  if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L;
+  if (dynamic_cast<KDockContainer*>(w)) return 0L;
 
   if (!childDockWidgetList) return 0L;
   if ( childDockWidgetList->find(w) != -1 ) return 0L;
@@ -1957,7 +1957,7 @@ void KDockManager::startDrag( KDockWidget* w )
   curPos = KDockWidget::DockDesktop;
   dragging = true;
 
-  TQApplication::setOverrideCursor(TQCursor(tqsizeAllCursor));
+  TQApplication::setOverrideCursor(TQCursor(TQt::sizeAllCursor));
 }
 
 void KDockManager::dragMove( KDockWidget* dw, TQPoint pos )
@@ -2213,7 +2213,7 @@ void KDockManager::writeConfig(TQDomElement &base)
     TQObjectListIt it(*childDock);
     KDockWidget *obj1;
     while ( (obj1=(KDockWidget*)it.current()) ) {
-        if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
+        if ( obj1->parent() == main )
             mainWidgetStr = TQString::fromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
@@ -2221,7 +2221,7 @@ void KDockManager::writeConfig(TQDomElement &base)
 
     for (TQObjectListIt it(d->containerDocks);it.current();++it)
     {
-        KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
+        KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
         if (dc) {
                 dc->prepareSave(nList);
         }
@@ -2241,7 +2241,7 @@ void KDockManager::writeConfig(TQDomElement &base)
 
         TQDomElement groupEl;
 	if (obj->d->isContainer) {
-      		KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget);
+      		KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget);
        		if (x) {
 			groupEl=doc.createElement("dockContainer");
           		x->save(groupEl);
@@ -2379,7 +2379,7 @@ void KDockManager::readConfig(TQDomElement &base)
 		if (!(cont->d->isContainer)) {
 			kdDebug(282)<<"restoration of dockContainer is only supported for already existing dock containers"<<endl;
 		} else {
-			KDockContainer *dc=tqt_dynamic_cast<KDockContainer*>(cont->getWidget());
+			KDockContainer *dc=dynamic_cast<KDockContainer*>(cont->getWidget());
 			if (!dc) kdDebug(282)<<"Error while trying to handle dockcontainer configuration restoration"<<endl;
 				else {
 					dc->load(childEl);
@@ -2401,7 +2401,7 @@ void KDockManager::readConfig(TQDomElement &base)
             KDockWidget *second = getDockWidgetFromName(secondName);
             if (first && second) {
                 obj = first->manualDock(second,
-                                        (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
+                                        (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop,
                                         separatorPos);
                 if (obj)
                     obj->setName(name.latin1());
@@ -2512,7 +2512,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget)
 {
     if (!autoCreateDock) return;
     autoCreateDock->setAutoDelete(false);
-    autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget));
+    autoCreateDock->removeRef(pDockWidget);
     autoCreateDock->setAutoDelete(true);
 }
 
@@ -2548,14 +2548,14 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group )
     ++it;
     //debug("  +Add subdock %s", obj->name());
     nList.append( obj->name() );
-    if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) )
+    if ( obj->parent() == main )
       c->writeEntry( "Main:view", obj->name() );
   }
 
 //  kdDebug(282)<<TQString("list size: %1").arg(nList.count())<<endl;
   for (TQObjectListIt it(d->containerDocks);it.current();++it)
   {
-  	KDockContainer* dc = tqt_dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
+  	KDockContainer* dc = dynamic_cast<KDockContainer*>(((KDockWidget*)it.current())->widget);
 	if (dc) {
 		dc->prepareSave(nList);
 	}
@@ -2571,7 +2571,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group )
       obj->header->saveConfig( c );
     }
     if (obj->d->isContainer) {
-       KDockContainer* x = tqt_dynamic_cast<KDockContainer*>(obj->widget);
+       KDockContainer* x = dynamic_cast<KDockContainer*>(obj->widget);
        if (x) {
           x->save(c,group);
        }
@@ -2734,7 +2734,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
     }
 
     if (obj && obj->d->isContainer) {
-		tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
+		dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
 		removeFromAutoCreateList(obj);
     }
     if ( obj && obj->header){
@@ -2758,7 +2758,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
 
       Orientation p = (Orientation)c->readNumEntry( oname + ":orientation" );
       if ( first  && last ){
-        obj = first->manualDock( last, ( p == Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
+        obj = first->manualDock( last, ( p == TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos );
         if (obj){
           obj->setName( oname.latin1() );
         }
@@ -2774,7 +2774,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
       KDockWidget* d2 = getDockWidgetFromName( list.current() );
       tabDockGroup = d2->manualDock( d1, KDockWidget::DockCenter );
       if ( tabDockGroup ){
-        KDockTabGroup* tab = tqt_dynamic_cast<KDockTabGroup*>(tabDockGroup->widget);
+        KDockTabGroup* tab = dynamic_cast<KDockTabGroup*>(tabDockGroup->widget);
         list.next();
         while ( list.current() && tabDockGroup ){
           KDockWidget* tabDock = getDockWidgetFromName( list.current() );
@@ -2791,7 +2791,7 @@ void KDockManager::readConfig( TDEConfig* c, TQString group )
       obj = tabDockGroup;
     }
 
-    if (obj && obj->d->isContainer)  tqt_dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
+    if (obj && obj->d->isContainer)  dynamic_cast<KDockContainer*>(obj->widget)->load(c,group);
     if ( obj && obj->header){
       obj->header->loadConfig( c );
     }
@@ -2890,7 +2890,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName )
   if ( autoCreateDock ){
     kdDebug(282)<<"Autocreating dock: "<<dockName<<endl;
     autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) );
-    autoCreateDock->append( TQT_TQOBJECT(autoCreate) );
+    autoCreateDock->append( autoCreate );
   }
   return autoCreate;
 }
@@ -3105,7 +3105,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
 #ifndef NO_KDE2
 //    kdDebug(282)<<"KDockArea::resize"<<endl;
 #endif
-    TQObjectList *list=queryList(TQWIDGET_OBJECT_NAME_STRING,0,false);
+    TQObjectList *list=queryList("TQWidget",0,false);
 
     TQObjectListIt it( *list ); // iterate over the buttons
     TQObject *obj;
@@ -3123,7 +3123,7 @@ void KDockArea::resizeEvent(TQResizeEvent *rsize)
 //    	TQPtrList<TQObject> list(children());
 //       TQObject *obj=((TQPtrList<TQObject*>)children())->at(i);
 	TQObject *obj=children()->getFirst();
-       if (split = tqt_dynamic_cast<KDockSplitter*>(obj))
+       if (split = dynamic_cast<KDockSplitter*>(obj))
        {
           split->setGeometry( TQRect(TQPoint(0,0), size() ));
 //	  break;
@@ -3179,7 +3179,7 @@ void KDockContainer::activateOverlapMode(int nonOverlapSize) {
 	m_overlapMode=true;
 	if (parentDockWidget() && parentDockWidget()->parent()) {
 		kdDebug(282)<<"KDockContainer::activateOverlapMode: recalculating sizes"<<endl;
-		KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+		KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
 			parent());
 		if (sp)
 			sp->resizeEvent(0);
@@ -3191,7 +3191,7 @@ void KDockContainer::deactivateOverlapMode() {
 	m_overlapMode=false;
 	if (parentDockWidget() && parentDockWidget()->parent()) {
 		kdDebug(282)<<"KDockContainer::deactivateOverlapMode: recalculating sizes"<<endl;
-		KDockSplitter *sp= ::tqqt_cast<KDockSplitter*>(parentDockWidget()->
+		KDockSplitter *sp= ::tqt_cast<KDockSplitter*>(parentDockWidget()->
 			parent());
 		if (sp)
 			sp->resizeEvent(0);
@@ -3280,7 +3280,7 @@ void KDockContainer::prepareSave(TQStringList &names)
 TQWidget *KDockTabGroup::transientTo() {
 	TQWidget *tT=0;
 	for (int i=0;i<count();i++) {
-		KDockWidget *dw=::tqqt_cast<KDockWidget*>(page(i));
+		KDockWidget *dw=::tqt_cast<KDockWidget*>(page(i));
 		TQWidget *tmp;
 		if ((tmp=dw->transientTo())) {
 			if (!tT) tT=tmp;
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index e6c9bae1a..6c6d48d92 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -37,7 +37,7 @@
    - KDockWidget                   - IMPORTANT CLASS: the one and only dockwidget class
    - KDockManager                  - helper class
    - KDockMainWindow               - IMPORTANT CLASS: a special TDEMainWindow that can have dockwidgets
-   - KDockArea                     - like KDockMainWindow but inherits just QWidget
+   - KDockArea                     - like KDockMainWindow but inherits just TQWidget
 
    IMPORTANT Note: This file compiles also in Qt-only mode by using the NO_KDE2 precompiler definition!
 */
@@ -102,7 +102,7 @@ namespace KMDI
  */
 class TDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -152,7 +152,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -198,7 +198,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -240,7 +240,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -366,7 +366,7 @@ private:
  */
 class TDEUI_EXPORT KDockTabGroup : public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**
@@ -427,7 +427,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidget: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 friend class KDockManager;
 friend class KDockSplitter;
@@ -448,7 +448,7 @@ public:
    * @param parent      Parent widget
    * @param strCaption  Title of the dockwidget window (shown when toplevel)
    * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption
-   * @param f Qt::WidgetFlags widget flags
+   * @param f TQt::WidgetFlags widget flags
    */
   KDockWidget( KDockManager* dockManager, const char* name,
                const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = TQString::null,
@@ -914,7 +914,7 @@ private:
  */
 class TDEUI_EXPORT KDockManager: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 friend class KDockWidget;
 friend class KDockMainWindow;
@@ -1313,7 +1313,7 @@ private:
  */
 class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 friend class KDockManager;
@@ -1330,7 +1330,7 @@ public:
    *
    * @param parent Parent widget for the dock main widget
    * @param name internal object name
-   * @param f Qt::WidgetFlags widget flags
+   * @param f TQt::WidgetFlags widget flags
    */
 #ifdef qdoc
   KDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
@@ -1484,7 +1484,7 @@ private:
 
 class TDEUI_EXPORT KDockArea : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 friend class KDockManager;
diff --git a/tdeui/kdockwidget_private.cpp b/tdeui/kdockwidget_private.cpp
index a067efe2a..13e5a7ea6 100644
--- a/tdeui/kdockwidget_private.cpp
+++ b/tdeui/kdockwidget_private.cpp
@@ -61,10 +61,10 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1)
   divider->setLineWidth(1);
   divider->raise();
 
-  if (m_orientation == Qt::Horizontal)
-    divider->setCursor(TQCursor(tqsizeVerCursor));
+  if (m_orientation == TQt::Horizontal)
+    divider->setCursor(TQCursor(TQt::sizeVerCursor));
   else
-    divider->setCursor(TQCursor(tqsizeHorCursor));
+    divider->setCursor(TQCursor(TQt::sizeHorCursor));
   divider->installEventFilter(this);
 
   initialised= true;
@@ -173,7 +173,7 @@ void KDockSplitter::setupMinMaxSize()
 {
   // Set the minimum and maximum sizes for the KDockSplitter (this)
   int minx, maxx, miny, maxy;
-  if (m_orientation == Qt::Horizontal) {
+  if (m_orientation == TQt::Horizontal) {
     miny = child0->minimumHeight() + child1->minimumHeight() + 4;
     maxy = child0->maximumHeight() + child1->maximumHeight() + 4;
     minx = (child0->minimumWidth() > child1->minimumWidth()) ? child0->minimumWidth() : child1->minimumWidth();
@@ -266,15 +266,15 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
     //
     if (ev && isVisible() && divider->isVisible()) {
       // real resize event.
-//       kdDebug(282)<<"mKeepSize : "<< ((m_orientation == Qt::Horizontal) ? "Horizontal":"Vertical") <<endl;
+//       kdDebug(282)<<"mKeepSize : "<< ((m_orientation == TQt::Horizontal) ? "Horizontal":"Vertical") <<endl;
 
       if (mKeepSize) {
         // keep the splitter on a fixed position. This may be a bit inaccurate, because
         // xpos saves a proportional value, which means there might occur rounding errors.
         // However, this works surprising well!
-        if (m_orientation == Qt::Horizontal) {
+        if (m_orientation == TQt::Horizontal) {
           if (ev->oldSize().height() != ev->size().height()) {
-            if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+            if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
               // dockwidget is on the bottom. move xpos so that the size from child1 stays
               xpos = (int)ceil(((double)factor) * checkValue(height() - child1->height() - 4) / height());
             } else {
@@ -286,7 +286,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
           }
         } else {
           if (ev->oldSize().width() != width()) {
-            if( (c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+            if( (c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
               xpos = (int)ceil(((double)factor) * checkValue(width() - child1->width() - 4) / width());
             } else {
               // xpos should not change
@@ -307,7 +307,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
       // values.
       //
       if ( isVisible()) {
-        if (m_orientation == Qt::Horizontal) {
+        if (m_orientation == TQt::Horizontal) {
           if (fixedHeight0!=-1)
             xpos = checkValue(fixedHeight0) * factor / height();
           else if (fixedHeight1!=-1)
@@ -327,16 +327,16 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
 /*
     // --- debugging information ---
     kdDebug(282) << "isVisible() is         : " << isVisible() << endl;
-    kdDebug(282) << "Orientation            : " << (m_orientation==Qt::Horizontal?"Horizontal":"Vertical")
+    kdDebug(282) << "Orientation            : " << (m_orientation==TQt::Horizontal?"Horizontal":"Vertical")
                                                 << endl;
     kdDebug(282) << "Splitter visibility    : " << divider->isVisible() << endl;;
     kdDebug(282) << "Splitter procentual pos: " << xpos << endl;
     if (c0->getWidget()) {
-        dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget());
+        dc=dynamic_cast<KDockContainer*>(c0->getWidget());
         kdDebug(282) << "Child 0 KDockContainer?: " << dc << endl;
     }
     if (c1->getWidget()) {
-        dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget());
+        dc=dynamic_cast<KDockContainer*>(c1->getWidget());
         kdDebug(282) << "Child 1 KDockContainer?: " << dc << endl;
     }
     kdDebug(282) << "Child0                 : " << child0 << endl;
@@ -346,16 +346,16 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
     //
     // handle overlapped widgets only.
     //
-    if( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
-        ( (m_orientation==Qt::Horizontal)  &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
-      if ((c0->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c0->getWidget()))
+    if( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) ||
+        ( (m_orientation==TQt::Horizontal)  &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) {
+      if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget()))
            && (dc->isOverlapMode())) {
         // child0 ist a KDockContainer
         int position;
         child0->show();
         child0->raise();
         divider->raise();
-        if (m_orientation == Qt::Horizontal) {
+        if (m_orientation == TQt::Horizontal) {
           position = checkValueOverlapped( height() * xpos / factor, child0 );
           child0->setGeometry(0, 0, width(), position);
           child1->setGeometry(0, dc->m_nonOverlapSize, width(), height()-dc->m_nonOverlapSize);
@@ -367,14 +367,14 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
           divider->setGeometry(position, 0, 4, height());
         }
       } else {
-        if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))
+        if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))
              && (dc->isOverlapMode())) {
           // child1 ist a KDockContainer
           int position;
           child1->show();
           child1->raise();
           divider->raise();
-          if (m_orientation == Qt::Horizontal) {
+          if (m_orientation == TQt::Horizontal) {
             position = checkValueOverlapped( height() * xpos / factor, child1 );
             child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize);
             child1->setGeometry(0, position+4, width(), height()-position-4);
@@ -399,11 +399,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
     // the child0 and child1 adjoin.
     //
     if (stdHandling) {
-      int position = checkValue( (m_orientation == Qt::Vertical ? width() : height()) * xpos / factor );
+      int position = checkValue( (m_orientation == TQt::Vertical ? width() : height()) * xpos / factor );
       int diff = 0;
 
-      if (m_orientation == Qt::Horizontal) {
-        if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+      if (m_orientation == TQt::Horizontal) {
+        if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
           // bottom is dockcontainer
           if( divider->isVisible() ) {
             child0->setGeometry(0, 0, width(), position);
@@ -419,7 +419,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
         }
       divider->setGeometry(0, position, width(), 4);
       } else {
-        if ((c1->getWidget()) && (dc=tqt_dynamic_cast<KDockContainer*>(c1->getWidget()))) {
+        if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget()))) {
           // right is dockcontainer
           if( divider->isVisible() ) {
             child0->setGeometry(0, 0, position, height());
@@ -442,7 +442,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev)
 int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const
 {
   if (initialised) {
-    if (m_orientation == Qt::Vertical) {
+    if (m_orientation == TQt::Vertical) {
       if (child0==overlappingWidget) {
         if (position < child0->minimumWidth() || position > width())
           position = child0->minimumWidth();
@@ -450,7 +450,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
         if (position > (width()-child1->minimumWidth()-4) || position < 0)
           position = width()-child1->minimumWidth()-4;
       }
-    } else {// orientation  == Qt::Horizontal
+    } else {// orientation  == TQt::Horizontal
       if (child0==overlappingWidget) {
         if (position < (child0->minimumHeight()) || position > height())
           position = child0->minimumHeight();
@@ -466,7 +466,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge
 int KDockSplitter::checkValue( int position ) const
 {
   if (initialised) {
-    if (m_orientation == Qt::Vertical) {
+    if (m_orientation == TQt::Vertical) {
       if (position < child0->minimumWidth())
         position = child0->minimumWidth();
       if ((width()-4-position) < (child1->minimumWidth()))
@@ -481,9 +481,9 @@ int KDockSplitter::checkValue( int position ) const
 
   if (position < 0) position = 0;
 
-  if ((m_orientation == Qt::Vertical) && (position > width()))
+  if ((m_orientation == TQt::Vertical) && (position > width()))
     position = width();
-  if ((m_orientation == Qt::Horizontal) && (position > height()))
+  if ((m_orientation == TQt::Horizontal) && (position > height()))
     position = height();
 
   return position;
@@ -499,7 +499,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
       mev= (TQMouseEvent*)e;
       child0->setUpdatesEnabled(mOpaqueResize);
       child1->setUpdatesEnabled(mOpaqueResize);
-      if (m_orientation == Qt::Horizontal) {
+      if (m_orientation == TQt::Horizontal) {
         if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
         {
           handled=true; break;
@@ -539,7 +539,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e)
       child0->setUpdatesEnabled(true);
       child1->setUpdatesEnabled(true);
       mev= (TQMouseEvent*)e;
-      if (m_orientation == Qt::Horizontal){
+      if (m_orientation == TQt::Horizontal){
         if ((fixedHeight0!=-1) || (fixedHeight1!=-1))
         {
           handled=true; break;
@@ -625,7 +625,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name )
 :TQPushButton( parent, name )
 {
   moveMouse = false;
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 }
 
 KDockButton_Private::~KDockButton_Private()
@@ -701,7 +701,7 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
 {
    if (w) {
       TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget();
-      if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) {
+      if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) {
          embeddedWdg->setFocus();
       }
    }
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index a72532e3d..b6cc685d0 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -47,7 +47,7 @@ class TDEUI_EXPORT KDockSplitter : public TQWidget
   // which copies the whole definition of the class to be able to access separatorPosInPercent etc. 
   // This needs real fixing in KDE4.
   
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor.
@@ -56,7 +56,7 @@ public:
    * @param orient orientation. Either @p Vertical or @p Horizontal
    * @param pos procentual position of the splitter. Must be int [0...100].
    */
-  KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= Qt::Vertical, int pos= 50);
+  KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient= TQt::Vertical, int pos= 50);
   virtual ~KDockSplitter(){}
 
   /**
@@ -247,7 +247,7 @@ private:
 */
 class TDEUI_EXPORT KDockButton_Private : public TQPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDockButton_Private( TQWidget *parent=0, const char *name=0 );
   ~KDockButton_Private();
@@ -272,7 +272,7 @@ private:
 */
 class KDockWidgetPrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDockWidgetPrivate();
   ~KDockWidgetPrivate();
diff --git a/tdeui/kdockwindow.h b/tdeui/kdockwindow.h
index 4b7a34049..851502488 100644
--- a/tdeui/kdockwindow.h
+++ b/tdeui/kdockwindow.h
@@ -31,7 +31,7 @@
  */
 class KDE_DEPRECATED KDockWindow : public KSystemTray
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KDockWindow( TQWidget* parent = 0, const char* name  = 0 )
 	: KSystemTray( parent, name ) {}
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp
index 532e4aaaa..44bd6d6f2 100644
--- a/tdeui/kdualcolorbutton.cpp
+++ b/tdeui/kdualcolorbutton.cpp
@@ -46,8 +46,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget*
                               (const unsigned char *)dcolorarrow_bits, true);
     arrowBitmap->setMask(*arrowBitmap); // heh
     resetPixmap = new TQPixmap((const char **)dcolorreset_xpm);
-    fg = TQBrush(Qt::black, Qt::SolidPattern);
-    bg = TQBrush(Qt::white, Qt::SolidPattern);
+    fg = TQBrush(TQt::black, TQt::SolidPattern);
+    bg = TQBrush(TQt::white, TQt::SolidPattern);
     curColor = Foreground;
     dragFlag = false;
     miniCtlFlag = false;
@@ -67,8 +67,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo
                               (const unsigned char *)dcolorarrow_bits, true);
     arrowBitmap->setMask(*arrowBitmap);
     resetPixmap = new TQPixmap((const char **)dcolorreset_xpm);
-    fg = TQBrush(fgColor, Qt::SolidPattern);
-    bg = TQBrush(bgColor, Qt::SolidPattern);
+    fg = TQBrush(fgColor, TQt::SolidPattern);
+    bg = TQBrush(bgColor, TQt::SolidPattern);
     curColor = Foreground;
     dragFlag = false;
     miniCtlFlag = false;
@@ -111,7 +111,7 @@ TQSize KDualColorButton::sizeHint() const
 
 void KDualColorButton::setForeground(const TQColor &c)
 {
-    fg = TQBrush(c, Qt::SolidPattern);
+    fg = TQBrush(c, TQt::SolidPattern);
     repaint(false);
 
     emit fgChanged(fg.color());
@@ -119,7 +119,7 @@ void KDualColorButton::setForeground(const TQColor &c)
 
 void KDualColorButton::setBackground(const TQColor &c)
 {
-    bg = TQBrush(c, Qt::SolidPattern);
+    bg = TQBrush(c, TQt::SolidPattern);
     repaint(false);
 
     emit bgChanged(bg.color());
@@ -128,9 +128,9 @@ void KDualColorButton::setBackground(const TQColor &c)
 void KDualColorButton::setCurrentColor(const TQColor &c)
 {
     if(curColor == Background)
-        bg = TQBrush(c, Qt::SolidPattern);
+        bg = TQBrush(c, TQt::SolidPattern);
     else
-        fg = TQBrush(c, Qt::SolidPattern);
+        fg = TQBrush(c, TQt::SolidPattern);
     repaint(false);
 }
 
@@ -211,8 +211,8 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev)
         miniCtlFlag = true;
     }
     else if(ev->pos().x() < bgRect.x()){
-        fg.setColor(Qt::black);
-        bg.setColor(Qt::white);
+        fg.setColor(TQt::black);
+        bg.setColor(TQt::white);
         emit fgChanged(fg.color());
         emit bgChanged(bg.color());
         miniCtlFlag = true;
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index 2495750f8..15e04d39d 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -47,7 +47,7 @@ class TQBitmap;
  */
 class TDEUI_EXPORT KDualColorButton : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_ENUMS( DualColor )
     TQ_PROPERTY( TQColor foreground READ foreground WRITE setForeground )
     TQ_PROPERTY( TQColor background READ background WRITE setBackground )
diff --git a/tdeui/keditcl.h b/tdeui/keditcl.h
index aefd3df81..2f84e4622 100644
--- a/tdeui/keditcl.h
+++ b/tdeui/keditcl.h
@@ -36,7 +36,7 @@ class TQVButtonGroup;
 
 class TDEUI_EXPORT KEdGotoLine : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KEdGotoLine( TQWidget *parent=0, const char *name=0, bool modal=true );
@@ -58,7 +58,7 @@ private:
 ///
 class TDEUI_EXPORT KEdFind : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString text READ getText WRITE setText )
     TQ_PROPERTY( bool caseSensitivity READ case_sensitive WRITE setCaseSensitive )
     TQ_PROPERTY( bool direction READ get_direction WRITE setDirection )
@@ -108,7 +108,7 @@ private:
 ///
 class TDEUI_EXPORT KEdReplace : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -170,7 +170,7 @@ private:
 
 class TDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -403,7 +403,7 @@ protected:
 private:
     TQTimer* repaintTimer;
 
-    QString	killbufferstring;
+    TQString	killbufferstring;
     TQWidget     *parent;
     KEdFind 	*srchdialog;
     KEdReplace 	*replace_dialog;
diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp
index a550a7af1..85ccd1c88 100644
--- a/tdeui/keditcl1.cpp
+++ b/tdeui/keditcl1.cpp
@@ -67,8 +67,8 @@ KEdit::KEdit(TQWidget *_parent, const char *name)
     setAcceptDrops(true);
     KCursor::setAutoHideCursor( this, true );
 
-    connect(this, TQT_SIGNAL(cursorPositionChanged(int,int)),
-            this, TQT_SLOT(slotCursorPositionChanged()));
+    connect(this, TQ_SIGNAL(cursorPositionChanged(int,int)),
+            this, TQ_SLOT(slotCursorPositionChanged()));
 }
 
 
diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp
index 0c147e4b8..3ccb5226b 100644
--- a/tdeui/keditcl2.cpp
+++ b/tdeui/keditcl2.cpp
@@ -58,8 +58,8 @@ void KEdit::search(){
   if( !srchdialog )
   {
     srchdialog = new KEdFind( this, "searchdialog", false);
-    connect(srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot()));
-    connect(srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot()));
+    connect(srchdialog,TQ_SIGNAL(search()),this,TQ_SLOT(search_slot()));
+    connect(srchdialog,TQ_SIGNAL(done()),this,TQ_SLOT(searchdone_slot()));
   }
 
   // If we already searched / replaced something before make sure it shows
@@ -254,10 +254,10 @@ void KEdit::replace()
   if( !replace_dialog )
   {
     replace_dialog = new KEdReplace( this, "replace_dialog", false );
-    connect(replace_dialog,TQT_SIGNAL(find()),this,TQT_SLOT(replace_search_slot()));
-    connect(replace_dialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replace_slot()));
-    connect(replace_dialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replace_all_slot()));
-    connect(replace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(replacedone_slot()));
+    connect(replace_dialog,TQ_SIGNAL(find()),this,TQ_SLOT(replace_search_slot()));
+    connect(replace_dialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replace_slot()));
+    connect(replace_dialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replace_all_slot()));
+    connect(replace_dialog,TQ_SIGNAL(done()),this,TQ_SLOT(replacedone_slot()));
   }
 
   TQString string = replace_dialog->getText();
@@ -715,8 +715,8 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal )
   d->combo->setMinimumWidth(fontMetrics().maxWidth()*20);
   d->combo->setFocus();
 
-  connect(d->combo, TQT_SIGNAL(textChanged ( const TQString & )),
-          this,TQT_SLOT(textSearchChanged ( const TQString & )));
+  connect(d->combo, TQ_SIGNAL(textChanged ( const TQString & )),
+          this,TQ_SLOT(textSearchChanged ( const TQString & )));
 
   topLayout->addWidget(d->combo);
 
@@ -734,7 +734,7 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal )
   enableButton( KDialogBase::User1, !d->combo->currentText().isEmpty() );
 
   if ( !modal )
-    connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCancel() ) );
+    connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCancel() ) );
 }
 
 KEdFind::~KEdFind()
@@ -834,7 +834,7 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
 {
   setWFlags( WType_TopLevel );
 
-  setButtonBoxOrientation( Qt::Vertical );
+  setButtonBoxOrientation( TQt::Vertical );
 
   TQFrame *page = makeMainWidget();
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
@@ -856,8 +856,8 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal )
   d->replaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20);
   topLayout->addWidget(d->replaceCombo);
 
-  connect(d->searchCombo, TQT_SIGNAL(textChanged ( const TQString & )),
-          this,TQT_SLOT(textSearchChanged ( const TQString & )));
+  connect(d->searchCombo, TQ_SIGNAL(textChanged ( const TQString & )),
+          this,TQ_SLOT(textSearchChanged ( const TQString & )));
 
   TQButtonGroup *group = new TQButtonGroup( i18n("Options"), page );
   topLayout->addWidget( group );
diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp
index bd7bb76b5..92efce083 100644
--- a/tdeui/keditlistbox.cpp
+++ b/tdeui/keditlistbox.cpp
@@ -105,10 +105,10 @@ void KEditListBox::init( bool checkAtEntering, int buttons,
     d->buttons = 0;
     setButtons( buttons );
 
-    connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&)));
+    connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&)));
     m_lineEdit->setTrapReturnKey(true);
-    connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem()));
-    connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int)));
+    connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem()));
+    connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int)));
 
     // maybe supplied lineedit has some text already
     typedSomething( m_lineEdit->text() );
@@ -124,7 +124,7 @@ void KEditListBox::setButtons( uint buttons )
         servNewButton = new TQPushButton(i18n("&Add"), this);
         servNewButton->setEnabled(false);
         servNewButton->show();
-        connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem()));
+        connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem()));
 
         grid->addWidget(servNewButton, 2, 1);
     } else if ( ( buttons & Add ) == 0 && servNewButton ) {
@@ -136,7 +136,7 @@ void KEditListBox::setButtons( uint buttons )
         servRemoveButton = new TQPushButton(i18n("&Remove"), this);
         servRemoveButton->setEnabled(false);
         servRemoveButton->show();
-        connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem()));
+        connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem()));
 
         grid->addWidget(servRemoveButton, 3, 1);
     } else if ( ( buttons & Remove ) == 0 && servRemoveButton ) {
@@ -148,12 +148,12 @@ void KEditListBox::setButtons( uint buttons )
         servUpButton = new TQPushButton(i18n("Move &Up"), this);
         servUpButton->setEnabled(false);
         servUpButton->show();
-        connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp()));
+        connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp()));
 
         servDownButton = new TQPushButton(i18n("Move &Down"), this);
         servDownButton->setEnabled(false);
         servDownButton->show();
-        connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown()));
+        connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown()));
 
         grid->addWidget(servUpButton, 4, 1);
         grid->addWidget(servDownButton, 5, 1);
@@ -174,10 +174,14 @@ void KEditListBox::typedSomething(const TQString& text)
             // of currentItem() ... like changing it or emitting signals ...
             // but TT disagree with me on this one (it's been that way since ages ... grrr)
             bool block = m_listBox->signalsBlocked();
+            const TQString& oldText = currentText();
+            int item = currentItem();
             m_listBox->blockSignals( true );
-            m_listBox->changeItem(text, currentItem());
+            m_listBox->changeItem(text, item);
             m_listBox->blockSignals( block );
             emit changed();
+            emit renamed(oldText, text);
+            emit renamed(item, oldText, text);
         }
     }
 
@@ -278,7 +282,8 @@ void KEditListBox::addItem()
     m_lineEdit->clear();
     m_lineEdit->blockSignals(block);
 
-    m_listBox->setSelected(currentItem(), false);
+    int item = currentItem();
+    m_listBox->setSelected(item, false);
 
     if (!alreadyInList)
     {
@@ -287,7 +292,8 @@ void KEditListBox::addItem()
         m_listBox->insertItem(currentTextLE);
         m_listBox->blockSignals( block );
         emit changed();
-	emit added( currentTextLE );
+        emit added( currentTextLE );
+        emit added( item, currentTextLE );
     }
 }
 
@@ -300,18 +306,19 @@ int KEditListBox::currentItem() const
 
 void KEditListBox::removeItem()
 {
-    int selected = m_listBox->currentItem();
+    int item = m_listBox->currentItem();
 
-    if ( selected >= 0 )
+    if ( item >= 0 )
     {
-	TQString removedText = m_listBox->currentText();
+        TQString removedText = m_listBox->currentText();
 
-        m_listBox->removeItem( selected );
+        m_listBox->removeItem( item );
         if ( count() > 0 )
-            m_listBox->setSelected( TQMIN( selected, count() - 1 ), true );
+            m_listBox->setSelected( TQMIN( item, count() - 1 ), true );
 
         emit changed();
-	emit removed( removedText );
+        emit removed( removedText );
+        emit removed( item, removedText );
     }
 
     if ( servRemoveButton && m_listBox->currentItem() == -1 )
@@ -411,7 +418,7 @@ void KEditListBox::virtual_hook( int, void* )
 KEditListBox::CustomEditor::CustomEditor( KComboBox *combo )
 {
     m_representationWidget = combo;
-    m_lineEdit = tqt_dynamic_cast<KLineEdit*>( combo->lineEdit() );
+    m_lineEdit = dynamic_cast<KLineEdit*>( combo->lineEdit() );
     assert( m_lineEdit );
 }
 
diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h
index 2bb8de6b8..0a986b93e 100644
--- a/tdeui/keditlistbox.h
+++ b/tdeui/keditlistbox.h
@@ -33,7 +33,7 @@ class KEditListBoxPrivate;
 /**
  * An editable listbox
  *
- * This class provides a editable listbox ;-), this means
+ * This class provides an editable listbox ;-), this means
  * a listbox which is accompanied by a line edit to enter new
  * items into the listbox and pushbuttons to add and remove
  * items from the listbox and two buttons to move items up and down.
@@ -43,7 +43,7 @@ class KEditListBoxPrivate;
  */
 class TDEUI_EXPORT KEditListBox : public TQGroupBox
 {
-   Q_OBJECT
+   TQ_OBJECT
    
 
    TQ_SETS( Button )
@@ -199,19 +199,58 @@ public:
       void changed();
 
       /**
-       * This signal is emitted when the user adds a new string to the list,
-       * the parameter is the added string.
+       * This signal is emitted when the user adds a new string to the list.
+       * @param text is the added string.
        * @since 3.2
+       * @see added( int item, const TQString & text )
        */
       void added( const TQString & text );
 
       /**
-       * This signal is emitted when the user removes a string from the list,
-       * the parameter is the removed string.
+       * This signal is emitted when the user adds a new string to the list.
+       * @param item is the added item's position in the list.
+       * @param text is the added string.
+       * @since R14.1.0
+       * @see added( const TQString & text )
+       */
+      void added( int item, const TQString & text );
+
+      /**
+       * This signal is emitted when the user removes a string from the list.
+       * @param text is the removed string.
        * @since 3.2
+       * @see removed( int item, const TQString & text )
        */
       void removed( const TQString & text );
 
+      /**
+       * This signal is emitted when the user removes a string from the list.
+       * @param item is the removed item's position in the list.
+       * @param text is the removed string.
+       * @since R14.1.0
+       * @see removed( const TQString & text )
+       */
+      void removed( int item, const TQString & text );
+
+      /**
+       * This signal is emitted when the user renames a list item.
+       * @param from is the original item's text.
+       * @param to is the new text of the item.
+       * @since R14.1.0
+       * @see renamed( int item, const TQString &from, const TQString &to )
+       */
+      void renamed( const TQString &from, const TQString &to );
+
+      /**
+       * This signal is emitted when the user renames a list item.
+       * @param item is the renamed item's position in the list.
+       * @param from is the original item's text.
+       * @param to is the new text of the item.
+       * @since R14.1.0
+       * @see renamed( const TQString &from, const TQString &to )
+       */
+      void renamed( int item, const TQString &from, const TQString &to );
+
    protected slots:
       //the names should be self-explaining
       void moveItemUp();
diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp
index 13d928b52..193a2e4ac 100644
--- a/tdeui/kedittoolbar.cpp
+++ b/tdeui/kedittoolbar.cpp
@@ -422,8 +422,8 @@ void KEditToolbar::init()
 
     setMainWidget(m_widget);
 
-    connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool)));
-    connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool)));
+    connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool)));
+    connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool)));
     enableButtonApply(false);
 
     setMinimumSize(sizeHint());
@@ -499,8 +499,8 @@ void KEditToolbar::slotDefault()
     setMainWidget(m_widget);
     m_widget->show();
 
-    connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool)));
-    connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool)));
+    connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool)));
+    connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool)));
 
     enableButtonApply(false);
     emit newToolbarConfig();
@@ -762,8 +762,8 @@ void KEditToolbarWidget::setupLayout()
   m_toolbarCombo->setEnabled(false);
   d->m_comboLabel->setBuddy(m_toolbarCombo);
   d->m_comboSeparator = new KSeparator(this);
-  connect(m_toolbarCombo, TQT_SIGNAL(activated(const TQString&)),
-          this,           TQT_SLOT(slotToolbarSelected(const TQString&)));
+  connect(m_toolbarCombo, TQ_SIGNAL(activated(const TQString&)),
+          this,           TQ_SLOT(slotToolbarSelected(const TQString&)));
 
 //  TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this);
 //  new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall));
@@ -785,10 +785,10 @@ void KEditToolbarWidget::setupLayout()
   int column2 = m_inactiveList->addColumn(""); // text
   m_inactiveList->setSorting( column2 );
   inactive_label->setBuddy(m_inactiveList);
-  connect(m_inactiveList, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-          this,           TQT_SLOT(slotInactiveSelected(TQListViewItem *)));
-  connect(m_inactiveList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int  )),
-          this,           TQT_SLOT(slotInsertButton()));
+  connect(m_inactiveList, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+          this,           TQ_SLOT(slotInactiveSelected(TQListViewItem *)));
+  connect(m_inactiveList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int  )),
+          this,           TQ_SLOT(slotInsertButton()));
 
   // our list of active actions
   TQLabel *active_label = new TQLabel(i18n("Curr&ent actions:"), this);
@@ -804,14 +804,14 @@ void KEditToolbarWidget::setupLayout()
   m_activeList->setSorting(-1);
   active_label->setBuddy(m_activeList);
 
-  connect(m_inactiveList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)),
-          this,              TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*)));
-  connect(m_activeList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)),
-          this,            TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*)));
-  connect(m_activeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)),
-          this,         TQT_SLOT(slotActiveSelected(TQListViewItem *)));
-  connect(m_activeList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int  )),
-          this,           TQT_SLOT(slotRemoveButton()));
+  connect(m_inactiveList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)),
+          this,              TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*)));
+  connect(m_activeList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)),
+          this,            TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*)));
+  connect(m_activeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)),
+          this,         TQ_SLOT(slotActiveSelected(TQListViewItem *)));
+  connect(m_activeList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int  )),
+          this,           TQ_SLOT(slotRemoveButton()));
 
   // "change icon" button
   d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this );
@@ -819,8 +819,8 @@ void KEditToolbarWidget::setupLayout()
   d->m_hasKDialog = !kdialogExe.isEmpty();
   d->m_changeIcon->setEnabled( d->m_hasKDialog );
 
-  connect( d->m_changeIcon, TQT_SIGNAL( clicked() ),
-           this, TQT_SLOT( slotChangeIcon() ) );
+  connect( d->m_changeIcon, TQ_SIGNAL( clicked() ),
+           this, TQ_SLOT( slotChangeIcon() ) );
 
   // The buttons in the middle
   TQIconSet iconSet;
@@ -830,26 +830,26 @@ void KEditToolbarWidget::setupLayout()
   m_upAction->setIconSet( iconSet );
   m_upAction->setEnabled(false);
   m_upAction->setAutoRepeat(true);
-  connect(m_upAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpButton()));
+  connect(m_upAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpButton()));
 
   m_insertAction = new TQToolButton(this);
   iconSet = TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" );
   m_insertAction->setIconSet( iconSet );
   m_insertAction->setEnabled(false);
-  connect(m_insertAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotInsertButton()));
+  connect(m_insertAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotInsertButton()));
 
   m_removeAction = new TQToolButton(this);
   iconSet = TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" );
   m_removeAction->setIconSet( iconSet );
   m_removeAction->setEnabled(false);
-  connect(m_removeAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveButton()));
+  connect(m_removeAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveButton()));
 
   m_downAction   = new TQToolButton(this);
   iconSet = SmallIconSet( "go-down" );
   m_downAction->setIconSet( iconSet );
   m_downAction->setEnabled(false);
   m_downAction->setAutoRepeat(true);
-  connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton()));
+  connect(m_downAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownButton()));
 
   d->m_helpArea = new TQLabel(this);
   d->m_helpArea->setAlignment( TQt::WordBreak );
@@ -890,7 +890,7 @@ void KEditToolbarWidget::setupLayout()
   changeIcon_layout->addStretch( 1 );
 
   list_layout->addLayout(inactive_layout);
-  list_layout->addLayout(TQT_TQLAYOUT(button_layout));
+  list_layout->addLayout(button_layout);
   list_layout->addLayout(active_layout);
 
   top_layout->addLayout(name_layout);
@@ -1405,8 +1405,8 @@ void KEditToolbarWidget::slotChangeIcon()
   m_activeList->setEnabled( false ); // don't change the current item
   m_toolbarCombo->setEnabled( false ); // don't change the current toolbar
 
-  connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ),
-           this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
+  connect( d->m_kdialogProcess, TQ_SIGNAL( processExited( TDEProcess* ) ),
+           this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
 }
 
 void KEditToolbarWidget::slotProcessExited( TDEProcess* )
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h
index 8afe67352..d59756b71 100644
--- a/tdeui/kedittoolbar.h
+++ b/tdeui/kedittoolbar.h
@@ -67,7 +67,7 @@ namespace KEditToolbarInternal
  * {
  *   saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
  *   KEditToolbar dlg(actionCollection());
- *   connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
+ *   connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig()));
  *   dlg.exec();
  * }
  *
@@ -92,7 +92,7 @@ namespace KEditToolbarInternal
  * \code
  * saveMainWindowSettings( TDEGlobal::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();
  *
  * void MyClass::slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked
@@ -108,7 +108,7 @@ namespace KEditToolbarInternal
  */
 class TDEUI_EXPORT KEditToolbar : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   /**
    * Constructor for apps that do not use components.
@@ -268,7 +268,7 @@ private:
  */
 class TDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor.  This is the only entry point to this class.  You
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index f929e92a4..a274ec737 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -89,13 +89,13 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
 
   if (actions)
   {
-    KStdAction::helpContents(this, TQT_SLOT(appHelpActivated()), actions);
+    KStdAction::helpContents(this, TQ_SLOT(appHelpActivated()), actions);
     if (showWhatsThis)
-      KStdAction::whatsThis(this, TQT_SLOT(contextHelpActivated()), actions);
-    KStdAction::reportBug(this, TQT_SLOT(reportBug()), actions);
-    KStdAction::aboutApp(this, TQT_SLOT(aboutApplication()), actions);
-    KStdAction::aboutKDE(this, TQT_SLOT(aboutKDE()), actions);
-    KStdAction::switchApplicationLanguage(this, TQT_SLOT(switchApplicationLanguage()), actions);
+      KStdAction::whatsThis(this, TQ_SLOT(contextHelpActivated()), actions);
+    KStdAction::reportBug(this, TQ_SLOT(reportBug()), actions);
+    KStdAction::aboutApp(this, TQ_SLOT(aboutApplication()), actions);
+    KStdAction::aboutKDE(this, TQ_SLOT(aboutKDE()), actions);
+    KStdAction::switchApplicationLanguage(this, TQ_SLOT(switchApplicationLanguage()), actions);
   }
 }
 
@@ -122,14 +122,14 @@ TDEPopupMenu* KHelpMenu::menu()
     TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
 
     mMenu = new TDEPopupMenu();
-    connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
+    connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed()));
 
     bool need_separator = false;
     if (kapp->authorizeTDEAction("help_contents"))
     {
       mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall),
                      TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents );
-      mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) );
+      mMenu->connectItem( menuHelpContents, this, TQ_SLOT(appHelpActivated()) );
       mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents );
       need_separator = true;
     }
@@ -138,7 +138,7 @@ TDEPopupMenu* KHelpMenu::menu()
     {
       TQToolButton* wtb = TQWhatsThis::whatsThisButton(0);
       mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis);
-      mMenu->connectItem( menuWhatsThis, this, TQT_SLOT(contextHelpActivated()) );
+      mMenu->connectItem( menuWhatsThis, this, TQ_SLOT(contextHelpActivated()) );
       delete wtb;
       mMenu->setAccel( SHIFT + Key_F1, menuWhatsThis );
       need_separator = true;
@@ -148,8 +148,8 @@ TDEPopupMenu* KHelpMenu::menu()
     {
       if (need_separator)
         mMenu->insertSeparator();
-      mMenu->insertItem( i18n( "&Report Bug/Request Enhancement..." ), menuReportBug );
-      mMenu->connectItem( menuReportBug, this, TQT_SLOT(reportBug()) );
+      mMenu->insertItem( SmallIcon("bug"), i18n( "&Report Bug/Request Enhancement..." ), menuReportBug );
+      mMenu->connectItem( menuReportBug, this, TQ_SLOT(reportBug()) );
       need_separator = true;
     }
 
@@ -158,7 +158,7 @@ TDEPopupMenu* KHelpMenu::menu()
       if (need_separator)
         mMenu->insertSeparator();
       mMenu->insertItem( SmallIcon("locale"), i18n( "Switch application &language..." ), menuSwitchLanguage );
-      mMenu->connectItem( menuSwitchLanguage, this, TQT_SLOT(switchApplicationLanguage()) );
+      mMenu->connectItem( menuSwitchLanguage, this, TQ_SLOT(switchApplicationLanguage()) );
       need_separator = true;
     }
     
@@ -169,13 +169,13 @@ TDEPopupMenu* KHelpMenu::menu()
     {
       mMenu->insertItem( kapp->miniIcon(),
         TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp );
-      mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) );
+      mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) );
     }
     
     if (kapp->authorizeTDEAction("help_about_kde"))
     {
-      mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &Trinity" ), menuAboutKDE );
-      mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) );
+      mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE );
+      mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) );
     }
   }
 
@@ -197,7 +197,7 @@ void KHelpMenu::aboutApplication()
     if( !mAboutApp )
     {
       mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false );
-      connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+      connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
     }
     mAboutApp->show();
   }
@@ -213,7 +213,7 @@ void KHelpMenu::aboutApplication()
 				   KDialogBase::Yes, KDialogBase::Yes,
 				   KDialogBase::Yes, mParent, "about",
 				   false, true, KStdGuiItem::ok() );
-      connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+      connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
 
       TQHBox *hbox = new TQHBox( mAboutApp );
       mAboutApp->setMainWidget( hbox );
@@ -239,7 +239,7 @@ void KHelpMenu::aboutKDE()
   if( !mAboutKDE )
   {
     mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false );
-    connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+    connect( mAboutKDE, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
   }
   mAboutKDE->show();
 }
@@ -250,7 +250,7 @@ void KHelpMenu::reportBug()
   if( !mBugReport )
   {
     mBugReport = new KBugReport( mParent, false, d->mAboutData );
-    connect( mBugReport, TQT_SIGNAL(finished()),this,TQT_SLOT( dialogFinished()) );
+    connect( mBugReport, TQ_SIGNAL(finished()),this,TQ_SLOT( dialogFinished()) );
   }
   mBugReport->show();
 }
@@ -260,7 +260,7 @@ void KHelpMenu::switchApplicationLanguage()
   if ( !d->mSwitchApplicationLanguage )
   {
     d->mSwitchApplicationLanguage = new KSwitchLanguageDialog( mParent, "switchlanguagedialog", false );
-    connect( d->mSwitchApplicationLanguage, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+    connect( d->mSwitchApplicationLanguage, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
   }
   d->mSwitchApplicationLanguage->show();
 }
@@ -268,7 +268,7 @@ void KHelpMenu::switchApplicationLanguage()
 
 void KHelpMenu::dialogFinished()
 {
-  TQTimer::singleShot( 0, this, TQT_SLOT(timerExpired()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(timerExpired()) );
 }
 
 
@@ -308,7 +308,7 @@ void KHelpMenu::contextHelpActivated()
   TQWidget* w = TQApplication::widgetAt( TQCursor::pos(), true );
   while ( w && !w->isTopLevel() && !w->inherits("QXEmbed")  )
       w = w->parentWidget();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
    if ( w && w->inherits("QXEmbed") )
 	  (( QXEmbed*) w )->enterWhatsThisMode();
 #endif
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index 25e118b5b..ad0e65140 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -60,7 +60,7 @@ class KHelpMenuPrivate;
  *
  * \code
  * mHelpMenu = new KHelpMenu( this, <someText> );
- * connect( this, TQT_SIGNAL(someSignal()), mHelpMenu,TQT_SLOT(mHelpMenu->aboutKDE()));
+ * connect( this, TQ_SIGNAL(someSignal()), mHelpMenu,TQ_SLOT(mHelpMenu->aboutKDE()));
  * \endcode
  *
  * IMPORTANT:
@@ -97,8 +97,8 @@ class KHelpMenuPrivate;
  * {
  *   ..
  *   KHelpMenu *helpMenu = new KHelpMenu( this );
- *   connect( helpMenu, TQT_SIGNAL(showAboutApplication()),
- *          this, TQT_SLOT(myDialogSlot()));
+ *   connect( helpMenu, TQ_SIGNAL(showAboutApplication()),
+ *          this, TQ_SLOT(myDialogSlot()));
  *   ..
  * }
  *
@@ -116,7 +116,7 @@ class KHelpMenuPrivate;
  * {
  *   KHelpMenu *helpMenu = new KHelpMenu( this );
  *   TDEPopupMenu *help = mHelpMenu->menu();
- *   help->connectItem( KHelpMenu::menuAboutApp, this, TQT_SLOT(myDialogSlot()) );
+ *   help->connectItem( KHelpMenu::menuAboutApp, this, TQ_SLOT(myDialogSlot()) );
  * }
  *
  * void MyClass::myDialogSlot()
@@ -130,7 +130,7 @@ class KHelpMenuPrivate;
 
 class TDEUI_EXPORT KHelpMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum MenuId
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 04b78f389..517730b9c 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -61,23 +61,23 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f )
 {
     d = new TDEIconViewPrivate;
 
-    connect( this, TQT_SIGNAL( onViewport() ),
-             this, TQT_SLOT( slotOnViewport() ) );
-    connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ),
-             this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) );
+    connect( this, TQ_SIGNAL( onViewport() ),
+             this, TQ_SLOT( slotOnViewport() ) );
+    connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ),
+             this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) );
     slotSettingsChanged( TDEApplication::SETTINGS_MOUSE );
     if ( kapp ) { // maybe null when used inside designer
-        connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+        connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
         kapp->addKipcEventMask( KIPC::SettingsChanged );
     }
 
     m_pCurrentItem = 0L;
 
     m_pAutoSelect = new TQTimer( this );
-    connect( m_pAutoSelect, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotAutoSelect() ) );
+    connect( m_pAutoSelect, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotAutoSelect() ) );
 
-    connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) );
+    connect( &d->dragHoldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragHoldTimeout()) );
 }
 
 TDEIconView::~TDEIconView()
@@ -128,25 +128,25 @@ void TDEIconView::slotSettingsChanged(int category)
     m_bUseSingle = TDEGlobalSettings::singleClick();
     //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl;
 
-    disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
+    disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
 						  const TQPoint & ) ),
-		this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
+		this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
 						    const TQPoint & ) ) );
-//         disconnect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *,
+//         disconnect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *,
 // 						 const TQPoint & ) ),
-// 		    this, TQT_SLOT( slotExecute( TQIconViewItem *,
+// 		    this, TQ_SLOT( slotExecute( TQIconViewItem *,
 // 					     const TQPoint & ) ) );
 
     if( m_bUseSingle ) {
-      connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
+      connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *,
 						 const TQPoint & ) ),
-	       this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
+	       this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *,
 						   const TQPoint & ) ) );
     }
     else {
-//         connect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *,
+//         connect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *,
 // 					      const TQPoint & ) ),
-//                  this, TQT_SLOT( slotExecute( TQIconViewItem *,
+//                  this, TQ_SLOT( slotExecute( TQIconViewItem *,
 // 					  const TQPoint & ) ) );
     }
 
@@ -310,7 +310,7 @@ void TDEIconView::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
   TQIconViewItem* item = findItem( e->pos() );
 
   if( item ) {
-    if( (e->button() == Qt::LeftButton) && !m_bUseSingle )
+    if( (e->button() == TQt::LeftButton) && !m_bUseSingle )
       emitExecute( item, e->globalPos() );
 
     emit doubleClicked( item, e->globalPos() );
@@ -324,7 +324,7 @@ void TDEIconView::slotMouseButtonClicked( int btn, TQIconViewItem *item, const T
   if( d->doubleClickIgnoreTimer.isActive() )
     return; // Ignore double click
     
-  if( (btn == Qt::LeftButton) && item )
+  if( (btn == TQt::LeftButton) && item )
     emitExecute( item, pos );
 }
 
@@ -388,7 +388,7 @@ void TDEIconView::cancelPendingHeldSignal()
 void TDEIconView::wheelEvent( TQWheelEvent *e )
 {
     if (horizontalScrollBar() && (arrangement() == TQIconView::TopToBottom)) {
-        TQWheelEvent ce(e->pos(), e->delta(), e->state(), Qt::Horizontal);
+        TQWheelEvent ce(e->pos(), e->delta(), e->state(), TQt::Horizontal);
         TQApplication::sendEvent( horizontalScrollBar(), &ce);
 	if (ce.isAccepted()) {
             e->accept();
@@ -757,7 +757,7 @@ void TDEIconViewItem::paintText( TQPainter *p, const TQColorGroup &cg )
         p->setPen( TQPen( cg.highlightedText() ) );
     }
     else {
-        if ( iconView()->itemTextBackground() != Qt::NoBrush ) {
+        if ( iconView()->itemTextBackground() != TQt::NoBrush ) {
             p->fillRect( textRect( false ), iconView()->itemTextBackground() );
         }
         p->setPen( cg.text() );
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 8c0cd5a24..f29bf61d4 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -42,7 +42,7 @@
 class TDEUI_EXPORT TDEIconView : public TQIconView
 {
   friend class TDEIconViewItem;
-  Q_OBJECT
+  TQ_OBJECT
   TQ_ENUMS( Mode )
   TQ_PROPERTY( Mode mode READ mode WRITE setMode )
 
diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp
index 77b8082ea..f853221ff 100644
--- a/tdeui/kiconviewsearchline.cpp
+++ b/tdeui/kiconviewsearchline.cpp
@@ -152,15 +152,15 @@ void TDEIconViewSearchLine::setCaseSensitive( bool cs )
 void TDEIconViewSearchLine::setIconView( TQIconView *iv )
 {
   if ( d->iconView != NULL )
-    disconnect( d->iconView, TQT_SIGNAL( destroyed() ),
-		this,        TQT_SLOT(   iconViewDeleted() ) );
+    disconnect( d->iconView, TQ_SIGNAL( destroyed() ),
+		this,        TQ_SLOT(   iconViewDeleted() ) );
 
   d->iconView = iv;
 
   if ( iv != NULL )
     {
-      connect( d->iconView, TQT_SIGNAL( destroyed() ),
-	       this,        TQT_SLOT(   iconViewDeleted() ) );
+      connect( d->iconView, TQ_SIGNAL( destroyed() ),
+	       this,        TQ_SLOT(   iconViewDeleted() ) );
       setEnabled( true );
     }
   else
@@ -190,13 +190,13 @@ void TDEIconViewSearchLine::init( TQIconView *iconView )
 
   d->iconView = iconView;
 
-  connect( this, TQT_SIGNAL( textChanged( const TQString & ) ),
-	   this, TQT_SLOT(   queueSearch( const TQString & ) ) );
+  connect( this, TQ_SIGNAL( textChanged( const TQString & ) ),
+	   this, TQ_SLOT(   queueSearch( const TQString & ) ) );
 
   if ( iconView != NULL )
     {
-      connect( iconView, TQT_SIGNAL( destroyed() ),
-	       this,     TQT_SLOT(   iconViewDeleted() ) );
+      connect( iconView, TQ_SIGNAL( destroyed() ),
+	       this,     TQ_SLOT(   iconViewDeleted() ) );
       setEnabled( true );
     }
   else
@@ -231,7 +231,7 @@ void TDEIconViewSearchLine::queueSearch( const TQString &s )
 {
   d->queuedSearches++;
   d->search = s;
-  TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) );
+  TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) );
 }
 
 void TDEIconViewSearchLine::activateSearch()
@@ -244,7 +244,7 @@ void TDEIconViewSearchLine::activateSearch()
       d->queuedSearches = 0;
   }
   else {
-      TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) );
+      TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) );
   }
 }
 
diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h
index cef09b3ea..3988a7c9b 100644
--- a/tdeui/kiconviewsearchline.h
+++ b/tdeui/kiconviewsearchline.h
@@ -37,7 +37,7 @@ class TQIconViewItem;
  */
 class TDEUI_EXPORT TDEIconViewSearchLine : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp
index 831cf2560..5bf89ae20 100644
--- a/tdeui/kinputdialog.cpp
+++ b/tdeui/kinputdialog.cpp
@@ -17,10 +17,6 @@
   Boston, MA 02110-1301, USA.
 */
 
-#ifdef USE_QT4
-#undef Status
-#endif // USE_QT4
-
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqvalidator.h>
@@ -81,9 +77,9 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
   if ( !mask.isEmpty() )
     d->m_lineEdit->setInputMask( mask );
 
-  connect( d->m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-      TQT_SLOT( slotEditTextChanged( const TQString & ) ) );
-  connect( this, TQT_SIGNAL( user1Clicked() ), d->m_lineEdit, TQT_SLOT( clear() ) );
+  connect( d->m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+      TQ_SLOT( slotEditTextChanged( const TQString & ) ) );
+  connect( this, TQ_SIGNAL( user1Clicked() ), d->m_lineEdit, TQ_SLOT( clear() ) );
 
   slotEditTextChanged( value );
   setMinimumWidth( 350 );
@@ -109,7 +105,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
   d->m_textEdit->setFocus();
   d->m_label->setBuddy( d->m_textEdit );
 
-  connect( this, TQT_SIGNAL( user1Clicked() ), d->m_textEdit, TQT_SLOT( clear() ) );
+  connect( this, TQ_SIGNAL( user1Clicked() ), d->m_textEdit, TQ_SLOT( clear() ) );
 
   setMinimumWidth( 400 );
 }
@@ -180,10 +176,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d->m_comboBox->setCurrentItem( current );
     layout->addWidget( d->m_comboBox );
 
-    connect( d->m_comboBox, TQT_SIGNAL( textChanged( const TQString & ) ),
-      TQT_SLOT( slotUpdateButtons( const TQString & ) ) );
-    connect( this, TQT_SIGNAL( user1Clicked() ),
-      d->m_comboBox, TQT_SLOT( clearEdit() ) );
+    connect( d->m_comboBox, TQ_SIGNAL( textChanged( const TQString & ) ),
+      TQ_SLOT( slotUpdateButtons( const TQString & ) ) );
+    connect( this, TQ_SIGNAL( user1Clicked() ),
+      d->m_comboBox, TQ_SLOT( clearEdit() ) );
     slotUpdateButtons( d->m_comboBox->currentText() );
     d->m_comboBox->setFocus();
   } else {
@@ -192,10 +188,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
     d->m_listBox->setSelected( current, true );
     d->m_listBox->ensureCurrentVisible();
     layout->addWidget( d->m_listBox, 10 );
-    connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
-      TQT_SLOT( slotOk() ) );
-    connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
-      TQT_SLOT( slotOk() ) );
+    connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ),
+      TQ_SLOT( slotOk() ) );
+    connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ),
+      TQ_SLOT( slotOk() ) );
 
     d->m_listBox->setFocus();
   }
@@ -236,10 +232,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label,
   }
   else
   {
-    connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ),
-      TQT_SLOT( slotOk() ) );
-    connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ),
-      TQT_SLOT( slotOk() ) );
+    connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ),
+      TQ_SLOT( slotOk() ) );
+    connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ),
+      TQ_SLOT( slotOk() ) );
 
     TQString text = select.first();
     item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch );
@@ -374,7 +370,7 @@ TQString KInputDialog::getItem( const TQString &caption, const TQString &label,
     editable, parent, name );
   if ( !editable)
   {
-      connect( dlg.listBox(),  TQT_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQT_SLOT( slotOk()));
+      connect( dlg.listBox(),  TQ_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQ_SLOT( slotOk()));
   }
   bool _ok = ( dlg.exec() == Accepted );
 
diff --git a/tdeui/kinputdialog.h b/tdeui/kinputdialog.h
index d1e148d9a..6fad6b54e 100644
--- a/tdeui/kinputdialog.h
+++ b/tdeui/kinputdialog.h
@@ -47,7 +47,7 @@ class KInputDialogPrivate;
  */
 class TDEUI_EXPORT KInputDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   private:
 
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 513ae2d8a..a17afc59c 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -115,8 +115,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
       mTreeList->header()->hide();
       mTreeList->setRootIsDecorated(true);
       mTreeList->setSorting( -1 );
-      connect( mTreeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()) );
-      connect( mTreeList, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemClicked(TQListViewItem *)));
+      connect( mTreeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()) );
+      connect( mTreeList, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemClicked(TQListViewItem *)));
 
       //
       // Page area. Title at top with a separator below and a pagestack using
@@ -143,8 +143,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
       mIconList->setFont( listFont );
 
       mIconList->verticalScrollBar()->installEventFilter( this );
-      connect( mIconList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()));
-      connect( mIconList, TQT_SIGNAL(onItem(TQListBoxItem *)), TQT_SLOT(slotOnItem(TQListBoxItem *)));
+      connect( mIconList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()));
+      connect( mIconList, TQ_SIGNAL(onItem(TQListBoxItem *)), TQ_SLOT(slotOnItem(TQListBoxItem *)));
 
       hbox->addSpacing( KDialog::marginHint() );
       page = new TQFrame( this );
@@ -170,8 +170,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
     vbox->addWidget( mTitleSep );
 
     mPageStack = new TQWidgetStack( page );
-    connect(mPageStack, TQT_SIGNAL(aboutToShow(TQWidget *)),
-            TQT_SIGNAL(aboutToShowPage(TQWidget *)));
+    connect(mPageStack, TQ_SIGNAL(aboutToShow(TQWidget *)),
+            TQ_SIGNAL(aboutToShowPage(TQWidget *)));
     vbox->addWidget( mPageStack, 10 );
   }
   else if( mFace == Tabbed )
@@ -180,8 +180,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
 
     mTabControl = new TQTabWidget( this );
     mTabControl->setMargin (KDialog::marginHint());
-    connect(mTabControl, TQT_SIGNAL(currentChanged(TQWidget *)),
-            TQT_SIGNAL(aboutToShowPage(TQWidget *)));
+    connect(mTabControl, TQ_SIGNAL(currentChanged(TQWidget *)),
+            TQ_SIGNAL(aboutToShowPage(TQWidget *)));
     topLayout->addWidget( mTabControl, 10 );
   }
   else if( mFace == Swallow )
@@ -197,7 +197,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face )
   }
 
   if ( kapp )
-    connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged()));
+    connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged()));
   mValid = true;
 
   setSwallowedWidget(0); // Set default size if 'mFace' is Swallow.
@@ -254,7 +254,7 @@ TQFrame *KJanusWidget::addPage( const TQStringList &items, const TQString &heade
 
 void KJanusWidget::pageGone( TQObject *obj )
 {
-  removePage( TQT_TQWIDGET( obj ) );
+  removePage( static_cast<TQWidget*>( obj ) );
 }
 
 void KJanusWidget::slotReopen( TQListViewItem * item )
@@ -430,19 +430,19 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap
 void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items,
 				  const TQString &header,const TQPixmap &pixmap )
 {
-  connect(page, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(pageGone(TQObject*)));
+  connect(page, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(pageGone(TQObject*)));
 
   if( mFace == Tabbed )
   {
     mTabControl->addTab (page, items.last());
-    d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page);
-    d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex;
+    d->mIntToPage[d->mNextPageIndex] = page;
+    d->mPageToInt[page] = d->mNextPageIndex;
     d->mNextPageIndex++;
   }
   else if( mFace == TreeList || mFace == IconList )
   {
-    d->mIntToPage[d->mNextPageIndex] = static_cast<TQWidget*>(page);
-    d->mPageToInt[static_cast<TQWidget*>(page)] = d->mNextPageIndex;
+    d->mIntToPage[d->mNextPageIndex] = page;
+    d->mPageToInt[page] = d->mNextPageIndex;
     mPageStack->addWidget( page, 0 );
 
     if (items.isEmpty()) {
@@ -536,7 +536,7 @@ bool KJanusWidget::setSwallowedWidget( TQWidget *widget )
   }
   else
   {
-    if( TQT_BASE_OBJECT(widget->parent()) != TQT_BASE_OBJECT(mSwallowPage) )
+    if( widget->parent() != mSwallowPage )
     {
       widget->reparent( mSwallowPage, 0, TQPoint(0,0) );
     }
@@ -684,7 +684,7 @@ int KJanusWidget::pageIndex( TQWidget *widget ) const
     // and addGridPage() but not with addPage() which returns a child of
     // the toplevel page. addPage() returns a TQFrame so I check for that.
     //
-    if( widget->isA(TQFRAME_OBJECT_NAME_STRING) )
+    if( widget->isA("TQFrame") )
     {
       return d->mPageToInt[widget->parentWidget()];
     }
@@ -726,7 +726,7 @@ void KJanusWidget::slotItemClicked(TQListViewItem *it)
     it->setOpen(!it->isOpen());
 }
 
-// hack because qt does not support Q_OBJECT in nested classes
+// hack because qt does not support TQ_OBJECT in nested classes
 void KJanusWidget::slotOnItem(TQListBoxItem *qitem)
 {
   mIconList->slotOnItem( qitem );
@@ -856,9 +856,9 @@ void KJanusWidget::unfoldTreeList( bool persist )
   if( mFace == TreeList )
   {
     if( persist )
-      connect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) );
+      connect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) );
     else
-      disconnect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) );
+      disconnect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) );
 
     for( TQListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() )
       item->setOpen( true );
@@ -878,7 +878,7 @@ void KJanusWidget::addButtonBelowList( const TQString & text, TQObject * recv, c
   if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame )
   {
     TQPushButton * button = new TQPushButton( text, d->mListFrame, "KJanusWidget::buttonBelowList" );
-    connect( button, TQT_SIGNAL( clicked() ), recv, slot );
+    connect( button, TQ_SIGNAL( clicked() ), recv, slot );
   }
 }
 
@@ -887,7 +887,7 @@ void KJanusWidget::addButtonBelowList( const KGuiItem & item, TQObject * recv, c
   if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame )
   {
     KPushButton * button = new KPushButton( item, d->mListFrame, "KJanusWidget::buttonBelowList" );
-    connect( button, TQT_SIGNAL( clicked() ), recv, slot );
+    connect( button, TQ_SIGNAL( clicked() ), recv, slot );
   }
 }
 
@@ -1017,7 +1017,7 @@ void KJanusWidget::IconListBox::leaveEvent( TQEvent *ev )
   }
 } 
 
-// hack because qt does not support Q_OBJECT in nested classes
+// hack because qt does not support TQ_OBJECT in nested classes
 void KJanusWidget::IconListBox::slotOnItem(TQListBoxItem *qitem)
 {
   TDEListBox::slotOnItem( qitem );
@@ -1110,14 +1110,14 @@ const TQPixmap &KJanusWidget::IconListItem::defaultPixmap()
     pix = new TQPixmap( 32, 32 );
     TQPainter p( pix );
     p.eraseRect( 0, 0, pix->width(), pix->height() );
-    p.setPen( Qt::red );
+    p.setPen( TQt::red );
     p.drawRect ( 0, 0, pix->width(), pix->height() );
     p.end();
 
     TQBitmap mask( pix->width(), pix->height(), true );
-    mask.fill( Qt::black );
+    mask.fill( TQt::black );
     p.begin( &mask );
-    p.setPen( Qt::white );
+    p.setPen( TQt::white );
     p.drawRect ( 0, 0, pix->width(), pix->height() );
     p.end();
 
@@ -1149,14 +1149,14 @@ void KJanusWidget::IconListItem::paint( TQPainter *painter )
 void KJanusWidget::IconListItem::paintContents( TQPainter *painter )
 {
   TQFontMetrics fm = painter->fontMetrics();
-  int ht = fm.boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height();
+  int ht = fm.boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height();
   int wp = mPixmap.width();
   int hp = mPixmap.height();
   painter->drawPixmap( (mMinimumWidth - wp) / 2, 5, mPixmap );
 
   if( !text().isEmpty() )
   {
-    painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, Qt::AlignCenter, text() );
+    painter->drawText( 1, hp + 7, mMinimumWidth - 2, ht, TQt::AlignCenter, text() );
   }
 }
 
@@ -1168,7 +1168,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const
   }
   else
   {
-    int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).height();
+    int ht = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).height();
     return (mPixmap.height() + ht + 10);
   }
 }
@@ -1176,7 +1176,7 @@ int KJanusWidget::IconListItem::height( const TQListBox *lb ) const
 
 int KJanusWidget::IconListItem::width( const TQListBox *lb ) const
 {
-  int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, Qt::AlignCenter, text() ).width() + 10;
+  int wt = lb->fontMetrics().boundingRect( 0, 0, 0, 0, TQt::AlignCenter, text() ).width() + 10;
   int wp = mPixmap.width() + 10;
   int w  = TQMAX( wt, wp );
   return TQMAX( w, mMinimumWidth );
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index 604765029..1bc8ed332 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -66,7 +66,7 @@ class KGuiItem;
  */
 class TDEUI_EXPORT KJanusWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   private:
     class IconListBox : public TDEListBox
diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp
index 9b530b751..201ade557 100644
--- a/tdeui/kkeybutton.cpp
+++ b/tdeui/kkeybutton.cpp
@@ -30,7 +30,7 @@
 #include <tdelocale.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define XK_XKB_KEYS
 #define XK_MISCELLANY
 #include <X11/Xlib.h>	// For x11Event() 
@@ -46,7 +46,7 @@ const int XKeyRelease = KeyRelease;
 #undef FocusOut
 #undef FocusIn
 #endif // KeyPress
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 //static const char* psTemp[] = { 
 //  I18N_NOOP("Primary"), I18N_NOOP("Alternate"), I18N_NOOP("Multi-Key") 
@@ -69,9 +69,9 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name)
 :	TQPushButton( parent, name )
 {
 	d = new KKeyButtonPrivate;
-	setFocusPolicy( TQ_StrongFocus );
+	setFocusPolicy( TQWidget::StrongFocus );
 	m_bEditing = false;
-	connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) );
+	connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureShortcut()) );
 	setShortcut( TDEShortcut(), true );
 }
 
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 889319884..03b551679 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -39,7 +39,7 @@
  */
 class TDEUI_EXPORT KKeyButton: public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 
  public:
 	/**
diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp
index 35fe0e45f..052710d89 100644
--- a/tdeui/kkeydialog.cpp
+++ b/tdeui/kkeydialog.cpp
@@ -54,7 +54,7 @@
 #include <tdeaboutdata.h>
 #include <kstaticdeleter.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #define XK_XKB_KEYS
 #define XK_MISCELLANY
 #include <X11/Xlib.h>	// For x11Event()
@@ -326,7 +326,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(this);
   searchLayout->addWidget(listViewSearch);
   slbl->setBuddy(listViewSearch);
-  connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
+  connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear()));
 
   TQString wtstr = i18n("Search interactively for shortcut names (e.g. Copy) "
                        "or combination of keys (e.g. Ctrl+C) by typing them here.");
@@ -340,7 +340,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   // fill up the split list box with the action/key pairs.
   //
   TQGridLayout *stackLayout = new TQGridLayout(2, 2, 2);
-  topLayout->addLayout( TQT_TQLAYOUT(stackLayout), 10 );
+  topLayout->addLayout( stackLayout, 10 );
   stackLayout->setRowStretch( 1, 10 ); // Only list will stretch
 
   d->pList = new TDEListView( this );
@@ -364,13 +364,13 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   d->pList->addColumn(i18n("Shortcut"));
   d->pList->addColumn(i18n("Alternate"));
 
-  connect( d->pList, TQT_SIGNAL(currentChanged(TQListViewItem*)),
-           TQT_SLOT(slotListItemSelected(TQListViewItem*)) );
+  connect( d->pList, TQ_SIGNAL(currentChanged(TQListViewItem*)),
+           TQ_SLOT(slotListItemSelected(TQListViewItem*)) );
 
   // handle double clicking an item
-  connect ( d->pList, TQT_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-                       TQT_SLOT ( captureCurrentItem()) );
-  connect ( d->pList, TQT_SIGNAL ( spacePressed( TQListViewItem* )), TQT_SLOT( captureCurrentItem()));
+  connect ( d->pList, TQ_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+                       TQ_SLOT ( captureCurrentItem()) );
+  connect ( d->pList, TQ_SIGNAL ( spacePressed( TQListViewItem* )), TQ_SLOT( captureCurrentItem()));
   //
   // CREATE CHOOSE KEY GROUP
   //
@@ -396,7 +396,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   //grid->addMultiCellWidget( rb, 1, 1, 1, 2 );
   grid->addWidget( m_prbNone, 1, 0 );
   TQWhatsThis::add( m_prbNone, i18n("The selected action will not be associated with any key.") );
-  connect( m_prbNone, TQT_SIGNAL(clicked()), TQT_SLOT(slotNoKey()) );
+  connect( m_prbNone, TQ_SIGNAL(clicked()), TQ_SLOT(slotNoKey()) );
 
   m_prbDef = new TQRadioButton( i18n("default key", "De&fault"), d->fCArea );
   d->kbGroup->insert( m_prbDef, DefaultKey );
@@ -404,7 +404,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   //grid->addMultiCellWidget( rb, 2, 2, 1, 2 );
   grid->addWidget( m_prbDef, 1, 1 );
   TQWhatsThis::add( m_prbDef, i18n("This will bind the default key to the selected action. Usually a reasonable choice.") );
-  connect( m_prbDef, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultKey()) );
+  connect( m_prbDef, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultKey()) );
 
   m_prbCustom = new TQRadioButton( i18n("C&ustom"), d->fCArea );
   d->kbGroup->insert( m_prbCustom, CustomKey );
@@ -413,16 +413,16 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   grid->addWidget( m_prbCustom, 1, 2 );
   TQWhatsThis::add( m_prbCustom, i18n("If this option is selected you can create a customized key binding for the"
     " selected action using the buttons below.") );
-  connect( m_prbCustom, TQT_SIGNAL(clicked()), TQT_SLOT(slotCustomKey()) );
+  connect( m_prbCustom, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomKey()) );
 
-  //connect( d->kbGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( keyMode( int ) ) );
+  //connect( d->kbGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( keyMode( int ) ) );
 
   TQBoxLayout *pushLayout = new TQHBoxLayout( KDialog::spacingHint() );
   grid->addLayout( pushLayout, 1, 3 );
 
   d->pbtnShortcut = new KKeyButton(d->fCArea, "key");
   d->pbtnShortcut->setEnabled( false );
-  connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&)) );
+  connect( d->pbtnShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(capturedShortcut(const TDEShortcut&)) );
   grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 );
 
   wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, "
@@ -451,7 +451,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
   //d->stdDict->setAutoDelete( true );
   //if (type == Application || type == ApplicationGlobal)
   //  readStdKeys();
-  connect( kapp, TQT_SIGNAL( settingsChanged( int )), TQT_SLOT( slotSettingsChanged( int )));
+  connect( kapp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int )));
   if( allChoosers == NULL )
         allChoosers = allChoosersDeleter.setObject( allChoosers, new TQValueList< KKeyChooser* > );
   allChoosers->append( this );
@@ -1092,7 +1092,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts
 {
 	m_pKeyChooser = new KKeyChooser( this, type, bAllowLetterShortcuts );
 	setMainWidget( m_pKeyChooser );
-	connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) );
+	connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) );
 
 	TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" );
 	TQSize sz = size();
@@ -1104,7 +1104,7 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char
 {
 	m_pKeyChooser = new KKeyChooser( this, KKeyChooser::Application, bAllowLetterShortcuts );
 	setMainWidget( m_pKeyChooser );
-	connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) );
+	connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) );
 
 	TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" );
 	TQSize sz = size();
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index af395682e..bbfa07f59 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -57,7 +57,7 @@ class KKeyChooserItem;
  */
 class TDEUI_EXPORT KKeyChooser : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	enum ActionType { Application, ApplicationGlobal, Standard, Global };
 
@@ -273,7 +273,7 @@ typedef KKeyChooser KKeyChooser;
  */
 class TDEUI_EXPORT KKeyDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	/**
diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp
index abbc4f5d3..ff6695dec 100644
--- a/tdeui/klanguagebutton.cpp
+++ b/tdeui/klanguagebutton.cpp
@@ -172,10 +172,10 @@ void KLanguageButton::insertSubmenu( const TQIconSet & icon,
   checkInsertPos( pi, text, index );
   pi->insertItem( icon, text, p, count(), index );
   m_ids->append( id );
-  connect( p, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( slotActivated( int ) ) );
-  connect( p, TQT_SIGNAL( highlighted( int ) ), this,
-           TQT_SLOT( slotHighlighted( int ) ) );
+  connect( p, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( slotActivated( int ) ) );
+  connect( p, TQ_SIGNAL( highlighted( int ) ), this,
+           TQ_SLOT( slotHighlighted( int ) ) );
 }
 
 void KLanguageButton::insertSubmenu( const TQString &text, const TQString &id,
@@ -218,10 +218,10 @@ void KLanguageButton::clear()
 
   d->button->setPopup( m_popup );
 
-  connect( m_popup, TQT_SIGNAL( activated( int ) ),
-           TQT_SLOT( slotActivated( int ) ) );
-  connect( m_popup, TQT_SIGNAL( highlighted( int ) ),
-           TQT_SLOT( slotHighlighted( int ) ) );
+  connect( m_popup, TQ_SIGNAL( activated( int ) ),
+           TQ_SLOT( slotActivated( int ) ) );
+  connect( m_popup, TQ_SIGNAL( highlighted( int ) ),
+           TQ_SLOT( slotHighlighted( int ) ) );
 
   if ( !d->staticText )
   {
diff --git a/tdeui/klanguagebutton.h b/tdeui/klanguagebutton.h
index e13ad9566..c6bb122c5 100644
--- a/tdeui/klanguagebutton.h
+++ b/tdeui/klanguagebutton.h
@@ -46,7 +46,7 @@ class TQPopupMenu;
  */
 class TDEUI_EXPORT KLanguageButton : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kled.cpp b/tdeui/kled.cpp
index 6b29ac0ca..4f12ec12e 100644
--- a/tdeui/kled.cpp
+++ b/tdeui/kled.cpp
@@ -225,7 +225,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp
 
     // Set the brush to SolidPattern, this fills the entire area
     // of the ellipse which is drawn with a thin gray "border" (pen)
-    brush.setStyle( Qt::SolidPattern );
+    brush.setStyle( TQt::SolidPattern );
     brush.setColor( color );
 
     pen.setWidth( scale );
@@ -280,7 +280,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
 
     // Set the brush to SolidPattern, this fills the entire area
     // of the ellipse which is drawn first
-    brush.setStyle( Qt::SolidPattern );
+    brush.setStyle( TQt::SolidPattern );
     brush.setColor( color );
     paint.setBrush( brush );		// Assign the brush to the painter
 
@@ -328,7 +328,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp
     color = colorGroup().dark();
     pen.setColor( color );			// Set the pen accordingly
     paint.setPen( pen );			// Select pen for drawing
-    brush.setStyle( Qt::NoBrush );		// Switch off the brush
+    brush.setStyle( TQt::NoBrush );		// Switch off the brush
     paint.setBrush( brush );			// This avoids filling of the ellipse
 
     paint.drawEllipse( 2, 2, width, width );
@@ -376,7 +376,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
 
     // Set the brush to SolidPattern, this fills the entire area
     // of the ellipse which is drawn first
-    brush.setStyle( Qt::SolidPattern );
+    brush.setStyle( TQt::SolidPattern );
     brush.setColor( color );
     paint.setBrush( brush );                // Assign the brush to the painter
 
@@ -421,7 +421,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp
     // from the upper left.
 
     pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs?
-    brush.setStyle( (Qt::BrushStyle)NoBrush );              // Switch off the brush
+    brush.setStyle( (TQt::BrushStyle)NoBrush );              // Switch off the brush
     paint.setBrush( brush );                        // This avoids filling of the ellipse
 
     // Set the initial color value to colorGroup().light() (bright) and start
@@ -494,8 +494,8 @@ KLed::paintRectFrame(bool raised)
   TQBrush darkBrush(d->offcolor);
   int w=width();
   int h=height();
-  TQColor black=Qt::black;
-  TQColor white=Qt::white;
+  TQColor black=TQt::black;
+  TQColor white=TQt::white;
   // -----
   if(raised)
     {
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 7307be06a..5bca61467 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -44,7 +44,7 @@ class TQColor;
  */
 class TDEUI_EXPORT KLed : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_ENUMS( State Shape Look )
     TQ_PROPERTY( State state READ state WRITE setState )
     TQ_PROPERTY( Shape shape READ shape WRITE setShape )
@@ -236,7 +236,7 @@ public:
    * in OFF state.
    * Defaults to 300.
    *
-   * @see QColor
+   * @see TQColor
    *
    * @param darkfactor sets the factor to darken the LED.
    * @short sets the factor to darken the LED.
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 92afc91fd..c1fc7d8f0 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -136,13 +136,13 @@ void KLineEdit::init()
     d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan ||
                       mode == TDEGlobalSettings::CompletionPopupAuto ||
                       mode == TDEGlobalSettings::CompletionAuto);
-    connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors()));
+    connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotRestoreSelectionColors()));
 
     TQPalette p = palette();
     if ( !d->previousHighlightedTextColor.isValid() )
-      d->previousHighlightedTextColor=p.color(TQPalette::Normal,TQColorGroup::HighlightedText);
+      d->previousHighlightedTextColor=p.color(TQPalette::Active,TQColorGroup::HighlightedText);
     if ( !d->previousHighlightColor.isValid() )
-      d->previousHighlightColor=p.color(TQPalette::Normal,TQColorGroup::Highlight);
+      d->previousHighlightColor=p.color(TQPalette::Active,TQColorGroup::Highlight);
 
     d->drawClickMsg = false;
 }
@@ -420,10 +420,10 @@ bool KLineEdit::copySqueezedText(bool clipboard) const
          return false;
       TQString t = d->squeezedText;
       t = t.mid(start, end - start);
-      disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0);
+      disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0);
       TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
-      connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this,
-               TQT_SLOT(clipboardChanged()) );
+      connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this,
+               TQ_SLOT(clipboardChanged()) );
       return true;
    }
    return false;
@@ -526,7 +526,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
     {
         KeyBindingMap keys = getKeyBindings();
         TDEGlobalSettings::Completion mode = completionMode();
-        bool noModifier = (e->state() == Qt::NoButton ||
+        bool noModifier = (e->state() == TQt::NoButton ||
                            e->state() == TQt::ShiftButton ||
                            e->state() == TQt::Keypad);
 
@@ -536,7 +536,7 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
         {
             if ( !d->userSelection && hasSelectedText() &&
                  ( e->key() == Key_Right || e->key() == Key_Left ) &&
-                 e->state()== Qt::NoButton )
+                 e->state()== TQt::NoButton )
             {
                 TQString old_txt = text();
                 d->disableRestoreSelection = true;
@@ -817,18 +817,18 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
 
 void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e )
 {
-    if ( e->button() == Qt::LeftButton  )
+    if ( e->button() == TQt::LeftButton  )
     {
         possibleTripleClick=true;
         TQTimer::singleShot( TQApplication::doubleClickInterval(),this,
-                            TQT_SLOT(tripleClickTimeout()) );
+                            TQ_SLOT(tripleClickTimeout()) );
     }
     TQLineEdit::mouseDoubleClickEvent( e );
 }
 
 void KLineEdit::mousePressEvent( TQMouseEvent* e )
 {
-    if ( possibleTripleClick && e->button() == Qt::LeftButton )
+    if ( possibleTripleClick && e->button() == TQt::LeftButton )
     {
         selectAll();
         e->accept();
@@ -841,7 +841,7 @@ void KLineEdit::mouseReleaseEvent( TQMouseEvent* e )
 {
     TQLineEdit::mouseReleaseEvent( e );
     if (TQApplication::clipboard()->supportsSelection() ) {
-        if ( e->button() == Qt::LeftButton ) {
+        if ( e->button() == TQt::LeftButton ) {
             // Fix copying of squeezed text if needed
             copySqueezedText( false );
         }
@@ -879,8 +879,8 @@ TQPopupMenu *KLineEdit::createPopupMenu()
     if ( compObj() && !isReadOnly() && kapp->authorize("lineedit_text_completion") )
     {
         TQPopupMenu *subMenu = new TQPopupMenu( popup );
-        connect( subMenu, TQT_SIGNAL( activated( int ) ),
-                 this, TQT_SLOT( completionMenuActivated( int ) ) );
+        connect( subMenu, TQ_SIGNAL( activated( int ) ),
+                 this, TQ_SLOT( completionMenuActivated( int ) ) );
 
         popup->insertSeparator();
         popup->insertItem( SmallIconSet("completion"), i18n("Text Completion"),
@@ -1006,12 +1006,12 @@ void KLineEdit::dropEvent(TQDropEvent *e)
 
 bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev )
 {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) )
+    if( o == this )
     {
-        KCursor::autoHideEventFilter( TQT_TQOBJECT(this), ev );
+        KCursor::autoHideEventFilter( this, ev );
         if ( ev->type() == TQEvent::AccelOverride )
         {
-            TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+            TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
             if (overrideAccel (e))
             {
                 e->accept();
@@ -1020,14 +1020,14 @@ bool KLineEdit::eventFilter( TQObject* o, TQEvent* ev )
         }
         else if( ev->type() == TQEvent::KeyPress )
         {
-            TQKeyEvent *e = TQT_TQKEYEVENT( ev );
+            TQKeyEvent *e = static_cast<TQKeyEvent*>( ev );
 
-            if( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter )
+            if( e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter )
             {
                 bool trap = d->completionBox && d->completionBox->isVisible();
 
                 bool stopEvent = trap || (d->grabReturnKeyEvents &&
-                                          (e->state() == Qt::NoButton ||
+                                          (e->state() == TQt::NoButton ||
                                            e->state() == TQt::Keypad));
 
                 // Qt will emit returnPressed() itself if we return false
@@ -1088,14 +1088,12 @@ void KLineEdit::setCompletionBox( TDECompletionBox *box )
     d->completionBox = box;
     if ( handleSignals() )
     {
-        connect( d->completionBox, TQT_SIGNAL(highlighted( const TQString& )),
-                 TQT_SLOT(setTextWorkaround( const TQString& )) );
-        connect( d->completionBox, TQT_SIGNAL(userCancelled( const TQString& )),
-                 TQT_SLOT(userCancelled( const TQString& )) );
-
-        // TODO: we need our own slot, and to call setModified(true) if Qt4 has that.
-        connect( d->completionBox, TQT_SIGNAL( activated( const TQString& )),
-                 TQT_SIGNAL(completionBoxActivated( const TQString& )) );
+        connect( d->completionBox, TQ_SIGNAL(highlighted( const TQString& )),
+                 TQ_SLOT(setTextWorkaround( const TQString& )) );
+        connect( d->completionBox, TQ_SIGNAL(userCancelled( const TQString& )),
+                 TQ_SLOT(userCancelled( const TQString& )) );
+        connect( d->completionBox, TQ_SIGNAL( activated( const TQString& )),
+                 TQ_SIGNAL(completionBoxActivated( const TQString& )) );
     }
 }
 
@@ -1182,7 +1180,7 @@ bool KLineEdit::overrideAccel (const TQKeyEvent* e)
         int key = e->key();
         ButtonState state = e->state();
         if ((key == Key_Backtab || key == Key_Tab) &&
-            (state == Qt::NoButton || (state & TQt::ShiftButton)))
+            (state == TQt::NoButton || (state & TQt::ShiftButton)))
         {
             return true;
         }
@@ -1273,12 +1271,12 @@ void KLineEdit::setCompletionObject( TDECompletion* comp, bool hsig )
 {
     TDECompletion *oldComp = compObj();
     if ( oldComp && handleSignals() )
-        disconnect( oldComp, TQT_SIGNAL( matches( const TQStringList& )),
-                    this, TQT_SLOT( setCompletedItems( const TQStringList& )));
+        disconnect( oldComp, TQ_SIGNAL( matches( const TQStringList& )),
+                    this, TQ_SLOT( setCompletedItems( const TQStringList& )));
 
     if ( comp && hsig )
-      connect( comp, TQT_SIGNAL( matches( const TQStringList& )),
-               this, TQT_SLOT( setCompletedItems( const TQStringList& )));
+      connect( comp, TQ_SIGNAL( matches( const TQStringList& )),
+               this, TQ_SLOT( setCompletedItems( const TQStringList& )));
 
     TDECompletionBase::setCompletionObject( comp, hsig );
 }
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index 82179fa05..6c56d6a3a 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -99,7 +99,7 @@ class KURL;
  * KLineEdit *edit = new KLineEdit( this, "mywidget" );
  * TDECompletion *comp = edit->completionObject();
  * // Connect to the return pressed signal - optional
- * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
+ * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&)));
  * \endcode
  *
  * To use a customized completion objects or your
@@ -110,7 +110,7 @@ class KURL;
  * KURLCompletion *comp = new KURLCompletion();
  * edit->setCompletionObject( comp );
  * // Connect to the return pressed signal - optional
- * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
+ * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&)));
  * \endcode
  *
  * Note if you specify your own completion object you have to either delete
@@ -127,7 +127,7 @@ class KURL;
  * edit->setHandleSignals( false );
  *
  * // Set your own key-bindings for a text completion mode.
- * edit->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End );
+ * edit->setKeyBinding( TDECompletionBase::TextCompletion, TQt::End );
  *
  * // Hide the context (popup) menu
  * edit->setContextMenuEnabled( false );
@@ -146,7 +146,7 @@ class TDEUI_EXPORT KLineEdit : public TQLineEdit, public TDECompletionBase
 {
     friend class KComboBox;
 
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
     TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
     TQ_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapReturnKey )
diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp
index 8fc0a9a4f..9bdd429ce 100644
--- a/tdeui/klineeditdlg.cpp
+++ b/tdeui/klineeditdlg.cpp
@@ -46,12 +46,12 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
   edit = new KLineEdit( plainPage(), 0L );
   edit->setMinimumWidth(edit->sizeHint().width() * 3);
   label->setBuddy(edit);  // please "scheck" style
-  //  connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) );
-  connect( edit, TQT_SIGNAL(textChanged(const TQString&)),
-	   TQT_SLOT(slotTextChanged(const TQString&)) );
+  //  connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) );
+  connect( edit, TQ_SIGNAL(textChanged(const TQString&)),
+	   TQ_SLOT(slotTextChanged(const TQString&)) );
   topLayout->addWidget( edit, 1 );
 
-  connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) );
+  connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) );
   edit->setText( _value );
   if ( _value.isEmpty() )
   {
@@ -76,7 +76,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
 
   edit = new KLineEdit( this, 0L );
   edit->setMinimumWidth(edit->sizeHint().width() * 3);
-  connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) );
+  connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) );
 
   if ( _file_mode ) {
     completion = new KURLCompletion();
@@ -91,8 +91,8 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
   if (_file_mode) {
     TQPushButton *browse = new TQPushButton(i18n("&Browse..."), this);
     layout->addWidget(browse, 1, 2, AlignCenter);
-    connect(browse, TQT_SIGNAL(clicked()),
-	    TQT_SLOT(slotBrowse()));
+    connect(browse, TQ_SIGNAL(clicked()),
+	    TQ_SLOT(slotBrowse()));
   }
 
   TQFrame *hLine = new TQFrame(this);
@@ -104,17 +104,17 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
 
   TQPushButton *ok = bBox->addButton(KStdGuiItem::ok());
   ok->setDefault(true);
-  connect( ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()));
+  connect( ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()));
 
   bBox->addStretch(1);
 
   TQPushButton *clear = bBox->addButton(KStdGuiItem::clear());
-  connect( clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClear()));
+  connect( clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClear()));
 
   bBox->addStretch(1);
 
   TQPushButton *cancel = bBox->addButton(KStdGuiItem::cancel());
-  connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
+  connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()));
 
   bBox->layout();
 
diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h
index efa4b4a4a..e0b609dcd 100644
--- a/tdeui/klineeditdlg.h
+++ b/tdeui/klineeditdlg.h
@@ -39,7 +39,7 @@ class TQValidator;
 
 class TDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a dialog that asks for a single line of text. _value is
diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp
index 46f7f2b5c..0820fd29b 100644
--- a/tdeui/knuminput.cpp
+++ b/tdeui/knuminput.cpp
@@ -298,9 +298,9 @@ void KIntNumInput::init(int val, int _base)
     if (_base != 10)
         m_spin->setValidator(new KIntValidator(this, _base, "KNumInput::KIntValidtr"));
 
-    connect(m_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinValueChanged(int)));
-    connect(this, TQT_SIGNAL(valueChanged(int)),
-	    TQT_SLOT(slotEmitRelativeValueChanged(int)));
+    connect(m_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinValueChanged(int)));
+    connect(this, TQ_SIGNAL(valueChanged(int)),
+	    TQ_SLOT(slotEmitRelativeValueChanged(int)));
 
     setFocusProxy(m_spin);
     layout(true);
@@ -344,10 +344,10 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider)
 	    m_slider->setRange(lower, upper);
 	else {
 	    m_slider = new TQSlider(lower, upper, step, m_spin->value(),
-				   Qt::Horizontal, this);
+				   TQt::Horizontal, this);
 	    m_slider->setTickmarks(TQSlider::Below);
-	    connect(m_slider, TQT_SIGNAL(valueChanged(int)),
-		    m_spin, TQT_SLOT(setValue(int)));
+	    connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+		    m_spin, TQ_SLOT(setValue(int)));
 	}
 
 	// calculate (upper-lower)/10 without overflowing int's:
@@ -616,10 +616,10 @@ void KDoubleNumInput::init(double value, double lower, double upper,
     d->spin = new KDoubleSpinBox( lower, upper, step, value, precision,
 				  this, "KDoubleNumInput::d->spin" );
     setFocusProxy(d->spin);
-    connect( d->spin, TQT_SIGNAL(valueChanged(double)),
-	     this, TQT_SIGNAL(valueChanged(double)) );
-    connect( this, TQT_SIGNAL(valueChanged(double)),
-	     this, TQT_SLOT(slotEmitRelativeValueChanged(double)) );
+    connect( d->spin, TQ_SIGNAL(valueChanged(double)),
+	     this, TQ_SIGNAL(valueChanged(double)) );
+    connect( this, TQ_SIGNAL(valueChanged(double)),
+	     this, TQ_SLOT(slotEmitRelativeValueChanged(double)) );
 
     updateLegacyMembers();
 
@@ -754,8 +754,8 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
     if( m_slider ) {
 	// don't update the slider to avoid an endless recursion
 	TQSpinBox * spin = d->spin;
-	disconnect(spin, TQT_SIGNAL(valueChanged(int)),
-		m_slider, TQT_SLOT(setValue(int)) );
+	disconnect(spin, TQ_SIGNAL(valueChanged(int)),
+		m_slider, TQ_SLOT(setValue(int)) );
     }
     d->spin->setRange( lower, upper, step, d->spin->precision() );
 
@@ -771,14 +771,14 @@ void KDoubleNumInput::setRange(double lower, double upper, double step,
             m_slider->setValue(slvalue);
         } else {
             m_slider = new TQSlider(slmin, slmax, slstep, slvalue,
-                                   Qt::Horizontal, this);
+                                   TQt::Horizontal, this);
             m_slider->setTickmarks(TQSlider::Below);
 	    // feedback line: when one moves, the other moves, too:
-            connect(m_slider, TQT_SIGNAL(valueChanged(int)),
-                    TQT_SLOT(sliderMoved(int)) );
+            connect(m_slider, TQ_SIGNAL(valueChanged(int)),
+                    TQ_SLOT(sliderMoved(int)) );
         }
-	connect(spin, TQT_SIGNAL(valueChanged(int)),
-			m_slider, TQT_SLOT(setValue(int)) );
+	connect(spin, TQ_SIGNAL(valueChanged(int)),
+			m_slider, TQ_SLOT(setValue(int)) );
 	// calculate ( slmax - slmin ) / 10 without overflowing ints:
 	int major = calcDiffByTen( slmax, slmin );
 	if ( !major ) major = slstep; // ### needed?
@@ -901,7 +901,7 @@ class KDoubleSpinBoxValidator : public KDoubleValidator
 {
 public:
     KDoubleSpinBoxValidator( double bottom, double top, int decimals, KDoubleSpinBox* sb, const char *name )
-        : KDoubleValidator( bottom, top, decimals, TQT_TQOBJECT(sb), name ), spinBox( sb ) { }
+        : KDoubleValidator( bottom, top, decimals, sb, name ), spinBox( sb ) { }
 
     virtual State validate( TQString& str, int& pos ) const;
 
@@ -1011,10 +1011,10 @@ public:
 KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name )
   : TQSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  editor()->setAlignment( TQt::AlignRight );
   d = new Private();
   updateValidator();
-  connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) );
+  connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) );
 }
 
 KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
@@ -1022,11 +1022,11 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step,
 				TQWidget * parent, const char * name )
   : TQSpinBox( parent, name )
 {
-  editor()->setAlignment( Qt::AlignRight );
+  editor()->setAlignment( TQt::AlignRight );
   d = new Private();
   setRange( lower, upper, step, precision );
   setValue( value );
-  connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) );
+  connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) );
 }
 
 KDoubleSpinBox::~KDoubleSpinBox() {
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index 4716d8051..28ff17d68 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -48,7 +48,7 @@ class KIntSpinBox;
  */
 class TDEUI_EXPORT KNumInput : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( TQString label READ label WRITE setLabel )
 public:
@@ -187,7 +187,7 @@ private:
 
 class TDEUI_EXPORT KIntNumInput : public KNumInput
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int value READ value WRITE setValue )
     TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
@@ -213,7 +213,7 @@ public:
      *
      * @param value  initial value for the control
      * @param base   numeric base used for display
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
     KIntNumInput(int value, TQWidget* parent=0, int base = 10, const char *name=0);
@@ -232,7 +232,7 @@ public:
      * @param below  append KIntNumInput to the KNumInput chain
      * @param value  initial value for the control
      * @param base   numeric base used for display
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
     KIntNumInput(KNumInput* below, int value, TQWidget* parent=0, int base = 10, const char *name=0);
@@ -433,7 +433,7 @@ class KDoubleLine;
 
 class TDEUI_EXPORT KDoubleNumInput : public KNumInput
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( double value READ value WRITE setValue )
     TQ_PROPERTY( double minValue READ minValue WRITE setMinValue )
@@ -457,7 +457,7 @@ public:
      * Constructor
      *
      * @param value  initial value for the control
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      */
     KDoubleNumInput(double value, TQWidget *parent=0, const char *name=0) KDE_DEPRECATED;
@@ -470,7 +470,7 @@ public:
      * @param value  initial value for the control
      * @param step   step size to use for up/down arrow clicks
      * @param precision number of digits after the decimal point
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      * @since 3.1
      */
@@ -490,7 +490,7 @@ public:
      *
      * @param  below
      * @param  value  initial value for the control
-     * @param  parent parent QWidget
+     * @param  parent parent TQWidget
      * @param  name   internal name for this widget
      **/
     KDoubleNumInput(KNumInput* below, double value, TQWidget* parent=0, const char* name=0) KDE_DEPRECATED;
@@ -512,7 +512,7 @@ public:
      * @param value  initial value for the control
      * @param step   step size to use for up/down arrow clicks
      * @param precision number of digits after the decimal point
-     * @param parent parent QWidget
+     * @param parent parent TQWidget
      * @param name   internal name for this widget
      * @since 3.1
      */
@@ -706,7 +706,7 @@ private:
  */
 class TDEUI_EXPORT KIntSpinBox : public TQSpinBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int base READ base WRITE setBase )
 
@@ -836,7 +836,7 @@ private:
 **/
 
 class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
   TQ_OVERRIDE( double maxValue READ maxValue WRITE setMaxValue )
diff --git a/tdeui/knumvalidator.cpp b/tdeui/knumvalidator.cpp
index 6cf486ad1..62099dd32 100644
--- a/tdeui/knumvalidator.cpp
+++ b/tdeui/knumvalidator.cpp
@@ -35,7 +35,7 @@
 //
 
 KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name )
-  : TQValidator(TQT_TQOBJECT(parent), name)
+  : TQValidator(parent, name)
 {
   _base = base;
   if (_base < 2) _base = 2;
@@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name )
 }
 
 KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name )
-  : TQValidator(TQT_TQOBJECT(parent), name)
+  : TQValidator(parent, name)
 {
   _base = base;
   if (_base > 36) _base = 36;
@@ -162,7 +162,7 @@ public:
 
 
 KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name )
-  : TQValidator(TQT_TQOBJECT(parent), name)
+  : TQValidator(parent, name)
 {
     d = new KFloatValidatorPrivate;
     d->acceptLocalizedNumbers=false;
@@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name )
 }
 
 KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name )
-  : TQValidator(TQT_TQOBJECT(parent), name)
+  : TQValidator(parent, name)
 {
     d = new KFloatValidatorPrivate;
     d->acceptLocalizedNumbers=false;
@@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent,
 }
 
 KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name )
-  : TQValidator(TQT_TQOBJECT(parent), name)
+  : TQValidator(parent, name)
 {
     d = new KFloatValidatorPrivate;
     d->acceptLocalizedNumbers = localeAware;
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 5c7b31484..fd42a0fa6 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -179,7 +179,7 @@ class TDEUI_EXPORT KFloatValidator : public TQValidator {
 **/
 
 class TDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
 public:
   /** Constuct a locale-aware KDoubleValidator with default range
diff --git a/tdeui/kpanelapplet.cpp b/tdeui/kpanelapplet.cpp
index f88cb5a8a..22ca4428c 100644
--- a/tdeui/kpanelapplet.cpp
+++ b/tdeui/kpanelapplet.cpp
@@ -94,12 +94,12 @@ void KPanelApplet::positionChange( Position )
   popupDirectionChange( popupDirection() );
 }
 
-Qt::Orientation KPanelApplet::orientation() const
+TQt::Orientation KPanelApplet::orientation() const
 {
   if( _position == pTop || _position == pBottom ) {
-    return Qt::Horizontal;
+    return TQt::Horizontal;
   } else {
-    return Qt::Vertical;
+    return TQt::Vertical;
   }
 }
 
@@ -146,15 +146,15 @@ void KPanelApplet::watchForFocus(TQWidget* widget, bool watch)
 
     if (watch)
     {
-        if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) == -1)
+        if (d->watchedForFocus.find(widget) == -1)
         {
-            d->watchedForFocus.append(TQT_TQOBJECT(widget));
+            d->watchedForFocus.append(widget);
             widget->installEventFilter(this);
         }
     }
-    else if (d->watchedForFocus.find(TQT_TQOBJECT(widget)) != -1)
+    else if (d->watchedForFocus.find(widget) != -1)
     {
-        d->watchedForFocus.remove(TQT_TQOBJECT(widget));
+        d->watchedForFocus.remove(widget);
         widget->removeEventFilter(this);
     }
 }
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index a8729e331..df3bca44b 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -96,7 +96,7 @@ class TQPopupMenu;
  **/
 class TDEUI_EXPORT KPanelApplet : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeui/kpanelappmenu.h b/tdeui/kpanelappmenu.h
index 56131e290..39b6b8e4e 100644
--- a/tdeui/kpanelappmenu.h
+++ b/tdeui/kpanelappmenu.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class TDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a new menu with the given title.
diff --git a/tdeui/kpanelextension.cpp b/tdeui/kpanelextension.cpp
index 31fbd4343..d332ba2a1 100644
--- a/tdeui/kpanelextension.cpp
+++ b/tdeui/kpanelextension.cpp
@@ -98,12 +98,12 @@ void KPanelExtension::action( Action a )
     reportBug();
 }
 
-Qt::Orientation KPanelExtension::orientation()
+TQt::Orientation KPanelExtension::orientation()
 {
     if (_position == Left || _position == Right)
-	return Qt::Vertical;
+	return TQt::Vertical;
     else
-	return Qt::Horizontal;
+	return TQt::Horizontal;
 }
 
 KPanelExtension::Size KPanelExtension::sizeSetting() const
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index f97e85482..2c817ae39 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -96,7 +96,7 @@ class KPanelExtensionPrivate;
  **/
 class TDEUI_EXPORT KPanelExtension : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp
index 287208b66..f2a3d8f08 100644
--- a/tdeui/kpanelmenu.cpp
+++ b/tdeui/kpanelmenu.cpp
@@ -59,8 +59,8 @@ void KPanelMenu::init(const TQString& path)
     setInitialized( false );
     d->startPath = path;
 
-    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()));
 
     // setup cache timer
     TDEConfig *config = TDEGlobal::config();
@@ -99,8 +99,8 @@ void KPanelMenu::hideEvent(TQHideEvent *ev)
 {
     // start the cache timer
     if(d->clearDelay) {
-        disconnect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear()));
-        connect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear()));
+        disconnect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear()));
+        connect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear()));
         d->t.start(d->clearDelay, true);
     }
     TQPopupMenu::hideEvent(ev);
diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h
index 03b700b82..972fb2bc1 100644
--- a/tdeui/kpanelmenu.h
+++ b/tdeui/kpanelmenu.h
@@ -52,7 +52,7 @@ class KPanelMenuPrivate;
  */
 class TDEUI_EXPORT KPanelMenu : public TDEPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp
index 38f63484f..c34801777 100644
--- a/tdeui/kpassdlg.cpp
+++ b/tdeui/kpassdlg.cpp
@@ -230,12 +230,12 @@ void KPasswordDialog::init()
 	lbl->setPixmap(pix);
 	lbl->setAlignment(AlignHCenter|AlignVCenter);
 	lbl->setFixedSize(lbl->sizeHint());
-	m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter);
+	m_pGrid->addWidget(lbl, 0, 0, TQt::AlignCenter);
     }
 
     m_pHelpLbl = new TQLabel(m_pMain);
     m_pHelpLbl->setAlignment(AlignLeft|AlignVCenter|WordBreak);
-    m_pGrid->addWidget(m_pHelpLbl, 0, 2, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(m_pHelpLbl, 0, 2, TQt::AlignLeft);
     m_pGrid->addRowSpacing(1, 10);
     m_pGrid->setRowStretch(1, 12);
 
@@ -248,7 +248,7 @@ void KPasswordDialog::init()
     lbl->setAlignment(AlignLeft|AlignVCenter);
     lbl->setText(i18n("&Password:"));
     lbl->setFixedSize(lbl->sizeHint());
-    m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(lbl, 7, 0, TQt::AlignLeft);
 
     TQHBoxLayout *h_lay = new TQHBoxLayout();
     m_pGrid->addLayout(h_lay, 7, 2);
@@ -277,9 +277,9 @@ void KPasswordDialog::init()
 	    m_Keep = 0;
 	    m_keepWarnLbl->hide();
 	}
-	connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool)));
-	m_pGrid->addWidget(cb, 9, 2, (TQ_Alignment)(AlignLeft|AlignVCenter));
-//	m_pGrid->addWidget(m_keepWarnLbl, 13, 2, (TQ_Alignment)(AlignLeft|AlignVCenter));
+	connect(cb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeep(bool)));
+	m_pGrid->addWidget(cb, 9, 2, TQt::AlignLeft|TQt::AlignVCenter);
+//	m_pGrid->addWidget(m_keepWarnLbl, 13, 2, TQt::AlignLeft|TQt::AlignVCenter);
 	m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3);
     } else if (m_Type == NewPassword) {
 	m_pGrid->addRowSpacing(8, 10);
@@ -287,7 +287,7 @@ void KPasswordDialog::init()
 	lbl->setAlignment(AlignLeft|AlignVCenter);
 	lbl->setText(i18n("&Verify:"));
 	lbl->setFixedSize(lbl->sizeHint());
-	m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft);
+	m_pGrid->addWidget(lbl, 9, 0, TQt::AlignLeft);
 
 	h_lay = new TQHBoxLayout();
 	m_pGrid->addLayout(h_lay, 9, 2);
@@ -330,8 +330,8 @@ void KPasswordDialog::init()
         d->m_MatchLabel->setText(i18n("Passwords do not match"));
 
 
-        connect( m_pEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) );
-        connect( m_pEdit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) );
+        connect( m_pEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) );
+        connect( m_pEdit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) );
         enableOkBtn();
     }
 
@@ -381,12 +381,12 @@ void KPasswordDialog::addLine(TQString key, TQString value)
     TQLabel *lbl = new TQLabel(key, m_pMain);
     lbl->setAlignment(AlignLeft|AlignTop);
     lbl->setFixedSize(lbl->sizeHint());
-    m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(lbl, m_Row+2, 0, TQt::AlignLeft);
 
     lbl = new TQLabel(value, m_pMain);
     lbl->setAlignment(AlignTop|WordBreak);
     lbl->setFixedSize(275, lbl->heightForWidth(275));
-    m_pGrid->addWidget(lbl, m_Row+2, 2, (TQ_Alignment)AlignLeft);
+    m_pGrid->addWidget(lbl, m_Row+2, 2, TQt::AlignLeft);
     ++m_Row;
 }
 
@@ -446,7 +446,7 @@ void KPasswordDialog::slotKeep(bool keep)
         else {
             m_keepWarnLbl->hide();
         }
-        TQTimer::singleShot(0, this, SLOT(slotLayout()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotLayout()));
     }
 
     m_Keep = keep;
diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h
index 9272e63c3..039f1c506 100644
--- a/tdeui/kpassdlg.h
+++ b/tdeui/kpassdlg.h
@@ -38,7 +38,7 @@ class TQWidget;
 class TDEUI_EXPORT KPasswordEdit
     : public TQLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum EchoModes { OneStar, ThreeStars, NoEcho };
@@ -150,7 +150,7 @@ private:
 class TDEUI_EXPORT KPasswordDialog
     : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp
index ce6126314..eb626a767 100644
--- a/tdeui/kpassivepopup.cpp
+++ b/tdeui/kpassivepopup.cpp
@@ -25,7 +25,7 @@
 #include <tdeglobalsettings.h>
 
 #include "config.h"
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <netwm.h>
 #endif
 
@@ -96,8 +96,8 @@ void KPassivePopup::init( int popupStyle )
         setPalette(TQToolTip::palette());
         setAutoMask(TRUE);
     }
-    connect( hideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) );
-    connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( hide() ) );
+    connect( hideTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) );
+    connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( hide() ) );
 }
 
 KPassivePopup::~KPassivePopup()
@@ -143,7 +143,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
 	TQString sizedCaption = caption;
 	TQString sizedText = text;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	int max_width;
 
 	NETRootInfo info( tqt_xdisplay(),
@@ -172,13 +172,13 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
 	if ( !sizedCaption.isEmpty() ) {
 		ttl = new TQLabel( sizedCaption, hb ? hb : vb, "title_label" );
 		TQFont fnt = ttl->font();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		truncateStringToFit(sizedCaption, fnt, max_width);
 		ttl->setText(sizedCaption);
 #endif
 		fnt.setBold( true );
 		ttl->setFont( fnt );
-		ttl->setAlignment( Qt::AlignHCenter );
+		ttl->setAlignment( TQt::AlignHCenter );
 		if ( hb ) {
 			hb->setStretchFactor( ttl, 10 ); // enforce centering
 		}
@@ -186,7 +186,7 @@ TQVBox * KPassivePopup::standardView(const TQString& caption,
 
 	if ( !sizedText.isEmpty() ) {
 		msg = new TQLabel( sizedText, vb, "msg_label" );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 		TQStringList textLines = TQStringList::split("\n", sizedText, true);
 		for (TQStringList::Iterator it = textLines.begin(); it != textLines.end(); ++it) {
 			truncateStringToFit(*it, msg->font(), max_width);
@@ -295,7 +295,7 @@ void KPassivePopup::hideEvent( TQHideEvent * )
 
 TQRect KPassivePopup::defaultArea() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo info( tqt_xdisplay(),
                       NET::NumberOfDesktops |
                       NET::CurrentDesktop |
@@ -317,7 +317,7 @@ void KPassivePopup::positionSelf()
 {
     TQRect target;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if ( !window ) {
         target = defaultArea();
     }
@@ -442,7 +442,7 @@ void KPassivePopup::updateMask()
 
     TQBitmap mask( width(), height(), true );
     TQPainter p( &mask );
-    TQBrush brush( Qt::white, Qt::SolidPattern );
+    TQBrush brush( TQt::white, TQt::SolidPattern );
     p.setBrush( brush );
 
     int i = 0, z = 0;
diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h
index 89a05a671..bc1b9ed1c 100644
--- a/tdeui/kpassivepopup.h
+++ b/tdeui/kpassivepopup.h
@@ -65,7 +65,7 @@ class TQVBox;
  */
 class TDEUI_EXPORT KPassivePopup : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete )
     TQ_PROPERTY (int timeout READ timeout WRITE setTimeout )
 
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp
index 47f6c405f..74d3c64b1 100644
--- a/tdeui/kpixmapio.cpp
+++ b/tdeui/kpixmapio.cpp
@@ -28,7 +28,7 @@
 #include <sys/shm.h>
 #endif
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/X.h> 
 #include <X11/Xlib.h> 
 #include <X11/Xutil.h> 
@@ -51,7 +51,7 @@ struct KPixmapIOPrivate
     int threshold;
     int bpp;
     int byteorder;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     XImage *ximage;
 #ifdef HAVE_MITSHM
     XShmSegmentInfo *shminfo;
@@ -664,7 +664,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	{
 	    uchar *src;
 	    TQ_INT32 val, *dst;
-	    TQRgb pixel, *clut = img.tqcolorTable();
+	    TQRgb pixel, *clut = img.colorTable();
 	    for (y=0; y<height; y++)
 	    {
 		src = const_cast<TQImage&>(img).scanLine(y);
@@ -721,7 +721,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	{
 	    uchar *src;
 	    TQ_INT32 val, *dst;
-	    TQRgb pixel, *clut = img.tqcolorTable();
+	    TQRgb pixel, *clut = img.colorTable();
 	    for (y=0; y<height; y++)
 	    {
 		src = const_cast<TQImage&>(img).scanLine(y);
@@ -780,7 +780,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	{
 	    uchar *src, *dst;
 	    int w1 = width/4;
-	    TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4;
+	    TQRgb *clut = img.colorTable(), d1, d2, d3, d4;
 	    for (y=0; y<height; y++)
 	    {
 		src = const_cast<TQImage&>(img).scanLine(y);
@@ -841,7 +841,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	{
 	    uchar *src, *dst;
 	    int w1 = width/4;
-	    TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4;
+	    TQRgb *clut = img.colorTable(), d1, d2, d3, d4;
 	    for (y=0; y<height; y++)
 	    {
 		src = const_cast<TQImage&>(img).scanLine(y);
@@ -878,7 +878,7 @@ void KPixmapIO::convertToXImage(const TQImage &img)
 	} else
 	{
 	    uchar *src;
-	    TQRgb *dst, *clut = img.tqcolorTable();
+	    TQRgb *dst, *clut = img.colorTable();
 	    for (y=0; y<height; y++)
 	    {
 		src = const_cast<TQImage&>(img).scanLine(y);
diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp
index 7083dac72..43cfa311d 100644
--- a/tdeui/kpixmapregionselectorwidget.cpp
+++ b/tdeui/kpixmapregionselectorwidget.cpp
@@ -110,7 +110,7 @@ void KPixmapRegionSelectorWidget::updatePixmap()
      painter.begin(&m_linedPixmap);
      painter.setRasterOp( TQt::XorROP );
      painter.fillRect(0,0,m_linedPixmap.width(), m_linedPixmap.height(), 
-                  TQBrush( TQColor(255,255,255), Qt::BDiagPattern) );
+                  TQBrush( TQColor(255,255,255), TQt::BDiagPattern) );
      painter.end();
 
      TQImage image=m_linedPixmap.convertToImage();
@@ -141,13 +141,13 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
    popup->insertTitle(i18n("Image Operations"));
    
    TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right",
-                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateClockwise()),
-                                TQT_TQOBJECT(popup), "rotateclockwise");
+                                0, this, TQ_SLOT(rotateClockwise()),
+                                popup, "rotateclockwise");
    action->plug(popup);
 
    action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left",
-                                0, TQT_TQOBJECT(this), TQT_SLOT(rotateCounterclockwise()),
-                                TQT_TQOBJECT(popup), "rotatecounterclockwise");
+                                0, this, TQ_SLOT(rotateCounterclockwise()),
+                                popup, "rotatecounterclockwise");
    action->plug(popup);
  
 /*
@@ -213,7 +213,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
       TQMouseEvent *mev= (TQMouseEvent *)(ev);
       //kdDebug() << TQString("click at  %1,%2").arg( mev->x() ).arg( mev->y() ) << endl;
 
-      if ( mev->button() == Qt::RightButton )
+      if ( mev->button() == TQt::RightButton )
       {
          TDEPopupMenu *popup = createPopupMenu( );
          popup->exec( mev->globalPos() );
@@ -227,12 +227,12 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
           && m_selectedRegion!=m_originalPixmap.rect() )
       {
          m_state=Moving;
-         cursor.setShape( Qt::SizeAllCursor );
+         cursor.setShape( TQt::SizeAllCursor );
       }
       else
       {
          m_state=Resizing;
-         cursor.setShape( Qt::CrossCursor );
+         cursor.setShape( TQt::CrossCursor );
       }
       TQApplication::setOverrideCursor(cursor);
 
@@ -426,7 +426,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
    {
          /* We have to resize the pixmap to get it complete on the screen */
          TQImage image=m_originalPixmap.convertToImage();
-         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) );
+         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) );
          double oldZoomFactor = m_zoomFactor;
          m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width();
 
diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h
index 0277a0d10..7d6f37b99 100644
--- a/tdeui/kpixmapregionselectorwidget.h
+++ b/tdeui/kpixmapregionselectorwidget.h
@@ -43,7 +43,7 @@ class TDEPopupMenu;
  */
 class TDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    /**
     * Constructor for a KPixmapRegionSelectorWidget.
diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp
index 8fb050a11..701b1f7f7 100644
--- a/tdeui/kprogress.cpp
+++ b/tdeui/kprogress.cpp
@@ -179,7 +179,7 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name,
       mMinDuration(2000),
       d(new KProgressDialogPrivate)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
@@ -196,9 +196,9 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name,
     mProgressBar = new KProgress(mainWidget);
     layout->addWidget(mProgressBar);
 
-    connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)),
-            this, TQT_SLOT(slotAutoActions(int)));
-    connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow()));
+    connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)),
+            this, TQ_SLOT(slotAutoActions(int)));
+    connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow()));
     mShowTimer->start(mMinDuration, true);
 }
 
diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h
index 49dce88c0..ada1f4fc0 100644
--- a/tdeui/kprogress.h
+++ b/tdeui/kprogress.h
@@ -45,7 +45,7 @@
  */
 class TDEUI_EXPORT KProgress : public TQProgressBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -186,7 +186,7 @@ private:
  */
 class TDEUI_EXPORT KProgressDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp
index 2472207f4..02b60afe4 100644
--- a/tdeui/kprogressbox.cpp
+++ b/tdeui/kprogressbox.cpp
@@ -67,7 +67,7 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name,
       mMinDuration(2000),
       d(new KProgressBoxDialogPrivate)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
 #endif
     mShowTimer = new TQTimer(this);
@@ -86,9 +86,9 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name,
     mTextBox = new KTextEdit(mainWidget);
     layout->addWidget(mTextBox);
 
-    connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)),
-            this, TQT_SLOT(slotAutoActions(int)));
-    connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow()));
+    connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)),
+            this, TQ_SLOT(slotAutoActions(int)));
+    connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow()));
     mShowTimer->start(mMinDuration, true);
 }
 
diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h
index 448b37abe..5d9f3bd8b 100644
--- a/tdeui/kprogressbox.h
+++ b/tdeui/kprogressbox.h
@@ -53,7 +53,7 @@
  */
 class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp
index 6f994dbe3..3c73de83e 100644
--- a/tdeui/kpushbutton.cpp
+++ b/tdeui/kpushbutton.cpp
@@ -106,8 +106,8 @@ void KPushButton::init( const KGuiItem &item )
 
     if (kapp)
     {
-       connect( kapp, TQT_SIGNAL( settingsChanged(int) ),
-               TQT_SLOT( slotSettingsChanged(int) ) );
+       connect( kapp, TQ_SIGNAL( settingsChanged(int) ),
+               TQ_SLOT( slotSettingsChanged(int) ) );
        kapp->addKipcEventMask( KIPC::SettingsChanged );
     }
 }
@@ -193,7 +193,7 @@ void KPushButton::mouseMoveEvent( TQMouseEvent *e )
         return;
     }
 
-    if ( (e->state() & Qt::LeftButton) &&
+    if ( (e->state() & TQt::LeftButton) &&
          (e->pos() - startPos).manhattanLength() >
          TDEGlobalSettings::dndEventDelay() )
     {
diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h
index ee7bb3b52..44f174da9 100644
--- a/tdeui/kpushbutton.h
+++ b/tdeui/kpushbutton.h
@@ -36,7 +36,7 @@ class TQDragObject;
  */
 class TDEUI_EXPORT KPushButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY(int stdItem READ guiItm WRITE setGuiItm )
     TQ_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)
 
diff --git a/tdeui/krestrictedline.h b/tdeui/krestrictedline.h
index 142bd5444..26af032b8 100644
--- a/tdeui/krestrictedline.h
+++ b/tdeui/krestrictedline.h
@@ -43,7 +43,7 @@
  */
 class TDEUI_EXPORT KRestrictedLine : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString validChars READ validChars WRITE setValidChars )
 
 public:
@@ -85,7 +85,7 @@ protected:
 
 private:
   /// TQString of valid characters for this line
-  QString	qsValidChars;
+  TQString	qsValidChars;
 protected:
   virtual void virtual_hook( int id, void* data );
 private:
diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp
index 517821ea1..5a0923566 100644
--- a/tdeui/krootpixmap.cpp
+++ b/tdeui/krootpixmap.cpp
@@ -37,7 +37,7 @@ class KRootPixmapData
 {
 public:
     TQWidget *toplevel;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWinModule *twin;
 #endif
 };
@@ -67,14 +67,14 @@ void KRootPixmap::init()
     m_bActive = false;
     m_bCustomPaint = 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 );
-    connect(d->twin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int)));
-    connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int)));
+    connect(d->twin, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int)));
+    connect(d->twin, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(desktopChanged(int)));
 #endif
 
     d->toplevel = m_pWidget->topLevelWidget();
@@ -91,7 +91,7 @@ KRootPixmap::~KRootPixmap()
 
 int KRootPixmap::currentDesktop() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     NETRootInfo rinfo( tqt_xdisplay(), NET::CurrentDesktop );
     rinfo.activate();
     return rinfo.currentDesktop();
@@ -187,7 +187,7 @@ void KRootPixmap::desktopChanged(int desktop)
 	!wallpaperForDesktop(m_Desk).isNull())
 	return;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if (KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop() == NET::OnAllDesktops &&
 	pixmapName(m_Desk) != pixmapName(desktop))
 #endif
@@ -196,7 +196,7 @@ void KRootPixmap::desktopChanged(int desktop)
 
 void KRootPixmap::desktopChanged( WId window, unsigned int properties )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( !(properties & NET::WMDesktop) ||
 	(window != m_pWidget->topLevelWidget()->winId()))
 	return;
@@ -232,7 +232,7 @@ void KRootPixmap::repaint(bool force)
 	return;
     }
     m_Rect = TQRect(p1, p2);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     m_Desk = KWin::windowInfo(m_pWidget->topLevelWidget()->winId()).desktop();
     if ((m_Desk == NET::OnAllDesktops) || (m_Desk == 0)) {
 	m_Desk = currentDesktop();
@@ -254,7 +254,7 @@ void KRootPixmap::repaint(bool force)
 
 bool KRootPixmap::isAvailable() const
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     return m_pPixmap->isAvailable(pixmapName(m_Desk));
 #else
     return m_pPixmap->isNull();
@@ -263,7 +263,7 @@ bool KRootPixmap::isAvailable() const
 
 TQString KRootPixmap::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";
@@ -275,7 +275,7 @@ TQString KRootPixmap::pixmapName(int desk) {
 
 void KRootPixmap::enableExports()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     kdDebug(270) << k_lineinfo << "activating background exports.\n";
     DCOPClient *client = kapp->dcopClient();
     if (!client->isAttached())
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 5f279be6d..485580fbb 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -15,7 +15,7 @@
 #include <tqcolor.h>
 #include <tdelibs_export.h>
 
-#ifndef Q_WS_QWS //FIXME
+#ifndef TQ_WS_QWS //FIXME
 
 class TQRect;
 class TQWidget;
@@ -45,7 +45,7 @@ class KRootPixmapData;
  */
 class TDEUI_EXPORT KRootPixmap: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -235,6 +235,6 @@ private:
     void init();
 };
 
-#endif // ! Q_WS_QWS
+#endif // ! TQ_WS_QWS
 #endif // __KRootPixmap_h_Included__
 
diff --git a/tdeui/kruler.cpp b/tdeui/kruler.cpp
index fed264981..eac7d8c99 100644
--- a/tdeui/kruler.cpp
+++ b/tdeui/kruler.cpp
@@ -94,7 +94,7 @@ public:
 KRuler::KRuler(TQWidget *parent, const char *name)
   : TQFrame(parent, name),
     range(INIT_MIN_VALUE, INIT_MAX_VALUE, 1, 10, INIT_VALUE),
-    dir(Qt::Horizontal)
+    dir(TQt::Horizontal)
 {
   init();
   setFixedHeight(FIX_WIDTH);
@@ -108,7 +108,7 @@ KRuler::KRuler(Orientation orient,
     dir(orient)
 {
   init();
-  if (orient == Qt::Horizontal)
+  if (orient == TQt::Horizontal)
     setFixedHeight(FIX_WIDTH);
   else
     setFixedWidth(FIX_WIDTH);
@@ -123,7 +123,7 @@ KRuler::KRuler(Orientation orient, int widgetWidth,
 {
   init();
 
-  if (orient == Qt::Horizontal)
+  if (orient == TQt::Horizontal)
     setFixedHeight(widgetWidth);
   else
     setFixedWidth(widgetWidth);
@@ -362,7 +362,7 @@ KRuler::setEndLabel(const TQString& label)
   endlabel = label;
 
   // premeasure the fontwidth and save it
-  if (dir == Qt::Vertical) {
+  if (dir == TQt::Vertical) {
     TQFont font = this->font();
     font.setPointSize(LABEL_SIZE);
     TQFontMetrics fm(font);
@@ -551,7 +551,7 @@ KRuler::slotNewValue(int _value)
   }
   // get the rectangular of the old and the new ruler pointer
   // and repaint only him
-  if (dir == Qt::Horizontal) {
+  if (dir == TQt::Horizontal) {
     TQRect oldrec(-5+oldvalue,10, 11,6);
     TQRect newrec(-5+_value,10, 11,6);
     repaint( oldrec.unite(newrec) );
@@ -604,7 +604,7 @@ KRuler::drawContents(TQPainter *p)
   int value  = range.value(),
     minval = range.minValue(),
     maxval;
-    if (dir == Qt::Horizontal) {
+    if (dir == TQt::Horizontal) {
     maxval = range.maxValue()
     + offset_
     - (d->lengthFix?(height()-d->endOffset_length):d->endOffset_length);
@@ -636,7 +636,7 @@ KRuler::drawContents(TQPainter *p)
 
   // draw endlabel
   if (d->showEndL) {
-    if (dir == Qt::Horizontal) {
+    if (dir == TQt::Horizontal) {
       p->translate( fontOffset, 0 );
       p->drawText( END_LABEL_X, END_LABEL_Y, endlabel );
     }
@@ -659,7 +659,7 @@ KRuler::drawContents(TQPainter *p)
   if (showtm) {
     fend = ppm*tmDist;
     for ( f=offsetmin; f<offsetmax; f+=fend ) {
-      if (dir == Qt::Horizontal) {
+      if (dir == TQt::Horizontal) {
         p->drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2);
       }
       else {
@@ -671,7 +671,7 @@ KRuler::drawContents(TQPainter *p)
     // draw the little marks
     fend = ppm*lmDist;
     for ( f=offsetmin; f<offsetmax; f+=fend ) {
-      if (dir == Qt::Horizontal) {
+      if (dir == TQt::Horizontal) {
         p->drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2);
       }
       else {
@@ -683,7 +683,7 @@ KRuler::drawContents(TQPainter *p)
     // draw medium marks
     fend = ppm*mmDist;
     for ( f=offsetmin; f<offsetmax; f+=fend ) {
-      if (dir == Qt::Horizontal) {
+      if (dir == TQt::Horizontal) {
         p->drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2);
       }
       else {
@@ -695,7 +695,7 @@ KRuler::drawContents(TQPainter *p)
     // draw big marks
     fend = ppm*bmDist;
     for ( f=offsetmin; f<offsetmax; f+=fend ) {
-      if (dir == Qt::Horizontal) {
+      if (dir == TQt::Horizontal) {
         p->drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2);
       }
       else {
@@ -705,7 +705,7 @@ KRuler::drawContents(TQPainter *p)
   }
   if (showem) {
     // draw end marks
-    if (dir == Qt::Horizontal) {
+    if (dir == TQt::Horizontal) {
       p->drawLine(minval-offset_, END_MARK_X1, minval-offset_, END_MARK_X2);
       p->drawLine(maxval-offset_, END_MARK_X1, maxval-offset_, END_MARK_X2);
     }
@@ -718,7 +718,7 @@ KRuler::drawContents(TQPainter *p)
   // draw pointer
   if (d->showpointer) {
     TQPointArray pa(4);
-    if (dir == Qt::Horizontal) {
+    if (dir == TQt::Horizontal) {
       pa.setPoints(3, value-5, 10, value+5, 10, value/*+0*/,15);
     }
     else {
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index 2ad699b5e..c962fd947 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -69,7 +69,7 @@
  */
 class TDEUI_EXPORT KRuler : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
   TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
   TQ_PROPERTY( int value READ value WRITE setValue )
diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp
index cb211e4df..8256ad72a 100644
--- a/tdeui/ksconfig.cpp
+++ b/tdeui/ksconfig.cpp
@@ -101,18 +101,18 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name,
   TQGridLayout *glay = new TQGridLayout( this, 6, 3, 0, KDialog::spacingHint() );
   cb1 = new TQCheckBox( i18n("Create &root/affix combinations"
                             " not in dictionary"), this, "NoRootAffix" );
-  connect( cb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sNoAff(bool)) );
+  connect( cb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sNoAff(bool)) );
   glay->addMultiCellWidget( cb1, 0, 0, 0, 2 );
 
   cb2 = new TQCheckBox( i18n("Consider run-together &words"
 			    " as spelling errors"), this, "RunTogether" );
-  connect( cb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sRunTogether(bool)) );
+  connect( cb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sRunTogether(bool)) );
   glay->addMultiCellWidget( cb2, 1, 1, 0, 2 );
 
   dictcombo = new TQComboBox( this, "DictFromList" );
   dictcombo->setInsertionPolicy( TQComboBox::NoInsertion );
-  connect( dictcombo, TQT_SIGNAL (activated(int)),
-	   this, TQT_SLOT (sSetDictionary(int)) );
+  connect( dictcombo, TQ_SIGNAL (activated(int)),
+	   this, TQ_SLOT (sSetDictionary(int)) );
   glay->addMultiCellWidget( dictcombo, 2, 2, 1, 2 );
 
   dictlist = new TQLabel( dictcombo, i18n("&Dictionary:"), this );
@@ -136,8 +136,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name,
   encodingcombo->insertItem( "CP1251" );
   encodingcombo->insertItem( "CP1255" );
 
-  connect( encodingcombo, TQT_SIGNAL(activated(int)), this,
-	   TQT_SLOT(sChangeEncoding(int)) );
+  connect( encodingcombo, TQ_SIGNAL(activated(int)), this,
+	   TQ_SLOT(sChangeEncoding(int)) );
   glay->addMultiCellWidget( encodingcombo, 3, 3, 1, 2 );
 
   TQLabel *tmpQLabel = new TQLabel( encodingcombo, i18n("&Encoding:"), this);
@@ -149,8 +149,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name,
   clientcombo->insertItem( i18n("Aspell") );
   clientcombo->insertItem( i18n("Hspell") );
   clientcombo->insertItem( i18n("Zemberek") );
-  connect( clientcombo, TQT_SIGNAL (activated(int)), this,
-	   TQT_SLOT (sChangeClient(int)) );
+  connect( clientcombo, TQ_SIGNAL (activated(int)), this,
+	   TQ_SLOT (sChangeClient(int)) );
   glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 );
 
   tmpQLabel = new TQLabel( clientcombo, i18n("&Client:"), this );
@@ -159,7 +159,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name,
   if( addHelpButton )
   {
     TQPushButton *pushButton = new KPushButton( KStdGuiItem::help(), this );
-    connect( pushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(sHelp()) );
+    connect( pushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(sHelp()) );
     glay->addWidget(pushButton, 5, 2);
   }
 
@@ -926,7 +926,7 @@ KSpellConfig::sSetDictionary (int i)
 {
   setDictionary (langfnames[i]);
   setDictFromList (true);
-  TQTimer::singleShot( 0, this, TQT_SIGNAL( configChanged() ) );
+  TQTimer::singleShot( 0, this, TQ_SIGNAL( configChanged() ) );
 }
 
 void
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index b0ca46fd9..21ce54013 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -86,7 +86,7 @@ enum KSpellClients {
 
 class TDEUI_EXPORT KSpellConfig : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp
index cf37c4403..f0d77be26 100644
--- a/tdeui/kscrollview.cpp
+++ b/tdeui/kscrollview.cpp
@@ -40,11 +40,11 @@ struct KScrollView::KScrollViewPrivate {
     bool scrolling;
 };
 
-KScrollView::KScrollView( TQWidget *parent, const char *name, Qt::WFlags f )
+KScrollView::KScrollView( TQWidget *parent, const char *name, TQt::WFlags f )
     : TQScrollView( parent, name, f )
 {
     d = new KScrollViewPrivate;
-    connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick()));
+    connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick()));
 }
 
 KScrollView::~KScrollView()
diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h
index 315ea1c81..7082f3dba 100644
--- a/tdeui/kscrollview.h
+++ b/tdeui/kscrollview.h
@@ -29,10 +29,10 @@
  **/
 class TDEUI_EXPORT KScrollView : public TQScrollView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
-    KScrollView( TQWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 );
+    KScrollView( TQWidget *parent = 0, const char *name = 0, TQt::WFlags f = 0 );
 
     ~KScrollView();
 
diff --git a/tdeui/kseparator.cpp b/tdeui/kseparator.cpp
index c5a4879d8..f97a54080 100644
--- a/tdeui/kseparator.cpp
+++ b/tdeui/kseparator.cpp
@@ -49,7 +49,7 @@ void KSeparator::setOrientation(int orientation)
 {
    switch(orientation)
    {
-      case Qt::Vertical:
+      case TQt::Vertical:
       case VLine:
          setFrameStyle( TQFrame::VLine | TQFrame::Sunken );
          setMinimumSize(2, 0);
@@ -58,7 +58,7 @@ void KSeparator::setOrientation(int orientation)
       default:
          kdWarning() << "KSeparator::setOrientation(): invalid orientation, using default orientation HLine" << endl;
          
-      case Qt::Horizontal:
+      case TQt::Horizontal:
       case HLine:
          setFrameStyle( TQFrame::HLine | TQFrame::Sunken );
          setMinimumSize(0, 2);
@@ -95,7 +95,7 @@ void KSeparator::drawFrame(TQPainter *p)
    }
 
    TQStyleOption opt( lineWidth(), midLineWidth() );
-   style().tqdrawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
+   style().drawPrimitive( TQStyle::PE_Separator, p, TQRect( p1, p2 ), g,
 		          TQStyle::Style_Sunken, opt );
 }
 
diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h
index f21c4c99b..908a0d57a 100644
--- a/tdeui/kseparator.h
+++ b/tdeui/kseparator.h
@@ -32,7 +32,7 @@
 */
 class TDEUI_EXPORT KSeparator : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int orientation READ orientation WRITE setOrientation )
  public:
   /**
diff --git a/tdeui/ksharedpixmap.cpp b/tdeui/ksharedpixmap.cpp
index d4d830d57..a6d965dd0 100644
--- a/tdeui/ksharedpixmap.cpp
+++ b/tdeui/ksharedpixmap.cpp
@@ -20,7 +20,7 @@
 #include <tqwindowdefs.h>
 #include <tqwidget.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tdeapplication.h>
 #include <krootprop.h>
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index c87196876..a77e40683 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -16,11 +16,7 @@
 
 #include <kpixmap.h>
 
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include <tqstring.h>
 #include <tqpixmap.h>
@@ -40,12 +36,12 @@ class TDESharedPixmapPrivate;
  *
  * The server part of shared pixmaps is not implemented here. 
  * That part is provided by KPixmapServer, in the source file:
- * tdebase/kdesktop/pixmapserver.cc.
+ * tdebase/kdesktop/pixmapserver.cpp.
  *
  * An example: copy from a shared pixmap:
  * \code
  *   TDESharedPixmap *pm = new TDESharedPixmap;
- *   connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
+ *   connect(pm, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool)));
  *   pm->loadFromShared("My Pixmap");
  * \endcode
  *
@@ -57,7 +53,7 @@ class TDEUI_EXPORT TDESharedPixmap:
     public TQWidget,
     public KPixmap
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeui/ksplashscreen.h b/tdeui/ksplashscreen.h
index f4d1c22ef..9980cc203 100644
--- a/tdeui/ksplashscreen.h
+++ b/tdeui/ksplashscreen.h
@@ -40,7 +40,7 @@ class TQPixmap;
  */
 class TDEUI_EXPORT KSplashScreen : public TQSplashScreen
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h
index 586c9b27b..2dfa70bec 100644
--- a/tdeui/ksqueezedtextlabel.h
+++ b/tdeui/ksqueezedtextlabel.h
@@ -44,7 +44,7 @@
  * QLabel
  */
 class TDEUI_EXPORT KSqueezedTextLabel : public TQLabel {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp
index daa22f46b..ce6585686 100644
--- a/tdeui/kstatusbar.cpp
+++ b/tdeui/kstatusbar.cpp
@@ -44,8 +44,8 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id,
 
   setAlignment( AlignHCenter | AlignVCenter | SingleLine );
 
-  connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int)));
-  connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int)));
+  connect (this, TQ_SIGNAL(itemPressed(int)), parent, TQ_SIGNAL(pressed(int)));
+  connect (this, TQ_SIGNAL(itemReleased(int)), parent, TQ_SIGNAL(released(int)));
 }
 
 void KStatusBarLabel::mousePressEvent (TQMouseEvent *)
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index 2c7574a79..cbf305d83 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -34,7 +34,7 @@ class KStatusBar;
  */
 class TDEUI_EXPORT KStatusBarLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -86,7 +86,7 @@ signals:
  */
 class TDEUI_EXPORT KStatusBar : public TQStatusBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h
index db1199757..76aad98a8 100644
--- a/tdeui/kstdaction.h
+++ b/tdeui/kstdaction.h
@@ -52,13 +52,13 @@ class TDEToggleFullScreenAction;
  * \code
  * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")),
  *                               TDEStdAccel::shortcut(TDEStdAccel::New), this,
- *                               TQT_SLOT(fileNew()), actionCollection());
+ *                               TQ_SLOT(fileNew()), actionCollection());
  * \endcode
  *
  * You could drop that and replace it with:
  *
  * \code
- * TDEAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()),
+ * TDEAction *newAct = KStdAction::openNew(this, TQ_SLOT(fileNew()),
  *                                       actionCollection());
  * \endcode
  *
@@ -84,7 +84,7 @@ class TDEToggleFullScreenAction;
  * do something like:
  *
  * \code
- * (void)KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection(), "my_cut");
+ * (void)KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection(), "my_cut");
  * \endcode
  *
  * Now, in your local XML resource file (e.g., yourappui.rc), simply
@@ -102,14 +102,14 @@ class TDEToggleFullScreenAction;
  *
  * Another non-standard usage concerns instantiating the action in the
  * first place.  Usually, you would use the member functions as
- * shown above (e.g., KStdAction::cut(this, SLOT, parent)).  You
+ * shown above (e.g., KStdAction::cut(this, TQ_SLOT, parent)).  You
  * may, however, do this using the enums provided.  This author can't
  * think of a reason why you would want to, but, hey, if you do,
  * here's how:
  *
  * \code
- * (void)KStdAction::action(KStdAction::New, this, TQT_SLOT(fileNew()), actionCollection());
- * (void)KStdAction::action(KStdAction::Cut, this, TQT_SLOT(editCut()), actionCollection());
+ * (void)KStdAction::action(KStdAction::New, this, TQ_SLOT(fileNew()), actionCollection());
+ * (void)KStdAction::action(KStdAction::Cut, this, TQ_SLOT(editCut()), actionCollection());
  * \endcode
  *
  * @author Kurt Granroth <granroth@kde.org>
@@ -212,7 +212,7 @@ namespace KStdAction
 	 * Open a recently used document. The signature of the slot being called
 	 * is of the form slotURLSelected( const KURL & ).
 	 * @param recvr object to receive slot
-	 * @param slot The TQT_SLOT to invoke when a URL is selected. The slot's
+	 * @param slot The slot to invoke when a URL is selected. The slot's
 	 * signature is slotURLSelected( const KURL & ).
 	 * @param parent parent widget
 	 * @param name name of widget
@@ -532,7 +532,7 @@ namespace KStdAction
 	* Display the configure key bindings dialog.
 	*
 	*  Note that you might be able to use the pre-built KXMLGUIFactory's fuction:
-	*  KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection());
+	*  KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection());
         */
 	TDEUI_EXPORT TDEAction *keyBindings(const TQObject *recvr, const char *slot,
 					TDEActionCollection* parent, const char *name = 0 );
diff --git a/tdeui/kstdaction_p.h b/tdeui/kstdaction_p.h
index e9aba5231..827b2adca 100644
--- a/tdeui/kstdaction_p.h
+++ b/tdeui/kstdaction_p.h
@@ -111,7 +111,7 @@ static const KStdActionInfo g_rgActionInfo[] =
 	{ ReportBug,     TDEStdAccel::AccelNone, "help_report_bug", I18N_NOOP("&Report Bug/Request Enhancement..."), 0, "bug" },
 	{ SwitchApplicationLanguage,     TDEStdAccel::AccelNone, "switch_application_language", I18N_NOOP("Switch application &language..."), 0, "preferences-desktop-locale" },
 	{ AboutApp,      TDEStdAccel::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 },
-	{ AboutKDE,      TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &Trinity"), 0,"about_kde" },
+	{ AboutKDE,      TDEStdAccel::AccelNone, "help_about_kde", I18N_NOOP("About &TDE"), 0,"about_kde" },
 	{ ActionNone, TDEStdAccel::AccelNone, 0, 0, 0, 0 }
 };
 
diff --git a/tdeui/kstdguiitem.cpp b/tdeui/kstdguiitem.cpp
index 3091092f5..0ed7241dd 100644
--- a/tdeui/kstdguiitem.cpp
+++ b/tdeui/kstdguiitem.cpp
@@ -199,7 +199,7 @@ KGuiItem KStdGuiItem::forward( BidiMode useBidi )
 
 TQPair<KGuiItem, KGuiItem> KStdGuiItem::backAndForward()
 {
-    return tqMakePair( back( UseRTL ), forward( UseRTL ) );
+    return qMakePair( back( UseRTL ), forward( UseRTL ) );
 }
 
 KGuiItem KStdGuiItem::print()
diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h
index b23bc87bd..55c00a3ab 100644
--- a/tdeui/kstringvalidator.h
+++ b/tdeui/kstringvalidator.h
@@ -58,7 +58,7 @@
  * @author Marc Mutz <mutz@kde.org>
  **/
 class TDEUI_EXPORT KStringListValidator : public TQValidator {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQStringList stringList READ stringList WRITE setStringList )
   TQ_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting )
   TQ_PROPERTY( bool fixupEnabled READ isFixupEnabled WRITE setFixupEnabled )
@@ -118,7 +118,7 @@ private:
  **/
 class TDEUI_EXPORT KMimeTypeValidator : public TQValidator
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KMimeTypeValidator( TQObject* parent, const char* name=0)
     : TQValidator( parent, name ) {}
diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp
index c82ffb83d..0d4563b6f 100644
--- a/tdeui/kswitchlanguagedialog.cpp
+++ b/tdeui/kswitchlanguagedialog.cpp
@@ -100,7 +100,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog(
     topLayout->addLayout(languageHorizontalLayout);
     
     d->languagesLayout = new TQGridLayout(0 , 2);
-    languageHorizontalLayout->addLayout(TQT_TQLAYOUT(d->languagesLayout));
+    languageHorizontalLayout->addLayout(d->languagesLayout);
     languageHorizontalLayout->addStretch();
     
     TQStringList defaultLanguages = d->applicationLanguageList();
@@ -122,7 +122,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog(
     
     KPushButton *addLangButton = new KPushButton(i18n("Add fallback language"), d->page, "addLangButton");
     TQToolTip::add(addLangButton, i18n("Adds one more language which will be used if other translations do not contain proper translation"));
-    connect(addLangButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddLanguageButton()));
+    connect(addLangButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddLanguageButton()));
     addButtonHorizontalLayout->addWidget(addLangButton);
     addButtonHorizontalLayout->addStretch();
     
@@ -142,7 +142,7 @@ void KSwitchLanguageDialog::slotAddLanguageButton()
 
 void KSwitchLanguageDialog::removeButtonClicked()
 {
-    TQObject const *signalSender = TQT_TQOBJECT_CONST(sender());
+    TQObject const *signalSender = sender();
     
     if (signalSender == NULL)
     {
@@ -150,7 +150,7 @@ void KSwitchLanguageDialog::removeButtonClicked()
         return;
     }
     
-    KPushButton *removeButton = const_cast<KPushButton*>(::tqqt_cast<const KPushButton*>(signalSender));
+    KPushButton *removeButton = const_cast<KPushButton*>(::tqt_cast<const KPushButton*>(signalSender));
     
     if (removeButton == NULL)
     {
@@ -291,9 +291,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
     
     TQObject::connect(
         languageButton, 
-        TQT_SIGNAL(activated( const TQString &)), 
+        TQ_SIGNAL(activated( const TQString &)), 
         p,
-        TQT_SLOT(languageOnButtonChanged(const TQString &))
+        TQ_SLOT(languageOnButtonChanged(const TQString &))
         );
     
     LanguageRowData languageRowData;
@@ -305,9 +305,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
         
         TQObject::connect(
             removeButton, 
-            TQT_SIGNAL(clicked()),
+            TQ_SIGNAL(clicked()),
             p,
-            TQT_SLOT(removeButtonClicked())
+            TQ_SLOT(removeButtonClicked())
             );
     }
         
@@ -323,12 +323,12 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo
     int numRows = languagesLayout->numRows();
     
     TQLabel *languageLabel = new TQLabel(labelText, page);
-    languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQ_Alignment)TQt::AlignAuto );
-    languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQ_Alignment)TQt::AlignAuto );
+    languagesLayout->addWidget( languageLabel, numRows + 1, 1, (TQt::AlignmentFlags)TQt::AlignAuto );
+    languagesLayout->addWidget( languageButton, numRows + 1, 2, (TQt::AlignmentFlags)TQt::AlignAuto );
     
     if (primaryLanguage == false)
     {
-        languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQ_Alignment)TQt::AlignAuto );
+        languagesLayout->addWidget( removeButton, numRows + 1, 3, (TQt::AlignmentFlags)TQt::AlignAuto );
         
         languageRowData.setRowWidgets(
             languageLabel,
diff --git a/tdeui/kswitchlanguagedialog.h b/tdeui/kswitchlanguagedialog.h
index 9e0a3ff87..64ffe171c 100644
--- a/tdeui/kswitchlanguagedialog.h
+++ b/tdeui/kswitchlanguagedialog.h
@@ -37,7 +37,7 @@ class KSwitchLanguageDialogPrivate;
 
 class TDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
         /**
diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp
index 9e63fc929..8e46e14ec 100644
--- a/tdeui/ksyntaxhighlighter.cpp
+++ b/tdeui/ksyntaxhighlighter.cpp
@@ -300,11 +300,11 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit,
     textEdit->viewport()->installEventFilter( this );
 
     d->rehighlightRequest = new TQTimer(this);
-    connect( d->rehighlightRequest, TQT_SIGNAL( timeout() ),
-	     this, TQT_SLOT( slotRehighlight() ));
+    connect( d->rehighlightRequest, TQ_SIGNAL( timeout() ),
+	     this, TQ_SLOT( slotRehighlight() ));
     d->spellTimeout = new TQTimer(this);
-    connect( d->spellTimeout, TQT_SIGNAL( timeout() ),
-	     this, TQT_SLOT( slotKSpellNotResponding() ));
+    connect( d->spellTimeout, TQ_SIGNAL( timeout() ),
+	     this, TQ_SLOT( slotKSpellNotResponding() ));
 
     if ( d->globalConfig ) {
         d->spellKey = spellKey();
@@ -314,8 +314,8 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit,
     }
     else {
         d->mDict = new TQDict<int>(4001);
-        connect( d->mSpellConfig, TQT_SIGNAL( configChanged() ),
-                 this, TQT_SLOT( slotLocalSpellConfigChanged() ) );
+        connect( d->mSpellConfig, TQ_SIGNAL( configChanged() ),
+                 this, TQ_SLOT( slotLocalSpellConfigChanged() ) );
     }
 
     slotDictionaryChanged();
@@ -339,8 +339,8 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell )
     if ( cg.readEntry("KSpell_DoSpellChecking") != "0" )
     {
       if ( d->globalConfig ) {
-          connect( d->sDictionaryMonitor, TQT_SIGNAL( destroyed()),
-                   this, TQT_SLOT( slotDictionaryChanged() ));
+          connect( d->sDictionaryMonitor, TQ_SIGNAL( destroyed()),
+                   this, TQ_SLOT( slotDictionaryChanged() ));
       }
       if ( spell != d->spell )
       {
@@ -352,10 +352,10 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell )
       for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) {
           d->spell->addPersonal( *it );
       }
-      connect( spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )),
-	       this, TQT_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int )));
-      connect( spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )),
-               this, TQT_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int )));
+      connect( spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )),
+	       this, TQ_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int )));
+      connect( spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )),
+               this, TQ_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int )));
       d->checksRequested = 0;
       d->checksDone = 0;
       d->completeRehighlightRequired = true;
@@ -514,7 +514,7 @@ void KDictSpellingHighlighter::slotRehighlight()
     }
     if (d->checksDone == d->checksRequested)
 	d->completeRehighlightRequired = false;
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() ));
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() ));
 }
 
 void KDictSpellingHighlighter::slotDictionaryChanged()
@@ -526,7 +526,7 @@ void KDictSpellingHighlighter::slotDictionaryChanged()
     d->autoDict.clear();
 
     d->spell = new KSpell( 0, i18n( "Incremental Spellcheck" ), this,
-		TQT_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig );
+		TQ_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig );
 }
 
 void KDictSpellingHighlighter::slotLocalSpellConfigChanged()
@@ -609,7 +609,7 @@ void KDictSpellingHighlighter::slotKSpellNotResponding()
 
 bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e)
 {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::FocusIn)) {
+    if (o == textEdit() && (e->type() == TQEvent::FocusIn)) {
         if ( d->globalConfig ) {
             TQString skey = spellKey();
             if ( d->spell && d->spellKey != skey ) {
@@ -619,8 +619,8 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e)
         }
     }
 
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()) && (e->type() == TQEvent::KeyPress)) {
-	TQKeyEvent *k = TQT_TQKEYEVENT(e);
+    if (o == textEdit() && (e->type() == TQEvent::KeyPress)) {
+	TQKeyEvent *k = static_cast<TQKeyEvent*>(e);
 	d->autoReady = true;
 	if (d->rehighlightRequest->isActive()) // try to stay out of the users way
 	    d->rehighlightRequest->changeInterval( 500 );
@@ -657,11 +657,11 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e)
 	if ( k->key() == Key_Space ||
 	     k->key() == Key_Enter ||
 	     k->key() == Key_Return ) {
-	    TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() ));
+	    TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() ));
 	}
     }
 
-    else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(textEdit()->viewport()) &&
+    else if ( o == textEdit()->viewport() &&
 	 ( e->type() == TQEvent::MouseButtonPress )) {
 	d->autoReady = true;
 	if ( intraWordEditing() ) {
diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h
index 6ac4264ab..45ad7da36 100644
--- a/tdeui/ksyntaxhighlighter.h
+++ b/tdeui/ksyntaxhighlighter.h
@@ -93,7 +93,7 @@ private:
  */
 class TDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KDictSpellingHighlighter( TQTextEdit *textEdit,
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index fd58c6d06..096d9637c 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -28,7 +28,7 @@
 #include "tdelocale.h"
 #include "tdeaboutdata.h"
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #include <twinmodule.h>
 #include <qxembed.h>
@@ -61,14 +61,14 @@ public:
 KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     : TQLabel( parent, name, (WFlags)WType_TopLevel )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     QXEmbed::initialize();
 #endif
 
     d = new KSystemTrayPrivate;
     d->actionCollection = new TDEActionCollection(this);
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setSystemTrayWindowFor( winId(), parent?parent->topLevelWidget()->winId(): tqt_xrootwin() );
 #endif
     setBackgroundMode(X11ParentRelative);
@@ -77,14 +77,14 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
     menu = new TDEPopupMenu( this );
     menu->insertTitle( kapp->miniIcon(), kapp->caption() );
     move( -1000, -1000 );
-    KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(maybeQuit()), d->actionCollection);
+    KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection);
 
     if (parentWidget())
     {
-        new TDEAction(i18n("Minimize"), TDEShortcut(),
-                    TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ),
+        new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(),
+                    this, TQ_SLOT( minimizeRestoreAction() ),
                     d->actionCollection, "minimizeRestore");
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() );
 	d->on_all_desktops = info.onAllDesktops();
 #else
@@ -96,7 +96,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name )
         d->on_all_desktops = false;
     }
     setCaption( TDEGlobal::instance()->aboutData()->programName());
-    setAlignment( alignment() | Qt::AlignVCenter | Qt::AlignHCenter );
+    setAlignment( alignment() | TQt::AlignVCenter | TQt::AlignHCenter );
 
     // Handle the possibility that the requested system tray size is something other than 22x22 pixels, per the Free Desktop specifications
     setScaledContents(true);
@@ -148,12 +148,12 @@ void KSystemTray::mousePressEvent( TQMouseEvent *e )
 	return;
 
     switch ( e->button() ) {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
         toggleActive();
 	break;
-    case Qt::MidButton:
+    case TQt::MidButton:
 	// fall through
-    case Qt::RightButton:
+    case TQt::RightButton:
 	if ( parentWidget() ) {
             TDEAction* action = d->actionCollection->action("minimizeRestore");
 	    if ( parentWidget()->isVisible() )
@@ -244,7 +244,7 @@ void KSystemTray::activateOrHide()
     if ( !pw )
 	return;
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::WindowInfo info1 = KWin::windowInfo( pw->winId(), NET::XAWMState | NET::WMState );
     // mapped = visible (but possibly obscured)
     bool mapped = (info1.mappingState() == NET::Visible) && !info1.isMinimized();
@@ -288,7 +288,7 @@ void KSystemTray::minimizeRestore( bool restore )
     TQWidget* pw = parentWidget();
     if( !pw )
 	return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::WindowInfo info = KWin::windowInfo( pw->winId(), NET::WMGeometry | NET::WMDesktop );
     if ( restore )
     {
@@ -333,7 +333,7 @@ void KSystemTray::setPixmap( const TQPixmap& p )
 		iconPixmapToSet.convertFromImage(correctedImage);
 	}
 	TQLabel::setPixmap( iconPixmapToSet );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	KWin::setIcons( winId(), iconPixmapToSet, TQPixmap());
 #endif
 }
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index f7e81c9b1..5c66dc143 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -62,7 +62,7 @@ class KSystemTrayPrivate;
  **/
 class TDEUI_EXPORT KSystemTray : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index 29479c0e9..ed30bc466 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name )
     setMouseTracking( true );
 
     mEnableCloseButtonTimer = new TQTimer( this );
-    connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) );
+    connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) );
 
     mActivateDragSwitchTabTimer = new TQTimer( this );
-    connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) );
+    connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) );
 
-    connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange()));
+    connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange()));
 }
 
 KTabBar::~KTabBar()
@@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled )
 
 void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-    if( e->button() != Qt::LeftButton )
+    if( e->button() != TQt::LeftButton )
         return;
 
     TQTab *tab = selectTab( e->pos() );
@@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e )
 
 void KTabBar::mousePressEvent( TQMouseEvent *e )
 {
-    if( e->button() == Qt::LeftButton ) {
+    if( e->button() == TQt::LeftButton ) {
         mEnableCloseButtonTimer->stop();
         mDragStart = e->pos();
     }
-    else if( e->button() == Qt::RightButton ) {
+    else if( e->button() == TQt::RightButton ) {
         TQTab *tab = selectTab( e->pos() );
         if( tab ) {
             emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) );
@@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e )
 
 void KTabBar::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( e->state() == Qt::LeftButton ) {
+    if ( e->state() == TQt::LeftButton ) {
         TQTab *tab = selectTab( e->pos() );
         if ( mDragSwitchTab && tab != mDragSwitchTab ) {
           mActivateDragSwitchTabTimer->stop();
@@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
            }
        }
     }
-    else if ( e->state() == Qt::MidButton ) {
+    else if ( e->state() == TQt::MidButton ) {
         if (mReorderStartTab==-1) {
             int delay = TDEGlobalSettings::dndEventDelay();
             TQPoint newPos = e->pos();
@@ -144,7 +144,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
                 TQTab *tab = selectTab( e->pos() );
                 if( tab && mTabReorderingEnabled ) {
                     mReorderStartTab = indexOf( tab->identifier() );
-                    grabMouse( tqsizeAllCursor );
+                    grabMouse( TQt::sizeAllCursor );
                     return;
                 }
             }
@@ -201,7 +201,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e )
                   mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true );
                 }
                 mHoverCloseButtonTab = t;
-                connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) );
+                connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) );
                 return;
             }
         }
@@ -230,7 +230,7 @@ void KTabBar::activateDragSwitchTab()
 
 void KTabBar::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if( e->button() == Qt::MidButton ) {
+    if( e->button() == TQt::MidButton ) {
         if ( mReorderStartTab==-1 ) {
             TQTab *tab = selectTab( e->pos() );
             if( tab ) {
@@ -240,7 +240,7 @@ void KTabBar::mouseReleaseEvent( TQMouseEvent *e )
         }
         else {
             releaseMouse();
-            setCursor( tqarrowCursor );
+            setCursor( TQt::arrowCursor );
             mReorderStartTab=-1;
             mReorderPreviousTab=-1;
         }
@@ -282,7 +282,7 @@ void KTabBar::dropEvent( TQDropEvent *e )
 #ifndef TQT_NO_WHEELEVENT
 void KTabBar::wheelEvent( TQWheelEvent *e )
 {
-    if ( e->orientation() == Qt::Horizontal )
+    if ( e->orientation() == TQt::Horizontal )
         return;
 
     emit( wheelDelta( e->delta() ) );
@@ -298,9 +298,19 @@ void KTabBar::setTabColor( int id, const TQColor& color )
     }
 }
 
+void KTabBar::resetTabColor( int id )
+{
+    TQTab *t = tab(id);
+    if (t) {
+        if (mTabColors.contains(id))
+            mTabColors.remove(id);
+        repaint(t->rect(), false);
+    }
+}
+
 const TQColor &KTabBar::tabColor( int id  ) const
 {
-    if ( mTabColors.contains( id ) )
+    if ( mTabColors.contains(id) && mTabColors[id].isValid() )
         return mTabColors[id];
 
     return colorGroup().foreground();
@@ -359,7 +369,7 @@ void KTabBar::paintLabel( TQPainter *p, const TQRect& br,
         flags |= TQStyle::Style_HasFocus;
 
     TQColorGroup cg( colorGroup() );
-    if ( mTabColors.contains( t->identifier() ) )
+    if ( mTabColors.contains(t->identifier()) && mTabColors[t->identifier()].isValid() )
         cg.setColor( TQColorGroup::Foreground, mTabColors[t->identifier()] );
 
     style().drawControl( TQStyle::CE_TabBarLabel, p, this, r,
diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h
index c5ea25c6d..c6602d0c6 100644
--- a/tdeui/ktabbar.h
+++ b/tdeui/ktabbar.h
@@ -34,7 +34,7 @@ class KTabBarPrivate;
  */
 class TDEUI_EXPORT KTabBar: public TQTabBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KTabBar( TQWidget* parent=0, const char* name=0 );
@@ -44,6 +44,7 @@ public:
 
     const TQColor &tabColor( int ) const;
     void setTabColor( int, const TQColor& );
+    void resetTabColor( int );
 
     virtual int insertTab( TQTab *, int index = -1 );
     virtual void removeTab( TQTab * );
diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp
index 0ff9f64e4..193e68a38 100644
--- a/tdeui/ktabctl.cpp
+++ b/tdeui/ktabctl.cpp
@@ -35,7 +35,7 @@ KTabCtl::KTabCtl(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
     tabs = new TQTabBar(this, "_tabbar");
-    connect(tabs, TQT_SIGNAL(selected(int)), this, TQT_SLOT(showTab(int)));
+    connect(tabs, TQ_SIGNAL(selected(int)), this, TQ_SLOT(showTab(int)));
     tabs->move(2, 1);
 
     blBorder = true;
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index 28de4805b..dcd7756e9 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -47,7 +47,7 @@
 */
 class TDEUI_EXPORT KTabCtl : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KTabCtl(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index d6800ab9a..bcccc4c9a 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -58,16 +58,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
 
     setHoverCloseButtonDelayed(false);
 
-    connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & )));
-    connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int )));
-    connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int )));
-    connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int )));
-    connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )));
-    connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * )));
-    connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int )));
-    connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int )));
+    connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & )));
+    connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int )));
+    connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int )));
+    connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int )));
+    connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )));
+    connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * )));
+    connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int )));
+    connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int )));
 #ifndef TQT_NO_WHEELEVENT
-    connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int )));
+    connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int )));
 #endif
 }
 
@@ -135,6 +135,14 @@ void KTabWidget::setTabColor( TQWidget *w, const TQColor& color )
     }
 }
 
+void KTabWidget::resetTabColor( TQWidget *w )
+{
+    TQTab *t = tabBar()->tabAt( indexOf( w ) );
+    if (t) {
+        static_cast<KTabBar*>(tabBar())->resetTabColor( t->identifier() );
+    }
+}
+
 TQColor KTabWidget::tabColor( TQWidget *w ) const
 {
     TQTab *t = tabBar()->tabAt( indexOf( w ) );
@@ -182,7 +190,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength )
         int iw = 0;
         if ( tab->iconSet() )
           iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
-        x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this,
+        x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this,
                    TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ),
                    TQStyleOption( tab ) ) ).width();
     }
@@ -328,7 +336,7 @@ void KTabWidget::dropEvent( TQDropEvent *e )
 #ifndef TQT_NO_WHEELEVENT
 void KTabWidget::wheelEvent( TQWheelEvent *e )
 {
-    if ( e->orientation() == Qt::Horizontal )
+    if ( e->orientation() == TQt::Horizontal )
         return;
 
     if ( isEmptyTabbarSpace( e->pos() ) )
@@ -357,7 +365,7 @@ void KTabWidget::wheelDelta(int delta)
 
 void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
 {
-    if( e->button() != Qt::LeftButton )
+    if( e->button() != TQt::LeftButton )
         return;
 
     if ( isEmptyTabbarSpace( e->pos() ) ) {
@@ -369,12 +377,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e )
 
 void KTabWidget::mousePressEvent( TQMouseEvent *e )
 {
-    if ( e->button() == Qt::RightButton ) {
+    if ( e->button() == TQt::RightButton ) {
         if ( isEmptyTabbarSpace( e->pos() ) ) {
             emit( contextMenu( mapToGlobal( e->pos() ) ) );
             return;
         }
-    } else if ( e->button() == Qt::MidButton ) {
+    } else if ( e->button() == TQt::MidButton ) {
         if ( isEmptyTabbarSpace( e->pos() ) ) {
             emit( mouseMiddleClick() );
             return;
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index d0a75b38b..1290e6307 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -35,7 +35,7 @@ class KTabWidgetPrivate;
  */
 class TDEUI_EXPORT KTabWidget : public TQTabWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
     TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
     TQ_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed )
@@ -56,6 +56,11 @@ public:
     void setTabColor( TQWidget *, const TQColor& color );
 
     /*!
+      Reset the color of the tab of the given widget.
+    */
+    void resetTabColor( TQWidget * );
+
+    /*!
       Returns the tab color for the given widget.
     */
     TQColor tabColor( TQWidget * ) const;
diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp
index a0331ccf7..f53973352 100644
--- a/tdeui/ktextbrowser.cpp
+++ b/tdeui/ktextbrowser.cpp
@@ -32,8 +32,8 @@ KTextBrowser::KTextBrowser( TQWidget *parent, const char *name,
 {
   //
   //1999-10-04 Espen Sand: Not required anymore ?
-  //connect( this, TQT_SIGNAL(highlighted(const TQString &)),
-  //   this, TQT_SLOT(refChanged(const TQString &)));
+  //connect( this, TQ_SIGNAL(highlighted(const TQString &)),
+  //   this, TQ_SLOT(refChanged(const TQString &)));
 }
 
 KTextBrowser::~KTextBrowser( void )
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 0d6885329..eb79078c9 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -41,7 +41,7 @@
 
 class TDEUI_EXPORT KTextBrowser : public TQTextBrowser
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
 
   public:
diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp
index 3ebb1375f..22d8dd0ab 100644
--- a/tdeui/ktextedit.cpp
+++ b/tdeui/ktextedit.cpp
@@ -229,16 +229,16 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos )
 
         menu->insertSeparator();
         id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ),
-                                   this, TQT_SLOT( checkSpelling() ) );
+                                   this, TQ_SLOT( checkSpelling() ) );
 
         if( text().isEmpty() )
             menu->setItemEnabled( id, false );
 
         id = menu->insertItem( i18n( "Auto Spell Check" ),
-                               this, TQT_SLOT( toggleAutoSpellCheck() ) );
+                               this, TQ_SLOT( toggleAutoSpellCheck() ) );
         menu->setItemChecked(id, d->checkSpellingEnabled);
 	menu->insertSeparator();
-	id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab()));
+	id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab()));
 	menu->setItemChecked(id, !tabChangesFocus());
     }
 
@@ -332,7 +332,7 @@ void KTextEdit::setReadOnly(bool readOnly)
         if ( d->customPalette )
         {
             TQPalette p = palette();
-            TQColor color = p.color(TQPalette::Normal, TQColorGroup::Base);
+            TQColor color = p.color(TQPalette::Active, TQColorGroup::Base);
             p.setColor(TQColorGroup::Base, color);
             p.setColor(TQColorGroup::Background, color);
             setPalette( p );
@@ -351,16 +351,16 @@ void KTextEdit::checkSpelling()
 {
     delete d->spell;
     d->spell = new KSpell( this, i18n( "Spell Checking" ),
-                          TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
+                          this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true);
 
-    connect( d->spell, TQT_SIGNAL( death() ),
-             this, TQT_SLOT( spellCheckerFinished() ) );
+    connect( d->spell, TQ_SIGNAL( death() ),
+             this, TQ_SLOT( spellCheckerFinished() ) );
 
-    connect( d->spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),
-             this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
+    connect( d->spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),
+             this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) );
 
-    connect( d->spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),
-             this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) );
+    connect( d->spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),
+             this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) );
 }
 
 void KTextEdit::spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos )
@@ -398,7 +398,7 @@ void KTextEdit::spellCheckerFinished()
 void KTextEdit::slotSpellCheckReady( KSpell *s )
 {
     s->check( text() );
-    connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) );
+    connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) );
 }
 
 void KTextEdit::slotSpellCheckDone( const TQString &s )
diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h
index 930409b04..8ba6f382f 100644
--- a/tdeui/ktextedit.h
+++ b/tdeui/ktextedit.h
@@ -42,7 +42,7 @@ class KSpell;
  */
 class TDEUI_EXPORT KTextEdit : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/ktimewidget.cpp b/tdeui/ktimewidget.cpp
index 4d48b2129..aaa0be9e4 100644
--- a/tdeui/ktimewidget.cpp
+++ b/tdeui/ktimewidget.cpp
@@ -41,8 +41,8 @@ void KTimeWidget::init()
 
   d->timeWidget = new TQTimeEdit(this);
 
-  connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)),
-          TQT_SIGNAL(valueChanged(const TQTime &)));
+  connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)),
+          TQ_SIGNAL(valueChanged(const TQTime &)));
 }
 
 void KTimeWidget::setTime(const TQTime & time)
diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h
index 9ac6923f3..5d170434b 100644
--- a/tdeui/ktimewidget.h
+++ b/tdeui/ktimewidget.h
@@ -36,7 +36,7 @@
  */
 class TDEUI_EXPORT KTimeWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQTime time READ time WRITE setTime )
 
 public:
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index 70d63521e..ff044460c 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -59,7 +59,7 @@ class KTimezoneWidgetPrivate;
 class TDEUI_EXPORT KTimezoneWidget :
     public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp
index 1cc520640..2c8a8ef08 100644
--- a/tdeui/ktip.cpp
+++ b/tdeui/ktip.cpp
@@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconeffect.h>
 #include <tdeglobalsettings.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h>
 #endif
 
@@ -189,7 +189,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	img = TQImage(locate("data", "tdewizard/pics/wizard_small.png"));
 	// colorize and check to figure the correct color
 	TDEIconEffect::colorize(img, mBlendedColor, 1.0);
-	QRgb colPixel( img.pixel(0,0) );
+	TQRgb colPixel( img.pixel(0,0) );
 
 	mBlendedColor = TQColor(tqRed(colPixel),tqGreen(colPixel),tqBlue(colPixel));
     }
@@ -204,7 +204,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     mDatabase = db;
 
     setCaption(i18n("Tip of the Day"));
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons( winId(),
                     TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 32 ),
                     TDEGlobal::iconLoader()->loadIcon( "idea", TDEIcon::NoGroup, 16 ) );
@@ -268,7 +268,7 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
 	TQLabel *l = new TQLabel(hbox);
 	l->setPixmap(img);
 	l->setBackgroundColor(mBlendedColor);
-	l->setAlignment(Qt::AlignRight | Qt::AlignBottom);
+	l->setAlignment(TQt::AlignRight | TQt::AlignBottom);
 
 	resize(550, 230);
         TQSize sh = size();
@@ -304,10 +304,10 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name)
     TDEConfigGroup config(kapp->config(), "TipOfDay");
     mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true));
 
-    connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip()));
-    connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip()));
-    connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
-    connect(mTipOnStart, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showOnStart(bool)));
+    connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextTip()));
+    connect(prev, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevTip()));
+    connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
+    connect(mTipOnStart, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showOnStart(bool)));
 
     ok->setFocus();
 
@@ -425,7 +425,7 @@ static TQString fixTip(TQString tip)
 
   bool KTipDialog::eventFilter(TQObject *o, TQEvent *e)
   {
-    if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mTipText) && e->type()== TQEvent::KeyPress &&
+    if (o == mTipText && e->type()== TQEvent::KeyPress &&
 		(((TQKeyEvent *)e)->key() == Key_Return ||
 		((TQKeyEvent *)e)->key() == Key_Space ))
 		accept();
diff --git a/tdeui/ktip.h b/tdeui/ktip.h
index a506902bf..b6fe3c0b6 100644
--- a/tdeui/ktip.h
+++ b/tdeui/ktip.h
@@ -107,7 +107,7 @@ private:
  */
 class TDEUI_EXPORT KTipDialog : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Construct a tip dialog.
diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp
index 539984466..4a296a284 100644
--- a/tdeui/kurllabel.cpp
+++ b/tdeui/kurllabel.cpp
@@ -37,7 +37,7 @@ public:
   Private (const TQString& url, KURLLabel* label)
     : URL (url),
       LinkColor (TDEGlobalSettings::linkColor()),
-      HighlightedLinkColor (Qt::red),
+      HighlightedLinkColor (TQt::red),
       Tip(url),
       Cursor (0L),
       Underline (true),
@@ -50,7 +50,7 @@ public:
       MarginAltered(false),
       Timer (new TQTimer (label))
   {
-    connect (Timer, TQT_SIGNAL (timeout ()), label, TQT_SLOT (updateColor ()));
+    connect (Timer, TQ_SIGNAL (timeout ()), label, TQ_SLOT (updateColor ()));
   }
 
   ~Private ()
@@ -87,7 +87,7 @@ KURLLabel::KURLLabel (const TQString& url, const TQString& text,
   setFont (font());
   setUseCursor (true);
   setLinkColor (d->LinkColor);
-  setFocusPolicy( TQ_StrongFocus ); //better accessibility
+  setFocusPolicy( TQWidget::StrongFocus ); //better accessibility
   setMouseTracking (true);
 }
 
@@ -98,7 +98,7 @@ KURLLabel::KURLLabel (TQWidget* parent, const char* name)
   setFont (font());
   setUseCursor (true);
   setLinkColor (d->LinkColor);
-  setFocusPolicy( TQ_StrongFocus ); //better accessibility
+  setFocusPolicy( TQWidget::StrongFocus ); //better accessibility
   setMouseTracking (true);
 }
 
@@ -122,17 +122,17 @@ void KURLLabel::mouseReleaseEvent (TQMouseEvent* e)
 
   switch (e->button())
     {
-    case Qt::LeftButton:
+    case TQt::LeftButton:
       emit leftClickedURL ();
       emit leftClickedURL (d->URL);
       break;
 
-    case Qt::MidButton:
+    case TQt::MidButton:
       emit middleClickedURL ();
       emit middleClickedURL (d->URL);
       break;
 
-    case Qt::RightButton:
+    case TQt::RightButton:
       emit rightClickedURL ();
       emit rightClickedURL (d->URL);
       break;
@@ -308,7 +308,7 @@ void KURLLabel::enterEvent (TQEvent* e)
   TQLabel::enterEvent (e);
 
   TQRect r( activeRect() );
-  if (!r.contains( TQT_TQMOUSEEVENT(e)->pos() ))
+  if (!r.contains( static_cast<TQMouseEvent*>(e)->pos() ))
     return;
 
   if (!d->AltPixmap.isNull() && pixmap())
@@ -355,7 +355,7 @@ bool KURLLabel::event (TQEvent *e)
   {
     // use parentWidget() unless you are a toplevel widget, then try qAapp
     TQPalette p = parentWidget() ? parentWidget()->palette() : tqApp->palette();
-    p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Normal, TQColorGroup::Background));
+    p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
     p.setColor(TQColorGroup::Foreground, palette().active().foreground());
     setPalette(p);
     d->LinkColor = TDEGlobalSettings::linkColor();
@@ -367,13 +367,13 @@ bool KURLLabel::event (TQEvent *e)
     if (result && hasFocus()) {
         TQPainter p(this);
         TQRect r( activeRect() );
-        style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
+        style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, colorGroup() );
     }
     return result;
   }
   else if (e->type() == TQEvent::KeyPress) {
-    TQKeyEvent* ke = TQT_TQKEYEVENT(e);
-    if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) {
+    TQKeyEvent* ke = static_cast<TQKeyEvent*>(e);
+    if (ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Return) {
       setLinkColor (d->HighlightedLinkColor);
       d->Timer->start (300);
       emit leftClickedURL ();
@@ -384,12 +384,12 @@ bool KURLLabel::event (TQEvent *e)
   }
   else if (e->type() == TQEvent::MouseButtonPress) {
     TQRect r( activeRect() );
-    d->MousePressed = r.contains(TQT_TQMOUSEEVENT(e)->pos());
+    d->MousePressed = r.contains(static_cast<TQMouseEvent*>(e)->pos());
   }
   else if (e->type() == TQEvent::MouseMove) {
     if (d->Cursor) {
       TQRect r( activeRect() );
-      bool inside = r.contains(TQT_TQMOUSEEVENT(e)->pos());
+      bool inside = r.contains(static_cast<TQMouseEvent*>(e)->pos());
       if (d->WasInsideRect != inside) {
         if (inside)
           TQLabel::setCursor(*d->Cursor);
@@ -428,11 +428,11 @@ void KURLLabel::setMargin( int margin )
   d->MarginAltered = true;
 }
 
-void KURLLabel::setFocusPolicy( TQ_FocusPolicy policy )
+void KURLLabel::setFocusPolicy( TQWidget::FocusPolicy policy )
 {
   TQLabel::setFocusPolicy(policy);
   if (!d->MarginAltered) {
-      TQLabel::setMargin(policy == TQ_NoFocus ? 0 : 3); //better default : better look when focused
+      TQLabel::setMargin(policy == TQWidget::NoFocus ? 0 : 3); //better default : better look when focused
   }
 }
 
diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h
index c35d3156b..ab5ff067e 100644
--- a/tdeui/kurllabel.h
+++ b/tdeui/kurllabel.h
@@ -51,8 +51,8 @@ class TQPixmap;
  * KURLLabel *address = new KURLLabel(this);
  * address->setText("My homepage");
  * address->setURL("http://www.home.com/~me");
- * connect(address, TQT_SIGNAL(leftClickedURL(const TQString&)),
- *                  TQT_SLOT(processMyURL(const TQString&)));
+ * connect(address, TQ_SIGNAL(leftClickedURL(const TQString&)),
+ *                  TQ_SLOT(processMyURL(const TQString&)));
  * \endcode
  *
  * In this example, the text "My homepage" would be displayed
@@ -70,7 +70,7 @@ class TQPixmap;
  */
 class TDEUI_EXPORT KURLLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY (TQString url READ url WRITE setURL)
   TQ_PROPERTY (TQString tipText READ tipText WRITE setTipText )
   TQ_PROPERTY (TQPixmap altPixmap READ altPixmap WRITE setAltPixmap)
@@ -163,7 +163,7 @@ public:
    */
 #ifdef qdoc
 #else
-  virtual void setFocusPolicy ( TQ_FocusPolicy policy );
+  virtual void setFocusPolicy ( TQWidget::FocusPolicy policy );
 #endif
 
   /**
diff --git a/tdeui/kwhatsthismanager_p.h b/tdeui/kwhatsthismanager_p.h
index 084c83641..ddc7c0e86 100644
--- a/tdeui/kwhatsthismanager_p.h
+++ b/tdeui/kwhatsthismanager_p.h
@@ -45,7 +45,7 @@ class TQTextEdit;
  **/
 class TDEUI_EXPORT KWhatsThisManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         static void init ();
         bool eventFilter (TQObject *o, TQEvent *e);
diff --git a/tdeui/kwizard.h b/tdeui/kwizard.h
index 56995a2e0..4fafd5933 100644
--- a/tdeui/kwizard.h
+++ b/tdeui/kwizard.h
@@ -45,7 +45,7 @@
 */
 class TDEUI_EXPORT KWizard : public TQWizard
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 /**
 * Constructor
diff --git a/tdeui/kwordwrap.cpp b/tdeui/kwordwrap.cpp
index de031c966..471a7227a 100644
--- a/tdeui/kwordwrap.cpp
+++ b/tdeui/kwordwrap.cpp
@@ -236,9 +236,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags )
 	    break;
         int end = (*it);
         int x = textX;
-        if ( flags & Qt::AlignHCenter )
+        if ( flags & TQt::AlignHCenter )
             x += ( maxwidth - *itw ) / 2;
-        else if ( flags & Qt::AlignRight )
+        else if ( flags & TQt::AlignRight )
             x += maxwidth - *itw;
         painter->drawText( x, textY + y + ascent, m_text.mid( start, end - start + 1 ) );
         y += height;
@@ -246,9 +246,9 @@ void KWordWrap::drawText( TQPainter *painter, int textX, int textY, int flags )
     }
     // Draw the last line
     int x = textX;
-    if ( flags & Qt::AlignHCenter )
+    if ( flags & TQt::AlignHCenter )
         x += ( maxwidth - *itw ) / 2;
-    else if ( flags & Qt::AlignRight )
+    else if ( flags & TQt::AlignRight )
         x += maxwidth - *itw;
     if ( (d->m_constrainingRect.height() < 0) ||
          ((y + height) <= d->m_constrainingRect.height()) ) {
diff --git a/tdeui/kwordwrap.h b/tdeui/kwordwrap.h
index 3fb48acd9..803389ed3 100644
--- a/tdeui/kwordwrap.h
+++ b/tdeui/kwordwrap.h
@@ -91,8 +91,8 @@ public:
 
     /**
      * Draw the text that has been previously wrapped, at position x,y.
-     * Flags are for alignment, e.g. Qt::AlignHCenter. Default is
-     * Qt::AlignAuto.
+     * Flags are for alignment, e.g. TQt::AlignHCenter. Default is
+     * TQt::AlignAuto.
      * @param painter the TQPainter to use.
      * @param x the horizontal position of the text
      * @param y the vertical position of the text
diff --git a/tdeui/kxmlgui.xsd b/tdeui/kxmlgui.xsd
index dc2fad341..da7bf04e4 100644
--- a/tdeui/kxmlgui.xsd
+++ b/tdeui/kxmlgui.xsd
@@ -56,7 +56,7 @@
         <xsd:annotation>
             <xsd:documentation>
                 
-                The name used for every name and group attribute. Maps to QObject::name() in most cases. 
+                The name used for every name and group attribute. Maps to TQObject::name() in most cases. 
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:Name">
diff --git a/tdeui/kxmlguibuilder.cpp b/tdeui/kxmlguibuilder.cpp
index b02ed5b08..c3dd1c233 100644
--- a/tdeui/kxmlguibuilder.cpp
+++ b/tdeui/kxmlguibuilder.cpp
@@ -117,7 +117,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
   if ( element.tagName().lower() == d->tagMainWindow )
   {
     TDEMainWindow *mainwindow = 0;
-    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+    if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) )
       mainwindow = static_cast<TDEMainWindow *>(d->m_widget);
 
     return mainwindow;
@@ -127,7 +127,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
   {
     KMenuBar *bar;
 
-    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+    if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) )
       bar = static_cast<TDEMainWindow *>(d->m_widget)->menuBar();
     else
       bar = new KMenuBar( d->m_widget );
@@ -145,7 +145,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
     // And we don't want to set the parent for a standalone popupmenu,
     // otherwise its shortcuts appear.
     TQWidget* p = parent;
-    while ( p && !::tqqt_cast<TDEMainWindow *>( p ) )
+    while ( p && !::tqt_cast<TDEMainWindow *>( p ) )
         p = p->parentWidget();
 
     TQCString name = element.attribute( d->attrName ).utf8();
@@ -181,14 +181,14 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
       pix = SmallIconSet( icon, 16, instance );
     }
 
-    if ( parent && ::tqqt_cast<KMenuBar *>( parent ) )
+    if ( parent && ::tqt_cast<KMenuBar *>( parent ) )
     {
       if ( !icon.isEmpty() )
         id = static_cast<KMenuBar *>(parent)->insertItem( pix, i18nText, popup, -1, index );
       else
         id = static_cast<KMenuBar *>(parent)->insertItem( i18nText, popup, -1, index );
     }
-    else if ( parent && ::tqqt_cast<TQPopupMenu *>( parent ) )
+    else if ( parent && ::tqt_cast<TQPopupMenu *>( parent ) )
     {
       if ( !icon.isEmpty() )
         id = static_cast<TQPopupMenu *>(parent)->insertItem( pix, i18nText, popup, -1, index );
@@ -205,13 +205,13 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
     TQCString name = element.attribute( d->attrName ).utf8();
 
-    TDEToolBar *bar = static_cast<TDEToolBar*>(TQT_TQWIDGET(d->m_widget->child( name, "TDEToolBar" )));
+    TDEToolBar *bar = static_cast<TDEToolBar*>(d->m_widget->child( name, "TDEToolBar" ));
     if( !bar )
     {
        bar = new TDEToolBar( d->m_widget, name, honor, false );
     }
 
-    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+    if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) )
     {
         if ( d->m_client && !d->m_client->xmlFile().isEmpty() )
             bar->setXMLGUIClient( d->m_client );
@@ -224,7 +224,7 @@ TQWidget *KXMLGUIBuilder::createContainer( TQWidget *parent, int index, const TQ
 
   if ( element.tagName().lower() == d->tagStatusBar )
   {
-      if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+      if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) )
     {
       TDEMainWindow *mainWin = static_cast<TDEMainWindow *>(d->m_widget);
       mainWin->statusBar()->show();
@@ -241,26 +241,26 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD
 {
   // Warning parent can be 0L
 
-  if ( ::tqqt_cast<TQPopupMenu *>( container ) )
+  if ( ::tqt_cast<TQPopupMenu *>( container ) )
   {
     if ( parent )
     {
-        if ( ::tqqt_cast<KMenuBar *>( parent ) )
+        if ( ::tqt_cast<KMenuBar *>( parent ) )
             static_cast<KMenuBar *>(parent)->removeItem( id );
-        else if ( ::tqqt_cast<TQPopupMenu *>( parent ) )
+        else if ( ::tqt_cast<TQPopupMenu *>( parent ) )
             static_cast<TQPopupMenu *>(parent)->removeItem( id );
     }
 
     delete container;
   }
-  else if ( ::tqqt_cast<TDEToolBar *>( container ) )
+  else if ( ::tqt_cast<TDEToolBar *>( container ) )
   {
     TDEToolBar *tb = static_cast<TDEToolBar *>( container );
 
     tb->saveState( element );
     delete tb;
   }
-  else if ( ::tqqt_cast<KMenuBar *>( container ) )
+  else if ( ::tqt_cast<KMenuBar *>( container ) )
   {
     KMenuBar *mb = static_cast<KMenuBar *>( container );
     mb->hide();
@@ -269,9 +269,9 @@ void KXMLGUIBuilder::removeContainer( TQWidget *container, TQWidget *parent, TQD
     // sure that TQMainWindow::d->mb does not point to a deleted
     // menubar object.
   }
-  else if ( ::tqqt_cast<KStatusBar *>( container ) )
+  else if ( ::tqt_cast<KStatusBar *>( container ) )
   {
-    if ( ::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+    if ( ::tqt_cast<TDEMainWindow *>( d->m_widget ) )
         container->hide();
     else
       delete static_cast<KStatusBar *>(container);
@@ -291,7 +291,7 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
 {
   if ( element.tagName().lower() == d->tagSeparator )
   {
-    if ( ::tqqt_cast<TQPopupMenu *>( parent ) )
+    if ( ::tqt_cast<TQPopupMenu *>( parent ) )
     {
       // Don't insert multiple separators in a row
       TQPopupMenu *menu = static_cast<TQPopupMenu *>(parent);
@@ -317,9 +317,9 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
       else
         return menu->insertSeparator( index );
     }
-    else if ( ::tqqt_cast<TQMenuBar *>( parent ) )
+    else if ( ::tqt_cast<TQMenuBar *>( parent ) )
        return static_cast<TQMenuBar *>(parent)->insertSeparator( index );
-    else if ( ::tqqt_cast<TDEToolBar *>( parent ) )
+    else if ( ::tqt_cast<TDEToolBar *>( parent ) )
     {
       TDEToolBar *bar = static_cast<TDEToolBar *>( parent );
 
@@ -351,12 +351,12 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
   }
   else if ( element.tagName().lower() == d->tagTearOffHandle )
   {
-    if ( ::tqqt_cast<TQPopupMenu *>( parent )  && TDEGlobalSettings::insertTearOffHandle())
+    if ( ::tqt_cast<TQPopupMenu *>( parent )  && TDEGlobalSettings::insertTearOffHandle())
       return static_cast<TQPopupMenu *>(parent)->insertTearOffHandle( -1, index );
   }
   else if ( element.tagName().lower() == d->tagMenuTitle )
   {
-    if ( ::tqqt_cast<TDEPopupMenu *>( parent ) )
+    if ( ::tqt_cast<TDEPopupMenu *>( parent ) )
     {
       TQString i18nText;
       TQCString text = element.text().utf8();
@@ -389,11 +389,11 @@ int KXMLGUIBuilder::createCustomElement( TQWidget *parent, int index, const TQDo
 
 void KXMLGUIBuilder::removeCustomElement( TQWidget *parent, int id )
 {
-  if ( ::tqqt_cast<TQPopupMenu *>( parent ) )
+  if ( ::tqt_cast<TQPopupMenu *>( parent ) )
     static_cast<TQPopupMenu *>(parent)->removeItem( id );
-  else if ( ::tqqt_cast<TQMenuBar *>( parent ) )
+  else if ( ::tqt_cast<TQMenuBar *>( parent ) )
     static_cast<TQMenuBar *>(parent)->removeItem( id );
-  else if ( ::tqqt_cast<TDEToolBar *>( parent ) )
+  else if ( ::tqt_cast<TDEToolBar *>( parent ) )
     static_cast<TDEToolBar *>(parent)->removeItemDelayed( id );
 }
 
@@ -421,7 +421,7 @@ void KXMLGUIBuilder::setBuilderInstance( TDEInstance *instance )
 
 void KXMLGUIBuilder::finalizeGUI( KXMLGUIClient * )
 {
-    if ( !d->m_widget || !::tqqt_cast<TDEMainWindow *>( d->m_widget ) )
+    if ( !d->m_widget || !::tqt_cast<TDEMainWindow *>( d->m_widget ) )
         return;
 #if 0
     TDEToolBar *toolbar = 0;
diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp
index 233907b72..8e9b376b2 100644
--- a/tdeui/kxmlguifactory.cpp
+++ b/tdeui/kxmlguifactory.cpp
@@ -552,7 +552,7 @@ void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomAttr &attrib
 
 int KXMLGUIFactory::configureShortcuts(bool bAllowLetterShortcuts , bool bSaveSettings )
 {
-	KKeyDialog dlg( bAllowLetterShortcuts, tqt_dynamic_cast<TQWidget*>(parent()) );
+	KKeyDialog dlg( bAllowLetterShortcuts, dynamic_cast<TQWidget*>(parent()) );
 	TQPtrListIterator<KXMLGUIClient> it( d->m_clients );
 	KXMLGUIClient *client;
 	while( (client=it.current()) !=0 )
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index ae726dd9c..775446308 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -61,7 +61,7 @@ class BuildHelper;
 class TDEUI_EXPORT KXMLGUIFactory : public TQObject
 {
   friend class KXMLGUI::BuildHelper;
-  Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Constructs a KXMLGUIFactory. The provided @p builder KXMLGUIBuilder will be called
@@ -183,7 +183,7 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject
    * This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to
    * do that by adding a single line
    * \code
-   * KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() );
+   * KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() );
    * \endcode
    *
    * @param bAllowLetterShortcuts Set to false if unmodified alphanumeric
diff --git a/tdeui/qxembed.cpp b/tdeui/qxembed.cpp
index 6ba25fff7..23076e38d 100644
--- a/tdeui/qxembed.cpp
+++ b/tdeui/qxembed.cpp
@@ -54,7 +54,7 @@
 #include <tqfocusdata.h>
 
 // L0001: QXEmbed works only under X windows.
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 # include <X11/X.h>
 # include <X11/Xlib.h>
@@ -199,7 +199,7 @@ static void sendXEmbedMessage( WId window, long message, long detail = 0,
     ev.xclient.window = window;
     ev.xclient.message_type = xembed;
     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] = message;
     ev.xclient.data.l[2] = detail;
     ev.xclient.data.l[3] = data1;
@@ -219,7 +219,7 @@ static void sendClientMessage(Window window, Atom a, long x)
   ev.xclient.message_type = a;
   ev.xclient.format = 32;
   ev.xclient.data.l[0] = x;
-  ev.xclient.data.l[1] = GET_QT_X_TIME();
+  ev.xclient.data.l[1] = get_tqt_x_time();
   XSendEvent(tqt_xdisplay(), window, false, NoEventMask, &ev);
 }
 
@@ -310,7 +310,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
         //        active and has just been given the Qt focus (L0614) or
         //        because the widget already had the Qt focus and just became
         //        active (L0615).
-        if ( TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) &&
+        if ( tqApp->focusWidget() == o &&
              ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
             TQFocusEvent* fe = (TQFocusEvent*) e;
             if ( obeyFocus || fe->reason() != TQFocusEvent::ActiveWindow /*|| fe->reason() == TQFocusEvent::Mouse ||
@@ -319,11 +319,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
                 //        Variable `obeyFocus' suggests that this is the result of mouse
                 //        activity in the client.  The XEMBED_REQUEST_FOCUS message causes
                 //        the embedding widget to take the Qt focus (L2085).
-#ifdef USE_QT4
-                WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->effectiveWinId();
-#else // USE_QT4
                 WId window = ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->parentWinId;
-#endif // USE_QT4
                 focusMap->remove( tqApp->focusWidget()->topLevelWidget() );
                 sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
             } else if ( fe->reason() == TQFocusEvent::ActiveWindow ) {
@@ -344,7 +340,7 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
         }
         break;
     case TQEvent::KeyPress: 
-        if (TQT_BASE_OBJECT(tqApp->focusWidget()) == TQT_BASE_OBJECT(o) &&
+        if (tqApp->focusWidget() == o &&
             ((QPublicWidget*)tqApp->focusWidget()->topLevelWidget())->topData()->embedded ) {
             // L0620: The following code replaces the Qt code that 
             //        handles focus focus changes with the tab key. See the
@@ -365,32 +361,20 @@ bool QXEmbedAppFilter::eventFilter( TQObject *o, TQEvent * e)
             bool tabForward = true;
             if ( !(k->state() & ControlButton || k->state() & AltButton) ) {
                 if ( k->key() == Key_Backtab || (k->key() == Key_Tab && (k->state() & ShiftButton)) ) {
-#ifdef USE_QT4
-                    res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false );
-#else // USE_QT4
                     TQFocusEvent::setReason( TQFocusEvent::Backtab );
                     res = ((QPublicWidget*)w)->focusNextPrev( tabForward = false );
                     TQFocusEvent::resetReason();
-#endif // USE_QT4
                 } else if ( k->key() == Key_Tab ) {
-#ifdef USE_QT4
-                    res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true );
-#else // USE_QT4
                     TQFocusEvent::setReason( TQFocusEvent::Tab );
                     res = ((QPublicWidget*)w)->focusNextPrev( tabForward = true );
                     TQFocusEvent::resetReason();
-#endif // USE_QT4
                 }
             }
             if (res) {
                 // L0625: We changed the focus because of tab/backtab key
                 //        Now check whether we have been looping around.
                 TQFocusData *fd = ((QPublicWidget*)w)->focusData();
-#ifdef USE_QT4
-                WId window = ((QPublicWidget*)w->topLevelWidget())->effectiveWinId();
-#else // USE_QT4
                 WId window = ((QPublicWidget*)w->topLevelWidget())->topData()->parentWinId;
-#endif // USE_QT4
                 TQWidget *cw = 0;
                 TQWidget *fw = fd->home();
                 if (tabForward && window) {
@@ -435,9 +419,9 @@ static int qxembed_x11_event_filter( XEvent* e)
             long message = e->xclient.data.l[1];
             long detail = e->xclient.data.l[2];
             // L0671: Keep Qt message time up to date
-            if ( msgtime > GET_QT_X_TIME() )
-                SET_QT_X_TIME(msgtime);
-            TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window ));
+            if ( msgtime > get_tqt_x_time() )
+                set_tqt_x_time(msgtime);
+            TQWidget* w = TQWidget::find( e->xclient.window );
             if ( !w )
                 break;
             switch ( message) {
@@ -445,12 +429,7 @@ static int qxembed_x11_event_filter( XEvent* e)
                 // L0675: We just have been embedded into a XEMBED aware widget.
                 TQTLWExtra *extra = ((QPublicWidget*)w->topLevelWidget())->topData();
                 extra->embedded = 1;
-#ifdef USE_QT4
-                // [FIXME]
-                printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n");
-#else // USE_QT4
                 extra->parentWinId = e->xclient.data.l[3];
-#endif // USE_QT4
                 w->topLevelWidget()->show();
                 break;
             }
@@ -500,7 +479,7 @@ static int qxembed_x11_event_filter( XEvent* e)
                         // L0683: Set focus on saved focus widget
                         if ( focusCurrent ) {
                             focusCurrent->setFocus();
-                            if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( focusCurrent ))
+                            if( QXEmbed* emb = dynamic_cast< QXEmbed* >( focusCurrent ))
                                 emb->updateEmbeddedFocus( true );
                         }
                         else if ( !w->topLevelWidget()->focusWidget() )
@@ -509,29 +488,19 @@ static int qxembed_x11_event_filter( XEvent* e)
                     case XEMBED_FOCUS_FIRST:
                         {
                             // L0684: Search first widget in tab chain
-#ifdef USE_QT4
-                            w->topLevelWidget()->setFocus();
-                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
-#else // USE_QT4
                             TQFocusEvent::setReason( TQFocusEvent::Tab );
                             w->topLevelWidget()->setFocus();
                             ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(true);
                             TQFocusEvent::resetReason();
-#endif // USE_QT4
                         }
                         break;
                     case XEMBED_FOCUS_LAST:
                         {
                             // L0686: Search last widget in tab chain
-#ifdef USE_QT4
-                            w->topLevelWidget()->setFocus();
-                            ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
-#else // USE_QT4
                             TQFocusEvent::setReason( TQFocusEvent::Backtab );
                             w->topLevelWidget()->setFocus();
                             ((QPublicWidget*)w->topLevelWidget())->focusNextPrev(false);
                             TQFocusEvent::resetReason();
-#endif // USE_QT4
                         }
                         break;
                     default:
@@ -544,7 +513,7 @@ static int qxembed_x11_event_filter( XEvent* e)
                 //        We first record what the focus widget was
                 //        and clear the Qt focus.
                 if ( w->topLevelWidget()->focusWidget() ) {
-                    if( QXEmbed* emb = tqt_dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
+                    if( QXEmbed* emb = dynamic_cast< QXEmbed* >( w->topLevelWidget()->focusWidget()))
                         emb->updateEmbeddedFocus( false );
                     focusMap->insert( w->topLevelWidget(),
                         new TQGuardedPtr<TQWidget>(w->topLevelWidget()->focusWidget() ) );
@@ -556,7 +525,7 @@ static int qxembed_x11_event_filter( XEvent* e)
             }
         } else if ( e->xclient.format == 32 && e->xclient.message_type ) {
             if ( e->xclient.message_type == tqt_wm_protocols ) {
-                TQWidget* w = TQT_TQWIDGET(TQWidget::find( e->xclient.window ));
+                TQWidget* w = TQWidget::find( e->xclient.window );
                 if ( !w )
                     break;
                 // L0690: This is for the embedding side!
@@ -569,8 +538,8 @@ static int qxembed_x11_event_filter( XEvent* e)
                 Atom a = e->xclient.data.l[0];
                 if ( a == tqt_wm_take_focus ) {
                     // L0695: update Qt message time variable
-                    if ( (ulong) e->xclient.data.l[1] > GET_QT_X_TIME() )
-                        SET_QT_X_TIME(e->xclient.data.l[1]);
+                    if ( (ulong) e->xclient.data.l[1] > get_tqt_x_time() )
+                        set_tqt_x_time(e->xclient.data.l[1]);
                     // L0696: There is no problem when the window is not active.
                     //        Qt will generate a WindowActivate event that will
                     //        do the job (L1310).  This does not happen if the
@@ -661,7 +630,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
     //        See L0660, L0671, L0685.
     initialize();
     window = 0;
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     setKeyCompression( false );
 
     // L0910: Trick Qt to create extraData();
@@ -694,7 +663,7 @@ QXEmbed::QXEmbed(TQWidget *parent, const char *name, WFlags f)
     if ( tqApp->activeWindow() == topLevelWidget() )
         if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
             XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), 
-                            RevertToParent, GET_QT_X_TIME() );
+                            RevertToParent, get_tqt_x_time() );
     // L0915: ??? [drag&drop?]
     setAcceptDrops( true );
 }
@@ -746,7 +715,7 @@ QXEmbed::~QXEmbed()
     int revert;
     XGetInputFocus( tqt_xdisplay(), &focus, &revert );
     if( focus == d->focusProxy->winId())
-        XSetInputFocus( tqt_xdisplay(), topLevelWidget()->winId(), RevertToParent, GET_QT_X_TIME() );
+        XSetInputFocus( tqt_xdisplay(), topLevelWidget()->winId(), RevertToParent, get_tqt_x_time() );
     // L01045: Delete our private data.
     delete d;
 }
@@ -810,13 +779,13 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
 
     switch ( e->type() ) {
     case TQEvent::WindowActivate:
-        if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) {
+        if ( o == topLevelWidget() ) {
             // L1310: Qt thinks the application window has just been activated.
             //        Make sure the X11 focus is on the focus proxy window. See L0686.
             if ( !((QPublicWidget*) topLevelWidget())->topData()->embedded )
                 if (! hasFocus() )
                     XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), 
-                                    RevertToParent, GET_QT_X_TIME() );
+                                    RevertToParent, get_tqt_x_time() );
             if (d->xplain)
                 // L1311: Activation has changed. Grab state might change. See L2800.
                 checkGrab();
@@ -826,7 +795,7 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
         }
         break;
     case TQEvent::WindowDeactivate:
-        if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(topLevelWidget()) ) {
+        if ( o == topLevelWidget() ) {
             if (d->xplain)
                 // L1321: Activation has changed. Grab state might change. See L2800.
                 checkGrab();
@@ -838,9 +807,9 @@ bool QXEmbed::eventFilter( TQObject *o, TQEvent * e)
     case TQEvent::Move:
         {
             TQWidget* pos = this;
-            while( TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(o) && TQT_BASE_OBJECT(pos) != TQT_BASE_OBJECT(topLevelWidget()))
+            while( pos != o && pos != topLevelWidget())
                 pos = pos->parentWidget();
-            if( TQT_BASE_OBJECT(pos) == TQT_BASE_OBJECT(o) ) {
+            if( pos == o ) {
                 // L1390: Send fake configure notify events whenever the
                 //        global position of the client changes. See L2900.
                 TQPoint globalPos = mapToGlobal(TQPoint(0,0));
@@ -900,7 +869,7 @@ void QXEmbed::focusInEvent( TQFocusEvent * e ){
           //        This is dual safety here because FocusIn implies this.
           //        But see L1581 for an example where this really matters.
           XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), 
-                          RevertToParent, GET_QT_X_TIME() );
+                          RevertToParent, get_tqt_x_time() );
     if (d->xplain) {
         // L1520: Qt focus has changed. Grab state might change. See L2800.
         checkGrab();
@@ -950,7 +919,7 @@ void QXEmbed::focusOutEvent( TQFocusEvent * ){
             //        Function isActiveWindow() also returns true when a modal
             //        dialog child of this window is active.
             XSetInputFocus( tqt_xdisplay(), d->focusProxy->winId(), 
-                            RevertToParent, GET_QT_X_TIME() );
+                            RevertToParent, get_tqt_x_time() );
 }
 
 
@@ -1168,13 +1137,9 @@ bool QXEmbed::x11Event( XEvent* e)
         if (d->xplain && d->xgrab) {
             // L2060: The passive grab has intercepted a mouse click
             //        in the embedded client window. Take the focus.
-#ifdef USE_QT4
-            setFocus();
-#else // USE_QT4
             TQFocusEvent::setReason( TQFocusEvent::Mouse );
             setFocus();
             TQFocusEvent::resetReason();
-#endif // USE_QT4
             // L2064: Resume X11 event processing.
             XAllowEvents(tqt_xdisplay(), ReplayPointer, CurrentTime);
             // L2065: Qt should not know about this.
@@ -1213,20 +1178,12 @@ bool QXEmbed::x11Event( XEvent* e)
                 if( ((QPublicWidget*)topLevelWidget())->topData()->embedded ) {
                     focusMap->remove( topLevelWidget() );
                     focusMap->insert( topLevelWidget(), new TQGuardedPtr<TQWidget>( this ));
-#ifdef USE_QT4
-                    WId window = ((QPublicWidget*)topLevelWidget())->effectiveWinId();
-#else // USE_QT4
                     WId window = ((QPublicWidget*)topLevelWidget())->topData()->parentWinId;
-#endif // USE_QT4
                     sendXEmbedMessage( window, XEMBED_REQUEST_FOCUS );
                 } else {
-#ifdef USE_QT4
-                    setFocus();
-#else // USE_QT4
                     TQFocusEvent::setReason( TQFocusEvent::Mouse );
                     setFocus();
                     TQFocusEvent::resetReason();
-#endif // USE_QT4
                 }
                 break;
             default:
@@ -1318,12 +1275,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window)
     XReparentWindow(tqt_xdisplay(), client->winId(), window, 0, 0);
     // L2451: These two lines are redundant. See L0680.
     ((QXEmbed*)client)->topData()->embedded = true;
-#ifdef USE_QT4
-    // [FIXME]
-    printf("[FIXME] WId not set in tdelibs/tdeui/qxembed.cpp\n");
-#else // USE_QT4
     ((QXEmbed*)client)->topData()->parentWinId = window;
-#endif // USE_QT4
     // L2452: This seems redundant because L2020 maps the window.
     //        But calling show() might also set Qt internal flags.
     client->show();
@@ -1447,4 +1399,4 @@ void QXEmbed::reparent( TQWidget * parent, WFlags f, const TQPoint & p, bool sho
 
 // for KDE
 #include "qxembed.moc"
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index 5c409fd51..c21b96eac 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -25,11 +25,7 @@
 #include <tqwidget.h>
 #include <tdelibs_export.h>
 
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 class QXEmbedData;
 
@@ -61,7 +57,7 @@ class QXEmbedData;
 */
 class TDEUI_EXPORT QXEmbed : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
index e9eb2f4b8..636d336f2 100644
--- a/tdeui/tdeaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -96,8 +96,8 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData )
     url->setText(aboutData->homepage());
     url->setURL(aboutData->homepage());
     appPage->addWidget( url );
-    connect( url, TQT_SIGNAL(leftClickedURL(const TQString &)),
-             this, TQT_SLOT(openURLSlot(const TQString &)));
+    connect( url, TQ_SIGNAL(leftClickedURL(const TQString &)),
+             this, TQ_SLOT(openURLSlot(const TQString &)));
   }
 
   int authorCount = aboutData->authors().count();
diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index d0ab3dc3d..57bc84d24 100644
--- a/tdeui/tdeaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -96,15 +96,15 @@ TDEAboutContributor::TDEAboutContributor( TQWidget *_parent, const char *wname,
   kurl->setFloat(true);
   kurl->setUnderline(true);
   kurl->setMargin(0);
-  connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)),
-	  TQT_SLOT(emailClickedSlot(const TQString &)));
+  connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)),
+	  TQ_SLOT(emailClickedSlot(const TQString &)));
 
   kurl = static_cast<KURLLabel *>(mText[2]);
   kurl->setFloat(true);
   kurl->setUnderline(true);
   kurl->setMargin(0);
-  connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)),
-	  TQT_SLOT(urlClickedSlot(const TQString &)));
+  connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)),
+	  TQ_SLOT(urlClickedSlot(const TQString &)));
 
   mLabel[3]->setAlignment( AlignTop );
 
@@ -227,8 +227,8 @@ void TDEAboutContributor::updateLayout( void )
       {
 	if( mShowHeader )
 	{
-	  gbox->addWidget( TQT_TQWIDGET(mLabel[i]), r, 0, (TQ_Alignment)AlignLeft );
-	  gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft  );
+	  gbox->addWidget( mLabel[i], r, 0, (TQt::AlignmentFlags)AlignLeft );
+	  gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft  );
 	  mLabel[i]->show();
 	  mText[i]->show();
 	}
@@ -237,11 +237,11 @@ void TDEAboutContributor::updateLayout( void )
 	  mLabel[i]->hide();
 	  if( !i )
 	  {
-	    gbox->addMultiCellWidget( TQT_TQWIDGET(mText[i]), r, r, 0, 1, (TQ_Alignment)AlignLeft );
+	    gbox->addMultiCellWidget( mText[i], r, r, 0, 1, (TQt::AlignmentFlags)AlignLeft );
 	  }
 	  else
 	  {
-	    gbox->addWidget( TQT_TQWIDGET(mText[i]), r, 1, (TQ_Alignment)AlignLeft  );
+	    gbox->addWidget( mText[i], r, 1, (TQt::AlignmentFlags)AlignLeft  );
 	  }
 	  mText[i]->show();
 	}
@@ -359,8 +359,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent,
 
     vbox = new TQVBoxLayout( mImageFrame, 1 );
     mImageLabel = new KImageTrackLabel( mImageFrame );
-    connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
-	     TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
+    connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
+	     TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
     vbox->addStretch(10);
     vbox->addWidget( mImageLabel );
     vbox->addStretch(10);
@@ -386,8 +386,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent,
     gbox->setColStretch( 2, 10 );
 
     mImageLabel = new KImageTrackLabel( mImageFrame );
-    connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
-	     TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
+    connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
+	     TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
     gbox->addWidget( mImageLabel, 1, 1 );
     gbox->activate();
   }
@@ -410,8 +410,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent,
 
     vbox = new TQVBoxLayout( mImageFrame, 1 );
     mImageLabel = new KImageTrackLabel( mImageFrame );
-    connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
-	     TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
+    connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )),
+	     TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) );
     vbox->addStretch(10);
     vbox->addWidget( mImageLabel );
     vbox->addStretch(10);
@@ -475,10 +475,10 @@ TQFrame *TDEAboutContainerBase::addTextPage( const TQString &title,
     browser->setMinimumHeight( fontMetrics().lineSpacing()*numLines );
 
     vbox->addWidget(browser);
-    connect(browser, TQT_SIGNAL(urlClick(const TQString &)),
-	    TQT_SLOT(slotUrlClick(const TQString &)));
-    connect(browser, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-	    TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+    connect(browser, TQ_SIGNAL(urlClick(const TQString &)),
+	    TQ_SLOT(slotUrlClick(const TQString &)));
+    connect(browser, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+	    TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
   }
   else
   {
@@ -527,10 +527,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainerPage( const TQString &titl
 						  innerAlignment );
   mPageTab->addTab( container, title );
 
-  connect(container, TQT_SIGNAL(urlClick(const TQString &)),
-	  TQT_SLOT(slotUrlClick(const TQString &)));
-  connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-	  TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+  connect(container, TQ_SIGNAL(urlClick(const TQString &)),
+	  TQ_SLOT(slotUrlClick(const TQString &)));
+  connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+	  TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
 
   return container;
 }
@@ -559,10 +559,10 @@ TDEAboutContainer *TDEAboutContainerBase::addScrolledContainerPage(
   scrollView->addChild( container );
 
 
-  connect(container, TQT_SIGNAL(urlClick(const TQString &)),
-	  TQT_SLOT(slotUrlClick(const TQString &)));
-  connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-	  TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+  connect(container, TQ_SIGNAL(urlClick(const TQString &)),
+	  TQ_SLOT(slotUrlClick(const TQString &)));
+  connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+	  TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
 
   return container;
 }
@@ -591,10 +591,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainer( int childAlignment,
     0, KDialog::spacingHint(), childAlignment, innerAlignment );
   mTopLayout->addWidget( container, 0, childAlignment );
 
-  connect(container, TQT_SIGNAL(urlClick(const TQString &)),
-	  TQT_SLOT(slotUrlClick(const TQString &)));
-  connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-	  TQT_SLOT(slotMailClick(const TQString &,const TQString &)));
+  connect(container, TQ_SIGNAL(urlClick(const TQString &)),
+	  TQ_SLOT(slotUrlClick(const TQString &)));
+  connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+	  TQ_SLOT(slotMailClick(const TQString &,const TQString &)));
 
   return container;
 }
@@ -800,7 +800,7 @@ void TDEAboutContainer::childEvent( TQChildEvent *e )
     ++itr;
     if( o->isWidgetType() )
     {
-        TQT_TQWIDGET(o)->setMinimumWidth( s.width() );
+        static_cast<TQWidget*>(o)->setMinimumWidth( s.width() );
     }
   }
 }
@@ -826,7 +826,7 @@ TQSize TDEAboutContainer::sizeHint( void ) const
     if( o->isWidgetType() )
     {
       ++numChild;
-      TQWidget* const w= TQT_TQWIDGET(o);
+      TQWidget* const w= static_cast<TQWidget*>(o);
 
       TQSize s = w->minimumSize();
       if( s.isEmpty() )
@@ -883,10 +883,10 @@ void TDEAboutContainer::addPerson( const TQString &_name, const TQString &_email
 
   TDEAboutContributor* const cont = new TDEAboutContributor( this, "pers",
     _name, _email, _url, _task, showHeader, showFrame, showBold );
-  connect( cont, TQT_SIGNAL( openURL(const TQString&)),
-	   this, TQT_SIGNAL( urlClick(const TQString &)));
-  connect( cont, TQT_SIGNAL( sendEmail(const TQString &, const TQString &)),
-	   this, TQT_SIGNAL( mailClick(const TQString &, const TQString &)));
+  connect( cont, TQ_SIGNAL( openURL(const TQString&)),
+	   this, TQ_SIGNAL( urlClick(const TQString &)));
+  connect( cont, TQ_SIGNAL( sendEmail(const TQString &, const TQString &)),
+	   this, TQ_SIGNAL( mailClick(const TQString &, const TQString &)));
 }
 
 
@@ -938,7 +938,7 @@ void TDEAboutContainer::addImage( const TQString &fileName, int alignment )
 class TDEAboutContributor : public QFrame
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /** The Qt constructor. */
@@ -1011,10 +1011,10 @@ TDEAboutContributor::TDEAboutContributor(TQWidget* parent, const char* n)
     }
   setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   // -----
-  connect(email, TQT_SIGNAL(leftClickedURL(const TQString&)),
-	  TQT_SLOT(emailClickedSlot(const TQString&)));
-  connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
-	  TQT_SLOT(urlClickedSlot(const TQString&)));
+  connect(email, TQ_SIGNAL(leftClickedURL(const TQString&)),
+	  TQ_SLOT(emailClickedSlot(const TQString&)));
+  connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)),
+	  TQ_SLOT(urlClickedSlot(const TQString&)));
   // ############################################################
 }
 
@@ -1026,7 +1026,7 @@ TDEAboutContributor::setName(const TQString& n)
   // ############################################################
 }
 
-QString
+TQString
 TDEAboutContributor::getName()
 {
   // ###########################################################
@@ -1041,7 +1041,7 @@ TDEAboutContributor::setURL(const TQString& u)
   // ###########################################################
 }
 
-QString
+TQString
 TDEAboutContributor::getURL()
 {
   // ###########################################################
@@ -1057,7 +1057,7 @@ TDEAboutContributor::setEmail(const TQString& e)
   // ###########################################################
 }
 
-QString
+TQString
 TDEAboutContributor::getEmail()
 {
   // ###########################################################
@@ -1328,14 +1328,14 @@ TDEAboutWidget::TDEAboutWidget(TQWidget *_parent, const char *_name)
   logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised);
   version->setAlignment(AlignCenter);
   // -----
-  connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)),
-	  TQT_SLOT(sendEmailSlot(const TQString&, const TQString&)));
-  connect(author, TQT_SIGNAL(openURL(const TQString&)),
-	  TQT_SLOT(openURLSlot(const TQString&)));
-  connect(maintainer, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)),
-	  TQT_SLOT(sendEmailSlot(const TQString&, const TQString&)));
-  connect(maintainer, TQT_SIGNAL(openURL(const TQString&)),
-	  TQT_SLOT(openURLSlot(const TQString&)));
+  connect(author, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)),
+	  TQ_SLOT(sendEmailSlot(const TQString&, const TQString&)));
+  connect(author, TQ_SIGNAL(openURL(const TQString&)),
+	  TQ_SLOT(openURLSlot(const TQString&)));
+  connect(maintainer, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)),
+	  TQ_SLOT(sendEmailSlot(const TQString&, const TQString&)));
+  connect(maintainer, TQ_SIGNAL(openURL(const TQString&)),
+	  TQ_SLOT(openURLSlot(const TQString&)));
   // #################################################################
 }
 
@@ -1439,9 +1439,9 @@ TDEAboutWidget::addContributor(const TQString &_name, const TQString &_email,
   c->setURL(_url);
   c->setWork(_w);
   contributors.append(c);
-  connect(c, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)),
-	  TQT_SLOT(sendEmailSlot(const TQString&, const TQString&)));
-  connect(c, TQT_SIGNAL(openURL(const TQString&)), TQT_SLOT(openURLSlot(const TQString&)));
+  connect(c, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)),
+	  TQ_SLOT(sendEmailSlot(const TQString&, const TQString&)));
+  connect(c, TQ_SIGNAL(openURL(const TQString&)), TQ_SLOT(openURLSlot(const TQString&)));
   // ############################################################################
 }
 
@@ -1515,10 +1515,10 @@ TDEAboutDialog::TDEAboutDialog(TQWidget *_parent, const char *_name, bool modal)
     tqApp->quit();
   }
   setMainWidget(about);
-  connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)),
-	  TQT_SLOT(sendEmailSlot(const TQString&, const TQString&)));
-  connect(about, TQT_SIGNAL(openURL(const TQString&)),
-	  TQT_SLOT(openURLSlot(const TQString&)));
+  connect(about, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)),
+	  TQ_SLOT(sendEmailSlot(const TQString&, const TQString&)));
+  connect(about, TQ_SIGNAL(openURL(const TQString&)),
+	  TQ_SLOT(openURLSlot(const TQString&)));
   // #################################################################
 }
 
@@ -1537,12 +1537,12 @@ TDEAboutDialog::TDEAboutDialog( int layoutType, const TQString &_caption,
   mContainerBase = new TDEAboutContainerBase( layoutType, this );
   setMainWidget(mContainerBase);
 
-  connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)),
-	   this, TQT_SLOT(openURLSlot(const TQString &)));
-  connect( mContainerBase, TQT_SIGNAL(mailClick(const TQString &,const TQString &)),
-	   this, TQT_SLOT(sendEmailSlot(const TQString &,const TQString &)));
-  connect( mContainerBase, TQT_SIGNAL(mouseTrack(int, const TQMouseEvent *)),
-	   this, TQT_SLOT(mouseTrackSlot(int, const TQMouseEvent *)));
+  connect( mContainerBase, TQ_SIGNAL(urlClick(const TQString &)),
+	   this, TQ_SLOT(openURLSlot(const TQString &)));
+  connect( mContainerBase, TQ_SIGNAL(mailClick(const TQString &,const TQString &)),
+	   this, TQ_SLOT(sendEmailSlot(const TQString &,const TQString &)));
+  connect( mContainerBase, TQ_SIGNAL(mouseTrack(int, const TQMouseEvent *)),
+	   this, TQ_SLOT(mouseTrackSlot(int, const TQMouseEvent *)));
 }
 
 
diff --git a/tdeui/tdeaboutdialog.h b/tdeui/tdeaboutdialog.h
index 0ebb89174..d637a64b7 100644
--- a/tdeui/tdeaboutdialog.h
+++ b/tdeui/tdeaboutdialog.h
@@ -49,7 +49,7 @@ class TDEAboutContainerPrivate;
  */
 class TDEUI_EXPORT TDEAboutContainer : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TDEAboutContainer( TQWidget *parent=0, const char *name=0,
@@ -91,7 +91,7 @@ class TDEAboutContributorPrivate;
  */
 class TDEUI_EXPORT TDEAboutContributor : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TDEAboutContributor( TQWidget *parent=0, const char *name=0,
@@ -149,7 +149,7 @@ class TDEUI_EXPORT TDEAboutContributor : public TQFrame
  */
 class TDEUI_EXPORT TDEAboutWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -282,7 +282,7 @@ class TDEAboutDialogPrivate;
  */
 class TDEUI_EXPORT TDEAboutDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
   /**
diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp
index 64d9fa95b..b29d482f3 100644
--- a/tdeui/tdeabouttde.cpp
+++ b/tdeui/tdeabouttde.cpp
@@ -85,7 +85,7 @@ TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal )
   setHelp( TQString::fromLatin1("khelpcenter/main.html"), TQString::null );
   setTitle(i18n("Trinity Desktop Environment. Release %1").
 	   arg(TQString::fromLatin1(TDE_VERSION_STRING)) );
-  addTextPage( i18n("About Trinity","&About"), text1, true );
+  addTextPage( i18n("About TDE","&About"), text1, true );
   addTextPage( i18n("&Report Bugs/Request Enhancements"), text2, true );
   addTextPage( i18n("&Join the Trinity Team"), text3, true );
   addTextPage( i18n("&Support Trinity"), text4, true );
diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp
index 63f633d95..d63e71feb 100644
--- a/tdeui/tdeaction.cpp
+++ b/tdeui/tdeaction.cpp
@@ -256,13 +256,13 @@ void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut,
 {
     d->m_cutDefault = cut;
 
-    m_parentCollection = tqt_dynamic_cast<TDEActionCollection *>( parent() );
+    m_parentCollection = dynamic_cast<TDEActionCollection *>( parent() );
     kdDebug(129) << "TDEAction::initPrivate(): this = " << this << " name = \"" << name() << "\" cut = " << cut.toStringInternal() << " m_parentCollection = " << m_parentCollection << endl;
     if ( m_parentCollection )
         m_parentCollection->insert( this );
 
     if ( receiver && slot )
-        connect( this, TQT_SIGNAL( activated() ), receiver, slot );
+        connect( this, TQ_SIGNAL( activated() ), receiver, slot );
 
     if( !cut.isNull() && !qstrcmp( name(), "unnamed" ) )
         kdWarning(129) << "TDEAction::initPrivate(): trying to assign a shortcut (" << cut.toStringInternal() << ") to an unnamed action." << endl;
@@ -462,7 +462,7 @@ bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel )
       kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl;
       b = tdeaccel->insert( name(), d->plainText(), TQString::null,
           d->m_cut,
-          this, TQT_SLOT(slotActivated()),
+          this, TQ_SLOT(slotActivated()),
           isShortcutConfigurable(), isEnabled() );
     }
   }
@@ -478,7 +478,7 @@ void TDEAction::insertTDEAccel( TDEAccel* tdeaccel )
   if ( !tdeaccel->actions().actionPtr( name() ) ) {
     if( updateTDEAccelShortcut( tdeaccel ) ) {
       d->m_tdeaccelList.append( tdeaccel );
-      connect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+      connect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
     }
   }
   else
@@ -496,7 +496,7 @@ void TDEAction::removeTDEAccel( TDEAccel* tdeaccel )
     if( (*itr) == tdeaccel ) {
       tdeaccel->remove( name() );
       accelList.remove( itr );
-      disconnect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+      disconnect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
       break;
     }
   }
@@ -515,11 +515,11 @@ void TDEAction::updateShortcut( int i )
   int id = itemId( i );
 
   TQWidget* w = container( i );
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) ) {
+  if ( ::tqt_cast<TQPopupMenu *>( w ) ) {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>(w);
     updateShortcut( menu, id );
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( w ) )
+  else if ( ::tqt_cast<TQMenuBar *>( w ) )
     static_cast<TQMenuBar*>(w)->setAccel( d->m_cut.keyCodeQt(), id );
 }
 
@@ -616,7 +616,7 @@ void TDEAction::updateToolTip( int i )
 {
   TQWidget *w = container( i );
 
-  if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  if ( ::tqt_cast<TDEToolBar *>( w ) )
     TQToolTip::add( static_cast<TDEToolBar*>(w)->getWidget( itemId( i ) ), d->toolTip() );
 }
 
@@ -649,7 +649,7 @@ int TDEAction::plug( TQWidget *w, int index )
 
   plugShortcut();
 
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) )
+  if ( ::tqt_cast<TQPopupMenu *>( w ) )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( w );
     int id;
@@ -664,12 +664,12 @@ int TDEAction::plug( TQWidget *w, int index )
         else
           instance = TDEGlobal::instance();
         id = menu->insertItem( d->iconSet( TDEIcon::Small, 0, instance ), d->text(), this,//dsweet
-                                 TQT_SLOT( slotPopupActivated() ), keyQt,
+                                 TQ_SLOT( slotPopupActivated() ), keyQt,
                                  -1, index );
     }
     else
         id = menu->insertItem( d->text(), this,
-                               TQT_SLOT( slotPopupActivated() ),
+                               TQ_SLOT( slotPopupActivated() ),
                                keyQt, -1, index );
 
     // If the shortcut is already in a TDEAccel object, then
@@ -686,14 +686,14 @@ int TDEAction::plug( TQWidget *w, int index )
         menu->TQMenuData::setWhatsThis( id, whatsThisWithIcon() );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if ( m_parentCollection )
       m_parentCollection->connectHighlight( menu, this );
 
     return d->m_containers.count() - 1;
   }
-  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  else if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
     TDEToolBar *bar = static_cast<TDEToolBar *>( w );
 
@@ -706,8 +706,8 @@ int TDEAction::plug( TQWidget *w, int index )
 
     if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly
     {
-        bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
-                           TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
+        bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
+                           TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
                            d->isEnabled(), d->plainText(), index );
     }
     else
@@ -715,8 +715,8 @@ int TDEAction::plug( TQWidget *w, int index )
         TQString icon = d->iconName();
         if ( icon.isEmpty() )
             icon = "unknown";
-        bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
-                           TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
+        bar->insertButton( icon, id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
+                           TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
                            d->isEnabled(), d->plainText(), index, instance );
     }
 
@@ -731,7 +731,7 @@ int TDEAction::plug( TQWidget *w, int index )
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if ( m_parentCollection )
       m_parentCollection->connectHighlight( bar, this );
@@ -749,17 +749,17 @@ void TDEAction::unplug( TQWidget *w )
     return;
   int id = itemId( i );
 
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) )
+  if ( ::tqt_cast<TQPopupMenu *>( w ) )
   {
     TQPopupMenu *menu = static_cast<TQPopupMenu *>( w );
     menu->removeItem( id );
   }
-  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  else if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
     TDEToolBar *bar = static_cast<TDEToolBar *>( w );
     bar->removeItemDelayed( id );
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( w ) )
+  else if ( ::tqt_cast<TQMenuBar *>( w ) )
   {
     TQMenuBar *bar = static_cast<TQMenuBar *>( w );
     bar->removeItem( id );
@@ -791,10 +791,10 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable)
     d->m_tdeaccel = kacc;
     d->m_tdeaccel->insert(name(), d->plainText(), TQString::null,
         TDEShortcut(d->m_cut),
-        this, TQT_SLOT(slotActivated()),
+        this, TQ_SLOT(slotActivated()),
         configurable, isEnabled());
-    connect(d->m_tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()));
-    //connect(d->m_tdeaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged()));
+    connect(d->m_tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()));
+    //connect(d->m_tdeaccel, TQ_SIGNAL(keycodeChanged()), this, TQ_SLOT(slotKeycodeChanged()));
   }
   else
   {
@@ -822,7 +822,7 @@ void TDEAction::plugMainWindowAccel( TQWidget *w )
   while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
     tl = n;
 
-  TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
+  TDEMainWindow * mw = dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
   if (mw)
     plugAccel( mw->accel() );
   else
@@ -863,11 +863,11 @@ void TDEAction::updateEnabled( int i )
 {
     TQWidget *w = container( i );
 
-    if ( ::tqqt_cast<TQPopupMenu *>( w ) )
+    if ( ::tqt_cast<TQPopupMenu *>( w ) )
       static_cast<TQPopupMenu*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
-    else if ( ::tqqt_cast<TQMenuBar *>( w ) )
+    else if ( ::tqt_cast<TQMenuBar *>( w ) )
       static_cast<TQMenuBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
-    else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+    else if ( ::tqt_cast<TDEToolBar *>( w ) )
       static_cast<TDEToolBar*>(w)->setItemEnabled( itemId( i ), d->isEnabled() );
 }
 
@@ -909,18 +909,18 @@ void TDEAction::updateText( int i )
 {
   TQWidget *w = container( i );
 
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) ) {
+  if ( ::tqt_cast<TQPopupMenu *>( w ) ) {
     int id = itemId( i );
     static_cast<TQPopupMenu*>(w)->changeItem( id, d->text() );
     if (!d->m_cut.isNull())
       updateShortcut( static_cast<TQPopupMenu*>(w), id );
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( w ) )
+  else if ( ::tqt_cast<TQMenuBar *>( w ) )
     static_cast<TQMenuBar*>(w)->changeItem( itemId( i ), d->text() );
-  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  else if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
     TQWidget *button = static_cast<TDEToolBar *>(w)->getWidget( itemId( i ) );
-    if ( ::tqqt_cast<TDEToolBarButton *>( button ) )
+    if ( ::tqt_cast<TDEToolBarButton *>( button ) )
       static_cast<TDEToolBarButton *>(button)->setText( d->plainText() );
   }
 }
@@ -949,15 +949,15 @@ void TDEAction::updateIcon( int id )
 {
   TQWidget* w = container( id );
 
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) ) {
+  if ( ::tqt_cast<TQPopupMenu *>( w ) ) {
     int itemId_ = itemId( id );
     static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet( TDEIcon::Small ), d->text() );
     if (!d->m_cut.isNull())
       updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ );
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( w ) )
+  else if ( ::tqt_cast<TQMenuBar *>( w ) )
     static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet( TDEIcon::Small ), d->text() );
-  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  else if ( ::tqt_cast<TDEToolBar *>( w ) )
     static_cast<TDEToolBar *>(w)->setButtonIcon( itemId( id ), d->iconName() );
 }
 
@@ -980,16 +980,16 @@ void TDEAction::updateIconSet( int id )
 {
   TQWidget *w = container( id );
 
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) )
+  if ( ::tqt_cast<TQPopupMenu *>( w ) )
   {
     int itemId_ = itemId( id );
     static_cast<TQPopupMenu*>(w)->changeItem( itemId_, d->iconSet(), d->text() );
     if (!d->m_cut.isNull())
       updateShortcut( static_cast<TQPopupMenu*>(w), itemId_ );
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( w ) )
+  else if ( ::tqt_cast<TQMenuBar *>( w ) )
     static_cast<TQMenuBar*>(w)->changeItem( itemId( id ), d->iconSet(), d->text() );
-  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  else if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
     if ( icon().isEmpty() && d->hasIcon() ) // only if there is no named icon ( scales better )
       static_cast<TDEToolBar *>(w)->setButtonIconSet( itemId( id ), d->iconSet() );
@@ -1057,12 +1057,12 @@ TQWidget* TDEAction::container( int index ) const
 
 TDEToolBar* TDEAction::toolBar( int index ) const
 {
-    return tqt_dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container );
+    return dynamic_cast<TDEToolBar *>( d->m_containers[ index ].m_container );
 }
 
 TQPopupMenu* TDEAction::popupMenu( int index ) const
 {
-    return tqt_dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container );
+    return dynamic_cast<TQPopupMenu *>( d->m_containers[ index ].m_container );
 }
 
 TQWidget* TDEAction::representative( int index ) const
@@ -1103,17 +1103,17 @@ void TDEAction::addContainer( TQWidget* c, TQWidget* w )
 
 void TDEAction::activate()
 {
-  emit activated( TDEAction::EmulatedActivation, Qt::NoButton );
+  emit activated( TDEAction::EmulatedActivation, TQt::NoButton );
   slotActivated();
 }
 
 void TDEAction::slotActivated()
 {
-  const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
+  const TQObject *senderObj = sender();
   if ( senderObj )
   {
-    if ( ::tqqt_cast<TDEAccelPrivate *>( senderObj ) )
-        emit activated( TDEAction::AccelActivation, Qt::NoButton );
+    if ( ::tqt_cast<TDEAccelPrivate *>( senderObj ) )
+        emit activated( TDEAction::AccelActivation, TQt::NoButton );
   }
   emit activated();
 }
@@ -1124,16 +1124,16 @@ void TDEAction::slotActivated()
 // only called by QPopupMenus, we plugged us in.
 void TDEAction::slotPopupActivated()
 {
-  if( ::tqqt_cast<TQSignal *>(sender()))
+  if( ::tqt_cast<TQSignal *>(sender()))
   {
-    int id = tqt_dynamic_cast<const TQSignal *>(sender())->value().toInt();
+    int id = dynamic_cast<const TQSignal *>(sender())->value().toInt();
     int pos = findContainer(id);
     if(pos != -1)
     {
-      TQPopupMenu* qpm = tqt_dynamic_cast<TQPopupMenu *>( container(pos) );
+      TQPopupMenu* qpm = dynamic_cast<TQPopupMenu *>( container(pos) );
       if(qpm)
       {
-        TDEPopupMenu* kpm = tqt_dynamic_cast<TDEPopupMenu *>( qpm );
+        TDEPopupMenu* kpm = dynamic_cast<TDEPopupMenu *>( qpm );
         TQt::ButtonState state;
         if ( kpm ) // TDEPopupMenu? Nice, it stores the state.
             state = kpm->state();
@@ -1149,7 +1149,7 @@ void TDEAction::slotPopupActivated()
   }
 
   kdWarning(129)<<"Don't connect TDEAction::slotPopupActivated() to anything, expect into QPopupMenus which are in containers. Use slotActivated instead."<<endl;
-  emit activated( TDEAction::PopupMenuActivation, Qt::NoButton );
+  emit activated( TDEAction::PopupMenuActivation, TQt::NoButton );
   slotActivated();
 }
 
@@ -1159,7 +1159,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
   emit activated( TDEAction::ToolBarActivation, state );
 
   // RightButton isn't really an activation
-  if ( ( state & Qt::LeftButton ) || ( state & Qt::MidButton ) )
+  if ( ( state & TQt::LeftButton ) || ( state & TQt::MidButton ) )
     slotActivated();
 }
 
@@ -1167,7 +1167,7 @@ void TDEAction::slotButtonClicked( int, TQt::ButtonState state )
 void TDEAction::slotDestroyed()
 {
   kdDebug(129) << "TDEAction::slotDestroyed(): this = " << this << ", name = \"" << name() << "\", sender = " << sender() << endl;
-  const TQObject* const o = TQT_TQOBJECT_CONST(sender());
+  const TQObject* const o = sender();
 
 #ifndef KDE_NO_COMPAT  // KDE 4: remove
   if ( o == d->m_tdeaccel )
@@ -1184,7 +1184,7 @@ void TDEAction::slotDestroyed()
   {
     if ( o == *itr )
     {
-      disconnect( *itr, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) );
+      disconnect( *itr, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) );
       accelList.remove(itr);
       return;
     }
@@ -1193,7 +1193,7 @@ void TDEAction::slotDestroyed()
   int i;
   do
   {
-    i = findContainer( TQT_TQWIDGET_CONST( static_cast<const QObject*>(o) ) );
+    i = findContainer(  static_cast<const TQWidget*>(o)  );
     if ( i != -1 )
       removeContainer( i );
   } while ( i != -1 );
diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h
index cc803022f..9bf232c49 100644
--- a/tdeui/tdeaction.h
+++ b/tdeui/tdeaction.h
@@ -109,12 +109,12 @@ class TDEMainWindow;
  *
  * \code
  * TQSignalMapper *desktopNumberMapper = new TQSignalMapper( this );
- * connect( desktopNumberMapper, TQT_SIGNAL( mapped( int ) ),
- *          this, TQT_SLOT( moveWindowToDesktop( int ) ) );
+ * connect( desktopNumberMapper, TQ_SIGNAL( mapped( int ) ),
+ *          this, TQ_SLOT( moveWindowToDesktop( int ) ) );
  *
  * for ( uint i = 0; i < numberOfDesktops; ++i ) {
  *     TDEAction *desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... );
- *     connect( desktopAction, TQT_SIGNAL( activated() ), desktopNumberMapper, TQT_SLOT( map() ) );
+ *     connect( desktopAction, TQ_SIGNAL( activated() ), desktopNumberMapper, TQ_SLOT( map() ) );
  *     desktopNumberMapper->setMapping( desktopAction, i );
  * }
  * \endcode
@@ -135,7 +135,7 @@ class TDEMainWindow;
  * \code
  * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new",
  *                               TDEStdAccel::shortcut(TDEStdAccel::New),
- *                               this, TQT_SLOT(fileNew()),
+ *                               this, TQ_SLOT(fileNew()),
  *                               actionCollection(), "new");
  * \endcode
  * This line creates our action.  It says that wherever this action is
@@ -202,7 +202,7 @@ class TDEMainWindow;
 class TDEUI_EXPORT TDEAction : public TQObject
 {
   friend class TDEActionCollection;
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int containerCount READ containerCount )
   TQ_PROPERTY( TQString plainText READ plainText )
   TQ_PROPERTY( TQString text READ text WRITE setText )
@@ -215,7 +215,7 @@ class TDEUI_EXPORT TDEAction : public TQObject
 public:
     /**
      * Constructs an action with text, potential keyboard
-     * shortcut, and a TQT_SLOT to call when this action is invoked by
+     * shortcut, and a slot to call when this action is invoked by
      * the user.
      *
      * If you do not want or have a keyboard shortcut,
@@ -228,8 +228,8 @@ public:
      *
      * @param text The text that will be displayed.
      * @param cut The corresponding keyboard shortcut.
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
@@ -239,7 +239,7 @@ public:
 
     /**
      * Constructs an action with text, icon, potential keyboard
-     * shortcut, and a TQT_SLOT to call when this action is invoked by
+     * shortcut, and a slot to call when this action is invoked by
      * the user.
      *
      * If you do not want or have a keyboard shortcut, set the
@@ -251,8 +251,8 @@ public:
      * @param text The text that will be displayed.
      * @param pix The icon to display.
      * @param cut The corresponding keyboard shortcut.
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
@@ -262,7 +262,7 @@ public:
 
     /**
      * Constructs an action with text, icon, potential keyboard
-     * shortcut, and a TQT_SLOT to call when this action is invoked by
+     * shortcut, and a slot to call when this action is invoked by
      * the user.  The icon is loaded on demand later based on where it
      * is plugged in.
      *
@@ -275,8 +275,8 @@ public:
      * @param text The text that will be displayed.
      * @param pix The icon to display.
      * @param cut The corresponding keyboard shortcut (shortcut).
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
@@ -290,8 +290,8 @@ public:
      *
      * @param item The KGuiItem with the label and (optional) icon.
      * @param cut The corresponding keyboard shortcut (shortcut).
-     * @param receiver The SLOT's parent.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's parent.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index a1e9f28a3..ad9c4d102 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -137,7 +137,7 @@ TDEToggleAction::~TDEToggleAction()
 
 int TDEToggleAction::plug( TQWidget* widget, int index )
 {
-  if ( !::tqqt_cast<TQPopupMenu *>( widget ) && !::tqqt_cast<TDEToolBar *>( widget ) )
+  if ( !::tqt_cast<TQPopupMenu *>( widget ) && !::tqt_cast<TDEToolBar *>( widget ) )
   {
     kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl;
     return -1;
@@ -149,7 +149,7 @@ int TDEToggleAction::plug( TQWidget* widget, int index )
   if ( _index == -1 )
     return _index;
 
-  if ( ::tqqt_cast<TDEToolBar *>( widget ) ) {
+  if ( ::tqt_cast<TDEToolBar *>( widget ) ) {
     TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
 
     bar->setToggle( itemId( _index ), true );
@@ -180,7 +180,7 @@ void TDEToggleAction::setChecked( bool c )
     if ( !list.isEmpty() ) {
       TQObjectListIt it( list );
       for( ; it.current(); ++it ) {
-          if ( ::tqqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this &&
+          if ( ::tqt_cast<TDEToggleAction *>( it.current() ) && it.current() != this &&
             static_cast<TDEToggleAction*>(it.current())->exclusiveGroup() == exclusiveGroup() ) {
 	  TDEToggleAction *a = static_cast<TDEToggleAction*>(it.current());
 	  if( a->isChecked() ) {
@@ -197,7 +197,7 @@ void TDEToggleAction::updateChecked( int id )
 {
   TQWidget *w = container( id );
 
-  if ( ::tqqt_cast<TQPopupMenu *>( w ) ) {
+  if ( ::tqt_cast<TQPopupMenu *>( w ) ) {
     TQPopupMenu* pm = static_cast<TQPopupMenu*>(w);
     int itemId_ = itemId( id );
     if ( !d->m_checkedGuiItem )
@@ -219,12 +219,12 @@ void TDEToggleAction::updateChecked( int id )
       updateShortcut( pm, itemId_ );
     }
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( w ) ) // not handled in plug...
+  else if ( ::tqt_cast<TQMenuBar *>( w ) ) // not handled in plug...
     static_cast<TQMenuBar*>(w)->setItemChecked( itemId( id ), d->m_checked );
-  else if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  else if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
     TQWidget* r = static_cast<TDEToolBar*>( w )->getButton( itemId( id ) );
-    if ( r && ::tqqt_cast<TDEToolBarButton *>( r ) ) {
+    if ( r && ::tqt_cast<TDEToolBarButton *>( r ) ) {
       static_cast<TDEToolBar*>( w )->setButton( itemId( id ), d->m_checked );
       if ( d->m_checkedGuiItem && d->m_checkedGuiItem->hasIcon() ) {
         const KGuiItem* gui = d->m_checked ? d->m_checkedGuiItem : &guiItem();
@@ -322,12 +322,12 @@ void TDERadioAction::slotActivated()
 {
   if ( isChecked() )
   {
-    const TQObject *senderObj = TQT_TQOBJECT_CONST(sender());
+    const TQObject *senderObj = sender();
 
-    if ( !senderObj || !::tqqt_cast<const TDEToolBarButton *>( senderObj ) )
+    if ( !senderObj || !::tqt_cast<const TDEToolBarButton *>( senderObj ) )
       return;
 
-    const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( TQT_TQWIDGET_CONST(senderObj) ) )->on( true );
+    const_cast<TDEToolBarButton *>( static_cast<const TDEToolBarButton *>( senderObj ) )->on( true );
 
     return;
   }
@@ -507,7 +507,7 @@ void TDESelectAction::setupMenu() const
     for( uint id = 0; it != d->m_list.end(); ++it, ++id ) {
         TQString text = *it;
         if ( !text.isEmpty() )
-            d->m_menu->insertItem( d->makeMenuText( text ), this, TQT_SLOT( slotActivated( int ) ), 0, id );
+            d->m_menu->insertItem( d->makeMenuText( text ), this, TQ_SLOT( slotActivated( int ) ), 0, id );
         else
             d->m_menu->insertSeparator();
     }
@@ -537,10 +537,10 @@ void TDESelectAction::changeItem( int id, int index, const TQString& text)
         return;
 
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
      TQWidget* r = (static_cast<TDEToolBar*>( w ))->getWidget( itemId( id ) );
-     if ( ::tqqt_cast<TQComboBox *>( r ) )
+     if ( ::tqt_cast<TQComboBox *>( r ) )
      {
         TQComboBox *b = static_cast<TQComboBox*>( r );
         b->changeItem(text, index );
@@ -587,9 +587,9 @@ void TDESelectAction::updateCurrentItem( int id )
         return;
 
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+  if ( ::tqt_cast<TDEToolBar *>( w ) ) {
     TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
-    if ( ::tqqt_cast<TQComboBox *>( r ) ) {
+    if ( ::tqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *b = static_cast<TQComboBox*>( r );
       b->setCurrentItem( d->m_current );
     }
@@ -604,9 +604,9 @@ int TDESelectAction::comboWidth() const
 void TDESelectAction::updateComboWidth( int id )
 {
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+  if ( ::tqt_cast<TDEToolBar *>( w ) ) {
     TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
-    if ( ::tqqt_cast<TQComboBox *>( r ) ) {
+    if ( ::tqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *cb = static_cast<TQComboBox*>( r );
       cb->setMinimumWidth( d->m_comboWidth );
       cb->setMaximumWidth( d->m_comboWidth );
@@ -618,9 +618,9 @@ void TDESelectAction::updateItems( int id )
 {
   kdDebug(129) << "TDEAction::updateItems( " << id << ", lst )" << endl; // remove -- ellis
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+  if ( ::tqt_cast<TDEToolBar *>( w ) ) {
     TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
-    if ( ::tqqt_cast<TQComboBox *>( r ) ) {
+    if ( ::tqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *cb = static_cast<TQComboBox*>( r );
       cb->clear();
       TQStringList lst = comboItems();
@@ -641,7 +641,7 @@ int TDESelectAction::plug( TQWidget *widget, int index )
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( ::tqqt_cast<TQPopupMenu *>( widget) )
+  if ( ::tqt_cast<TQPopupMenu *>( widget) )
   {
     // Create the PopupMenu and store it in m_menu
     (void)popupMenu();
@@ -661,23 +661,23 @@ int TDESelectAction::plug( TQWidget *widget, int index )
         menu->TQMenuData::setWhatsThis( id, wth );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<TDEToolBar *>( widget ) )
+  else if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
     TDEToolBar* bar = static_cast<TDEToolBar*>( widget );
     int id_ = TDEAction::getToolButtonID();
     bar->insertCombo( comboItems(), id_, isEditable(),
-                      TQT_SIGNAL( activated( const TQString & ) ), this,
-                      TQT_SLOT( slotActivated( const TQString & ) ), isEnabled(),
+                      TQ_SIGNAL( activated( const TQString & ) ), this,
+                      TQ_SLOT( slotActivated( const TQString & ) ), isEnabled(),
                       toolTip(), -1, index );
 
     TQComboBox *cb = bar->getCombo( id_ );
     if ( cb )
     {
-      if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus);
+      if (!isEditable()) cb->setFocusPolicy(TQWidget::NoFocus);
       cb->setMinimumWidth( cb->sizeHint().width() );
       if ( d->m_comboWidth > 0 )
       {
@@ -691,13 +691,13 @@ int TDESelectAction::plug( TQWidget *widget, int index )
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     updateCurrentItem( containerCount() - 1 );
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( widget ) )
+  else if ( ::tqt_cast<TQMenuBar *>( widget ) )
   {
     // Create the PopupMenu and store it in m_menu
     (void)popupMenu();
@@ -713,7 +713,7 @@ int TDESelectAction::plug( TQWidget *widget, int index )
         menu->TQMenuData::setWhatsThis( id, wth );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -754,9 +754,9 @@ void TDESelectAction::clear()
 void TDESelectAction::updateClear( int id )
 {
   TQWidget* w = container( id );
-  if ( ::tqqt_cast<TDEToolBar *>( w ) ) {
+  if ( ::tqt_cast<TDEToolBar *>( w ) ) {
     TQWidget* r = static_cast<TDEToolBar*>( w )->getWidget( itemId( id ) );
-    if ( ::tqqt_cast<TQComboBox *>( r ) ) {
+    if ( ::tqt_cast<TQComboBox *>( r ) ) {
       TQComboBox *b = static_cast<TQComboBox*>( r );
       b->clear();
     }
@@ -771,7 +771,7 @@ void TDESelectAction::slotActivated( int id )
   setCurrentItem( id );
   // Delay this. Especially useful when the slot connected to activated() will re-create
   // the menu, e.g. in the recent files action. This prevents a crash.
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) );
 }
 
 void TDESelectAction::slotActivated( const TQString &text )
@@ -793,7 +793,7 @@ void TDESelectAction::slotActivated( const TQString &text )
       setCurrentItem( comboItems().findIndex( text ) );
   // Delay this. Especially useful when the slot connected to activated() will re-create
   // the menu, e.g. in the recent files action. This prevents a crash.
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) );
 }
 
 void TDESelectAction::slotActivated()
@@ -858,7 +858,7 @@ TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut,
 {
   d = new TDEListActionPrivate;
   if ( receiver )
-    connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot );
 }
 
 TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix,
@@ -885,7 +885,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix,
 {
   d = new TDEListActionPrivate;
   if ( receiver )
-    connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot );
 }
 
 TDEListAction::TDEListAction( const TQString& text, const TQString& pix,
@@ -896,7 +896,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQString& pix,
 {
   d = new TDEListActionPrivate;
   if ( receiver )
-    connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot );
 }
 
 TDEListAction::TDEListAction( TQObject* parent, const char* name )
@@ -970,7 +970,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
   init();
 
   if ( receiver )
-    connect( this,     TQT_SIGNAL(urlSelected(const KURL&)),
+    connect( this,     TQ_SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
@@ -1015,7 +1015,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
   init();
 
   if ( receiver )
-    connect( this,     TQT_SIGNAL(urlSelected(const KURL&)),
+    connect( this,     TQ_SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
@@ -1034,7 +1034,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
   init();
 
   if ( receiver )
-    connect( this,     TQT_SIGNAL(urlSelected(const KURL&)),
+    connect( this,     TQ_SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
@@ -1052,10 +1052,10 @@ void TDERecentFilesAction::init()
 {
   TDERecentFilesAction *that = const_cast<TDERecentFilesAction*>(this);
   that->d->m_popup = new TDEPopupMenu;
-  connect(d->m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
-  connect(d->m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
-  connect( this, TQT_SIGNAL( activated( const TQString& ) ),
-           this, TQT_SLOT( itemSelected( const TQString& ) ) );
+  connect(d->m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow()));
+  connect(d->m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
+  connect( this, TQ_SIGNAL( activated( const TQString& ) ),
+           this, TQ_SLOT( itemSelected( const TQString& ) ) );
 
   setMenuAccelsEnabled( false );
 }
@@ -1272,7 +1272,7 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index )
     return -1;
   // This is very related to TDEActionMenu::plug.
   // In fact this class could be an interesting base class for TDEActionMenu
-  if ( ::tqqt_cast<TDEToolBar *>( widget ) )
+  if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
     TDEToolBar *bar = (TDEToolBar *)widget;
 
@@ -1284,13 +1284,13 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index )
     else
         instance = TDEGlobal::instance();
 
-    bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                       TQT_SLOT( slotClicked() ), isEnabled(), plainText(),
+    bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                       TQ_SLOT( slotClicked() ), isEnabled(), plainText(),
                        index, instance );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     bar->setDelayedPopup( id_, d->m_popup, true);
 
@@ -1526,20 +1526,20 @@ int TDEFontAction::plug( TQWidget *w, int index )
 {
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  if ( ::tqqt_cast<TDEToolBar *>( w ) )
+  if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
     TDEToolBar* bar = static_cast<TDEToolBar*>( w );
     int id_ = TDEAction::getToolButtonID();
     TDEFontCombo *cb = new TDEFontCombo( items(), bar );
-    connect( cb, TQT_SIGNAL( activated( const TQString & ) ),
-             TQT_SLOT( slotActivated( const TQString & ) ) );
+    connect( cb, TQ_SIGNAL( activated( const TQString & ) ),
+             TQ_SLOT( slotActivated( const TQString & ) ) );
     cb->setEnabled( isEnabled() );
     bar->insertWidget( id_, comboWidth(), cb, index );
     cb->setMinimumWidth( cb->sizeHint().width() );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     updateCurrentItem( containerCount() - 1 );
 
@@ -1796,7 +1796,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
-  if ( ::tqqt_cast<TQPopupMenu *>( widget ) )
+  if ( ::tqt_cast<TQPopupMenu *>( widget ) )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
     int id;
@@ -1809,22 +1809,22 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
       menu->setItemEnabled( id, false );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if ( m_parentCollection )
       m_parentCollection->connectHighlight( menu, this );
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<TDEToolBar *>( widget ) )
+  else if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
     TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
 
     int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
-      bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
-                         TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this,
+                         TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                          index );
     else
     {
@@ -1835,8 +1835,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
       else
         instance = TDEGlobal::instance();
 
-      bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                         TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                         TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                          index, instance );
     }
 
@@ -1845,7 +1845,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
     if (!whatsThis().isEmpty())
       TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if (delayed()) {
         bar->setDelayedPopup( id_, popupMenu(), stickyMenu() );
@@ -1858,7 +1858,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( widget ) )
+  else if ( ::tqt_cast<TQMenuBar *>( widget ) )
   {
     TQMenuBar *bar = static_cast<TQMenuBar *>( widget );
 
@@ -1870,7 +1870,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
         bar->setItemEnabled( id, false );
 
     addContainer( bar, id );
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -1943,15 +1943,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
     return -1;
   // This is very related to TDEActionMenu::plug.
   // In fact this class could be an interesting base class for TDEActionMenu
-  if ( ::tqqt_cast<TDEToolBar *>( widget ) )
+  if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
     TDEToolBar *bar = (TDEToolBar *)widget;
 
     int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() ) {
-        bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
-                           TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
+        bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
+                           TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
                            isEnabled(), plainText(),
                            index );
     } else {
@@ -1961,15 +1961,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
         else
             instance = TDEGlobal::instance();
 
-        bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
-                           TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
+        bar->insertButton( icon(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
+                           TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
                            isEnabled(), plainText(),
                            index, instance );
     }
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if (delayed()) {
         bar->setDelayedPopup( id_, popupMenu(), stickyMenu() );
@@ -2028,7 +2028,7 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index )
     while ( !tl->isDialog() && ( n = tl->parentWidget() ) ) // lookup parent and store
       tl = n;
 
-    TDEMainWindow * mw = tqt_dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
+    TDEMainWindow * mw = dynamic_cast<TDEMainWindow *>(tl); // try to see if it's a tdemainwindow
 
     if ( mw )
         m_toolBar = mw->toolBar( m_toolBarName );
@@ -2036,9 +2036,9 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index )
 
   if( m_toolBar ) {
     setChecked( m_toolBar->isVisible() );
-    connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(setChecked(bool)) );
+    connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(setChecked(bool)) );
     // Also emit toggled when the toolbar's visibility changes (see comment in header)
-    connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SIGNAL(toggled(bool)) );
+    connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SIGNAL(toggled(bool)) );
   } else {
     setEnabled( false );
   }
@@ -2055,7 +2055,7 @@ void TDEToggleToolBarAction::setChecked( bool c )
       m_toolBar->hide();
     }
     TQMainWindow* mw = m_toolBar->mainWindow();
-    if ( mw && ::tqqt_cast<TDEMainWindow *>( mw ) )
+    if ( mw && ::tqt_cast<TDEMainWindow *>( mw ) )
       static_cast<TDEMainWindow *>( mw )->setSettingsDirty();
   }
   TDEToggleAction::setChecked( c );
@@ -2103,7 +2103,7 @@ void TDEToggleFullScreenAction::setChecked( bool c )
 
 bool TDEToggleFullScreenAction::eventFilter( TQObject* o, TQEvent* e )
 {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(window) )
+    if( o == window )
         if( e->type() == TQEvent::WindowStateChange )
             {
             if( window->isFullScreen() != isChecked())
@@ -2122,7 +2122,7 @@ KWidgetAction::KWidgetAction( TQWidget* widget,
   , m_widget( widget )
   , m_autoSized( false )
 {
-  connect( this, TQT_SIGNAL(enabled(bool)), widget, TQT_SLOT(setEnabled(bool)) );
+  connect( this, TQ_SIGNAL(enabled(bool)), widget, TQ_SLOT(setEnabled(bool)) );
 }
 
 KWidgetAction::~KWidgetAction()
@@ -2153,7 +2153,7 @@ int KWidgetAction::plug( TQWidget* w, int index )
   if (kapp && !kapp->authorizeTDEAction(name()))
       return -1;
 
-  if ( !::tqqt_cast<TDEToolBar *>( w ) ) {
+  if ( !::tqt_cast<TDEToolBar *>( w ) ) {
     kdError() << "KWidgetAction::plug: KWidgetAction must be plugged into TDEToolBar." << endl;
     return -1;
   }
@@ -2173,8 +2173,8 @@ int KWidgetAction::plug( TQWidget* w, int index )
   TQWhatsThis::add( m_widget, whatsThis() );
   addContainer( toolBar, id );
 
-  connect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) );
-  connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+  connect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) );
+  connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
   return containerCount() - 1;
 }
@@ -2187,7 +2187,7 @@ void KWidgetAction::unplug( TQWidget *w )
   TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent();
   if ( toolBar == w )
   {
-      disconnect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) );
+      disconnect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) );
       m_widget->reparent( 0L, TQPoint(), false /*showIt*/ );
   }
   TDEAction::unplug( w );
@@ -2217,18 +2217,18 @@ TDEActionSeparator::~TDEActionSeparator()
 
 int TDEActionSeparator::plug( TQWidget *widget, int index )
 {
-  if ( ::tqqt_cast<TQPopupMenu *>( widget) )
+  if ( ::tqt_cast<TQPopupMenu *>( widget) )
   {
     TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
 
     int id = menu->insertSeparator( index );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<TQMenuBar *>( widget ) )
+  else if ( ::tqt_cast<TQMenuBar *>( widget ) )
   {
     TQMenuBar *menuBar = static_cast<TQMenuBar *>( widget );
 
@@ -2236,11 +2236,11 @@ int TDEActionSeparator::plug( TQWidget *widget, int index )
 
     addContainer( menuBar, id );
 
-    connect( menuBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menuBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
-  else if ( ::tqqt_cast<TDEToolBar *>( widget ) )
+  else if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
     TDEToolBar *toolBar = static_cast<TDEToolBar *>( widget );
 
@@ -2248,7 +2248,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index )
 
     addContainer( toolBar, id );
 
-    connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -2265,8 +2265,8 @@ TDEPasteTextAction::TDEPasteTextAction( const TQString& text,
   : TDEAction( text, icon, cut, receiver, slot, parent, name )
 {
   m_popup = new TDEPopupMenu;
-  connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
-  connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
+  connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow()));
+  connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
   m_popup->setCheckable(true);
   m_mixedMode = true;
 }
@@ -2285,7 +2285,7 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index )
 {
   if (kapp && !kapp->authorizeTDEAction(name()))
     return -1;
-  if ( ::tqqt_cast<TDEToolBar *>( widget ) )
+  if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
     TDEToolBar *bar = (TDEToolBar *)widget;
 
@@ -2297,13 +2297,13 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index )
     else
         instance = TDEGlobal::instance();
 
-    bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                       TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+    bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                       TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                        index, instance );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     bar->setDelayedPopup( id_, m_popup, true );
 
@@ -2357,7 +2357,7 @@ void TDEPasteTextAction::menuItemActivated( int id)
       if (reply.isValid())
         kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl;
     }
-    TQTimer::singleShot(20, this, TQT_SLOT(slotActivated()));
+    TQTimer::singleShot(20, this, TQ_SLOT(slotActivated()));
 }
 
 void TDEPasteTextAction::slotActivated()
diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h
index 86594f179..f7536a6b3 100644
--- a/tdeui/tdeactionclasses.h
+++ b/tdeui/tdeactionclasses.h
@@ -67,7 +67,7 @@ class TDEMainWindow;
  */
 class TDEUI_EXPORT TDEToggleAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
     TQ_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup )
@@ -88,8 +88,8 @@ public:
     /**
      *  @param text The text that will be displayed.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -120,8 +120,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -132,8 +132,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -230,7 +230,7 @@ private:
  */
 class TDEUI_EXPORT TDERadioAction : public TDEToggleAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
     /**
@@ -248,8 +248,8 @@ public:
     /**
      *  @param text The text that will be displayed.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -280,8 +280,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -292,8 +292,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -330,7 +330,7 @@ private:
  */
 class TDEUI_EXPORT TDESelectAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
     TQ_PROPERTY( TQStringList items READ items WRITE setItems )
@@ -355,8 +355,8 @@ public:
     /**
      *  @param text The text that will be displayed.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -387,8 +387,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -399,8 +399,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -583,7 +583,7 @@ private:
  */
 class TDEUI_EXPORT_DEPRECATED TDEListAction : public TDESelectAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -602,8 +602,8 @@ public:
     /**
      *  @param text The text that will be displayed.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -634,8 +634,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The icons that go with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -647,8 +647,8 @@ public:
      *  @param text The text that will be displayed.
      *  @param pix The dynamically loaded icon that goes with this action.
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param name An internal name for this action.
      */
@@ -699,7 +699,7 @@ private:
  */
 class TDEUI_EXPORT TDERecentFilesAction : public TDEListAction  // TODO public TDESelectAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems )
 public:
@@ -717,8 +717,8 @@ public:
   /**
    *  @param text The text that will be displayed.
    *  @param cut The corresponding keyboard accelerator (shortcut).
-   *  @param receiver The SLOT's parent.
-   *  @param slot The TQT_SLOT to invoke when a URL is selected.
+   *  @param receiver The slot's parent.
+   *  @param slot The slot to invoke when a URL is selected.
    *  Its signature is of the form slotURLSelected( const KURL & ).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
@@ -757,8 +757,8 @@ public:
    *  @param text The text that will be displayed.
    *  @param pix The icons that go with this action.
    *  @param cut The corresponding keyboard accelerator (shortcut).
-   *  @param receiver The SLOT's parent.
-   *  @param slot The TQT_SLOT to invoke when a URL is selected.
+   *  @param receiver The slot's parent.
+   *  @param slot The slot to invoke when a URL is selected.
    *  Its signature is of the form slotURLSelected( const KURL & ).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
@@ -773,8 +773,8 @@ public:
    *  @param text The text that will be displayed.
    *  @param pix The dynamically loaded icon that goes with this action.
    *  @param cut The corresponding keyboard accelerator (shortcut).
-   *  @param receiver The SLOT's parent.
-   *  @param slot The TQT_SLOT to invoke when a URL is selected.
+   *  @param receiver The slot's parent.
+   *  @param slot The slot to invoke when a URL is selected.
    *  Its signature is of the form slotURLSelected( const KURL & ).
    *  @param parent This action's parent.
    *  @param name An internal name for this action.
@@ -909,7 +909,7 @@ private:
 
 class TDEUI_EXPORT TDEFontAction : public TDESelectAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( TQString font READ font WRITE setFont )
 public:
@@ -960,7 +960,7 @@ private:
 
 class TDEUI_EXPORT TDEFontSizeAction : public TDESelectAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
@@ -1019,7 +1019,7 @@ private:
  */
 class TDEUI_EXPORT TDEActionMenu : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
@@ -1093,7 +1093,7 @@ private:
  */
 class TDEUI_EXPORT TDEToolBarPopupAction : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
@@ -1124,8 +1124,8 @@ public:
      * @param text The text that will be displayed.
      * @param icon The icon to display.
      * @param cut The corresponding keyboard accelerator (shortcut).
-     * @param receiver The SLOT's owner.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's owner.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
@@ -1143,8 +1143,8 @@ public:
      *
      * @param item The text and icon that will be displayed.
      * @param cut The corresponding keyboard accelerator (shortcut).
-     * @param receiver The SLOT's owner.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's owner.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
@@ -1216,7 +1216,7 @@ private:
  */
 class TDEUI_EXPORT TDEToggleToolBarAction : public TDEToggleAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -1263,14 +1263,14 @@ private:
  */
 class TDEUI_EXPORT TDEToggleFullScreenAction : public TDEToggleAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
      * Create a TDEToggleFullScreenAction
      *  @param cut The corresponding keyboard accelerator (shortcut).
-     *  @param receiver The SLOT's parent.
-     *  @param slot The TQT_SLOT to invoke to execute this action.
+     *  @param receiver The slot's parent.
+     *  @param slot The slot to invoke to execute this action.
      *  @param parent This action's parent.
      *  @param window the window that will switch to/from full screen mode
      *  @param name An internal name for this action.
@@ -1308,7 +1308,7 @@ private:
  */
 class TDEUI_EXPORT KWidgetAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -1353,7 +1353,7 @@ private:
 
 class TDEUI_EXPORT TDEActionSeparator : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     TDEActionSeparator( TQObject* parent = 0, const char* name = 0 );
@@ -1380,7 +1380,7 @@ private:
  */
 class TDEUI_EXPORT TDEPasteTextAction: public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -1393,8 +1393,8 @@ public:
      * @param text The text that will be displayed.
      * @param icon The icon to display.
      * @param cut The corresponding keyboard accelerator (shortcut).
-     * @param receiver The SLOT's owner.
-     * @param slot The TQT_SLOT to invoke to execute this action.
+     * @param receiver The slot's owner.
+     * @param slot The slot to invoke to execute this action.
      * @param parent This action's parent.
      * @param name An internal name for this action.
      */
diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp
index 98e8264b6..7f4fe0191 100644
--- a/tdeui/tdeactioncollection.cpp
+++ b/tdeui/tdeactioncollection.cpp
@@ -110,7 +110,7 @@ TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name,
   kdWarning(129) << "TDEActionCollection::TDEActionCollection( TQObject *parent, const char *name, TDEInstance *instance )" << endl; //ellis
   kdDebug(129) << kdBacktrace() << endl;
   d = new TDEActionCollectionPrivate;
-  TQWidget* w = tqt_dynamic_cast<TQWidget*>( parent );
+  TQWidget* w = dynamic_cast<TQWidget*>( parent );
   if( w )
     setWidget( w );
   //d->m_bOneTDEAccelOnly = (d->m_tdeaccelList.count() > 0);
@@ -501,21 +501,21 @@ void TDEActionCollection::connectHighlight( TQWidget *container, TDEAction *acti
   {
     actionList = new TQPtrList<TDEAction>;
 
-    if ( ::tqqt_cast<TQPopupMenu *>( container ) )
+    if ( ::tqt_cast<TQPopupMenu *>( container ) )
     {
-      connect( container, TQT_SIGNAL( highlighted( int ) ),
-               this, TQT_SLOT( slotMenuItemHighlighted( int ) ) );
-      connect( container, TQT_SIGNAL( aboutToHide() ),
-               this, TQT_SLOT( slotMenuAboutToHide() ) );
+      connect( container, TQ_SIGNAL( highlighted( int ) ),
+               this, TQ_SLOT( slotMenuItemHighlighted( int ) ) );
+      connect( container, TQ_SIGNAL( aboutToHide() ),
+               this, TQ_SLOT( slotMenuAboutToHide() ) );
     }
-    else if ( ::tqqt_cast<TDEToolBar *>( container ) )
+    else if ( ::tqt_cast<TDEToolBar *>( container ) )
     {
-      connect( container, TQT_SIGNAL( highlighted( int, bool ) ),
-               this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) );
+      connect( container, TQ_SIGNAL( highlighted( int, bool ) ),
+               this, TQ_SLOT( slotToolBarButtonHighlighted( int, bool ) ) );
     }
 
-    connect( container, TQT_SIGNAL( destroyed() ),
-             this, TQT_SLOT( slotDestroyed() ) );
+    connect( container, TQ_SIGNAL( destroyed() ),
+             this, TQ_SLOT( slotDestroyed() ) );
 
     d->m_dctHighlightContainers.insert( container, actionList );
   }
@@ -547,7 +547,7 @@ void TDEActionCollection::slotMenuItemHighlighted( int id )
   if ( d->m_currentHighlightAction )
     emit actionHighlighted( d->m_currentHighlightAction, false );
 
-  TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
+  TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
 
   d->m_currentHighlightAction = findAction( container, id );
 
@@ -581,7 +581,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
   if ( !d->m_highlight )
     return;
 
-  TQWidget *container = const_cast<TQWidget*>(TQT_TQWIDGET_CONST( sender() ));
+  TQWidget *container = static_cast<TQWidget *>( const_cast<TQObject *>( sender() ));
 
   TDEAction *action = findAction( container, id );
 
@@ -606,7 +606,7 @@ void TDEActionCollection::slotToolBarButtonHighlighted( int id, bool highlight )
 
 void TDEActionCollection::slotDestroyed()
 {
-    d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(TQT_TQOBJECT_CONST(sender())) ) );
+    d->m_dctHighlightContainers.remove( reinterpret_cast<void *>( const_cast<TQObject*>(sender()) ) );
 }
 
 TDEAction *TDEActionCollection::findAction( TQWidget *container, int id )
diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h
index ae6fd6575..4de022d3e 100644
--- a/tdeui/tdeactioncollection.h
+++ b/tdeui/tdeactioncollection.h
@@ -69,10 +69,10 @@ typedef TQValueList<TDEAction *> TDEActionPtrList;
  *
  * \code
  * actionCollection()->setHighlightingEnabled(true);  
- * connect(actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ),
- *           statusBar(), TQT_SLOT( message( const TQString & ) ) );
- * connect(actionCollection(), TQT_SIGNAL( clearStatusText() ),
- *           statusBar(), TQT_SLOT( clear() ) );
+ * connect(actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ),
+ *           statusBar(), TQ_SLOT( message( const TQString & ) ) );
+ * connect(actionCollection(), TQ_SIGNAL( clearStatusText() ),
+ *           statusBar(), TQ_SLOT( clear() ) );
  * \endcode
  */
 class TDEUI_EXPORT TDEActionCollection : public TQObject
@@ -80,7 +80,7 @@ class TDEUI_EXPORT TDEActionCollection : public TQObject
   friend class TDEAction;
   friend class KXMLGUIClient;
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDEActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 );
diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp
index 9583775c4..4ac8ac71d 100644
--- a/tdeui/tdeactionselector.cpp
+++ b/tdeui/tdeactionselector.cpp
@@ -99,18 +99,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name )
 
   loadIcons();
 
-  connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) );
-  connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) );
-  connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) );
-  connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) );
-  connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
-           this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) );
-  connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)),
-           this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) );
-  connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
-           this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) );
-  connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)),
-           this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) );
+  connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) );
+  connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) );
+  connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) );
+  connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) );
+  connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+           this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) );
+  connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)),
+           this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) );
+  connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)),
+           this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) );
+  connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)),
+           this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) );
 
   d->availableListBox->installEventFilter( this );
   d->selectedListBox->installEventFilter( this );
@@ -392,7 +392,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
       }
       return true;
     }
-    else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( "TQListBox" ) )
     {
       switch ( ((TQKeyEvent*)e)->key() )
       {
diff --git a/tdeui/tdeactionselector.h b/tdeui/tdeactionselector.h
index 6aeaac3d8..d9ee62873 100644
--- a/tdeui/tdeactionselector.h
+++ b/tdeui/tdeactionselector.h
@@ -77,7 +77,7 @@ class TDEActionSelectorPrivate;
 */
 
 class TDEUI_EXPORT TDEActionSelector : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_ENUMS( ButtonIconSize InsertionPolicy )
   TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
   TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp
index d447ec17e..06ca1acda 100644
--- a/tdeui/tdecmodule.cpp
+++ b/tdeui/tdecmodule.cpp
@@ -98,7 +98,7 @@ void TDECModule::init()
 TDEConfigDialogManager* TDECModule::addConfig( TDEConfigSkeleton *config, TQWidget* widget )
 {
     TDEConfigDialogManager* manager = new TDEConfigDialogManager( widget, config, name() );
-    connect( manager, TQT_SIGNAL( widgetModified() ), TQT_SLOT( widgetChanged() ));
+    connect( manager, TQ_SIGNAL( widgetModified() ), TQ_SLOT( widgetChanged() ));
     d->managers.append( manager );
     return manager;
 }
diff --git a/tdeui/tdecmodule.h b/tdeui/tdecmodule.h
index 186ee6656..920769d33 100644
--- a/tdeui/tdecmodule.h
+++ b/tdeui/tdecmodule.h
@@ -68,7 +68,7 @@ class TDEInstance;
  */
 class TDEUI_EXPORT TDECModule : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp
index a8a2bd237..9ff9b95e5 100644
--- a/tdeui/tdecompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -61,19 +61,19 @@ TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name )
     if ( parent )
         setFocusProxy( parent );
     else
-        setFocusPolicy( TQ_NoFocus );
+        setFocusPolicy( TQWidget::NoFocus );
 
     setVScrollBarMode( Auto );
     setHScrollBarMode( AlwaysOff );
 
-    connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem * )),
-             TQT_SLOT( slotActivated( TQListBoxItem * )) );
+    connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem * )),
+             TQ_SLOT( slotActivated( TQListBoxItem * )) );
 
     // grmbl, just TQListBox workarounds :[ Thanks Volker.
-    connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem * )),
-             TQT_SLOT( slotCurrentChanged() ));
-    connect( this, TQT_SIGNAL( clicked( TQListBoxItem * )),
-             TQT_SLOT( slotItemClicked( TQListBoxItem * )) );
+    connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem * )),
+             TQ_SLOT( slotCurrentChanged() ));
+    connect( this, TQ_SIGNAL( clicked( TQListBoxItem * )),
+             TQ_SLOT( slotItemClicked( TQListBoxItem * )) );
 }
 
 TDECompletionBox::~TDECompletionBox()
@@ -109,13 +109,13 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
 {
     int type = e->type();
 
-    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_parent) ) {
+    if ( o == d->m_parent ) {
         if ( isVisible() ) {
             if ( type == TQEvent::KeyPress ) {
-                TQKeyEvent *ev = TQT_TQKEYEVENT( e );
+                TQKeyEvent *ev = static_cast<TQKeyEvent*>( e );
                 switch ( ev->key() ) {
                     case Key_BackTab:
-                        if ( d->tabHandling && (ev->state() == Qt::NoButton ||
+                        if ( d->tabHandling && (ev->state() == TQt::NoButton ||
                              (ev->state() & ShiftButton)) ) {
                             up();
                             ev->accept();
@@ -123,7 +123,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
                         }
                         break;
                     case Key_Tab:
-                        if ( d->tabHandling && (ev->state() == Qt::NoButton) ) {
+                        if ( d->tabHandling && (ev->state() == TQt::NoButton) ) {
                             down(); // Only on TAB!!
                             ev->accept();
                             return true;
@@ -185,7 +185,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
             else if ( type == TQEvent::AccelOverride ) {
                 // Override any acceleartors that match
                 // the key sequences we use here...
-                TQKeyEvent *ev = TQT_TQKEYEVENT( e );
+                TQKeyEvent *ev = static_cast<TQKeyEvent*>( e );
                 switch ( ev->key() ) {
                     case Key_Down:
                     case Key_Up:
@@ -199,7 +199,7 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
                       break;
                     case Key_Tab:
                     case Key_BackTab:
-                        if ( ev->state() == Qt::NoButton ||
+                        if ( ev->state() == TQt::NoButton ||
                             (ev->state() & ShiftButton))
                         {
                             ev->accept();
@@ -230,11 +230,11 @@ bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
 
     // any mouse-click on something else than "this" makes us hide
     else if ( type == TQEvent::MouseButtonPress ) {
-        TQMouseEvent *ev = TQT_TQMOUSEEVENT( e );
+        TQMouseEvent *ev = static_cast<TQMouseEvent*>( e );
         if ( !rect().contains( ev->pos() )) // this widget
             hide();
 
-        if ( !d->emitSelected && currentItem() && !::tqqt_cast<TQScrollBar*>(o) )
+        if ( !d->emitSelected && currentItem() && !::tqt_cast<TQScrollBar*>(o) )
         {
           emit highlighted( currentText() );
           hide();
@@ -343,9 +343,9 @@ TQRect TDECompletionBox::calculateGeometry() const
     // to adjust it. Do that here as well, for consistency
     const TQObject* combo;
     if ( d->m_parent && (combo = d->m_parent->parent() ) &&
-        combo->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) )
+        combo->inherits("TQComboBox") )
     {
-        const TQComboBox* cb = static_cast<const TQComboBox*>(TQT_TQWIDGET_CONST(combo));
+        const TQComboBox* cb = static_cast<const TQComboBox*>(combo);
 
         //Expand to the combo width
         w = TQMAX( w, cb->width() );
diff --git a/tdeui/tdecompletionbox.h b/tdeui/tdecompletionbox.h
index b804411b1..e3f74e819 100644
--- a/tdeui/tdecompletionbox.h
+++ b/tdeui/tdecompletionbox.h
@@ -42,7 +42,7 @@ class TQEvent;
  */
 class TDEUI_EXPORT TDECompletionBox : public TDEListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
     TQ_PROPERTY(TQString cancelledText READ cancelledText WRITE setCancelledText)
     TQ_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect )
diff --git a/tdeui/tdeconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp
index df43defc5..274355910 100644
--- a/tdeui/tdeconfigdialog.cpp
+++ b/tdeui/tdeconfigdialog.cpp
@@ -65,11 +65,11 @@ TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name,
     setName(genericName);
   }
 
-  connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateSettings()));
-  connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateSettings()));
-  connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateButtons()));
-  connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault()));
-  connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons()));
+  connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateSettings()));
+  connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateSettings()));
+  connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateButtons()));
+  connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateWidgetsDefault()));
+  connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateButtons()));
 
   d->manager = new TDEConfigDialogManager(this, config);
   setupManagerConnections(d->manager);
@@ -150,12 +150,12 @@ void TDEConfigDialog::addPageInternal(TQWidget *page,
 
 void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager)
 {
-  connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot()));
-  connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons()));
+  connect(manager, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChangedSlot()));
+  connect(manager, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons()));
 
-  connect(this, TQT_SIGNAL(okClicked()), manager, TQT_SLOT(updateSettings()));
-  connect(this, TQT_SIGNAL(applyClicked()), manager, TQT_SLOT(updateSettings()));
-  connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault()));
+  connect(this, TQ_SIGNAL(okClicked()), manager, TQ_SLOT(updateSettings()));
+  connect(this, TQ_SIGNAL(applyClicked()), manager, TQ_SLOT(updateSettings()));
+  connect(this, TQ_SIGNAL(defaultClicked()), manager, TQ_SLOT(updateWidgetsDefault()));
 }
 
 TDEConfigDialog* TDEConfigDialog::exists(const char* name)
diff --git a/tdeui/tdeconfigdialog.h b/tdeui/tdeconfigdialog.h
index 3eeed5b6f..6ce44da22 100644
--- a/tdeui/tdeconfigdialog.h
+++ b/tdeui/tdeconfigdialog.h
@@ -52,8 +52,8 @@ class TDEConfigDialogManager;
  *   TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList);
  *   dialog->addPage(new General(0, "General"), i18n("General") );
  *   dialog->addPage(new Appearance(0, "Style"), i18n("Appearance") );
- *   connect(dialog, TQT_SIGNAL(settingsChanged()), mainWidget, TQT_SLOT(loadSettings()));
- *   connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings()));
+ *   connect(dialog, TQ_SIGNAL(settingsChanged()), mainWidget, TQ_SLOT(loadSettings()));
+ *   connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings()));
  *   dialog->show();
  * }
  * \endcode
@@ -70,7 +70,7 @@ class TDEConfigDialogManager;
  * @since 3.2
  */
 class TDEUI_EXPORT TDEConfigDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
 
 signals:
   /**
diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp
index cc3b090b7..31cc23849 100644
--- a/tdeui/tdefontcombo.cpp
+++ b/tdeui/tdefontcombo.cpp
@@ -283,7 +283,7 @@ void TDEFontCombo::init()
     setInsertionPolicy(NoInsertion);
     setAutoCompletion(true);
     setSize(12);
-    connect( this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotModified(int)));
+    connect( this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotModified(int)));
 }
 
 TDEFontCombo::~TDEFontCombo()
diff --git a/tdeui/tdefontcombo.h b/tdeui/tdefontcombo.h
index 308b7e047..2ddf7f638 100644
--- a/tdeui/tdefontcombo.h
+++ b/tdeui/tdefontcombo.h
@@ -34,7 +34,7 @@
  */
 class TDEUI_EXPORT TDEFontCombo : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
     TQ_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true)
     TQ_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true)
diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp
index fcd50b16e..2b657a7a8 100644
--- a/tdeui/tdefontdialog.cpp
+++ b/tdeui/tdefontdialog.cpp
@@ -1,3 +1,4 @@
+
 /*
 
     Requires the Qt widget libraries, available at no cost at
@@ -84,8 +85,8 @@ class TDEFontChooser::TDEFontChooserPrivate
 {
 public:
     TDEFontChooserPrivate()
-        { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, Qt::black);
-          m_palette.setColor(TQPalette::Active, TQColorGroup::Base, Qt::white); }
+        { m_palette.setColor(TQPalette::Active, TQColorGroup::Text, TQt::black);
+          m_palette.setColor(TQPalette::Active, TQColorGroup::Base, TQt::white); }
     TQPalette m_palette;
 };
 
@@ -130,8 +131,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   familyLayout->addSpacing( checkBoxGap );
   if (diff) {
     familyCheckbox = new TQCheckBox(i18n("Font"), page);
-    connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox()));
-    familyLayout->addWidget(familyCheckbox, 0, Qt::AlignLeft);
+    connect(familyCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox()));
+    familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft);
     TQString familyCBToolTipText =
       i18n("Change font family?");
     TQString familyCBWhatsThisText =
@@ -142,15 +143,15 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   } else {
     familyCheckbox = 0;
     familyLabel = new TQLabel( i18n("Font:"), page, "familyLabel" );
-    familyLayout->addWidget(familyLabel, 1, Qt::AlignLeft);
+    familyLayout->addWidget(familyLabel, 1, TQt::AlignLeft);
   }
   gridLayout->addLayout(familyLayout, row, 0 );
 
   TQHBoxLayout *styleLayout = new TQHBoxLayout();
   if (diff) {
      styleCheckbox = new TQCheckBox(i18n("Font style"), page);
-     connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox()));
-     styleLayout->addWidget(styleCheckbox, 0, Qt::AlignLeft);
+     connect(styleCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox()));
+     styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft);
     TQString styleCBToolTipText =
       i18n("Change font style?");
     TQString styleCBWhatsThisText =
@@ -161,7 +162,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   } else {
     styleCheckbox = 0;
     styleLabel = new TQLabel( i18n("Font style:"), page, "styleLabel");
-    styleLayout->addWidget(styleLabel, 1, Qt::AlignLeft);
+    styleLayout->addWidget(styleLabel, 1, TQt::AlignLeft);
   }
   styleLayout->addSpacing( checkBoxGap );
   gridLayout->addLayout(styleLayout, row, 1 );
@@ -169,8 +170,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   TQHBoxLayout *sizeLayout = new TQHBoxLayout();
   if (diff) {
     sizeCheckbox = new TQCheckBox(i18n("Size"),page);
-    connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox()));
-    sizeLayout->addWidget(sizeCheckbox, 0, Qt::AlignLeft);
+    connect(sizeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox()));
+    sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft);
     TQString sizeCBToolTipText =
       i18n("Change font size?");
     TQString sizeCBWhatsThisText =
@@ -181,7 +182,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   } else {
     sizeCheckbox = 0;
     sizeLabel = new TQLabel( i18n("Size:"), page, "sizeLabel");
-    sizeLayout->addWidget(sizeLabel, 1, Qt::AlignLeft);
+    sizeLayout->addWidget(sizeLabel, 1, TQt::AlignLeft);
   }
   sizeLayout->addSpacing( checkBoxGap );
   sizeLayout->addSpacing( checkBoxGap ); // prevent label from eating border
@@ -199,8 +200,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
     i18n("Here you can choose the font family to be used." );
   TQWhatsThis::add( familyListBox, fontFamilyWhatsThisText );
   TQWhatsThis::add(diff?(TQWidget *) familyCheckbox:(TQWidget *) familyLabel, fontFamilyWhatsThisText );
-  connect(familyListBox, TQT_SIGNAL(highlighted(const TQString &)),
-	  TQT_SLOT(family_chosen_slot(const TQString &)));
+  connect(familyListBox, TQ_SIGNAL(highlighted(const TQString &)),
+	  TQ_SLOT(family_chosen_slot(const TQString &)));
   if(!fontList.isEmpty())
   {
     familyListBox->insertStringList(fontList);
@@ -229,8 +230,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   styleListBox->setMinimumHeight(
     minimumListHeight( styleListBox, visibleListSize  ) );
 
-  connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)),
-	  TQT_SLOT(style_chosen_slot(const TQString &)));
+  connect(styleListBox, TQ_SIGNAL(highlighted(const TQString &)),
+	  TQ_SLOT(style_chosen_slot(const TQString &)));
 
 
   sizeListBox = new TDEListBox( page, "sizeListBox");
@@ -257,7 +258,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
     sizeLayout2->setColStretch( 1, 1 ); // to prevent text from eating the right border
     sizeLayout2->addMultiCellWidget( sizeOfFont, 0, 0, 0, 1);
     sizeLayout2->addMultiCellWidget(sizeListBox, 1,1, 0,1);
-    sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, Qt::AlignLeft);
+    sizeLayout2->addWidget(sizeIsRelativeCheckBox, 2, 0, TQt::AlignLeft);
     TQWhatsThis::add( sizeIsRelativeCheckBox, sizeIsRelativeCBWhatsThisText );
     TQToolTip::add(   sizeIsRelativeCheckBox, sizeIsRelativeCBToolTipText );
   }
@@ -279,11 +280,11 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   sizeListBox->setMinimumHeight(
     minimumListHeight( sizeListBox, visibleListSize  ) );
 
-  connect( sizeOfFont, TQT_SIGNAL( valueChanged(int) ),
-           TQT_SLOT(size_value_slot(int)));
+  connect( sizeOfFont, TQ_SIGNAL( valueChanged(int) ),
+           TQ_SLOT(size_value_slot(int)));
 
-  connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)),
-	   TQT_SLOT(size_chosen_slot(const TQString&)) );
+  connect( sizeListBox, TQ_SIGNAL(highlighted(const TQString&)),
+	   TQ_SLOT(size_chosen_slot(const TQString&)) );
   sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt.
 
   row ++;
@@ -295,14 +296,14 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name,
   //i18n: This is a classical test phrase. (It contains all letters from A to Z.)
   sampleEdit->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog"));
   sampleEdit->setMinimumHeight( sampleEdit->fontMetrics().lineSpacing() );
-  sampleEdit->setAlignment(Qt::AlignCenter);
+  sampleEdit->setAlignment(TQt::AlignCenter);
   gridLayout->addMultiCellWidget(sampleEdit, 4, 4, 0, 2);
   TQString sampleEditWhatsThisText =
     i18n("This sample text illustrates the current settings. "
          "You may edit it to test special characters." );
   TQWhatsThis::add( sampleEdit, sampleEditWhatsThisText );
-  connect(this, TQT_SIGNAL(fontSelected(const TQFont &)),
-	  TQT_SLOT(displaySample(const TQFont &)));
+  connect(this, TQ_SIGNAL(fontSelected(const TQFont &)),
+	  TQ_SLOT(displaySample(const TQFont &)));
 
   TQVBoxLayout *vbox;
   if( makeFrame )
@@ -461,23 +462,36 @@ void TDEFontChooser::toggled_checkbox()
   sizeOfFont->setEnabled( sizeCheckbox->isChecked() );
 }
 
+TQString TDEFontChooser::style_name(const TQString &style)
+{
+  return i18n(
+    TQString(style).replace("Plain",  "Regular")
+                   .replace("Normal", "Regular")
+                   .replace("Oblique", "Italic")
+                   .utf8());
+}
+
 void TDEFontChooser::family_chosen_slot(const TQString& family)
 {
+    TQString currentFamily;
+    if (family.isEmpty())
+    {
+      currentFamily = familyListBox->currentText();
+    }
+    else
+    {
+      currentFamily = family;
+    }
+
     TQFontDatabase dbase;
-    TQStringList styles = TQStringList(dbase.styles(family));
+    TQStringList styles = dbase.styles(currentFamily);
     styleListBox->clear();
     currentStyles.clear();
     for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
-        TQString style = *it;
-        int pos = style.find("Plain");
-        if(pos >=0) style = style.replace(pos,5,i18n("Regular"));
-        pos = style.find("Normal");
-        if(pos >=0) style = style.replace(pos,6,i18n("Regular"));
-        pos = style.find("Oblique");
-        if(pos >=0) style = style.replace(pos,7,i18n("Italic"));
+        TQString style = style_name(*it);
         if(!styleListBox->findItem(style)) {
-            styleListBox->insertItem(i18n(style.utf8()));
-            currentStyles.insert(i18n(style.utf8()), *it);
+            styleListBox->insertItem(style);
+            currentStyles.insert(style, *it);
         }
     }
     if(styleListBox->count()==0) {
@@ -488,12 +502,21 @@ void TDEFontChooser::family_chosen_slot(const TQString& family)
     styleListBox->blockSignals(true);
     TQListBoxItem *item = styleListBox->findItem(selectedStyle);
     if (item)
+    {
        styleListBox->setSelected(styleListBox->findItem(selectedStyle), true);
+    }
     else
+    {
        styleListBox->setSelected(0, true);
+    }
     styleListBox->blockSignals(false);
 
     style_chosen_slot(TQString::null);
+
+    if (!family.isEmpty() )
+    {
+      selectedFamily = family;
+    }
 }
 
 void TDEFontChooser::size_chosen_slot(const TQString& size){
@@ -565,8 +588,9 @@ void TDEFontChooser::setupDisplay()
 {
   // Calling familyListBox->setCurrentItem() causes the value of selFont
   // to change, so we save the family, style and size beforehand.
+  TQFontDatabase dbase;
   TQString family = TQString(selFont.family()).lower();
-  int style = (selFont.bold() ? 2 : 0) + (selFont.italic() ? 1 : 0);
+  TQString style = style_name(dbase.styleString(selFont));
   int size = selFont.pointSize();
   if (size == -1)
      size = TQFontInfo(selFont).pointSize();
@@ -624,7 +648,16 @@ void TDEFontChooser::setupDisplay()
   if ( i == numEntries )
     familyListBox->setCurrentItem( 0 );
 
-  styleListBox->setCurrentItem(style);
+  int item = 0;
+  for (int i = 0; i < (int)styleListBox->count(); ++i)
+  {
+    if (styleListBox->text(i) == style)
+    {
+      item = i;
+      break;
+    }
+  }
+  styleListBox->setCurrentItem(item);
 
   numEntries = sizeListBox->count();
   for (i = 0; i < numEntries; i++){
@@ -671,6 +704,15 @@ void TDEFontChooser::getFontList( TQStringList &list, uint fontListCriteria)
   list = lstSys;
 }
 
+void TDEFontChooser::setFamilyList( TQStringList list )
+{
+  familyListBox->blockSignals(true);
+  familyListBox->clear();
+  familyListBox->insertStringList(list);
+  setFont( TDEGlobalSettings::generalFont(), usingFixed );
+  familyListBox->blockSignals(false);
+}
+
 void TDEFontChooser::addFont( TQStringList &list, const char *xfont )
 {
   const char *ptr = strchr( xfont, '-' );
diff --git a/tdeui/tdefontdialog.h b/tdeui/tdefontdialog.h
index 0f4a56f77..0946c1b6e 100644
--- a/tdeui/tdefontdialog.h
+++ b/tdeui/tdefontdialog.h
@@ -53,7 +53,7 @@ class KIntNumInput;
  */
 class TDEUI_EXPORT TDEFontChooser : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQFont font READ font WRITE setFont )
 
 public:
@@ -250,6 +250,14 @@ public:
   static void getFontList( TQStringList &list, uint fontListCriteria);
 
   /**
+   *
+   * Fill the font family list of the TDEFontChooser
+   *
+   * @param list The font list.
+   */
+    void setFamilyList( TQStringList list );
+
+  /**
    * Reimplemented for internal reasons.
    */
   virtual TQSize sizeHint( void ) const;
@@ -271,6 +279,7 @@ private slots:
 private:
   void fillFamilyListBox(bool onlyFixedFonts = false);
   void fillSizeList();
+  TQString style_name(const TQString &name);
   // This one must be static since getFontList( TQStringList, char*) is so
   static void addFont( TQStringList &list, const char *xfont );
 
@@ -299,8 +308,9 @@ private:
 
   TQFont        selFont;
 
+  TQString      selectedFamily;
   TQString      selectedStyle;
-  int          selectedSize;
+  int           selectedSize;
   TQMap<TQString, TQString> currentStyles;
 
   bool usingFixed;
@@ -337,7 +347,7 @@ private:
  * @version $Id$
  */
 class TDEUI_EXPORT TDEFontDialog : public KDialogBase  {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/tdefontrequester.cpp b/tdeui/tdefontrequester.cpp
index 2cabede01..d5dd3b08c 100644
--- a/tdeui/tdefontrequester.cpp
+++ b/tdeui/tdefontrequester.cpp
@@ -43,7 +43,7 @@ TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name,
   layout->addWidget( m_sampleLabel, 1 );
   layout->addWidget( m_button );
 
-  connect( m_button, TQT_SIGNAL( clicked() ), TQT_SLOT( buttonClicked() ) );
+  connect( m_button, TQ_SIGNAL( clicked() ), TQ_SLOT( buttonClicked() ) );
 
   displaySampleText();
   setToolTip();
diff --git a/tdeui/tdefontrequester.h b/tdeui/tdefontrequester.h
index 9d324545a..ef0a17c59 100644
--- a/tdeui/tdefontrequester.h
+++ b/tdeui/tdefontrequester.h
@@ -43,7 +43,7 @@ class TQPushButton;
  */
 class TDEUI_EXPORT TDEFontRequester : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   TQ_PROPERTY( TQString title READ title WRITE setTitle )
   TQ_PROPERTY( TQString sampleText READ sampleText WRITE setSampleText )
diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp
index 0e4c5d520..256e1669d 100644
--- a/tdeui/tdelistbox.cpp
+++ b/tdeui/tdelistbox.cpp
@@ -30,22 +30,22 @@
 TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f )
     : TQListBox( parent, name, f ), d(0)
 {
-    connect( this, TQT_SIGNAL( onViewport() ),
-	     this, TQT_SLOT( slotOnViewport() ) );
-    connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ),
-	     this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) );
+    connect( this, TQ_SIGNAL( onViewport() ),
+	     this, TQ_SLOT( slotOnViewport() ) );
+    connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ),
+	     this, TQ_SLOT( slotOnItem( TQListBoxItem * ) ) );
     slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
     if (kapp)
     {
-        connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+        connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
         kapp->addKipcEventMask( KIPC::SettingsChanged );
     }
 
     m_pCurrentItem = 0L;
 
     m_pAutoSelect = new TQTimer( this );
-    connect( m_pAutoSelect, TQT_SIGNAL( timeout() ),
-    	     this, TQT_SLOT( slotAutoSelect() ) );
+    connect( m_pAutoSelect, TQ_SIGNAL( timeout() ),
+    	     this, TQ_SLOT( slotAutoSelect() ) );
 }
 
 void TDEListBox::slotOnItem( TQListBoxItem *item )
@@ -75,27 +75,27 @@ void TDEListBox::slotSettingsChanged(int category)
         return;
     m_bUseSingle = TDEGlobalSettings::singleClick();
 
-    disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *,
+    disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *,
 						  const TQPoint & ) ),
-		this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *,
+		this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *,
 						    const TQPoint & ) ) );
-//         disconnect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, 
+//         disconnect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, 
 // 						 const TQPoint & ) ),
-// 		    this, TQT_SLOT( slotExecute( TQListBoxItem *, 
+// 		    this, TQ_SLOT( slotExecute( TQListBoxItem *, 
 // 					     const TQPoint & ) ) );
 
     if( m_bUseSingle )
     {
-      connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, 
+      connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, 
 						 const TQPoint & ) ),
-	       this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *,
+	       this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *,
 						   const TQPoint & ) ) );
     }
     else
     {
-//         connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, 
+//         connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, 
 // 					      const TQPoint & ) ),
-//                  this, TQT_SLOT( slotExecute( TQListBoxItem *, 
+//                  this, TQ_SLOT( slotExecute( TQListBoxItem *, 
 // 					  const TQPoint & ) ) );
     }
 
@@ -249,14 +249,14 @@ void TDEListBox::contentsMouseDoubleClickEvent ( TQMouseEvent * e )
   if( item ) {
     emit doubleClicked( item, e->globalPos() );
 
-    if( (e->button() == Qt::LeftButton) && !m_bUseSingle )
+    if( (e->button() == TQt::LeftButton) && !m_bUseSingle )
       emitExecute( item, e->globalPos() );
   }
 }
 
 void TDEListBox::slotMouseButtonClicked( int btn, TQListBoxItem *item, const TQPoint &pos )
 {
-  if( (btn == Qt::LeftButton) && item )
+  if( (btn == TQt::LeftButton) && item )
     emitExecute( item, pos );
 }
 
diff --git a/tdeui/tdelistbox.h b/tdeui/tdelistbox.h
index e7666af32..591349320 100644
--- a/tdeui/tdelistbox.h
+++ b/tdeui/tdelistbox.h
@@ -39,7 +39,7 @@
  **/
 class TDEUI_EXPORT TDEListBox : public TQListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
   TDEListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp
index c0c52ce48..868be813d 100644
--- a/tdeui/tdelistview.cpp
+++ b/tdeui/tdelistview.cpp
@@ -109,9 +109,9 @@ public:
       initialFileManagerItem(0)
   {
       renameable.append(0);
-      connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int)));
-      connect(editor, TQT_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQT_SLOT(renameNextProxy(TQListViewItem*,int)));
-      connect(editor, TQT_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQT_SLOT(renamePrevProxy(TQListViewItem*,int)));
+      connect(editor, TQ_SIGNAL(done(TQListViewItem*,int)), listview, TQ_SLOT(doneEditing(TQListViewItem*,int)));
+      connect(editor, TQ_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQ_SLOT(renameNextProxy(TQListViewItem*,int)));
+      connect(editor, TQ_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQ_SLOT(renamePrevProxy(TQListViewItem*,int)));
   }
 
   ~TDEListViewPrivate ()
@@ -189,9 +189,9 @@ TDEListViewLineEdit::TDEListViewLineEdit(TDEListView *parent)
 {
   setFrame( false );
   hide();
-  connect( parent, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotSelectionChanged() ));
-  connect( parent, TQT_SIGNAL( itemRemoved( TQListViewItem * ) ),
-                    TQT_SLOT( slotItemRemoved( TQListViewItem * ) ));
+  connect( parent, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotSelectionChanged() ));
+  connect( parent, TQ_SIGNAL( itemRemoved( TQListViewItem * ) ),
+                    TQ_SLOT( slotItemRemoved( TQListViewItem * ) ));
 }
 
 TDEListViewLineEdit::~TDEListViewLineEdit()
@@ -344,7 +344,7 @@ bool TDEListViewLineEdit::event(TQEvent *pe)
       keyPressEvent(k);
       return true;
     }
-	  else if ((k->key() == Qt::Key_Backtab || k->key() == Qt::Key_Tab) &&
+	  else if ((k->key() == TQt::Key_Backtab || k->key() == TQt::Key_Tab) &&
 			       p->tabOrderedRenaming() && p->itemsRenameable() &&
 			       !(k->state() & ControlButton || k->state() & AltButton))
 		{
@@ -374,11 +374,11 @@ void TDEListViewLineEdit::keyPressEvent(TQKeyEvent *e)
       emit renamePrev(i,c);
     }
   }
-  else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter)
+  else if (e->key() == TQt::Key_Return || e->key() == TQt::Key_Enter)
 		terminate(true);
-	else if(e->key() == Qt::Key_Escape)
+	else if(e->key() == TQt::Key_Escape)
 		terminate(false);
-  else if (e->key() == Qt::Key_Down || e->key() == Qt::Key_Up)
+  else if (e->key() == TQt::Key_Down || e->key() == TQt::Key_Up)
   {
 		terminate(true);
     KLineEdit::keyPressEvent(e);
@@ -459,42 +459,42 @@ TDEListView::TDEListView( TQWidget *parent, const char *name )
 {
   setDragAutoScroll(true);
 
-  connect( this, TQT_SIGNAL( onViewport() ),
-                   this, TQT_SLOT( slotOnViewport() ) );
-  connect( this, TQT_SIGNAL( onItem( TQListViewItem * ) ),
-                   this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( onViewport() ),
+                   this, TQ_SLOT( slotOnViewport() ) );
+  connect( this, TQ_SIGNAL( onItem( TQListViewItem * ) ),
+                   this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) );
 
-  connect (this, TQT_SIGNAL(contentsMoving(int,int)),
-                   this, TQT_SLOT(cleanDropVisualizer()));
-  connect (this, TQT_SIGNAL(contentsMoving(int,int)),
-                   this, TQT_SLOT(cleanItemHighlighter()));
+  connect (this, TQ_SIGNAL(contentsMoving(int,int)),
+                   this, TQ_SLOT(cleanDropVisualizer()));
+  connect (this, TQ_SIGNAL(contentsMoving(int,int)),
+                   this, TQ_SLOT(cleanItemHighlighter()));
 
   slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
   if (kapp)
   {
-    connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+    connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
     kapp->addKipcEventMask( KIPC::SettingsChanged );
   }
 
-  connect(&d->autoSelect, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotAutoSelect() ) );
-  connect(&d->dragExpand, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotDragExpand() ) );
+  connect(&d->autoSelect, TQ_SIGNAL( timeout() ),
+                  this, TQ_SLOT( slotAutoSelect() ) );
+  connect(&d->dragExpand, TQ_SIGNAL( timeout() ),
+                  this, TQ_SLOT( slotDragExpand() ) );
 
   // context menu handling
   if (d->showContextMenusOnPress)
         {
-          connect (this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)),
-                           this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
+          connect (this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)),
+                           this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
         }
   else
         {
-          connect (this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)),
-                           this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
+          connect (this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)),
+                           this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
         }
 
-  connect (this, TQT_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)),
-                   this, TQT_SLOT (emitContextMenu (TDEListView*, TQListViewItem*)));
+  connect (this, TQ_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)),
+                   this, TQ_SLOT (emitContextMenu (TDEListView*, TQListViewItem*)));
   d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor();
 }
 
@@ -585,12 +585,12 @@ void TDEListView::slotSettingsChanged(int category)
     d->dragDelay =  TDEGlobalSettings::dndEventDelay();
     d->bUseSingle = TDEGlobalSettings::singleClick();
 
-    disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)),
-               this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)));
+    disconnect(this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)),
+               this, TQ_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)));
 
     if( d->bUseSingle )
-      connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)),
-               this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int)));
+      connect (this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)),
+               this, TQ_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int)));
 
     d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon();
     if ( !d->disableAutoSelection )
@@ -607,17 +607,17 @@ void TDEListView::slotSettingsChanged(int category)
 
     if (d->showContextMenusOnPress)
     {
-      disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
+      disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
 
-      connect(this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)),
-              this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
+      connect(this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)),
+              this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
     }
     else
     {
-      disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
+      disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
 
-      connect(this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)),
-              this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
+      connect(this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)),
+              this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int)));
     }
     break;
 
@@ -828,7 +828,7 @@ void TDEListView::contentsMousePressEvent( TQMouseEvent *e )
                 treeStepSize() * ( at->depth() + ( rootIsDecorated() ? 1 : 0) ) + itemMargin() )
            && ( p.x() >= header()->cellPos( header()->mapToActual( 0 ) ) );
 
-  if (e->button() == Qt::LeftButton && !rootDecoClicked)
+  if (e->button() == TQt::LeftButton && !rootDecoClicked)
   {
     //Start a drag
     d->startDragPos = e->pos();
@@ -885,7 +885,7 @@ void TDEListView::contentsMouseMoveEvent( TQMouseEvent *e )
 
 void TDEListView::contentsMouseReleaseEvent( TQMouseEvent *e )
 {
-  if (e->button() == Qt::LeftButton)
+  if (e->button() == TQt::LeftButton)
   {
     // If the row was already selected, maybe we want to start an in-place editing
     if ( d->pressedOnSelected && itemsRenameable() )
@@ -921,7 +921,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
   // We don't want to call the parent method because it does setOpen,
   // whereas we don't do it in single click mode... (David)
   //TQListView::contentsMouseDoubleClickEvent( e );
-  if ( !e || e->button() != Qt::LeftButton ) {
+  if ( !e || e->button() != TQt::LeftButton ) {
     return;
   }
 
@@ -934,7 +934,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
   if( item ) {
     emit doubleClicked( item, e->globalPos(), col );
 
-    if( (e->button() == Qt::LeftButton) && !d->bUseSingle ) {
+    if( (e->button() == TQt::LeftButton) && !d->bUseSingle ) {
       emitExecute( item, e->globalPos(), col );
     }
   }
@@ -942,7 +942,7 @@ void TDEListView::contentsMouseDoubleClickEvent ( TQMouseEvent *e )
 
 void TDEListView::slotMouseButtonClicked( int btn, TQListViewItem *item, const TQPoint &pos, int c )
 {
-  if( (btn == Qt::LeftButton) && item ) {
+  if( (btn == TQt::LeftButton) && item ) {
     emitExecute(item, pos, c);
   }
 }
@@ -1399,7 +1399,7 @@ TQRect TDEListView::drawItemHighlighter(TQPainter *painter, TQListViewItem *item
     r = itemRect(item);
     r.setLeft(r.left()+(item->depth()+(rootIsDecorated() ? 1 : 0))*treeStepSize());
     if (painter)
-      style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(),
                             TQStyle::Style_FocusAtBorder, colorGroup().highlight());
   }
 
@@ -1601,7 +1601,7 @@ void TDEListView::fileManagerKeyPressEvent (TQKeyEvent* e)
 	}
 
 	if (((!selectedItems) || ((selectedItems==1) && (d->selectedUsingMouse)))
-			&& (e_state==Qt::NoButton)
+			&& (e_state==TQt::NoButton)
 			&& ((e->key()==Key_Down)
 			|| (e->key()==Key_Up)
 			|| (e->key()==Key_Next)
@@ -2152,7 +2152,7 @@ void TDEListView::viewportPaintEvent(TQPaintEvent *e)
       TQPainter painter(viewport());
 
       // This is where we actually draw the drop-highlighter
-      style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
+      style().drawPrimitive(TQStyle::PE_FocusRect, &painter, d->mOldDropHighlighter, colorGroup(),
                             TQStyle::Style_FocusAtBorder);
     }
   d->painting = false;
@@ -2456,7 +2456,7 @@ TQColor TDEListViewItem::backgroundColor(int column)
   // calculate a different color if the current column is sorted (only if more than 1 column)
   if ( (view->columns() > 1) && view->shadeSortColumn() && (column == view->columnSorted()) )
   {
-    if ( color == Qt::black )
+    if ( color == TQt::black )
       color = TQColor(55, 55, 55);  // dark gray
     else
     {
diff --git a/tdeui/tdelistview.h b/tdeui/tdelistview.h
index 6b02b6891..c07d040e4 100644
--- a/tdeui/tdelistview.h
+++ b/tdeui/tdelistview.h
@@ -85,7 +85,7 @@ class TDEUI_EXPORT TDEListView : public TQListView
 {
   friend class TDEListViewItem;
 
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_ENUMS( SelectionModeExt )
   TQ_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
diff --git a/tdeui/tdelistviewlineedit.h b/tdeui/tdelistviewlineedit.h
index 0a87394ab..b7c166096 100644
--- a/tdeui/tdelistviewlineedit.h
+++ b/tdeui/tdelistviewlineedit.h
@@ -28,7 +28,7 @@
  **/
 class TDEUI_EXPORT TDEListViewLineEdit : public KLineEdit
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	TDEListViewLineEdit(TDEListView *parent);
 	~TDEListViewLineEdit();
diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp
index 50ad3d276..88ac3746c 100644
--- a/tdeui/tdelistviewsearchline.cpp
+++ b/tdeui/tdelistviewsearchline.cpp
@@ -63,15 +63,15 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, TDEListView *list
 
     d->listView = listView;
 
-    connect(this, TQT_SIGNAL(textChanged(const TQString &)),
-            this, TQT_SLOT(queueSearch(const TQString &)));
+    connect(this, TQ_SIGNAL(textChanged(const TQString &)),
+            this, TQ_SLOT(queueSearch(const TQString &)));
 
     if(listView) {
-        connect(listView, TQT_SIGNAL(destroyed()),
-                this, TQT_SLOT(listViewDeleted()));
+        connect(listView, TQ_SIGNAL(destroyed()),
+                this, TQ_SLOT(listViewDeleted()));
 
-        connect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)),
-                this, TQT_SLOT(itemAdded(TQListViewItem *)));
+        connect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)),
+                this, TQ_SLOT(itemAdded(TQListViewItem *)));
     }
     else
         setEnabled(false);
@@ -84,8 +84,8 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, const char *name)
 
     d->listView = 0;
 
-    connect(this, TQT_SIGNAL(textChanged(const TQString &)),
-            this, TQT_SLOT(queueSearch(const TQString &)));
+    connect(this, TQ_SIGNAL(textChanged(const TQString &)),
+            this, TQ_SLOT(queueSearch(const TQString &)));
 
     setEnabled(false);
 }
@@ -178,21 +178,21 @@ void TDEListViewSearchLine::setSearchColumns(const TQValueList<int> &columns)
 void TDEListViewSearchLine::setListView(TDEListView *lv)
 {
     if(d->listView) {
-        disconnect(d->listView, TQT_SIGNAL(destroyed()),
-                   this, TQT_SLOT(listViewDeleted()));
+        disconnect(d->listView, TQ_SIGNAL(destroyed()),
+                   this, TQ_SLOT(listViewDeleted()));
 
-        disconnect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)),
-                   this, TQT_SLOT(itemAdded(TQListViewItem *)));
+        disconnect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)),
+                   this, TQ_SLOT(itemAdded(TQListViewItem *)));
     }
 
     d->listView = lv;
 
     if(lv) {
-        connect(d->listView, TQT_SIGNAL(destroyed()),
-                this, TQT_SLOT(listViewDeleted()));
+        connect(d->listView, TQ_SIGNAL(destroyed()),
+                this, TQ_SLOT(listViewDeleted()));
 
-        connect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)),
-                this, TQT_SLOT(itemAdded(TQListViewItem *)));
+        connect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)),
+                this, TQ_SLOT(itemAdded(TQListViewItem *)));
     }
 
     setEnabled(bool(lv));
@@ -237,7 +237,7 @@ TQPopupMenu *TDEListViewSearchLine::createPopupMenu()
 
     if (d->listView->columns()>1) {
         TQPopupMenu *subMenu = new TQPopupMenu(popup);
-        connect(subMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(searchColumnsMenuActivated(int)));
+        connect(subMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(searchColumnsMenuActivated(int)));
 
         popup->insertSeparator();
         popup->insertItem(i18n("Search Columns"), subMenu);
@@ -285,7 +285,7 @@ void TDEListViewSearchLine::queueSearch(const TQString &search)
 {
     d->queuedSearches++;
     d->search = search;
-    TQTimer::singleShot(200, this, TQT_SLOT(activateSearch()));
+    TQTimer::singleShot(200, this, TQ_SLOT(activateSearch()));
 }
 
 void TDEListViewSearchLine::activateSearch()
@@ -425,7 +425,7 @@ TDEListViewSearchLineWidget::TDEListViewSearchLineWidget(TDEListView *listView,
 
     setSpacing(5);
 
-    TQTimer::singleShot(0, this, TQT_SLOT(createWidgets()));
+    TQTimer::singleShot(0, this, TQ_SLOT(createWidgets()));
 }
 
 TDEListViewSearchLineWidget::~TDEListViewSearchLineWidget()
@@ -460,7 +460,7 @@ void TDEListViewSearchLineWidget::createWidgets()
     label->setBuddy(d->searchLine);
     label->show();
 
-    connect(d->clearButton, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear()));
+    connect(d->clearButton, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear()));
 }
 
 TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const
@@ -470,7 +470,7 @@ TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const
 
 void TDEListViewSearchLineWidget::positionInToolBar()
 {
-    TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>(parent());
+    TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>(parent());
 
     if(toolBar) {
 
diff --git a/tdeui/tdelistviewsearchline.h b/tdeui/tdelistviewsearchline.h
index cf02c492c..aeac7d668 100644
--- a/tdeui/tdelistviewsearchline.h
+++ b/tdeui/tdelistviewsearchline.h
@@ -46,7 +46,7 @@ class TQToolButton;
 
 class TDEUI_EXPORT TDEListViewSearchLine : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -218,7 +218,7 @@ private:
  */
 class TDEUI_EXPORT TDEListViewSearchLineWidget : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 225b910e4..817c14423 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -49,7 +49,7 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
 #include <netwm.h>
 #endif
 
@@ -126,7 +126,7 @@ public:
                     TQApplication::sendEvent( window, &e );
                     canceled = !e.isAccepted();
 		    /* Don't even think_about deleting widgets with
-		     Qt::WDestructiveClose flag set at this point. We
+		     TQt::WDestructiveClose flag set at this point. We
 		     are faking a close event, but we are *not*_
 		     closing the window. The purpose of the faked
 		     close event is to prepare the application so it
@@ -184,7 +184,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     mHelpMenu = 0;
     kapp->setTopWidget( this );
     actionCollection()->setWidget( this );
-    connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown()));
+    connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
     if( !memberList )
         memberList = new TQPtrList<TDEMainWindow>;
 
@@ -290,7 +290,7 @@ void TDEMainWindow::parseGeometry(bool parsewidth)
     assert ( !kapp->geometryArgument().isNull() );
     assert ( d->care_about_geometry );
 
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     int x, y;
     int w, h;
     int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h);
@@ -340,8 +340,8 @@ TDEPopupMenu* TDEMainWindow::helpMenu( const TQString &aboutAppText, bool showWh
 
         if ( !mHelpMenu )
             return 0;
-        connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ),
-                 this, TQT_SLOT( showAboutApplication() ) );
+        connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ),
+                 this, TQ_SLOT( showAboutApplication() ) );
     }
 
     return mHelpMenu->menu();
@@ -351,8 +351,8 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis )
 {
     if( !mHelpMenu ) {
         mHelpMenu = new KHelpMenu( this, TQString::null, showWhatsThis );
-        connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ),
-                 this, TQT_SLOT( showAboutApplication() ) );
+        connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ),
+                 this, TQ_SLOT( showAboutApplication() ) );
     }
 
     return mHelpMenu->menu();
@@ -403,7 +403,7 @@ void TDEMainWindow::hide()
 
         d->hiddenDockWindows.clear();
 
-        TQObjectList *list = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
+        TQObjectList *list = queryList( "TQDockWindow" );
         for( TQObjectListIt it( *list ); it.current(); ++it ) {
             TQDockWindow *dw = (TQDockWindow*)it.current();
             if ( dw->isTopLevel() && dw->isVisible() ) {
@@ -433,7 +433,7 @@ bool TDEMainWindow::restore( int number, bool show )
 KXMLGUIFactory *TDEMainWindow::guiFactory()
 {
     if ( !factory_ )
-        factory_ = new KXMLGUIFactory( this, TQT_TQOBJECT(this), "guifactory" );
+        factory_ = new KXMLGUIFactory( this, this, "guifactory" );
     return factory_;
 }
 
@@ -441,7 +441,7 @@ int TDEMainWindow::configureToolbars()
 {
     saveMainWindowSettings(TDEGlobal::config());
     KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(saveNewToolbarConfig()));
     return dlg.exec();
 }
 
@@ -458,7 +458,7 @@ void TDEMainWindow::setupGUI( int options, const TQString & xmlfile ) {
 void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) {
     if( options & Keys ){
         KStdAction::keyBindings(guiFactory(),
-                    TQT_SLOT(configureShortcuts()), actionCollection());
+                    TQ_SLOT(configureShortcuts()), actionCollection());
     }
 
     if( (options & StatusBar) && internalStatusBar() ){
@@ -467,8 +467,8 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString &
 
     if( options & ToolBar ){
         setStandardToolBarMenuEnabled( true );
-        KStdAction::configureToolbars(TQT_TQOBJECT(this),
-                      TQT_SLOT(configureToolbars() ), actionCollection());
+        KStdAction::configureToolbars(this,
+                      TQ_SLOT(configureToolbars() ), actionCollection());
     }
 
     if( options & Create ){
@@ -600,7 +600,7 @@ void TDEMainWindow::setCaption( const TQString &caption, bool modified )
 void TDEMainWindow::setPlainCaption( const TQString &caption )
 {
     TQMainWindow::setCaption( caption );
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
     NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 );
     info.setName( caption.utf8().data() );
 #endif
@@ -659,7 +659,7 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e )
         if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted?
             if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app?
                 // don't call queryExit() twice
-                disconnect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown()));
+                disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
                 d->shuttingDown = true;
                 kapp->deref();             // ...and quit application.
             }  else {
@@ -804,9 +804,9 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const
 
 void TDEMainWindow::createStandardStatusBarAction(){
   if(!d->showStatusBarAction){
-    d->showStatusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(setSettingsDirty()), actionCollection());
+    d->showStatusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(setSettingsDirty()), actionCollection());
     KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already.
-    connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool)));
+    connect(d->showStatusBarAction, TQ_SIGNAL(toggled(bool)), sb, TQ_SLOT(setShown(bool)));
     d->showStatusBarAction->setChecked(sb->isHidden());
   }
 }
@@ -913,7 +913,7 @@ void TDEMainWindow::saveWindowSize( TDEConfig * config ) const
   int scnum = TQApplication::desktop()->screenNumber(parentWidget());
   TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
   int w, h;
-#if defined Q_WS_X11
+#if defined TQ_WS_X11
   // save maximalization as desktop size + 1 in that direction
   KWin::WindowInfo info = KWin::windowInfo( winId(), NET::WMState );
   w = info.state() & NET::MaxHoriz ? desk.width() + 1 : width();
@@ -963,7 +963,7 @@ void TDEMainWindow::restoreWindowSize( TDEConfig * config )
             }
         }
         if ( !size.isEmpty() ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             int state = 0;
             if (size.width() > desk.width()) {
                 state = state | NET::MaxHoriz;
@@ -1017,7 +1017,7 @@ void TDEMainWindow::setSettingsDirty()
         if ( !d->settingsTimer )
         {
            d->settingsTimer = new TQTimer( this );
-           connect( d->settingsTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAutoSaveSettings() ) );
+           connect( d->settingsTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAutoSaveSettings() ) );
         }
         d->settingsTimer->start( 500, true );
     }
@@ -1039,10 +1039,10 @@ void TDEMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWi
     d->autoSaveGroup = groupName;
     d->autoSaveWindowSize = saveWindowSize;
     // Get notified when the user moves a toolbar around
-    disconnect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
-                this, TQT_SLOT( setSettingsDirty() ) );
-    connect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
-             this, TQT_SLOT( setSettingsDirty() ) );
+    disconnect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
+                this, TQ_SLOT( setSettingsDirty() ) );
+    connect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
+             this, TQ_SLOT( setSettingsDirty() ) );
 
     // Now read the previously saved settings
     applyMainWindowSettings( TDEGlobal::config(), groupName );
@@ -1244,7 +1244,7 @@ TQSize TDEMainWindow::sizeForCentralWidgetSize(TQSize size)
 void TDEMainWindow::setIcon( const TQPixmap& p )
 {
     TQMainWindow::setIcon( p );
-#ifdef Q_WS_X11 
+#ifdef TQ_WS_X11 
     // Qt3 doesn't support _NET_WM_ICON, but TDEApplication::setTopWidget(), which
     // is used by TDEMainWindow, sets it
     KWin::setIcons( winId(), p, TQPixmap());
diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h
index 856590ab9..446b9c937 100644
--- a/tdeui/tdemainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -98,7 +98,7 @@ class DCOPObject;
 class TDEUI_EXPORT TDEMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
 {
     friend class KMWSessionManaged;
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -541,8 +541,8 @@ public:
      * this function) a connection needs to be made to let TDEMainWindow
      * know when that status (hidden/shown) of the statusbar has changed.
      * For example:
-     * connect(action, TQT_SIGNAL(activated()),
-     *         tdemainwindow, TQT_SLOT(setSettingsDirty()));
+     * connect(action, TQ_SIGNAL(activated()),
+     *         tdemainwindow, TQ_SLOT(setSettingsDirty()));
      * Otherwise the status (hidden/show) of the statusbar might not be saved
      * by TDEMainWindow.
      * @since 3.2
@@ -683,7 +683,7 @@ public slots:
      * This slot can be connected dirrectly to the action to configure shortcuts.
      * This is very simple to do that by adding a single line
      * \code
-     * KStdAction::configureToolbars( guiFactory(), TQT_SLOT( configureToolbars() ),
+     * KStdAction::configureToolbars( guiFactory(), TQ_SLOT( configureToolbars() ),
      *                                actionCollection() );
      * \endcode
      *
@@ -734,8 +734,8 @@ public slots:
      * \code
      * TDEIconLoader &loader = *TDEGlobal::iconLoader();
      * TQPixmap pixmap = loader.loadIcon( "help" );
-     * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()),
-     *   this, TQT_SLOT(appHelpActivated()), true, i18n("Help") );
+     * toolBar(0)->insertButton( pixmap, 0, TQ_SIGNAL(clicked()),
+     *   this, TQ_SLOT(appHelpActivated()), true, i18n("Help") );
      * \endcode
      *
      */
diff --git a/tdeui/tdemainwindowiface.cpp b/tdeui/tdemainwindowiface.cpp
index 0404249b0..a18fb80ed 100644
--- a/tdeui/tdemainwindowiface.cpp
+++ b/tdeui/tdemainwindowiface.cpp
@@ -34,7 +34,7 @@ TDEMainWindowInterface::TDEMainWindowInterface(TDEMainWindow * mainWindow)
 {
 	m_MainWindow = mainWindow;
 	m_dcopActionProxy = new KDCOPActionProxy( m_MainWindow->actionCollection(), this );
-	m_dcopPropertyProxy = new KDCOPPropertyProxy(TQT_TQOBJECT(m_MainWindow));
+	m_dcopPropertyProxy = new KDCOPPropertyProxy(m_MainWindow);
 }
 
 TDEMainWindowInterface::~TDEMainWindowInterface()
diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp
index 0a5fe0188..e7c901d56 100644
--- a/tdeui/tdemenubar.cpp
+++ b/tdeui/tdemenubar.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kmanagerselection.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <twin.h> 
 #include <twinmodule.h> 
 #include <qxembed.h> 
@@ -74,7 +74,7 @@ public:
 	:   forcedTopLevel( false ),
 	    topLevel( false ),
 	    wasTopLevel( false ),
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	    selection( NULL ),
 #endif
             min_size( 0, 0 )
@@ -82,7 +82,7 @@ public:
 	}
     ~KMenuBarPrivate()
         {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         delete selection;
 #endif
         }
@@ -93,7 +93,7 @@ public:
     int lineWidth;  // dtto
     int margin;     // dtto
     bool fallback_mode; // dtto
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TDESelectionWatcher* selection;
 #endif
     TQTimer selection_timer;
@@ -101,7 +101,7 @@ public:
     static Atom makeSelectionAtom();
 };
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 static Atom selection_atom = None;
 static Atom msg_type_atom = None;
 
@@ -121,7 +121,7 @@ void initAtoms()
 
 Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( selection_atom == None )
 	initAtoms();
     return selection_atom;
@@ -133,19 +133,19 @@ Atom KMenuBar::KMenuBarPrivate::makeSelectionAtom()
 KMenuBar::KMenuBar(TQWidget *parent, const char *name)
   : TQMenuBar(parent, name)
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     QXEmbed::initialize();
 #endif
     d = new KMenuBarPrivate;
-    connect( &d->selection_timer, TQT_SIGNAL( timeout()),
-        this, TQT_SLOT( selectionTimeout()));
+    connect( &d->selection_timer, TQ_SIGNAL( timeout()),
+        this, TQ_SLOT( selectionTimeout()));
 
-    connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize()));
+    connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( updateFallbackSize()));
 
     if ( kapp )
         // toolbarAppearanceChanged(int) is sent when changing macstyle
-        connect( kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)),
-            this, TQT_SLOT(slotReadConfig()));
+        connect( kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)),
+            this, TQ_SLOT(slotReadConfig()));
 
     slotReadConfig();
 }
@@ -176,13 +176,13 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
   d->topLevel = top_level;
   if ( isTopLevelMenu() )
   {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(),
           DefaultScreen( tqt_xdisplay()));
-      connect( d->selection, TQT_SIGNAL( newOwner( Window )),
-          this, TQT_SLOT( updateFallbackSize()));
-      connect( d->selection, TQT_SIGNAL( lostOwner()),
-          this, TQT_SLOT( updateFallbackSize()));
+      connect( d->selection, TQ_SIGNAL( newOwner( Window )),
+          this, TQ_SLOT( updateFallbackSize()));
+      connect( d->selection, TQ_SIGNAL( lostOwner()),
+          this, TQ_SLOT( updateFallbackSize()));
 #endif
       d->frameStyle = frameStyle();
       d->lineWidth = lineWidth();
@@ -190,7 +190,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
       d->fallback_mode = false;
       bool wasShown = !isHidden();
       reparent( parentWidget(), (WFlags)(WType_TopLevel | WStyle_Tool | WStyle_Customize | WStyle_NoBorder), TQPoint(0,0), false );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       KWin::setType( winId(), NET::TopMenu );
       if( parentWidget())
           XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
@@ -206,7 +206,7 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level)
           show();
   } else
   {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
       delete d->selection;
       d->selection = NULL;
 #endif
@@ -244,7 +244,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
 {
     if ( d->topLevel )
     {
-	if ( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget())  )
+	if ( parentWidget() && obj == parentWidget()->topLevelWidget()  )
         {
 	    if( ev->type() == TQEvent::Resize )
 		return false; // ignore resizing of parent, TQMenuBar would try to adjust size
@@ -257,20 +257,20 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
                 // will update the state properly
                 setTopLevelMenuInternal( d->topLevel );
         }
-        if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()) && ev->type() == TQEvent::Reparent )
+        if( parentWidget() && obj == parentWidget() && ev->type() == TQEvent::Reparent )
             {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
             XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #else
             //TODO: WIN32?
 #endif
             setShown( parentWidget()->isTopLevel() || parentWidget()->isVisible());
             }
-        if( parentWidget() && !parentWidget()->isTopLevel() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()))
+        if( parentWidget() && !parentWidget()->isTopLevel() && obj == parentWidget())
         { // if the parent is not toplevel, KMenuBar needs to match its visibility status
             if( ev->type() == TQEvent::Show )
                 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
                 XSetTransientForHint( tqt_xdisplay(), winId(), parentWidget()->topLevelWidget()->winId());
 #else
                 //TODO: WIN32?
@@ -283,7 +283,7 @@ bool KMenuBar::eventFilter(TQObject *obj, TQEvent *ev)
     }
     else
     {
-        if( parentWidget() && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(parentWidget()->topLevelWidget()))
+        if( parentWidget() && obj == parentWidget()->topLevelWidget())
         {
             if( ev->type() == TQEvent::WindowStateChange
                 && !parentWidget()->topLevelWidget()->isFullScreen() )
@@ -303,7 +303,7 @@ void KMenuBar::updateFallbackSize()
 {
     if( !d->topLevel )
 	return;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( d->selection->owner() != None )
 #endif
     { // somebody is managing us, don't mess anything, undo changes
@@ -340,7 +340,7 @@ void KMenuBar::selectionTimeout()
         int margin = 0;
 	move(area.left() - margin, area.top() - margin); 
         setFixedSize(area.width() + 2* margin , heightForWidth( area.width() + 2 * margin ) );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         int strut_height = height() - margin;
         if( strut_height < 0 )
             strut_height = 0;
@@ -426,7 +426,7 @@ TQSize KMenuBar::sizeHint() const
     return TQSize( w, h );
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 bool KMenuBar::x11Event( XEvent* ev )
 {
     if( ev->type == ClientMessage && ev->xclient.message_type == msg_type_atom
diff --git a/tdeui/tdemenubar.h b/tdeui/tdemenubar.h
index 18ee3bf90..07345978d 100644
--- a/tdeui/tdemenubar.h
+++ b/tdeui/tdemenubar.h
@@ -41,7 +41,7 @@
 
 class TDEUI_EXPORT KMenuBar : public TQMenuBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -91,7 +91,7 @@ protected:
     virtual void showEvent( TQShowEvent* );
     virtual void resizeEvent( TQResizeEvent* );
     virtual bool eventFilter(TQObject *, TQEvent *);
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     virtual bool x11Event( XEvent* );
 #endif
     virtual void closeEvent( TQCloseEvent* );
diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp
index 3208e94d8..49648a74d 100644
--- a/tdeui/tdemessagebox.cpp
+++ b/tdeui/tdemessagebox.cpp
@@ -45,7 +45,7 @@
 #include <kiconloader.h>
 #include <tdeglobalsettings.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #endif
 
@@ -164,7 +164,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
     if (!icon.isNull())
        label1->setPixmap(icon);
 
-    lay->addWidget( label1, 0, Qt::AlignCenter );
+    lay->addWidget( label1, 0, TQt::AlignCenter );
     lay->addSpacing(KDialog::spacingHint());
     // Enforce <p>text</p> otherwise the word-wrap doesn't work well
     TQString qt_text = qrichtextify( text );
@@ -214,8 +214,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
     KActiveLabel *label2 = new KActiveLabel( qt_text, contents );
     if (!(options & KMessageBox::AllowLink))
     {
-       TQObject::disconnect(label2, TQT_SIGNAL(linkClicked(const TQString &)),
-                  label2, TQT_SLOT(openLink(const TQString &)));
+       TQObject::disconnect(label2, TQ_SIGNAL(linkClicked(const TQString &)),
+                  label2, TQ_SLOT(openLink(const TQString &)));
     }
 
     // We add 10 pixels extra to compensate for some KActiveLabel margins.
@@ -250,8 +250,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
          label3->setMinimumSize(label3->sizeHint());
          if (!(options & KMessageBox::AllowLink))
          {
-           TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)),
-                               label3, TQT_SLOT(openLink(const TQString &)));
+           TQObject::disconnect(label3, TQ_SIGNAL(linkClicked(const TQString &)),
+                               label3, TQ_SLOT(openLink(const TQString &)));
          }
        } else {
          TQTextEdit* te = new TQTextEdit(details, TQString::null, detailsGroup);
@@ -423,7 +423,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Question") : caption,
                        KDialogBase::Yes | KDialogBase::No,
@@ -432,7 +432,7 @@ KMessageBox::questionYesNoListWId(WId parent_id, const TQString &text,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -474,7 +474,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Question") : caption,
                        KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
@@ -483,7 +483,7 @@ KMessageBox::questionYesNoCancelWId(WId parent_id,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -556,7 +556,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Warning") : caption,
                        KDialogBase::Yes | KDialogBase::No,
@@ -565,7 +565,7 @@ KMessageBox::warningYesNoListWId(WId parent_id, const TQString &text,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -628,7 +628,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownContinue(dontAskAgainName) )
         return Continue;
 
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Warning") : caption,
                        KDialogBase::Yes | KDialogBase::No,
@@ -637,7 +637,7 @@ KMessageBox::warningContinueCancelListWId(WId parent_id, const TQString &text,
                        buttonContinue, KStdGuiItem::cancel() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -704,7 +704,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text,
     if ( !shouldBeShownYesNo(dontAskAgainName, res) )
         return res;
 
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Warning") : caption,
                        KDialogBase::Yes | KDialogBase::No | KDialogBase::Cancel,
@@ -713,7 +713,7 @@ KMessageBox::warningYesNoCancelListWId(WId parent_id, const TQString &text,
                        buttonYes, buttonNo);
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -755,7 +755,7 @@ void
 KMessageBox::errorListWId(WId parent_id,  const TQString &text, const TQStringList &strlist,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Error") : caption,
                        KDialogBase::Yes,
@@ -764,7 +764,7 @@ KMessageBox::errorListWId(WId parent_id,  const TQString &text, const TQStringLi
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -785,7 +785,7 @@ KMessageBox::detailedErrorWId(WId parent_id,  const TQString &text,
                    const TQString &details,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Error") : caption,
                        KDialogBase::Yes | KDialogBase::Details,
@@ -794,7 +794,7 @@ KMessageBox::detailedErrorWId(WId parent_id,  const TQString &text,
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -832,7 +832,7 @@ void
 KMessageBox::sorryWId(WId parent_id, const TQString &text,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Sorry") : caption,
                        KDialogBase::Yes,
@@ -841,7 +841,7 @@ KMessageBox::sorryWId(WId parent_id, const TQString &text,
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -862,7 +862,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text,
                    const TQString &details,
                    const TQString &caption, int options)
 {
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Sorry") : caption,
                        KDialogBase::Yes | KDialogBase::Details,
@@ -871,7 +871,7 @@ KMessageBox::detailedSorryWId(WId parent_id, const TQString &text,
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
@@ -908,7 +908,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri
     if ( !shouldBeShownContinue(dontShowAgainName) )
         return;
 
-    TQWidget* parent = TQT_TQWIDGET(TQWidget::find( parent_id ));
+    TQWidget* parent = TQWidget::find( parent_id );
     KDialogBase *dialog= new KDialogBase(
                        caption.isEmpty() ? i18n("Information") : caption,
                        KDialogBase::Yes,
@@ -917,7 +917,7 @@ KMessageBox::informationListWId(WId parent_id,const TQString &text, const TQStri
                        KStdGuiItem::ok() );
     if( options & PlainCaption )
         dialog->setPlainCaption( caption );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     if( parent == NULL && parent_id )
         XSetTransientForHint( tqt_xdisplay(), dialog->winId(), parent_id );
 #endif
diff --git a/tdeui/tdepassivepopupstack.cpp b/tdeui/tdepassivepopupstack.cpp
index 9f116059f..cef63db18 100644
--- a/tdeui/tdepassivepopupstack.cpp
+++ b/tdeui/tdepassivepopupstack.cpp
@@ -60,9 +60,9 @@ KPassivePopup* TDEPassivePopupStackContainer::displayMessage(TQString title, TQS
 		leftCorner.setX(mRightOfStack-popupSize.width());
 		leftCorner.setY(mTopOfStack);
 	}
-	connect(popup, SIGNAL(hidden(KPassivePopup*)), this, SLOT(popupClosed(KPassivePopup*)));
-	connect(popup, SIGNAL(clicked(TQPoint)), this, SLOT(popupClicked(TQPoint)));
-	connect(popup, SIGNAL(destroyed(TQObject*)), this, SLOT(popupDestroyed(TQObject*)));
+	connect(popup, TQ_SIGNAL(hidden(KPassivePopup*)), this, TQ_SLOT(popupClosed(KPassivePopup*)));
+	connect(popup, TQ_SIGNAL(clicked(TQPoint)), this, TQ_SLOT(popupClicked(TQPoint)));
+	connect(popup, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(popupDestroyed(TQObject*)));
 	mPopupList.append(popup);
 	mPopupIDMap[popup] = id;
 	popup->show(leftCorner);
@@ -104,4 +104,4 @@ void TDEPassivePopupStackContainer::popupDestroyed(TQObject* object) {
 	}
 }
 
-#include "tdepassivepopupstack.moc"
\ No newline at end of file
+#include "tdepassivepopupstack.moc"
diff --git a/tdeui/tdepassivepopupstack.h b/tdeui/tdepassivepopupstack.h
index 61ef209e1..13ac29f44 100644
--- a/tdeui/tdepassivepopupstack.h
+++ b/tdeui/tdepassivepopupstack.h
@@ -32,7 +32,7 @@ typedef TQMap<KPassivePopup*, TQString> TQStringPopupIDMap;
 
 class TDEUI_EXPORT TDEPassivePopupStackContainer : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDEPassivePopupStackContainer(TQWidget *parent=0, const char *name=0);
diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp
index 3fd8a90e2..5195c64a8 100644
--- a/tdeui/tdepopupmenu.cpp
+++ b/tdeui/tdepopupmenu.cpp
@@ -21,10 +21,6 @@
 #include <tqtimer.h>
 #include <tqfontmetrics.h>
 
-#ifdef USE_QT4
-#undef None
-#endif // USE_QT4
-
 #include <tqstyle.h>
 
 #include "tdepopupmenu.h"
@@ -90,7 +86,7 @@ void TDEPopupTitle::paintEvent(TQPaintEvent *)
 {
     TQRect r(rect());
     TQPainter p(this);
-    kapp->style().tqdrawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
+    kapp->style().drawPrimitive(TQStyle::PE_HeaderSectionMenu, &p, r, palette().active());
 
     if (!miniicon.isNull())
         p.drawPixmap(4, (r.height()-miniicon.height())/2, miniicon);
@@ -128,7 +124,7 @@ public:
         , shortcuts(false)
         , autoExec(false)
         , lastHitIndex(-1)
-        , state(Qt::NoButton)
+        , state(TQt::NoButton)
         , m_ctxMenu(0)
     {}
 
@@ -168,7 +164,7 @@ TDEPopupMenu::TDEPopupMenu(TQWidget *parent, const char *name)
 {
     d = new TDEPopupMenuPrivate;
     resetKeyboardVars();
-    connect(&(d->clearTimer), TQT_SIGNAL(timeout()), TQT_SLOT(resetKeyboardVars()));
+    connect(&(d->clearTimer), TQ_SIGNAL(timeout()), TQ_SLOT(resetKeyboardVars()));
 }
 
 TDEPopupMenu::~TDEPopupMenu()
@@ -278,7 +274,7 @@ void TDEPopupMenu::closeEvent(TQCloseEvent*e)
 
 void TDEPopupMenu::activateItemAt(int index)
 {
-    d->state = Qt::NoButton;
+    d->state = TQt::NoButton;
     TQPopupMenu::activateItemAt(index);
 }
 
@@ -289,7 +285,7 @@ TQt::ButtonState TDEPopupMenu::state() const
 
 void TDEPopupMenu::keyPressEvent(TQKeyEvent* e)
 {
-    d->state = Qt::NoButton;
+    d->state = TQt::NoButton;
     if (!d->shortcuts) {
         // continue event processing by Qpopup
         //e->ignore();
@@ -518,7 +514,7 @@ TQPopupMenu* TDEPopupMenu::contextMenu()
     if (!d->m_ctxMenu)
     {
         d->m_ctxMenu = new TQPopupMenu(this);
-        connect(d->m_ctxMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(ctxMenuHiding()));
+        connect(d->m_ctxMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(ctxMenuHiding()));
     }
 
     return d->m_ctxMenu;
@@ -563,7 +559,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos)
         TQPopupMenu* subMenu = item->popup();
         if (subMenu)
         {
-            disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu()));
+            disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu()));
         }
     }
 
@@ -580,8 +576,8 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos)
     TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup();
     if (subMenu)
     {
-        connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu()));
-        TQTimer::singleShot(100, subMenu, TQT_SLOT(hide()));
+        connect(subMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(ctxMenuHideShowingMenu()));
+        TQTimer::singleShot(100, subMenu, TQ_SLOT(hide()));
     }
 
     if (!TDEPopupMenuPrivate::s_continueCtxMenuShow)
@@ -592,7 +588,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos)
 
     TDEPopupMenuPrivate::s_contextedMenu = this;
     d->m_ctxMenu->popup(this->mapToGlobal(pos));
-    connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int)));
+    connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int)));
 }
 
 /*
@@ -607,7 +603,7 @@ void TDEPopupMenu::ctxMenuHideShowingMenu()
         TQPopupMenu* subMenu = item->popup();
         if (subMenu)
         {
-            TQTimer::singleShot(0, subMenu, TQT_SLOT(hide()));
+            TQTimer::singleShot(0, subMenu, TQ_SLOT(hide()));
         }
     }
 }
@@ -619,11 +615,11 @@ void TDEPopupMenu::ctxMenuHiding()
         TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup();
         if (subMenu)
         {
-            disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu()));
+            disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu()));
         }
     }
 
-    disconnect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int)));
+    disconnect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int)));
     TDEPopupMenuPrivate::s_continueCtxMenuShow = true;
 }
 
diff --git a/tdeui/tdepopupmenu.h b/tdeui/tdepopupmenu.h
index 7f84a5fc5..1a03ad11b 100644
--- a/tdeui/tdepopupmenu.h
+++ b/tdeui/tdepopupmenu.h
@@ -37,7 +37,7 @@
  */
 class TDEUI_EXPORT TDEPopupTitle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -121,7 +121,7 @@ private:
  * @author Hamish Rodda <rodda@kde.org>
  */
 class TDEUI_EXPORT TDEPopupMenu : public TQPopupMenu {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
diff --git a/tdeui/tdeselect.cpp b/tdeui/tdeselect.cpp
index 272f7a144..3d453f01e 100644
--- a/tdeui/tdeselect.cpp
+++ b/tdeui/tdeselect.cpp
@@ -122,7 +122,7 @@ void KXYSelector::paintEvent( TQPaintEvent *ev )
 	TQPainter painter;
 	painter.begin( this );
 
-	style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, 
+	style().drawPrimitive(TQStyle::PE_Panel, &painter, 
 			      borderRect, colorGroup(), 
 			      TQStyle::Style_Sunken);
 
@@ -160,7 +160,7 @@ void KXYSelector::mouseMoveEvent( TQMouseEvent *e )
 
 void KXYSelector::wheelEvent( TQWheelEvent *e )
 {
-	if ( e->orientation() == Qt::Horizontal )
+	if ( e->orientation() == TQt::Horizontal )
 		setValues( xValue() + e->delta()/120, yValue() );
 	else	
 		setValues( xValue(), yValue() + e->delta()/120 );
@@ -238,7 +238,7 @@ void KXYSelector::drawCursor( TQPainter *p, int xp, int yp )
 TDESelector::TDESelector( TQWidget *parent, const char *name )
 	: TQWidget( parent, name ), TQRangeControl()
 {
-	_orientation = Qt::Horizontal;
+	_orientation = TQt::Horizontal;
 	_indent = true;
 }
 
@@ -258,7 +258,7 @@ TQRect TDESelector::contentsRect() const
 {
 	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
-	if ( orientation() == Qt::Vertical )
+	if ( orientation() == TQt::Vertical )
 		return TQRect( w, iw, width() - w * 2 - 5, height() - 2 * iw );
 	else
 		return TQRect( iw, w, width() - 2 * iw, height() - w * 2 - 5 );
@@ -277,11 +277,11 @@ void TDESelector::paintEvent( TQPaintEvent * )
 	if ( indent() )
 	{
 		TQRect r = rect();
-		if ( orientation() == Qt::Vertical )
+		if ( orientation() == TQt::Vertical )
 			r.addCoords(0, iw - w, -iw, w - iw);
 		else
 			r.addCoords(iw - w, 0, w - iw, -iw);
-		style().tqdrawPrimitive(TQStyle::PE_Panel, &painter, 
+		style().drawPrimitive(TQStyle::PE_Panel, &painter, 
 			r, colorGroup(), 
 			TQStyle::Style_Sunken);
 	}
@@ -332,7 +332,7 @@ void TDESelector::moveArrow( const TQPoint &pos )
 	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
 
-	if ( orientation() == Qt::Vertical )
+	if ( orientation() == TQt::Vertical )
 		val = ( maxValue() - minValue() ) * (height()-pos.y()-5+w)
 				/ (height()-iw*2) + minValue();
 	else
@@ -348,7 +348,7 @@ TQPoint TDESelector::calcArrowPos( int val )
 
 	int w = style().pixelMetric(TQStyle::PM_DefaultFrameWidth);
 	int iw = (w < 5) ? 5 : w;
-	if ( orientation() == Qt::Vertical )
+	if ( orientation() == TQt::Vertical )
 	{
 		p.setY( height() - ( (height()-2*iw) * val
 				/ ( maxValue() - minValue() ) + 5 ) );
@@ -377,7 +377,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
     painter->setBrush( TQBrush( colorGroup().buttonText() ) );
     array.setPoint( 0, pos.x()+0, pos.y()+0 );
     array.setPoint( 1, pos.x()+5, pos.y()+5 );
-    if ( orientation() == Qt::Vertical )
+    if ( orientation() == TQt::Vertical )
     {
       array.setPoint( 2, pos.x()+5, pos.y()-5 );
     }
@@ -390,7 +390,7 @@ void TDESelector::drawArrow( TQPainter *painter, bool show, const TQPoint &pos )
   } 
   else 
   {
-    if ( orientation() == Qt::Vertical )
+    if ( orientation() == TQt::Vertical )
     {
        repaint(pos.x(), pos.y()-5, 6, 11, true);
     }
@@ -442,7 +442,7 @@ void KGradientSelector::drawContents( TQPainter *painter )
 	int greenDiff = color2.green() - color1.green();
 	int blueDiff  = color2.blue() - color1.blue();
 
-	if ( orientation() == Qt::Vertical )
+	if ( orientation() == TQt::Vertical )
 	{
 		for ( int y = 0; y < image.height(); y++ )
 		{
@@ -488,7 +488,7 @@ void KGradientSelector::drawContents( TQPainter *painter )
 
 	painter->drawPixmap( contentsRect().x(), contentsRect().y(), p );
 
-	if ( orientation() == Qt::Vertical )
+	if ( orientation() == TQt::Vertical )
 	{
 		int yPos = contentsRect().top() + painter->fontMetrics().ascent() + 2;
 		int xPos = contentsRect().left() + (contentsRect().width() -
diff --git a/tdeui/tdeselect.h b/tdeui/tdeselect.h
index 19321da1b..748b5897a 100644
--- a/tdeui/tdeselect.h
+++ b/tdeui/tdeselect.h
@@ -42,7 +42,7 @@
  */
 class TDEUI_EXPORT KXYSelector : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int xValue READ xValue WRITE setXValue )
   TQ_PROPERTY( int yValue READ yValue WRITE setYValue )
   
@@ -158,7 +158,7 @@ private:
  */
 class TDEUI_EXPORT TDESelector : public TQWidget, public TQRangeControl
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int value READ value WRITE setValue )
   TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
   TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
@@ -292,7 +292,7 @@ private:
  **/
 class TDEUI_EXPORT KGradientSelector : public TDESelector
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   TQ_PROPERTY( TQColor firstColor READ firstColor WRITE setFirstColor )
   TQ_PROPERTY( TQColor secondColor READ secondColor WRITE setSecondColor )
diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp
index 4d95970b6..be0386dea 100644
--- a/tdeui/tdeshortcutdialog.cpp
+++ b/tdeui/tdeshortcutdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tqvariant.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 	#define XK_XKB_KEYS
 	#define XK_MISCELLANY
 	#include <X11/Xlib.h>	// For x11Event()
@@ -37,7 +37,7 @@
 		#undef FocusOut
 		#undef FocusIn
 	#endif
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 # include <kkeyserver.h>
 #endif
 
@@ -91,21 +91,21 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort
 	m_simple->m_btnClearShortcut->setPixmap( SmallIcon( "locationbar_erase" ) );
 	m_adv->m_btnClearPrimary->setPixmap( SmallIcon( "locationbar_erase" ) );
 	m_adv->m_btnClearAlternate->setPixmap( SmallIcon( "locationbar_erase" ) );
-	connect(m_simple->m_btnClearShortcut, TQT_SIGNAL(clicked()),
-	        this, TQT_SLOT(slotClearShortcut()));
-	connect(m_adv->m_btnClearPrimary, TQT_SIGNAL(clicked()),
-	        this, TQT_SLOT(slotClearPrimary()));
-	connect(m_adv->m_btnClearAlternate, TQT_SIGNAL(clicked()),
-	        this, TQT_SLOT(slotClearAlternate()));
-
-	connect(m_adv->m_txtPrimary, TQT_SIGNAL(clicked()),
-		m_adv->m_btnPrimary, TQT_SLOT(animateClick()));
-	connect(m_adv->m_txtAlternate, TQT_SIGNAL(clicked()),
-		m_adv->m_btnAlternate, TQT_SLOT(animateClick()));
-	connect(m_adv->m_btnPrimary, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotSelectPrimary()));
-	connect(m_adv->m_btnAlternate, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotSelectAlternate()));
+	connect(m_simple->m_btnClearShortcut, TQ_SIGNAL(clicked()),
+	        this, TQ_SLOT(slotClearShortcut()));
+	connect(m_adv->m_btnClearPrimary, TQ_SIGNAL(clicked()),
+	        this, TQ_SLOT(slotClearPrimary()));
+	connect(m_adv->m_btnClearAlternate, TQ_SIGNAL(clicked()),
+	        this, TQ_SLOT(slotClearAlternate()));
+
+	connect(m_adv->m_txtPrimary, TQ_SIGNAL(clicked()),
+		m_adv->m_btnPrimary, TQ_SLOT(animateClick()));
+	connect(m_adv->m_txtAlternate, TQ_SIGNAL(clicked()),
+		m_adv->m_btnAlternate, TQ_SLOT(animateClick()));
+	connect(m_adv->m_btnPrimary, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotSelectPrimary()));
+	connect(m_adv->m_btnAlternate, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotSelectAlternate()));
 
 	KGuiItem ok = KStdGuiItem::ok();
 	ok.setText( i18n( "OK" ) );
@@ -121,7 +121,7 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort
 	s_showMore = TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("ShowAlternativeShortcutConfig", s_showMore);
 	updateDetails();
 
-	#ifdef Q_WS_X11
+	#ifdef TQ_WS_X11
 	kapp->installX11EventFilter( this );	// Allow button to capture X Key Events.
 	#endif
 }
@@ -276,7 +276,7 @@ void TDEShortcutDialog::slotMultiKeyMode( bool bOn )
 	}
 }
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 /* we don't use the generic Qt code on X11 because it allows us 
  to grab the keyboard so that all keypresses are seen
  */
@@ -387,7 +387,7 @@ void TDEShortcutDialog::x11KeyReleaseEvent( XEvent* pEvent )
 		updateShortcutDisplay();
 	}
 }
-#elif defined(Q_WS_WIN)
+#elif defined(TQ_WS_WIN)
 void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e )
 {
 	kdDebug() << e->text() << " " << (int)e->text()[0].latin1()<<  " " << (int)e->ascii() << endl;
@@ -442,7 +442,7 @@ void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e )
 				updateShortcutDisplay();
 
 				if( !m_adv->m_btnMultiKey->isChecked() )
-					TQTimer::singleShot(500, this, TQT_SLOT(accept()));
+					TQTimer::singleShot(500, this, TQ_SLOT(accept()));
 			}
 			return;
 	}
@@ -520,7 +520,7 @@ void TDEShortcutDialog::keyPressed( KKey key )
 	updateShortcutDisplay();
 
 	if( !m_adv->m_btnMultiKey->isChecked() )
-		TQTimer::singleShot(500, this, TQT_SLOT(accept()));
+		TQTimer::singleShot(500, this, TQ_SLOT(accept()));
 }
 
 #include "tdeshortcutdialog.moc"
diff --git a/tdeui/tdeshortcutdialog.h b/tdeui/tdeshortcutdialog.h
index afad6fda2..348996878 100644
--- a/tdeui/tdeshortcutdialog.h
+++ b/tdeui/tdeshortcutdialog.h
@@ -40,7 +40,7 @@ class TDEShortcutDialogAdvanced;
  */
 class TDEUI_EXPORT TDEShortcutDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShortcut, TQWidget* parent = 0, const char* name = 0 );
 	~TDEShortcutDialog();
@@ -67,13 +67,13 @@ private:
 	void keyPressed( KKey key );
 	void updateDetails();
 
-	#ifdef Q_WS_X11
+	#ifdef TQ_WS_X11
 	virtual bool x11Event( XEvent *pEvent );
 	//void x11EventKeyPress( XEvent *pEvent );
 	void x11KeyPressEvent( XEvent* pEvent );
 	void x11KeyReleaseEvent( XEvent* pEvent );
 	#endif
-	#ifdef Q_WS_WIN
+	#ifdef TQ_WS_WIN
 	virtual void keyPressEvent( TQKeyEvent * e );
 	virtual bool event(TQEvent * e);
 	#endif
diff --git a/tdeui/tdeshortcutdialog_advanced.ui b/tdeui/tdeshortcutdialog_advanced.ui
index b1cc70460..26c255595 100644
--- a/tdeui/tdeshortcutdialog_advanced.ui
+++ b/tdeui/tdeshortcutdialog_advanced.ui
@@ -238,8 +238,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
@@ -247,8 +247,4 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tdeui/tdeshortcutdialog_simple.ui b/tdeui/tdeshortcutdialog_simple.ui
index c21b6f940..30faf94a0 100644
--- a/tdeui/tdeshortcutdialog_simple.ui
+++ b/tdeui/tdeshortcutdialog_simple.ui
@@ -105,8 +105,8 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in declaration">kdialog.h</include>
+    <include location="global" impldecl="in declaration">tdeshortcut.h</include>
     <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <forwards>
@@ -114,7 +114,4 @@
 </forwards>
 <layoutdefaults spacing="6" margin="11"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp
index e5d21d45b..d2326412b 100644
--- a/tdeui/tdespell.cpp
+++ b/tdeui/tdespell.cpp
@@ -97,10 +97,10 @@ public:
 
 
 //  Connects a slot to KProcIO's output signal
-#define OUTPUT(x) (connect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *))))
+#define OUTPUT(x) (connect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *))))
 
 // Disconnect a slot from...
-#define NOOUTPUT(x) (disconnect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *))))
+#define NOOUTPUT(x) (disconnect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *))))
 
 
 
@@ -296,11 +296,11 @@ KSpell::startIspell()
 
   if (trystart == 0) //don't connect these multiple times
   {
-    connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-             this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) );
+    connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+             this, TQ_SLOT(ispellErrors(TDEProcess *, char *, int)) );
 
-    connect( proc, TQT_SIGNAL(processExited(TDEProcess *)),
-             this, TQT_SLOT(ispellExit (TDEProcess *)) );
+    connect( proc, TQ_SIGNAL(processExited(TDEProcess *)),
+             this, TQ_SLOT(ispellExit (TDEProcess *)) );
 
     OUTPUT(KSpell2);
   }
@@ -308,7 +308,7 @@ KSpell::startIspell()
   if ( !proc->start() )
   {
     m_status = Error;
-    TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()));
   }
 }
 
@@ -331,14 +331,14 @@ void KSpell::KSpell2( KProcIO * )
 
   if ( proc->readln( line, true ) == -1 )
   {
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
 
   if ( line[0] != '@' ) //@ indicates that ispell is working fine
   {
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
@@ -346,7 +346,7 @@ void KSpell::KSpell2( KProcIO * )
   if ( !ignore("kde") )
   {
      kdDebug(750) << "@KDE was false" << endl;
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
@@ -354,7 +354,7 @@ void KSpell::KSpell2( KProcIO * )
   if ( !ignore("linux") )
   {
      kdDebug(750) << "@Linux was false" << endl;
-     TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+     TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
      return;
   }
 
@@ -375,12 +375,12 @@ KSpell::setUpDialog( bool reallyuseprogressbar )
                          progressbar && reallyuseprogressbar, modaldlg );
   ksdlg->setCaption( caption );
 
-  connect( ksdlg, TQT_SIGNAL(command(int)),
-           this, TQT_SLOT(slotStopCancel(int)) );
-  connect( this, TQT_SIGNAL(progress(unsigned int)),
-	   ksdlg, TQT_SLOT(slotProgress(unsigned int)) );
+  connect( ksdlg, TQ_SIGNAL(command(int)),
+           this, TQ_SLOT(slotStopCancel(int)) );
+  connect( this, TQ_SIGNAL(progress(unsigned int)),
+	   ksdlg, TQ_SLOT(slotProgress(unsigned int)) );
 
-#ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded
+#ifdef TQ_WS_X11 // FIXME(E): Implement for Qt/Embedded
   KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() );
 #endif
   if ( modaldlg )
@@ -488,7 +488,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog )
     return false;
   }
   ///set the dialog signal handler
-  dialog3slot = TQT_SLOT(checkWord3());
+  dialog3slot = TQ_SLOT(checkWord3());
 
   usedialog = _usedialog;
   setUpDialog( false );
@@ -503,7 +503,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog )
   while (proc->readln( blank_line, true ) != -1); // eat spurious blanks
 
   OUTPUT(checkWord2);
-  //  connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3()));
+  //  connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3()));
 
   proc->writeStdin(TQString("%")); // turn off terse mode
   proc->writeStdin( buffer ); // send the word to ispell
@@ -532,7 +532,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest )
 
   ///set the dialog signal handler
   if ( !suggest ) {
-    dialog3slot = TQT_SLOT(checkWord3());
+    dialog3slot = TQ_SLOT(checkWord3());
     usedialog = _usedialog;
     setUpDialog( false );
     if ( _usedialog )
@@ -547,7 +547,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest )
   while (proc->readln( blank_line, true ) != -1); // eat spurious blanks
 
   OUTPUT(checkWord2);
-  //  connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3()));
+  //  connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3()));
 
   proc->writeStdin(TQString("%")); // turn off terse mode
   proc->writeStdin( buffer ); // send the word to ispell
@@ -578,7 +578,7 @@ void KSpell::checkWord2( KProcIO* )
   if ( mistake && usedialog )
   {
     cwword = word;
-    dialog( word, sugg, TQT_SLOT(checkWord3()) );
+    dialog( word, sugg, TQ_SLOT(checkWord3()) );
     d->checkNextTimer->start( 0, true );
     return;
   }
@@ -626,14 +626,14 @@ void KSpell::suggestWord( KProcIO * )
   if ( mistake && usedialog )
   {
     cwword=word;
-    dialog( word, sugg, TQT_SLOT(checkWord3()) );
+    dialog( word, sugg, TQ_SLOT(checkWord3()) );
     return;
   }
 }
 
 void KSpell::checkWord3()
 {
-  disconnect( this, TQT_SIGNAL(dialog3()), this, TQT_SLOT(checkWord3()) );
+  disconnect( this, TQ_SIGNAL(dialog3()), this, TQ_SLOT(checkWord3()) );
 
   emit corrected( cwword, replacement(), 0L );
 }
@@ -792,7 +792,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog)
   setUpDialog();
 
   //set the dialog signal handler
-  dialog3slot = TQT_SLOT (checkList4 ());
+  dialog3slot = TQ_SLOT (checkList4 ());
 
   proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time
 
@@ -883,7 +883,7 @@ void KSpell::checkList3a (KProcIO *)
           cwword = word;
           dlgon = true;
           // show the dialog
-          dialog( word, sugg, TQT_SLOT(checkList4()) );
+          dialog( word, sugg, TQ_SLOT(checkList4()) );
           return;
         }
         else
@@ -930,7 +930,7 @@ void KSpell::checkList4 ()
   dlgon=false;
   TQString old;
 
-  disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkList4()));
+  disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkList4()));
 
   //others should have been processed by dialog() already
   switch (dlgresult)
@@ -980,7 +980,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog )
   usedialog = _usedialog;
   setUpDialog();
   //set the dialog signal handler
-  dialog3slot = TQT_SLOT(check3());
+  dialog3slot = TQ_SLOT(check3());
 
   kdDebug(750) << "KS: check" << endl;
   origbuffer = _buffer;
@@ -1090,7 +1090,7 @@ void KSpell::check2( KProcIO * )
           //kdDebug(750) << "(Before dialog) word=[" << word << "] cwword =[" << cwword << "]\n" << endl;
           if ( usedialog ) {
             // show the word in the dialog
-            dialog( word, sugg, TQT_SLOT(check3()) );
+            dialog( word, sugg, TQ_SLOT(check3()) );
           } else {
             // No dialog, just emit misspelling and continue
             d->m_bNoMisspellingsEncountered = false;
@@ -1152,7 +1152,7 @@ void KSpell::check2( KProcIO * )
 void KSpell::check3 ()
   // evaluates the return value of the dialog
 {
-  disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (check3()));
+  disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (check3()));
   kdDebug(750) << "check3 [" << cwword << "] [" << replacement() << "] " << dlgresult << endl;
 
   //others should have been processed by dialog() already
@@ -1199,7 +1199,7 @@ KSpell::slotStopCancel (int result)
     if (!dialog3slot.isEmpty())
     {
       dlgresult=result;
-      connect (this, TQT_SIGNAL (dialog3()), this, dialog3slot.ascii());
+      connect (this, TQ_SIGNAL (dialog3()), this, dialog3slot.ascii());
       emit dialog3();
     }
 }
@@ -1211,7 +1211,7 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl
 
   dialog3slot = _slot;
   dialogwillprocess = true;
-  connect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) );
+  connect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) );
   TQString tmpBuf = newbuffer;
   kdDebug(750)<<" position = "<<lastpos<<endl;
 
@@ -1238,7 +1238,7 @@ void KSpell::dialog2( int result )
 {
   TQString qs;
 
-  disconnect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) );
+  disconnect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) );
   dialogwillprocess = false;
   dlgresult = result;
   ksdlg->standby();
@@ -1277,7 +1277,7 @@ void KSpell::dialog2( int result )
     break;
   }
 
-  connect( this, TQT_SIGNAL(dialog3()), this, dialog3slot.ascii() );
+  connect( this, TQ_SIGNAL(dialog3()), this, dialog3slot.ascii() );
   emit dialog3();
 }
 
@@ -1334,7 +1334,7 @@ void KSpell::ispellExit( TDEProcess* )
      return; // Dead already
 
   kdDebug(750) << "Death" << endl;
-  TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) );
 }
 
 // This is always called from the event loop to make
@@ -1423,12 +1423,12 @@ void KSpell::slotModalReady()
   //kdDebug(750) << "MODAL READY------------------" << endl;
 
   Q_ASSERT( m_status == Running );
-  connect( this, TQT_SIGNAL( done( const TQString & ) ),
-           this, TQT_SLOT( slotModalDone( const TQString & ) ) );
-  TQObject::connect( this, TQT_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ),
-                    this, TQT_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) );
-  TQObject::connect( this, TQT_SIGNAL( death() ),
-                    this, TQT_SLOT( slotModalSpellCheckerFinished( ) ) );
+  connect( this, TQ_SIGNAL( done( const TQString & ) ),
+           this, TQ_SLOT( slotModalDone( const TQString & ) ) );
+  TQObject::connect( this, TQ_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ),
+                    this, TQ_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) );
+  TQObject::connect( this, TQ_SIGNAL( death() ),
+                    this, TQ_SLOT( slotModalSpellCheckerFinished( ) ) );
   check( modaltext );
 }
 
@@ -1463,8 +1463,8 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
   d->checking = false;
   d->aspellV6 = false;
   d->checkNextTimer = new TQTimer( this );
-  connect( d->checkNextTimer, TQT_SIGNAL( timeout() ),
-	   this, TQT_SLOT( checkNext() ));
+  connect( d->checkNextTimer, TQ_SIGNAL( timeout() ),
+	   this, TQ_SLOT( checkNext() ));
   autoDelete = false;
   modaldlg = _modal;
   progressbar = _progressbar;
@@ -1559,10 +1559,10 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption,
 
   if ( obj && slot )
       // caller wants to know when tdespell is ready
-      connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot);
+      connect( this, TQ_SIGNAL(ready(KSpell *)), obj, slot);
   else
       // Hack for modal spell checking
-      connect( this, TQT_SIGNAL(ready(KSpell *)), this, TQT_SLOT(slotModalReady()) );
+      connect( this, TQ_SIGNAL(ready(KSpell *)), this, TQ_SLOT(slotModalReady()) );
 
   proc = new KProcIO( codec );
 
diff --git a/tdeui/tdespell.h b/tdeui/tdespell.h
index f09571004..802c5567b 100644
--- a/tdeui/tdespell.h
+++ b/tdeui/tdespell.h
@@ -45,7 +45,7 @@ class KSpellDlg;
 
 class TDEUI_EXPORT KSpell : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp
index 9e8206505..f111eb50f 100644
--- a/tdeui/tdespelldlg.cpp
+++ b/tdeui/tdespelldlg.cpp
@@ -60,44 +60,44 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
   d->ui = new KSpellUI( this );
   setMainWidget( d->ui );
 
-  connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()),
-           this, TQT_SLOT(replace()));
-  connect( this, TQT_SIGNAL(ready(bool)),
-           d->ui->m_replaceBtn, TQT_SLOT(setEnabled(bool)) );
+  connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()),
+           this, TQ_SLOT(replace()));
+  connect( this, TQ_SIGNAL(ready(bool)),
+           d->ui->m_replaceBtn, TQ_SLOT(setEnabled(bool)) );
 
-  connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(replaceAll()));
-  connect(this, TQT_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQT_SLOT(setEnabled(bool)));
+  connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(replaceAll()));
+  connect(this, TQ_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQ_SLOT(setEnabled(bool)));
 
-  connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignore()));
-  connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQT_SLOT(setEnabled(bool)));
+  connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignore()));
+  connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQ_SLOT(setEnabled(bool)));
 
-  connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignoreAll()));
-  connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQT_SLOT(setEnabled(bool)));
+  connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignoreAll()));
+  connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQ_SLOT(setEnabled(bool)));
 
-  connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
-  connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_addBtn, TQT_SLOT(setEnabled(bool)));
+  connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()));
+  connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_addBtn, TQ_SLOT(setEnabled(bool)));
 
-  connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(suggest()));
-  connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQT_SLOT(setEnabled(bool)) );
+  connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(suggest()));
+  connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQ_SLOT(setEnabled(bool)) );
   d->ui->m_suggestBtn->hide();
 
-  connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(stop()));
+  connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(stop()));
 
-  connect( d->ui->m_replacement, TQT_SIGNAL(textChanged(const TQString &)),
-           TQT_SLOT(textChanged(const TQString &)) );
+  connect( d->ui->m_replacement, TQ_SIGNAL(textChanged(const TQString &)),
+           TQ_SLOT(textChanged(const TQString &)) );
 
-  connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()),   TQT_SLOT(replace()) );
-  connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-           TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+  connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()),   TQ_SLOT(replace()) );
+  connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+           TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
 
-  connect( d->ui->m_suggestions, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
-           TQT_SLOT( replace() ) );
+  connect( d->ui->m_suggestions, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
+           TQ_SLOT( replace() ) );
   d->spellConfig = new KSpellConfig( 0, 0 ,0, false );
   d->spellConfig->fillDicts( d->ui->m_language );
-  connect( d->ui->m_language, TQT_SIGNAL(activated(int)),
-	   d->spellConfig, TQT_SLOT(sSetDictionary(int)) );
-  connect( d->spellConfig, TQT_SIGNAL(configChanged()),
-           TQT_SLOT(slotConfigChanged()) );
+  connect( d->ui->m_language, TQ_SIGNAL(activated(int)),
+	   d->spellConfig, TQ_SLOT(sSetDictionary(int)) );
+  connect( d->spellConfig, TQ_SIGNAL(configChanged()),
+           TQ_SLOT(slotConfigChanged()) );
 
   setHelp( "spelldlg", "tdespell" );
   setMinimumSize( sizeHint() );
diff --git a/tdeui/tdespelldlg.h b/tdeui/tdespelldlg.h
index c4731800f..565464c4e 100644
--- a/tdeui/tdespelldlg.h
+++ b/tdeui/tdespelldlg.h
@@ -45,7 +45,7 @@ enum KS_RESULT {
 
 class TDEUI_EXPORT KSpellDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   class KSpellDlgPrivate;
   KSpellDlgPrivate *d;
diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 7c6902fed..817af5007 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -149,8 +149,8 @@ TDEToolBarSeparator::TDEToolBarSeparator(Orientation o , bool l, TQToolBar *pare
                                      const char* name )
     :TQFrame( parent, name ), line( l )
 {
-    connect( parent, TQT_SIGNAL(orientationChanged(Orientation)),
-             this, TQT_SLOT(setOrientation(Orientation)) );
+    connect( parent, TQ_SIGNAL(orientationChanged(Orientation)),
+             this, TQ_SLOT(setOrientation(Orientation)) );
     setOrientation( o );
     setBackgroundMode( parent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
@@ -167,10 +167,10 @@ void TDEToolBarSeparator::drawContents( TQPainter* p )
     if ( line ) {
         TQStyle::SFlags flags = TQStyle::Style_Default;
 
-        if ( orientation() == Qt::Horizontal )
+        if ( orientation() == TQt::Horizontal )
             flags = flags | TQStyle::Style_Horizontal;
 
-        style().tqdrawPrimitive(TQStyle::PE_DockWindowSeparator, p,
+        style().drawPrimitive(TQStyle::PE_DockWindowSeparator, p,
                               contentsRect(), colorGroup(), flags);
     } else {
         TQFrame::drawContents(p);
@@ -185,7 +185,7 @@ void TDEToolBarSeparator::styleChange( TQStyle& )
 TQSize TDEToolBarSeparator::sizeHint() const
 {
     int dim = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
-    return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
+    return orientation() == TQt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
 }
 
 TQSizePolicy TDEToolBarSeparator::sizePolicy() const
@@ -195,7 +195,7 @@ TQSizePolicy TDEToolBarSeparator::sizePolicy() const
 
 TDEToolBar::TDEToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
     : TQToolBar( TQString::fromLatin1( name ),
-      tqt_dynamic_cast<TQMainWindow*>(parent),
+      dynamic_cast<TQMainWindow*>(parent),
       parent, false,
       name ? name : "mainToolBar")
 {
@@ -232,16 +232,16 @@ void TDEToolBar::init( bool readConfig, bool honorStyle )
     d->m_honorStyle = honorStyle;
     context = 0;
     layoutTimer = new TQTimer( this );
-    connect( layoutTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( rebuildLayout() ) );
-    connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( slotRepaint() ) );
+    connect( layoutTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( rebuildLayout() ) );
+    connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( slotRepaint() ) );
 
     if ( kapp ) { // may be null when started inside designer
-        connect(kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), this, TQT_SLOT(slotAppearanceChanged()));
+        connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged()));
         // request notification of changes in icon style
         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)));
     }
 
     // finally, read in our configurable settings
@@ -249,11 +249,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle )
         slotReadConfig();
 
     if ( mainWindow() )
-        connect( mainWindow(), TQT_SIGNAL( toolBarPositionChanged( TQToolBar * ) ),
-                 this, TQT_SLOT( toolBarPosChanged( TQToolBar * ) ) );
+        connect( mainWindow(), TQ_SIGNAL( toolBarPositionChanged( TQToolBar * ) ),
+                 this, TQ_SLOT( toolBarPosChanged( TQToolBar * ) ) );
 
     // Hack to make sure we recalculate our size when we dock.
-    connect( this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(rebuildLayout()) );
+    connect( this, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), TQ_SLOT(rebuildLayout()) );
 }
 
 int TDEToolBar::insertButton(const TQString& icon, int id, bool enabled,
@@ -422,7 +422,7 @@ int TDEToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slo
     insertWidgetInternal( anim, index, id );
 
     if ( receiver )
-        connect( anim, TQT_SIGNAL(clicked()), receiver, slot);
+        connect( anim, TQ_SIGNAL(clicked()), receiver, slot);
 
     return index;
 }
@@ -432,7 +432,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id )
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(*it);
+    KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it);
     if ( aw )
         return aw;
     TQObjectList *l = queryList( "KAnimWidget" );
@@ -442,7 +442,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id )
     }
 
     for ( TQObject *o = l->first(); o; o = l->next() ) {
-        KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(o);
+        KAnimWidget *aw = dynamic_cast<KAnimWidget *>(o);
         if ( aw )
         {
             delete l;
@@ -615,7 +615,7 @@ KComboBox * TDEToolBar::getCombo(int id)
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<KComboBox *>( *it );
+    return dynamic_cast<KComboBox *>( *it );
 }
 
 
@@ -624,7 +624,7 @@ KLineEdit * TDEToolBar::getLined (int id)
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<KLineEdit *>( *it );
+    return dynamic_cast<KLineEdit *>( *it );
 }
 
 
@@ -633,7 +633,7 @@ TDEToolBarButton * TDEToolBar::getButton (int id)
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<TDEToolBarButton *>( *it );
+    return dynamic_cast<TDEToolBarButton *>( *it );
 }
 
 
@@ -947,7 +947,7 @@ void TDEToolBar::setFlat (bool flag)
     else
         mainWindow()->moveDockWindow( this, DockTop );
     // And remember to save the new look later
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
@@ -1093,7 +1093,7 @@ void TDEToolBar::saveSettings(TDEConfig *config, const TQString &_configGroup)
     // reappear at the same position the next time.
     // The whole set of indexes has to be saved.
     //kdDebug(220) << name() << "                writing index " << index << endl;
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     // don't save if there's only one toolbar
 
     // Don't use kmw->toolBarIterator() because you might
@@ -1145,12 +1145,12 @@ TQString TDEToolBar::text() const
 
 void TDEToolBar::doConnections( TDEToolBarButton *button )
 {
-    connect(button, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL( clicked( int ) ) );
-    connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL( doubleClicked( int ) ) );
-    connect(button, TQT_SIGNAL(released(int)), this, TQT_SIGNAL( released( int ) ) );
-    connect(button, TQT_SIGNAL(pressed(int)), this, TQT_SIGNAL( pressed( int ) ) );
-    connect(button, TQT_SIGNAL(toggled(int)), this, TQT_SIGNAL( toggled( int ) ) );
-    connect(button, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SIGNAL( highlighted( int, bool ) ) );
+    connect(button, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL( clicked( int ) ) );
+    connect(button, TQ_SIGNAL(doubleClicked(int)), this, TQ_SIGNAL( doubleClicked( int ) ) );
+    connect(button, TQ_SIGNAL(released(int)), this, TQ_SIGNAL( released( int ) ) );
+    connect(button, TQ_SIGNAL(pressed(int)), this, TQ_SIGNAL( pressed( int ) ) );
+    connect(button, TQ_SIGNAL(toggled(int)), this, TQ_SIGNAL( toggled( int ) ) );
+    connect(button, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SIGNAL( highlighted( int, bool ) ) );
 }
 
 void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
@@ -1159,7 +1159,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
         return;
     TQMainWindow *mw = mainWindow();
     if ( mw->toolBarsMovable() && d->m_enableContext ) {
-        if ( m->button() == Qt::RightButton ) {
+        if ( m->button() == TQt::RightButton ) {
 	    TQGuardedPtr<TDEToolBar> guard( this );
             int i = contextMenu()->exec( m->globalPos(), 0 );
 	    // "Configure Toolbars" recreates toolbars, so we might not exist anymore.
@@ -1204,7 +1204,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
                 else
                     return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
             }
-            TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mw);
+            TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mw);
             if ( kmw )
                 kmw->setSettingsDirty();
         }
@@ -1238,17 +1238,17 @@ void TDEToolBar::rebuildLayout()
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
         if ( w == rightAligned )
             continue;
-        TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w);
+        TDEToolBarSeparator *ktbs = dynamic_cast<TDEToolBarSeparator *>(w);
         if ( ktbs && !ktbs->showLine() ) {
-            l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
+            l->addSpacing( orientation() == TQt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
             w->hide();
             continue;
         }
-        if ( tqt_dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu?
+        if ( dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu?
             continue;
         l->addWidget( w );
         w->show();
-        if ((orientation() == Qt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
+        if ((orientation() == TQt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
             l->addSpacing(2); // A little bit extra spacing behind it.
     }
     if ( rightAligned ) {
@@ -1270,14 +1270,14 @@ void TDEToolBar::rebuildLayout()
 void TDEToolBar::childEvent( TQChildEvent *e )
 {
     if ( e->child()->isWidgetType() ) {
-        TQWidget * w = tqt_dynamic_cast<TQWidget *>(e->child());
+        TQWidget * w = dynamic_cast<TQWidget *>(e->child());
         if (!w || !(::qstrcmp( "qt_dockwidget_internal", w->name())))
         {
            TQToolBar::childEvent( e );
            return;
         }
         if ( e->type() == TQEvent::ChildInserted ) {
-            if ( !tqt_dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
+            if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
                 // prevent items that have been explicitly inserted by insert*() from
                 // being inserted again
                 if ( !widget2id.contains( w ) )
@@ -1309,8 +1309,8 @@ void TDEToolBar::insertWidgetInternal( TQWidget *w, int &index, int id )
     // we can't have it in widgets, or something is really wrong
     //widgets.removeRef( w );
 
-    connect( w, TQT_SIGNAL( destroyed() ),
-             this, TQT_SLOT( widgetDestroyed() ) );
+    connect( w, TQ_SIGNAL( destroyed() ),
+             this, TQ_SLOT( widgetDestroyed() ) );
     if ( index == -1 || index > (int)widgets.count() ) {
         index = (int)widgets.count();
         widgets.append( w );
@@ -1337,7 +1337,7 @@ void TDEToolBar::setStretchableWidget( TQWidget *w )
 
 TQSizePolicy TDEToolBar::sizePolicy() const
 {
-    if ( orientation() == Qt::Horizontal )
+    if ( orientation() == TQt::Horizontal )
         return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
     else
         return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
@@ -1350,7 +1350,7 @@ TQSize TDEToolBar::sizeHint() const
 
     ncThis->polish();
 
-    int margin = static_cast<TQWidget*>(ncThis)->layout()->margin() + frameWidth();
+    int margin = ncThis->layout()->margin() + frameWidth();
     switch( barPos() )
     {
      case TDEToolBar::Top:
@@ -1367,7 +1367,7 @@ TQSize TDEToolBar::sizeHint() const
 
           minSize = minSize.expandedTo(TQSize(0, sh.height()));
           minSize += TQSize(sh.width()+1, 0);
-          if (tqt_dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ?
+          if (dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ?
              minSize += TQSize(2, 0); // A little bit extra spacing behind it.
        }
 
@@ -1478,7 +1478,7 @@ void TDEToolBar::slotAppearanceChanged()
     applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ );
 
     // And remember to save the new look later
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
@@ -1750,7 +1750,7 @@ void TDEToolBar::toolBarPosChanged( TQToolBar *tb )
     if ( d->oldPos == DockMinimized )
         rebuildLayout();
     d->oldPos = (TQMainWindow::ToolBarDock)barPos();
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
@@ -2125,10 +2125,10 @@ TDEPopupMenu *TDEToolBar::contextMenu()
   context->setItemChecked(CONTEXT_ICONS, true);
   context->insertItem( i18n("Icon Size"), size );
 
-  connect( context, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotContextAboutToShow() ) );
+  connect( context, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotContextAboutToShow() ) );
   // Unplugging a submenu from abouttohide leads to the popupmenu floating around
   // So better simply call that code from after exec() returns (DF)
-  //connect( context, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotContextAboutToHide() ) );
+  //connect( context, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotContextAboutToHide() ) );
   return context;
 }
 
@@ -2139,7 +2139,7 @@ void TDEToolBar::slotContextAboutToShow()
   // and ToolBarHandler::setupActions() deletes it, so better not keep it around.
   // So we currently plug/unplug the last two actions of the menu.
   // Another way would be to keep around the actions and plug them all into a (new each time) popupmenu.
-  TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+  TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
   if ( kmw ) {
       kmw->setupToolbarMenuActions();
       // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar)
@@ -2219,7 +2219,7 @@ void TDEToolBar::slotContextAboutToHide()
 {
   // We have to unplug whatever slotContextAboutToShow plugged into the menu.
   // Unplug the toolbar menu action
-  TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+  TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
   if ( kmw && kmw->toolBarMenuAction() )
     if ( kmw->toolBarMenuAction()->containerCount() > 1 )
       kmw->toolBarMenuAction()->unplug(context);
@@ -2237,7 +2237,7 @@ void TDEToolBar::slotContextAboutToHide()
   TQPtrListIterator<TQWidget> it( widgets );
   TQWidget *wdg;
   while ( ( wdg = it.current() ) != 0 ) {
-    if ( wdg->inherits( TQTOOLBUTTON_OBJECT_NAME_STRING ) )
+    if ( wdg->inherits( "TQToolButton" ) )
       static_cast<TQToolButton*>( wdg )->setDown( false );
     ++it;
   }
diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h
index f59d78174..919af5cfe 100644
--- a/tdeui/tdetoolbar.h
+++ b/tdeui/tdetoolbar.h
@@ -57,7 +57,7 @@ class TDEToolBarPrivate;
 
 class TDEUI_EXPORT TDEToolBarSeparator : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     TDEToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
@@ -103,7 +103,7 @@ private:
 
 class TDEUI_EXPORT TDEToolBar : public TQToolBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_ENUMS( IconText BarPosition )
     TQ_PROPERTY( IconText iconText READ iconText WRITE setIconText )
@@ -466,8 +466,8 @@ public:
    * You will insert a normal button with connection (or use signals from
    * toolbar):
    * \code
-   * bar->insertButton(icon, id, TQT_SIGNAL(clicked ()), this,
-   *                   TQT_SLOT (slotClick()), true, "click or wait for popup");
+   * bar->insertButton(icon, id, TQ_SIGNAL(clicked ()), this,
+   *                   TQ_SLOT (slotClick()), true, "click or wait for popup");
    * \endcode
    * And then add a delayed popup:
    * \code
@@ -645,7 +645,7 @@ public:
    * You can do with this whatever you want,
    * except change its height (hardcoded). If you change its width
    * you will probably have to call TQToolBar::updateRects(true)
-   * @see QWidget
+   * @see TQWidget
    * @see updateRects()
    */
     TQWidget *getWidget (int id); // ### KDE4: make this const!
diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp
index 791b47db1..1c3f550db 100644
--- a/tdeui/tdetoolbarbutton.cpp
+++ b/tdeui/tdetoolbarbutton.cpp
@@ -123,21 +123,21 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id,
   TQToolButton::setTextLabel(_txt);
   d->m_instance = _instance;
 
-  d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent);
+  d->m_parent = dynamic_cast<TDEToolBar*>(_parent);
   if (d->m_parent) {
-    connect(d->m_parent, TQT_SIGNAL( modechange() ),
-            this,         TQT_SLOT( modeChange() ));
+    connect(d->m_parent, TQ_SIGNAL( modechange() ),
+            this,         TQ_SLOT( modeChange() ));
   }
 
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 
   // connect all of our slots and start trapping events
-  connect(this, TQT_SIGNAL( clicked() ),
-          this, TQT_SLOT( slotClicked() ) );
-  connect(this, TQT_SIGNAL( pressed() ),
-          this, TQT_SLOT( slotPressed() ) );
-  connect(this, TQT_SIGNAL( released() ),
-          this, TQT_SLOT( slotReleased() ) );
+  connect(this, TQ_SIGNAL( clicked() ),
+          this, TQ_SLOT( slotClicked() ) );
+  connect(this, TQ_SIGNAL( pressed() ),
+          this, TQ_SLOT( slotPressed() ) );
+  connect(this, TQ_SIGNAL( released() ),
+          this, TQ_SLOT( slotReleased() ) );
   installEventFilter(this);
 
   d->m_iconName = _icon;
@@ -156,21 +156,21 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id,
   d->m_id       = _id;
   TQToolButton::setTextLabel(txt);
 
-  d->m_parent = tqt_dynamic_cast<TDEToolBar*>(_parent);
+  d->m_parent = dynamic_cast<TDEToolBar*>(_parent);
   if (d->m_parent) {
-    connect(d->m_parent, TQT_SIGNAL( modechange() ),
-            this,         TQT_SLOT( modeChange() ));
+    connect(d->m_parent, TQ_SIGNAL( modechange() ),
+            this,         TQ_SLOT( modeChange() ));
   }
 
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 
   // connect all of our slots and start trapping events
-  connect(this, TQT_SIGNAL( clicked() ),
-          this, TQT_SLOT( slotClicked() ));
-  connect(this, TQT_SIGNAL( pressed() ),
-          this, TQT_SLOT( slotPressed() ));
-  connect(this, TQT_SIGNAL( released() ),
-          this, TQT_SLOT( slotReleased() ));
+  connect(this, TQ_SIGNAL( clicked() ),
+          this, TQ_SLOT( slotClicked() ));
+  connect(this, TQ_SIGNAL( pressed() ),
+          this, TQ_SLOT( slotPressed() ));
+  connect(this, TQ_SIGNAL( released() ),
+          this, TQ_SLOT( slotReleased() ));
   installEventFilter(this);
 
   // set our pixmap and do our initial setup
@@ -251,7 +251,7 @@ void TDEToolBarButton::modeChange()
     break;
   }
 
-  mysize = style().tqsizeFromContents(TQStyle::CT_ToolButton, this, mysize).
+  mysize = style().sizeFromContents(TQStyle::CT_ToolButton, this, mysize).
                expandedTo(TQApplication::globalStrut());
 
   // make sure that this isn't taller then it is wide
@@ -410,7 +410,7 @@ void TDEToolBarButton::enterEvent(TQEvent *)
 
 bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
 {
-  if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this))
+  if (o == this)
   {
 
     // Popup the menu when the left mousebutton is pressed and the mouse
@@ -419,12 +419,12 @@ bool TDEToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
     {
       if (ev->type() == TQEvent::MouseButtonPress)
       {
-        TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+        TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
         d->m_mousePressPos = mev->pos();
       }
       else if (ev->type() == TQEvent::MouseMove)
       {
-        TQMouseEvent* mev = TQT_TQMOUSEEVENT(ev);
+        TQMouseEvent* mev = static_cast<TQMouseEvent*>(ev);
         if ((mev->pos() - d->m_mousePressPos).manhattanLength()
               > TDEGlobalSettings::dndEventDelay())
         {
@@ -455,10 +455,10 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e )
 {
   d->m_buttonDown = true;
 
-  if ( e->button() == Qt::MidButton )
+  if ( e->button() == TQt::MidButton )
   {
     // Get TQToolButton to show the button being down while pressed
-    TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::LeftButton, e->state() );
+    TQMouseEvent ev( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::LeftButton, e->state() );
     TQToolButton::mousePressEvent(&ev);
     return;
   }
@@ -468,9 +468,9 @@ void TDEToolBarButton::mousePressEvent( TQMouseEvent * e )
 void TDEToolBarButton::mouseReleaseEvent( TQMouseEvent * e )
 {
   TQt::ButtonState state = TQt::ButtonState(e->button() | (e->state() & KeyButtonMask));
-  if ( e->button() == Qt::MidButton )
+  if ( e->button() == TQt::MidButton )
   {
-    TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), Qt::LeftButton, e->state() );
+    TQMouseEvent ev( TQEvent::MouseButtonRelease, e->pos(), e->globalPos(), TQt::LeftButton, e->state() );
     TQToolButton::mouseReleaseEvent(&ev);
   }
   else
@@ -628,7 +628,7 @@ void TDEToolBarButton::drawButton( TQPainter *_painter )
     if (isDown())	arrowFlags |= TQStyle::Style_Down;
     if (isEnabled()) 	arrowFlags |= TQStyle::Style_Enabled;
 
-      style().tqdrawPrimitive(TQStyle::PE_ArrowDown, _painter,
+      style().drawPrimitive(TQStyle::PE_ArrowDown, _painter,
           TQRect(width()-7, height()-7, 7, 7), colorGroup(),
 	  arrowFlags, TQStyleOption() );
   }
@@ -676,8 +676,8 @@ void TDEToolBarButton::slotClicked()
   // emit buttonClicked when the button was clicked while being in an extension popupmenu
   if ( d->m_parent && !d->m_parent->rect().contains( geometry().center() ) ) {
     ButtonState state = TDEApplication::keyboardMouseState();
-    if ( ( state & Qt::MouseButtonMask ) == Qt::NoButton )
-      state = ButtonState( Qt::LeftButton | state );
+    if ( ( state & TQt::MouseButtonMask ) == TQt::NoButton )
+      state = ButtonState( TQt::LeftButton | state );
     emit buttonClicked( d->m_id, state ); // Doesn't work with MidButton
   }
 }
@@ -734,9 +734,9 @@ void TDEToolBarButton::setToggle(bool flag)
 {
   setToggleButton(flag);
   if (flag)
-    connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
+    connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled()));
   else
-    disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
+    disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled()));
 }
 
 TQSize TDEToolBarButton::sizeHint() const
diff --git a/tdeui/tdetoolbarbutton.h b/tdeui/tdetoolbarbutton.h
index 16831b0d7..0c2d65fb4 100644
--- a/tdeui/tdetoolbarbutton.h
+++ b/tdeui/tdetoolbarbutton.h
@@ -43,7 +43,7 @@ class TQPainter;
  */
 class TDEUI_EXPORT TDEToolBarButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp
index dd9cf7087..37540ae92 100644
--- a/tdeui/tdetoolbarhandler.cpp
+++ b/tdeui/tdetoolbarhandler.cpp
@@ -51,7 +51,7 @@ namespace
             TQPtrListIterator<TQDockWindow> dockWindowIt( dockWindows );
             for ( ; dockWindowIt.current(); ++dockWindowIt ) {
 
-                TDEToolBar *toolBar = tqt_dynamic_cast<TDEToolBar *>( dockWindowIt.current() );
+                TDEToolBar *toolBar = dynamic_cast<TDEToolBar *>( dockWindowIt.current() );
                 if ( !toolBar )
                     continue;
 
@@ -177,8 +177,8 @@ void ToolBarHandler::setupActions()
     /*
     for (  TQPtrListIterator<TDEToolBar> toolBarIt( m_toolBars );
            toolBarIt.current(); ++toolBarIt )
-        connect( toolBarIt.current(), TQT_SIGNAL( destroyed() ),
-                 this, TQT_SLOT( setupActions() ) );
+        connect( toolBarIt.current(), TQ_SIGNAL( destroyed() ),
+                 this, TQ_SLOT( setupActions() ) );
                  */
 
     if (kapp && kapp->authorizeTDEAction("options_show_toolbar"))
@@ -198,8 +198,8 @@ void ToolBarHandler::init( TDEMainWindow *mainWindow )
     d = 0;
     m_mainWindow = mainWindow;
 
-    connect( m_mainWindow->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ),
-             this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) );
+    connect( m_mainWindow->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ),
+             this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) );
 
     /* re-use an existing resource file if it exists. can happen if the user launches the
      * toolbar editor */
@@ -232,12 +232,12 @@ void ToolBarHandler::connectToActionContainer( TDEAction *action )
 
 void ToolBarHandler::connectToActionContainer( TQWidget *container )
 {
-    TQPopupMenu *popupMenu = tqt_dynamic_cast<TQPopupMenu *>( container );
+    TQPopupMenu *popupMenu = dynamic_cast<TQPopupMenu *>( container );
     if ( !popupMenu )
         return;
 
-    connect( popupMenu, TQT_SIGNAL( aboutToShow() ),
-             this, TQT_SLOT( setupActions() ) );
+    connect( popupMenu, TQ_SIGNAL( aboutToShow() ),
+             this, TQ_SLOT( setupActions() ) );
 }
 
 #include "tdetoolbarhandler.moc"
diff --git a/tdeui/tdetoolbarhandler.h b/tdeui/tdetoolbarhandler.h
index fe25ace98..aea84b84b 100644
--- a/tdeui/tdetoolbarhandler.h
+++ b/tdeui/tdetoolbarhandler.h
@@ -33,7 +33,7 @@ namespace KDEPrivate
 class ToolBarHandler : public TQObject,
                        public KXMLGUIClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ToolBarHandler( TDEMainWindow *mainWindow, const char *name = 0 );
     ToolBarHandler( TDEMainWindow *mainWindow, TQObject *parent, const char *name = 0 );
diff --git a/tdeui/tdetoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp
index c88f68434..e75e0a755 100644
--- a/tdeui/tdetoolbarlabelaction.cpp
+++ b/tdeui/tdetoolbarlabelaction.cpp
@@ -82,11 +82,11 @@ void TDEToolBarLabelAction::init()
 {
   d->m_label = static_cast<TQLabel*>(widget());
   /* these lines were copied from Konqueror's KonqDraggableLabel class in
-     konq_misc.cc */
+     konq_misc.cpp */
   d->m_label->setBackgroundMode(TQt::PaletteButton);
   d->m_label->setAlignment((TQApplication::reverseLayout()
-			 ? Qt::AlignRight : Qt::AlignLeft) |
- 			Qt::AlignVCenter | TQt::ShowPrefix );
+			 ? TQt::AlignRight : TQt::AlignLeft) |
+ 			TQt::AlignVCenter | TQt::ShowPrefix );
   d->m_label->adjustSize();
 }
 
diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h
index c330c9254..801f0ed78 100644
--- a/tdeui/tdetoolbarlabelaction.h
+++ b/tdeui/tdetoolbarlabelaction.h
@@ -35,11 +35,11 @@ class TQLabel;
  *
  * KHistoryCombo* findCombo = new KHistoryCombo(true, this);
  * KWidgetAction* action
- *   = new KWidgetAction(findCombo, i18n("F&ind Combo"), Qt::Key_F6, this,
- *                       TQT_SLOT(slotFocus()), actionCollection(), "find_combo");
+ *   = new KWidgetAction(findCombo, i18n("F&ind Combo"), TQt::Key_F6, this,
+ *                       TQ_SLOT(slotFocus()), actionCollection(), "find_combo");
  *
  * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this,
- *                         TQT_SLOT(slotFocus()), actionCollection(),
+ *                         TQ_SLOT(slotFocus()), actionCollection(),
  *             "find_label");
  *
  * \endcode
@@ -54,8 +54,8 @@ public:
    *
    * @param text The label's and the action's text.
    * @param cut The action's shortcut.
-   * @param receiver The SLOT's parent.
-   * @param slot The TQT_SLOT to invoke to execute this action.
+   * @param receiver The slot's parent.
+   * @param slot The slot to invoke to execute this action.
    * @param parent This action's parent.
    * @param name An internal name for this action.
    */
@@ -70,8 +70,8 @@ public:
    * typed.
    * @param text The label's and the action's text.
    * @param cut The action's shortcut.
-   * @param receiver The SLOT's parent.
-   * @param slot The TQT_SLOT to invoke to execute this action.
+   * @param receiver The slot's parent.
+   * @param slot The slot to invoke to execute this action.
    * @param parent This action's parent.
    * @param name An internal name for this action.
    */
@@ -93,8 +93,8 @@ public:
    *
    * @param label the label which is displayed in the toolbar.
    * @param cut The action's shortcut.
-   * @param receiver The SLOT's parent.
-   * @param slot The TQT_SLOT to invoke to execute this action.
+   * @param receiver The slot's parent.
+   * @param slot The slot to invoke to execute this action.
    * @param parent This action's parent.
    * @param name An internal name for this action.
    */
diff --git a/tdeui/tdetoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp
index 937354357..0f5febb0a 100644
--- a/tdeui/tdetoolbarradiogroup.cpp
+++ b/tdeui/tdetoolbarradiogroup.cpp
@@ -36,7 +36,7 @@ TDEToolBarRadioGroup::TDEToolBarRadioGroup (TDEToolBar *_parent, const char *_na
 {
   buttons = new TDEToolBarButtonList();
   tb = _parent;
-  connect (tb, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int)));
+  connect (tb, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int)));
 }
 
 TDEToolBarRadioGroup::~TDEToolBarRadioGroup()
diff --git a/tdeui/tdetoolbarradiogroup.h b/tdeui/tdetoolbarradiogroup.h
index d262aa539..5df8c5a20 100644
--- a/tdeui/tdetoolbarradiogroup.h
+++ b/tdeui/tdetoolbarradiogroup.h
@@ -48,7 +48,7 @@ class TDEToolBarRadioGroupPrivate;
   */
 class TDEUI_EXPORT TDEToolBarRadioGroup : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp
index c3b6d1ddc..7226eb6f5 100644
--- a/tdeui/tests/itemcontainertest.cpp
+++ b/tdeui/tests/itemcontainertest.cpp
@@ -66,7 +66,7 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     hBox->addSpacing( 5 );
 
     //Selection mode selection
-    m_pbgMode = new TQButtonGroup( 1, Qt::Horizontal, "Selection Mode", this);
+    m_pbgMode = new TQButtonGroup( 1, TQt::Horizontal, "Selection Mode", this);
     m_pbgMode->insert(new TQRadioButton("NoSlection", m_pbgMode), TopLevel::NoSelection );
     m_pbgMode->insert(new TQRadioButton("Single", m_pbgMode), TopLevel::Single );
     m_pbgMode->insert(new TQRadioButton("Multi", m_pbgMode), TopLevel::Multi );
@@ -74,52 +74,52 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     m_pbgMode->setExclusive( true );
     vBox->addWidget( m_pbgMode );
 
-    connect( m_pbgMode, TQT_SIGNAL( clicked( int ) ),
-	     this, TQT_SLOT( slotSwitchMode( int ) ) );
+    connect( m_pbgMode, TQ_SIGNAL( clicked( int ) ),
+	     this, TQ_SLOT( slotSwitchMode( int ) ) );
 
     //Signal labels
-    TQGroupBox* gbWiget = new TQGroupBox( 1, Qt::Horizontal, "Widget", this);
+    TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this);
     m_plblWidget = new TQLabel( gbWiget );
     vBox->addWidget( gbWiget );
-    TQGroupBox* gbSignal = new TQGroupBox( 1, Qt::Horizontal, "emitted Signal", this);
+    TQGroupBox* gbSignal = new TQGroupBox( 1, TQt::Horizontal, "emitted Signal", this);
     m_plblSignal = new TQLabel( gbSignal );
     vBox->addWidget( gbSignal );
-    TQGroupBox* gbItem = new TQGroupBox( 1, Qt::Horizontal, "on Item", this);
+    TQGroupBox* gbItem = new TQGroupBox( 1, TQt::Horizontal, "on Item", this);
     m_plblItem = new TQLabel( gbItem );
     vBox->addWidget( gbItem );
 
-    TQButtonGroup* bgListView = new TQButtonGroup( 1, Qt::Horizontal, "TDEListView", this);
+    TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this);
     TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView);
     vBox->addWidget( bgListView );
-    connect( cbListView, TQT_SIGNAL( toggled( bool ) ),
-	     this, TQT_SLOT( slotToggleSingleColumn( bool ) ) );
+    connect( cbListView, TQ_SIGNAL( toggled( bool ) ),
+	     this, TQ_SLOT( slotToggleSingleColumn( bool ) ) );
 
     TDEGlobal::config()->reparseConfiguration();
 
     //Create IconView
-    TQGroupBox* gbIconView = new TQGroupBox( 1, Qt::Horizontal, "TDEIconView", this);
+    TQGroupBox* gbIconView = new TQGroupBox( 1, TQt::Horizontal, "TDEIconView", this);
     m_pIconView = new TDEIconView( gbIconView );
     hBox->addWidget( gbIconView );
     hBox->addSpacing( 5 );
-    connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
-	     this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
+    connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+	     this, TQ_SLOT( slotIconViewExec( TQIconViewItem* ) ) );
 
     //Create ListView
-    TQGroupBox* gbListView = new TQGroupBox( 1, Qt::Horizontal, "TDEListView", this);
+    TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this);
     m_pListView = new TDEListView( gbListView );
     m_pListView->addColumn("Item");
     m_pListView->addColumn("Text");
     hBox->addWidget( gbListView );
     hBox->addSpacing( 5 );
-    connect( m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ),
-	     this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) );
+    connect( m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ),
+	     this, TQ_SLOT( slotListViewExec( TQListViewItem* ) ) );
 
     //Create ListBox
-    TQGroupBox* gbListBox = new TQGroupBox( 1, Qt::Horizontal, "TDEListBox", this);
+    TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this);
     m_pListBox = new TDEListBox( gbListBox );
     hBox->addWidget( gbListBox );
-    connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ),
-	     this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) );
+    connect( m_pListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ),
+	     this, TQ_SLOT( slotListBoxExec( TQListBoxItem* ) ) );
 
     //Initialize buttons
     cbListView->setChecked( !m_pListView->allColumnsShowFocus() );
@@ -137,10 +137,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
       new TQListBoxPixmap( m_pListBox, TQPixmap(item_xpm), TQString("Item%1").arg(i));
     }
 
-    connect( m_pIconView, TQT_SIGNAL( clicked( TQIconViewItem* ) ),
-	     this, TQT_SLOT( slotClicked( TQIconViewItem* ) ) );
-    connect( m_pIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ),
-	     this, TQT_SLOT( slotDoubleClicked( TQIconViewItem* ) ) );
+    connect( m_pIconView, TQ_SIGNAL( clicked( TQIconViewItem* ) ),
+	     this, TQ_SLOT( slotClicked( TQIconViewItem* ) ) );
+    connect( m_pIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ),
+	     this, TQ_SLOT( slotDoubleClicked( TQIconViewItem* ) ) );
 }
 
 void TopLevel::slotSwitchMode( int id ) 
diff --git a/tdeui/tests/itemcontainertest.h b/tdeui/tests/itemcontainertest.h
index cb6cc3a51..bb8c7fefc 100644
--- a/tdeui/tests/itemcontainertest.h
+++ b/tdeui/tests/itemcontainertest.h
@@ -11,7 +11,7 @@ class TQLabel;
 
 class TopLevel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TopLevel( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/kblendtest.cpp b/tdeui/tests/kblendtest.cpp
index 4672b76ee..6484791b5 100644
--- a/tdeui/tests/kblendtest.cpp
+++ b/tdeui/tests/kblendtest.cpp
@@ -28,7 +28,7 @@ void KBlendWidget::paintEvent(TQPaintEvent */*ev*/)
     image = TQImage("testimage.png");
 
     TQPainter p(this);
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
 
     // you see here use of anti_dir param (blend from down to up, here)
     time.start();
diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp
index c9eb1134b..3390ce5f3 100644
--- a/tdeui/tests/kbuttonboxtest.cpp
+++ b/tdeui/tests/kbuttonboxtest.cpp
@@ -37,16 +37,16 @@ int main(int argc, char **argv) {
 			   "the window!\n"
 			   "Press OK or Cancel when done"
 			   , w);
-    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
     l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
     
     bbox->addStretch(1);
     bbox->addButton("Help");
@@ -65,17 +65,17 @@ int main(int argc, char **argv) {
     TQLabel *l = new TQLabel("Another common dialog\n\n"\
 			   "OK and Cancel are right aligned\n"\
 			   "Try resizing the window!", w);
-    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
     l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
     bbox->layout();
     tl->addWidget(bbox,0);
     tl->activate();  
@@ -91,17 +91,17 @@ int main(int argc, char **argv) {
     TQLabel *l = new TQLabel("Another common dialog\n\n"\
 			   "OK and Cancel are middle aligned\n"\
 			   "Try resizing the window!", w);
-    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
     l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
     bbox->addStretch(1);
     bbox->layout();
     tl->addWidget(bbox,0);
@@ -120,17 +120,17 @@ int main(int argc, char **argv) {
 			   "the maximum width for all buttons\n"
 			   "since it will look ugly -- "
 			   "anyway, it works", w);
-    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
     l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
 
     bbox->addButton("Push me and I give you a banana");
     bbox->addStretch(1);
@@ -152,17 +152,17 @@ int main(int argc, char **argv) {
 			   "prevent this strange effect as seen\n"
 			   "the former example!"
 			   ,w);
-    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
     l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w);
     bbox->addStretch(1);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
 
     bbox->addButton("Push me and I give you a banana", true);
     bbox->addStretch(1);
@@ -182,16 +182,16 @@ int main(int argc, char **argv) {
 			   "to make vertically aligned buttons\n"
 			   "too?"
 			   ,w);
-    l->setAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
+    l->setAlignment(TQt::AlignVCenter|TQt::AlignLeft|TQt::WordBreak);
     l->setMinimumSize(l->sizeHint());
     tl->addWidget(l,1);
     KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical);
     TQPushButton *b = bbox->addButton("OK");
     b->setDefault(true);
-    w->connect(b, TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
-    w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()),
-	       w, TQT_SLOT(accept()));
+    w->connect(b, TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
+    w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()),
+	       w, TQ_SLOT(accept()));
 
     bbox->addStretch(1);
     bbox->layout();
diff --git a/tdeui/tests/kcolordlgtest.cpp b/tdeui/tests/kcolordlgtest.cpp
index dbe39484c..a7738a7ed 100644
--- a/tdeui/tests/kcolordlgtest.cpp
+++ b/tdeui/tests/kcolordlgtest.cpp
@@ -33,7 +33,7 @@ int main( int argc, char *argv[] )
         aConfig.setGroup( "KColorDialog-test" );
     
 	color = aConfig.readColorEntry( "Chosen" );
-	int nRet = KColorDialog::getColor( color, Qt::red /*testing default color*/ );
+	int nRet = KColorDialog::getColor( color, TQt::red /*testing default color*/ );
 	aConfig.writeEntry( "Chosen", color );
 	
 	return nRet;
diff --git a/tdeui/tests/kcolortest.cpp b/tdeui/tests/kcolortest.cpp
index 243de265b..09b4a56c1 100644
--- a/tdeui/tests/kcolortest.cpp
+++ b/tdeui/tests/kcolortest.cpp
@@ -25,7 +25,7 @@ void KColorWidget::paintEvent(TQPaintEvent *)
 {
   if(!pixmap.isNull())
     bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-	   Qt::CopyROP, true);
+	   TQt::CopyROP, true);
 }
 
 void KColorWidget::doIntensityLoop()
@@ -46,11 +46,11 @@ void KColorWidget::doIntensityLoop()
 	  KImageEffect::intensity(image, -1./max);
 	else {
 	  uint *qptr=(uint *)image.bits();
-	  QRgb qrgb;
+	  TQRgb qrgb;
 	  int size=pixmap.width()*pixmap.height();
 	  for (int i=0;i<size; i++, qptr++)
 	    {
-	      qrgb=*(QRgb *)qptr;
+	      qrgb=*(TQRgb *)qptr;
 	      *qptr=tqRgb((int)(tqRed(qrgb)*1./max),
 			 (int)(tqGreen(qrgb)*1./max),
 			 (int)(tqBlue(qrgb)*1./max));
@@ -58,7 +58,7 @@ void KColorWidget::doIntensityLoop()
 	}
 	pixmap.convertFromImage(image);
 	bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-	       Qt::CopyROP, true);
+	       TQt::CopyROP, true);
       }
       stop = t.elapsed();
       tqDebug ("Total fullscreen %s dim time for %d steps : %f s",
@@ -71,7 +71,7 @@ void KColorWidget::doIntensityLoop()
 	  KImageEffect::fade(image, 1./max, black);
 	  pixmap.convertFromImage(image);
 	  bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-		 Qt::CopyROP, true);
+		 TQt::CopyROP, true);
 	}
       }
       stop = t.elapsed();
@@ -87,14 +87,14 @@ void KColorWidget::doIntensityLoop()
         KImageEffect::intensity(image, 1./max);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
 
       for(count=0; count < max; ++count){
         KImageEffect::intensity(image, -1./max);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
 
       image = original; image.detach();
@@ -103,13 +103,13 @@ void KColorWidget::doIntensityLoop()
         KImageEffect::channelIntensity(image, -1./max, KImageEffect::Red);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
       for(count=0; count < max; ++count){
         KImageEffect::channelIntensity(image, 1./max, KImageEffect::Red);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
 
       image = original; image.detach();
@@ -118,13 +118,13 @@ void KColorWidget::doIntensityLoop()
         KImageEffect::channelIntensity(image, -1./max, KImageEffect::Green);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
       for(count=0; count < max; ++count){
         KImageEffect::channelIntensity(image, 1./max, KImageEffect::Green);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
 
       image = original; image.detach();
@@ -133,13 +133,13 @@ void KColorWidget::doIntensityLoop()
         KImageEffect::channelIntensity(image, -1./max, KImageEffect::Blue);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
       for(count=0; count < max; ++count){
         KImageEffect::channelIntensity(image, 1./max, KImageEffect::Blue);
         pixmap.convertFromImage(image);
         bitBlt(this, 0, 0, &pixmap, 0, 0, pixmap.width(), pixmap.height(),
-               Qt::CopyROP, true);
+               TQt::CopyROP, true);
       }
     }
 }
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index d2b59a4c2..7e51396c1 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -40,8 +40,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   
   m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" );
   lbl->setBuddy (m_qc);  
-  TQObject::connect (m_qc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_qc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_qc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_qc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
   
   // Read-only combobox
@@ -53,8 +53,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_ro = new KComboBox(hbox, "ReadOnlyCombo" );
   lbl->setBuddy (m_ro);
   m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-  TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_ro, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_ro, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
   vbox->addWidget (hbox);
 
   // Read-write combobox
@@ -68,10 +68,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_rw->setDuplicatesEnabled( true );
   m_rw->setInsertionPolicy( TQComboBox::NoInsertion );
   m_rw->setTrapReturnKey( true );
-  TQObject::connect (m_rw, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_rw, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&)));
-  TQObject::connect (m_rw, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
-  TQObject::connect (m_rw, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&)));
+  TQObject::connect (m_rw, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_rw, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&)));
+  TQObject::connect (m_rw, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
+  TQObject::connect (m_rw, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&)));
   vbox->addWidget (hbox);
 
   // History combobox...
@@ -84,9 +84,9 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   lbl->setBuddy (m_hc);
   m_hc->setDuplicatesEnabled( true );
   m_hc->setInsertionPolicy( TQComboBox::NoInsertion );
-  TQObject::connect (m_hc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_hc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&)));
-  TQObject::connect (m_hc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));  
+  TQObject::connect (m_hc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_hc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&)));
+  TQObject::connect (m_hc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));  
   vbox->addWidget (hbox);
   m_hc->setTrapReturnKey(true);
 
@@ -99,19 +99,19 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_konqc = new KComboBox( true, hbox, "KonqyCombo" );
   lbl->setBuddy (m_konqc);
   m_konqc->setMaxCount( 10 );
-  TQObject::connect (m_konqc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
-  TQObject::connect (m_konqc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&)));
-  TQObject::connect (m_konqc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
+  TQObject::connect (m_konqc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
+  TQObject::connect (m_konqc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&)));
+  TQObject::connect (m_konqc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
   vbox->addWidget (hbox);
 
   // Create an exit button
   hbox = new TQHBox (this);
   m_btnExit = new TQPushButton( "E&xit", hbox );
-  TQObject::connect( m_btnExit, TQT_SIGNAL(clicked()), TQT_SLOT(quitApp()) );
+  TQObject::connect( m_btnExit, TQ_SIGNAL(clicked()), TQ_SLOT(quitApp()) );
 
   // Create a disable button...
   m_btnEnable = new TQPushButton( "Disa&ble", hbox );
-  TQObject::connect (m_btnEnable, TQT_SIGNAL(clicked()), TQT_SLOT(slotDisable()));
+  TQObject::connect (m_btnEnable, TQ_SIGNAL(clicked()), TQ_SLOT(slotDisable()));
 
   vbox->addWidget (hbox);
 
@@ -150,7 +150,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   m_konqc->setCurrentItem( m_konqc->count()-1 );
 
   m_timer = new TQTimer (this);
-  connect (m_timer, TQT_SIGNAL (timeout()), TQT_SLOT (slotTimeout()));
+  connect (m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (slotTimeout()));
 }
 
 KComboBoxTest::~KComboBoxTest()
diff --git a/tdeui/tests/kcomboboxtest.h b/tdeui/tests/kcomboboxtest.h
index 6566c9097..577b09080 100644
--- a/tdeui/tests/kcomboboxtest.h
+++ b/tdeui/tests/kcomboboxtest.h
@@ -11,7 +11,7 @@ class KComboBox;
 
 class KComboBoxTest : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
     
 public:
   KComboBoxTest ( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp
index 261534465..a6c010fc7 100644
--- a/tdeui/tests/kcompletiontest.cpp
+++ b/tdeui/tests/kcompletiontest.cpp
@@ -38,11 +38,11 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     GroupBox1 = new TQGroupBox( this, "GroupBox1" );
     GroupBox1->setTitle( "Completion Test" );
-    GroupBox1->setColumnLayout(0, Qt::Vertical );
+    GroupBox1->setColumnLayout(0, TQt::Vertical );
     GroupBox1->layout()->setSpacing( 0 );
     GroupBox1->layout()->setMargin( 0 );
     GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() );
-    GroupBox1Layout->setAlignment( Qt::AlignTop );
+    GroupBox1Layout->setAlignment( TQt::AlignTop );
     GroupBox1Layout->setSpacing( 6 );
     GroupBox1Layout->setMargin( 11 );
 
@@ -74,8 +74,8 @@ Form1::Form1( TQWidget* parent,  const char* name )
     combo->setCompletionObject( edit->completionObject() );
     // combo->setMaxCount( 5 );
     combo->setHistoryItems( defaultItems(), true );
-    connect( combo, TQT_SIGNAL( activated( const TQString& )),
-	     combo, TQT_SLOT( addToHistory( const TQString& )));
+    connect( combo, TQ_SIGNAL( activated( const TQString& )),
+	     combo, TQ_SLOT( addToHistory( const TQString& )));
     TQToolTip::add( combo, "KHistoryCombo" );
     Layout2->addWidget( combo );
 
@@ -84,7 +84,7 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     PushButton1 = new TQPushButton( GroupBox1, "PushButton1" );
     PushButton1->setText( "Add" );
-    connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ));
+    connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ));
     Layout2->addWidget( PushButton1 );
     Layout9->addLayout( Layout2 );
 
@@ -96,7 +96,7 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     PushButton1_4 = new TQPushButton( GroupBox1, "PushButton1_4" );
     PushButton1_4->setText( "Remove" );
-    connect( PushButton1_4, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ));
+    connect( PushButton1_4, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ));
     Layout3->addWidget( PushButton1_4 );
     Layout9->addLayout( Layout3 );
 
@@ -106,8 +106,8 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     ListBox1 = new TQListBox( GroupBox1, "ListBox1" );
     Layout8->addWidget( ListBox1 );
-    connect( ListBox1, TQT_SIGNAL( highlighted( const TQString& )),
-	     TQT_SLOT( slotHighlighted( const TQString& )));
+    connect( ListBox1, TQ_SIGNAL( highlighted( const TQString& )),
+	     TQ_SLOT( slotHighlighted( const TQString& )));
     TQToolTip::add( ListBox1, "Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted");
 
     Layout7 = new TQVBoxLayout;
@@ -116,13 +116,13 @@ Form1::Form1( TQWidget* parent,  const char* name )
 
     PushButton1_3 = new TQPushButton( GroupBox1, "PushButton1_3" );
     PushButton1_3->setText( "Completion items" );
-    connect( PushButton1_3, TQT_SIGNAL( clicked() ), TQT_SLOT( slotList() ));
+    connect( PushButton1_3, TQ_SIGNAL( clicked() ), TQ_SLOT( slotList() ));
     Layout7->addWidget( PushButton1_3 );
 
     PushButton1_2 = new TQPushButton( GroupBox1, "PushButton1_2" );
     PushButton1_2->setText( "Clear" );
-    connect( PushButton1_2, TQT_SIGNAL( clicked() ),
-	     edit->completionObject(), TQT_SLOT( clear() ));
+    connect( PushButton1_2, TQ_SIGNAL( clicked() ),
+	     edit->completionObject(), TQ_SLOT( clear() ));
     Layout7->addWidget( PushButton1_2 );
     Layout8->addLayout( Layout7 );
     Layout9->addLayout( Layout8 );
diff --git a/tdeui/tests/kcompletiontest.h b/tdeui/tests/kcompletiontest.h
index 9443401eb..03cb6ed2a 100644
--- a/tdeui/tests/kcompletiontest.h
+++ b/tdeui/tests/kcompletiontest.h
@@ -27,7 +27,7 @@ class KLineEdit;
 
 class Form1 : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Form1( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp
index 8eab0b125..3daf22b08 100644
--- a/tdeui/tests/kdesattest.cpp
+++ b/tdeui/tests/kdesattest.cpp
@@ -15,7 +15,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name)
     slide = new KDoubleNumInput(700, this, "desat");
     slide->setRange(0, 1, 0.001);
     slide->setLabel("Desaturate: ", AlignVCenter | AlignLeft);
-    connect(slide,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(change(double)));
+    connect(slide,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(change(double)));
 
     resize(image.width()*2, image.height() + slide->height());
     slide->setGeometry(0, image.height(), image.width()*2, slide->height());
@@ -33,7 +33,7 @@ void KDesatWidget::paintEvent(TQPaintEvent */*ev*/)
     TQString say;
 
     TQPainter p(this);
-    p.setPen(Qt::black);
+    p.setPen(TQt::black);
 
     // original image
     time.start();
diff --git a/tdeui/tests/kdesattest.h b/tdeui/tests/kdesattest.h
index 8e04c08c6..4faaa2798 100644
--- a/tdeui/tests/kdesattest.h
+++ b/tdeui/tests/kdesattest.h
@@ -13,7 +13,7 @@
 
 class KDesatWidget : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     KDesatWidget(TQWidget *parent=0, const char *name=0);
 
diff --git a/tdeui/tests/kdocktest.cpp b/tdeui/tests/kdocktest.cpp
index 538e2b888..57b8d2a08 100644
--- a/tdeui/tests/kdocktest.cpp
+++ b/tdeui/tests/kdocktest.cpp
@@ -18,7 +18,7 @@ DockTest::DockTest( TQWidget* parent )
   m_blueDock->setCaption( "Blue" );
   m_blueDock->setGeometry( 50, 50, 100, 100 );
   TQWidget *l = new TQWidget( m_blueDock );
-  l->setBackgroundColor( Qt::blue );
+  l->setBackgroundColor( TQt::blue );
   l->setMinimumSize( 100,100 );
   m_blueDock->setWidget( l );
 
@@ -32,7 +32,7 @@ DockTest::DockTest( TQWidget* parent )
   m_redDock->setCaption( "Red" );
   m_redDock->setGeometry( 50, 50, 100, 100 );
   l = new TQWidget( m_redDock );
-  l->setBackgroundColor( Qt::red );
+  l->setBackgroundColor( TQt::red );
   l->setMinimumSize( 100,100 );
   m_redDock->setWidget( l );
   m_redDock->manualDock( m_blueDock, KDockWidget::DockLeft, 3000 );
@@ -45,7 +45,7 @@ DockTest::DockTest( TQWidget* parent )
   m_yellowDock->setCaption( "Yellow" );
   m_yellowDock->setGeometry( 50, 50, 100, 100 );
   l = new TQWidget( m_yellowDock );
-  l->setBackgroundColor( Qt::yellow );
+  l->setBackgroundColor( TQt::yellow );
   l->setMinimumSize( 100,100 );
   m_yellowDock->setWidget( l );
   m_yellowDock->manualDock( m_blueDock, KDockWidget::DockTop, 5000 );
diff --git a/tdeui/tests/kdocktest.h b/tdeui/tests/kdocktest.h
index f23d22a35..d38ac029a 100644
--- a/tdeui/tests/kdocktest.h
+++ b/tdeui/tests/kdocktest.h
@@ -6,7 +6,7 @@
 class TQWidget;
 class DockTest : public KDockArea
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   DockTest( TQWidget* parent=0 );
 
diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp
index a922acf2d..ba3f97d74 100644
--- a/tdeui/tests/kdockwidgetdemo.cpp
+++ b/tdeui/tests/kdockwidgetdemo.cpp
@@ -116,8 +116,8 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
   fd->reparent(d_fd, TQPoint(0,0));
   d_fd->setWidget( fd );
 
-  connect( dirView, TQT_SIGNAL( folderSelected( const TQString & ) ), fd, TQT_SLOT( setDir2( const TQString & ) ) );
-  connect( fd, TQT_SIGNAL( dirEntered( const TQString & ) ), dirView, TQT_SLOT( setDir( const TQString & ) ) );
+  connect( dirView, TQ_SIGNAL( folderSelected( const TQString & ) ), fd, TQ_SLOT( setDir2( const TQString & ) ) );
+  connect( fd, TQ_SIGNAL( dirEntered( const TQString & ) ), dirView, TQ_SLOT( setDir( const TQString & ) ) );
 
   d_fd->setDockSite( KDockWidget::DockTop|KDockWidget::DockLeft|KDockWidget::DockRight|KDockWidget::DockBottom );
   d_fd->setEnableDocking(KDockWidget::DockNone);
@@ -128,16 +128,16 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
   d_dirView->manualDock( d_fd, KDockWidget::DockLeft, 20 );
   d_preview->manualDock( d_fd, KDockWidget::DockBottom, 70 );
 
-  connect(fd, TQT_SIGNAL(fileHighlighted(const TQString&)), preview, TQT_SLOT(showPreview(const TQString&)));
-  connect(fd, TQT_SIGNAL(signalDone(int)), this, TQT_SLOT(done(int)));
+  connect(fd, TQ_SIGNAL(fileHighlighted(const TQString&)), preview, TQ_SLOT(showPreview(const TQString&)));
+  connect(fd, TQ_SIGNAL(signalDone(int)), this, TQ_SLOT(done(int)));
 
-  connect(fd, TQT_SIGNAL(dirEntered(const TQString&)), this, TQT_SLOT(changeDir(const TQString&)));
-  connect(dirView, TQT_SIGNAL(folderSelected(const TQString&)), this, TQT_SLOT(changeDir(const TQString&)));
+  connect(fd, TQ_SIGNAL(dirEntered(const TQString&)), this, TQ_SLOT(changeDir(const TQString&)));
+  connect(dirView, TQ_SIGNAL(folderSelected(const TQString&)), this, TQ_SLOT(changeDir(const TQString&)));
 
   b_tree = new TQToolButton( fd );
   TQToolTip::add( b_tree, "Show/Hide Tree" );
   b_tree->setPixmap( TQPixmap( dir_tree_xpm ) );
-  connect( b_tree, TQT_SIGNAL(clicked()), d_dirView, TQT_SLOT(changeHideShowState()) );
+  connect( b_tree, TQ_SIGNAL(clicked()), d_dirView, TQ_SLOT(changeHideShowState()) );
   b_tree->setToggleButton(true);
   b_tree->setOn(true);
   fd->addToolButton( b_tree, true );
@@ -145,13 +145,13 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const
   b_preview = new TQToolButton( fd );
   TQToolTip::add( b_preview, "Show/Hide Preview" );
   b_preview->setPixmap( TQPixmap( preview_xpm ) );
-  connect( b_preview, TQT_SIGNAL(clicked()), d_preview, TQT_SLOT(changeHideShowState()) );
+  connect( b_preview, TQ_SIGNAL(clicked()), d_preview, TQ_SLOT(changeHideShowState()) );
   b_preview->setToggleButton(true);
   b_preview->setOn(true);
   fd->addToolButton( b_preview );
 
-  connect( dockManager, TQT_SIGNAL(change()), this, TQT_SLOT(dockChange()));
-  connect( dockManager, TQT_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQT_SLOT(setDockDefaultPos(KDockWidget*)));
+  connect( dockManager, TQ_SIGNAL(change()), this, TQ_SLOT(dockChange()));
+  connect( dockManager, TQ_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQ_SLOT(setDockDefaultPos(KDockWidget*)));
   setCaption("Open File");
   resize(550,450);
   tqDebug("read config");
@@ -403,7 +403,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent )
   TQToolTip::add( p, tr( "Bookmarks" ) );
 
   bookmarkMenu = new TQPopupMenu( this );
-  connect( bookmarkMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( bookmarkChosen( int ) ) );
+  connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( bookmarkChosen( int ) ) );
   addId = bookmarkMenu->insertItem( "Add bookmark" );
   clearId = bookmarkMenu->insertItem( TQPixmap(folder_trash), "Clear bookmarks" );
   bookmarkMenu->insertSeparator();
@@ -416,7 +416,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent )
   TQToolTip::add( b, tr( "Go Home!" ) );
 
   b->setPixmap( TQPixmap( homepage_xpm ) );
-  connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( goHome() ) );
+  connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goHome() ) );
 
   addToolButton( b );
 }
@@ -695,12 +695,12 @@ TQString Directory::text( int column ) const
 DirectoryView::DirectoryView( TQWidget *parent, const char *name )
 :TQListView( parent, name )
 {
-  connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-           this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-           this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+           this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+           this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) );
 
   setAcceptDrops( true );
   viewport()->setAcceptDrops( true );
diff --git a/tdeui/tests/kdockwidgetdemo.h b/tdeui/tests/kdockwidgetdemo.h
index b6f029cd5..f3227fb86 100644
--- a/tdeui/tests/kdockwidgetdemo.h
+++ b/tdeui/tests/kdockwidgetdemo.h
@@ -29,7 +29,7 @@ class Preview;
 class DirectoryView;
 
 class SFileDialog : public TQDialog
-{Q_OBJECT
+{TQ_OBJECT
 
 public:
 	SFileDialog( TQString initially = TQString::null,
@@ -87,7 +87,7 @@ private:
 };
 
 class DirectoryView : public TQListView
-{Q_OBJECT
+{TQ_OBJECT
 public:
   DirectoryView( TQWidget *parent = 0, const char *name = 0 );
   virtual void setOpen ( TQListViewItem *, bool );
@@ -108,7 +108,7 @@ private:
 };
 /******************************************************************************************************/
 class PixmapView : public TQScrollView
-{Q_OBJECT
+{TQ_OBJECT
 public:
   PixmapView( TQWidget *parent );
   void setPixmap( const TQPixmap &pix );
@@ -119,7 +119,7 @@ private:
 };
 
 class Preview : public TQWidgetStack
-{Q_OBJECT
+{TQ_OBJECT
 public:
   Preview( TQWidget *parent );
 
@@ -133,7 +133,7 @@ private:
 };
 
 class CustomFileDialog : public TQFileDialog
-{Q_OBJECT
+{TQ_OBJECT
 public:
   CustomFileDialog( TQWidget* parent );
   ~CustomFileDialog();
diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp
index aacac19a0..154d02463 100644
--- a/tdeui/tests/kdockwidgettest.cpp
+++ b/tdeui/tests/kdockwidgettest.cpp
@@ -101,7 +101,7 @@ DockApplication::DockApplication( const char* name )
   l->setBackgroundColor(white);
   l->setMinimumSize(100,100);
   dock5->setWidget(l);
-  if (::tqqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 5");
+  if (::tqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 5");
   /*****************************************************/
 
   /*****************************************************/
@@ -112,7 +112,7 @@ DockApplication::DockApplication( const char* name )
   l->setBackgroundColor(white);
   l->setMinimumSize(100,100);
   dock6->setWidget(l);
-  if (::tqqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 6");
+  if (::tqt_cast<KDockContainer*>(l)) tqDebug("KDockContainer created for dock 6");
   /*****************************************************/
 
 
@@ -120,12 +120,12 @@ DockApplication::DockApplication( const char* name )
   TQPushButton* b1 = new TQPushButton(mainW);
   b1->setGeometry(10, 10, 250, 25);
   b1->setText("write dock config");
-  connect(b1, TQT_SIGNAL(clicked()), TQT_SLOT(wConfig()));
+  connect(b1, TQ_SIGNAL(clicked()), TQ_SLOT(wConfig()));
 
   TQPushButton* b2 = new TQPushButton(mainW);
   b2->setGeometry(10, 35, 250, 25);
   b2->setText("read dock config");
-  connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(rConfig()));
+  connect(b2, TQ_SIGNAL(clicked()), TQ_SLOT(rConfig()));
 
   m_bname = new TQPushButton(mainW);
   m_bname->setGeometry(10, 60, 250, 25);
@@ -134,12 +134,12 @@ DockApplication::DockApplication( const char* name )
   TQPushButton *b3 = new TQPushButton(mainW);
   b3->setGeometry(10,95,250,25);
   b3->setText("change the icon of the green widget");
-  connect(b3,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix1()));
+  connect(b3,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix1()));
 
   TQPushButton *b4 = new TQPushButton(mainW);
   b4->setGeometry(10,130,250,25);
   b4->setText("remove icon ");
-  connect(b4,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix2()));
+  connect(b4,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix2()));
 
   setGeometry(200, 100, 500, 300);
 
@@ -170,11 +170,11 @@ void DockApplication::initMenuBar()
   TQPixmap p(folder);
   TQPopupMenu *file_menu = new TQPopupMenu();
 
-  file_menu->insertItem(p, "Change Green Widget Caption", this, TQT_SLOT(cap()) );
+  file_menu->insertItem(p, "Change Green Widget Caption", this, TQ_SLOT(cap()) );
   file_menu->insertSeparator();
-  file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQT_SLOT(greenMain()) );
-  file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQT_SLOT(blueMain()) );
-  file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQT_SLOT(nullMain()) );
+  file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQ_SLOT(greenMain()) );
+  file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQ_SLOT(blueMain()) );
+  file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQ_SLOT(nullMain()) );
 
   KMenuBar* menu_bar = menuBar();
   menu_bar->insertItem( "&Test", file_menu );
diff --git a/tdeui/tests/kdockwidgettest.h b/tdeui/tests/kdockwidgettest.h
index 4cc952857..315c23267 100644
--- a/tdeui/tests/kdockwidgettest.h
+++ b/tdeui/tests/kdockwidgettest.h
@@ -22,7 +22,7 @@
 class TQPushButton;
 
 class DockApplication : public KDockMainWindow
-{Q_OBJECT
+{TQ_OBJECT
 public:
   DockApplication( const char* name );
   ~DockApplication();
@@ -57,7 +57,7 @@ private:
 
 class CTW:public TQTabWidget,public KDockContainer
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         CTW(TQWidget *parent):TQTabWidget(parent,"MyDockContainer"),KDockContainer(){insertTab(new TQLabel("BLAH",this),"BLUP");}
         virtual ~CTW(){;}
diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp
index 512bfc610..a9be04cac 100644
--- a/tdeui/tests/kdualcolortest.cpp
+++ b/tdeui/tests/kdualcolortest.cpp
@@ -12,12 +12,12 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
     KDualColorButton *colorBtn =
         new KDualColorButton(lbl->colorGroup().text(),
                              lbl->colorGroup().background(), this);
-    connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)),
-            TQT_SLOT(slotFgChanged(const TQColor &)));
-    connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)),
-            TQT_SLOT(slotBgChanged(const TQColor &)));
-    connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)),
-            TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor)));
+    connect(colorBtn, TQ_SIGNAL(fgChanged(const TQColor &)),
+            TQ_SLOT(slotFgChanged(const TQColor &)));
+    connect(colorBtn, TQ_SIGNAL(bgChanged(const TQColor &)),
+            TQ_SLOT(slotBgChanged(const TQColor &)));
+    connect(colorBtn, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)),
+            TQ_SLOT(slotCurrentChanged(KDualColorButton::DualColor)));
     
     TQHBoxLayout *layout = new TQHBoxLayout(this, 5);
     layout->addWidget(colorBtn, 0);
diff --git a/tdeui/tests/kdualcolortest.h b/tdeui/tests/kdualcolortest.h
index 2c38b7af0..bfea58493 100644
--- a/tdeui/tests/kdualcolortest.h
+++ b/tdeui/tests/kdualcolortest.h
@@ -6,7 +6,7 @@
 
 class KDualColorWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KDualColorWidget(TQWidget *parent=0, const char *name=0);
 protected slots:
diff --git a/tdeui/tests/kgradienttest.cpp b/tdeui/tests/kgradienttest.cpp
index 4ee8c0f93..f828e31f7 100644
--- a/tdeui/tests/kgradienttest.cpp
+++ b/tdeui/tests/kgradienttest.cpp
@@ -13,13 +13,13 @@ void KGradientWidget::paintEvent(TQPaintEvent */*ev*/)
     int it, ft;
     TQString say;
 
-    TQColor ca = Qt::black, cb = Qt::blue;
+    TQColor ca = TQt::black, cb = TQt::blue;
 
     int x = 0, y = 0;
 
     pix.resize(width()/cols, height()/rows);
     TQPainter p(this);
-    p.setPen(Qt::white);
+    p.setPen(TQt::white);
 
     // draw once, so that the benchmarking be fair :-)
     KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient);
diff --git a/tdeui/tests/khashtest.cpp b/tdeui/tests/khashtest.cpp
index d392fcbc5..d2829606e 100644
--- a/tdeui/tests/khashtest.cpp
+++ b/tdeui/tests/khashtest.cpp
@@ -21,7 +21,7 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/)
 
     pix.resize(width()/cols, height()/rows);
     TQPainter p(this);
-    p.setPen(Qt::white);
+    p.setPen(TQt::white);
 
     // draw once, so that the benchmarking be fair :-)
     KPixmapEffect::gradient(pix,ca, cb, KPixmapEffect::VerticalGradient);
@@ -86,9 +86,9 @@ void KHashWidget::paintEvent(TQPaintEvent * /*ev*/)
     pix.resize(width()/cols, height()/rows);
     say.setNum( ft - it); say += " ms, CrossDiagonal";
     p.drawPixmap(x*width()/cols, y*height()/rows, pix);
-    p.setPen(Qt::blue);
+    p.setPen(TQt::blue);
     p.drawText(5+(x++)*width()/cols, 15+y*height()/rows, say);
-    p.setPen(Qt::white);
+    p.setPen(TQt::white);
 
 
     y++; // next row
diff --git a/tdeui/tests/khashtest.h b/tdeui/tests/khashtest.h
index 05de5c435..ea1c161aa 100644
--- a/tdeui/tests/khashtest.h
+++ b/tdeui/tests/khashtest.h
@@ -12,7 +12,7 @@
 
 class KHashWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KHashWidget(TQWidget *parent=0, const char *name=0)
diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp
index 71e72fb13..798145f47 100644
--- a/tdeui/tests/kjanuswidgettest.cpp
+++ b/tdeui/tests/kjanuswidgettest.cpp
@@ -18,7 +18,7 @@ int main(int argc, char** argv)
   TQCheckBox* cb2 = new TQCheckBox( "a", page2 );
 
   janus->show();
-  TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
 
   return app.exec();
 }
diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp
index 8a16c122f..4694bd2c9 100644
--- a/tdeui/tests/kledtest.cpp
+++ b/tdeui/tests/kledtest.cpp
@@ -22,7 +22,7 @@ KLedTest::KLedTest(TQWidget* parent)
   if (kled_round) {
     //KLed l(KLed::red, &qw);				// create lamp
     //KLed l(KLed::blue, &qw);				// create lamp
-    l = new KLed(Qt::green, this);				// create lamp
+    l = new KLed(TQt::green, this);				// create lamp
     //KLed l(KLed::yellow, &qw);				// create lamp
     //KLed l(KLed::orange, &qw);				// create lamp
 
@@ -42,9 +42,9 @@ KLedTest::KLedTest(TQWidget* parent)
     t_toggle.start(1000, false);
     t_color.start(3500, false);
     t_look.start(3500, false);
-    TQObject::connect(&t_toggle, TQT_SIGNAL(timeout()), l, TQT_SLOT(toggle()));
-    TQObject::connect(&t_color, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextColor()));
-    TQObject::connect(&t_look, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextLook()));
+    TQObject::connect(&t_toggle, TQ_SIGNAL(timeout()), l, TQ_SLOT(toggle()));
+    TQObject::connect(&t_color, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextColor()));
+    TQObject::connect(&t_look, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextLook()));
     l->show();
     resize(240,140);
   }
@@ -55,7 +55,7 @@ KLedTest::KLedTest(TQWidget* parent)
       for( int look=0; (int)look<3; look=(KLed::Look)(look+1)) {
 	for(state=KLed::Off; (int)state<2; state=(KLed::State)(state+1))
 	    {
-	      leds[index]=new KLed(Qt::yellow, state,
+	      leds[index]=new KLed(TQt::yellow, state,
 				   (KLed::Look)(look+1),
 				   (KLed::Shape)(shape+1), this);
 	      leds[index]->setGeometry(x, y, LedWidth, LedHeight);
@@ -66,7 +66,7 @@ KLedTest::KLedTest(TQWidget* parent)
       y+=Grid+LedHeight;
       }
     setFixedSize(x+Grid, y+Grid);
-    connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
+    connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
     timer.start(500);
   }
 }
diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h
index 5652e306e..dce5fb3a8 100644
--- a/tdeui/tests/kledtest.h
+++ b/tdeui/tests/kledtest.h
@@ -8,7 +8,7 @@
 
 class KLedTest : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   TQTimer timer;
   KLed *leds[/*KLed::NoOfShapes*/2* /*KLed::NoOfLooks*/3* /*KLed::NoOfStates*/2];
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index 20e9b6ca8..e9601ccec 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -31,28 +31,28 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name )
     m_lineedit->completionObject()->setItems( list );
     m_lineedit->setFixedSize(500,30);
     m_lineedit->setEnableSqueezedText( true );
-    connect( m_lineedit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) );
-    connect( m_lineedit, TQT_SIGNAL( returnPressed(const TQString&) ), 
-             TQT_SLOT( slotReturnPressed(const TQString&) ) );
+    connect( m_lineedit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) );
+    connect( m_lineedit, TQ_SIGNAL( returnPressed(const TQString&) ), 
+             TQ_SLOT( slotReturnPressed(const TQString&) ) );
 
     TQHBox *hbox = new TQHBox (this);
     m_btnExit = new TQPushButton( "E&xit", hbox );
     m_btnExit->setFixedSize(100,30);
-    connect( m_btnExit, TQT_SIGNAL( clicked() ), TQT_SLOT( quitApp() ) );
+    connect( m_btnExit, TQ_SIGNAL( clicked() ), TQ_SLOT( quitApp() ) );
     
     m_btnReadOnly = new TQPushButton( "&Read Only", hbox );
     m_btnReadOnly->setToggleButton (true);
     m_btnReadOnly->setFixedSize(100,30);
-    connect( m_btnReadOnly, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotReadOnly(bool) ) );
+    connect( m_btnReadOnly, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotReadOnly(bool) ) );
     
     m_btnEnable = new TQPushButton( "Dis&able", hbox );
     m_btnEnable->setToggleButton (true);
     m_btnEnable->setFixedSize(100,30);
-    connect( m_btnEnable, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotEnable(bool) ) );
+    connect( m_btnEnable, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotEnable(bool) ) );
     
     m_btnHide = new TQPushButton( "Hi&de", hbox );
      m_btnHide->setFixedSize(100,30);
-    connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) );
+    connect( m_btnHide, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHide() ) );
 
     layout->addWidget( m_lineedit );
     layout->addWidget( hbox );
@@ -113,7 +113,7 @@ void KLineEditTest::slotHide()
     m_btnHide->setEnabled( false );      
     m_lineedit->setText( "My dog ate the homework, whaaaaaaaaaaaaaaaaaaaaaaa"
                           "aaaaaaaaaaaaaaaaaaaaaaaaa! I want my mommy!" );
-    TQTimer::singleShot( 1000, this, TQT_SLOT(show()) );
+    TQTimer::singleShot( 1000, this, TQ_SLOT(show()) );
 }
 
 int main ( int argc, char **argv)
diff --git a/tdeui/tests/klineedittest.h b/tdeui/tests/klineedittest.h
index 6fee4dbc4..63cb1d459 100644
--- a/tdeui/tests/klineedittest.h
+++ b/tdeui/tests/klineedittest.h
@@ -11,7 +11,7 @@ class KLineEdit;
 
 class KLineEditTest : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
    KLineEditTest( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp
index 9a333dfda..8e99df1b9 100644
--- a/tdeui/tests/knuminputtest.cpp
+++ b/tdeui/tests/knuminputtest.cpp
@@ -26,7 +26,7 @@ void TopLevel::slotPrint( double n ) {
   kdDebug() << "slotPrint( " << n << " )" << endl;
 }
 
-#define conn(x,y) connect( x, TQT_SIGNAL(valueChanged(y)), TQT_SLOT(slotPrint(y)))
+#define conn(x,y) connect( x, TQ_SIGNAL(valueChanged(y)), TQ_SLOT(slotPrint(y)))
 TopLevel::TopLevel(TQWidget *parent, const char *name)
     : TQWidget(parent, name)
 {
@@ -67,10 +67,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     i6->setLabel("Height (should be 2xWidth):");
     i6->setRange(0, 200, 1, false);
     i6->setReferencePoint( 10 );
-    connect( i5, TQT_SIGNAL(relativeValueChanged(double)),
-	     i6, TQT_SLOT(setRelativeValue(double)) );
-    connect( i6, TQT_SIGNAL(relativeValueChanged(double)),
-	     i5, TQT_SLOT(setRelativeValue(double)) );
+    connect( i5, TQ_SIGNAL(relativeValueChanged(double)),
+	     i6, TQ_SLOT(setRelativeValue(double)) );
+    connect( i6, TQ_SIGNAL(relativeValueChanged(double)),
+	     i5, TQ_SLOT(setRelativeValue(double)) );
 
     i7 = new KIntNumInput(i6, 0, b1, 10);
     i7->setLabel("math test:", AlignVCenter|AlignLeft );
@@ -119,10 +119,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
     d7 = new KDoubleNumInput(d6, -30, 30, 0, 0.001, 3, b2, "d7");
     d7->setReferencePoint( -3 );
 
-    connect( d6, TQT_SIGNAL(relativeValueChanged(double)),
-	     d7, TQT_SLOT(setRelativeValue(double)) );
-    connect( d7, TQT_SIGNAL(relativeValueChanged(double)),
-	     d6, TQT_SLOT(setRelativeValue(double)) );
+    connect( d6, TQ_SIGNAL(relativeValueChanged(double)),
+	     d7, TQ_SLOT(setRelativeValue(double)) );
+    connect( d7, TQ_SIGNAL(relativeValueChanged(double)),
+	     d6, TQ_SLOT(setRelativeValue(double)) );
 
     l->addWidget(b2);
 }
diff --git a/tdeui/tests/knuminputtest.h b/tdeui/tests/knuminputtest.h
index 32a9e9098..e5d1c6d7f 100644
--- a/tdeui/tests/knuminputtest.h
+++ b/tdeui/tests/knuminputtest.h
@@ -8,7 +8,7 @@ class KDoubleNumInput;
 
 class TopLevel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TopLevel( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp
index a14cb3366..c08c03a8c 100644
--- a/tdeui/tests/kpanelmenutest.cpp
+++ b/tdeui/tests/kpanelmenutest.cpp
@@ -15,8 +15,8 @@ TestWidget::TestWidget(TQWidget *parent, const char *name)
 
     KPanelAppMenu *ssub = subMenu->insertMenu(locate("mini", "x.png"), "One more");
    
-    connect(testMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuCalled(int)));
-    connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubMenuCalled(int)));
+    connect(testMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuCalled(int)));
+    connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubMenuCalled(int)));
     init();
     
     setText("We added \"Client Test\" to kicker. Click the TDE Menu to check.");
diff --git a/tdeui/tests/kpanelmenutest.h b/tdeui/tests/kpanelmenutest.h
index 361ae545a..f6c81eac8 100644
--- a/tdeui/tests/kpanelmenutest.h
+++ b/tdeui/tests/kpanelmenutest.h
@@ -6,7 +6,7 @@
 
 class TestWidget : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestWidget(TQWidget *parent=0, const char *name=0);
     ~TestWidget(){delete testMenu;}
diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp
index 628c5096e..28bc2a362 100644
--- a/tdeui/tests/krulertest.cpp
+++ b/tdeui/tests/krulertest.cpp
@@ -76,14 +76,14 @@ KRulerTest::KRulerTest( const char *name )
   vruler->setOffset( 0 );
   vruler->setRange( 0, 1000 );
 
-  connect( bigwidget, TQT_SIGNAL(newXPos(int)),
-	   hruler, TQT_SLOT(slotNewValue(int)) );
-  connect( bigwidget, TQT_SIGNAL(newYPos(int)),
-	   vruler, TQT_SLOT(slotNewValue(int)) );
-  connect( bigwidget, TQT_SIGNAL(newWidth(int)),
-	   TQT_SLOT(slotNewWidth(int)) );
-  connect( bigwidget, TQT_SIGNAL(newHeight(int)),
-	   TQT_SLOT(slotNewHeight(int)) );
+  connect( bigwidget, TQ_SIGNAL(newXPos(int)),
+	   hruler, TQ_SLOT(slotNewValue(int)) );
+  connect( bigwidget, TQ_SIGNAL(newYPos(int)),
+	   vruler, TQ_SLOT(slotNewValue(int)) );
+  connect( bigwidget, TQ_SIGNAL(newWidth(int)),
+	   TQ_SLOT(slotNewWidth(int)) );
+  connect( bigwidget, TQ_SIGNAL(newHeight(int)),
+	   TQ_SLOT(slotNewHeight(int)) );
 
   layout->addWidget(miniwidget, 0, 0);
   layout->addWidget(hruler, 0, 1);
@@ -101,38 +101,38 @@ KRulerTest::KRulerTest( const char *name )
   showTM->adjustSize();
   showTM->move(5,15);
   showTM->setChecked(true);
-  connect(showTM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetTinyMarks(bool)) );
+  connect(showTM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetTinyMarks(bool)) );
   showLM = new TQCheckBox("show little marks", showMarks);
   showLM->adjustSize();
   showLM->move(5,35);
   showLM->setChecked(true);
-  connect(showLM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetLittleMarks(bool)) );
+  connect(showLM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetLittleMarks(bool)) );
   showMM = new TQCheckBox("show medium marks", showMarks);
   showMM->adjustSize();
   showMM->move(5,55);
   showMM->setChecked(true);
-  connect(showMM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetMediumMarks(bool)) );
+  connect(showMM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetMediumMarks(bool)) );
   showBM = new TQCheckBox("show big marks", showMarks);
   showBM->adjustSize();
   showBM->move(5,75);
   showBM->setChecked(true);
-  connect(showBM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetBigMarks(bool)) );
+  connect(showBM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetBigMarks(bool)) );
   showEM = new TQCheckBox("show end marks", showMarks);
   showEM->adjustSize();
   showEM->move(5,95);
   showEM->setChecked(true);
-  connect(showEM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetEndMarks(bool)) );
+  connect(showEM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetEndMarks(bool)) );
   showPT = new TQCheckBox("show ruler pointer", showMarks);
   showPT->adjustSize();
   showPT->move(5,115);
   showPT->setChecked(true);
-  connect(showPT, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetRulerPointer(bool)) );
+  connect(showPT, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetRulerPointer(bool)) );
   fixLen = new TQCheckBox("fix ruler length", showMarks);
   fixLen->adjustSize();
   fixLen->move(5,135);
   fixLen->setChecked(true);
-  connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFixRulerLength(bool)) );
-  connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckLength(bool)) );
+  connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFixRulerLength(bool)) );
+  connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckLength(bool)) );
 
   lineEdit = new TQGroupBox("Value of begin/end", bigwidget);
   lineEdit->setFixedSize(140, 80);
@@ -141,26 +141,26 @@ KRulerTest::KRulerTest( const char *name )
   beginMark->setRange(-1000, 1000, 1, false);
   beginMark->move(5, 15);
   beginMark->setFixedSize(beginMark->sizeHint());
-  connect(beginMark, TQT_SIGNAL(valueChanged(int)), 
-	  hruler, TQT_SLOT(slotNewOffset(int)) );
-  connect(beginMark, TQT_SIGNAL(valueChanged(int)), 
-	  vruler, TQT_SLOT(slotNewOffset(int)) );
+  connect(beginMark, TQ_SIGNAL(valueChanged(int)), 
+	  hruler, TQ_SLOT(slotNewOffset(int)) );
+  connect(beginMark, TQ_SIGNAL(valueChanged(int)), 
+	  vruler, TQ_SLOT(slotNewOffset(int)) );
   endMark = new KIntNumInput(0, lineEdit);
   endMark->setRange(-1000, 1000, 1, false);
   endMark->move(5, 35);
   endMark->setFixedSize(endMark->sizeHint());
-  connect(endMark, TQT_SIGNAL(valueChanged(int)), 
-	  hruler, TQT_SLOT(slotEndOffset(int)) );
-  connect(endMark, TQT_SIGNAL(valueChanged(int)), 
-	  vruler, TQT_SLOT(slotEndOffset(int)) );
+  connect(endMark, TQ_SIGNAL(valueChanged(int)), 
+	  hruler, TQ_SLOT(slotEndOffset(int)) );
+  connect(endMark, TQ_SIGNAL(valueChanged(int)), 
+	  vruler, TQ_SLOT(slotEndOffset(int)) );
   lengthInput = new KIntNumInput(0, lineEdit);
   lengthInput->setRange(-1000, 1000, 1, false);
   lengthInput->move(5, 55);
   lengthInput->setFixedSize(lengthInput->sizeHint());
-  connect(lengthInput, TQT_SIGNAL(valueChanged(int)), 
-	  hruler, TQT_SLOT(slotEndOffset(int)) );
-  connect(lengthInput, TQT_SIGNAL(valueChanged(int)), 
-	  vruler, TQT_SLOT(slotEndOffset(int)) );
+  connect(lengthInput, TQ_SIGNAL(valueChanged(int)), 
+	  hruler, TQ_SLOT(slotEndOffset(int)) );
+  connect(lengthInput, TQ_SIGNAL(valueChanged(int)), 
+	  vruler, TQ_SLOT(slotEndOffset(int)) );
 
 
   vertrot = new TQGroupBox("Value of rotate translate for Vert.", bigwidget);
@@ -171,22 +171,22 @@ KRulerTest::KRulerTest( const char *name )
   transX->move(5, 15);
   transX->setFixedSize(transX->sizeHint());
   //transX->setLabel("transx", AlignLeft);
-  connect(transX, TQT_SIGNAL(valueChanged(double)), 
-	  TQT_SLOT(slotSetXTrans(double)) );
+  connect(transX, TQ_SIGNAL(valueChanged(double)), 
+	  TQ_SLOT(slotSetXTrans(double)) );
   transY = new KDoubleNumInput(-12.0, vertrot);
   transY->setRange(-1000, 1000, 1, false);
   transY->move(5, 35);
   transY->setFixedSize(transY->sizeHint());
   //transY->setLabel("transy", AlignLeft);
-  connect(transY, TQT_SIGNAL(valueChanged(double)), 
-	  TQT_SLOT(slotSetYTrans(double)) );
+  connect(transY, TQ_SIGNAL(valueChanged(double)), 
+	  TQ_SLOT(slotSetYTrans(double)) );
   rotV = new KDoubleNumInput(90.0, vertrot);
   rotV->setRange(-1000, 1000, 1, false);
   rotV->move(5, 55);
   rotV->setFixedSize(rotV->sizeHint());
   //rotV->setLabel("rot", AlignLeft);
-  connect(rotV, TQT_SIGNAL(valueChanged(double)), 
-	  TQT_SLOT(slotSetRotate(double)) );
+  connect(rotV, TQ_SIGNAL(valueChanged(double)), 
+	  TQ_SLOT(slotSetRotate(double)) );
   
 
   metricstyle = new TQButtonGroup("metric styles", bigwidget);
@@ -212,7 +212,7 @@ KRulerTest::KRulerTest( const char *name )
   mmetric->adjustSize();
   mmetric->move(5,95);
   metricstyle->insert(mmetric, (int)KRuler::Metres);
-  connect ( metricstyle, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSetMStyle(int)) );
+  connect ( metricstyle, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSetMStyle(int)) );
 
   setCentralWidget(mainframe);
 
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index 0175db3aa..1bcc5ade1 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -19,7 +19,7 @@ class TQGroupBox;
 
 class MouseWidget : public TQFrame
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 MouseWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 );
 
@@ -42,7 +42,7 @@ private:
 
 class KRulerTest : public TDEMainWindow
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 KRulerTest( const char *name = 0L );
 ~KRulerTest();
diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp
index 0a8c6d10c..a2bb2b6e8 100644
--- a/tdeui/tests/kstatusbartest.cpp
+++ b/tdeui/tests/kstatusbartest.cpp
@@ -23,7 +23,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     fileMenu = new TQPopupMenu;
     menuBar->insertItem ("&File", fileMenu);
     fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
-                          TQT_SLOT( quit() ), ALT + Key_Q );
+                          TQ_SLOT( quit() ), ALT + Key_Q );
     statusbar = new KStatusBar (this);
     statusbar->insertItem("Zoom: XXXX", 0);
     statusbar->insertItem("XXX", 1);
@@ -34,8 +34,8 @@ testWindow::testWindow (TQWidget *, const char *name)
     insert = true;
     statusbar->changeItem("Line: 13567", 2);
 
-    connect (statusbar, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(slotPress(int)));
-    connect (statusbar, TQT_SIGNAL(released(int)), this, TQT_SLOT(slotClick(int)));
+    connect (statusbar, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(slotPress(int)));
+    connect (statusbar, TQ_SIGNAL(released(int)), this, TQ_SLOT(slotClick(int)));
 
     widget = new TQMultiLineEdit (this);
 
@@ -53,7 +53,7 @@ testWindow::testWindow (TQWidget *, const char *name)
     smenu->insertItem("400%");
     smenu->insertItem("oo%");
 
-    connect (smenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenu(int)));
+    connect (smenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenu(int)));
 }
 
 void testWindow::slotClick(int id)
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 712f24352..d61f3b422 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -10,7 +10,7 @@ class TQMultiLineEdit;
 
 class testWindow  : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     testWindow (TQWidget *parent=0, const char *name=0);
diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp
index 05fe2aeb3..27229e436 100644
--- a/tdeui/tests/ktabctltest.cpp
+++ b/tdeui/tests/ktabctltest.cpp
@@ -43,10 +43,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name)
      */
     
     test = new KTabCtl(this, "test");
-    connect(test, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(tabChanged(int)));
+    connect(test, TQ_SIGNAL(tabSelected(int)), this, TQ_SLOT(tabChanged(int)));
     TQWidget *w = new TQWidget(test, "_page1");
     TQPushButton *bt = new TQPushButton("Click me to quit", w, "_bt1");
-    connect(bt, TQT_SIGNAL(clicked()), this, TQT_SLOT(okPressed()));
+    connect(bt, TQ_SIGNAL(clicked()), this, TQ_SLOT(okPressed()));
     bt->adjustSize();
     bt->move(20, 20);
     test->addTab(w, "Seite 1");
diff --git a/tdeui/tests/ktabctltest.h b/tdeui/tests/ktabctltest.h
index 6dd3b932a..fe327c4c1 100644
--- a/tdeui/tests/ktabctltest.h
+++ b/tdeui/tests/ktabctltest.h
@@ -12,7 +12,7 @@ class TQMultiLineEdit;
 
 class TopLevel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TopLevel( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp
index 64d2795fc..362df8558 100644
--- a/tdeui/tests/ktabwidgettest.cpp
+++ b/tdeui/tests/ktabwidgettest.cpp
@@ -21,21 +21,21 @@ Test::Test( TQWidget* parent, const char *name )
   mWidget->addTab( new TQLabel( "Testlabel 2", mWidget ), "Two" );
   mWidget->addTab( new TQWidget( mWidget), SmallIcon( "konsole" ), "Three" );
   mWidget->addTab( new TQWidget( mWidget), "Four" );
-  mWidget->setTabColor( mWidget->page(0), Qt::red );
-  mWidget->setTabColor( mWidget->page(1), Qt::blue );
-
-  connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) );
-  connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & )));
-  connect( mWidget, TQT_SIGNAL( contextMenu( const TQPoint & )), TQT_SLOT(tabbarContextMenu( const TQPoint & )));
-  connect( mWidget, TQT_SIGNAL( mouseDoubleClick( TQWidget * )), TQT_SLOT(mouseDoubleClick( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( mouseMiddleClick() ), TQT_SLOT(addTab() ));
-  connect( mWidget, TQT_SIGNAL( mouseMiddleClick( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SLOT(testCanDecode(const TQDragMoveEvent *, bool & )));
-  connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQDropEvent * )));
-  connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * )));
-  connect( mWidget, TQT_SIGNAL( initiateDrag( TQWidget * )), TQT_SLOT(initiateDrag( TQWidget * )));
-  connect( mWidget, TQT_SIGNAL( movedTab( int, int )), TQT_SLOT(movedTab( int, int )));
+  mWidget->setTabColor( mWidget->page(0), TQt::red );
+  mWidget->setTabColor( mWidget->page(1), TQt::blue );
+
+  connect( mWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), TQ_SLOT( currentChanged( TQWidget * ) ) );
+  connect( mWidget, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQ_SLOT(contextMenu( TQWidget *, const TQPoint & )));
+  connect( mWidget, TQ_SIGNAL( contextMenu( const TQPoint & )), TQ_SLOT(tabbarContextMenu( const TQPoint & )));
+  connect( mWidget, TQ_SIGNAL( mouseDoubleClick( TQWidget * )), TQ_SLOT(mouseDoubleClick( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( mouseMiddleClick() ), TQ_SLOT(addTab() ));
+  connect( mWidget, TQ_SIGNAL( mouseMiddleClick( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SLOT(testCanDecode(const TQDragMoveEvent *, bool & )));
+  connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQDropEvent * )));
+  connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * )));
+  connect( mWidget, TQ_SIGNAL( initiateDrag( TQWidget * )), TQ_SLOT(initiateDrag( TQWidget * )));
+  connect( mWidget, TQ_SIGNAL( movedTab( int, int )), TQ_SLOT(movedTab( int, int )));
   mWidget->setTabReorderingEnabled( true );
 
   TQWidget * grid = new TQWidget(this);
@@ -43,53 +43,53 @@ Test::Test( TQWidget* parent, const char *name )
 
   TQPushButton * addTab = new TQPushButton( "Add Tab", grid );
   gridlayout->addWidget( addTab, 0, 0 );
-  connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) );
+  connect( addTab, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) );
 
   TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid );
   gridlayout->addWidget( removeTab, 0, 1 );
-  connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) );
+  connect( removeTab, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) );
 
   mLeftButton = new TQCheckBox( "Show left button", grid );
   gridlayout->addWidget( mLeftButton, 1, 0 );
-  connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) );
+  connect( mLeftButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftButton(bool) ) );
   mLeftButton->setChecked(true);
 
   TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid );
   gridlayout->addWidget( leftPopup, 2, 0 );
-  connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) );
+  connect( leftPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftPopup(bool) ) );
   leftPopup->setChecked(true);
 
   mRightButton = new TQCheckBox( "Show right button", grid );
   gridlayout->addWidget( mRightButton, 1, 1 );
-  connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) );
+  connect( mRightButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightButton(bool) ) );
   mRightButton->setChecked(true);
 
   TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid );
   gridlayout->addWidget( rightPopup, 2, 1 );
-  connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) );
+  connect( rightPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightPopup(bool) ) );
   rightPopup->setChecked(true);
 
   mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid );
   gridlayout->addWidget( mTabsBottom, 3, 0 );
-  connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) );
+  connect( mTabsBottom, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabPosition(bool) ) );
 
   TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid );
   gridlayout->addWidget( tabshape, 3, 1 );
-  connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) );
+  connect( tabshape, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabShape(bool) ) );
 
   TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid );
   gridlayout->addWidget( tabClose, 4, 0 );
-  connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) );
+  connect( tabClose, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleCloseButtons(bool) ) );
   tabClose->setChecked(true);
 
   TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid );
   gridlayout->addWidget( showlabels, 4, 1 );
-  connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) );
+  connect( showlabels, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toggleLabels(bool) ) );
 }
 
 void Test::currentChanged(TQWidget* w)
 {
-  mWidget->setTabColor( w, Qt::black );
+  mWidget->setTabColor( w, TQt::black );
 }
 
 void Test::addTab()
@@ -137,7 +137,7 @@ void Test::toggleLeftButton(bool state)
   if (state) {
     if (!mLeftWidget) {
       mLeftWidget = new TQToolButton( mWidget );
-      connect( mLeftWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) );
+      connect( mLeftWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) );
       mLeftWidget->setIconSet( SmallIcon( "tab_new" ) );
       mLeftWidget->setTextLabel("New");
       mLeftWidget->setTextPosition(TQToolButton::Right);
@@ -162,7 +162,7 @@ void Test::toggleLeftPopup(bool state)
       mLeftPopup->insertSeparator();
       mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Button Tab", 1);
       mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Label Tab", 2);
-      connect(mLeftPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(leftPopupActivated(int)));
+      connect(mLeftPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(leftPopupActivated(int)));
     }
     mLeftWidget->setPopup(mLeftPopup);
   }
@@ -188,7 +188,7 @@ void Test::toggleRightButton(bool state)
 if (state) {
     if ( !mRightWidget) {
       mRightWidget = new TQToolButton( mWidget );
-      TQObject::connect( mRightWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) );
+      TQObject::connect( mRightWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) );
       mRightWidget->setIconSet( SmallIcon( "tab_remove" ) );
       mRightWidget->setTextLabel("Close");
       mRightWidget->setTextPosition(TQToolButton::Right);
@@ -212,7 +212,7 @@ void Test::toggleRightPopup(bool state)
       mRightPopup->insertSeparator();
       mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Left Tab", 0);
       mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Right Tab", 2);
-      connect(mRightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(rightPopupActivated(int)));
+      connect(mRightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(rightPopupActivated(int)));
     }
     mRightWidget->setPopup(mRightPopup);
   }
@@ -264,7 +264,7 @@ void Test::contextMenu(TQWidget *w, const TQPoint &p)
   mContextPopup->insertSeparator();
   mContextPopup->insertItem( mWidget->isTabEnabled(w) ? "Disable Tab" : "Enable Tab", 2);
   mContextPopup->insertItem( mWidget->tabToolTip(w).isEmpty() ? "Set Tooltip" : "Remove Tooltip", 3);
-  connect(mContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+  connect(mContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
 
   mContextWidget = w;
   mContextPopup->popup(p);
@@ -300,7 +300,7 @@ void Test::tabbarContextMenu(const TQPoint &p)
   mTabbarContextPopup->insertItem(SmallIcon( "tab_remove" ), mRightWidget->isVisible() ? "Hide \"Remove\" Button" : "Show \"Remove\" Button", 1);
   mTabbarContextPopup->insertSeparator();
   mTabbarContextPopup->insertItem(mWidget->tabPosition()==TQTabWidget::Top ? "Put Tabbar to Bottom" : "Put Tabbar to Top", 2);
-  connect(mTabbarContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(tabbarContextMenuActivated(int)));
+  connect(mTabbarContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(tabbarContextMenuActivated(int)));
 
   mTabbarContextPopup->popup(p);
 }
@@ -326,7 +326,7 @@ void Test::mouseDoubleClick(TQWidget *w)
             mWidget->label( mWidget->indexOf( w ) ), &ok, this );
   if ( ok && !text.isEmpty() ) {
      mWidget->changeTab( w, text );
-     mWidget->setTabColor( w, Qt::green );
+     mWidget->setTabColor( w, TQt::green );
   }
 }
 
diff --git a/tdeui/tests/ktabwidgettest.h b/tdeui/tests/ktabwidgettest.h
index 7c178bd32..eba95ef7b 100644
--- a/tdeui/tests/ktabwidgettest.h
+++ b/tdeui/tests/ktabwidgettest.h
@@ -15,7 +15,7 @@
 
 class Test : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Test( TQWidget* parent=0, const char *name =0 );
 
diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp
index 40904000b..839a9c71a 100644
--- a/tdeui/tests/kunbalancedgrdtest.cpp
+++ b/tdeui/tests/kunbalancedgrdtest.cpp
@@ -20,13 +20,13 @@ void KGradientWidget::paintEvent(TQPaintEvent *)
     int it, ft;
     TQString say;
 
-    TQColor ca = Qt::black, cb = Qt::cyan;
+    TQColor ca = TQt::black, cb = TQt::cyan;
 
     int x = 0, y = 0;
 
     pix.resize(width()/cols, height()/rows);
     TQPainter p(this);
-    p.setPen(Qt::white);
+    p.setPen(TQt::white);
 
     // draw once, so that the benchmarking be fair :-)
     KPixmapEffect::unbalancedGradient(pix,ca, cb,
@@ -138,8 +138,8 @@ myTopWidget::myTopWidget (TQWidget *parent, const char *name)
   ySlider = new TQSlider ( -200, 200, 1, 100, TQSlider::Horizontal, this);
   lay->addWidget(ySlider, 1, 2);
 
-  connect(xSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance()));
-  connect(ySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance()));
+  connect(xSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance()));
+  connect(ySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance()));
 
   rebalance();
 
diff --git a/tdeui/tests/kunbalancedgrdtest.h b/tdeui/tests/kunbalancedgrdtest.h
index 8b7893772..db4c99f80 100644
--- a/tdeui/tests/kunbalancedgrdtest.h
+++ b/tdeui/tests/kunbalancedgrdtest.h
@@ -30,7 +30,7 @@ private:
 
 class myTopWidget: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   myTopWidget(TQWidget *parent=0, const char *name=0);
   
diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp
index 0635188d0..591e71d7e 100644
--- a/tdeui/tests/kwizardtest.cpp
+++ b/tdeui/tests/kwizardtest.cpp
@@ -27,17 +27,17 @@ int main(int argc, char **argv)
 {
   TDEApplication a(argc,argv,"kwizardtest");
   KWizard *wiz = new KWizard(0, "kwizardtest", false);
-  TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()),
-		   &a, TQT_SLOT(quit()));
-  TQObject::connect((TQObject*) wiz->finishButton(), TQT_SIGNAL(clicked()),
-		   &a, TQT_SLOT(quit()));
+  TQObject::connect((TQObject*) wiz->cancelButton(), TQ_SIGNAL(clicked()),
+		   &a, TQ_SLOT(quit()));
+  TQObject::connect((TQObject*) wiz->finishButton(), TQ_SIGNAL(clicked()),
+		   &a, TQ_SLOT(quit()));
   for(int i = 1; i < 11; i++)
   {
     TQWidget *p = new TQWidget;
     TQString msg = TQString("This is page %1 out of 10").arg(i);
     TQLabel *label = new TQLabel(msg, p);
     TQHBoxLayout *layout = new TQHBoxLayout(p, 5);
-    label->setAlignment(Qt::AlignCenter);
+    label->setAlignment(TQt::AlignCenter);
     label->setFixedSize(300, 200);
     layout->addWidget(label);
     TQString title = TQString("%1. page").arg(i);
diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp
index b72e9dc68..d32593094 100644
--- a/tdeui/tests/kxmlguitest.cpp
+++ b/tdeui/tests/kxmlguitest.cpp
@@ -48,7 +48,7 @@ int main( int argc, char **argv )
     Client *part = new Client;
 
     (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" );
-    (void)new TDEAction( "sec", "unlock", Qt::ALT + Qt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" );
+    (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQ_SLOT( slotSec() ), part->actionCollection(), "security" );
 
     part->setXMLFile( "./kxmlguitest_part.rc" );
 
diff --git a/tdeui/tests/kxmlguitest.h b/tdeui/tests/kxmlguitest.h
index bc88711f7..9d1789301 100644
--- a/tdeui/tests/kxmlguitest.h
+++ b/tdeui/tests/kxmlguitest.h
@@ -6,7 +6,7 @@
 
 class Client : public TQObject, public KXMLGUIClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Client() {}
 
diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp
index 4965e5487..fe6c9aef9 100644
--- a/tdeui/tests/qxembedtest.cpp
+++ b/tdeui/tests/qxembedtest.cpp
@@ -25,10 +25,10 @@ main(int argc, char**argv)
 
   TQApplication a(argc,argv);
 
-  TQWidget *main = new TQVBox(NULL,"main",Qt::WDestructiveClose);
+  TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose);
   TQWidget *top = new TQHBox(main);
   TQPushButton *quit = new TQPushButton("Quit", top);
-  TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) );
+  TQObject::connect( quit, TQ_SIGNAL(clicked()), main, TQ_SLOT(close()) );
   TQLineEdit *edit = new TQLineEdit(top);
   edit->setText( "Just to see focus changes");
   QXEmbed *embed = new QXEmbed(main);
diff --git a/tdeui/tests/tdeactiontest.cpp b/tdeui/tests/tdeactiontest.cpp
index e892bb306..676872e96 100644
--- a/tdeui/tests/tdeactiontest.cpp
+++ b/tdeui/tests/tdeactiontest.cpp
@@ -10,7 +10,7 @@ int main( int argc, char **argv )
 {
     TDEApplication app( argc, argv, "tdeactiontest" );
 
-    TDEActionCollection coll( static_cast<TQObject *>( 0 ) );
+    TDEActionCollection coll(  0  );
 
     TQGuardedPtr<TDEAction> action1 = new TDERadioAction("test",0, &coll);
     TQGuardedPtr<TDEAction> action2 = new TDERadioAction("test",0, &coll);
diff --git a/tdeui/tests/tdemainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h
index d0279cdae..5e6531dbb 100644
--- a/tdeui/tests/tdemainwindowrestoretest.h
+++ b/tdeui/tests/tdemainwindowrestoretest.h
@@ -4,42 +4,42 @@
 #include <tdemainwindow.h>
 
 class MainWin1 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin1() : TDEMainWindow() {}
   virtual ~MainWin1() {}
 };
 
 class MainWin2 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin2() : TDEMainWindow() {}
   virtual ~MainWin2() {}
 };
 
 class MainWin3 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin3() : TDEMainWindow() {}
   virtual ~MainWin3() {}
 };
 
 class MainWin4 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin4() : TDEMainWindow() {}
   virtual ~MainWin4() {}
 };
 
 class MainWin5 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin5() : TDEMainWindow() {}
   virtual ~MainWin5() {}
 };
 
 class MainWin6 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin6() : TDEMainWindow() {}
   virtual ~MainWin6() {}
diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp
index bf92dc11c..ffaaa8862 100644
--- a/tdeui/tests/tdemainwindowtest.cpp
+++ b/tdeui/tests/tdemainwindowtest.cpp
@@ -9,7 +9,7 @@
 
 MainWindow::MainWindow()
 {
-    TQTimer::singleShot( 2*1000, this, TQT_SLOT( showMessage() ) );
+    TQTimer::singleShot( 2*1000, this, TQ_SLOT( showMessage() ) );
 
     setCentralWidget( new TQLabel( "foo", this ) );
 
diff --git a/tdeui/tests/tdemainwindowtest.h b/tdeui/tests/tdemainwindowtest.h
index 5512c7f9f..3bf613aaf 100644
--- a/tdeui/tests/tdemainwindowtest.h
+++ b/tdeui/tests/tdemainwindowtest.h
@@ -5,7 +5,7 @@
 
 class MainWindow : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWindow();
 
diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp
index f9a97bad4..637031443 100644
--- a/tdeui/tests/tdepopuptest.cpp
+++ b/tdeui/tests/tdepopuptest.cpp
@@ -24,7 +24,7 @@ public:
         menu->insertItem("Item1");
         menu->insertItem("Item2");
         menu->insertSeparator();
-        menu->insertItem("Quit", tqApp, TQT_SLOT(quit()));
+        menu->insertItem("Quit", tqApp, TQ_SLOT(quit()));
     }       
 };
 
diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp
index f826f13b0..8fd5170e0 100644
--- a/tdeui/tests/twindowtest.cpp
+++ b/tdeui/tests/twindowtest.cpp
@@ -56,13 +56,13 @@ setAutoSaveSettings();
     // We insert item "Exit" with accelerator ALT-Q, and connect
     // it to application's exit-slot.
     fileMenu->insertItem ("&Exit", TDEApplication::kApplication(),
-                          TQT_SLOT( quit() ), ALT + Key_Q );
+                          TQ_SLOT( quit() ), ALT + Key_Q );
 
     // Another popup...
     toolBarMenu = new TQPopupMenu;
     menuBar->insertItem ("&Toolbars", toolBarMenu);
-    toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQT_SLOT(slotHide1()));
-    toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQT_SLOT(slotHide2()));
+    toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQ_SLOT(slotHide1()));
+    toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQ_SLOT(slotHide2()));
 
     itemsMenu = new TQPopupMenu;
     menuBar->insertItem ("&Items", itemsMenu);
@@ -71,15 +71,15 @@ setAutoSaveSettings();
     lineL = true;   // Lined is enabled
     greenF = false;  // Frame not inserted
     
-    itemsMenu->insertItem ("delete/insert exit button", this, TQT_SLOT(slotExit()));
-    itemsMenu->insertItem ("insert/delete green frame!", this, TQT_SLOT(slotFrame()));
-    itemsMenu->insertItem ("enable/disable Lined", this, TQT_SLOT(slotLined()));
-    itemsMenu->insertItem ("Toggle fileNew", this, TQT_SLOT(slotNew()));
-    itemsMenu->insertItem ("Clear comboBox", this, TQT_SLOT(slotClearCombo()));
-    itemsMenu->insertItem ("Insert List in Combo", this, TQT_SLOT(slotInsertListInCombo()));
-    itemsMenu->insertItem ("Make item 3 curent", this, TQT_SLOT(slotMakeItem3Current()));
-    //itemsMenu->insertItem ("Insert clock!", this, TQT_SLOT(slotInsertClock()));
-    itemsMenu->insertItem ("Important!", this, TQT_SLOT(slotImportant()));
+    itemsMenu->insertItem ("delete/insert exit button", this, TQ_SLOT(slotExit()));
+    itemsMenu->insertItem ("insert/delete green frame!", this, TQ_SLOT(slotFrame()));
+    itemsMenu->insertItem ("enable/disable Lined", this, TQ_SLOT(slotLined()));
+    itemsMenu->insertItem ("Toggle fileNew", this, TQ_SLOT(slotNew()));
+    itemsMenu->insertItem ("Clear comboBox", this, TQ_SLOT(slotClearCombo()));
+    itemsMenu->insertItem ("Insert List in Combo", this, TQ_SLOT(slotInsertListInCombo()));
+    itemsMenu->insertItem ("Make item 3 curent", this, TQ_SLOT(slotMakeItem3Current()));
+    //itemsMenu->insertItem ("Insert clock!", this, TQ_SLOT(slotInsertClock()));
+    itemsMenu->insertItem ("Important!", this, TQ_SLOT(slotImportant()));
 
     menuBar->insertSeparator();
     helpMenu = new KHelpMenu(this, "KWindowTest was programmed by Sven Radej");
@@ -113,30 +113,30 @@ setAutoSaveSettings();
     
     // First four  buttons
     pix = BarIcon("document-new");
-    itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()),
+    itemId = tb->insertButton(pix, 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()),
                          true, "Create.. (toggles upper button)", 50);
     pix = BarIcon("document-open");
-    tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
+    tb->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()),
                          false, "Open");
     pix = BarIcon("filefloppy");
-    tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()),
+    tb->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()),
                           true, "Save (beep or delayed popup)");
     tb->setDelayedPopup(2, itemsMenu);
     pix = BarIcon("document-print");
-    tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()),
+    tb->insertButton(pix, 3, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrint()),
                          true, "Print (enables/disables open)");
 
     // And a combobox
     // arguments: text (or strList), ID, writable, signal, object, slot, enabled,
     //            tooltiptext, size
-    tb->insertCombo (TQString("one"), 4, true, TQT_SIGNAL(activated(const TQString&)), this,
-                          TQT_SLOT(slotList(const TQString&)), true, "ComboBox", 150);
+    tb->insertCombo (TQString("one"), 4, true, TQ_SIGNAL(activated(const TQString&)), this,
+                          TQ_SLOT(slotList(const TQString&)), true, "ComboBox", 150);
 
 
     // Then one line editor
     // arguments: text, id, signal, object (this), slot, enabled, tooltiptext, size
-    tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQT_SIGNAL(returnPressed()), this,
-                          TQT_SLOT(slotReturn()), true, "Location", 200);
+    tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQ_SIGNAL(returnPressed()), this,
+                          TQ_SLOT(slotReturn()), true, "Location", 200);
 
     // Set this Lined to auto size itself. Note that only one item (Lined or Combo)
     // Can be set to autosize; If you specify more of them only last (according to
@@ -148,8 +148,8 @@ setAutoSaveSettings();
 
     // Now add another button and align it right
     pix = BarIcon("system-log-out");
-    tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
-                          TQT_SLOT( quit() ), true, "Exit");
+    tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+                          TQ_SLOT( quit() ), true, "Exit");
     tb->alignItemRight (6);
 
     // Another toolbar
@@ -159,16 +159,16 @@ setAutoSaveSettings();
     pix = BarIcon("document-new");
     tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)");
     tb1->setToggle(0);
-    tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool)));
+    tb1->addConnection (0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggle(bool)));
 
     pix = BarIcon("document-open");
-    tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()),
+    tb1->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()),
                           true, "Open (starts progres in sb)");
 
     tb1->insertSeparator ();
     
     pix = BarIcon("filefloppy");
-    tb1->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()),
+    tb1->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()),
                       true, "Save file2 (autorepeat)");
     tb1->setAutoRepeat(2);
     
@@ -201,7 +201,7 @@ setAutoSaveSettings();
     rg->addButton(6);
     rg->addButton(7);
 
-    connect (tb1, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int)));
+    connect (tb1, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int)));
     
     // Set caption for floating toolbars
     tb->setTitle ("Toolbar 1");
@@ -216,8 +216,8 @@ setAutoSaveSettings();
     //addToolBar (tb1);
     //addToolBar (tb);
 
-    connect (tb, TQT_SIGNAL(highlighted(int,bool)), this, TQT_SLOT(slotMessage(int, bool)));
-    connect (tb1, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SLOT(slotMessage(int, bool)));
+    connect (tb, TQ_SIGNAL(highlighted(int,bool)), this, TQ_SLOT(slotMessage(int, bool)));
+    connect (tb1, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SLOT(slotMessage(int, bool)));
 
     // Floating is enabled by default, so you don't need this.
     // tb->enableFloating(true);
@@ -243,7 +243,7 @@ setAutoSaveSettings();
     completions->insertItem("/home/");
     completions->insertItem("/vmlinuz :-)");
 
-    connect (completions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCompletionsMenu(int)));
+    connect (completions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotCompletionsMenu(int)));
     pr = 0;
 }
 /***********************************/
@@ -273,7 +273,7 @@ void testWindow::slotOpen()
 //  statusBar->message(pr);
   timer = new TQTimer (pr);
 
-  connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGoGoGoo()));
+  connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGoGoGoo()));
   timer->start(100);
 }
 
@@ -408,8 +408,8 @@ void testWindow::slotExit ()
    {
      TQPixmap pix;
      pix = BarIcon("system-log-out");
-     tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(),
-                           TQT_SLOT( quit() ), true, "Exit");
+     tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(),
+                           TQ_SLOT( quit() ), true, "Exit");
      tb->alignItemRight (6);
      exitB = true;
    }
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index d1d9d460e..12cc0f297 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -15,7 +15,7 @@ class KHelpMenu;
 
 class testWindow  : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     testWindow (TQWidget *parent=0, const char *name=0);
diff --git a/tdeui/twindowinfo.cpp b/tdeui/twindowinfo.cpp
index 436aa5227..ec1a448c5 100644
--- a/tdeui/twindowinfo.cpp
+++ b/tdeui/twindowinfo.cpp
@@ -67,12 +67,12 @@ void KWindowInfo::message( const TQString &text, const TQPixmap &pix, int timeou
     if ( timeout < 0 )
 	timeout = DEFAULT_MESSAGE_TIMEOUT;
     if ( timeout != 0 )
-	TQTimer::singleShot( timeout, this, TQT_SLOT( restore() ) );
+	TQTimer::singleShot( timeout, this, TQ_SLOT( restore() ) );
 }
 
 void KWindowInfo::permanent( const TQString &text )
 {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     oldMiniIcon = KWin::icon( win->winId(), 16, 16, true );
     oldIcon = KWin::icon( win->winId(), 34, 34, false );
     if ( oldIcon.isNull() )
@@ -85,7 +85,7 @@ void KWindowInfo::permanent( const TQString &text )
 void KWindowInfo::permanent( const TQString &text, const TQPixmap &pix )
 {
     if ( !oldText.isNull() ) {
-	TQObjectList *l = queryList( TQTIMER_OBJECT_NAME_STRING );
+	TQObjectList *l = queryList( "TQTimer" );
 	TQObjectListIt it( *l );
 	TQObject *obj;
 
@@ -117,7 +117,7 @@ void KWindowInfo::display( const TQString &text, const TQPixmap &pix )
 
     win->setCaption( text );
     win->setIcon( icon );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons( win->winId(), icon, icon );
 #endif
 }
@@ -135,7 +135,7 @@ void KWindowInfo::save()
     }
 
     oldText = win->caption();
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     oldMiniIcon = KWin::icon( win->winId(), 16, 16, true );
     oldIcon = KWin::icon( win->winId(), 34, 34, false );
     if ( oldIcon.isNull() )
@@ -162,7 +162,7 @@ void KWindowInfo::restore()
     }
 
     win->setIcon( oldIcon );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     KWin::setIcons( win->winId(), oldIcon, oldMiniIcon );
 #endif
     win->setCaption( oldText );
diff --git a/tdeui/twindowinfo.h b/tdeui/twindowinfo.h
index d15942b47..26a274aa1 100644
--- a/tdeui/twindowinfo.h
+++ b/tdeui/twindowinfo.h
@@ -38,7 +38,7 @@
 */
 class TDEUI_EXPORT KWindowInfo : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp
index bc2df2f66..0e070f79b 100644
--- a/tdeui/twindowlistmenu.cpp
+++ b/tdeui/twindowlistmenu.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqglobal.h>
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 
 #include "config.h"
 #include <tqpainter.h>
@@ -85,9 +85,9 @@ int NameSortedInfoList::compareItems( TQPtrCollection::Item s1, TQPtrCollection:
 KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name)
   : TDEPopupMenu(parent, name)
 {
-    twin_module = new KWinModule(TQT_TQOBJECT(this));
+    twin_module = new KWinModule(this);
 
-    connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int)));
+    connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int)));
 }
 
 KWindowListMenu::~KWindowListMenu()
@@ -127,9 +127,9 @@ void KWindowListMenu::init()
     map.clear();
 
     int unclutter = insertItem( i18n("Unclutter Windows"),
-                                this, TQT_SLOT( slotUnclutterWindows() ) );
+                                this, TQ_SLOT( slotUnclutterWindows() ) );
     int cascade = insertItem( i18n("Cascade Windows"),
-                              this, TQT_SLOT( slotCascadeWindows() ) );
+                              this, TQ_SLOT( slotCascadeWindows() ) );
 
     // if we only have one desktop we won't be showing titles, so put a separator in
     if (nd == 1)
@@ -253,5 +253,5 @@ void KWindowListMenu::slotCascadeWindows()
 void KWindowListMenu::virtual_hook( int id, void* data )
 { TDEPopupMenu::virtual_hook( id, data ); }
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
diff --git a/tdeui/twindowlistmenu.h b/tdeui/twindowlistmenu.h
index 20da236f1..0e7884e39 100644
--- a/tdeui/twindowlistmenu.h
+++ b/tdeui/twindowlistmenu.h
@@ -28,18 +28,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdepopupmenu.h>
 #include <tqmap.h>
 
-#ifdef Q_MOC_RUN
-#define Q_WS_X11
-#endif // Q_MOC_RUN
-
-#ifdef Q_WS_X11 // not yet available for non-X11
+#ifdef TQ_WS_X11 // not yet available for non-X11
 
 class KWinModule;
 class KWindowListMenuPrivate;
 
 class TDEUI_EXPORT KWindowListMenu : public TDEPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KWindowListMenu( TQWidget *parent = 0, const char *name = 0 );
@@ -69,6 +65,6 @@ private:
     KWindowListMenuPrivate *d;
 };
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 #endif
diff --git a/tdeunittest/runner.h b/tdeunittest/runner.h
index 76c662bb7..cff4ac718 100644
--- a/tdeunittest/runner.h
+++ b/tdeunittest/runner.h
@@ -96,7 +96,7 @@ namespace KUnitTest
      */
     class TDEUNITTEST_EXPORT Runner : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     
     public:
         /*! Registers a test case. A registry will be automatically created if necessary.
diff --git a/tdeunittest/tester.cpp b/tdeunittest/tester.cpp
index 11a24e653..d168280be 100644
--- a/tdeunittest/tester.cpp
+++ b/tdeunittest/tester.cpp
@@ -40,10 +40,10 @@ namespace KUnitTest
 
     void SlotTester::invokeMember(const TQString &str)
     {
-        TQString slotname = TQString::number(TQSLOT_CODE) + str;
-        connect(this, TQT_SIGNAL(invoke()), this, slotname.ascii());
+        TQString slotname = TQString::number(TQ_SLOT_CODE) + str;
+        connect(this, TQ_SIGNAL(invoke()), this, slotname.ascii());
         emit invoke();
-        disconnect(this, TQT_SIGNAL(invoke()), this, slotname.ascii());
+        disconnect(this, TQ_SIGNAL(invoke()), this, slotname.ascii());
     }
     
     void SlotTester::allTests()
diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h
index 3f0e45acf..07d65ce56 100644
--- a/tdeunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -685,7 +685,7 @@ namespace KUnitTest
      */
     class TDEUNITTEST_EXPORT SlotTester : public Tester
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         SlotTester(const char *name = 0L);
diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 742e78eef..3d4fd5556 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -89,11 +89,11 @@ KCMultiDialog::KCMultiDialog( int dialogFace, const KGuiItem &user2,
 
 inline void KCMultiDialog::init()
 {
-    connect( this, TQT_SIGNAL( finished()), TQT_SLOT( dialogClosed()));
+    connect( this, TQ_SIGNAL( finished()), TQ_SLOT( dialogClosed()));
     showButton( User1, false );
     showButton( User2, false );
     enableButton(Apply, false);
-    connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *)));
+    connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *)));
     setInitialSize(TQSize(640,480));
     moduleParentComponents.setAutoDelete( true );
 
@@ -310,7 +310,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo,
         moduleParentComponents.insert( module,
                 new TQStringList( parentComponents ) );
 
-        connect(module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool)));
+        connect(module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
 
         if( m_modules.count() == 0 )
             aboutToShowPage( page );
@@ -338,7 +338,7 @@ void KCMultiDialog::removeAllModules()
     {
         kdDebug( 710 ) << "remove 2" << endl;
         TDECModuleProxy * kcm = ( *it ).kcm;
-        TQObject * page = TQT_TQOBJECT(kcm->parent());
+        TQObject * page = kcm->parent();
         kcm->hide();
         if( page )
         {
@@ -368,7 +368,7 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page)
     if( ! obj )
         return;
 
-    TDECModuleProxy * module = ::tqqt_cast<TDECModuleProxy*>(obj);
+    TDECModuleProxy * module = ::tqt_cast<TDECModuleProxy*>(obj);
     if( ! module )
         return;
     d->currentModule = module;
@@ -378,15 +378,15 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page)
     enableButton( KDialogBase::Default,
             d->currentModule->buttons() & TDECModule::Default );
 
-    disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 );
+    disconnect( this, TQ_SIGNAL(user2Clicked()), 0, 0 );
 
     if (d->currentModule->moduleInfo().needsRootPrivileges())
     {
         if ( !d->currentModule->rootMode() )
             { /* Enable the Admin Mode button */
             enableButton( User2, true );
-            connect( this, TQT_SIGNAL(user2Clicked()), d->currentModule, TQT_SLOT( runAsRoot() ));
-            connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT( disableRModeButton() ));
+            connect( this, TQ_SIGNAL(user2Clicked()), d->currentModule, TQ_SLOT( runAsRoot() ));
+            connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT( disableRModeButton() ));
         }
         else
             enableButton( User2, false);
@@ -401,7 +401,7 @@ void KCMultiDialog::rootExit()
 void KCMultiDialog::disableRModeButton()
 {
     enableButton( User2, false );
-    connect ( d->currentModule, TQT_SIGNAL( childClosed() ), TQT_SLOT( rootExit() ));
+    connect ( d->currentModule, TQ_SIGNAL( childClosed() ), TQ_SLOT( rootExit() ));
 }
 
 void KCMultiDialog::dialogClosed()
diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 8f30603e6..89aedf0a5 100644
--- a/tdeutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -42,7 +42,7 @@ class TDECModuleInfo;
  */
 class TDEUTILS_EXPORT KCMultiDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp
index 74fb46e9a..f306fa254 100644
--- a/tdeutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
@@ -212,8 +212,8 @@ KDialogBase* KFind::findNextDialog( bool create )
     if ( !m_dialog && create )
     {
         m_dialog = new KFindNextDialog( m_pattern, parentWidget() );
-        connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) );
-        connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) );
+        connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotFindNext() ) );
+        connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) );
     }
     return m_dialog;
 }
diff --git a/tdeutils/kfind.h b/tdeutils/kfind.h
index 054eeb259..c71f2a41e 100644
--- a/tdeutils/kfind.h
+++ b/tdeutils/kfind.h
@@ -50,11 +50,11 @@
  *
  *  // Connect highlight signal to code which handles highlighting
  *  // of found text.
- *  connect( m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
- *          this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
+ *  connect( m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ),
+ *          this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) );
  *  // Connect findNext signal - called when pressing the button in the dialog
- *  connect( m_find, TQT_SIGNAL( findNext() ),
- *          this, TQT_SLOT( slotFindNext() ) );
+ *  connect( m_find, TQ_SIGNAL( findNext() ),
+ *          this, TQ_SLOT( slotFindNext() ) );
  * \endcode
  *
  * If you are using a non-modal find dialog (the recommended new way
@@ -103,7 +103,7 @@
 class TDEUTILS_EXPORT KFind :
     public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index 31e502eb6..529043a16 100644
--- a/tdeutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -116,7 +116,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
     topLayout->setSpacing( KDialog::spacingHint() );
     topLayout->setMargin( 0 );
 
-    m_findGrp = new TQGroupBox(0, Qt::Vertical, i18n("Find"), page);
+    m_findGrp = new TQGroupBox(0, TQt::Vertical, i18n("Find"), page);
     m_findGrp->layout()->setSpacing( KDialog::spacingHint() );
    // m_findGrp->layout()->setMargin( KDialog::marginHint() );
     m_findLayout = new TQGridLayout(m_findGrp->layout());
@@ -137,7 +137,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
     m_findLayout->addWidget(m_regExpItem, 2, 1);
     topLayout->addWidget(m_findGrp);
 
-    m_replaceGrp = new TQGroupBox(0, Qt::Vertical, i18n("Replace With"), page);
+    m_replaceGrp = new TQGroupBox(0, TQt::Vertical, i18n("Replace With"), page);
     m_replaceGrp->layout()->setSpacing( KDialog::spacingHint() );
   //  m_replaceGrp->layout()->setMargin( KDialog::marginHint() );
     m_replaceLayout = new TQGridLayout(m_replaceGrp->layout());
@@ -159,7 +159,7 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
     m_replaceLayout->addWidget(m_backRefItem, 2, 1);
     topLayout->addWidget(m_replaceGrp);
 
-    m_optionGrp = new TQGroupBox(0, Qt::Vertical, i18n("Options"), page);
+    m_optionGrp = new TQGroupBox(0, TQt::Vertical, i18n("Options"), page);
     m_optionGrp->layout()->setSpacing(KDialog::spacingHint());
   //  m_optionGrp->layout()->setMargin(KDialog::marginHint());
     optionsLayout = new TQGridLayout(m_optionGrp->layout());
@@ -193,13 +193,13 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha
     m_placeholders = 0L;
 
     // signals and slots connections
-    connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool)));
-    connect(m_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool)));
-    connect(m_backRef, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlaceholdersCheckBoxToggled(bool)));
-    connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns()));
-    connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders()));
+    connect(m_selectedText, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectedTextToggled(bool)));
+    connect(m_regExp, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRegexCheckBoxToggled(bool)));
+    connect(m_backRef, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPlaceholdersCheckBoxToggled(bool)));
+    connect(m_regExpItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPatterns()));
+    connect(m_backRefItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPlaceholders()));
 
-    connect(m_find, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(textSearchChanged( const TQString & )));
+    connect(m_find, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(textSearchChanged( const TQString & )));
 
     // tab order
     setTabOrder(m_find, m_regExp);
@@ -439,13 +439,13 @@ void KFindDialog::showPatterns()
 {
     if ( !d->m_regexpDialogQueryDone )
     {
-        d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) );
+        d->m_regexpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this );
         d->m_regexpDialogQueryDone = true;
     }
 
     if ( d->m_regexpDialog )
     {
-        KRegExpEditorInterface *iface = tqt_dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog );
+        KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( d->m_regexpDialog );
         assert( iface );
 
         iface->setRegExp( pattern() );
@@ -508,7 +508,7 @@ void KFindDialog::showPlaceholders()
     if (!m_placeholders)
     {
         m_placeholders = new TQPopupMenu(this);
-        connect( m_placeholders, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPlaceholdersAboutToShow()) );
+        connect( m_placeholders, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPlaceholdersAboutToShow()) );
     }
 
     // Insert the selection into the edit control.
diff --git a/tdeutils/kfinddialog.h b/tdeutils/kfinddialog.h
index 687939e05..35710d72d 100644
--- a/tdeutils/kfinddialog.h
+++ b/tdeutils/kfinddialog.h
@@ -62,7 +62,7 @@ class TQCheckBox;
  *   else
  *   {
  *     m_findDia = new KFindDialog(false,...);
- *     connect( m_findDia, TQT_SIGNAL(okClicked()), this, TQT_SLOT(findTextNext()) );
+ *     connect( m_findDia, TQ_SIGNAL(okClicked()), this, TQ_SLOT(findTextNext()) );
  *   }
  * \endcode
  * Don't forget to delete and reset m_findDia when closed.
@@ -74,7 +74,7 @@ class TQCheckBox;
 class TDEUTILS_EXPORT KFindDialog:
     public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index 6afa7c8d3..af771bd8f 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -184,14 +184,14 @@ void KPluginSelectionWidget::init( const TQValueList<KPluginInfo*> & plugininfos
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
     TDEListView * listview = new TDEListView( this );
     d->tooltip = new KPluginListViewToolTip( listview->viewport(), listview );
-    connect( listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
-    connect( listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
-    connect( listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
-    connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
+    connect( listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
+    connect( listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
+    connect( listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
+    connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
     listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     listview->setAcceptDrops( false );
     listview->setFullWidth( true );
@@ -246,7 +246,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
     {
         //FIXME: not very verbose
         TQLabel * label = new TQLabel( i18n( "Error" ), parent );
-        label->setAlignment( Qt::AlignCenter );
+        label->setAlignment( TQt::AlignCenter );
 
         return label;
     }
@@ -256,7 +256,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent,
             moduleinfo.service()->property(
                 "X-TDE-ParentComponents" ).toStringList() );
     d->moduleParentComponents.insert( module, parentComponents );
-    connect( module, TQT_SIGNAL( changed( bool ) ), TQT_SLOT( clientChanged( bool ) ) );
+    connect( module, TQ_SIGNAL( changed( bool ) ), TQ_SLOT( clientChanged( bool ) ) );
     return module;
 }
 
@@ -264,7 +264,7 @@ void KPluginSelectionWidget::embeddPluginKCMs( KPluginInfo * plugininfo, bool ch
 {
     //if we have Services for the plugin we should be able to
     //create KCM(s)
-    TQApplication::setOverrideCursor( Qt::WaitCursor );
+    TQApplication::setOverrideCursor( TQt::WaitCursor );
     if( plugininfo->kcmServices().size() > 1 )
     {
         // we need a tabwidget
@@ -523,7 +523,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
     TQBoxLayout * hbox = new TQHBoxLayout( this, 0, KDialog::spacingHint() );
     hbox->setAutoAdd( true );
 
-    TQSplitter* splitter = new TQSplitter( Qt::Horizontal, this );
+    TQSplitter* splitter = new TQSplitter( TQt::Horizontal, this );
     d->frame = new TQFrame( splitter, "KPluginSelector left frame" );
     d->frame->setFrameStyle( TQFrame::NoFrame );
     ( new TQVBoxLayout( d->frame, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
@@ -536,7 +536,7 @@ KPluginSelector::KPluginSelector( TQWidget * parent, const char * name )
     TQLabel * label = new TQLabel( i18n( "(This plugin is not configurable)" ),
             d->widgetstack );
     ( new TQVBoxLayout( label, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
-    label->setAlignment( Qt::AlignCenter );
+    label->setAlignment( TQt::AlignCenter );
     label->setMinimumSize( 200, 200 );
 
     d->widgetstack->addWidget( label, 1 );
@@ -564,8 +564,8 @@ void KPluginSelector::checkNeedForTabWidget()
                     "KPluginSelector TabWidget" );
             w->reparent( d->tabwidget, TQPoint( 0, 0 ) );
             d->tabwidget->addTab( w, w->catName() );
-            connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w,
-                    TQT_SLOT( tabWidgetChanged( TQWidget * ) ) );
+            connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w,
+                    TQ_SLOT( tabWidgetChanged( TQWidget * ) ) );
         }
     }
 }
@@ -605,16 +605,16 @@ void KPluginSelector::addPluginsInternal( const TQValueList<KPluginInfo*> plugin
         w = new KPluginSelectionWidget( plugininfos, this,
                 d->tabwidget, catname, category, cfgGroup );
         d->tabwidget->addTab( w, catname );
-        connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w,
-                TQT_SLOT( tabWidgetChanged( TQWidget * ) ) );
+        connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w,
+                TQ_SLOT( tabWidgetChanged( TQWidget * ) ) );
     }
     else
         w = new KPluginSelectionWidget( plugininfos, this, d->frame,
                 catname, category, cfgGroup );
     w->setMinimumSize( 200, 200 );
-    connect( w, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
-    connect( w, TQT_SIGNAL( configCommitted( const TQCString & ) ), this,
-            TQT_SIGNAL( configCommitted( const TQCString & ) ) );
+    connect( w, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) );
+    connect( w, TQ_SIGNAL( configCommitted( const TQCString & ) ), this,
+            TQ_SIGNAL( configCommitted( const TQCString & ) ) );
     d->pswidgets += w;
 }
 
@@ -696,7 +696,7 @@ void KPluginSelector::defaults()
     // tabwidget - defaults() will be called for all of them)
 
     TQWidget * pluginconfig = d->widgetstack->visibleWidget();
-    TDECModuleProxy * kcm = ::tqqt_cast<TDECModuleProxy*>(pluginconfig);
+    TDECModuleProxy * kcm = ::tqt_cast<TDECModuleProxy*>(pluginconfig);
     if( kcm )
     {
         kdDebug( 702 ) << "call TDECModule::defaults() for the plugins KCM"
diff --git a/tdeutils/kpluginselector.h b/tdeutils/kpluginselector.h
index 111abfe0d..12d484d0e 100644
--- a/tdeutils/kpluginselector.h
+++ b/tdeutils/kpluginselector.h
@@ -61,7 +61,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget
 {
     friend class KPluginSelectionWidget;
 
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Create a new KPluginSelector.
diff --git a/tdeutils/kpluginselector_p.h b/tdeutils/kpluginselector_p.h
index 79a39ca94..1983a6468 100644
--- a/tdeutils/kpluginselector_p.h
+++ b/tdeutils/kpluginselector_p.h
@@ -41,7 +41,7 @@ class TDECModuleInfo;
  */
 class KPluginSelectionWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Create a new Plugin Selector widget.
diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp
index 98e3ce93c..9540d2d7a 100644
--- a/tdeutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
@@ -91,10 +91,10 @@ KReplaceNextDialog* KReplace::dialog()
     if ( !m_dialog )
     {
         m_dialog = new KReplaceNextDialog( parentWidget() );
-        connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) );
-        connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) );
-        connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) );
-        connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) );
+        connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotReplaceAll() ) );
+        connect( m_dialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotSkip() ) );
+        connect( m_dialog, TQ_SIGNAL( user3Clicked() ), this, TQ_SLOT( slotReplace() ) );
+        connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) );
     }
     return static_cast<KReplaceNextDialog *>(m_dialog);
 }
diff --git a/tdeutils/kreplace.h b/tdeutils/kreplace.h
index e30e20b44..f14887e25 100644
--- a/tdeutils/kreplace.h
+++ b/tdeutils/kreplace.h
@@ -50,14 +50,14 @@ class KReplaceNextDialog;
  *
  *  // Connect signals to code which handles highlighting
  *  // of found text, and on-the-fly replacement.
- *  connect( m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
- *          this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
+ *  connect( m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ),
+ *          this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) );
  *  // Connect findNext signal - called when pressing the button in the dialog
- *  connect( m_replace, TQT_SIGNAL( findNext() ),
- *          this, TQT_SLOT( slotReplaceNext() ) );
+ *  connect( m_replace, TQ_SIGNAL( findNext() ),
+ *          this, TQ_SLOT( slotReplaceNext() ) );
  *  // Connect replace signal - called when doing a replacement
- *  connect( m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ),
- *          this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) );
+ *  connect( m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ),
+ *          this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) );
  * \endcode
  *  Then initialize the variables determining the "current position"
  *  (to the cursor, if the option FromCursor is set,
@@ -97,7 +97,7 @@ class KReplaceNextDialog;
 class TDEUTILS_EXPORT KReplace :
     public KFind
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeutils/kreplacedialog.h b/tdeutils/kreplacedialog.h
index 573a059f2..9e787730e 100644
--- a/tdeutils/kreplacedialog.h
+++ b/tdeutils/kreplacedialog.h
@@ -59,7 +59,7 @@ class TQRect;
 class TDEUTILS_EXPORT KReplaceDialog:
     public KFindDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox
index 40d54ee3d..83a71767e 100644
--- a/tdeutils/ksettings/README.dox
+++ b/tdeutils/ksettings/README.dox
@@ -15,7 +15,7 @@ the following:
 
 create the 'Configure MyApp' StdAction like this:
 \code
-KStdAction::preferences( this, SLOT( showConfigDialog() ), actionCollection );
+KStdAction::preferences( this, TQ_SLOT( showConfigDialog() ), actionCollection );
 \endcode
 
 and the slot looks like this:
@@ -35,7 +35,7 @@ KSettings::Dialog:
 m_dlg = new KSettings::Dialog( QStringList::split( ';', "component1;component2" ) );
 \endcode
 
-The KSettings::Dialog object will be destructed automatically by the QObject
+The KSettings::Dialog object will be destructed automatically by the TQObject
 mechanisms.
 
 
@@ -47,9 +47,9 @@ Every page is a KCM. This is what you need for creating a page:
 \code
 class MyAppConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
-  MyAppConfig( QWidget *parent, const char *name = 0, const QStringList &args =
+  MyAppConfig( TQWidget *parent, const char *name = 0, const QStringList &args =
       QStringList() );
   ~MyAppConfig();
 
@@ -62,11 +62,11 @@ public:
 and in the cpp file:
 
 \code
-typedef KGenericFactory<MyAppConfig, QWidget> MyAppConfigFactory;
+typedef KGenericFactory<MyAppConfig, TQWidget> MyAppConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_myappconfig, MyAppConfigFactory(
     "kcm_myappconfig" ) );
 
-MyAppConfig::MyAppConfig( QWidget *parent, const char *, const QStringList &args )
+MyAppConfig::MyAppConfig( TQWidget *parent, const char *, const QStringList &args )
   : TDECModule( MyAppConfigFactory::instance(), parent, args )
 {
   // create the pages GUI
@@ -191,10 +191,10 @@ for the first.
 To create a plugin page you need the following code:
 
 \code
-typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFactory;
+typedef KGenericFactory<MyAppPluginConfig, TQWidget> MyAppPluginConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFactory( "kcm_myapppluginconfig" ) );
 
-MyAppPluginConfig( QWidget * parent, const char *, const QStringList & args )
+MyAppPluginConfig( TQWidget * parent, const char *, const QStringList & args )
     : PluginPage( MyAppPluginConfigFactory::instance(), parent, args )
 {
     pluginSelector()->addPlugins( ... );
diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index ad3fa81cc..164ea19a5 100644
--- a/tdeutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -71,14 +71,14 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name )
     d->listview->setSelectionModeExt( TDEListView::Single );
     d->listview->setAllColumnsShowFocus( true );
 
-    connect( d->listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
-    connect( d->listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
-    connect( d->listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
-    connect( d->listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
-            TQT_SLOT( executed( TQListViewItem * ) ) );
+    connect( d->listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
+    connect( d->listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
+    connect( d->listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
+    connect( d->listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
+            TQ_SLOT( executed( TQListViewItem * ) ) );
 }
 
 ComponentsDialog::~ComponentsDialog()
diff --git a/tdeutils/ksettings/componentsdialog.h b/tdeutils/ksettings/componentsdialog.h
index 49e5a26e9..ca6d029a9 100644
--- a/tdeutils/ksettings/componentsdialog.h
+++ b/tdeutils/ksettings/componentsdialog.h
@@ -39,7 +39,7 @@ namespace KSettings
 */
 class TDEUTILS_EXPORT ComponentsDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
           Create Dialog.
diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 83af48fcb..609d8cb16 100644
--- a/tdeutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -588,14 +588,14 @@ void Dialog::createDialogFromServices()
 
 	if( ! d->staticlistview )
 		d->dlg->addButtonBelowList( i18n( "Select Components..." ), this,
-			TQT_SLOT( configureTree() ) );
+			TQ_SLOT( configureTree() ) );
 
-	connect( d->dlg, TQT_SIGNAL( okClicked() ), Dispatcher::self(),
-		TQT_SLOT( syncConfiguration() ) );
-	connect( d->dlg, TQT_SIGNAL( applyClicked() ), Dispatcher::self(),
-		TQT_SLOT( syncConfiguration() ) );
-	connect( d->dlg, TQT_SIGNAL( configCommitted( const TQCString & ) ),
-		Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) );
+	connect( d->dlg, TQ_SIGNAL( okClicked() ), Dispatcher::self(),
+		TQ_SLOT( syncConfiguration() ) );
+	connect( d->dlg, TQ_SIGNAL( applyClicked() ), Dispatcher::self(),
+		TQ_SLOT( syncConfiguration() ) );
+	connect( d->dlg, TQ_SIGNAL( configCommitted( const TQCString & ) ),
+		Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) );
 
 	d->pagetree.addToDialog( d->dlg );
 
@@ -609,13 +609,13 @@ void Dialog::configureTree()
 	ComponentsDialog * subdlg = new ComponentsDialog( d->dlg );
 	subdlg->setPluginInfos( d->plugininfomap );
 	subdlg->show();
-	connect( subdlg, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( updateTreeList() ) );
-	connect( subdlg, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( updateTreeList() ) );
-	connect( subdlg, TQT_SIGNAL( okClicked() ), this,
-			TQT_SIGNAL( pluginSelectionChanged() ) );
-	connect( subdlg, TQT_SIGNAL( applyClicked() ), this,
-			TQT_SIGNAL( pluginSelectionChanged() ) );
-	connect( subdlg, TQT_SIGNAL( finished() ), subdlg, TQT_SLOT( delayedDestruct() ) );
+	connect( subdlg, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( updateTreeList() ) );
+	connect( subdlg, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( updateTreeList() ) );
+	connect( subdlg, TQ_SIGNAL( okClicked() ), this,
+			TQ_SIGNAL( pluginSelectionChanged() ) );
+	connect( subdlg, TQ_SIGNAL( applyClicked() ), this,
+			TQ_SIGNAL( pluginSelectionChanged() ) );
+	connect( subdlg, TQ_SIGNAL( finished() ), subdlg, TQ_SLOT( delayedDestruct() ) );
 }
 
 void Dialog::updateTreeList()
diff --git a/tdeutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h
index f42558b26..619c05749 100644
--- a/tdeutils/ksettings/dialog.h
+++ b/tdeutils/ksettings/dialog.h
@@ -59,7 +59,7 @@ namespace KSettings
  * \endcode
  * and the action for the config dialog is connected to the show slot:
  * \code
- * KStdAction::preferences( m_cfgdlg, TQT_SLOT( show() ), actionCollection() );
+ * KStdAction::preferences( m_cfgdlg, TQ_SLOT( show() ), actionCollection() );
  * \endcode
  *
  * If you need to be informed when the config was changed and applied in the
@@ -73,7 +73,7 @@ namespace KSettings
 class TDEUTILS_EXPORT Dialog : public TQObject
 {
     friend class PageNode;
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Tells the dialog whether the entries in the listview are all static
diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp
index 6d87e4cde..5cd5a4208 100644
--- a/tdeutils/ksettings/dispatcher.cpp
+++ b/tdeutils/ksettings/dispatcher.cpp
@@ -80,7 +80,7 @@ void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, cons
     sig->connect( recv, slot );
 
     ++m_instanceInfo[ instanceName ].count;
-    connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) );
+    connect( recv, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( unregisterInstance( TQObject * ) ) );
 }
 
 TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName )
diff --git a/tdeutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h
index ec5a540b1..2cb0cdc2a 100644
--- a/tdeutils/ksettings/dispatcher.h
+++ b/tdeutils/ksettings/dispatcher.h
@@ -42,7 +42,7 @@ namespace KSettings
  * into the TDEConfigureDialog you need a way to get notified. This is what you
  * do:
  * \code
- * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) );
+ * Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( loadSettings() ) );
  * \endcode
  *
  * @author Matthias Kretz <kretz@kde.org>
@@ -52,7 +52,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject
 {
     friend class KStaticDeleter<Dispatcher>;
 
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Get a reference the the Dispatcher object.
@@ -69,7 +69,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject
          *
          * @param instance     The TDEInstance object
          * @param recv         The object that should receive the signal
-         * @param slot         The slot to be called: TQT_SLOT( slotName() )
+         * @param slot         The slot to be called: TQ_SLOT( slotName() )
          */
         void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot );
 
diff --git a/tdeutils/ksettings/pluginpage.cpp b/tdeutils/ksettings/pluginpage.cpp
index ddb58fb03..39af821e7 100644
--- a/tdeutils/ksettings/pluginpage.cpp
+++ b/tdeutils/ksettings/pluginpage.cpp
@@ -43,7 +43,7 @@ class PluginPage::PluginPagePrivate
 {
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
     d->selwid = new KPluginSelector( this );
-    connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
+    connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) );
 }
 
     PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args )
@@ -52,9 +52,9 @@ class PluginPage::PluginPagePrivate
 {
     ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true );
     d->selwid = new KPluginSelector( this );
-    connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) );
-    connect( d->selwid, TQT_SIGNAL( configCommitted( const TQCString & ) ),
-            Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) );
+    connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) );
+    connect( d->selwid, TQ_SIGNAL( configCommitted( const TQCString & ) ),
+            Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) );
 }
 
 PluginPage::~PluginPage()
diff --git a/tdeutils/ksettings/pluginpage.h b/tdeutils/ksettings/pluginpage.h
index e9a23fcd8..f3dc1c946 100644
--- a/tdeutils/ksettings/pluginpage.h
+++ b/tdeutils/ksettings/pluginpage.h
@@ -72,7 +72,7 @@ namespace KSettings
  */
 class TDEUTILS_EXPORT PluginPage : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Standart TDECModule constructor. Automatically creates the the
diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp
index 2df7a0421..7a0337615 100644
--- a/tdeutils/tdecmodulecontainer.cpp
+++ b/tdeutils/tdecmodulecontainer.cpp
@@ -91,7 +91,7 @@ void TDECModuleContainer::init()
 	d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" );
 	d->tabWidget = new TQTabWidget(this, "tabWidget");
 	d->tabWidget->setMargin(KDialog::marginHint());
-	connect( d->tabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), TQT_SLOT( tabSwitched( TQWidget* ) ));
+	connect( d->tabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), TQ_SLOT( tabSwitched( TQWidget* ) ));
 	d->topLayout->addWidget( d->tabWidget );
 
 	if ( !d->modules.isEmpty() )
@@ -152,7 +152,7 @@ void TDECModuleContainer::addModule( const TQString& module )
 
 	d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() );
 
-	connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *)));
+	connect( proxy, TQ_SIGNAL(changed(TDECModuleProxy *)), TQ_SLOT(moduleChanged(TDECModuleProxy *)));
 
 	/* Collect our buttons - we go for the common deliminator */
 	d->buttons = d->buttons | proxy->realModule()->buttons();
@@ -178,10 +178,10 @@ void TDECModuleContainer::tabSwitched( TQWidget * module )
 
 	if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() ) {
 		d->btnRootMode->setEnabled( true );
-		connect( d->btnRootMode, TQT_SIGNAL( clicked() ), 
-				TQT_SLOT( runAsRoot() ));
-		connect( mod, TQT_SIGNAL( childClosed() ), 
-				TQT_SLOT ( rootExited() ));
+		connect( d->btnRootMode, TQ_SIGNAL( clicked() ), 
+				TQ_SLOT( runAsRoot() ));
+		connect( mod, TQ_SIGNAL( childClosed() ), 
+				TQ_SLOT ( rootExited() ));
 	}
 	else {
 		d->btnRootMode->setEnabled( false );
@@ -205,7 +205,7 @@ void TDECModuleContainer::runAsRoot()
 
 void TDECModuleContainer::rootExited()
 {
-	connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() ));
+	connect( d->btnRootMode, TQ_SIGNAL( clicked() ), TQ_SLOT( runAsRoot() ));
 	d->btnRootMode->setEnabled( true );
 }
 
diff --git a/tdeutils/tdecmodulecontainer.h b/tdeutils/tdecmodulecontainer.h
index 6d6717370..4cfb2ca03 100644
--- a/tdeutils/tdecmodulecontainer.h
+++ b/tdeutils/tdecmodulecontainer.h
@@ -52,7 +52,7 @@ class TDECModuleProxy;
  */
 class TDEUTILS_EXPORT TDECModuleContainer : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		/**
 		 * Creates a TDECModuleContainer with tabs, each one containing one of the
@@ -203,8 +203,12 @@ extern "C" \
 	{ \
 		TQStringList modList = TQStringList::split( ",", TQString(modules).remove( " " )); \
 		for ( TQStringList::Iterator it = modList.begin(); it != modList.end(); ++it ) \
+		{ \
 			if ( TDECModuleLoader::testModule( *it ) ) \
+			{ \
 				return true; \
+			} \
+		} \
 		return false; \
 	} \
 }
diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index 174226ed2..907060ec7 100644
--- a/tdeutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -72,7 +72,7 @@ TDECModule* TDECModuleLoader::load(const TDECModuleInfo &mod, const TQString &li
       KLibFactory *factory = lib->factory();
       if ( factory )
       {
-        TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, TQT_TQOBJECT(parent), name ? name : mod.handle().latin1(), args );
+        TDECModule *module = KParts::ComponentFactory::createInstanceFromFactory<TDECModule>( factory, parent, name ? name : mod.handle().latin1(), args );
         if (module)
           return module;
       }
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 487280e39..b79e774cd 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -155,7 +155,7 @@ TDECModule * TDECModuleProxy::realModule() const
 	if( d->rootMode )
 		return 0;
 
-	TQApplication::setOverrideCursor( Qt::WaitCursor );
+	TQApplication::setOverrideCursor( TQt::WaitCursor );
 	
 	TDECModuleProxy * that = const_cast<TDECModuleProxy*>( this );
 
@@ -185,12 +185,12 @@ TDECModule * TDECModuleProxy::realModule() const
 		d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback,
 			that, name(), d->args );
 
-		connect( d->kcm, TQT_SIGNAL( changed( bool ) ),
-				TQT_SLOT(moduleChanged(bool)) );
-		connect( d->kcm, TQT_SIGNAL( destroyed() ),
-				TQT_SLOT( moduleDestroyed() ) );
-		connect( d->kcm, TQT_SIGNAL(quickHelpChanged()), 
-				TQT_SIGNAL(quickHelpChanged()));
+		connect( d->kcm, TQ_SIGNAL( changed( bool ) ),
+				TQ_SLOT(moduleChanged(bool)) );
+		connect( d->kcm, TQ_SIGNAL( destroyed() ),
+				TQ_SLOT( moduleDestroyed() ) );
+		connect( d->kcm, TQ_SIGNAL(quickHelpChanged()), 
+				TQ_SIGNAL(quickHelpChanged()));
 		TQWhatsThis::add( that, d->kcm->quickHelp() );
 
 		d->topLayout->addWidget( d->kcm );
@@ -234,8 +234,8 @@ TDECModule * TDECModuleProxy::realModule() const
 		d->dcopClient->attach();
 
 		d->dcopClient->setNotifications( true );
-		connect( d->dcopClient, TQT_SIGNAL( applicationRemoved( const TQCString& )),
-			TQT_SLOT( applicationRemoved( const TQCString& )));
+		connect( d->dcopClient, TQ_SIGNAL( applicationRemoved( const TQCString& )),
+			TQ_SLOT( applicationRemoved( const TQCString& )));
 
 		/* Figure out the name of where the module is already loaded */
 		TQByteArray replyData, data;
@@ -301,7 +301,7 @@ void TDECModuleProxy::runAsRoot()
 	if ( !moduleInfo().needsRootPrivileges() )
 		return;
 
-	TQApplication::setOverrideCursor( Qt::WaitCursor );
+	TQApplication::setOverrideCursor( TQt::WaitCursor );
 
 	delete d->rootProcess;
 	delete d->embedWidget;
@@ -367,7 +367,7 @@ void TDECModuleProxy::runAsRoot()
 		*d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell"))
 			.arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language());
 
-		connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited()));
+		connect(d->rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(rootExited()));
 
 		if ( !d->rootProcess->start( TDEProcess::NotifyOnExit ))
 		{
diff --git a/tdeutils/tdecmoduleproxy.h b/tdeutils/tdecmoduleproxy.h
index 11bbca987..1aa337a23 100644
--- a/tdeutils/tdecmoduleproxy.h
+++ b/tdeutils/tdecmoduleproxy.h
@@ -67,7 +67,7 @@ class TDEProcess;
  */
 class TDEUTILS_EXPORT TDECModuleProxy : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 
 	friend class TDECModuleProxyRootCommunicatorImpl;
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
index 5b1bcc339..6e6f1b286 100644
--- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp
@@ -35,10 +35,10 @@ TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name,
 	: DCOPObject( name ), TQObject( 0, name ),
 		p( const_cast<TDECModuleProxy *>( client ))
 { 
-	connect( p, TQT_SIGNAL( changed(bool)), 
-			TQT_SLOT( changedRelay(bool)));
-	connect( p, TQT_SIGNAL( quickHelpChanged()), 
-			TQT_SLOT( quickHelpRelay()));
+	connect( p, TQ_SIGNAL( changed(bool)), 
+			TQ_SLOT( changedRelay(bool)));
+	connect( p, TQ_SIGNAL( quickHelpChanged()), 
+			TQ_SLOT( quickHelpRelay()));
 }
 
 void TDECModuleProxyIfaceImpl::save()
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.h b/tdeutils/tdecmoduleproxyIfaceImpl.h
index a8a80f23b..ca77a966e 100644
--- a/tdeutils/tdecmoduleproxyIfaceImpl.h
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.h
@@ -33,7 +33,7 @@ class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyI
 	 * Update: This is probably not possible, since we don't want the DCOPObject when 
 	 * we're running in root mode. */
 
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 
@@ -79,7 +79,7 @@ private:
 class TDECModuleProxyRootCommunicatorImpl: public TQObject, 
 	virtual public TDECModuleProxyRootDispatcher
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client );
diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp
index b2246e104..6ffb8e00a 100644
--- a/tdeutils/tdemultitabbar.cpp
+++ b/tdeutils/tdemultitabbar.cpp
@@ -74,8 +74,8 @@ KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMult
 	addChild(box);
 	setFrameStyle(NoFrame);
 	viewport()->setBackgroundMode(TQt::PaletteBackground);
-/*	box->setPaletteBackgroundColor(Qt::red);
-	setPaletteBackgroundColor(Qt::green);*/
+/*	box->setPaletteBackgroundColor(TQt::red);
+	setPaletteBackgroundColor(TQt::green);*/
 }
 
 void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
@@ -394,7 +394,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text,
 	setFixedWidth(24);
 	m_id=id;
 	TQToolTip::add(this,text);
-	connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+	connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
 }
 
 KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
@@ -409,7 +409,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
 	setFixedWidth(24);
 	m_id=id;
 	TQToolTip::add(this,text);
-	connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
+	connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked()));
 }
 
 KMultiTabBarButton::~KMultiTabBarButton() {
@@ -445,13 +445,13 @@ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
 
 void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
 	TQPushButton::hideEvent(he);
-	KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget());
+	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
 	if (tb) tb->updateSeparator();
 }
 
 void KMultiTabBarButton::showEvent( TQShowEvent* he) {
 	TQPushButton::showEvent(he);
-	KMultiTabBar *tb=tqt_dynamic_cast<KMultiTabBar*>(parentWidget());
+	KMultiTabBar *tb=dynamic_cast<KMultiTabBar*>(parentWidget());
 	if (tb) tb->updateSeparator();
 }
 
@@ -491,7 +491,7 @@ TQSize KMultiTabBarButton::sizeHint() const
             h = TQMAX(h, sz.height());
     }
 
-    return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
+    return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)).
             expandedTo(TQApplication::globalStrut()));
 }
 
diff --git a/tdeutils/tdemultitabbar.h b/tdeutils/tdemultitabbar.h
index eca4695ff..3d7785842 100644
--- a/tdeutils/tdemultitabbar.h
+++ b/tdeutils/tdemultitabbar.h
@@ -55,7 +55,7 @@ class KMultiTabBarInternal;
  */
 class TDEUTILS_EXPORT KMultiTabBar: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 * The tab bar's orientation. Also constraints the bar's position.
@@ -204,7 +204,7 @@ private:
  */
 class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/** @internal */
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
@@ -267,7 +267,7 @@ protected slots:
  */
 class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
   /** @internal */
 	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
diff --git a/tdeutils/tdemultitabbar_p.h b/tdeutils/tdemultitabbar_p.h
index 353a33260..61f8e82c7 100644
--- a/tdeutils/tdemultitabbar_p.h
+++ b/tdeutils/tdemultitabbar_p.h
@@ -29,7 +29,7 @@
 
 class KMultiTabBarInternal: public TQScrollView
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
         int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null);
diff --git a/tdeutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp
index c913e5ec6..6a724d6a3 100644
--- a/tdeutils/tests/kfindtest.cpp
+++ b/tdeutils/tests/kfindtest.cpp
@@ -59,10 +59,10 @@ void KFindTest::find(const TQString &pattern, long options)
 	delete m_find;
 	m_find = new KFind(pattern, options, 0);
 
-	connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)),
-	                TQT_SLOT(slotHighlight(const TQString &, int, int)));
-	connect(m_find, TQT_SIGNAL(highlight(int, int, int)),
-	                TQT_SLOT(slotHighlight(int, int, int)));
+	connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)),
+	                TQ_SLOT(slotHighlight(const TQString &, int, int)));
+	connect(m_find, TQ_SIGNAL(highlight(int, int, int)),
+	                TQ_SLOT(slotHighlight(int, int, int)));
 
 	m_line = 0;
 	KFind::Result result = KFind::NoMatch;
diff --git a/tdeutils/tests/kfindtest.h b/tdeutils/tests/kfindtest.h
index 847d9579c..09526c1b0 100644
--- a/tdeutils/tests/kfindtest.h
+++ b/tdeutils/tests/kfindtest.h
@@ -27,7 +27,7 @@ class KFind;
 
 class KFindTest : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KFindTest(const TQStringList &text) :
diff --git a/tdeutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp
index 19ead8e77..df21d0c81 100644
--- a/tdeutils/tests/kreplacetest.cpp
+++ b/tdeutils/tests/kreplacetest.cpp
@@ -38,14 +38,14 @@ void KReplaceTest::replace( const TQString &pattern, const TQString &replacement
 
     // Connect highlight signal to code which handles highlighting
     // of found text.
-    connect(m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ),
-            this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) );
+    connect(m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ),
+            this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) );
     // Connect findNext signal - called when pressing the button in the dialog
-    connect(m_replace, TQT_SIGNAL( findNext() ),
-            this, TQT_SLOT( slotReplaceNext() ) );
+    connect(m_replace, TQ_SIGNAL( findNext() ),
+            this, TQ_SLOT( slotReplaceNext() ) );
     // Connect replace signal - called when doing a replacement
-    connect(m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ),
-            this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) );
+    connect(m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ),
+            this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) );
 
     // Go to initial position
     if ( (options & KReplaceDialog::FromCursor) == 0 )
diff --git a/tdeutils/tests/kreplacetest.h b/tdeutils/tests/kreplacetest.h
index b8fb8120b..71aa8cebb 100644
--- a/tdeutils/tests/kreplacetest.h
+++ b/tdeutils/tests/kreplacetest.h
@@ -27,7 +27,7 @@ class KReplace;
 
 class KReplaceTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KReplaceTest( const TQStringList& text, int button )
         : TQObject( 0L ), m_text( text ), m_replace( 0 ), m_button( button ) {}
diff --git a/tdewallet/backend/CMakeLists.txt b/tdewallet/backend/CMakeLists.txt
index 57a1e77ac..db2f66994 100644
--- a/tdewallet/backend/CMakeLists.txt
+++ b/tdewallet/backend/CMakeLists.txt
@@ -30,9 +30,9 @@ link_directories(
 set( target tdewalletbackend )
 
 set( ${target}_SRCS
-  blockcipher.cc blowfish.cc
-  cbc.cc sha1.cc tdewalletentry.cc
-  tdewalletbackend.cc
+  blockcipher.cpp blowfish.cpp
+  cbc.cpp sha1.cpp tdewalletentry.cpp
+  tdewalletbackend.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/tdewallet/backend/Makefile.am b/tdewallet/backend/Makefile.am
index 487385eac..a53a0129f 100644
--- a/tdewallet/backend/Makefile.am
+++ b/tdewallet/backend/Makefile.am
@@ -5,12 +5,12 @@ lib_LTLIBRARIES = libtdewalletbackend.la
 
 libtdewalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
 libtdewalletbackend_la_LIBADD = $(LIB_TQT) ../../tdecore/libtdecore.la
-libtdewalletbackend_la_SOURCES = blockcipher.cc		\
-			       blowfish.cc		\
-			       cbc.cc			\
-			       sha1.cc			\
-			       tdewalletentry.cc		\
-			       tdewalletbackend.cc
+libtdewalletbackend_la_SOURCES = blockcipher.cpp		\
+			       blowfish.cpp		\
+			       cbc.cpp			\
+			       sha1.cpp			\
+			       tdewalletentry.cpp		\
+			       tdewalletbackend.cpp
 
 
 libtdewalletbackend_la_METASOURCES = AUTO
diff --git a/tdewallet/backend/blockcipher.cc b/tdewallet/backend/blockcipher.cpp
index 9d770098e..9d770098e 100644
--- a/tdewallet/backend/blockcipher.cc
+++ b/tdewallet/backend/blockcipher.cpp
diff --git a/tdewallet/backend/blowfish.cc b/tdewallet/backend/blowfish.cpp
index c708935de..c708935de 100644
--- a/tdewallet/backend/blowfish.cc
+++ b/tdewallet/backend/blowfish.cpp
diff --git a/tdewallet/backend/blowfishtables.h b/tdewallet/backend/blowfishtables.h
index dae448f96..a41d7a7e3 100644
--- a/tdewallet/backend/blowfishtables.h
+++ b/tdewallet/backend/blowfishtables.h
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-// This is also from _Applied_Cryptography_.  See blowfish.cc for more details.
+// This is also from _Applied_Cryptography_.  See blowfish.cpp for more details.
 
 #ifndef __bfdefs_h
 #define __bfdefs_h
diff --git a/tdewallet/backend/cbc.cc b/tdewallet/backend/cbc.cpp
index 7bc5f3891..7bc5f3891 100644
--- a/tdewallet/backend/cbc.cc
+++ b/tdewallet/backend/cbc.cpp
diff --git a/tdewallet/backend/sha1.cc b/tdewallet/backend/sha1.cpp
index 7420b5f16..7420b5f16 100644
--- a/tdewallet/backend/sha1.cc
+++ b/tdewallet/backend/sha1.cpp
diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cpp
index 83e37a49a..83e37a49a 100644
--- a/tdewallet/backend/tdewalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cpp
diff --git a/tdewallet/backend/tdewalletentry.cc b/tdewallet/backend/tdewalletentry.cpp
index d6b3aa84e..d6b3aa84e 100644
--- a/tdewallet/backend/tdewalletentry.cc
+++ b/tdewallet/backend/tdewalletentry.cpp
diff --git a/tdewallet/backend/tests/CMakeLists.txt b/tdewallet/backend/tests/CMakeLists.txt
index 275891ae7..129377791 100644
--- a/tdewallet/backend/tests/CMakeLists.txt
+++ b/tdewallet/backend/tests/CMakeLists.txt
@@ -29,9 +29,10 @@ tde_add_check_executable( backendtest AUTOMOC
     LINK tdewalletbackend-shared tdewalletclient-shared )
 add_test( NAME "tdewallet/backed/backendtest"
     COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/backendtest.sh" )
+set_tests_properties( "tdewallet/backed/backendtest" PROPERTIES TIMEOUT 30)
 tde_add_check_executable( testbf AUTOMOC
-    SOURCES testbf.cpp ../blockcipher.cc ../blowfish.cc
+    SOURCES testbf.cpp ../blockcipher.cpp ../blowfish.cpp
     LINK tdewalletbackend-shared tdewalletclient-shared TEST )
 tde_add_check_executable( testsha AUTOMOC
-    SOURCES testsha.cpp ../sha1.cc
+    SOURCES testsha.cpp ../sha1.cpp
     LINK tdewalletbackend-shared tdewalletclient-shared TEST )
diff --git a/tdewallet/backend/tests/backendtest.sh b/tdewallet/backend/tests/backendtest.sh
index d3a6ef0e1..d4f1ba686 100644
--- a/tdewallet/backend/tests/backendtest.sh
+++ b/tdewallet/backend/tests/backendtest.sh
@@ -3,11 +3,16 @@
 # create temporary home
 export HOME=$PWD/test-home
 mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
 # run dcop server
 ../../../dcop/dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
+while ! ../../../dcop/dcopserver --serverid 2>/dev/null; do
+  sleep 2
+done
+
 # perform test
 ./backendtest
 STATE=$?
diff --git a/tdewallet/client/CMakeLists.txt b/tdewallet/client/CMakeLists.txt
index ac56830e8..87c77132b 100644
--- a/tdewallet/client/CMakeLists.txt
+++ b/tdewallet/client/CMakeLists.txt
@@ -34,7 +34,7 @@ install( FILES
 set( target tdewalletclient )
 
 set( ${target}_SRCS
-  tdewallet.skel tdewallet.cc
+  tdewallet.skel tdewallet.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdewallet/client/Makefile.am b/tdewallet/client/Makefile.am
index 4fe262f76..51fdd4161 100644
--- a/tdewallet/client/Makefile.am
+++ b/tdewallet/client/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libtdewalletclient.la
 libtdewalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
 libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la
 libtdewalletclient_la_SOURCES =   tdewallet.skel \
-				tdewallet.cc
+				tdewallet.cpp
 
 libtdewalletclient_la_METASOURCES = AUTO
 
diff --git a/tdewallet/client/tdewallet.cc b/tdewallet/client/tdewallet.cpp
index c730f10d4..9785472ed 100644
--- a/tdewallet/client/tdewallet.cc
+++ b/tdewallet/client/tdewallet.cpp
@@ -79,9 +79,9 @@ Wallet::Wallet(int handle, const TQString& name)
 
 	_dcopRef->dcopClient()->setNotifications(true);
 	connect(_dcopRef->dcopClient(),
-			TQT_SIGNAL(applicationRemoved(const TQCString&)),
+			TQ_SIGNAL(applicationRemoved(const TQCString&)),
 			this,
-			TQT_SLOT(slotAppUnregistered(const TQCString&)));
+			TQ_SLOT(slotAppUnregistered(const TQCString&)));
 
 	connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(int)", "slotWalletClosed(int)", false);
 	connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "folderListUpdated(TQString)", "slotFolderListUpdated(TQString)", false);
@@ -179,7 +179,7 @@ Wallet *Wallet::openWallet(const TQString& name, WId w, OpenType ot) {
 	}
 
         // avoid deadlock if the app has some popup open (#65978/#71048)
-        while( TQWidget* widget = TQT_TQWIDGET(tqApp->activePopupWidget()))
+        while( TQWidget* widget = tqApp->activePopupWidget())
             widget->close();
 
 	bool isPath = ot == Path;
diff --git a/tdewallet/client/tdewallet.h b/tdewallet/client/tdewallet.h
index 613231908..d1dddba20 100644
--- a/tdewallet/client/tdewallet.h
+++ b/tdewallet/client/tdewallet.h
@@ -24,10 +24,6 @@
 
 #include <tqglobal.h>
 
-#ifdef Q_MOC_RUN
-#define Q_OS_UNIX
-#endif // Q_MOC_RUN
-
 #ifdef Q_OS_UNIX
 
 #include <tqstring.h>
@@ -52,7 +48,7 @@ namespace TDEWallet {
  */
 class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
 	K_DCOP
-	Q_OBJECT
+	TQ_OBJECT
 	protected:
 		/**
 		 *  Construct a TDEWallet object.
diff --git a/tdewallet/tests/CMakeLists.txt b/tdewallet/tests/CMakeLists.txt
index 9c64ac9af..5d75f8d70 100644
--- a/tdewallet/tests/CMakeLists.txt
+++ b/tdewallet/tests/CMakeLists.txt
@@ -26,7 +26,6 @@ link_directories(
 
 add_definitions (
     -DKDE_NO_COMPAT
-    -DTQT_NO_COMPAT
     -DTQT_NO_ASCII_CAST
 )
 
diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am
index 085c0630e..0f8ad9946 100644
--- a/tdewallet/tests/Makefile.am
+++ b/tdewallet/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
+AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)
 
 METASOURCES = AUTO
 check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth
diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp
index 57571bebb..54e618b70 100644
--- a/tdewallet/tests/tdewalletasync.cpp
+++ b/tdewallet/tests/tdewalletasync.cpp
@@ -22,11 +22,11 @@ void openWallet()
 	TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous );
 
 	WalletReceiver r;
-	r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
+	r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) );
 
 	_out << "About to start 30 second event loop" << endl;
 
-	TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
+	TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) );
 	int ret = tqApp->exec();
 
 	if ( ret == 0 )
diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp
index cc2819e0b..bdfc73f8f 100644
--- a/tdewallet/tests/tdewalletboth.cpp
+++ b/tdewallet/tests/tdewalletboth.cpp
@@ -22,7 +22,7 @@ void openWallet()
 	TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous );
 
 	WalletReceiver r;
-	r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) );
+	r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) );
 
 	_out << "About to ask for wallet sync" << endl;
 
@@ -31,7 +31,7 @@ void openWallet()
 	_out << "Got sync wallet: " << (wallet != 0) << endl;
 	_out << "About to start 30 second event loop" << endl;
 
-	TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) );
+	TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) );
 	int ret = tqApp->exec();
 
 
diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h
index a3ce51e48..426412864 100644
--- a/tdewallet/tests/tdewallettest.h
+++ b/tdewallet/tests/tdewallettest.h
@@ -7,7 +7,7 @@ namespace TDEWallet { class Wallet; }
 
 class WalletReceiver : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public slots:
 	void walletOpened( bool );
 };
diff --git a/tdewidgets/README b/tdewidgets/README
index d0ce8fcab..72ab6ee46 100644
--- a/tdewidgets/README
+++ b/tdewidgets/README
@@ -11,7 +11,7 @@ $TDEDIR/lib/trinity/plugins . With the KDE build system nothing special
 (i.e. editing the plugin path) is needed, as uic will automatically be
 called with -L <path to the tdewidgets plugin> .
 
-This plugin uses the QWidget plugin API of Qt >= 3.0
+This plugin uses the TQWidget plugin API of Qt >= 3.0
 Don't expect it to work with any other versions of Qt.
 
 
diff --git a/tdewidgets/kde.widgets b/tdewidgets/kde.widgets
index 787b6f336..28e31c78a 100644
--- a/tdewidgets/kde.widgets
+++ b/tdewidgets/kde.widgets
@@ -281,7 +281,7 @@ ConstructorArgs=(TDEABC::LdapConfigWidget::W_ALL, parent, name)
 IncludeFile=karrowbutton.h
 ToolTip=Draws a button which shows an arrow pointing into a certain direction.
 Group=Buttons (KDE)
-ConstructorArgs=(parent,Qt::UpArrow,name)
+ConstructorArgs=(parent,TQt::UpArrow,name)
 
 [KAnimWidget]
 IncludeFile=kanimwidget.h
diff --git a/tdewidgets/tests/test.widgets b/tdewidgets/tests/test.widgets
index e428d0711..e8acdb945 100644
--- a/tdewidgets/tests/test.widgets
+++ b/tdewidgets/tests/test.widgets
@@ -173,7 +173,7 @@ Group=Input (KDE)
 
 [KURLLabel]
 ToolTip=URL Label (KDE)
-ConstructorArgs=("KURLLabel", QString::null, parent, name)
+ConstructorArgs=("KURLLabel", TQString::null, parent, name)
 Group=Display (KDE)
 
 [KURLComboRequester]
diff --git a/translations/desktop_files/all_languages.desktop/af.po b/translations/desktop_files/all_languages.desktop/af.po
index 4e938c5e5..95e429a1c 100644
--- a/translations/desktop_files/all_languages.desktop/af.po
+++ b/translations/desktop_files/all_languages.desktop/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Engels"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britse Engels"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikaanse Engels"
 
 #. Name
@@ -198,719 +198,724 @@ msgstr "Spaans"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonianse"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persies)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Feense"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franse"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 #, fuzzy
 msgid "Frisian"
 msgstr "Farsi (Persies)"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ierse Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 #, fuzzy
 msgid "Gaelic"
 msgstr "Ierse Gaelic"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hibreüs"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatiese"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Hoog Serbiese"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongaars"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeens"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesië"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Yslandies"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiaans"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanees"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanees"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgiën"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kanadees"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koriaanse"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Deens"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latyn"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lithuaniese"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolees"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltees"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmees"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 #, fuzzy
 msgid "Norwegian Bokmål"
 msgstr "Noörweese Nynorsk"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Noord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Lae Saxon"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollands"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noörweese Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Suid"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Noord Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okkitaan"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poolse"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugese"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "Portugese"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romeens"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Romeens"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russies"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ukraïnies"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Noordelike Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakies"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveniese"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanees"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbiese"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serbiese"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Suid"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sweeds"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilies"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tajikees"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thaïs"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turks"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 #, fuzzy
 msgid "Tahitian"
 msgstr "Kroatiese"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraïnies"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Viëtnamees"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Sjinese"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Sjinese vereenvoudig"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Sjinese tradisioneel"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zoeloe"
diff --git a/translations/desktop_files/all_languages.desktop/all_languages.desktop.pot b/translations/desktop_files/all_languages.desktop/all_languages.desktop.pot
index e86db7c58..f443e3f1a 100644
--- a/translations/desktop_files/all_languages.desktop/all_languages.desktop.pot
+++ b/translations/desktop_files/all_languages.desktop/all_languages.desktop.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr ""
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
@@ -198,710 +198,715 @@ msgstr ""
 
 #. Name
 #: all_languages.desktop:74
-msgid "Estonian"
+msgid "Spanish (Argentina)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:76
-msgid "Basque"
+msgid "Estonian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:78
-msgid "Farsi (Persian)"
+msgid "Basque"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:80
-msgid "Finnish"
+msgid "Persian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:82
-msgid "Fijian"
+msgid "Finnish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:84
-msgid "Faroese"
+msgid "Fijian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:86
-msgid "French"
+msgid "Faroese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:88
-msgid "Frisian"
+msgid "French"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:90
-msgid "Irish Gaelic"
+msgid "Frisian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:92
-msgid "Gaelic"
+msgid "Irish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:94
-msgid "Galician"
+msgid "Gaelic"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:96
-msgid "Guarani"
+msgid "Galician"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:98
-msgid "Gujarati"
+msgid "Guarani"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:100
-msgid "Manx"
+msgid "Gujarati"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:102
-msgid "Hausa"
+msgid "Manx"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:104
-msgid "Hebrew"
+msgid "Hausa"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:106
-msgid "Hindi"
+msgid "Hebrew"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:108
-msgid "Hiri Motu"
+msgid "Hindi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:110
-msgid "Croatian"
+msgid "Hiri Motu"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:112
-msgid "Upper Sorbian"
+msgid "Croatian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:114
-msgid "Hungarian"
+msgid "Upper Sorbian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:116
-msgid "Armenian"
+msgid "Hungarian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:118
-msgid "Herero"
+msgid "Armenian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:120
-msgid "Interlingua"
+msgid "Herero"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:122
-msgid "Indonesian"
+msgid "Interlingua"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:124
-msgid "Interlingue"
+msgid "Indonesian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:126
-msgid "Inupiaq"
+msgid "Interlingue"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:128
-msgid "Ido"
+msgid "Inupiaq"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:130
-msgid "Icelandic"
+msgid "Ido"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:132
-msgid "Italian"
+msgid "Icelandic"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:134
-msgid "Inuktitut"
+msgid "Italian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:136
-msgid "Japanese"
+msgid "Inuktitut"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:138
-msgid "Javanese"
+msgid "Japanese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:140
-msgid "Georgian"
+msgid "Javanese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:142
-msgid "Kikuyu"
+msgid "Georgian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:144
-msgid "Kazakh"
+msgid "Kikuyu"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:146
-msgid "Kalaallisut"
+msgid "Kazakh"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:148
-msgid "Khmer"
+msgid "Kalaallisut"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:150
-msgid "Kannada"
+msgid "Khmer"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:152
-msgid "Korean"
+msgid "Kannada"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:154
-msgid "Kashmiri"
+msgid "Korean"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:156
-msgid "Kurdish"
+msgid "Kashmiri"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:158
-msgid "Komi"
+msgid "Kurdish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:160
-msgid "Cornish"
+msgid "Komi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:162
-msgid "Kirghiz"
+msgid "Cornish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:164
-msgid "Latin"
+msgid "Kirghiz"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:166
-msgid "Luxembourgish"
+msgid "Latin"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:168
-msgid "Limburgan"
+msgid "Luxembourgish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:170
-msgid "Lingala"
+msgid "Limburgan"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:172
-msgid "Lao"
+msgid "Lingala"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:174
-msgid "Lithuanian"
+msgid "Lao"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:176
-msgid "Latvian"
+msgid "Lithuanian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:178
-msgid "Malagasy"
+msgid "Latvian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:180
-msgid "Marshallese"
+msgid "Malagasy"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:182
-msgid "Maori"
+msgid "Marshallese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:184
-msgid "Macedonian"
+msgid "Maori"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:186
-msgid "Malayalam"
+msgid "Macedonian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:188
-msgid "Mongolian"
+msgid "Malayalam"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:190
-msgid "Moldavian"
+msgid "Mongolian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:192
-msgid "Marathi"
+msgid "Moldavian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:194
-msgid "Malay"
+msgid "Marathi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:196
-msgid "Maltese"
+msgid "Malay"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:198
-msgid "Burmese"
+msgid "Maltese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:200
-msgid "Nauru"
+msgid "Burmese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:202
-msgid "Norwegian Bokmål"
+msgid "Nauru"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:204
-msgid "Ndebele, North"
+msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:206
-msgid "Low Saxon"
+msgid "Ndebele, North"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:208
-msgid "Nepali"
+msgid "Low Saxon"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:210
-msgid "Ndonga"
+msgid "Nepali"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:212
-msgid "Dutch"
+msgid "Ndonga"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:214
-msgid "Norwegian Nynorsk"
+msgid "Dutch"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:216
-msgid "Ndebele, South"
+msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:218
-msgid "Northern Sotho"
+msgid "Ndebele, South"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:220
-msgid "Navajo"
+msgid "Northern Sotho"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:222
-msgid "Chichewa"
+msgid "Navajo"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:224
-msgid "Occitan"
+msgid "Chichewa"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:226
-msgid "Oromo"
+msgid "Occitan"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:228
-msgid "Oriya"
+msgid "Oromo"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:230
-msgid "Ossetian"
+msgid "Oriya"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:232
-msgid "Panjabi"
+msgid "Ossetian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:234
-msgid "Pali"
+msgid "Punjabi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:236
-msgid "Polish"
+msgid "Pali"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:238
-msgid "Pushto"
+msgid "Polish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:240
-msgid "Portuguese"
+msgid "Pushto"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+msgid "Portuguese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:244
-msgid "Quechua"
+msgid "Portuguese (Brazil)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:246
-msgid "Rundi"
+msgid "Quechua"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:248
-msgid "Romanian"
+msgid "Rundi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:250
-msgid "Romany"
+msgid "Romanian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:252
-msgid "Russian"
+msgid "Romany"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:254
-msgid "Kinyarwanda"
+msgid "Russian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:256
-msgid "Sanskrit"
+msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:258
-msgid "Sardinian"
+msgid "Sanskrit"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:260
-msgid "Sindhi"
+msgid "Sardinian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:262
-msgid "Northern Sami"
+msgid "Sindhi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:264
-msgid "Sango"
+msgid "Northern Sami"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:266
-msgid "Sinhalese"
+msgid "Sango"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:268
-msgid "Slovak"
+msgid "Sinhalese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:270
-msgid "Slovenian"
+msgid "Slovak"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:272
-msgid "Samoan"
+msgid "Slovenian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:274
-msgid "Shona"
+msgid "Samoan"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:276
-msgid "Somali"
+msgid "Shona"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:278
-msgid "Albanian"
+msgid "Somali"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:280
-msgid "Serbian"
+msgid "Albanian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:282
-msgid "Serbian Latin"
+msgid "Serbian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:284
-msgid "Swati"
+msgid "Serbian Latin"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:286
-msgid "Sotho, Southern"
+msgid "Swati"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:288
-msgid "Sundanese"
+msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:290
-msgid "Swedish"
+msgid "Sundanese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:292
-msgid "Swahili"
+msgid "Swedish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:294
-msgid "Tamil"
+msgid "Swahili"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:296
-msgid "Telugu"
+msgid "Tamil"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:298
-msgid "Tajik"
+msgid "Telugu"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:300
-msgid "Thai"
+msgid "Tajik"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:302
-msgid "Tigrinya"
+msgid "Thai"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:304
-msgid "Turkmen"
+msgid "Tigrinya"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:306
-msgid "Tswana"
+msgid "Turkmen"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:308
-msgid "Tonga"
+msgid "Tswana"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:310
-msgid "Turkish"
+msgid "Tonga"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:312
-msgid "Tsonga"
+msgid "Turkish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:314
-msgid "Tatar"
+msgid "Tsonga"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:316
-msgid "Twi"
+msgid "Tatar"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:318
-msgid "Tahitian"
+msgid "Twi"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:320
-msgid "Uighur"
+msgid "Tahitian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:322
-msgid "Ukrainian"
+msgid "Uighur"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:324
-msgid "Urdu"
+msgid "Ukrainian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:326
-msgid "Uzbek"
+msgid "Urdu"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:328
-msgid "Uzbek (Cyrillic)"
+msgid "Uzbek"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:330
-msgid "Venda"
+msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:332
-msgid "Vietnamese"
+msgid "Venda"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:334
-msgid "Volapük"
+msgid "Vietnamese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:336
-msgid "Walloon"
+msgid "Volapük"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:338
-msgid "Wolof"
+msgid "Walloon"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:340
-msgid "Xhosa"
+msgid "Wolof"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:342
-msgid "Yiddish"
+msgid "Xhosa"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:344
-msgid "Yoruba"
+msgid "Yiddish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:346
-msgid "Zhuang"
+msgid "Yoruba"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:348
-msgid "Chinese"
+msgid "Zhuang"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:350
-msgid "Chinese Simplified"
+msgid "Chinese"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:352
-msgid "Chinese (Hong Kong)"
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:354
-msgid "Chinese Traditional"
+msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:356
+msgid "Chinese (Traditional)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ar.po b/translations/desktop_files/all_languages.desktop/ar.po
index 3e50b6543..46e6baca3 100644
--- a/translations/desktop_files/all_languages.desktop/ar.po
+++ b/translations/desktop_files/all_languages.desktop/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "الإنجليزية"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "الإنجليزية"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "الإنجليزية"
 
 #. Name
@@ -200,715 +200,720 @@ msgstr "الأسبانية"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "الإستونية"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "الباسك"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "فارسي"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "الفنلندية"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "فيجي"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "فروي"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "الفرنسية"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "الفريزية"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "غالي"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "غالي"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "غوراني"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "جوجوراتي"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "مانكس"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "الهاوسا"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "العبرية"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "هندي"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "الهيري-موتو"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "الكرواتية"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "الصربية"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "الهنغارية (المجرية)"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "أرمني"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "الهيريرو"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "الإنترلينغوا"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "الإندونيسية"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "الإنترلينغوي"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "الإنوبياك"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "الإيدو"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "الآيسلندية"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "الإيطالية"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "الإنكتيتوت"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "اليابانية"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "جاويه"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "جورجي"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "الكيكويو"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "كزخي"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "الكالاليسوت"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "خميري"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "الكانادا"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "الكورية"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "كشميري"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "الكردية"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "الكومي"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "كورنش"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "قرغيز"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "لاتيني"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "لوكسمبورغي"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "الليمبورغية"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "اللينغالا"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "لاويه"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "الليتوانية"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "اللاتفية"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 #, fuzzy
 msgid "Malagasy"
 msgstr "مالاوية"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "المارشالية"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "الموري"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "المقدونية"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "المالايالام"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "منغولية"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "مولدوفية"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "الماراثي"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "مالاوية"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "المالطية"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "بورمي"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "الناورو"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "بوكماال النرويجية "
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "النديبيلي الشمالية"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "نيبالي"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "الندونغا"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "الهولندية"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "نينورسك النرويجية"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "النديبيلي الجنوبية"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "السوتو الشمالية"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "النافاجو"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "التشيشيوا"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "الأوكسيتانية"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "الأورومو"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "لغة أهل أوريسا )الهند("
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "الأوسيتية"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "بنجابي"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "البالي"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "البولندية"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "باشتو"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "البرتغالية"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "البرتغالية البرازيلية"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "الكويتشيوا"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "رواندي"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "الرومانية"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "الرومانية"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "الروسية"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "الكينارواندا"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "سنسيكريتي"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "الساردينية"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "سندي"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "السامي الشمالية"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "السانغو"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "السينهالية"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "السلوفاكية"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "السلوفينية"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "الساموية"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "الشونا"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "صومالي"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "ألباني"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "الصربية"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "الصربية"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "السواتي"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "السوتو الشمالية"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "سوداني"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "السويدية"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "سواحلي"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "التاميلية"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "التيلوغو"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "طاجيكي"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "التايلاندية"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "التيغرينيا"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "تركماني"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "التسوانا"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "تونجي"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "التركية"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "التسونغا"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "تتري"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "التوي"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "التاهيتية"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "الأويغورية"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "الأوكرانية"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "أوردي"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "أوزباكي"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "فيندا"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "الفييتنامية"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "الفولابوك"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "الوالون"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "الوولوف"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "الهاوسا"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "اليديش"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "اليوروبا"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "الزهوانغ"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "الصينية"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "الزولو"
diff --git a/translations/desktop_files/all_languages.desktop/az.po b/translations/desktop_files/all_languages.desktop/az.po
index 605590bf0..94d0a9b7e 100644
--- a/translations/desktop_files/all_languages.desktop/az.po
+++ b/translations/desktop_files/all_languages.desktop/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "İngliscə"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "İngliscə"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "İngliscə"
 
 #. Name
@@ -200,718 +200,723 @@ msgstr "İspanca"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonca"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskca"
 
 #. Name
-#: all_languages.desktop:78
+#: all_languages.desktop:80
 #, fuzzy
-msgid "Farsi (Persian)"
+msgid "Persian"
 msgstr "Friscə"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fincə"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijiyaca"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faroezcə"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransızca"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Friscə"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Qaelikcə"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Qaelikcə"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Quaranca"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Qujaraticə"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manksca"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Yəhudicə"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Xorvatca"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbcə"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Macarca"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Ermənicə"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "İnterlinqua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "İndoneziyaca"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 #, fuzzy
 msgid "Interlingue"
 msgstr "İnterlinqua"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "İnupiaqca"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "İslandiyaca"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "İtalyanca"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Yaponca"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Yavonca"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gürcücə"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuyuca"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Qazaxca"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalaallisutca"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Xmercə"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kannadaca"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreyaca"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaşmircə"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kürdcə"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komicə"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornişcə"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Qırğızca"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latınca"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lyuksemburqca"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburqca"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Linqalaca"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laoca"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litovca"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latışca"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malaqasicə"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marşallca"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoricə"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonca"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malayamca"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Monqolca"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavca"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maraticə"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malayca"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltaca"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmaca"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nauruca"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norveçcə (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Şimal"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalca"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Tongaca"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Flamenkcə"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norveçcə (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Cənub"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Şimali Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navayoca"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Çiçeva"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitan"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromoca"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Oriyaca"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetiyaca"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Panjabicə"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Punjabicə"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Palicə"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polyakca"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puştoca"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portuqalca"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Braziliya Portuqalcası"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kveçcə"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundicə"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumınca"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumınca"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusca"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyarvandaca"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskritcə"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ukrayna Dili"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Şimali Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sagno"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalca"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakca"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovencə"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanca"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbcə"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serbcə"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Svati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Cənubi"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanca"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "İsveçcə"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahilcə"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamil Dili"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Teluguca"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tacikcə"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tayca"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinyaca"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Türkməncə"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tsvanaca"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongaca"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Türkcə"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsongaca"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarca"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tvicə"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Taiticə"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uyğurca"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrayna Dili"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urduca"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Özbəkcə"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vyetnamca"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapükcə"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonca"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofca"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Yiddişcə"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Yorubaca"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zhuangca"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Çincə"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/be.po b/translations/desktop_files/all_languages.desktop/be.po
index d4483ee52..46844cd61 100644
--- a/translations/desktop_files/all_languages.desktop/be.po
+++ b/translations/desktop_files/all_languages.desktop/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Англійская"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Англійская брытанская"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Англійская амерыканская"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Іспанская"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Эстонская"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Басцкая"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Персідская"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Фінская"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фіджыйская"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фароская"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Французская"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фрысійская"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ірландская гальская"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Гальская"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галіцыйская"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуярані"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гуяраці"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Мэнкс"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хаўса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Габрэйская"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хіндзі"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хірымоту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Харвацкая"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Верхнялужыцкая"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Венгерская"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Армянская"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Хэрэра"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Інтэрлінгуа"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Інданэзійская"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Інтэрлінг"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Інупіцкая"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Ідо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Ісландская"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Італьянская"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Інуктытут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Японская"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Яванская"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузінская"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кікую"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казахская"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калаалісут"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Хмерская"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Канадская"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Карэйская"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмірская"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдская"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Комі"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корнская"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Кіргізская"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Лацінская"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксембургская"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лімбургская"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лінгальская"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лаоская"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Літоўская"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвійская"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагасійская"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршальская"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маорская"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонская"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малаяламская"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Мангольская"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Малдаўская"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Мараўская"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайская"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Мальтыйская"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бурмеская"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Наурскі"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Нарвежская (бокмаль)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндэбель (поўнач)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Ніжнесаксонская"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непальская"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Галандская"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Нарвежская (нюнорск)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндэбель (поўдзень)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Паўночнае Сота"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Наваё"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чычэва"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Акітанская"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Арома"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Орыя"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Асетынская"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панджабі"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Палі"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Польская"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пушту"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Партугальская"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Партугальская бразільская"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Кэчуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рундзі"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Румынская"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Раманская"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Расійская"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кіньярванда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрыт"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардынская"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Сіндхі"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Самі (поўнач)"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санга"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Сінгальская"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Славацкая"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Славенская"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоа"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Самалійская"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албанская"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сербская"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Сербская (лацініца)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Сваці"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Сота (поўдзень)"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сунданская"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведская"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Суахілі"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамільская"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Тэлугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Таджыцкая"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайская"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тыгрынья"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркменская"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Цвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турэцкая"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Цонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарская"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Тві"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Таіцкая"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Уігур"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украінская"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбецкая"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "В'етнамская"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Валапук"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валонская"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волаф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Кшоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Ідыш"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Яруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Цванг"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Кітайская"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Кітайская спрошчаная"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Кітайская (Гонг-Конг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Кітайская традыцыйная"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулуская"
diff --git a/translations/desktop_files/all_languages.desktop/bg.po b/translations/desktop_files/all_languages.desktop/bg.po
index 41615097f..2467e455f 100644
--- a/translations/desktop_files/all_languages.desktop/bg.po
+++ b/translations/desktop_files/all_languages.desktop/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Английски"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Британски английски"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Американски английски"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Испански"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Естонски"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскийски"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фарси"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Фински"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фиджи"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фарьорски"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Френски"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризийски"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ирландски"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Гаелски"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галисийски"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарани"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гуджарати"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкски"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Иврит"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хинди"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хърватски"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Горносорбийски"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Унгарски"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Арменски"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Хереро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингва"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезийски"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Оксидентал"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиак"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландски"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Италиански"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Японски"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Явайски"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузински"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикю"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казахски"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калисути"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кхмерски"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Каннада"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корейски"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмири"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Кюрдски"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Комизирянски"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корнуълски"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Киргизки"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латински"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксембургски"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбургански"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингала"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лаоски"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литовски"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвийски"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагашки"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Ебон"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маори"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонски"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малаялам"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Монголски"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдовски"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Маратхи"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайски"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Малтийски"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бирмански"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвежки (букмол)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Северен Ндебеле"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Долносаксонски"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непали"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Холандски"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвежки (нюнорск)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Южен Ндебеле"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Северен Сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Навахо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чеуа"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Окситански"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Афан Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ория"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетински"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панджаби"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Полски"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пущу"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португалски"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразилски португалски"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Кечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Руанда"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Румънски"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Ромски"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Руски"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кинияруанда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардински"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдхи"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Северен Сами"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Сангро"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Сингалски"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словашки"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенски"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоански"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомали"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албански"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сръбски"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Сръбски латински"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Суази"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Южен Сото"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сундански"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведски"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Суахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамилски"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Таджикски"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайски"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигриня"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркменски"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Тсуана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турски"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Тсонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарски"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Туи"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Таитски"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Югхур"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украински"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбекски"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Узбекски (кирилица)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Виетнамски"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапюк"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валонски"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Уолоф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Ксоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Идиш"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Йоруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Жуанг"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Китайски"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Китайски опростен"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Китайски (Хонг Конг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Китайски традиционен"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/bn.po b/translations/desktop_files/all_languages.desktop/bn.po
index 353621cc8..7f483882a 100644
--- a/translations/desktop_files/all_languages.desktop/bn.po
+++ b/translations/desktop_files/all_languages.desktop/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "ইংরেজ"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "বৃটিশ ইংরেজি"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "মার্কিন ইংরেজি"
 
 #. Name
@@ -198,712 +198,717 @@ msgstr "স্প্যানিশ"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "এস্টোনীয়"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "বাস্ক"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "ফার্সি (পার্সিয়ান)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ফিনিশ"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ফিজিয়ান"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ফারোইস"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "ফরাসী"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ফ্রিসিয়ান"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "আইরিশ গেলিক"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "গেলিক"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "গেলিসিয়ান"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "গুয়ারানি"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "গুজরাতী"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "মানক্স"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "হাউসা"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "হীব্রু"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "হিন্দী"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "হিরি মোটু"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "ক্রোয়েশীয়"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "উচ্চ সার্বীয়"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "হাঙ্গারীয়"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "আর্মেনীয়"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "হেরেরো"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "ইন্টারলিঙ্গুয়া"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "ইন্দোনেশীয়"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "ইন্টারলিং"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "ইনুপিয়াক"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ইডো"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "আইসল্যান্ডিক"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "ইতালীয়"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "ইনাক্টিটুট"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "জাপানী"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "জাভানিস"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "জর্জিয়ান"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "কিকুয়ু"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "কাজাখ"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "কালালিসুট"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "খমের"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "কন্নাডা"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "কোরীয়"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "কাশ্মীরি"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "কুর্দিশ"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "কোমি"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "কর্নিশ"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "কার্ঘিস"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "লাতিন"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "লাক্সেমবার্গিশ"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "লিমবার্গান"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "লিঙ্গালা"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "লাও"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "লিথুয়েনীয়"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "লাটভিয়ান"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "মালাগাসি"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "মার্শালিস"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "মাওরি"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "মাসিডোনীয়"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "মালয়লম"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "মোঙ্গল"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "মলডেভীয়"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "মরাঠী"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "মালয়"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "মল্টিস"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "বর্মী"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "নাউরু"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "নরওয়েজীয় বোকমাল"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "ন্‌দেবেলে, উত্তর"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "নিম্ন স্যাক্সন"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "নেপালী"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "নডোঙ্গা"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "ওলন্দাজ"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "নরওয়েজীয় নাইনর্স্ক"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "ন্‌দেবেলে, দক্ষিণ"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "উত্তর সোথো"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "নাভায়ো"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "চিচেওয়া"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ওক্সিটান"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ওরোমো"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ওড়িয়া"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ওসেটিয়ান"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "পাঞ্জাবী"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "পালি"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "পোলিশ"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "পুস্ত"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "পর্তুগীজ"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ব্রাজিলীয় পর্তুগীজ"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "কেচুয়া"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "রুণ্ডি"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "রোমানীয়"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "রোমানীয়"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "রুশ"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "কিন্যারওয়াণ্ডা"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "সংস্কৃত"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "সার্ডিনিয়ান"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "সিন্ধি"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "উত্তর সামি"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "সাংগো"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "সিংহলী"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "স্লোভাক"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "স্লোভেনীয়"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "সামোয়ান"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "শোনা"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "সোমালীয়"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "আলবেনীয়"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "সার্বীয়"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "সার্বীয়"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "সোয়াতি"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "সোথো, দক্ষিণ"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "সুন্দানিজ"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "সুইডিশ"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "সোয়াহিলি"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "তামিল"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "তেলেগু"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "তাজিক"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "থাই"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "টিগ্রিন্যা"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "তুর্কমেন"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "তসওয়ানা"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "টংগা"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "তুর্কী"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "তসংগা"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "তাতার"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "টুয়ি"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "তাহিশিয়ান"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "উইঘুর"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ইউক্রেনীয়"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "উর্দু"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "উজবেক"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "ভেণ্ডা"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "ভিয়েতনামী"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "ভোলাপুক"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "ওয়ালুন"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "ওয়োলফ"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "জোসা"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "য়িড্ডিশ"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "য়োরুবা"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "ঝুয়াং"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "চৈনিক"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "সরলীকৃত চৈনিক"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "পারম্পরিক চৈনিক"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "জুলু"
diff --git a/translations/desktop_files/all_languages.desktop/br.po b/translations/desktop_files/all_languages.desktop/br.po
index 6e842424e..e15914bb5 100644
--- a/translations/desktop_files/all_languages.desktop/br.po
+++ b/translations/desktop_files/all_languages.desktop/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Saozneg"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Saozneg eus Bro Saoz"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Saozneg eus SUA"
 
 #. Name
@@ -199,714 +199,719 @@ msgstr "Spagnoleg"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoneg"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Euskareg"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsieg (Persieg)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finneg"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidjeg"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faroeseg"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Galleg"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisianeg"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Iwerzhoneg eus Bro Iwerzhon"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Iwerzhoneg"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiseg"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gujaratieg"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manav"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Haousa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreeg"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroateg"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sorab uhel"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hungareg"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenieg"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 #, fuzzy
 msgid "Interlingua"
 msgstr "Interlingeg"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneseg"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingeg"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandeg"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italianeg"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japaneg"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javaneg"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Jeorjieg"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazakstaneg"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmereg"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kanada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreeg"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdeg"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Korneveg"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgistaneg"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksembourgeg"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgeg"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingaleg"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituaneg"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvieg"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagacheg"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Yezh an enez Marshall"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorieg"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedoneg"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Maya"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolieg"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldaveg"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marateg"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Maya"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteg"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmaneg"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naurueg"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegeg Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Norzh"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Saozeg izel"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepaleg"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Inizi Tonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlandeg"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegeg Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Su"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Soto, Norzh"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitaneg"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetieg"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pendjabieg"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Palieg"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poloneg"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugaleg"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugaleg Brazil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kechuaeg"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Roumaneg"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Jipsianek"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusianeg"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinieg"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindhieg"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami, Norzh"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singaleg"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Sloveg"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenieg"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalieg"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanieg"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbeg"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbeg latin"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Soto, Su"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Soudaneg"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svedeg"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamouleg"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telegu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tajiek"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tailh"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Inizi Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkeg"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 #, fuzzy
 msgid "Tsonga"
 msgstr "Inizi Tonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatareg"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitieg"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainiek"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Ouzbeg"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Viet-Nameg"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapuk"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walloneg"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Sinaeg"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Sineg eeun"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Sinaeg (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Sinaeg da gustum"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zouloued"
diff --git a/translations/desktop_files/all_languages.desktop/bs.po b/translations/desktop_files/all_languages.desktop/bs.po
index 96243a1c6..7b2134fc6 100644
--- a/translations/desktop_files/all_languages.desktop/bs.po
+++ b/translations/desktop_files/all_languages.desktop/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engleski"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britanski engleski"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Američki engleski"
 
 #. Name
@@ -199,713 +199,718 @@ msgstr "Španski"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonski"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskijski"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Perzijski)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finski"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidžijski"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farski"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francuski"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizijski"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irski Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 #, fuzzy
 msgid "Gaelic"
 msgstr "Irski Gaelic"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicijski"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrejski"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Hrvatski"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Gornji lužičkosrpski"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Mađarski"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenski"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezijski"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandski"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Talijanski"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanski"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanski"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzijski"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazaški"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmerski"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korejski"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmirski"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdski"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornski"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiški"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latinski"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburški"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburški"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litvanski"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvijski"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 #, fuzzy
 msgid "Malagasy"
 msgstr "Malajski"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršalski"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorski"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonski"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malajski"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolski"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavski"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajski"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteški"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmanski"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norveški Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Sjeverni"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Niži saksonski"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalski"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nizozemski"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norveški Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Južni"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sjeverni Soto"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetski"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poljski"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalski"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazilski portugalski"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumunski"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romanski"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruski"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinijski"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sjeverni Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhaleški"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovački"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenački"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanski"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalijski"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanski"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Srpski"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Srpski latinica"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Soto, Južni"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundaneški"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Švedski"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilski"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžički"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tajlandski"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenski"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turski"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarski"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahićanski"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgurski"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbečki"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vijetnamski"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonski"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kineski"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Kineski pojednostavljeni"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kineski (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Kineski tradicionalni"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ca.po b/translations/desktop_files/all_languages.desktop/ca.po
index b04226454..9e5ba6ff9 100644
--- a/translations/desktop_files/all_languages.desktop/ca.po
+++ b/translations/desktop_files/all_languages.desktop/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Anglès"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Anglès britànic"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Anglès americà"
 
 #. Name
@@ -198,712 +198,717 @@ msgstr "Espanyol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonià"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basc"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persa)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finès"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijí"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Feroès"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francès"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisó"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlandès gaèlic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaèlic"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gallec"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaraní"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croat"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Alt sòrab"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongarès"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeni"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesi"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandès"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italià"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonès"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanès"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgià"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreà"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurd"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Danès"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Llatí"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburguès"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgà"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laosià"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituà"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letó"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgaix"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallès"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedoni"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malai"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldau"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malai"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltès"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmès"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Noruec Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Nord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Baix saxó"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalí"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandès"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noruec Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Sud"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho del nord"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occità"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Oseti"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polonès"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pashto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portuguès"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasiler Portuguès"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romanès"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Caló"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rus"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sard"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami del nord"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalès"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovè"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Eslovè"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanès"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalí"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanès"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbi"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbi llatí"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho del sud"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanès"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suec"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tàmil"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turcmeni"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turc"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitià"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucraïnès"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urdú"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbek (Ciríl·lic)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Xinès"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Xinès simplificat"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Xinès (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Xinès tradicional"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/cs.po b/translations/desktop_files/all_languages.desktop/cs.po
index 7cae6d69b..43934812d 100644
--- a/translations/desktop_files/all_languages.desktop/cs.po
+++ b/translations/desktop_files/all_languages.desktop/cs.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
-"PO-Revision-Date: 2020-10-07 17:20+0000\n"
+"POT-Creation-Date: 2020-11-25 17:36+0100\n"
+"PO-Revision-Date: 2020-11-25 19:48+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdelibs/all-languages/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.2.2\n"
+"X-Generator: Weblate 4.3.2\n"
 
 #. Name
 #: all_languages.desktop:2
@@ -179,12 +179,12 @@ msgstr "Angličtina"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Angličtina (Spojené království)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Angličtina (Spojené státy)"
 
 #. Name
@@ -199,710 +199,715 @@ msgstr "Španělština"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr "Španělština (Argentina)"
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonština"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskičtina"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Perština"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finština"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidžijština"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faerština"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francouzština"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Fríština"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irština"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaelština"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicijština"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaranština"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudžarátština"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manština"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hauština"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrejština"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindština"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Chorvatština"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Hornolužičtina"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Maďarština"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Arménština"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hererština"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonéština"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Occidental"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiaq"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandština"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italština"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inuitština"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonština"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javánština"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzínština"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikujština"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazaština"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Grónština"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Centrální khmerština"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kannadština"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korejština"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmírština"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdština"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komijština"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornština"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kyrgyzština"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latina"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lucemburština"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburština"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Ngalština"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laoština"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litevština"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lotyština"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgaština"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršálština"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorština"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonština"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajálamština"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolština"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavština"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maráthština"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajština"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltština"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Barmština"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naurština"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norština (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Severní ndebelština"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Dolnoněmčina"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepálština"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndondština"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nizozemština"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norština (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Jižní ndebelština"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Severní sotština"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navažština"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Čičevština"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okcitánština"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromština"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Urijština"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetština"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Paňdžábština"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Páli"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polština"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paštština"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalština"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugalština (Brazílie)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kečuánština"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumunština"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romština"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruština"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Rwandština"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskrt"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinština"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindhština"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Severní sámština"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangoština"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhálština"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovenština"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovinština"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samojština"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Šonština"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somálština"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albánština"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Srbština"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Srbština (latinka)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Svazijština"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Jižní sotho"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundánština"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Švédština"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahilština"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilština"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telužština"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tádžičtina"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thajština"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigriňa"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenština"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tswanština"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongánština"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turečtina"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarština"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Ťwiština"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitština"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgurština"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrajinština"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urdština"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbečtina"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbečtina (cyrillic)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Vendština"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamština"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonština"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofština"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xhoština"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Jorubština"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Čuangština"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Čínština"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Čínština (zjednodušená)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Čínština (tradiční, Hongkong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Čínština (tradiční)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulština"
diff --git a/translations/desktop_files/all_languages.desktop/csb.po b/translations/desktop_files/all_languages.desktop/csb.po
index b607a2548..f91d03c2e 100644
--- a/translations/desktop_files/all_languages.desktop/csb.po
+++ b/translations/desktop_files/all_languages.desktop/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Anielsczi"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britijsczi anielsczi"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikańsczi anielsczi"
 
 #. Name
@@ -199,711 +199,716 @@ msgstr "Szpańsczi"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estońsczi"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskijsczi"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (persczi)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finsczi"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "z Fiji"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "z Òwczëch Òstrowów"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francësczi"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizëjsczi"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlandzczi Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Celtycczi (gaelic)"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicëjsczi"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Marathi (hindusczi)"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrejsczi"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Chòrwacczi"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Górnosorbsczi"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Madżarsczi"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeńsczi"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezëjsczi"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandzczi"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italsczi"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japòńsczi"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jawańsczi"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Grëzóńsczi"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazachsczi"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khmersczi"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Kòrejańsczi"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaszmirsczi"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kùrdijsczi"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "z Komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kòrnwalijsczi"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgijsczi"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Łacëzna"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksembùrsczi"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limbùrgańsczi"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laòtańsczi"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litewsczi"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Łotewsczi"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Madagarsczi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "z Òstrowów Marshalla"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maòrëjsczi"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedońsczi"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Drawidańsczi (hindusczi)"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mòngolsczi"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Mòłdawsczi"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marathi (hindusczi)"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajsczi"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltajsczi"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmańsczi"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norwesczi Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Norda"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Dolnosaksońsczi"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalsczi"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hòlandzczi"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwesczi Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Pôłnie"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nordowé Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Òkcitańsczi"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Òsetańsczi"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pendżabsczi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pòlsczi"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Pòrtugalsczi"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazylsczi pòrtugalsczi"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumùńsczi"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Rumùńsczi"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusczi"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardińsczi"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Nordowi Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Synagelsczi"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Słowacczi"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slowensczi"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoańsczi"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalijsczi"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albańsczi"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbsczi"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbsczi (łacëńsczi)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Pôłniowi"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudańsczi"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Szwedzczi"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilsczi"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadżëcczi"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tajsczi"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeńsczi"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tërecczi"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarsczi"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitańsczi"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgùrsczi"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ùkrajińsczi"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Ùzbecczi"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Wietnamsczi"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walońsczi"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidisz"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chińsczi"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chińsczi Prosti"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chińsczi (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chińsczi Tradicëjny"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulusczi"
diff --git a/translations/desktop_files/all_languages.desktop/cy.po b/translations/desktop_files/all_languages.desktop/cy.po
index 8e5fae502..689d1ed7c 100644
--- a/translations/desktop_files/all_languages.desktop/cy.po
+++ b/translations/desktop_files/all_languages.desktop/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,13 +178,13 @@ msgstr "Saesneg"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Saesneg Prydain"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Saesneg Prydain"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Sbaeneg"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoneg"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basgeg"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Perseg)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Ffineg"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijieg"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faroeg"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Frangeg"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisieg"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Gaeleg"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaeleg"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiseg"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manneg"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Iddeweg"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindw^"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croatieg"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sorbieg Uchaf"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hwngareg"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeineg"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hausa"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesieg"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandeg"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Eidaleg"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japaneg"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javaneg"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgeg"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreëg"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kwrdeg"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cernyweg"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Lladin"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxembwrgeg"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limbwrgeg"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lithuaneg"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latfieg"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshalleg"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedoneg"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoleg"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldafeg"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteg"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmeg"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Bokmal Norwyeg"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Gogledd"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Sacsoneg Isel"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Iseldireg"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Nynorsk Norwyeg"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, De"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho'r Gogledd"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitaneg"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Oseteg"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pwyleg"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portiwgaleg"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portiwgaleg Brasil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rwndi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romaneg"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Romaneg"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rwsieg"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sansgrit"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinieg"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami'r Gogledd"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhaleg"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Sloveg"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveneg"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoeg"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albaneg"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbieg"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbieg Lladin"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, De"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundaneg"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Swedeg"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Twrcmeneg"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Twrceg"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitieg"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraineg"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Wrdw"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Wzbec"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnameg"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapuk"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Woloff"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Yideg"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Tseineeg"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Tseineeg Syml"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Tsieineeg Traddodiadol"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/da.po b/translations/desktop_files/all_languages.desktop/da.po
index 51f0b0a77..82f7ce4ef 100644
--- a/translations/desktop_files/all_languages.desktop/da.po
+++ b/translations/desktop_files/all_languages.desktop/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engelsk"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britisk engelsk"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikansk engelsk"
 
 #. Name
@@ -199,711 +199,716 @@ msgstr "Spansk"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estisk"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisk"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persisk)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finsk"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijiansk"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Færøsk"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransk"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisisk"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irsk gælisk"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gælisk"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicisk"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Mansk"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebraisk"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatisk"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Øvre Sorbisk"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armensk"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesisk"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandsk"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiensk"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japansk"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javansk"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgisk"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreansk"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kashmirsk"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdisk"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornisk"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgansk"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litauisk"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettisk"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallesisk"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonisk"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolsk"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldovisk"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesisk"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norsk bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, nord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Nedersaksisk"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollandsk"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, syd"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nord Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polsk"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugisisk"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasiliansk portugisisk"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumænsk"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumænsk"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russisk"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinsk"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Nordsamisk"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalesisk"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakisk"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovensk"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoansk"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalisk"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albansk"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbisk"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbisk latin"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, syd"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundansk"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svensk"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilsk"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thailandsk"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitisk"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbekisk (kyrillisk)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapyk"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallonsk"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kinesisk"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Kinesisk simplificeret"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kinesisk (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Kinesisk traditionel"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/de.po b/translations/desktop_files/all_languages.desktop/de.po
index c8035bd0f..bc4c3fea9 100644
--- a/translations/desktop_files/all_languages.desktop/de.po
+++ b/translations/desktop_files/all_languages.desktop/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Englisch"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Englisch (UK)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Englisch (US)"
 
 #. Name
@@ -198,713 +198,718 @@ msgstr "Spanisch"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estnisch"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisch"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persisch)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finnisch"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidschi"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Färöisch"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Französisch"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Friesisch"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irisches Gälisch"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gälisch"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicisch"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebräisch"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatisch"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Obersorbisch"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungarisch"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenisch"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesisch"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Isländisch"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italienisch"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanisch"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanisch"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgisch"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kasachisch"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreanisch"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdisch"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornisch"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgisisch"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latein"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgisch"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgisch"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laotisch"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litauisch"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettisch"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Madagassisch"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallisch"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Mazedonisch"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaiisch"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolisch"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldawisch"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaiisch"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesisch"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesisch"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nauruisch"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norwegisch (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele (nördliches)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Niederdeutsch"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalesisch"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Oshivambo"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Niederländisch"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwegisch (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele (südliches)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nord-Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Nyanja"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okzitanisch"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetisch"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandschabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polnisch"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paschtu"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasilianisches Portugiesisch"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumänisch"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russisch"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardisch"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Nördliches Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singhalesisch"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slowakisch"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slowenisch"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanisch"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanisch"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbisch"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbisch (lat. Alphabet)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Südliches Sotho"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesisch"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Schwedisch"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suaheli"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadschikisch"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenisch"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Oshivambo"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Türkisch"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 #, fuzzy
 msgid "Tsonga"
 msgstr "Oshivambo"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarisch"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitianisch"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uigurisch"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainisch"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbekisch"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Usbekisch (Kyrillisch)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Tshivenda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Wallonisch"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "isiXhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinesisch"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinesisch (vereinfachtes)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinesisch (Hongkong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinesisch (traditionelles)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/el.po b/translations/desktop_files/all_languages.desktop/el.po
index 994d32fb2..5aaae3037 100644
--- a/translations/desktop_files/all_languages.desktop/el.po
+++ b/translations/desktop_files/all_languages.desktop/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Αγγλικά"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Αγγλικά (Μ. Βρετανίας)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Αγγλικά (Αμερικής)"
 
 #. Name
@@ -198,717 +198,722 @@ msgstr "Ισπανικά"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Εσθονικά"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Βασκικά"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Περσικά)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Φιλανδικά"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Γαλλικά"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 #, fuzzy
 msgid "Frisian"
 msgstr "Farsi (Περσικά)"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Γκουαράνι"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Εβραϊκά"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Κροατικά"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Σερβικά"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ουγγρικά"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Αρμενικά"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Ινδονησιακά"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Ισλανδικά"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Ιταλικά"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Ιαπωνικά"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Ιαπωνικά"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Γεωργιανά"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Καζαχικά"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Κορεάτικα"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Κουρδικά"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Κορνουαλικά"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Λατινικά"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Λουξεμβουργικά"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Λιθουανικά"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Λεττονικά"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Μαλγασικά"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Μαορί"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Σλαβομακεδονικά"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Μογγολικά"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Μολδαβικά"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 #, fuzzy
 msgid "Malay"
 msgstr "Μαλγασικά"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Μαλτέζικα"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Βιρμανικά"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Ναουρού"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Νορβηγικά Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Τόνγκα"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Νορβηγικά Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Νάβαχο"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Πολωνικά"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Πορτογαλικά Βραζιλίας"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Ρουμανικά"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Ρουμανία"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ρωσικά"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Σανσκριτικά"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Σαρδηνιακά"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Σλοβακικά"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Σλοβενικά"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Σαμοανικά"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Σομαλικά"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Αλβανικά"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Σερβικά"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Σερβικά (Λατινικά)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Σουηδικά"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Σουαχίλι"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Τατζικικά"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Ταϊλανδικά"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Τουρκμενικά"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Τόνγκα"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Τουρκικά"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 #, fuzzy
 msgid "Tsonga"
 msgstr "Τόνγκα"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 #, fuzzy
 msgid "Tahitian"
 msgstr "Κροατικά"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ουκρανικά"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Ουζμπεκικά"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Ουζμπεκικά (Κυριλικά)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Βιετναμέζικα"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Κινέζικα"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Κινέζικα απλά"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Κινέζικα (Χονγκ Κονγκ)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Κινέζικα παραδοσιακά"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/eo.po b/translations/desktop_files/all_languages.desktop/eo.po
index 06b8b8c0c..2c6317553 100644
--- a/translations/desktop_files/all_languages.desktop/eo.po
+++ b/translations/desktop_files/all_languages.desktop/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Angla"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Brita Angla"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Usona Angla"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Hispana"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estlanda"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Vaska"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Frisa (Persa)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fina"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fiĝia"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Feroa"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franca"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisa"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlanda Gaela"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaela"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gaela"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Gvarania"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Guĝarata"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manksa"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Haŭsa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrea"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hinda"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri-Motuo"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroata"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Supra Soraba"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hungara"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armena"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Herera"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Interlingvao"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezia"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingveo"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inuita"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islanda"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Itala"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japana"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Java"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Kartvela"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazaĥa"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmera"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korea"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaŝmira"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurda"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komia"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornvala"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiza"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latino"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburga"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburga"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laŭa"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litova"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvia"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasa"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marŝala"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoria"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedonia"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajalama"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongola"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldava"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marata"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaja"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malta"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birma"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naura"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvega (Bokmal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Norda Ndebele"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Malsupra Saksa"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepala"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Conga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlanda"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvega (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Suda Ndebele"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Norda Sotoa"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaha"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Ĉiĉeva"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okcitana"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oroma"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orijo"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Oseta"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Panĝaba"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Palio"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pola"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paŝtua"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugala"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugala (Brazilo)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Keĉua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Ruanda"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumana"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romaa"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusa"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskrito"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sarda"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sinda"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Norda Samea"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangoa"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhala"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovaka"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovena"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoa"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Ŝona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somala"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albana"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serba"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serba Latina alfabeto"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Suda Sota"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sunda"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sveda"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahila"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamila"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telugua"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Taĝika"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Taja"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigraja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmena"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Cvana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Conga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turka"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Conga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatara"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitia"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgura"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraina"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urduo"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbeka"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapuko"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valona"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofa"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Ĥosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jida"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Ĉina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Simpla Ĉina"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Ĉina (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Tradicia Ĉina"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulua"
diff --git a/translations/desktop_files/all_languages.desktop/es.po b/translations/desktop_files/all_languages.desktop/es.po
index bfb61c36c..8ad9ee18c 100644
--- a/translations/desktop_files/all_languages.desktop/es.po
+++ b/translations/desktop_files/all_languages.desktop/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Inglés"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglés británico"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglés americano"
 
 #. Name
@@ -199,713 +199,718 @@ msgstr "Español"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonio"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Vasco"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Persa"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finés"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fiyiano"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Feroés"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francés"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisio"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaélico irlandés"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaélico"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gallego"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaraní"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Maratí"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreo"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croata"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Serbio superior"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Húngaro"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenio"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 #, fuzzy
 msgid "Interlingua"
 msgstr "Interlinga"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesio"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlinga"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandés"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiano"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonés"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanés"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgiano"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazajo"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreano"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdo"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Danés"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirguiz"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latín"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgués"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgano"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laosiano"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvio"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasio"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshalés"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorí"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedonio"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malayo"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavo"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maratí"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malayo"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltés"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmés"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Noruego Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele del norte"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Sajón bajo"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalí"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandés"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noruego Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele del sur"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho del norte"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitano"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetio"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Punjabí"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Palí"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polaco"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pastún"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugués"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugués brasileño"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumano"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Rumaní"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruso"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanscrito"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardo"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Samí del norte"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalés"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovaco"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Esloveno"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoano"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalí"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanés"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbio"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Latín Serbio"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho del sur"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudanés"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sueco"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tayiko"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tailandés"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenio"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiano"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucranio"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbeko"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbeko (Cirílico)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chino"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chino simplificado"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chino (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chino tradicional"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulú"
diff --git a/translations/desktop_files/all_languages.desktop/et.po b/translations/desktop_files/all_languages.desktop/et.po
index 5a6cee69a..c65bc979f 100644
--- a/translations/desktop_files/all_languages.desktop/et.po
+++ b/translations/desktop_files/all_languages.desktop/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Inglise"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Briti inglise"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Ameerika inglise"
 
 #. Name
@@ -199,711 +199,716 @@ msgstr "Hispaania"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Eesti"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baski"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (pärsia)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Soome"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidži"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Fääri"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Prantsuse"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Friisi"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Iiri gaeli"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaeli"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galeegi"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaranii"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudžarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Mänksi"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Heebrea"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Horvaadi"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Ülemsorbi"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungari"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeenia"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneesia"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandi"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Itaalia"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Jaapani"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jaava"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruusia"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuju"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kasahhi"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khmeeri"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korea"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmiiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdi"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Korni"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiisi"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Ladina"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburgi"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgi"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Leedu"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Läti"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagassi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršalli"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedoonia"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajalami"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoolia"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldaavia"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 #, fuzzy
 msgid "Marathi"
 msgstr "Gudžarati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaisia"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malta"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birma"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norra bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Põhja-ndebele"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Alamsaksi"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepaali"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollandi"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norra nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Lõuna-ndebele"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Põhja-sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oktsitaani"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orija"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osseedi"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandžabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Paali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poola"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puštu"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugali"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasiilia portugali"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Ketšua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumeenia"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Mustlaskeel"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Vene"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Ruanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskriti"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiinia"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Põhja-saami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singaleesi"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovaki"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveeni"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoa"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somaali"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albaania"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbia (ladina)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Svaasi"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Lõuna-sotho"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sunda"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Rootsi"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suahiili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamili"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžiki"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tai"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeeni"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tsvana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Türgi"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatari"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tvii"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uiguuri"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraina"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbeki"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Usbeki (kirillitsa)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnami"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallooni"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofi"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zhuangi"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Hiina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Hiina (lihtsustatud)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Hiina (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Hiina (traditsiooniline)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Suulu"
diff --git a/translations/desktop_files/all_languages.desktop/eu.po b/translations/desktop_files/all_languages.desktop/eu.po
index f5f4daada..bf5c00d00 100644
--- a/translations/desktop_files/all_languages.desktop/eu.po
+++ b/translations/desktop_files/all_languages.desktop/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Ingelesa"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Ingelesa (britainiarra)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Ingelesa (amerikarra)"
 
 #. Name
@@ -198,713 +198,718 @@ msgstr "Gaztelera"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoniera"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Euskara"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsiera (Persiera)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandiera"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijiera"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faroera"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Frantsesa"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisiera"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlandar gaelikoa"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaelikoa"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiziera"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaraniera"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gujaratera"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manera"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreera"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroaziera"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Goi Serbiera"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hungariera"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeniera"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesiera"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandiera"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiera"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japoniera"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javera"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgiera"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazakhera"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreera"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaxmirera"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Turkiera"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komoreera"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Daniera"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiera"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latina"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxenburgera"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laosera"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituaniera"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letoniera"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Madagaskarera"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallera"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoria"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Mazedoniera"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaysiera"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoliera"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldabiera"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marathera"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaysiera"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltera"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmaniera"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nauruera"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegiera (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebelera (iparraldekoa)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Beheko Sajoniera"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalera"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Tongera"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlandera"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegiera (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebelera (hegoaldekoa)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sothoera (iparraldekoa)"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okzitaniera"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetiera"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Punjabera"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poloniera"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paxtuera"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugesa"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugesa (Brasilgoa)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kitxua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Errumaniera"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Errumaniera"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Errusiera"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyaruanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskritoa"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiera"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Samia (iparrekoa)"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhala"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovakiera"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Esloveniera"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoera"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somaliera"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albaniera"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbiera"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbiera (Latina)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sothoera (egoaldekoa)"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanera"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suediera"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Swahiliera"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilera"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadjikera"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thailandiera"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeniera"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tswanera"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongera"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkiera"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsongera"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatariera"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiera"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainiera"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbekera"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamera"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Waloiera"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Wolofera"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xhosera"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Jorubera"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Txinera"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Txinatar soildua"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Txinera (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Txinatar tradizionala"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zuluera"
diff --git a/translations/desktop_files/all_languages.desktop/fa.po b/translations/desktop_files/all_languages.desktop/fa.po
index 75fdd19e1..0363cdd57 100644
--- a/translations/desktop_files/all_languages.desktop/fa.po
+++ b/translations/desktop_files/all_languages.desktop/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "انگلیسی"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "انگلیسی بریتانیایی"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "انگلیسی امریکایی"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "اسپانیایی"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "استونیایی"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "باسکی"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "فارسی"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "فنلاندی"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "فیجیایی"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "فاروسی"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "فرانسوی"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "فریسی"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "اسکاتلندی ایرلندی"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "اسکاتلندی"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "اسکاتلندی"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "گوارانی"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "گجراتی"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "مانکسی"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "هوسا"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "عبری"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "هندی"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "هیری موتو"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "کروواسیایی"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "صربستان شمالی"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "مجارستانی"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "ارمنی"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "هررو"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "میان زبانی"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "اندونزیایی"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "میان زبانی"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "اینوپیاک"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ایدو"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "ایسلندی"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "ایتالیایی"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "اینوکتیتوت"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "ژاپنی"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "جاوانیز"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "گرجی"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "کیکویا"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "قزاق"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "کالالیسوت"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "خمری"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "کانادایی"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "کره‌ای"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "کشمیری"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "کردی"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "کمی"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "کرنیشی"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "قرقیزی"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "لاتین"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "لوکزامبورگ"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "لیمبرگان"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "لینگالا"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "لائویی"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "لیتوانی"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "لاتوینی"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "مالاگازی"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "مارشالی"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "مائوری"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "مقدونی"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "مالی"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "مغول"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "مولداوی"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "ماراتی"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "مالی"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "مالتز"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "برمس"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "نائورو"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "نروژی بوکمال"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "اندبل شمالی"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "ساکسونی سفلی"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "نپالی"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "اندونگا"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "هلندی"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "نرس جدید نروژی"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "اندبل جنوبی"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "سوتوی شمالی"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "ناواجو"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "چیچوا"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "اُکیتان"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "اورومو"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "اوریا"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "اوستی قفقاز"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "پنجابی"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "پالی"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "لهستانی"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "پشتو"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "پرتغالی"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "پرتغالی برزیلی"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "کوچوا"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "روندی"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "رومانیایی"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "رومانی"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "روسی"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "کینیارواندایی"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "سانسکریت"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "ساردینی"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "سیندهی"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "سامی شمالی"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "سانگو"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "سینهالس"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "اسلواکی"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "اسلونیایی"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "ساموان"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "شوها"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "سومالی"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "آلبانی"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "صربستانی"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "صربستانی"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "سواتی"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "سوتوی جنوبی"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "ساندانیز"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "سوئدی"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "سواهیلی"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "تامیل"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "تلوگو"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "تاجیک"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "تایلندی"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "تیگرینیا"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "ترکمنی"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "تی سوانا"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "تونگا"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "ترکی"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "تی سوانگا"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "تاتاری"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "توی"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "تاهیتی"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "یوگر"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "اکراینی"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "اردو"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "ازبکی"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "وندا"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "ویتنامی"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "ولاپوک"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "والونی"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "ولوف"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "زسایی"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "عبری"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "یوروبا"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "هونگ"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "چینی"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "زبان چینی ساده‌شده"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "چینی)هنگ کنگ("
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "چینی سنتی"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ناتالی"
diff --git a/translations/desktop_files/all_languages.desktop/fi.po b/translations/desktop_files/all_languages.desktop/fi.po
index e6fdf0880..22507502c 100644
--- a/translations/desktop_files/all_languages.desktop/fi.po
+++ b/translations/desktop_files/all_languages.desktop/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Englanti"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Brittienglanti"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikanenglanti"
 
 #. Name
@@ -199,711 +199,716 @@ msgstr "Espanja"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Eesti"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baski"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persia)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Suomi"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidži"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Fääri"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Ranska"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Friisi"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlannin gael"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gael"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gallicia"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudžarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Heprea"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri-motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatia"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Yläsorbi"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Unkari"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenia"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesia"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiatun"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islanti"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italia"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japani"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jaava"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgia"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuju"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazakki"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Grönlanti"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korea"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdi"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Korni"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiisi"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latina"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburg"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgi"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Liettua"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvia"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshall"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonia"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoli"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavia"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 #, fuzzy
 msgid "Marathi"
 msgstr "Gudžarati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaiji"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malta"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burma"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norja (bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Pohjoinen"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Alasaksa"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollanti"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norja (nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Etelä"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Pohjoissotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Njandža"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitaani"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orija"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osseetti"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandžabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Puola"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paštu"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugali"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasilian Portugali"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Ketšua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romania"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Venäjä"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Ruanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardi"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Pohjoissaame"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhali"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakki"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveeni"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoa"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "šona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albania"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbian latina"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Swazi"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sunda"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Ruotsi"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamili"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžikki"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeeni"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tšwana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkki"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tataari"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uiguuri"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraina"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbekki"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnam"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valloni"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kiina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Yksinkertaistettu kiina"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kiina (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Perinteinen kiina"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/fr.po b/translations/desktop_files/all_languages.desktop/fr.po
index 0f6ce0bdf..700092b55 100644
--- a/translations/desktop_files/all_languages.desktop/fr.po
+++ b/translations/desktop_files/all_languages.desktop/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Anglais"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Anglais britannique"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Anglais américain"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Espagnol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonien"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Persan"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finnois"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidjien"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Féroïen"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Français"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frison"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaélique irlandais"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaélique"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gaélicien"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Marathe"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Mannois"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Haoussa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hébreu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croate"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Haut Sorabe"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongrois"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Arménien"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonésien"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandais"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italien"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonais"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanais"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Géorgien"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coréen"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurde"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cornique"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirghize"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxembourgeois"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limbourgeois"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituanien"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letton"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgache"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshall"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macédonien"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malais"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldave"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marathe"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malais"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltais"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birman"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nauruan"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvégien Bokmaal"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndébélé du Nord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Bas saxon (ou francique, ou plattdeutsch)"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Népalais"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollandais"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvégien Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndébélé du Sud"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho du Nord"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossète"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pendjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polonais"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugais"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugais Brésilien"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Roumain"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Rromani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russe"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sarde"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami du Nord"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singhalais"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovaque"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovène"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanais"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbe"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbe Latin"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho du Sud"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Soudanais"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suédois"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamoul"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Télougou"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadjik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thaïlandais"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrigna"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmène"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turc"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitien"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainien"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbek (Cyrillique)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Wallon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinois"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinois simplifié"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinois (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinois traditionnel"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zoulou"
diff --git a/translations/desktop_files/all_languages.desktop/fy.po b/translations/desktop_files/all_languages.desktop/fy.po
index f866f44d2..84d6c3ef9 100644
--- a/translations/desktop_files/all_languages.desktop/fy.po
+++ b/translations/desktop_files/all_languages.desktop/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Ingelsk"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britsk Ingelsk"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikaansk Ingelsk"
 
 #. Name
@@ -198,715 +198,720 @@ msgstr "Spaansk"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estsk"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskysk"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsysk (Persysk)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finsk"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijdzjysk"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faeroersk"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Frânsk"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frysk"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Iersk Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 #, fuzzy
 msgid "Gaelic"
 msgstr "Iersk Gaelic"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiciaansk"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrieuwsk"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindy"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatysk"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Heech Sorbysk"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongaarsk"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeensk"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 #, fuzzy
 msgid "Interlingua"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Yndonesysk"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Iislânsk"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiaansk"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japansk"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javaansk"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgysk"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koareaansk"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Koerdysk"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cornysk"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgizysk"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latyn"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemboarchsk"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgsk"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litouwsk"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letsk"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasysk"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshalleesk"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Masedoanysk"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Maleisk"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Moangoalsk"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavysk"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Maleisk"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteesk"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmeesk"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naurûaansk"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Noarsk, Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Noard"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Neder Saksysk"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepaleesk"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Tongaansk"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlânsk"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noarsk, Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Súd"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Noard Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitaansk"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetysk"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poalsk"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugeesk"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Braziliaansk Portugeesk"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rûandeesk"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Roemeensk"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Roemeensk"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russysk"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskryt"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinysk"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Noard-Koreaansk"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singaleesk"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovaaks"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveensk"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoaansk"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalysk"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albaansk"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Servysk"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Servysk Latijnsk"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Súd"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Soendaneesk"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sweedsk"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telûgû"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadzjyksk"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Taaisk"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrysk"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeensk"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tswanaansk"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongaansk"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turks"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsongaansk"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tataarsk"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiaansk"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Oekraïnsk"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urdû"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Oezbeeksk"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnameesk"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Waalsk"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddysk"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Sjineesk"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Sjineesk (ynfaldich)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Sjineesk (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Sjineesk (tradisjoniel)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ga.po b/translations/desktop_files/all_languages.desktop/ga.po
index 5e6bbd40d..082838b50 100644
--- a/translations/desktop_files/all_languages.desktop/ga.po
+++ b/translations/desktop_files/all_languages.desktop/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Béarla"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Béarla na Sasanach"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Béarla Mheiriceá"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Spáinnis"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Eastóinis"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Bascais"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Fairsis (Peirsis)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fionlainnis"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidsis"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faróis"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fraincis"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Freaslainnis"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaeilge"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gàidhlig"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gailísis"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaráinis"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gúisearáitis"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manainnis"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hásais"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Eabhrais"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hiondúis"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hírí-Mótúis"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Cróitis"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sorbais Uachtarach"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungáiris"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Airméinis"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Heiréiróis"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Idirtheanga"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indinéisis"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Idirtheanga iartharach"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Íoslainnis"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Iodáilis"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Ionúitis"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Seapáinis"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Iávais"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Seoirsis"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Ciocúis"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Casaicis"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Graonlainnis"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Ciméiris"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Cannadais"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Cóiréis"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Caismíris"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Coirdis"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Coimí"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Coirnis"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Cirgeastáinis"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Laidin"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lucsambuirgis"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limbuirgis"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Láóis"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Liotuáinis"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Laitvis"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagásais"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marascailis"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorais"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macadóinis"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Mailéalaimis"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongóilis"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldávais"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maraitis"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaeis"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Máltais"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmais"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nárúis"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Ioruais (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele Thuaidh"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Sacsainis Íochtarach"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Neipealais"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndongais"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Ollainnis"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Ioruais (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele Theas"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Seipidis"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navachóis"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Siseivis"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Ocatáinis"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oraimis"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Oirísis"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Óiséitis"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Painseáibis"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Páilis"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polainnis"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paistis"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portaingéilis"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portaingéilis na Brasaíle"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Ceatsuais"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rómáinis"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romainis"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rúisis"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Cinearuáindis"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanscrait"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sairdínis"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindis"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sáimis Thuaidh"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangóis"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Siolóinis"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slóvaicis"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slóivéinis"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samóis"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Seoinis"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somáilis"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albáinis"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Seirbis"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Seirbis (aibítir Laidineach)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Sasuatais"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sótó Theas"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundais"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sualainnis"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahaílis"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamailis"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Teileagúis"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Táidsícis"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Téalainnis"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinis"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turcamáinis"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Suáinis"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongais"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tuircis"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Songais"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatairis"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Taihítis"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Úígiúiris"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Úcráinis"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urdais"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Úisbéicis"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Veindis"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vítneamais"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallúnais"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volaifis"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Cóisis"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Giúdais"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Iarúibis"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Siuáingis"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Sínis"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Sínis Simplithe"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Sínis (Hong Cong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Sínis Thraidisiúnta"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Súlúis"
diff --git a/translations/desktop_files/all_languages.desktop/gl.po b/translations/desktop_files/all_languages.desktop/gl.po
index cc755dc7a..0face6008 100644
--- a/translations/desktop_files/all_languages.desktop/gl.po
+++ b/translations/desktop_files/all_languages.desktop/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Inglés"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglés de GB"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglés Americano"
 
 #. Name
@@ -198,711 +198,716 @@ msgstr "Castellano"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoniano"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basco"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Frisón (Pársi)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandés"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijiano"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Feroés"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francés"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frísio"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaélico"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaélico"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galego"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Guxarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebraico"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croata"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Alto Sórabo"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Húngaro"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Arménio"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 #, fuzzy
 msgid "Interlingua"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandés"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiano"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Xaponés"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Xavanés"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Xeorxiano"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Cazaxo"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Groenlandés"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreano"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Caxemir"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdo"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Córnico"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Quirguize"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgués"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgano"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letón"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Kanu"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshalés"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedónio"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malaialam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavo"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marata"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaio"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltés"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmés"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Noruegués (Bokmaal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele do norte"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Baixo Saxón"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandés"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noruegués (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele do Sur"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho do Norte"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaxo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitano"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orisa"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Oseto"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Panxabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polaco"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugués"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugués Do Brasil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romanés"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romanés"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruso"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Quiñaruanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sánscrito"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardo"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami do Norte"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalés"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovaco"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Esloveno"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoano"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanés"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Sérvio"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Sérbio Latino"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho do sur"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanés"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sueco"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Taxico"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tailandés"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrignan"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turquemeno"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Taitiano"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucraíno"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbeque"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valón"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Iídiche"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Yorùbá"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Chuan"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinés"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinés simplificado"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinés (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinés Tradicional"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/he.po b/translations/desktop_files/all_languages.desktop/he.po
index cabc5030b..968d46a22 100644
--- a/translations/desktop_files/all_languages.desktop/he.po
+++ b/translations/desktop_files/all_languages.desktop/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "אנגלית"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "אנגלית בריטית"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "אנגלית אמרקאית"
 
 #. Name
@@ -198,711 +198,716 @@ msgstr "ספרדית"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "אסטונית"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "בסקית"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "פרסית"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "פינית"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "פיגי'ת"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "פארואית"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "צרפתית"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "פריזיאנית"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "גאלית אירית"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "גאלית"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "גאלית"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "גוארני"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "גוג'רטית"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "מנקס"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "האוסה"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "עברית"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "הינדית"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "הירי מוטו"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "קרואטית"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "סרבית עליונה"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "הונגרית"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "ארמנית"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "הררו"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "אינטרלינגואה"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "אינדונזית"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "אינטרלינגווה"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "אינופיאק"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "אדו"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "איסלנדית"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "איטלקית"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "אינוקטיטוט"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "יפנית"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "יאווה"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "גרוזינית"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "קיקויו"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "קזחית"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "קלאליסוט"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "חמר"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "קנאדה"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "קוריאנית"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "קשמירית"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "כורדית"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "קומי"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "קורנית"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "קירגיזית"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "לטינית"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "לוקסמבורגית"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "לימבורגית"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "לינגלה"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "לאו"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "ליטאית"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "לטבית"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "מלגשית"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "מרשלית"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "מאורית"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "מקדונית"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "מליאלאם"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "מונגולית"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "מולדבית"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "מאראתי"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "מלאית"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "מלטזית"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "בורמזית"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "נאורו"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "נורבגית Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "נדבלה צפונית"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "נפאלית"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "נדונגה"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "הולנדית"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "נורבגית Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "נדבלה דרומית"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "סאמית צפונית"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "נבאחו"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "צ'יצ'ווה"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "פרובנסלית"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "אורומו"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "אוריה"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "אוסטית"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "פנג'בית"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "פאלי"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "פולנית"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "פשטו"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "פורטוגזית"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "פורטוגזית ברזילאית"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "קצ'ואה"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "רונדי"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "רומנית"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "רומניה"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "רוסית"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "קיניירואנדה"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "סנסקריט"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "סרדינית"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "סינדהי"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "סאמית צפונית"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "סאנגו"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "סינהלזית"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "סלובנית"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "סלובנית"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "סמואית"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "שונה"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "סומלית"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "אלבנית"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "סרבית"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "לטינית סרבית"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "סוואטי"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "סותו דרומית"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "סודנית"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "שבדית"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "סוואהילי"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "טמילית"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "טלוגו"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "טג'יקית"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "תאילנדית"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "טיגריניה"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "טורקמנית"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "צוואנה"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "טונגה"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "טורקית"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "צונגה"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "טטרית"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "צ'ווי"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "טהיטית"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "אויגור"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "אוקראינית"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "אורדו"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "אוזבקית"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "וייטנאמית"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "וולפיק"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "וולונית"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "וולוף"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "קוזה"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "יידיש"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "יורובה"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "ג'ואנג"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "סינית"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "סינית מופשטת"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "סינית (הונג קונג)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "סינית מסורתית"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "זולו"
diff --git a/translations/desktop_files/all_languages.desktop/hi.po b/translations/desktop_files/all_languages.desktop/hi.po
index 6a2c3be8d..1ed182d95 100644
--- a/translations/desktop_files/all_languages.desktop/hi.po
+++ b/translations/desktop_files/all_languages.desktop/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "अंग्रेज़ी"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "अंग्रेज़ी"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "अंग्रेज़ी"
 
 #. Name
@@ -200,713 +200,718 @@ msgstr "स्पेनी"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "एस्तोनियन"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "बाश्क"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "फ़ारसी (पर्सियन)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "फिनिश"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "फिज़ी"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "फ़ारसी"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "फ्रेंच"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "फ्रिसियन"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "गैलिक"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "गैलिक"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "गौरानी"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "गुजराती"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "मांक्स"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "हौसा"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "हिब्रू"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "हिन्दी"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "हिरी मोतू"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "क्रोएशियन"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "अपर सर्बियन"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "हंगेरियन"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "आरमेनियन"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "हेरेरो"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "इंटरलिंगुआ"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "इंडोनेशियन"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "इंटरलिंग"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "इनुपिआक"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "इडो"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "आइसलैंडिक"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "इतालवी"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "इनुक्तितु"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "जापानी"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "जावानी (Javanese)"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "ज्यॉर्जियन"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "किकूयू"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "कज़ाख"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "कलालिसुत"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "ख्मेर"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "कन्नड़"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "कोरियाई"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "कश्मीरी"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "कुर्दिश"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "कोमी"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "कॉर्निश"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "किर्गिज"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "लेटिन"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "लक्समबर्गिश"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "लिंबरगन"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "लिंगला"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "लाओ"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "लिथुआनियन"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "लाटवियन"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "मलागासी"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "मार्शलीस"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "माओरी"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "मकदूनियन"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "मलयालम"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "मंगोलियन"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "मोल्दावियन"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "मराठी"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "मलय"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "माल्टीस"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "बर्मीस"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "नौरू"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "नार्वेजियन बोकमॉल"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "नेदेबेले, उत्तर"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "लो सेक्सन"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "नेपाली"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "नदोन्गा"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "डच"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "नार्वेजियन नायनोरस्क"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "नेदेबेले,दक्षिण"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "नार्दर्न सोथो"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "नवाजो"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "चिचेवा"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ओसिटान"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ओरोमो"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ओरिया"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ओसेटियन"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "पंजाबी"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "पाली"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "पोलिश"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "पश्तो"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "पोर्तुगीस"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ब्राजिलियन पुर्तगाली"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "क्वेचुआ"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "रून्डी"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "रोमानियन"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "रोमानियन"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "रशियन"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "किन्यारवान्डा"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "संस्कृत"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "सारदिनी"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "सिंधी"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "नार्दर्न सामी"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "सैन्गो"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "सिंहली"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "स्लोवाकन"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "स्लोवेनियन"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "सामोन"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "शोना"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "सोमाली"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "अल्बानियन"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "सर्बियन"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "सर्बियन"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "स्वाती"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "सोथो, दक्षिणी"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "सूडानी"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "स्वीडिश"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "स्वाहिली"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "तमिल"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "तेलुगु"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "ताजिक"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "थाई"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "टिग्रिन्या"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "तुर्कमेन"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "तस्वाना"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "टोन्गा"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "तुर्की"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "त्सोन्गा"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "तातार"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "त्वी"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "ताहितियन"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "उइघुर"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "उक्रेनियन"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "उर्दू"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "उज्ब़ेक"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "वेंडा"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "वियतनामी"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "वोलापक"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "वालून"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "वालाफ़"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "झोसा"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "यिदिश"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "योरुबा"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "झुआंग"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "चाइनीस"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ज़ुलु"
diff --git a/translations/desktop_files/all_languages.desktop/hr.po b/translations/desktop_files/all_languages.desktop/hr.po
index 2faa233d6..1274f7c0f 100644
--- a/translations/desktop_files/all_languages.desktop/hr.po
+++ b/translations/desktop_files/all_languages.desktop/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Engleski"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britanski Engleski"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Američki Engleski"
 
 #. Name
@@ -198,711 +198,716 @@ msgstr "Španjolski"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonski"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskijski"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Perzijski)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finski"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidžijski"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farski"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francuski"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizijski"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irski Galski"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galski"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicijski"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Gvaranski"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudžaratski"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrejski"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hinduski"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Hrvatski"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Gornjosrpski"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Mađarski"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenski"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezijski"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandski"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Talijanski"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanski"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanski"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzijski"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazački"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmerski"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korejski"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmirski"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdski"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornski"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiški"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latinski"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburški"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburški"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingalski"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litvanski"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvijski"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagaski"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršaleski"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonski"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajamski"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolski"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavski"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 #, fuzzy
 msgid "Marathi"
 msgstr "Gudžaratski"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajski"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteški"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmanski"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norveški Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Sjeverni"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Donjosaksonski"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalski"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nizozemski"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norveški Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Južni"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sjeverni Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromski"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetski"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandžabski"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poljski"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalski"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazilski portugalski"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumunjski"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romanski"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruski"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinidžaruandski"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinijski"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sjeverni Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalski"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovački"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenski"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanski"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalijski"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanski"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Srpski"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Srpski latinica"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Južni"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Švedski"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilski"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tajlandski"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenski"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turski"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarski"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahićanski"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgurski"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbečki"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vijetnamski"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonski"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofski"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kineski"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Kineski pojednostavljen"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kineski (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Kineski tradicionalan"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/hsb.po b/translations/desktop_files/all_languages.desktop/hsb.po
index 01bc71cf0..367132d42 100644
--- a/translations/desktop_files/all_languages.desktop/hsb.po
+++ b/translations/desktop_files/all_languages.desktop/hsb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Jendźelsce"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Jendźelsce (WB)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Jendźelsce (USA)"
 
 #. Name
@@ -199,715 +199,720 @@ msgstr "Španisce"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estnisce"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisce"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persisce)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finsce"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidźiasce"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farösce"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francosce"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizisce"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaelisce (Irska)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaelisce"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicisce"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Marati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manxowsce"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrejsce"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Chorwatsce"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Hornjoserbsce"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Madźarsce"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armensce"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezisce"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandsce"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italsce"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japansce"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jawanisce"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzinsce"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazachisce"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreansce"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmirsce"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdisce"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornisce"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgisce"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Łaćonsce"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburgsce"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgsce"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laotisce"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litawsce"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letisce"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 #, fuzzy
 msgid "Malagasy"
 msgstr "Malajsce"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršalezisce"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorisce"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonsce"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malajsce"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolsce"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldawisce"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajsce"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltisce"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmezisce"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norwegsce (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Sewjerne"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Delnjosaksce"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalezisce"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nižozemsce"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwegsce (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Južne"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sewjerne Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okcitansce"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetisce"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandźabisce"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pólsce"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pušto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalsce"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugalsce (Brazilska)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumunsce"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumunsce"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusce"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinsce"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sewjernosamisce"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singalsce"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Słowaksce"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Słowjensce"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoasce"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalisce"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albansce"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbisce"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serbisce"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho (juh)"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesce"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Šwedsce"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilsce"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadźikisce"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Taisce"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmensce"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkowsce"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarisce"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitisce"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgursce"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainsce"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbekisce"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamsce"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walloonisce"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidisce"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinsce"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinsce (zjednorjene)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinsce (tradicionalnje)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/hu.po b/translations/desktop_files/all_languages.desktop/hu.po
index 2c54e5197..521676e08 100644
--- a/translations/desktop_files/all_languages.desktop/hu.po
+++ b/translations/desktop_files/all_languages.desktop/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Angol"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Angol (brit)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Angol (amerikai)"
 
 #. Name
@@ -199,710 +199,715 @@ msgstr "Spanyol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Észt"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baszk"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Fárszi (perzsa)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finn"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidzsi"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faröei"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francia"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Fríz"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gall (ír)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gall"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galíciai"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "héber"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Horvát"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Felső szorb"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Magyar"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Örmény"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hereró"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonéz"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Izlandi"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Olasz"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japán"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jávai"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Grúz"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuju"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazah"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalaalliszut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreai"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kasmír"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurd"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Korn"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiz"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgi"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgi"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litván"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lett"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagazi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marsalli"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedón"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldáv"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Maláj"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Máltai"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmai"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvég (bokmal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele (északi)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Alsószász"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepáli"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holland"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvég (nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele (déli)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Északi sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Csicseva"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okcitán"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orija"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Oszét"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandzsabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Lengyel"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pusto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugál"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugál (brazil)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kecsua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Román"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Lovári cigány"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Orosz"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinjarvanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Szanszkrit"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Szardíniai"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Szindi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Északi szami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Szangó"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Szingaléz"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Szlovák"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Szlovén"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Szamoai"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Sona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Szomáli"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albán"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Szerb"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Szerb (latin betűs)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Szvati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho (déli)"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Szundanéz"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svéd"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Szvahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadzsik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Türkmén"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tszvana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Török"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatár"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tvi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgur"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrán"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Üzbég"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnami"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xhosza"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddis"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kínai"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Kínai (egyszerűsített)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kínai (hongkongi)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Kínai (hagyományos)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/id.po b/translations/desktop_files/all_languages.desktop/id.po
index 204c29f55..5f1dc51eb 100644
--- a/translations/desktop_files/all_languages.desktop/id.po
+++ b/translations/desktop_files/all_languages.desktop/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Inggris"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inggris Inggris"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inggris Amerika"
 
 #. Name
@@ -198,719 +198,724 @@ msgstr "Spanyol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonia"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Persia"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandia"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Prancis"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 #, fuzzy
 msgid "Frisian"
 msgstr "Persia"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gujarat"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Israel"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroasia"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hungaria"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenia"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesia"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandia"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italia"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Jepang"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jawa"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korea"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kashmir"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdi"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Denmark"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburg"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lithuania"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvia"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Masedonian"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Melayu"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolia"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavia"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 #, fuzzy
 msgid "Marathi"
 msgstr "Gujarat"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Melayu"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malta"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burma"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 #, fuzzy
 msgid "Norwegian Bokmål"
 msgstr "Norwegia (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Utara"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepal"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Belanda"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwegia (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Selatan"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polandia"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugis"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugis Brazil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumania"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumania"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusia"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sansekerta"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ukraina"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakia"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenia"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoa"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalia"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albania"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sunda"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Swedia"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thailand"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turki"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraina"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnam"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Wallon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Cina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Cina Sederhana"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Cina (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Cina Tradisional"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/is.po b/translations/desktop_files/all_languages.desktop/is.po
index 16fce65a4..8419b0d5a 100644
--- a/translations/desktop_files/all_languages.desktop/is.po
+++ b/translations/desktop_files/all_languages.desktop/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Enska"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Bresk enska"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Bandarísk enska"
 
 #. Name
@@ -198,714 +198,719 @@ msgstr "Spánska"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Eistneska"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskamál"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persneska)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finnska"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Færeyska"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franska"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frísneska"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Írsk gelíska"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gelíska"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gelíska"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreska"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Króatíska"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbneska"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungverska"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeskt"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indónesíska"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Íslenska"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Ítalska"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanska"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Japanska"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgíska"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Kóreska"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kúrdíska"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Danska"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgíska"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latína"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lúxemborgiska"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgian"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litháíska"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettneska"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maltneska"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedóníska"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Bosníska"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldóvíska"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltneska"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Búrmenska"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norska (bókmál)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, norður"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollenska"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norska (nýnorska)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, suður"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Norður Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pólska"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portúgalska"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasílísk Portúgalska"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rúmenska"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Rúmenía"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rússneska"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskrít"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardíníska"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Shindi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Norður Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Shinhalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slóvenska"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slóvenska"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Sómalska"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanskur"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbneska"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbnesk latína"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, suður"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sænska"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamílska"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tælenska"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tyrkneska"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 #, fuzzy
 msgid "Tahitian"
 msgstr "Króatíska"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Úkraínska"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbek (Kyrilísk)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Víetnamska"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallónska"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddíska"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kínverska"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Einfölduð kínverska"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kínverska (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Hefðbundin kínverska"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zúlú"
diff --git a/translations/desktop_files/all_languages.desktop/it.po b/translations/desktop_files/all_languages.desktop/it.po
index 2b17ec1de..3457b52bd 100644
--- a/translations/desktop_files/all_languages.desktop/it.po
+++ b/translations/desktop_files/all_languages.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19: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: 2020-11-25 17:36+0100\n"
+"PO-Revision-Date: 2021-06-05 02:07+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/all-languages/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.6.2\n"
 
 #. Name
 #: all_languages.desktop:2
 msgid "Afar"
-msgstr ""
+msgstr "Afar"
 
 #. Name
 #: all_languages.desktop:4
@@ -34,7 +35,7 @@ msgstr "Avestano"
 #. Name
 #: all_languages.desktop:8
 msgid "Afrikaans"
-msgstr ""
+msgstr "Africano"
 
 #. Name
 #: all_languages.desktop:10
@@ -49,12 +50,12 @@ msgstr "Arabo"
 #. Name
 #: all_languages.desktop:14
 msgid "Assamese"
-msgstr ""
+msgstr "Assamese"
 
 #. Name
 #: all_languages.desktop:16
 msgid "Aymara"
-msgstr ""
+msgstr "Aymara"
 
 #. Name
 #: all_languages.desktop:18
@@ -64,7 +65,7 @@ msgstr "Azerbaigiano"
 #. Name
 #: all_languages.desktop:20
 msgid "Bashkir"
-msgstr ""
+msgstr "Bashkir"
 
 #. Name
 #: all_languages.desktop:22
@@ -78,14 +79,13 @@ msgstr "Bulgaro"
 
 #. Name
 #: all_languages.desktop:26
-#, fuzzy
 msgid "Bihari"
-msgstr "Amarico"
+msgstr "Bihari"
 
 #. Name
 #: all_languages.desktop:28
 msgid "Bislama"
-msgstr ""
+msgstr "Bislama"
 
 #. Name
 #: all_languages.desktop:30
@@ -120,7 +120,7 @@ msgstr "Ceceno"
 #. Name
 #: all_languages.desktop:42
 msgid "Chamorro"
-msgstr ""
+msgstr "Chamorro"
 
 #. Name
 #: all_languages.desktop:44
@@ -145,7 +145,7 @@ msgstr "Slavo della Chiesa"
 #. Name
 #: all_languages.desktop:52
 msgid "Chuvash"
-msgstr ""
+msgstr "Chuvash"
 
 #. Name
 #: all_languages.desktop:54
@@ -165,7 +165,7 @@ msgstr "Tedesco"
 #. Name
 #: all_languages.desktop:60
 msgid "Dzongkha"
-msgstr ""
+msgstr "Dzongkha"
 
 #. Name
 #: all_languages.desktop:62
@@ -179,18 +179,18 @@ msgstr "Inglese"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglese britannico"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglese americano"
 
 #. Name
 #: all_languages.desktop:70
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 #. Name
 #: all_languages.desktop:72
@@ -199,710 +199,715 @@ msgstr "Spagnolo"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr "Spagnolo (Argentina)"
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estone"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basco"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persiano)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandese"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Figiano"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
-msgstr ""
+msgstr "Faroese"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francese"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisone"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaelico irlandese"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaelico"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gallego"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
-msgstr ""
+msgstr "Guarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Man, lingua dell'isola di"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
-msgstr ""
+msgstr "Hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Ebraico"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
-msgstr ""
+msgstr "Hindi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croato"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Alto sorabo"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungherese"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeno"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
-msgstr ""
+msgstr "Herero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
-msgstr ""
+msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesiano"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
-msgstr ""
+msgstr "Interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
-msgstr ""
+msgstr "Ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandese"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiano"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
-msgstr ""
+msgstr "Inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Giapponese"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Giavanese"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgiano"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
-msgstr ""
+msgstr "Kikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazako"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
-msgstr ""
+msgstr "Kalaallisut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreano"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Cachemire, lingua del"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Curdo"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
-msgstr ""
+msgstr "Komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cornovaglia, lingua della"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Chirghiso"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latino"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lussemburghese"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburghese"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
-msgstr ""
+msgstr "Lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettone"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgascio"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshall, lingua delle isole"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
-msgstr ""
+msgstr "Maori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedone"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Kerala, lingua del"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolo"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavo"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
-msgstr ""
+msgstr "Marathi"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malese"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
-msgstr ""
+msgstr "Maltese"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmano"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegese Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele settentrionale"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Basso sassone"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalese"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
-msgstr ""
+msgstr "Ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Olandese"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegese Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele meridionale"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho settentrionale"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
-msgstr ""
+msgstr "Navajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
-msgstr ""
+msgstr "Chichewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitano"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
-msgstr ""
+msgstr "Oromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
-msgstr ""
+msgstr "Oriya"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetiano"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Punjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
-msgstr ""
+msgstr "Pali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polacco"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pashto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portoghese"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portoghese brasiliano"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
-msgstr ""
+msgstr "Quechua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
-msgstr ""
+msgstr "Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumeno"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Rom"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russo"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
-msgstr ""
+msgstr "Kinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanscrito"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardo"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
-msgstr ""
+msgstr "Sindhi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami settentrionale"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
-msgstr ""
+msgstr "Sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Cingalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovacco"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveno"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoano"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
-msgstr ""
+msgstr "Shona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalo"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanese"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbo"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbo latino"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
-msgstr ""
+msgstr "Swati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho meridionale"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudanese"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svedese"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tagicco"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thailandese"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
-msgstr ""
+msgstr "Tigrinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeno"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
-msgstr ""
+msgstr "Tswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
-msgstr ""
+msgstr "Tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tartaro"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
-msgstr ""
+msgstr "Twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiano"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
-msgstr ""
+msgstr "Uighur"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucraino"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbeco"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Usbeco (Cirillico)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
-msgstr ""
+msgstr "Venda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
-msgstr ""
+msgstr "Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallone"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
-msgstr ""
+msgstr "Wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
-msgstr ""
+msgstr "Xhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
-msgstr ""
+msgstr "Yiddish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
-msgstr ""
+msgstr "Yoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
-msgstr ""
+msgstr "Zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Cinese"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Cinese semplificato"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Cinese (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Cinese tradizionale"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
-msgstr ""
+msgstr "Zulu"
diff --git a/translations/desktop_files/all_languages.desktop/ja.po b/translations/desktop_files/all_languages.desktop/ja.po
index b0744488d..c7fe0449a 100644
--- a/translations/desktop_files/all_languages.desktop/ja.po
+++ b/translations/desktop_files/all_languages.desktop/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "英語"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "イギリス英語"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "アメリカ英語"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "スペイン語"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "エストニア語"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "バスク語"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "ペルシア語"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "フィンランド語"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "フィジー語"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "フェーロー語"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "フランス語"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "フリジア語"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "アイルランド系ゲール語"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "ゲール語"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "ガリシア語"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "グァラニ語"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "グジャラート語"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "マン島語"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "ハウサ語"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "ヘブライ語"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "ヒンディー語"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "ヒリモトゥ語"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "クロアチア語"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "上ソルブ語"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "ハンガリー語"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "アルメニア語"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "ヘレロ語"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "インターリンガ"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "インドネシア語"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "インターリング"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "イヌピアック語"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "イド語"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "アイスランド語"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "イタリア語"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "イヌイット語"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "日本語"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "ジャワ語"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "グルジア語"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "キクユ語"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "カザフ語"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "グリーンランド語"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "クメール語"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "カンナダ語"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "韓国語・朝鮮語"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "カシュミール語"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "クルド語"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "コミ語"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "コーンウォール語"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "キルギス語"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "ラテン語"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "ルクセンブルグ語"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "リグリア語"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "リンガラ語"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "ラオ語"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "リトアニア語"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "ラトビア語"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "マラガシ語"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "マーシャル語"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "マオリ語"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "マケドニア語"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "マラヤーラム語"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "モンゴル語"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "モルダビア語"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "マラーティー語"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "マレー語"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "マルタ語"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "ビルマ語"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "ナウル語"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "ノルウェー語 (ブークモール)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "北ンデベレ語"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "低ザクセン語"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "ネパール語"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "ンドゥンガ語"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "オランダ語"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "ノルウェー語 (ニーノシュク)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "南ンデベレ語"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "北ソト語"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "ナバホ語"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "チェワ語"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "オック語"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "オロモ語"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "オリヤー語"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "オセット語"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "バンジャーブ語"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "パーリ語"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "ポーランド語"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "パシュトー語"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ブラジル ポルトガル語"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "ケチュア語"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "ルンディ語"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "ルーマニア語"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "ロマニー語"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "ロシア語"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "ルワンダ語"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "サンスクリット語"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "サルデーニャ語"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "シンド語"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "北サーミ語"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "サンゴ語"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "シンハラ語"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "スロバキア語"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "スロベニア語"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "サモア語"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "ショナ語"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "ソマリ語"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "アルバニア語"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "セルビア語"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "セルビア語 (ラテン文字)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "スワティ語"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "南ソト語"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "スンダ語"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "スウェーデン語"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "スワヒリ語"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "タミル語"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "テルグ語"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "タジク語"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "タイ語"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "ティグリニア語"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "トルクメン語"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "ツワナ語"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "トンガ語"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "トルコ語"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "ツォンガ語"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "タタール語"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "チュイ語"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "タヒチ語"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "ウイグル語"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ウクライナ語"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "ウルドゥー語"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "ウズベク語"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "ウズベク語 (キリル文字)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "ベンダ語"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "ボラピューク語"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "ワロン語"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "ウォロフ語"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "コサ語"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "イディッシュ語"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "ヨルバ語"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "チュワン語"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "中国語"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "中国語 簡体字"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "中国語 (香港)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "中国語 繁体字"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ズールー語"
diff --git a/translations/desktop_files/all_languages.desktop/ka.po b/translations/desktop_files/all_languages.desktop/ka.po
index 052a08be2..761c54154 100644
--- a/translations/desktop_files/all_languages.desktop/ka.po
+++ b/translations/desktop_files/all_languages.desktop/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "ინგლისური"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "ინგლისური (დიდი ბრიტანეთი)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "ინგლისური (აშშ)"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "ესპანური"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "ესტონური"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "ბასკური"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "სპარსული (ფარსი)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ფინური"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ფიჯი"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ფარერული"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "ფრანგული"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ფრიზიული"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "ირლანდიური (გალური)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "გალური"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "გალიციური"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "გვარანი"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "გუჯარათი"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "მანქსი"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "ჰაუსა"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "ივრითი"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "ჰინდი"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "ჰირი მოტუ"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "ხორვატული"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "ზედასორბული"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "უნგრული"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "სომხური"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "ჰერერო"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "ინტერლინგვა"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "ინდონეზიური"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "ინტერლინგვე"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "ინუპიაკი"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "იდო"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "ისლანდიური"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "იტალიური"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "ინუქტიუტუტი"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "იაპონური"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "იავა"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "ქართული"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "კიკუიუ"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "ყაზახური"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "კალაალისუტი"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "ქჰმერული"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "კანნადა"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "კორეული"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "ქაშმირული"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "ქურთული"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "კომი"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "კორნუელური"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "ყირგიზული"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "ლათინური"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "ლუქსემბურგული"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "ლიმბურგული"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "ლინგალა"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "ლაო"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "ლიტვური"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "ლატვიური"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "მალაგასური"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "მარშალური"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "მაორი"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "მაკედონური"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "მალაილამი"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "მონღოლური"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "მოლდავური"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "მარათი"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "მალაური"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "მალტური"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "ბირმული"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "ნაურუ"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "ნორვეგიული (ბიოკმალი)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "ჩრდილო ნდებელე"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "ქვედა საქსონური"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "ნეპალური"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "ნდონგა"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "ჰოლანდიური"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "ნორვეგიული (ნინორსკი)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "სამხრეთ ნდებელე"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "ჩრდილო სოტო"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "ნავახო"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "ჩიჩევა"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ოქიტანური (ფრანგული დიალექტი)"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ორომო"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ორია"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ოსური"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "პენჯაბი"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "ფალაური"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "პოლონური"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "პუშტუ"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "პორტუგალური"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ბრაზილიური (პორტუგალური)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "კეჩუა"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "რუნდი"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "რუმინული"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "რომანული"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "რუსული"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "კინიარვანდა"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "სანსკრიტი"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "სარდინიული"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "სინდჰი"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "ჩრდილო საამი"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "სანგო"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "სენეგალური"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "სლოვაკური"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "სლოვენური"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "სამოა"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "შონა"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "სომალური"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "ალბანური"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "სერბული"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "სერბული ლათინური"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "სვატი"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "სამხრეთ სოტო"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "სუდანური"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "შვედური"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "სუაჰილი"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "თამილური"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "ტელუგუ"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "ტაჯიკური"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "ტაი"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "ტიგრინია"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "თურქმენული"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "ტსვანა"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "ცონგა"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "თურქული"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "ცონგა"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "თათრული"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "ტვი"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "ტაიტი"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "უიგურული"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "უკრაინული"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "ურდუ"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "უზბეკური"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "ვენდა"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "ვიეტნამური"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "ვოლაპიუკი"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "ვალონური"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "უოლოფი"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "ქშოსა"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "იდიში"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "იორუბა"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "ჩჟუანი"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "ჩინური"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "ჩინური გამარტივებული"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "ჩინური (ჰონგ კონგი)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "ჩინური ტრადიციული"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ზულუსური"
diff --git a/translations/desktop_files/all_languages.desktop/kk.po b/translations/desktop_files/all_languages.desktop/kk.po
index 9d50fe4a6..4c9d1f768 100644
--- a/translations/desktop_files/all_languages.desktop/kk.po
+++ b/translations/desktop_files/all_languages.desktop/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Ағылшынша"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Британдық ағылшынша"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Американдық ағылшынша"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Испанша"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Эстонша"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскша"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фарси"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Финнша"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фиджише"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фароэзше"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Французша"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризше"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ирланд галлша"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Галлша"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галицияша"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарани"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гуджарати"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манксша"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Ивритше"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хинди"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хорватша"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Жоғары сорбше"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Мажарша"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Арменше"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Хереро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингва"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезияша"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Интерлигве"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиакша"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландша"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Итальянша"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктиут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Жапонша"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Ява"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузинше"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикую"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Қазақша"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калаалисутша"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кхмерше"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Каннада"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корейше"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмирше"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдше"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Коми"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корнуолше"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Қырғызша"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латынша"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксимбургша"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбургша"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингата"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лаосша"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литваша"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвияша"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Мальгашша"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршаллша"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маори"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонша"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малайамша"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Моңғолша"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдовша"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Марати"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайша"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Мальташа"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бирманша"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвег букмалша"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Солтүсік Ндебеле"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Төмен саксонша"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непалша"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Нидреландша"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Новег нунорскша"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Оңтүстік ндебеле"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Солтүстік сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Навахо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичева"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Осситанша"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ория"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетинше"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панждаби"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Полякша"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пушту"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португалша"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразилиялық португалша"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Кечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Румынша"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Цыганша"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Орысша"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Киньяруанда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардинше"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдхи"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Солтүстік саами"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Сингалша"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словакша"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенше"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоа"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Схона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомали"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албанша"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сербше"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Сербше (Латын)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Свати"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Оңтүстік сото"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Суданша"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведше"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Суахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамилша"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Тәжікше"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайша"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигринья"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Түркменше"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Тсвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Түрікше"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Тсонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарша"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Тви"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Таитише"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ұйғырша"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украинша"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Өзбекше"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Вьетнамша"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапюк"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валонша"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волофша"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Кхоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Идиш"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Йоруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Зуангша"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Қытайша"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Жеңілдеткен қытайша"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Қытайша (Сянган)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Дәстүрлі қытайша"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/km.po b/translations/desktop_files/all_languages.desktop/km.po
index 9d474d166..e9935ce66 100644
--- a/translations/desktop_files/all_languages.desktop/km.po
+++ b/translations/desktop_files/all_languages.desktop/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "អង់គ្លេស"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "អង់គ្លេស (អង់គ្លេស)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "អង់គ្លេស អាមេរិក"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "អេស្ប៉ាញ"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "អេស្តូនី"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "បាស្កេ"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "ហ្វាស៊ី (ពឺស៊ាន)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ហ្វាំងឡង់"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ហ្វ៊ីហ្ស៊ី"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ហ្វាអេរូសឺ"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "បារាំង"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ហ្វ្រីស៊ាន"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "អៀរឡង់ ហ្កែលិគ"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "ហ្កែលិគ"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "ហ្កាលីស៊ី"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "ហ្កួរ៉ានី"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "ហ្កុយ៉ារាទី"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "ម៉ុង"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "ហូសា"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "ហេប្រូ"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "ហិណ្ឌូ"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "ហ៊ីរី ម៉ូទូ"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "ក្រូអាស៊ី"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "សូបៀន លើ"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "ហុងគ្រី"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "អារមេនី"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "ហេរេអូ"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "អ៊ីងតឺលីងគ័រ"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "ឥណ្ឌូនេស៊ី"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "អ៊ីងតឺលីងគឹ"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "អ៊ីនូភាគ"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "អ៊ីឌូ"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "អ៊ីស្លង់"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "អ៊ីតាលី"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "អ៊ីនូកទីទូត"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "ជប៉ុន"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "យ៉ាវា"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "ហ្សកហ្ស៉ី"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "គីគូយូ"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "កាហ្សាក់ស្តង់"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "កាឡាលីសាត់"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "ខ្មែរ"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "កិណាដា"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "កូរ៉េ"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "កាស្មៀរ"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "ឃឺដ"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "កូមី"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "កូនីស"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "គៀរហ្គីស្តង់"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "ឡាតាំង"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "លុចហ្សំបួរ"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "លីបួគ"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "លីនហ្កាឡា"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "ឡាវ"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "លីទុយអានី"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "ឡាតវីយ៉ា"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "ម៉ាដាហ្កាសការ"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "ម៉ាស្យលីស"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "ម៉ោរី"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "ម៉ាសេដូនី"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "ម៉ាឡាយ៉ាឡាម"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "ម៉ុងហ្គោលី"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "ម៉ុលដាវី"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "ម៉ារាធី"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "ម៉ាឡេស៊ី"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "ម៉ាល់តា"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "ភូមា"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "ណូរុ"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "ន័រវែស បុកម៉ាល់"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "នដិបិលិ​ខាង​ជើង"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "ឡូសាក់សុង"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "នេប៉ាល់"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "នដុងហ្កា"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "ហុល្លង់"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "ន័រវែស នីនូស"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "នដិបិលិ​ខាង​ត្បូង"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "សូធូ​ជើង"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "ណាវាហ្សូ"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "ចីចិវ៉ា"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "អុកស៊ីតង់"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "អុរុមុ"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "អូរីយ៉ា"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "អូសសិត្យុង"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "ពូនយ៉ាប៊ី"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "បាលី"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "ប៉ូឡូញ"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "ប៉ាសតូ"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "ព័រទុយហ្គាល់"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ប្រេស៊ីល ព័រទុយហ្គាល់"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "កេទ្ជូអា"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "រូន្ឌី"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "រូម៉ានី"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "រូម៉ានី"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "រុស្សី"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "គីនយ៉ាវ៉ាន់ដា"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "សំស្ក្រឹត"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "សារឌីណង់"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "ស៊ីន្ដី"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "សាមីជើង"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "សង់ហ្គោ"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "ស៊ីងហាលីស"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "ស្លូវ៉ាគី"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "ស្លូវ៉ានី"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "សាមូអា"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "សូណា"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "សូម៉ាលី"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "អាល់បានី"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "សែប៊ី"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "សែប៊ី (ឡាតាំង)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "ស្វាទី"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "សូធូ​ខាង​ត្បូង"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "ស៊ូដង់"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "ស៊ុយអែដ"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "ស្វាហ៊ីលី"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "តាមីល"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "តេលូហ្គូ"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "តាដហ្ស៊ីគីស្តង់"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "ថៃ"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "ទីក្រីនយ៉ា"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "ទួគមេនីស្តង់"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "វ៉ាន់ណា"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "តុងហ្គោ"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "ទួរគី"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "សុងហ្កា"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "តាតារ"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "ទ្វី"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "តាហិតង់"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "វីហ្គៀរ"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "អ៊ុយក្រែន"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "អ៊ូរ្ឌូ"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "អ៊ូហ្សបេគីស្តង់"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "អ៊ូហ្សបេគីស្តង់ (ស៊ីរីលីក)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "វង់ដា"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "វៀតណាម"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "វូឡាភូក"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "វ៉ាឡុង"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "វូឡុហ្វ"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "ឃសាLesotho"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "យីឌីហ្ស"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "យរូបា"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "ចួង"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "ចិន"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "ចិនសាមញ្ញ"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "ចិន (ហុងកុង)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "ចិន​បុរាណ"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ហ្ស៊ូលូ"
diff --git a/translations/desktop_files/all_languages.desktop/ko.po b/translations/desktop_files/all_languages.desktop/ko.po
index b103119dc..d59ca5d86 100644
--- a/translations/desktop_files/all_languages.desktop/ko.po
+++ b/translations/desktop_files/all_languages.desktop/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "영어"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "영어"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "영어"
 
 #. Name
@@ -200,717 +200,722 @@ msgstr "스페인어"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "에스토니아어"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "바스크어"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "팔시 (페르시아어)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "핀란드어"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "피지어"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "불어"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "프리시안어"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "과라니어"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "구자라트어"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "망스어"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "하우사어"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "히브리어"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "힌디어"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "히리 모투어"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "크로아티아어"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "세르비아어"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "헝가리어"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "아르메니아어"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "헤레로어"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "국제어 (Interlingua)"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "인도네시아어"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "국제어 (Interlingue)"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "이도어"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "아이슬란드어"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "이탈리아어"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "일본어"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "자바어"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "그루지안어"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "키쿠유어"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "카자크어"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "그린란드어"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "캄보디아어"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "한국어"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "카슈미르어"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "쿠르드어"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "코미어"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "콘월어"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "키르키즈어"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "라틴어"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "라오어"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "리투아니아어"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "라트비아어"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "말라가시어"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 #, fuzzy
 msgid "Marshallese"
 msgstr "신할라어"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "마오리어"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "마케도니아어"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "말레이어"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "몽골어"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "몰다비어"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "마라티어"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "말레이어"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "몰타어"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "버마어"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "나우루"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "노르웨이어 (Bokmaal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "북부 은데벨레"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "네팔어"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "통가어"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "네덜란드어"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "노르웨이어 (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "남부 은데벨레"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "북부 소토어"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "나바조어"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "오크어"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "오로모어"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "오리야어"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "오세티안어"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "펀잡어"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "폴란드어"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "푸시토어"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "포르투갈어"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "브라질식 포르투갈어"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "케추아어"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "룬디어"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "루마니아어"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "루마니아어"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "러시아어"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "키냐르완다어"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "범어"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "사르디니아어"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "신디어"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "북부 사미어"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "신할라어"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "슬로바키아어"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "슬로베니아어"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "사모아어"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "쇼나어"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "소말리아어"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "알바니아어"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "세르비아어"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "세르비아어"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "스와티어"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "남부 소토어"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "수단어"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "스웨덴어"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "스와힐리어"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "타밀어"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "테루그어"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "타직어"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "타이어"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "티그리냐어"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "통가어"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "터키어"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 #, fuzzy
 msgid "Tsonga"
 msgstr "통가어"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "타타르어"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "타히티어"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "우크라이나어"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "울두어"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "우즈베크어"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "벤다어"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "베트남어"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "왈론어"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "엑스호사어"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "이디시어"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "요루바어"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "중국어"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "줄루어"
diff --git a/translations/desktop_files/all_languages.desktop/ku.po b/translations/desktop_files/all_languages.desktop/ku.po
index b30bb1344..2ad4f508f 100644
--- a/translations/desktop_files/all_languages.desktop/ku.po
+++ b/translations/desktop_files/all_languages.desktop/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -180,12 +180,12 @@ msgstr "Polî"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr ""
 
 #. Name
@@ -200,717 +200,722 @@ msgstr ""
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 #, fuzzy
 msgid "Estonian"
 msgstr "Romanî"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Sirbî"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 #, fuzzy
 msgid "Armenian"
 msgstr "Romanî"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdî"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 #, fuzzy
 msgid "Malagasy"
 msgstr "Malayî"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malayî"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolî"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malayî"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltayî"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 #, fuzzy
 msgid "Norwegian Bokmål"
 msgstr "Norwêcî Nynorsk"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Saksonî ya Jêrîn"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalî"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holendî"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwêcî Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksîtanî"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pêncabî"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polî"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portûgalî"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portûgalî ya Brazîl"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romanî"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Romanî"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rûsî"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakî"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenî"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanî"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Sirbî"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Sirbiya Latînî"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Swêdî"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tay"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tirkî"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Viyetnamî"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walûn"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Çînî"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Çîniya Hesankirî"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Çînî (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Çîniya Kevneşop"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/lb.po b/translations/desktop_files/all_languages.desktop/lb.po
index 9718af12f..e8f2783f3 100644
--- a/translations/desktop_files/all_languages.desktop/lb.po
+++ b/translations/desktop_files/all_languages.desktop/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Englesch"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britescht Englesch"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikanescht Englesch"
 
 #. Name
@@ -198,713 +198,718 @@ msgstr "Spuenesch"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estnesch"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskesch"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persesch)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finnesch"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidschi-Sprooch"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faröesch"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franzéisch"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Friesesch"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irescht Gällesch"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gällesch"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galizesch"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Haussa-Sprooch"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebräesch"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri-Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatesch"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Uewersorbesch"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungaresch"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenesch"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 #, fuzzy
 msgid "Interlingua"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesesch"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islännesch"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italienesch"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanesch"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanesesch"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgesch"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuyu-Sprooch"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kasachesch"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreanesch"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdesch"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komi-Sprooch"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornesch"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirghisesch"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latäin"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lëtzebuergesch"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgesch"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litauesch"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettesch"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Madagassesch"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marschallesesch"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoresch"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Mazedonesch"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolesch"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldawesch"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaiesch"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesesch"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesesch"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nauruesch"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norwegesch (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele (nördlech)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Niddersächsesch"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalesesch"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Tsonga-Sprooch"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollännesch"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwegesch (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele (südlecht)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nördlecht Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Nyanja"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okzitanesch"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orija"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetesch"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Panjabi-Sprooch"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Punjabi-Sprooch"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polnesch"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paschtu"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugisesch"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazilianescht Portugisesch"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Quechua-Sprooch"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundi-Sprooch"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumänesch"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russesch"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Ruanda-Sprooch"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinesch"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindhi-Sprooch"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Nördlecht Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sango-Sprooch"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singhalesesch"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slowakesch"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slowenesch"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanesch"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalesch"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanesch"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbesch"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Latäinescht Serbesch"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Swazi"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Südlecht Sotho"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudanesesch"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Schwedesch"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadschikesch"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja-Sprooch"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenesch"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tswana-Sprooch"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Tsonga-Sprooch"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Türkesch"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsonga-Sprooch"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tataresch"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Akan-Sprooch"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitesch"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uiguresch"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainesch"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbekesch"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamesesch"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Wallounesch"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Wolof-Sprooch"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddesch"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Yoruba-Sprooch"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinesesch"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Einfacht Chinesesch"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinesesch (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Traditionellt Chinesesch"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/lt.po b/translations/desktop_files/all_languages.desktop/lt.po
index a94684d1b..272bd399e 100644
--- a/translations/desktop_files/all_languages.desktop/lt.po
+++ b/translations/desktop_files/all_languages.desktop/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Anglų"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Anglų (D.Britanijos)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Anglų (JAV)"
 
 #. Name
@@ -199,714 +199,719 @@ msgstr "Ispanų"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estų"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskų"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (persų)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Suomių"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidži"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farerų"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Prancūzų"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Fryzų"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Galų"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galų"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiciečių"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudžarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrajų"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatų"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbų"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Vengrų"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armėnų"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneziečių"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandų"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italų"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonų"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javiečių"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzinų"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazachų"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khmerų"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korėjiečių"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmiro"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdų"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornų"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgizų"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Lotynų"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Liuksemburgiečių"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laosiečių"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lietuvių"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvių"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasių"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršaliečių"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorių"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedoniečių"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajiečių"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolų"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavų"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 #, fuzzy
 msgid "Marathi"
 msgstr "Gudžarati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajų"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltiečių"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmiečių"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegų Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Šiaurės"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Žemutinių saksonų"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepaliečių"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Danų"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegų Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Pietų"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Šiaurės Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetinų"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pendžabo"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Lenkų"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puštūnų"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalų"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazilijos portugalų"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumunų"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumunų"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusų"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskritas"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinijos"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Šiaurės Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalų"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakų"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovėnų"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoa"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somaliečių"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanų"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbų"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbų lotynų"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Pietų"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudaniečių"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Švedų"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilų"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžikų"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tailandiečių"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmėnų"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkų"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Totorių"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainiečių"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbekų"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamiečių"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonų"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kiniečių"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Kinų supaprastinta"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kiniečių (Honkongo)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Kinų tradicinė"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/lv.po b/translations/desktop_files/all_languages.desktop/lv.po
index d18f4cacf..b9456dffe 100644
--- a/translations/desktop_files/all_languages.desktop/lv.po
+++ b/translations/desktop_files/all_languages.desktop/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Angļu"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britu angļu"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikāņu angļu"
 
 #. Name
@@ -199,719 +199,724 @@ msgstr "Spāņu"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Igauņu"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basku"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Persiešu (Farsi)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Somu"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidži"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Fēru"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franču"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frīziešu"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiciāņu"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Maratu"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hausu"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Ebreju"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindu"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Horvātu"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbu"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungāru"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armēņu"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Interlingva"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonēziešu"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingva"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandiešu"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Itāļu"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japāņu"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javiešu"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzīņu"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazahu"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khmeru"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korejiešu"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmiriešu"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdu"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Dāņu"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgīzu"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburgiešu"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laosiešu"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lietuviešu"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latviešu"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasu"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršaliešu"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoru"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Maķedoniešu"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malajiešu"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoļu"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldāvu"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maratu"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajiešu"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltiešu"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmiešu"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvēģu (Bokmālas)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Lejas sakšu"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepāliešu"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Tongiešu"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandiešu"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvēģu (Ņūnorskas)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Ziemeļu Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Čičeviešu"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okitāņu"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetīņu"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandžabu"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poļu"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puštu"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugāļu"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazīlijas portugāļu"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumāņu"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumāņu"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Krievu"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskrits"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardīniešu"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 #, fuzzy
 msgid "Northern Sami"
 msgstr "Ziemeļu Sotho"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 #, fuzzy
 msgid "Sinhalese"
 msgstr "Maršaliešu"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovāku"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovēņu"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoiešu"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somāliešu"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albāņu"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbu"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbu latīņu"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudāniešu"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Zviedru"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilu"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžiku"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Taizemiešu"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmēņu"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongiešu"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turku"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 #, fuzzy
 msgid "Tsonga"
 msgstr "Tongiešu"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatāru"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Taitiešu"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uiguru"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraiņu"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbeku"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vjetnamiešu"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valoņu"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidišš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Jarubu"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Ķīniešu"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Ķīniešu vienkāršotā"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Ķīniešu (Honkongas)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Ķīniešu tradicionālā"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulusu"
diff --git a/translations/desktop_files/all_languages.desktop/mi.po b/translations/desktop_files/all_languages.desktop/mi.po
index d12fedf3e..4b9d046af 100644
--- a/translations/desktop_files/all_languages.desktop/mi.po
+++ b/translations/desktop_files/all_languages.desktop/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -180,13 +180,13 @@ msgstr "Reo Päkehä"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Reo Päkehä"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Reo Päkehä"
 
 #. Name
@@ -201,718 +201,723 @@ msgstr "Reo Peina"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Reo Etonia"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Reo Whinarana"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Reo Parani"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Reo Hürai"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Reo Koroätia"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Reo Hanekari"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 #, fuzzy
 msgid "Armenian"
 msgstr "Reo Romeinia"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Reo Tiorangi"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Reo Itari"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Reo Hapana"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Reo Hapana"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Reo Tenemaka"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Reo Mäori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Reo Makerönia"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Reo Tenemaka"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Reo Pörana"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Reo Pötikï"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "Reo Pötikï"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Reo Romeinia"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Reo Romeinia"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Reo Ruhia"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Reo Makerönia"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 #, fuzzy
 msgid "Albanian"
 msgstr "Reo Romeinia"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Reo Wïtana"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Reo Ïnia tonga"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 #, fuzzy
 msgid "Tahitian"
 msgstr "Reo Koroätia"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Reo Häina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/mk.po b/translations/desktop_files/all_languages.desktop/mk.po
index 9148d8019..cc5f563a5 100644
--- a/translations/desktop_files/all_languages.desktop/mk.po
+++ b/translations/desktop_files/all_languages.desktop/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Англиски"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Англиски (британски)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Англиски (американски)"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Шпански"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Естонски"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскиски"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фарси (персиски)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Фински"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фиџиски"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фарски"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Француски"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризиски"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ирски галски"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Галски"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галски"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарани"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гујарати"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкс"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Еврејски"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хинди"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хрватски"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Јужно лужички"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Унгарски"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Ерменски"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Хереро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингва"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезиски"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Интерлингва"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиак"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландски"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Италијански"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Јапонски"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Јавански"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузиски"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикују"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казахстански"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калалисут"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кмерски"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Канада"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корејски"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмирски"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдски"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Коми"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корниш"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Киргизтански"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латински"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Луксембургски"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбургански"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингала"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лао"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литвански"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвиски"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагаси"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршалски"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маорски"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонски"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малајалам"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Монголски"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдавски"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Марати"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малајски"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Малтешки"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бурмански"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвешки Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндебеле, северен"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Долносаксонски"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непалски"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Холандски"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвешки Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндебеле, јужен"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Северен Сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Навахо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичева"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Очитан"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Орија"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетиски"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Пунџаби"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Полски"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пушто"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португалски"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразилски португалски"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Кечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Романски"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Ромски"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Руски"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кинјарванда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардиниски"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синди"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Северен Сами"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Синхалски"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словачки"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенечки"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоански"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомалиски"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албански"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Српски"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Српски (латиница)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Свати"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Сото, јужен"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сундански"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведски"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Свахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамилски"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Таџикистански"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тајландски"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигринја"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркменистански"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Цвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турски"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Цонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарски"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Тви"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Тахитски"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ујгур"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украински"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбекистански"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Виетнамски"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапук"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валонски"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волоф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Ксоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Еврејски"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Јоруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Жуанг"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Кинески"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Кинески поедноставен"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Кинески (Хонг Конг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Кинески традиционален"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/mn.po b/translations/desktop_files/all_languages.desktop/mn.po
index e2ccd1ccc..f9fc8324f 100644
--- a/translations/desktop_files/all_languages.desktop/mn.po
+++ b/translations/desktop_files/all_languages.desktop/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "Англи"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Англи"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Англи"
 
 #. Name
@@ -200,714 +200,719 @@ msgstr "Испани"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Эстони"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскү"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фарси (Перс)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Финнлянд"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фижи"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фаро"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Франц"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фрис"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Гаели"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Гаели"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарани"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гуярати"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкс"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Хебрев"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хинди"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хорват"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Серб"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Унгар"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Армен"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Хереро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингуа"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонези"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Интерлингуе"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиак"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исланд"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Итали"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Япон"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Явон"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Георги"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикуюу"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казак"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калааллисут"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Хмер"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Канад"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Солонгос"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмири"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Күрд"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Коми"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корни"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Киргиз"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латин"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люьксембүрг"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбүрг"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингала"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лао"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литви"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латви"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагасу"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршалл"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маори"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Макидон"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малаялам"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Монгол"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдав"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Марати"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Маля"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Малт"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бүрм"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвеги, Бокмал"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндэбэлэ, умард"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непал"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Дуч"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвеги Нинорск"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндэбэлэ, өмнөд"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Умард Сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Наваяа"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичева"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Окситан"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ория"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Оссетан"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панжаби"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Польш"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пушто"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португал"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразилын португал"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Куечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Роман"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Роман"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Орос"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кинярванда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардин"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синди"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Умард Сами"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Синхал"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словак"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словиан"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоан"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомали"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албани"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Серб"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Серб"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Свати"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Сото, Өмнөд"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сундан"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Швед"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Свахил"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамил"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Тэлүгү"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Тажик"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тай"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигрин"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркмен"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Цвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турк"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Цонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татаар"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Тви"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Тахит"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Уйгур"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украйн"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбек"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Витьнам"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапүк"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валлоон"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волоф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Чоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Юүд"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Ёруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Жунгаа"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Хятад"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/ms.po b/translations/desktop_files/all_languages.desktop/ms.po
index d704c700e..5709f1444 100644
--- a/translations/desktop_files/all_languages.desktop/ms.po
+++ b/translations/desktop_files/all_languages.desktop/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -180,13 +180,13 @@ msgstr "Inggeris"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Inggeris"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Inggeris"
 
 #. Name
@@ -201,714 +201,719 @@ msgstr "Sepanyol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonia"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Parsi"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Perancis"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisia"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croatia"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hungaria"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenia"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesia"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italia"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Jepun"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jawa"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgia"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korea"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lithuania"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvia"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedonia"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolia"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavia"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burma"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Belanda"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho Utara"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 #, fuzzy
 msgid "Polish"
 msgstr "Inggeris"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugis"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugis Brazil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romania"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romania"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russia"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ukrainia"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami Utara"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 #, fuzzy
 msgid "Slovak"
 msgstr "Slovenia"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenia"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albania"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbia"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Latin Serbia"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Selatan"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turki"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainia"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnam"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "China"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "China (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/mt.po b/translations/desktop_files/all_languages.desktop/mt.po
index 75f2a0eb2..160453901 100644
--- a/translations/desktop_files/all_languages.desktop/mt.po
+++ b/translations/desktop_files/all_languages.desktop/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "Ingliż"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Ingliż"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Ingliż"
 
 #. Name
@@ -200,721 +200,726 @@ msgstr "Spanjol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonjan"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Bask"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandiż"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franċiż"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiċian"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Lhudi"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroat"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serb"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungeriż"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 #, fuzzy
 msgid "Armenian"
 msgstr "Rumen"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneżjan"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandiż"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Taljan"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Ġappuniż"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Ġappuniż"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurd"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Daniż"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litwanjan"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvjan"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Maċedonjan"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 #, fuzzy
 msgid "Moldavian"
 msgstr "Latvjan"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malti"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Olandiż"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oċċitan"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pollakk"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugiż"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "Portugiż"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumen"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumen"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russu"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ukranjan"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakk"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloven"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 #, fuzzy
 msgid "Albanian"
 msgstr "Rumen"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serb"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serb"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svediż"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tai"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tork"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 #, fuzzy
 msgid "Tahitian"
 msgstr "Kroat"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukranjan"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vjetnamiż"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Ċiniż"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Żulu"
diff --git a/translations/desktop_files/all_languages.desktop/nb.po b/translations/desktop_files/all_languages.desktop/nb.po
index fc2aa1370..20750803e 100644
--- a/translations/desktop_files/all_languages.desktop/nb.po
+++ b/translations/desktop_files/all_languages.desktop/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engelsk"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britisk engelsk"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikansk engelsk"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Spansk"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estisk"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisk"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persisk)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finsk"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijisk"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Færøyisk"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransk"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisisk"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irsk gaelisk"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gælisk"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Gaelisk"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebraisk"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatisk"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Øvresorbisk"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armensk"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesisk"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandsk"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiensk"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japansk"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanesisk"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgisk"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreansk"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdisk"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cornisk"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgisisk"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgisk"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgisk"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litauisk"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvisk"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 #, fuzzy
 msgid "Malagasy"
 msgstr "Malaiisk"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallesisk"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonsk"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaiisk"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolsk"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavisk"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaiisk"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesisk"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesisk"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norsk, bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Nord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Lavgermansk"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlandsk"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Sør"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nord-Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitansk"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetisk"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polsk"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugisisk"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasil-portugisisk"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumensk"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russisk"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardisk"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Nordsamisk"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singalesisk"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakisk"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovensk"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoansk"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albansk"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbisk"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbisk (latinsk)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Sørlig"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesisk"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svensk"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmensk"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitisk"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uigursk"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbekisk"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallonsk"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddisk"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kinesisk"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Forenklet kinesisk"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kinesisk (Hong kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Tradisjonell kinesisk"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/nds.po b/translations/desktop_files/all_languages.desktop/nds.po
index 9228ed554..ec67e4deb 100644
--- a/translations/desktop_files/all_languages.desktop/nds.po
+++ b/translations/desktop_files/all_languages.desktop/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engelsch"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britsch Engelsch"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikaansch Engelsch"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Spaansch"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estnsch"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basksch"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persisch)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finnsch"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidschi"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Färöösch"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franzöösch"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Freesch"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irsch Gäälsch"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gäälsch"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galizsch"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gudscharati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Haussa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrääsch"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroaatsch"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Böversorbsch"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungaarsch"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeensch"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneesch"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islannsch"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italieensch"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japaansch"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javaneesch"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgsch"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kasachsch"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreaansch"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaschmiirsch"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdsch"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornisch"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiisch"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latiensch"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemborgsch"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limborgsch"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laootsch"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litausch"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettsch"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Madagass'sch"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marschalleesch"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedoonsch"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaiisch"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoolsch"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldaawsch"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 #, fuzzy
 msgid "Marathi"
 msgstr "Gudscharati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaiisch"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteesch"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmeesch"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norweegsch (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Noord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Plattdüütsch"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepaleesch"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nedderlannsch"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norweegsch Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Sööd"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Noord-Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okzitaansch"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osseetsch"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pandschaabsch"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poolsch"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Paschtuunsch"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugeesch"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasiliaansch Portugeesch"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Ketschua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumäänsch"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romaneesch"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russ'sch"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiensch"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Noord-Saamsch"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singaleesch"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slowaaksch"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloweensch"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoaansch"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Schona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albaansch"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbsch"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbsch (latiensch Schrift)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Sööd"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundaneesch"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sweedsch"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamielsch"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadschiiksch"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeensch"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Törksch"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tartaarsch"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahiitsch"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uighuursch"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainsch"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbeeksch"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Usbeeksch (kyrillsch)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnameesch"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walloonsch"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddsch"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chineesch"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Vereenfacht Chineesch"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chineesch (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Traditschonell Chineesch"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ne.po b/translations/desktop_files/all_languages.desktop/ne.po
index d01fb74bd..29e445ca0 100644
--- a/translations/desktop_files/all_languages.desktop/ne.po
+++ b/translations/desktop_files/all_languages.desktop/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "अङ्ग्रेजी"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "बेलायती अङ्ग्रेजी"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "अमेरेकी अङ्ग्रेजी"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "स्पेनिश"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "इस्टोनियन"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "बास्क"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "फारसी (पर्सियन)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "फिनिश"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "फिजियन"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "फारोसी"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "फ्रेन्च"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "फ्रिसियन"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "आइरिश ग्यालिक"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "ग्यालिक"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "ग्यालिसियाली"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "गुवारानी"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "गुजराती"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "म्याङ्क्स"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "हउसा"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "हिब्रु"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "हिन्दी"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "हिरी मोतु"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "क्रोयसियाली"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "माथिल्लो सोर्बियाली"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "हङ्गेरेली"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "आर्मेनियाली"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "हेरेरो"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "इन्टरलिङ्गुवा"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "इन्डोनेसियाली"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "इन्टरलिङ्गुवा"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "इनुपिक"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "इडो"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "आइसल्यान्डिक"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "इटालियन"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "इनक्टिटुट"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "जापानी"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "जाभानिज"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "जर्जियाली"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "किकुयु"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "कजाक"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "कलाल्लिसुट"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "खमेर"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "कानाडा"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "कोरियाली"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "काश्मिरी"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "कुर्दिश"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "कोमी"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "कर्निस"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "क्रिगिज"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "ल्याटिन"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "लग्जेमबर्गिस"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "लिम्बुरगन"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "लिङ्गाला"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "लाओ"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "लिथुनियाली"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "लाट्भियन"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "मालागासे"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "मार्शालिश"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "माओरी"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "म्यासेडोनियन"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "मलायालम"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "मङ्गोलियाली"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "मोल्डाभियन"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "मराठी"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "मले"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "माल्तेसी"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "बर्मेली"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "नाउरू"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "नर्वेली बोकमल"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "डेबेले, उत्तर"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "लो साक्सोन"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "नेपाली"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "डोङ्गा"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "डच"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "नर्वेली नाइनोर्सक"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "डेबेले, दक्षिण"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "उत्तरी सोथो"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "नेभाजो"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "चिचेवा"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ओक्सिटान"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ओरोमो"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ओरिया"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ओसेसियन"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "पन्जाबी"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "पाली"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "पोलीश"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "पुस्तो"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "पोर्चुगाली"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ब्राजिली पोर्चुगाली"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "क्वेचउ"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "रून्डी"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "रोमनियाली"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "रोमानी"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "रसियाली"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "किन्यरवान्डा"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "संस्कृत"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "सर्दिनियन"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "सिन्धी"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "उत्तरी सामी"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "साङ्गो"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "सिङ्हाली"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "स्लोभाक"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "स्लोभेनियन"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "सामोआन"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "शोना"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "सोमाली"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "अल्बानियाली"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "सर्बियाली"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "सर्बियाली ल्याटिन"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "स्वाती"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "सोथो, दक्षिणी"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "सुडानी"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "स्विडेनी"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "स्वाहिली"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "तामिल"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "तेलुगु"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "ताजिक"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "थाई"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "तिग्रिन्य"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "टर्कम्यान"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "तस्वाना"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "टोङ्गा"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "टर्किश"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "सोङ्गा"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "टाटर"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "तुइ"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "ताहिसिन"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "विगोर"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "युक्रेनी"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "उर्दु"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "उज्बेक"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "भेन्डा"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "भियतनामी"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "भोलापुक"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "वालोन"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "वलोफ"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "होजा"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "इडिस"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "योरूबा"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "झिआङ"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "चिनियाँ"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "सरलीकृत चिनियाँ"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "चिनियाँ (हङकङ)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "चिनियाँ परम्परागत"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "जुलु"
diff --git a/translations/desktop_files/all_languages.desktop/nl.po b/translations/desktop_files/all_languages.desktop/nl.po
index dd6207556..e2402b4d9 100644
--- a/translations/desktop_files/all_languages.desktop/nl.po
+++ b/translations/desktop_files/all_languages.desktop/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engels"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Engels (Brits)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Engels (Amerikaans)"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Spaans"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Ests"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisch"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Perzisch)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fins"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijisch"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Frans"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frysk"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gaelic (Iers)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 #, fuzzy
 msgid "Gaelic"
 msgstr "Gaelic (Iers)"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicisch"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatisch"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Opper Sorbian"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongaars"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeens"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesisch"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "IJslands"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiaans"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japans"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanees"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgisch"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreaans"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Koerdisch"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Deens"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirghizisch"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latijn"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Letzenburgs"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgs"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litouws"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lets"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallees"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedonisch"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolisch"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavisch"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltees"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmees"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Noors Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Noord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Nedersaksisch"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalees"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlands"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noors, Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Zuid"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Noord-Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetisch"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pools"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugees"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Braziliaans Portugees"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Roemeens"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Roma"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russisch"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinisch"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Noord Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalees"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slowaaks"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloweens"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoaans"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalisch"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanisch"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Servisch"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Servisch Latijn"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Zuid"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanees"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Zweeds"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tajiks"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thais"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeens"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turks"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiaans"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Oekraïns"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbeeks"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamees"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapúk"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Waals"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinees"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinees (Vereenvoudigd)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinees (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinees (Traditioneel)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/nn.po b/translations/desktop_files/all_languages.desktop/nn.po
index 5f140a9d7..d853075ba 100644
--- a/translations/desktop_files/all_languages.desktop/nn.po
+++ b/translations/desktop_files/all_languages.desktop/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engelsk"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Engelsk (Storbritannia)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Engelsk (USA)"
 
 #. Name
@@ -199,713 +199,718 @@ msgstr "Spansk"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estisk"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisk"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Persisk"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finsk"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijisk"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Færøysk"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransk"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisisk"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Gælisk (Irland)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gælisk"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galisisk"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebraisk"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatisk"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Øvresorbisk"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungarsk"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armensk"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesisk"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandsk"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiensk"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inuittisk"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japansk"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanesisk"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgisk"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kasakhisk"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Grønlandsk"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreansk"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kasjmiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdisk"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornisk"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgisisk"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxembourgsk"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgsk"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litauisk"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvisk"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Gassisk"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallesisk"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonsk"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malayisk"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolsk"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldovsk"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malayisk"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesisk"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesisk"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norsk bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, nord"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Låggermansk"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalsk"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Tongansk"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Nederlandsk"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norsk nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, sør"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nord-Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitansk"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetisk"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polsk"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugisisk"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasil-portugisisk"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumensk"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russisk"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiniansk"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Nordsamisk"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singalesisk"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakisk"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovensk"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoansk"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albansk"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbisk"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbisk, latinsk"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, sør"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesisk"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svensk"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilsk"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadsjikisk"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thailandsk"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmensk"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Setswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongansk"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Tyrkisk"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 #, fuzzy
 msgid "Tsonga"
 msgstr "Tongansk"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarisk"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitisk"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uigurisk"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbekisk"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapyk"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallonsk"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddisk"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Joruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kinesisk"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Kinesisk (forenkla)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kinesisk (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Kinesisk (tradisjonell)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/nso.po b/translations/desktop_files/all_languages.desktop/nso.po
index 968b49342..0b4921553 100644
--- a/translations/desktop_files/all_languages.desktop/nso.po
+++ b/translations/desktop_files/all_languages.desktop/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "Sekgowa"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Sekgowa"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Sekgowa"
 
 #. Name
@@ -200,718 +200,723 @@ msgstr "Se-Spanish"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Se-Estonian"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Se-Basque"
 
 #. Name
-#: all_languages.desktop:78
+#: all_languages.desktop:80
 #, fuzzy
-msgid "Farsi (Persian)"
+msgid "Persian"
 msgstr "Se-Frisian"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Se-Finnish"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Se-Fijian"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Se-Faroese"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Sefora"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Se-Frisian"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Se-Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Se-Gaelic"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Se-Guarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Se-Gujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Se-Manx"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Se-Hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Se-Heberu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Se-Hindi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Se-Hiri Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Se-Croatian"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Se-Serbian"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Se-Hungarian"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Se-Armenian"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Se-Herero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Se-Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Se-Indonesian"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Se-Interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Se-Inupiaq"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Se-Ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Se-Icelandic"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Se-Italian"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Se-Inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Se-Japanese"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Se-Javanese"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Se-Georgian"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Se-Kikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Se-Kazakh"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Se-Kalaallisut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Se-Khmer"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Se-Kannada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Se-Korean"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Se-Kashmiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Se-Kurdish"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Se-Komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Se-Cornish"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Se-Kirghiz"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Se-Latin"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Se-Luxembourgish"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Se-Limburgan"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Se-Lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Se-Lao"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Se-Lithuanian"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Se-Latvian"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Se-Malagasy"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Se-Marshallese"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Se-Maori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Se-Macedonian"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Se-Malayalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Se-Mongolian"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Se-Moldavian"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Se-Marathi"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Se-Malay"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Se-Maltese"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Se-Burmese"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Se-Nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Se-Norwegian Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Se-Ndebele, sa Lebowa"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Se-Nepali"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Se-Ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Se-Dutch"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Se-Norwegian Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Se-Ndebele, sa Borwa"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "Se-Sami sa Lebowa"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Se-Navajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Se-Chichewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Se-Occitan"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Se-Oromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Se-Oriya"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Se-Ossetian"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Se-Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Se-Punjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Se-Pali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Se-Polish"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Se-Pushto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Sepotokisi"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "Sepotokisi"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Se-Quechua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Se-Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Se-Romanian"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Se-Romanian"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Se-Russian"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Se-Kinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Se-Sanskrit"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Se-Sardinian"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Se-Sindhi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Se-Sami sa Lebowa"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Se-Sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Se-Sinhalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 #, fuzzy
 msgid "Slovak"
 msgstr "Se-Slovenian"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Se-Slovenian"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Se-Samoan"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Se-Shona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Se-Somali"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Se-Albanian"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Se-Serbian"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Se-Serbian"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Se-Swati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sesotho, sa Borwa"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Se-Sundan"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Se-Swedish"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Se-Swahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Se-Tamil"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Se-Telugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Se-Tajik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Se-Thai"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Se-Tigrinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Se-Turkmen"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Setswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Se-Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Se-Turkish"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Se-Tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Se-Tatar"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Se-Twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Se-Tahitian"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Se-Uighur"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Se-Ukrainian"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Se-Urdu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Se-Uzbek"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Se-Vietnamese"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Se-Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Se-Walloon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Se-Wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Sethosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Se-Yiddish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Se-Yoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Se-Zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Se-China"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Se-Zulu"
diff --git a/translations/desktop_files/all_languages.desktop/oc.po b/translations/desktop_files/all_languages.desktop/oc.po
index fe590bd67..7dd97be90 100644
--- a/translations/desktop_files/all_languages.desktop/oc.po
+++ b/translations/desktop_files/all_languages.desktop/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -180,13 +180,13 @@ msgstr "Anglès"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Anglès"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Anglès"
 
 #. Name
@@ -201,715 +201,720 @@ msgstr "Espanhòl"
 
 #. Name
 #: all_languages.desktop:74
-msgid "Estonian"
+msgid "Spanish (Argentina)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:76
+msgid "Estonian"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Bascon"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandès"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franchimand"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Cròatian"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongarian"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandès"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japònès"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Japònès"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Còrean"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Danès"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litua"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maòri"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Olandès"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitàn"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Pòlònès"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Pòrtuguès"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "Pòrtuguès"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rus"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ucranian"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslòvac"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Eslòvian"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suedès"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tai"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turc"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 #, fuzzy
 msgid "Tahitian"
 msgstr "Cròatian"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucranian"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinès"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/pa.po b/translations/desktop_files/all_languages.desktop/pa.po
index b95d7149b..0338d6650 100644
--- a/translations/desktop_files/all_languages.desktop/pa.po
+++ b/translations/desktop_files/all_languages.desktop/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "ਅੰਗਰੇਜ਼ੀ"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "ਅੰਗਰੇਜ਼ੀ ਬਰਤਾਨੀਆ"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "ਅੰਗਰੇਜ਼ੀ ਅਮਰੀਕੀ"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "ਸਪੇਨੀ"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "ਇਸਟੋਨੀਆ"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "ਬਸਕਿਉ"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "ਫਾਰਸੀ (ਪਰਸ਼ੀਆਈ)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ਫੈਨਿਸ਼"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ਫਿਜੀਨ"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ਫਾਰੋਇਸੀ"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "ਫਰੈਂਚ"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ਫਰੀਸੀਨਿਸ"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "ਆਈਰਿਸ਼ ਗਾਈਲਿਕ"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "ਗਾਈਲਿਕ"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "ਗਾਈਲੀਅਨ"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "ਗੁਰਾਨੀ"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "ਗੁਜਰਾਤੀ"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "ਮਾਲਸ"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "ਹਾਉਸਾ"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "ਹੈਬਰਿਊ"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "ਹਿੰਦੀ"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "ਹੀਰੀ ਮੋਟੂ"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "ਕਰੋਟੀਅਨ"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "ਉੱਪਰੀ ਸਰਬੀਅਨ"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "ਹੰਗਰੀਅਨ"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "ਅਰਮੀਅਨ"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "ਹੀਰੀਰੋ"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "ਇੰਟਰਲੀਗੂਆ"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "ਇੰਡੋਨੇਸ਼ੀਆ"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "ਇੰਟਰਈਨੂਗੂਈ"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "ਇਨਪੀਕਾਉ"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ਆਈਡੋ"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "ਆਇਸਲੈਂਡ"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "ਇਤਾਲਵੀ"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "ਇਨੂਕਟੀਟੂਟ"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "ਜਾਪਾਨੀ"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "ਜਾਵਾਨੀਅਨ"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "ਜਾਰਜੀਆ"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "ਕਿਕੂਯੂ"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "ਕਾਜ਼ਾਖ"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "ਕਾਲਾਆਲਿਸੂਟ"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "ਖਮੀਰ"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "ਕਾਨਡਾ"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "ਕੋਰੀਆਈ"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "ਕਸ਼ਮੀਰੀ"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "ਕੁਰਦ"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "ਕੋਮੀ"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "ਕੋਰਨਿਸ਼"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "ਕਿਰਘੀਜ਼"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "ਲੈਟਿਨ"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "ਲਕਸ਼ਬਰਗਸ਼"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "ਲੀਮਬੁਰਗਾਨ"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "ਲੀਨਗਾਲਾ"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "ਲਿਓ"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "ਲੀਥੂਨੀਆਨ"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "ਲਾਟਵੀਨ"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "ਮਾਲਾਗਾਸਆ"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "ਮਾਰਸ਼ਲੀਈਸੀ"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "ਮਾਓਰੀ"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "ਮੈਕਡੋਨੀਆ"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "ਮਲਿਆਲਮ"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "ਮੰਗੋਲੀਅਨ"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "ਮੋਲਡਾਵੀਅਨ"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "ਮਰਾਠੀ"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "ਮਾਲਿਆ"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "ਮਾਲਟੀਸੀ"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "ਬੁਰਮੀਸੀ"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "ਨਾਉਰੂ"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "ਨੋਰਵਿਗੀਆਨ ਬੋਕਮਾਲ"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "ਨਡੀਬੀਲੀ, ਉੱਤਰੀ"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "ਲੋਅ ਸਾਕੋਨ"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "ਨੇਪਾਲੀ"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "ਨਡੋਨਗਾ"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "ਡੱਚ"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "ਨੋਰਵਿਗੀਆਨ ਨਯਾਨੋਰਸਕ"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "ਨਡੀਬੀਲੀ, ਦੱਖਣੀ"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "ਉੱਤਰੀ ਸੋਥੋ"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "ਨਾਵਾਜੋ"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "ਚਿਚੀਵਾ"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ਓਸੀਟਾਨ"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ਓਰੋਮੋ"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ਉੜੀਆ"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ਓਸੀਟੀਅਨ"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "ਪੰਜਾਬੀ"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "ਪਾਲੀ"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "ਪੋਲੈਂਡੀ"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "ਪੁਸ਼ਤੋ"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "ਪੁਰਤਗਾਲੀ"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ਬਰਾਜ਼ੀਲ ਪੁਰਤਗਾਲੀ"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "ਕਿਉਚੁਆ"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "ਰੂਡੀ"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "ਰੋਮਾਨੀਆਈ"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "ਰੋਮੇ"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "ਰੂਸੀ"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "ਕਿਨਯਾਰਵਾਡਾਂ"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "ਸੰਸਕ੍ਰਿਤ"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "ਸਾਰਡੀਨੀਆਨ"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "ਸਿੰਧੀ"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "ਉੱਤਰੀ ਸਾਮੀ"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "ਸਾਂਗੋ"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "ਸਿੰਹਾਲਸ਼"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "ਸਲੋਵਾਕ"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "ਸਲੋਵੀਨੀਆਨ"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "ਸਾਮੋਆਨ"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "ਸ਼ੋਨਾ"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "ਸੋਮਾਲੀ"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "ਅਲਬਾਨੀਅਨ"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "ਸਰਬੀਅਨ"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "ਸਰਬੀਅਨ ਲੈਟਿਨ"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "ਸਵਾਟੀ"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "ਸੋਥੋ, ਦੱਖਣੀ"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "ਸੂਡਾਨੀਅਸ"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "ਸਵੀਡਿਸ਼"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "ਸਵਾਹਿਲੀ"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "ਤਾਮਿਲ"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "ਤੇਲਗੂ"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "ਤਾਜਿਕ"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "ਥਾਈ"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "ਤਿਗਰੀਅਨ"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "ਤੁਰਕਮੀਨ"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "ਤਸਵਾਨਾ"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "ਤੋਂਗਾ"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "ਤੁਰਕਿਸ਼"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "ਤਸੋਂਗਾ"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "ਤਾਟਾਰ"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "ਤਵੀ"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "ਤਾਹੀਟੀਅਨ"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "ਉਘੂਰ"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ਯੂਕਰੇਨ"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "ਉਰਦੂ"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "ਊਜੇਬਕ"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "ਵਾਂਡਾ"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "ਵੀਅਤਨਾਮੀ"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "ਵੂਲਾਉਕ"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "ਵਾਲੂਨ"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "ਵੂਲੂਫ"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "ਝੋਸਾ"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "ਯੀਡਿਸ਼"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "ਯੂਰੋਬਾ"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "ਜ਼ੂੰਗ"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "ਚੀਨੀ"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "ਚੀਨੀ ਸਧਾਰਨ"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "ਚੀਨੀ (ਹਾਂਗਕਾਂਗ)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "ਚੀਨੀ ਮੂਲ"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ਜ਼ੂਲੂ"
diff --git a/translations/desktop_files/all_languages.desktop/pl.po b/translations/desktop_files/all_languages.desktop/pl.po
index daef1bd63..dac66e0d0 100644
--- a/translations/desktop_files/all_languages.desktop/pl.po
+++ b/translations/desktop_files/all_languages.desktop/pl.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
-"PO-Revision-Date: 2020-08-21 15:32+0000\n"
+"POT-Creation-Date: 2020-11-25 17:36+0100\n"
+"PO-Revision-Date: 2020-12-02 17:59+0000\n"
 "Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdelibs/all-languages/pl/>\n"
@@ -16,7 +16,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.3.2\n"
 
 #. Name
 #: all_languages.desktop:2
@@ -80,14 +80,13 @@ msgstr "Bułgarski"
 
 #. Name
 #: all_languages.desktop:26
-#, fuzzy
 msgid "Bihari"
-msgstr "Etiopski"
+msgstr "Bihari"
 
 #. Name
 #: all_languages.desktop:28
 msgid "Bislama"
-msgstr ""
+msgstr "Bislama"
 
 #. Name
 #: all_languages.desktop:30
@@ -122,7 +121,7 @@ msgstr "Czeczeński"
 #. Name
 #: all_languages.desktop:42
 msgid "Chamorro"
-msgstr ""
+msgstr "Czamorro"
 
 #. Name
 #: all_languages.desktop:44
@@ -167,7 +166,7 @@ msgstr "Niemiecki"
 #. Name
 #: all_languages.desktop:60
 msgid "Dzongkha"
-msgstr ""
+msgstr "Dzongkha"
 
 #. Name
 #: all_languages.desktop:62
@@ -181,18 +180,18 @@ msgstr "Angielski"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Angielski brytyjski"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Angielski amerykański"
 
 #. Name
 #: all_languages.desktop:70
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 #. Name
 #: all_languages.desktop:72
@@ -201,711 +200,715 @@ msgstr "Hiszpański"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr "Hiszpański (Argentyna)"
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoński"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskijski"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Perski)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fiński"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "z Fiji"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "z Wysp Owczych"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francuski"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Fryzyjski"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlandzki Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "celtycki (gaelic)"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicyjski"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
-msgstr ""
+msgstr "Guarani"
 
 #. Name
-#: all_languages.desktop:98
-#, fuzzy
+#: all_languages.desktop:100
 msgid "Gujarati"
-msgstr "Marathi (Hinduski)"
+msgstr "Gudźarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
-msgstr ""
+msgstr "Manx"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
-msgstr ""
+msgstr "Hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrajski"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
-msgstr ""
+msgstr "Hindi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
-msgstr ""
+msgstr "Hiri Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Chorwacki"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Górnołużycki"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Węgierski"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Ormiański"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
-msgstr ""
+msgstr "Herero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
-msgstr ""
+msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezyjski"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
-msgstr ""
+msgstr "Interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
-msgstr ""
+msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
-msgstr ""
+msgstr "Ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandzki"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Włoski"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
-msgstr ""
+msgstr "Inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japoński"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jawański"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruziński"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
-msgstr ""
+msgstr "Kikuju"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazachski"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
-msgstr ""
+msgstr "Grenlandzki"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khmerski"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreański"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaszmirski"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdyjski"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "z Komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornwalijski"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiski"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Łaciński"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburski"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgiański"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
-msgstr ""
+msgstr "Lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laotański"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litewski"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Łotewski"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Madagaskarski"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "z Wysp Marshalla"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoryjski"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedoński"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Drawidiański (Hinduski)"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolski"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Mołdawski"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marathi (Hinduski)"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajski"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltański"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmański"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norweski Bokmaal"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Północ"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Dolnosaksoński"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalski"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
-msgstr ""
+msgstr "Ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holenderski"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norweski Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Południe"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Północne Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
-msgstr ""
+msgstr "Nawaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
-msgstr ""
+msgstr "Cziczewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okcytański"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
-msgstr ""
+msgstr "Oromski"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
-msgstr ""
+msgstr "Orija"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetański"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pendżabski"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
-msgstr ""
+msgstr "Pali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polski"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
-msgstr ""
+msgstr "Pasztuński"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalski"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugalski (brazylijski)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
-msgstr ""
+msgstr "Keczua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
-msgstr ""
+msgstr "Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumuński"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romski"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rosyjski"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
-msgstr ""
+msgstr "Rwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskryt"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardyński"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
-msgstr ""
+msgstr "Sindhi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Północny Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
-msgstr ""
+msgstr "Sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Syngaleski"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Słowacki"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Słoweński"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoański"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
-msgstr ""
+msgstr "Shona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalijski"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albański"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbski"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbski łaciński"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
-msgstr ""
+msgstr "Suazi"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Południowy"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudański"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Szwedzki"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
-msgstr ""
+msgstr "Suahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamiljski"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadżycki"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tajski"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
-msgstr ""
+msgstr "Tigrinia"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmeński"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
-msgstr ""
+msgstr "Tswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turecki"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
-msgstr ""
+msgstr "Tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarski"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
-msgstr ""
+msgstr "Twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitański"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgurski"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraiński"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbecki"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Uzbecki (cyrlica)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
-msgstr ""
+msgstr "Venda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
-msgstr ""
+msgstr "Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Waloński"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
-msgstr ""
+msgstr "Wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
-msgstr ""
+msgstr "Xhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidysz"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
-msgstr ""
+msgstr "Joruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
-msgstr ""
+msgstr "Zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chiński"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chiński uproszczony"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chiński (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chiński tradycyjny"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zuluski"
diff --git a/translations/desktop_files/all_languages.desktop/pt.po b/translations/desktop_files/all_languages.desktop/pt.po
index 700f0180a..83606b7cd 100644
--- a/translations/desktop_files/all_languages.desktop/pt.po
+++ b/translations/desktop_files/all_languages.desktop/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Inglês"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglês da Grã-Bretanha"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglês Americano"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Espanhol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estónio"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basco"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persa)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandês"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidjiano"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faroês"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francês"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frísio"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Galês da Irlanda"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galês"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galego"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindu"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croata"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sérvio de Cima"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Húngaro"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Arménio"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandês"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiano"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonês"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanês"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Geórgio"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Cazaquistanês"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreano"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Curdo"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cornualho"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Quirguistanês"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latim"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburguês"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburguês"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letão"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgaxe"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marselhês"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedónio"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaio"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavo"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaio"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltês"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Birmanês"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norueguês Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele do Norte"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Baixo-Saxão"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalês"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandês"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norueguês Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele do Sul"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho do Norte"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitano"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osseta"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polaco"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Português"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Português do Brasil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romeno"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russo"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanscrito"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardenho"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami do Norte"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 #, fuzzy
 msgid "Sinhalese"
 msgstr "Marselhês"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovaco"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Esloveno"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoano"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanês"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Sérvio"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Sérvio Latino"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho do Sul"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudanês"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sueco"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tailandês"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turquemenistanês"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiano"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Usbequistanês"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valão"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinês"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinês Simplificado"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinês (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinês Tradicional"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/pt_BR.po b/translations/desktop_files/all_languages.desktop/pt_BR.po
index 658c7ded3..7764fcbdb 100644
--- a/translations/desktop_files/all_languages.desktop/pt_BR.po
+++ b/translations/desktop_files/all_languages.desktop/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Inglês"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglês Britânico"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglês Americano"
 
 #. Name
@@ -199,716 +199,721 @@ msgstr "Espanhol"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoniano"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basco"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persa)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandês"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francês"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 #, fuzzy
 msgid "Frisian"
 msgstr "Farsi (Persa)"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlandês \"Gaelic\""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galês"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galês"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croata"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sérvio"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Húngaro"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armênio"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Interlíngua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonésio"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 #, fuzzy
 msgid "Interlingue"
 msgstr "Interlíngua"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islândico"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiano"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonês"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanês"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Geórgio"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Canadá"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreano"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Cashimira"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 #, fuzzy
 msgid "Cornish"
 msgstr "Dinamarquês"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latim"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgo"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvia"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 #, fuzzy
 msgid "Malagasy"
 msgstr "Malaiano"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedoniano"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaiano"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolês"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldaviano"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaiano"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltês"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norueguês (Bokmaal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Norte"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Baixa Saxonia"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandês"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norueguês do Norte"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Sul"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sotho do Norte"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polonês"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Português"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Português do Brasil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romeno"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romani"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Russo"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ucraniano"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami do Norte"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovaco"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Esloveno"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoa"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanês"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Sérvio"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Sérvio Latino"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Sul"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudanês"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Sueco"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turco"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiano"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinês"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chinês Simplificado"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chinês (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chinês Tradicional"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ro.po b/translations/desktop_files/all_languages.desktop/ro.po
index 8a2bbb1f9..509a38f3a 100644
--- a/translations/desktop_files/all_languages.desktop/ro.po
+++ b/translations/desktop_files/all_languages.desktop/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engleză"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Engleză britanică"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Engleză americană"
 
 #. Name
@@ -199,710 +199,715 @@ msgstr "Spaniolă"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoniană"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Bască"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persană)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandeză"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijiană"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faroeză"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franceză"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisiană"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Galeză irlandeză"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galică"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galică"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guarană"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manxă"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hausă"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Israeliană"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindusă"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Croată"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sîrbă de Sus"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Maghiară"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenă"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hereră"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneziană"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiacă"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandeză"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italiană"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japoneză"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Iavaneză"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgiană"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Cazacă"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Calalisută"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmeră"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kanada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreană"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Caşmiră"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Curdă"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Corneză"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Chirghiză"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latină"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgheză"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgană"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingală"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituaniană"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latviană"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgaşă"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marşaleză"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maură"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedoneană"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malailamă"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolă"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldovenească"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaeză"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteză"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmeză"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naură"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegiană Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebelă nordică"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Saxona de Jos"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepaleză"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndongă"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Olandeză"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegiană Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebelă sudică"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Soto nordică"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Ciceuă"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitană"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromă"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Oriană"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetiană"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Panjabă"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poloneză"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puştă"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugheză"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugheză braziliană"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Română"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Ţigănească"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusă"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Chiniaruandeză"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanscrită"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiniană"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami nordică"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangă"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinaleză"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovacă"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenă"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoană"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Şonă"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somaleză"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albaneză"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Sîrbă"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Sîrbă latină"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Suată"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Soto sudică"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sudaneză"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suedeză"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suahileză"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilă"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telugă"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tajică"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tailandeză"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrină"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turcmenă"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Ţuană"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongă"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turcă"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsongă"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tătară"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiană"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uigură"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ucrainiană"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbecă"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnameză"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapucă"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonă"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofă"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Idiş"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Iorubă"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chineză"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Chineză simplificată"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Chineză (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Chineză tradiţională"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ru.po b/translations/desktop_files/all_languages.desktop/ru.po
index 531e42362..5dfe5b403 100644
--- a/translations/desktop_files/all_languages.desktop/ru.po
+++ b/translations/desktop_files/all_languages.desktop/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.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19: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: 2020-11-25 17:36+0100\n"
+"PO-Revision-Date: 2023-12-02 20:14+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/all-languages/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_languages.desktop:2
@@ -134,7 +137,7 @@ msgstr "Чешский"
 #. Name
 #: all_languages.desktop:48
 msgid "Kashubian"
-msgstr ""
+msgstr "Кашубский"
 
 #. Name
 #: all_languages.desktop:50
@@ -178,12 +181,12 @@ msgstr "Английский"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Английский (Великобритания)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Английский (США)"
 
 #. Name
@@ -198,711 +201,715 @@ msgstr "Испанский"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr "Испанский (Аргентина)"
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Эстонский"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскский"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фарси"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Финский"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фиджи"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фарерский"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Французский"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризийский"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Галльский (Ирландия)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Галльский"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галицийский"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарани"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гуджарати"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкс"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Иврит"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хинди"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хорватский"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Верхнелужицкий"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Венгерский"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Армянский"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Эреро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингва"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезийский"
 
 #. Name
-#: all_languages.desktop:124
-#, fuzzy
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Интерлингва"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиак"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландский"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Итальянский"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Японский"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Яванский"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузинский"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикую"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казахский"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калаалисут"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кхмерский"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Каннада"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корейский"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмирский"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдский"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Коми"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корнуольский"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Киргизский"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латинский"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксембургский"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбуржский"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингала"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лао"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литовский"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латышский"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Мальгашский"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршалльский"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маори"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонский"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малайялам"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Монгольский"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдавский"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
-msgstr "Марати"
+msgstr "Маратхи"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайский"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Мальтийский"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бирманский"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвежский (литературный)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Сев. Ндебеле"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Нижнесаксонский"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непальский"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Голландский"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвежский (нинорский)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Юж. Ндебеле"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Северное Сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Навахо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичева"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
-msgstr "Французский (диалект Occitan)"
+msgstr "Окситанский"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ория"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетинский"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панджаби"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Польский"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пуштунский"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португальский"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Португальский (Бразилия)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Кечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Румынский"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Цыганский"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Русский"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Киньяруанда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардинийский"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдхи"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Северное Саами"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Сингальский"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словацкий"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенский"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
-msgstr "Самоа"
+msgstr "Самоанский"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
-msgstr "Схона"
+msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомалийский"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албанский"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сербский"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Сербский латинницей"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Свати"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Юж. Сото"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Суданский"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведский"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Суахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамильский"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Таджикский"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайский"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигринья"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркменский"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Тсвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турецкий"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Тсонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарский"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
-msgstr "Тви"
+msgstr "Чви"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Таити"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Уйгурский"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украинский"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбекский"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
-msgstr ""
+msgstr "Узбекский (Кирилица)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Вьетнамский"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапюк"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валлонский"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
-msgstr "Уолоф"
+msgstr "Волоф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
-msgstr "Кшоса"
+msgstr "Коса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Идиш"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Йоруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
-msgstr "Чжуанг"
+msgstr "Чжуанский"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Китайский"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Китайский (КНР)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Китайский (Гонконг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Китайский (Тайвань)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
-msgstr "Зулусский"
+msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/rw.po b/translations/desktop_files/all_languages.desktop/rw.po
index 412f41e79..0a8fe1133 100644
--- a/translations/desktop_files/all_languages.desktop/rw.po
+++ b/translations/desktop_files/all_languages.desktop/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Icyongereza"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Icyongereza, Nyongereza"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Icyongereza cy'Amerika"
 
 #. Name
@@ -198,713 +198,718 @@ msgstr "Igisipanyole"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Icyesitoniya"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Ikibasike"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Igifarisi"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Ikinyafinilande"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Igifijiyani"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Igifero"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Igifaransa"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Igifuriziyani"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ikinyirilande Gayerike"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Ikinyagayeli"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Ikinyagalisiya"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Ikigwarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Ikigujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Ikimangisi"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Igihawusa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Igiheburayo"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Igihindi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Igihiri-motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Ikinyakorowasi"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Ikinyasorubiya cyo hejuru"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ikinyahangariya"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Icyarumeniya"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Igiherero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Ikinyenterilinga"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Ikinyendonisiya"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Ikinyenterilinge"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Ikinupiyake"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Ikido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Ikinyisilande"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Igitaliyani"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Ikinukititutu"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Ikiyapani"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Ikijavani"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Ikinyageworugiya"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Ikikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Igikazaki"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Igikalalisuti"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Ikinyakime"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Iginyakanada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Igikoreya"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Igikashimiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Igikurudishi"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Igikomi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Igikorunishe"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Ikirigizi"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Ikilatini"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Ikinyalugizamburu"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Ikilimburigani"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Ilingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Ikilawo"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Ikinyalitwani"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Ikilativiya"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Ikimaragasi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Ikimarishali"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Ikimawori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Ikinyamacedoniya"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Ikimalayalamu"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Ikinyamongoliya"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Ikinyamoludavi"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Ikimarati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Ikimalayi"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Ikinyamalite"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Ikibarumi"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Ikinawuru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Ikibokumali nyanoruveje"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ikindebele, amajyaruguru"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Igisagisoni cyo hasi"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Ikinyanepale"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ikindonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Ikinyaholande"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Ikinyanoruveji nayinorusiki"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ikindebele, Amajyepfo"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Igisoto cy'Amajyaruguru"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Ikinavajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Igicicewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Icyogisitani"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Icyoromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Icyoriya"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Icyosetiyani"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Igipanjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Igipali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Ikinyapolonye"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Igipushito"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Igiporutigali"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Igiporutigali cya Burezile"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Igikwecuwa"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Ikirundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Ikinyarumaniya"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Ikinyarumaniya"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ikirusiya"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Ikinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Igisansikiriti"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Ikinyasaridini"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Igisindi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Igisami amajyaruguru"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Igisango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Ikinyasinali"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Igisilovake"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Ikinyasiloveniya"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Igisamowani"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Igishona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Igisomali"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Ikinyalubaniya"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Ikinyaseribiya"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Ikinyaseribiya"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Igiswati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Igisotho, Amajyepfo"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Ikinyasundani"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Ikinyasuwede"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Igiswayili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Igitamili"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Igitelugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Igitajika"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Igitayi"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Igitigirinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Igiturukimeni"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Igitswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Igitsonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Ikinyaturukiya"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Igitsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Igitatari"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Igitwi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Ikinyatahiti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Icyuyiguru"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ikinya-ikarayini"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Icyuridu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Icyuzubeka"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Ikivenda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Ikinyaviyetinamu"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Ikivolapuke"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Ikiwaluni"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Ikiwolofu"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Ikigisosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Ikiyidishi"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Ikiyoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Ikizwange"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Igishinwa"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Igishinwa Cyoroheje"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Igishinwa Karande"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Ikizulu"
diff --git a/translations/desktop_files/all_languages.desktop/se.po b/translations/desktop_files/all_languages.desktop/se.po
index 181482b6f..cf337669d 100644
--- a/translations/desktop_files/all_languages.desktop/se.po
+++ b/translations/desktop_files/all_languages.desktop/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Eŋgelasgiella"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Eŋgelasgiella (Stuorra Brittania)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Eŋgelasgiella (Amerihkáhlaš)"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Spánskkagiella"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Esttegiella"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskalašgiella"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsigiella (Persialaš)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Suomagiella"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fižigiella"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Fearagiella"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fránskkagiella"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisagiella"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irlánddalaš gaelagiella"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gaelagiella"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galisiagiella"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaránagiella"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gujaratigiella"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Mánksagiella"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hausagiella"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreagiella"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindigiella"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri Motu-giella"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatiagiella"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Bajil Sorbiagiella"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungárgiella"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armeniagiella"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hererogiella"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesiagiella"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiaqgiella"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Idogiella"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islánddagiella"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Itáliagiella"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inuhkagiella"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Jáhpangiella"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Jávagiella"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Grusiagiella"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikujugiella"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazakhagiella"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalállisutgiella"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khmeragiella"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kannadagiella"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreagiella"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmirgiella"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdigiella"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komigiella"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornagiella"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgisiagiella"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Láhtengiella"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksenburggagiella"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburggagiella"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingalagiella"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laogiella"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lietuvagiella"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Látviagiella"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasigiella"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallagiella"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoragiella"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedoniagiella"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajalamagiella"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoliagiella"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldáviagiella"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marathagiella"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaigiella"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltagiella"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmagiella"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naurugiella"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Girjedárogiella"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebelegiella, davvi"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Vuolil Sáksonagiella"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepálagiella"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndongagiella"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hollánddagiella"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Ođđadárogiella"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebelegiella, lulli"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Davvi-sothogiella"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Naváhogiella"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Chichevagiella"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitánagiella"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromogiella"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orijagiella"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetiagiella"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Panjabigiella"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Punjabigiella"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Páligiella"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polskkagiella"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puštugiella"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugálagiella"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasilialaš portugálagiella"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Keččuagiella"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundigiella"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romániagiella"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Románigiella"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruoššagiella"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyarwandagiella"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskrihtagiella"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiniagiella"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindhigiella"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Davvisámegiella"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangogiella"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singalesagiella"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovákagiella"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenagiella"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoagiella"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Šonagiella"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somálagiella"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albániagiella"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbiagiella"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbialaš latiidnagiella"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Svatigiella"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sothogiella, lulli"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesagiella"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Ruoŧagiella"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahilagiella"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilgiella"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telugugiella"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tažihkagiella"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thaigiella"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinjágiella"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenagiella"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tswanagiella"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongagiella"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkiijagiella"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsongagiella"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatáragiella"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Twigiella"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitigiella"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uiguragiella"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainagiella"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urdugiella"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbehkagiella"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Vendagiella"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamagiella"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapükgiella"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallonagiella"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofagiella"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xhosagiella"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jiddišgiella"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Jorubagiella"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zhuangagiella"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kiinnágiella"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Álkiduvvon kiinnágiella"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kiinnágiella (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Árbevirolaš kiinnágiella"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulugiella"
diff --git a/translations/desktop_files/all_languages.desktop/sk.po b/translations/desktop_files/all_languages.desktop/sk.po
index 9f0899308..f39dec126 100644
--- a/translations/desktop_files/all_languages.desktop/sk.po
+++ b/translations/desktop_files/all_languages.desktop/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "angličtina"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "angličtina (Spojené kráľovstvo)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "angličtina (USA)"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "španielčina"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "estónčina"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "baskičtina"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "perzština"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "fínčina"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "fidžijčina"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "faerčina"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "francúzština"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "frízština"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "írska gaelčina"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "gaelčina"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "galícijčina"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "guaraní"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "gudžarátčina"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "mančina"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "hauština"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "hebrejčina"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "hindčina"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "chorvátčina"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "hornolužická srbčina"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "maďarčina"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "arménčina"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "hererčina"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "indonézština"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "inupiaq"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "islandčina"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "taliančina"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "japončina"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "jávčina"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "gruzínčina"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "kikuju"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "kazaština"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "grónčina"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "khmérčina"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "kannadčina"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "kórejčina"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "kašmírčina"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "kurdčina"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "komijčina"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "kornčina"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "kirgizština"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "latinčina"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "luxemburčina"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "limburčina"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "lingalčina"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "laoština"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "litovčina"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "lotyština"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "malgaština"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "maršalčina"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "maorčina"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "macedónčina"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "malajálamčina"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "mongolčina"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "moldavčina"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "maráthčina"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "malajčina"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "maltčina"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "barmčina"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "nauruština"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "nórsky bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "severná ndebelčina"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "dolná saština"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "nepálčina"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "holandčina"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "nórsky nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "južná ndebelčina"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "severná sothčina"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "navajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "čičewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "okcitánčina"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "oromčina"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "uríjčina"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "osetčina"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "pandžábčina"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "pálí"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "poľština"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "paštčina"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "portugalčina"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "portugalčina (Brazília)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "kečuánčina"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "rundčina"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "rumunčina"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "rómčina"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "ruština"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "rwandčina"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "sanskrit"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "sardínčina"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "sindhčina"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "severná saamčina"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "sinhalčina"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "slovenčina"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "slovinčina"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "samojčina"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "šona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "somálčina"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "albánčina"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "srbčina"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "srbčina (latinka)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "swati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "južná sothčina"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "sundčina"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "švédčina"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "svahilčina"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "tamilčina"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "telugčina"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "tadžičtina"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "thajčina"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "tigriňa"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "turkménčina"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "čwančina"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "turečtina"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "tatárčina"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "tahitčina"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "ujgurčina"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ukrajinčina"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "urdčina"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "uzbečtina"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "uzbečtina (cyrilika)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "venda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "vietnamčina"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "valónčina"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "xhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "jidiš"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "jorubčina"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "čuangčina"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "čínština"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "čínština (zjednodušená)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "čínština (Hongkong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "čínština (tradičná)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "zuluština"
diff --git a/translations/desktop_files/all_languages.desktop/sl.po b/translations/desktop_files/all_languages.desktop/sl.po
index 948b2393f..bfc864594 100644
--- a/translations/desktop_files/all_languages.desktop/sl.po
+++ b/translations/desktop_files/all_languages.desktop/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "angleško"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "britansko angleško"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "ameriško angleško"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "špansko"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "estonsko"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "baskovsko"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (perzijsko)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "finsko"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "fidžijsko"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "fersko"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "francosko"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "frizijsko"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "irsko galsko"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "galsko"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "galicijsko"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "guarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "gujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "manx"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "hebrejsko"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "hindujsko"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "hiri motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "hrvaško"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "zgornjesorbijsko"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "madžarsko"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "armensko"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "herero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "indonezijsko"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "inupiaq"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "islandsko"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "italijansko"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "japonsko"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "javansko"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "gruzijsko"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "kikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "kazaško"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "kalaallisut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "kmersko"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "kannada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "korejsko"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "kašmirsko"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "kurdsko"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "cornish"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "kirgizijsko"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "latinsko"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "luksemburško"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "limburgan"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "laoško"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "litvansko"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "latvijsko"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "malagaško"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "maršalsko"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "maorsko"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "makedonsko"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "malayalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "mongolsko"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "moldavsko"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "marathi"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "malajsko"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "maltežansko"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "burmansko"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "norveško (bokmaal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "ndebele, severno"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "spodnjesaško"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "nepalsko"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "nizozemsko"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "norveško (nyorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "ndebele, južno"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "severni sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "navajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "chichewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "očitansko"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "oromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "oriya"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "osetijsko"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "pandžabsko"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "pali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "poljsko"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "pushto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "portugalsko"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "brazilska portugalščina"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "quechua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "romunsko"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "romsko"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "rusko"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "kinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "sanskrt"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "sardinsko"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "sindijsko"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "severno sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "sinhalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "slovaško"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "slovensko"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "samojsko"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "shona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "somalsko"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "albansko"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "srbsko"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "srbsko latinsko"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "swati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "sotho, južni"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "sudansko"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "švedsko"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "svahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "tamilsko"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "telugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "tadžiško"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "tajsko"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "tigrinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "turkmensko"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "tswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "tongaško"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "turško"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "tatarsko"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "tahitijsko"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "ujgursko"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ukrajinsko"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "urdu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "uzbeško"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "venda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "vietnamsko"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "walloonsko"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "xhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "yiddish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "yoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "kitajsko"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "poenostavljeno kitajsko"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "kitajsko (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "tradicionalno kitajsko"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "zulu"
diff --git a/translations/desktop_files/all_languages.desktop/sq.po b/translations/desktop_files/all_languages.desktop/sq.po
index ccbac98b6..a08f77453 100644
--- a/translations/desktop_files/all_languages.desktop/sq.po
+++ b/translations/desktop_files/all_languages.desktop/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "Anglisht"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Anglisht"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Anglisht"
 
 #. Name
@@ -200,716 +200,721 @@ msgstr "Spanjollisht"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonisht"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskisht"
 
 #. Name
-#: all_languages.desktop:78
+#: all_languages.desktop:80
 #, fuzzy
-msgid "Farsi (Persian)"
+msgid "Persian"
 msgstr "Frisisht"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finlandisht"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Figjinisht"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farosisht"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Frengjisht"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisisht"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Galikisht"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galikisht"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guaranisht"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Guxharatish"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manksisht"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hausisht"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebraisht"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hinduisht"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatisht"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Serbisht"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hungarisht"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenisht"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Herisht"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezisht"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupikisht"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Idoisht"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandisht"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italisht"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inukituisht"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonisht"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javonisht"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Xhorxhanisht"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuisht"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazakistanisht"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Katalisht"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmerisht"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kanadisht"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreanisht"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kashmirisht"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdisht"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komisht"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornisht"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgjizisht"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latinisht"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburgisht"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburganisht"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingalisht"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laisht"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Lituanisht"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvisht"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasisht"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshalisht"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorisht"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "SllavoMaqedonisht"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajamisht"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolisht"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavisht"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maratisht"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malanisht"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltezisht"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesisht"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naurisht"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 #, fuzzy
 msgid "Norwegian Bokmål"
 msgstr "Norvegjisht (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Nbedelisht të Veriut"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalisht"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndongisht"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hungarisht"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegjisht (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "NBedelisht të Jugut"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Sothisht Të Veriut"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navahisht"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Çiçevisht"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitanisht"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromisht"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orijisht"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetianisht"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Panjabisht"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Punjabisht"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Palisht"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polonisht"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pushtisht"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalisht"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugalishte Braziliane"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Keçisht"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundisht"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumanisht"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumanisht"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusisht"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinjaruandaisht"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskritisht"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinisht"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindisht"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami Verior"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangisht"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinalezisht"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Sllovakisht"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sllovenisht"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samonisht"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Shonisht"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalisht"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Shqip "
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbisht"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serbisht"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Suatisht"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sothe Jugore"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanezisht"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suedisht"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suailisht"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilisht"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Talugisht"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Taxhikisht"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tajlandisht"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinjisht"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenisht"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Cuanisht"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tongisht"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turqisht"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Congisht"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarisht"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tuisht"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahisht"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uigurisht"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainisht"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urdisht"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbekisht"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Vendisht"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamisht"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapisht"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Uallunisht"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Ollofisht"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Gjosisht"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidisht"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Jorubisht"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zhuanginsht"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kinezisht"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/sr.po b/translations/desktop_files/all_languages.desktop/sr.po
index b3fe50e06..eb9017a05 100644
--- a/translations/desktop_files/all_languages.desktop/sr.po
+++ b/translations/desktop_files/all_languages.desktop/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Енглески"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Британски енглески"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Амерички енглески"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Шпански"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Естонски"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскијски"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фарси (Персијски)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Фински"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фиџијски"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фарски"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Француски"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризијски"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ирски галски"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Галски"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галицијски"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гварански"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гујаратски"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкски"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Хебрејски"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Хинду"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хиримотски"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хрватски"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Горње лужичко српски"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Мађарски"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Јерменски"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Херерски"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингвански"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезијски"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Интерлингвијски"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиакски"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идоски"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландски"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Италијански"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитутски"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Јапански"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Јавански"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузијски"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикујски"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казачки"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калалисутски"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кмерски"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Канадски"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корејски"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмирски"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдски"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Комски"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корнски"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Киргиски"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латински"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Луксембуршки"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбуршки"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингалски"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лао"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литвански"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвијски"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагаски"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршалески"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маорски"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонски"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малајамски"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Монголски"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдавски"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Маратски"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малајски"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Малтешки"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бурмански"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Наурски"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвешки (Бокмалски)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндебеле, Северни"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Доњи саксонски"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непалски"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Холандски"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвешки (Ниноршки)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндебеле, Јужни"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Северни сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Навахо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичевски"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Оцитански"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромски"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Оријски"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетски"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Пенџабски"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Палијски"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Пољски"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пушто"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португалски"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразилско португалски"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Квечва"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Румунски"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Ромски"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Руски"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кинијарвандаски"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардинијски"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдиски"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Северносамски"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Синхалски"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словачки"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словеначки"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоански"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шонски"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомалијски"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албански"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Српски"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Српски латинични"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Свати"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Сото, јужни"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сундански"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведски"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Свахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамилски"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугски"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Таџикистански"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тајландски"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигрински"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркменистански"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Цвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турски"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Цонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарски"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Твиски"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Тахићански"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ујгурски"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украјински"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбечки"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Узбечки ћирилични"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Вијетнамски"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапикски"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валонски"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волофски"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Зоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Јидијски"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Јорубски"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Цуанг"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Кинески"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Поједностављени кинески"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Кинески (Хонгконг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Традиционални кинески"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/sr@Latn.po b/translations/desktop_files/all_languages.desktop/sr@Latn.po
index e2f77d2cf..3b49220ff 100644
--- a/translations/desktop_files/all_languages.desktop/sr@Latn.po
+++ b/translations/desktop_files/all_languages.desktop/sr@Latn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Engleski"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Britanski engleski"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Američki engleski"
 
 #. Name
@@ -198,712 +198,717 @@ msgstr "Španski"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonski"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskijski"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi (Persijski)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finski"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidžijski"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farski"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francuski"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizijski"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irski galski"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galski"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicijski"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Gvaranski"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gujaratski"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Mankski"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebrejski"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindu"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hirimotski"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Hrvatski"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Gornje lužičko srpski"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Mađarski"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Jermenski"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hererski"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Interlingvanski"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezijski"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingvijski"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiakski"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Idoski"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandski"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italijanski"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inuktitutski"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanski"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanski"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzijski"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikujski"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazački"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalalisutski"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kmerski"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kanadski"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korejski"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kašmirski"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdski"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komski"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornski"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirgiski"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latinski"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luksemburški"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburški"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingalski"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litvanski"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latvijski"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagaski"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Maršaleski"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maorski"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonski"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Malajamski"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolski"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavski"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maratski"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajski"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malteški"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmanski"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Naurski"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norveški (Bokmalski)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Severni"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Donji saksonski"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalski"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Conga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holandski"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norveški (Ninorški)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Južni"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Severni soto"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Čičevski"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Ocitanski"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromski"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Orijski"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Osetski"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pendžabski"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Palijski"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Poljski"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pušto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalski"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brazilsko portugalski"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kvečva"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumunski"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romski"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruski"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinijarvandaski"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinijski"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindiski"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Severnosamski"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalski"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovački"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenački"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanski"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Šonski"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalijski"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanski"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Srpski"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Srpski latinični"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Svati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Soto, južni"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanski"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Švedski"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilski"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telugski"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadžikistanski"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tajlandski"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinski"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenistanski"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Cvana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Conga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turski"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Conga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarski"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tviski"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahićanski"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ujgurski"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbečki"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Узбечки ћирилични"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vijetnamski"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapikski"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonski"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volofski"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Zosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Jidijski"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Jorubski"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Cuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kineski"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Pojednostavljeni kineski"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kineski (Hongkong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Tradicionalni kineski"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ss.po b/translations/desktop_files/all_languages.desktop/ss.po
index 323539436..3d86feafd 100644
--- a/translations/desktop_files/all_languages.desktop/ss.po
+++ b/translations/desktop_files/all_languages.desktop/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "SiNgisi"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "SiNgisi"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "SiNgisi"
 
 #. Name
@@ -200,718 +200,723 @@ msgstr "SiSpanishi"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Si-Estonian"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Si-Basque"
 
 #. Name
-#: all_languages.desktop:78
+#: all_languages.desktop:80
 #, fuzzy
-msgid "Farsi (Persian)"
+msgid "Persian"
 msgstr "Si-Frisian"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Si-Finnish"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Si-Fijian"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Si-Faroese"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "SiFrentji"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Si-Frisian"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Si-Gaelic"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Si-Gaelic"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Si-Guarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Si-Gujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Si-Manx"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Si-Hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "SiHebheru"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Si-Hindi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Si-Hiri Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Si-Croatian"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Si-Serbian"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Si-Hungarian"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Si-Armenian"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Si-Herero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Si-Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Si-Indonesian"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Si-Interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Si-Inupiaq"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Si-Ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Si-Icelandic"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Sitaliyani"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Si-Inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Si-Japanese"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Si-Javanese"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Si-Georgian"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Si-Kikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Si-Kazakh"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Si-Kalaallisut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Si-Khmer"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Si-Kannada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "SiKoriya"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Si-Kashmiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Si-Kurdish"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Si-Komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Si-Cornish"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Si-Kirghiz"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Si-Latin"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Si-Luxembourgish"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Si-Limburgan"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Si-Lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Si-Lao"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Si-Lithuanian"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Si-Latvian"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Si-Malagasy"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Si-Marshallese"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Si-Maori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Si-Macedonian"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Si-Malayalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Si-Mongolian"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Si-Moldavian"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Si-Marathi"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Si-Malay"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Si-Maltese"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Si-Burmese"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Si-Nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Si-Norwegian Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "SiNdebele, sasenyakatfo"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "SiNepali"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "SiNdonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "SiDatji"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Si-Norwegian Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "SiNdebele, saseningizimu"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "SiSami sasenyakatfo"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Si-Navajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Si-Chichewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Si-Occitan"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Si-Oromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Si-Oriya"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Si-Ossetian"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Si-Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Si-Punjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Si-Pali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Si-Polish"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Si-Pushto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "SiPutukezi"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "SiPutukezi"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Si-Quechua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Si-Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "SiRoma"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "SiRoma"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "SiRashiya"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Si-Kinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Si-Sanskrit"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Si-Sardinian"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Si-Sindhi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "SiSami sasenyakatfo"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Si-Sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Si-Sinhalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 #, fuzzy
 msgid "Slovak"
 msgstr "Si-Slovenian"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Si-Slovenian"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Si-Samoan"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "SiShona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Si-Somali"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Si-Albanian"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Si-Serbian"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Si-Serbian"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "SiSwati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "SiSotho, saseningizimo"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Si-Sundanese"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "SiSwidi"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "SiSwahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Si-Tamil"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Si-Telugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Si-Tajik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Si-Thai"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Si-Tigrinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Si-Turkmen"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "SiTswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Si-Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Si-Turkish"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "SiTsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Si-Tatar"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Si-Twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Si-Tahitian"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Si-Uighur"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Si-Ukrainian"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Si-Urdu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Si-Uzbek"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Si-Vietnamese"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Si-Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Si-Walloon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Si-Wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "SiXhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Si-Yiddish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Si-Yoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Si-Zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "SiShayina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "SiZulu"
diff --git a/translations/desktop_files/all_languages.desktop/sv.po b/translations/desktop_files/all_languages.desktop/sv.po
index 8b6a149a9..0de80490e 100644
--- a/translations/desktop_files/all_languages.desktop/sv.po
+++ b/translations/desktop_files/all_languages.desktop/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,12 +179,12 @@ msgstr "Engelska"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Brittisk engelska"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikansk engelska"
 
 #. Name
@@ -199,712 +199,717 @@ msgstr "Spanska"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estniska"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskiska"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Persiska"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finska"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijianska"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Färöiska"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Franska"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frisiska"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Irländsk galiciska"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galiciska"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galiciska"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Gujarati"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Hebreiska"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hirimotu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatiska"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Högsorbiska"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Ungerska"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armenska"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 #, fuzzy
 msgid "Interlingua"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonesiska"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Isländska"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italienska"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japanska"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javanska"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Georgiska"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazakiska"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Grönländska"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kambodjanska"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kanaresiska"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreanska"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdiska"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Korniska"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirghiziska"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Luxemburgiska"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgiska"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laotiska"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litauiska"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lettiska"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagassiska"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshall"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoriska"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonska"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malajiska"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongoliska"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldaviska"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malajiska"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesiska"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesiska"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norskt bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Nordndebele"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Lågsaxiska"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Holländska"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Nynorska"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Sydndebele"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Nordsotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Chewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitanska"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetsiska"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polska"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pashto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugisiska"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brasiliansk portugisiska"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumänska"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Romanés"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ryska"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Rwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardiska"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Samiska"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Singalesiska"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakiska"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovenska"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoanska"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanska"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbiska"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Latinsk serbiska"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Swazi"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sydsotho"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesiska"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Svenska"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadzjikiska"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thailändska"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinja"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmenska"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkiska"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatariska"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitiska"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uiguriska"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainska"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Uzbekiska"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Kyrillisk Uzbekiska"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamesiska"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Vallonska"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Kinesiska"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Förenklad kinesiska"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Kinesiska (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Traditionell kinesiska"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr ""
diff --git a/translations/desktop_files/all_languages.desktop/ta.po b/translations/desktop_files/all_languages.desktop/ta.po
index 7b0bbf535..8676ae958 100644
--- a/translations/desktop_files/all_languages.desktop/ta.po
+++ b/translations/desktop_files/all_languages.desktop/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "ஆங்கிலம்"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "பிரிட்டிஷ் ஆங்கிலம்"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "அமெரிக்கன் ஆங்கிலம்"
 
 #. Name
@@ -198,712 +198,717 @@ msgstr "ஸ்பானிய"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "எஸ்டோனியன்"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "பாஸ்க்"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "பார்சி (பெர்சியன்)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ஃபின்னிஷ்"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ஃபிஜியன்"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ஃபாரோவீஸ்"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "பிரென்ச்"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ஃபரீசியன்"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "ஐரிஷ் காலிக்"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "கேலிக்"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "காலிசியன்"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "குவரானி"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "குஜராத்தி"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "மான்க்ஸ்"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "ஹவுசா"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "எபிரேயம்"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "ஹிந்தி"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "ஹிரி மொட்டு"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "குரொவேசியன்"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "அப்பர் செர்பியன்"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "ஹங்கேரியன்"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "ஆர்மீனியன்"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "ஹெர்ரோ"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "இன்டெர்லிங்குவா"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "இந்தோனீசியன்"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "இன்டெர்லிங்கு"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "இனுபியாக்"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ஈடோ"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "ஐஸ்லாந்திக்"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "இத்தாலியன்"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "இனுக்டிடுட்"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "ஜப்பானியம்"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "ஜாவானீஸ்"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "ஜார்ஜியன்"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "கியுகு"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "கசாக்"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "கலாலிசுட்"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "கெமர்"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "கன்னடம்"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "கொரியன்"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "காஷ்மீரி"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "குர்திஷ்"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "கோமி"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "கோர்னிஷ்"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "கிர்கிஸ்"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "இலத்தீன்"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "லக்சம்போர்கிஷ்"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "லக்சம்பேர்க்"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "லிங்காலா"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "லாவோ"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "லிதுவேனியன்"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "இலட்வியன்"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "மலகாசி"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "மார்ஷலீஸ்"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "மாவோரி"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "மாசிடோனியன்"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "மலையாளம்"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "மொங்கோலியன்"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "மோல்டோவியன்"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "மராத்தி"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "மலாய்"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "மால்டீசிய"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "பர்மிய"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "நவுரு"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "நார்வீஜியன் பொக்மால்"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "டெபெலே, வட"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "லோ சாக்ஸான்"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "நேபாளி"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "டொங்கா"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "டச்சு"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "நார்வீஜியன் (நையோர்ஸ்க்)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "டெபெலே, தென்"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "நார்தன் சோத்தோ"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "நவாஜோ"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "சிச்செவா"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ஒக்சிட்டான்"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ஒரோமோ"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ஒரியா"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ஒசெட்டியன்"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "பஞ்சாபி"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "பாலி"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "போலிஷ்"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "பாஷ்டுன்"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "போர்த்துக்கீசிய"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "பிரேஸிலிய போர்த்துக்கீசிய"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "குவெச்சா"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "ருண்டி"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "உருமேனியன்"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "உருமேனியன்"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "இரஷியன்"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "கின்யார்வாண்டா"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "சமஸ்கிருதம்"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "சார்டீனியன்"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "சிந்தி"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "நார்தன் சாமி"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "சாங்கோ"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "சிங்களம்"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "சுலோவாக்"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "சுலோவீனியன்"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "சமோவன்"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "ஷோனா"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "சோமாலி"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "அல்பேனியன்"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "செர்பியன்"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "செர்பியன்"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "சுவாதி"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "சோத்தோ, தென்"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "சூடானீஸ்"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "சுவீடிஷ்"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "ஸ்வாஹிலி"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "தமிழ்"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "தெலுங்கு"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "தஜிக்"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "தாய்"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "திகிரின்யா"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "துருக்மென்"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "ஸ்வானா"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "டோங்கா"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "துருக்கிய"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "டிசோங்கா"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "டாடார்"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "த்வீ"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "தஹிடியன்"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "உயிகூர்"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "உக்ரேனியன்"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "உருது"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "உஸ்பெக்"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "வெண்டா"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "வியட்னாமிய"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "வொல்பாக்"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "வாலூன்"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "வொலொஃப்"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "சோசா"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "யிட்டிஷ்"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "யொரூபா"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "சுவாங்"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "சீனம்"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "சீனம் சுலபமாக்கப்பட்டது"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "சீனம் பழமையானது"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ஜுலு"
diff --git a/translations/desktop_files/all_languages.desktop/te.po b/translations/desktop_files/all_languages.desktop/te.po
index 764c8ecc5..27e6b8dc0 100644
--- a/translations/desktop_files/all_languages.desktop/te.po
+++ b/translations/desktop_files/all_languages.desktop/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "ఆంగ్లం"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "బ్రిటిష్ ఆంగ్లం"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "అమెరికన్ ఆంగ్లం"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "స్పెనిష్"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "ఎస్టొనియన్"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "బాస్క్"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "ఫార్సి (పెర్షియన్)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ఫిన్నిష్"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ఫిజియన్"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ఫారొఈస్"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "ఫ్రెంచ్"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ఫ్రిసియన్"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "ఐరిష్ గెలిక్"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "గెలిక్"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "గలిచియన్"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "గువారాని"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "గుజరాతీ"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "మేన్క్స్"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "హౌసా"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "హీబ్రూ"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "హింది"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "హిరి మోటు"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "క్రొయెషియన్"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "అప్పర్ సొర్బియన్"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "హంగెరియన్"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "అర్మెనియన్"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "హెరెరో"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "ఇంటర్ లింగువా"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "ఇన్డొనెషియన్"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "ఇంటర్ లింగె"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "ఇనుపియాక్"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ఇడొ"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "ఐస్ లేండిక్"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "ఇటాలియన్"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "ఇనుక్తిటుట్"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "జపనీస్"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "జావానీస్"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "జార్జియన్"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "కికుయు"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "కజాఖ్"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "కలాల్లిసుత్"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "ఖ్మెర్"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "కన్నడ"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "కొరియన్"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "కష్మీరీ"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "కుర్దిష్"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "కోమి"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "కొర్నిష్"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "కిర్ఘిజ్"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "లాటిన్"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "లక్సెంబర్గిష్"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "లింబర్గన్"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "లింగాలా"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "లావో"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "లితువెనియన్"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "లాటివ్యన్"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "మలగాసి"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "మార్షలీస్"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "మావొరి"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "మసిడొనియన్"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "మలయాళం"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "మంగోలియన్"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "మొల్దావియన్"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "మరాఠి"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "మలయ"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "మాల్టీస్"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "బర్మీస్"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "నౌరు"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "నార్వీజియన్ బోక్మాల్"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "నెబేలె, ఉత్తర"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "లో సాక్సన్"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "నేపాలి"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "డొంగా"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "డచ్"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "నార్వీజియన్ న్యోర్స్క్"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "నెబేలె, దక్షిణ"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "ఉత్తర సొతొ"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "నవాజొ"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "చిచెవా"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ఒస్సిటాన్"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ఒరొమొ"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ఒరియా"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ఒస్సెషియన్"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "పంజాబి"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "పాళి"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "పోలిష్"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "పుష్తొ"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "పోర్ట్యుగీస్"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "బ్రాజిలియన్ పోర్ట్యుగీస్"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "క్వెచువా"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "రుండి"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "రొమేనియన్"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "రొమని"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "రషియన్"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "కిన్న్యార్వాండా"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "సంస్క్రుతం"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "సార్డినియన్"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "సింధి"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "ఉత్తర సమి"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "సాంగొ"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "సింహలీస్"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "స్లొవాక్"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "స్లొవేనియన్"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "సమొవన్"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "షొనా"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "సొమాలి"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "అల్బేనియన్"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "సెర్బియన్"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "సెర్బియన్ లాటిన్"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "స్వాతి"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "సోతొ, దక్షిణ"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "సన్దనీస్"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "స్వీడిష్"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "స్వాహిలి"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "తమిళం"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "తెలుగు"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "తాజిక్"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "థాయి"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "టిగ్రిన్యా"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "తుర్క్మెన్"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "స్వానా"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "టొన్గా"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "టర్కిష్"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "సొంగా"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "తతర్"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "ట్వి"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "టహితియన్"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "ఉఇఘర్"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ఉక్రేనియన్"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "ఉర్దు"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "ఉజ్బెక్"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "వెండా"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "వియత్నామీస్"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "వొలపుక్"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "వాలూన్"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "వొలొఫ్"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "క్జొసా"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "యిడ్డిష్"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "యొరుబా"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "జువాంగ్"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "చైనీస్"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "సరళికరించిన చైనీస్"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "చైనీస్ (హాంగ్ కాంగ్)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "సాంప్రదాయక చైనీస్"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "జూలు"
diff --git a/translations/desktop_files/all_languages.desktop/tg.po b/translations/desktop_files/all_languages.desktop/tg.po
index 036483485..8e2fcf1bd 100644
--- a/translations/desktop_files/all_languages.desktop/tg.po
+++ b/translations/desktop_files/all_languages.desktop/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Англисӣ"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Англисӣ(Британӣ)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Англисӣ(Амрикоӣ)"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Испанӣ"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Эстонӣ"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскӣ"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фрисианӣ"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Финӣ"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фиҷианӣ"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фароесӣ"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Франсавӣ"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризианӣ"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Ирландӣ (Галикӣ)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Галӣ"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галлӣ"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуаранӣ"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гӯҷаратӣ"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манксӣ"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хаусагӣ"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Яҳудӣ"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Ҳиндӣ"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хорватӣ"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Лужасагии болоӣ"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Венгерӣ"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Арманӣ"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Херэро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Забони миёнрав"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезӣ"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Забони миёнрав"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиакӣ"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландӣ"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Итолиёӣ"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Японӣ"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Ёвонӣ"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Гурҷӣ"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикуягӣ"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Қазоқӣ"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калаалисутӣ"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Хмерӣ"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Каннадӣ"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Кореягӣ"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмирӣ"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдиш"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Коми"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корниягӣ"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Кирғизӣ"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Лотинӣ"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксембургӣ"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбурганӣ"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингалӣ"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лаосӣ"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литвонӣ"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвиягӣ"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагасӣ"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршалезӣ"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маори"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Мақдунӣ"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малаямӣ"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Муғулӣ"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдаванӣ"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Маравӣ"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайӣ"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Малтесӣ"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бурмезӣ"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвегиягӣ Боқмал"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндебелӣ, Шимол"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Саксон"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непалӣ"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Олмонӣ"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвегиягӣ Нунорск"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндебелӣ, Ҷануб"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Сотои Шимолӣ"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Наваҷо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичевагӣ"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Окитанӣ"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ориёӣ"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетинӣ"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панҷабӣ"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Полякӣ"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пушто"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португалӣ"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразилияӣ Португалӣ"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Квечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Романӣ"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Романӣ"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Рӯсӣ"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кинуарвандӣ"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардиниягӣ"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдхӣ"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Саамаи шимолӣ"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Сингалӣ"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словакӣ"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенӣ"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоанӣ"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шонӣ"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомалӣ"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албанӣ"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сербӣ"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Лотини Сербиявӣ"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Сватӣ"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Санданизӣ"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведӣ"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Свахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамилӣ"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугуягӣ"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Тоҷикӣ"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайландӣ"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигринягӣ"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркманӣ"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Сванавӣ"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонгаӣ"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Туркӣ"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Сонгавӣ"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Тоторӣ"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Твиягӣ"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Таитиягӣ"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Уйгурӣ"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украинӣ"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Ӯзбекӣ"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Вендаӣ"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Ветнамӣ"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапёкӣ"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валунӣ"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волофӣ"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Хоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Йидишӣ"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Ёруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Жуанг"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Хитоӣ"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Хитоӣ (Оддӣ)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Хитоӣ (Гон-Конг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Хитоӣ (Анъанавӣ)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулу"
diff --git a/translations/desktop_files/all_languages.desktop/th.po b/translations/desktop_files/all_languages.desktop/th.po
index f0ea6ed6d..d73ba898f 100644
--- a/translations/desktop_files/all_languages.desktop/th.po
+++ b/translations/desktop_files/all_languages.desktop/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "ภาษาอังกฤษ"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "ภาษาอังกฤษ บริติช"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "ภาษาอังกฤษ อเมริกัน"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "ภาษาสเปน"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "ภาษาเอสโทเนีย"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "ภาษาบาสก์"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "ภาษาฟาร์ซี (เปอร์เซียน)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "ภาษาฟินแลนด์"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "ภาษาฟิจิ"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "ภาษาฟาโรอีส"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "ภาษาฝรั่งเศส"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "ภาษาฟรีเชียน"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "ภาษาไอริชเกลิค"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "ภาษาเกลิคีย"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "ภาษาแกลิเซีย"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "ภาษากวารานี"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "ภาษากูจาราตี"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "ภาษาแมงซ์เกลิค"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "ภาษาเฮาซา"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "ภาษาฮิบรู"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "ภาษาฮินดี"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "ภาษาฮิริโมตู"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "ภาษาโครเอเชียน"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "ภาษาซอร์เบียนตอนบน"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "ภาษาฮังกาเรียน"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "ภาษาอาร์เมเนีย"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "ภาษาเฮอเรโร"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "ภาษานานาชาติ"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "ภาษาอินโดนีเซีย"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "ภาษาอินเทอร์ลิงก์"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "ภาษาอินุพิอัค"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "ภาษาอิดอ"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "ภาษาไอซ์แลนด์"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "ภาษาอิตาเลียน"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "ภาษาอินุคทิทุท"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "ภาษาญี่ปุ่น"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "ภาษาชวา"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "ภาษาจอร์เจียน"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "ภาษาคิคุยุ"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "ภาษาคาซัคสถาน"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "ภาษาคาลัทลิซุท"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "ภาษาเขมร"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "ภาษากัณณาท"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "ภาษาเกาหลี"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "ภาษากัศมิรี"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "ภาษาเคอร์ดิช"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "ภาษาคอมี"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "ภาษาคอร์นิช"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "ภาษาเคอร์กิซ"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "ภาษาละติน"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "ภาษาลักเซมเบอร์ก"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "ภาษาลิมเบอร์กัน"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "ภาษาลิงกาลา"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "ภาษาลาว"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "ภาษาลิธัวเนีย"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "ภาษาลัทเวีย"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "ภาษามาลากาซี"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "ภาษามาร์แชลลีส"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "ภาษาเมารี"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "ภาษามาเซโดเนีย"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "ภาษามะละยาลัง"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "ภาษามองโกล"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "ภาษามอลดาเวียน"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "ภาษามราฐี"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "ภาษามาเลย์"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "ภาษามอลตีส"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "ภาษาพม่า"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "ภาษานาอุรุ"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "ภาษานอร์เวย์ (บ็อคมัล)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "ภาษาอึนเดเบเล ตอนเหนือ"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "ภาษาเยอรมัน ระดับล่าง"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "ภาษาเนปาล"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "ภาษาอึนดองกา"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "ภาษาดัทช์"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "ภาษานอร์เวย์ (นูนอร์สคฺ)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "ภาษาอึนเดเบเล ตอนใต้"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "ภาษาโซโธ ตอนเหนือ"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "ภาษานาวาโฮ"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "ภาษาชิเชวา"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "ภาษาออคซิทัน"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "ภาษาโอโรโม"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "ภาษาโอริยา"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "ภาษาโอซิเชียน"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "ภาษาปัญจาบี"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "ภาษาบาลี"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "ภาษาโปลิช"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "ภาษาพาชโต"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "ภาษาโปรตุเกส"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "ภาษาโปรตุเกสบราซิล"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "ภาษาเคชัว"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "ภาษารุนดิ"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "ภาษาโรมาเนีย"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "ภาษาโรมานี"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "ภาษารัสเซีย"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "ภาษาคินยาร์วันดา"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "ภาษาสันสกฤต"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "ภาษาซาร์ดิเนียน"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "ภาษาสินธุ"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "ภาษาซามี ตอนเหนือ"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "ภาษาแซงโก"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "ภาษาสิงหล"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "ภาษาสโลวัค"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "ภาษาสโลเวเนีย"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "ภาษาซาโมน"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "ภาษาโชนา"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "ภาษาโซมาลี"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "ภาษาอัลเบเนีย"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "ภาษาเซอร์เบีย"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "ภาษาละตินเซอร์เบีย"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "ภาษาสวาตี"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "ภาษาโซโธ ตอนใต้"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "ภาษาซูดาน"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "ภาษาสวีดิช"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "ภาษาสวาฮิลี"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "ภาษาทมิฬ"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "ภาษาเตลูกู"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "ภาษาทาจิกิสถาน"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "ภาษาไทย"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "ภาษาทิกรินยา"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "ภาษาเติร์กเมน"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "ภาษาสวานา"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "ภาษาทองกา"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "ภาษาตุรกี"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "ภาษาซองกา"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "ภาษาทาทาร์"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "ภาษาชวี"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "ภาษาตาฮิเตียน"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "ภาษาอุยกูร์"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "ภาษายูเครน"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "ภาษาอูร์ดู"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "ภาษาอุซเบกิสถาน"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "ภาษาเวนดา"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "ภาษาเวียตนาม"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "ภาษาวอลาพุค"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "ภาษาวัลลูน"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "ภาษาวอลอฟ"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "ภาษาโคซา"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "ภาษายิดดิช"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "ภาษาโยรูบา"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "ภาษาจ้วง"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "ภาษาจีน"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "ภาษาจีนประยุกต์"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "ภาษาจีี (ฮ่องกง)น"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "ภาษาจีนดั้งเดิม"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "ภาษาซูลู"
diff --git a/translations/desktop_files/all_languages.desktop/tr.po b/translations/desktop_files/all_languages.desktop/tr.po
index 3dda8a8cc..c9553c2fb 100644
--- a/translations/desktop_files/all_languages.desktop/tr.po
+++ b/translations/desktop_files/all_languages.desktop/tr.po
@@ -1,35 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Mehmet Dokuz <madanadam@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19: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: 2020-11-25 17:36+0100\n"
+"PO-Revision-Date: 2022-03-02 13:11+0000\n"
+"Last-Translator: Mehmet Dokuz <madanadam@gmail.com>\n"
+"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/all-languages/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.11\n"
 
 #. Name
 #: all_languages.desktop:2
 msgid "Afar"
-msgstr ""
+msgstr "Afar"
 
 #. Name
 #: all_languages.desktop:4
 msgid "Abkhazian"
-msgstr ""
+msgstr "Abhazca"
 
 #. Name
 #: all_languages.desktop:6
 msgid "Avestan"
-msgstr ""
+msgstr "Avestan"
 
 #. Name
 #: all_languages.desktop:8
@@ -39,7 +40,7 @@ msgstr "Afrika Dili"
 #. Name
 #: all_languages.desktop:10
 msgid "Amharic"
-msgstr ""
+msgstr "Amharca"
 
 #. Name
 #: all_languages.desktop:12
@@ -49,12 +50,12 @@ msgstr "Arapça"
 #. Name
 #: all_languages.desktop:14
 msgid "Assamese"
-msgstr ""
+msgstr "Assam Dili"
 
 #. Name
 #: all_languages.desktop:16
 msgid "Aymara"
-msgstr ""
+msgstr "Aymara"
 
 #. Name
 #: all_languages.desktop:18
@@ -64,7 +65,7 @@ msgstr "Azerbeycanca"
 #. Name
 #: all_languages.desktop:20
 msgid "Bashkir"
-msgstr ""
+msgstr "Başkurtça"
 
 #. Name
 #: all_languages.desktop:22
@@ -79,12 +80,12 @@ msgstr "Bulgarca"
 #. Name
 #: all_languages.desktop:26
 msgid "Bihari"
-msgstr ""
+msgstr "Bihari"
 
 #. Name
 #: all_languages.desktop:28
 msgid "Bislama"
-msgstr ""
+msgstr "Bisleme"
 
 #. Name
 #: all_languages.desktop:30
@@ -94,7 +95,7 @@ msgstr "Bengal"
 #. Name
 #: all_languages.desktop:32
 msgid "Tibetan"
-msgstr ""
+msgstr "Tibetçe"
 
 #. Name
 #: all_languages.desktop:34
@@ -119,12 +120,12 @@ msgstr "Çeçen"
 #. Name
 #: all_languages.desktop:42
 msgid "Chamorro"
-msgstr ""
+msgstr "Çamorro Dili"
 
 #. Name
 #: all_languages.desktop:44
 msgid "Corsican"
-msgstr ""
+msgstr "Korsika Dili"
 
 #. Name
 #: all_languages.desktop:46
@@ -134,22 +135,22 @@ msgstr "Çekçe"
 #. Name
 #: all_languages.desktop:48
 msgid "Kashubian"
-msgstr ""
+msgstr "Kaşubiyen"
 
 #. Name
 #: all_languages.desktop:50
 msgid "Church Slavic"
-msgstr ""
+msgstr "Kilise Slavcası"
 
 #. Name
 #: all_languages.desktop:52
 msgid "Chuvash"
-msgstr ""
+msgstr "Çuvaşça"
 
 #. Name
 #: all_languages.desktop:54
 msgid "Welsh"
-msgstr ""
+msgstr "Galce"
 
 #. Name
 #: all_languages.desktop:56
@@ -164,7 +165,7 @@ msgstr "Almanca"
 #. Name
 #: all_languages.desktop:60
 msgid "Dzongkha"
-msgstr ""
+msgstr "Butan Dili"
 
 #. Name
 #: all_languages.desktop:62
@@ -178,18 +179,18 @@ msgstr "İngilizce"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "İngiliz İngilizcesi"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Amerikan İngilizcesi"
 
 #. Name
 #: all_languages.desktop:70
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto Dili"
 
 #. Name
 #: all_languages.desktop:72
@@ -198,716 +199,715 @@ msgstr "İspanyolca"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr "İspanyolca (Arjantin)"
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonca"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Bask Dili"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "İranca"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fince"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
-msgstr ""
+msgstr "Fiji Dili"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
-msgstr ""
+msgstr "Faroe Dili"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransızca"
 
 #. Name
-#: all_languages.desktop:88
-#, fuzzy
+#: all_languages.desktop:90
 msgid "Frisian"
-msgstr "İranca"
+msgstr "Frizce"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "İrlanda Galik"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galik"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galce"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
-msgstr ""
+msgstr "Guarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
-msgstr ""
+msgstr "Man Dili"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
-msgstr ""
+msgstr "Hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "İbranice"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
-msgstr ""
+msgstr "Hintçe"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
-msgstr ""
+msgstr "Hiri Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Hırvatça"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Yukarı Sırpça"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Macarca"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Ermenice"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
-msgstr ""
+msgstr "Here"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
-msgstr ""
+msgstr "Interlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "İndonezya dili"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
-msgstr ""
+msgstr "Interlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
-msgstr ""
+msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
-msgstr ""
+msgstr "Ido Dili"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "İzlanda Dili"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "İtalyanca"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
-msgstr ""
+msgstr "İnuitçe"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japonca"
 
 #. Name
-#: all_languages.desktop:138
-#, fuzzy
+#: all_languages.desktop:140
 msgid "Javanese"
-msgstr "Japonca"
+msgstr "Cava Dili"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gürcüce"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
-msgstr ""
+msgstr "Kikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
-msgstr ""
+msgstr "Kazak Dili"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
-msgstr ""
+msgstr "Kalaallisut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
-msgstr ""
+msgstr "Kmer"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Korece"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
-msgstr ""
+msgstr "Keşmir Dili"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kürtçe"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
-msgstr ""
+msgstr "Komi"
 
 #. Name
-#: all_languages.desktop:160
-#, fuzzy
+#: all_languages.desktop:162
 msgid "Cornish"
-msgstr "Danimarka Dili"
+msgstr "Kelt Dili"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kırgız"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
-msgstr ""
+msgstr "Latince"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
-msgstr ""
+msgstr "Lüksemburgca"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
-msgstr ""
+msgstr "Limburgan"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
-msgstr ""
+msgstr "Lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
-msgstr ""
+msgstr "Lao"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litvanya Dili"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Litvanya Dili"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
-msgstr ""
+msgstr "Madagaskarca"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
-msgstr ""
+msgstr "Marshallca"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maori Dili"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonca"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
-msgstr ""
+msgstr "Malayalamca"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongolca"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavaca"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
-msgstr ""
+msgstr "Marathi"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
-msgstr ""
+msgstr "Malayca"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Malta Dili"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
-msgstr ""
+msgstr "Burma Dili"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
-msgstr ""
+msgstr "Nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norveççe Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
-msgstr ""
+msgstr "Kuzey, Ndebele"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Aşağı Sakson"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalce"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
-msgstr ""
+msgstr "Ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Flamanca"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norveççe Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
-msgstr ""
+msgstr "Güney, Ndebele"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
-msgstr ""
+msgstr "Kuzey Soto"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
-msgstr ""
+msgstr "Navajo Dili"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
-msgstr ""
+msgstr "Chicheva"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Oksitan dili"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
-msgstr ""
+msgstr "Oromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
-msgstr ""
+msgstr "Ortaca"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
-msgstr ""
+msgstr "Osetçe"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr ""
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Pencapça"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
-msgstr ""
+msgstr "Pali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Lehçe"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
-msgstr ""
+msgstr "Pushto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portekizce"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Brezilya Portekizcesi"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
-msgstr ""
+msgstr "Keçua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
-msgstr ""
+msgstr "Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romence"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Çingene Dili"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rusça"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
-msgstr ""
+msgstr "Kinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
-msgstr ""
+msgstr "Sanskritçe"
 
 #. Name
-#: all_languages.desktop:258
-#, fuzzy
+#: all_languages.desktop:260
 msgid "Sardinian"
-msgstr "Ukrayna Dili"
+msgstr "Sardunya Dili"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
-msgstr ""
+msgstr "Sindhi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
-msgstr ""
+msgstr "Kuzey Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
-msgstr ""
+msgstr "Sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
-msgstr ""
+msgstr "Sinhala Dili"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakça"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovence"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
-msgstr ""
+msgstr "Samoaca"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
-msgstr ""
+msgstr "Şona Dili"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
-msgstr ""
+msgstr "Somali"
 
 #. Name
-#: all_languages.desktop:278
-#, fuzzy
+#: all_languages.desktop:280
 msgid "Albanian"
-msgstr "Romence"
+msgstr "Arnavutça"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Sırpça"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Sırpça Latin"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
-msgstr ""
+msgstr "Svati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
-msgstr ""
+msgstr "Sotho, Güney"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
-msgstr ""
+msgstr "Sunda Dili"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "İsveççe"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
-msgstr ""
+msgstr "Svahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamil Dili"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
-msgstr ""
+msgstr "Telugu Dili"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
-msgstr ""
+msgstr "Tacikçe"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
-msgstr ""
+msgstr "Tai Dili"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
-msgstr ""
+msgstr "Tigrinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Türkmence"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
-msgstr ""
+msgstr "Tsvana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
-msgstr ""
+msgstr "Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Türkçe"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
-msgstr ""
+msgstr "Tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
-msgstr ""
+msgstr "Tatarca"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
-msgstr ""
+msgstr "Tvi Dili"
 
 #. Name
-#: all_languages.desktop:318
-#, fuzzy
+#: all_languages.desktop:320
 msgid "Tahitian"
-msgstr "Hırvatça"
+msgstr "Tahiti Dili"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uygurca"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrayna Dili"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
-msgstr ""
+msgstr "Urduca"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Özbek"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
-msgstr ""
+msgstr "Özbekçe (Kiril)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
-msgstr ""
+msgstr "Venda"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamca"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
-msgstr ""
+msgstr "Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valonca"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
-msgstr ""
+msgstr "Wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
-msgstr ""
+msgstr "Xhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
-msgstr ""
+msgstr "Eskenazi Dili"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
-msgstr ""
+msgstr "Yoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
-msgstr ""
+msgstr "Zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Çince"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Basitleştirilmiş Çince"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Çince (Hong Kong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Geleneksel Çince"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
-msgstr ""
+msgstr "Zulu"
diff --git a/translations/desktop_files/all_languages.desktop/tt.po b/translations/desktop_files/all_languages.desktop/tt.po
index eba218e70..462bc0901 100644
--- a/translations/desktop_files/all_languages.desktop/tt.po
+++ b/translations/desktop_files/all_languages.desktop/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "İnglizçä"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "İnglizçä (Britania)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "İnglizçä (Amerika)"
 
 #. Name
@@ -198,716 +198,721 @@ msgstr "İspança"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonça"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basqça"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsı"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finçä"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijiçä"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farosça"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransça"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 #, fuzzy
 msgid "Frisian"
 msgstr "Farsı"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Galça (İrland)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galça"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galisçä"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Guarança"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Maratça"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manksça"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hausça"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Yähüdçä"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindçä"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Kroatça"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Sorbça, Öske"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Macarça"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Ärmänçä"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Hereroça"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "İnterlingua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "İndonesçä"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "İnterlingue"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "İnupiaqça"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "İdoça"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "İslandça"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "İtalça"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "İnuktitutça"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Japança"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Javaça"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Görceçä"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Kikuyuça"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Qazaqça"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalaallisutça"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Xmerçä"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Kannadça"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreyçä"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kaşmirçä"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kördçä"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komiçä"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Kornişçä"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Qırğızça"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latínça"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lüksemburgça"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgça"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingalaça"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laoça"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litçä"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latça"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasça"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marşallça"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Maoriça"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedonça"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malayça"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Moğolça"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavça"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Maratça"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malayça"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltesçä"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmesçä"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegçä (ädäbi)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebeleçä, Tönyaq"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Saksonça, Asqı"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalça"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndongaça"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Dutça"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norwejçä (Ninorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebeleçä, Könyaq"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Tönyaq Sotho"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaxoça"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Çiçewaça"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Okkitança"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromoça"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetinçä"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Panjabça"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Paliçä"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polça"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Puştu Farsíçası"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalça"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugalça, Brasil"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Queçuaça"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundiçä"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Romança"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Romança"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Urısça"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyarwandaça"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Sanskritçä"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinça"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindihçä"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Tönyaq Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sangoça"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalçä"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakça"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Slovençä"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoaça"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Şonaça"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somaliçä"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albança"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbçä"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Serbçä"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Swatça"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sothoça, Könyaq"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanesçä"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "İswäcçä"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Swahiliçä"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilça"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Teluguça"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tajıqça"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Tayça"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinyaça"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Törkmänçä"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tswanaça"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Tsongaça"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Törekçä"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsongaça"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatarça"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Twiçä"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahitçä"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uyğurça"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukrainça"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Urduça"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Üzbäkçä"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Vendaça"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamça"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapükçä"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walonça"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Wolofça"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Yidiş"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Yorubaça"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Cuañça"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Çinçä"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Çinçä (Ciñel)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Çinçä (Ğädäti)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zuluça"
diff --git a/translations/desktop_files/all_languages.desktop/uk.po b/translations/desktop_files/all_languages.desktop/uk.po
index 8c19eea1f..a029e9411 100644
--- a/translations/desktop_files/all_languages.desktop/uk.po
+++ b/translations/desktop_files/all_languages.desktop/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-03 19:58+0200\n"
-"PO-Revision-Date: 2020-07-21 13:31+0000\n"
+"POT-Creation-Date: 2020-11-25 17:36+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/tdelibs/all-languages/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.4.2\n"
 
 #. Name
 #: all_languages.desktop:2
@@ -180,12 +180,12 @@ msgstr "Англійська"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Англійська (Великобританія)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Англійська (США)"
 
 #. Name
@@ -200,710 +200,715 @@ msgstr "Іспанська"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr "Іспанська (Argentina)"
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Естонська"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскська"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Фризійська (Перська)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Фінська"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фіджійська"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фарерська"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Французька"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризійська"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Гаельська (Ірландія)"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Гаельська"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галісійська"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарані"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гуяраті"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкс"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Гауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Єврейська"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Гінді"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хірі Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хорватська"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Верхньолужицька"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Угорська"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Вірменська"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Гереро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Інтерлінгва"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Індонезійська"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Інтерлінгва"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Інупіак"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Ідо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Ісландська"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Італійська"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Інуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Японська"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Яванська"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузинська"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кікуйю"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Казахська"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калаалісут"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кхмерська"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Каннада"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корейська"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмірська"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдська"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Комі"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корнійська"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Киргизька"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Латинська"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксембурзька"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лімбурганська"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лінгала"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лаоська"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литовська"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латвійська"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малайська"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршальська"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маорі"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонська"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малайська"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Монгольська"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдовська"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Мараті"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайська"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Мальтійська"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бірманська"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвезька (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндебелє, Північна"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Нижньосаксонська"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непальська"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Нідерландська"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвезька (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндебелє, Південна"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Північне Сото"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Навахо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чічеванська"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Оксітанська"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Орія"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Осетинська"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панджабська"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Палі"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Польська"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пуштунська"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португальська"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Бразильська португальська"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Кечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунді"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Румунська"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Циганська"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Російська"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кіньярванда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардинська"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдхі"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Північна Саамі"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Сингальська"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словацька"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенська"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоанська"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомалійська"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албанська"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сербська"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Сербська (латинь)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Суаті"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Сото, Південна"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сунданська"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведська"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Суахілі"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамільська"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Таджицька"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайська"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигринійська"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркменська"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Тсвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Турецька"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Цонґа"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Татарська"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Тві"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Таїтянська"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Уйгур"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Українська"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Узбецька"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "Узбецька (Кирилиця)"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "В'єтнамська"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапюк"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валлонська"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волоф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Ксоза"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Ідиш"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Йоруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Жуан"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Китайська"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Китайська (спрощена)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Китайська (Гонконг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Китайська (традиційна)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулуська"
diff --git a/translations/desktop_files/all_languages.desktop/uz.po b/translations/desktop_files/all_languages.desktop/uz.po
index 371248ce2..2e4c311f0 100644
--- a/translations/desktop_files/all_languages.desktop/uz.po
+++ b/translations/desktop_files/all_languages.desktop/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Inglizcha"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglizcha (Angliya)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglizcha (AQSH)"
 
 #. Name
@@ -198,716 +198,721 @@ msgstr "Ispancha"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estoncha"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Baskcha"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Forscha (Perscha)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Fincha"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fijicha"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Farercha"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Fransuzcha"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizcha"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Galikcha"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Galikcha"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galikcha"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 #, fuzzy
 msgid "Gujarati"
 msgstr "Marati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Manks"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Xausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Yahudiycha"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hindcha"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Xiri Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Xorvatcha"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Yuqori Sorbcha"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Vengrcha"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Armancha"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Xerero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezcha"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Islandcha"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Italyancha"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Yaponcha"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Yaavanez"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gruzincha"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Qozoqcha"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Kxmercha"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Koreyscha"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Kashmircha"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdcha"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Korn"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Qirgʻizcha"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Lotincha"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lyuksemburgcha"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Laoscha"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litvacha"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Latishcha"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malagasi"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshallez"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Makedoniyacha"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 #, fuzzy
 msgid "Malayalam"
 msgstr "Malaycha"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mugʻulcha"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldavcha"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Malaycha"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltacha"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Burmezcha"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvegcha (Bokmaal)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Shimol"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Past Saksoncha"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalcha"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "Songa"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Gollandcha"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Norvegiyacha (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Janub"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Shimoliy Sotocha"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Chicheva"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Fransuzcha (Ossitan shevasi)"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetincha"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Panjabcha"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polyakcha"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pushtuncha"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portugalcha"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portugalcha (Braziliya)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kvechua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rumincha"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Rumincha"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Ruscha"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyarvanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardincha"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindxi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Shimoliy Sami"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinxalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Slovakcha"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Sloveniancha"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samoacha"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalicha"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albancha"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbcha"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Serbcha (Lotin)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Svati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotxo, Janubiy"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundancha"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Shvedcha"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Svaxili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamilcha"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tojikcha"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Taycha"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmancha"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Tsvana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 #, fuzzy
 msgid "Tonga"
 msgstr "Songa"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turkcha"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Songa"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Totarcha"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tvi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Taxitian"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Uygʻurcha"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukraincha"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Oʻzbekcha"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vetnamcha"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Volapuk"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Valloncha"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Volof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zxuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Xitoycha"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Soddalashtirilgan Xitoycha"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Xitoycha (Gongkong)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Anʼanaviy Xitoycha"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zulucha"
diff --git a/translations/desktop_files/all_languages.desktop/uz@cyrillic.po b/translations/desktop_files/all_languages.desktop/uz@cyrillic.po
index 2a34e2e18..904661411 100644
--- a/translations/desktop_files/all_languages.desktop/uz@cyrillic.po
+++ b/translations/desktop_files/all_languages.desktop/uz@cyrillic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Инглизча"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Инглизча (Англия)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Инглизча (АҚШ)"
 
 #. Name
@@ -198,712 +198,717 @@ msgstr "Испанча"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Эстонча"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Баскча"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Форсча (Персча)"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Финча"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Фижича"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Фарерча"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Французча"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Фризча"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Галикча"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Галикча"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Галикча"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Гуарани"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Гужарати"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Манкс"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Хауса"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Яҳудийча"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Ҳиндча"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Хири Моту"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Хорватча"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Юқори Сорбча"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Венгрча"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Арманча"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Хереро"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Интерлингуа"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Индонезча"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Интерлингуе"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Инупиак"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Идо"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Исландча"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Италянча"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Инуктитут"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Японча"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Яаванез"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Грузинча"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Кикуйу"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Қозоқча"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Калааллисут"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Кхмерча"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Каннада"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Корейсча"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Кашмирча"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Курдча"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Коми"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Корн"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Қирғизча"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Лотинча"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Люксембургча"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Лимбурган"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Лингала"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Лаосча"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Литвача"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Латишча"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Малагаси"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Маршаллез"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Маори"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Македонияча"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Малайалам"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Муғулча"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Молдавча"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Марати"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Малайча"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Малтача"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Бурмезча"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Науру"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Норвегча (Бокмаал)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ндебеле, Шимол"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Паст Саксонча"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Непалча"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ндонга"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Голландча"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Норвегияча (Нйнорск)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ндебеле, Жануб"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Шимолий Соточа"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Наважо"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Чичева"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Французча (Осситан шеваси)"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Оромо"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ория"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Оссетинча"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Панжабча"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Пали"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Полякча"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Пуштунча"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Португалча"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Португалча (Бразилия)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Квечуа"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Рунди"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Руминча"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Руминча"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Русча"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Кинярванда"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Санскрит"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Сардинча"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Синдхи"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Шимолий Сами"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Санго"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Синхалесе"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Словакча"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Словенианча"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Самоача"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Шона"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Сомалича"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Албанча"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Сербча"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Сербча (Лотин)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Свати"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Сотхо, Жанубий"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Сунданча"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Шведча"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Свахили"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Тамилча"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Телугу"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Тожикча"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Тайча"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Тигриня"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Туркманча"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Тсвана"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Тонга"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Туркча"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Цонга"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Тотарча"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Тви"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Тахитиан"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Уйғурча"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Украинча"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Урду"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Ўзбекча"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Венда"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Ветнамча"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Волапук"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Валлонча"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Волоф"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Хҳоса"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Йиддиш"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Ёруба"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Зхуанг"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Хитойча"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Соддалаштирилган Хитойча"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Хитойча (Гонгконг)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Анъанавий Хитойча"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Зулуча"
diff --git a/translations/desktop_files/all_languages.desktop/ven.po b/translations/desktop_files/all_languages.desktop/ven.po
index 4d5476677..8b583a3f0 100644
--- a/translations/desktop_files/all_languages.desktop/ven.po
+++ b/translations/desktop_files/all_languages.desktop/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "Luisimane"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Luisimane"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Luisimane"
 
 #. Name
@@ -200,716 +200,721 @@ msgstr ""
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 #, fuzzy
 msgid "Estonian"
 msgstr "Mubosinia"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Mufura"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Mugalata"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Luambo lwa hothe"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Luambo lwa hothe"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Mudzhapani"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Mudzhapani"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele, Devhula"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele, Tshipembe"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "Sami ya Devhula"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 #, fuzzy
 msgid "Polish"
 msgstr "Luisimane"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 #, fuzzy
 msgid "Romanian"
 msgstr "Mubosinia"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami ya Devhula"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Musilovaka"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 #, fuzzy
 msgid "Slovenian"
 msgstr "Musilovaka"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Sotho, Tshipembe"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Munna wa Turkey"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xhoza"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Mutshaina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Muzulu"
diff --git a/translations/desktop_files/all_languages.desktop/vi.po b/translations/desktop_files/all_languages.desktop/vi.po
index 535474452..c1be7ba9e 100644
--- a/translations/desktop_files/all_languages.desktop/vi.po
+++ b/translations/desktop_files/all_languages.desktop/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "Anh"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Anh (quốc Anh)"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "Anh (Mỹ)"
 
 #. Name
@@ -198,710 +198,715 @@ msgstr "Tây-ban-nha"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "E-x-tô-ni-a"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Ba-x-quợ"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Pha-xi"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Phần-lan"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Phi-gi"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Pha-rô"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Pháp"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Ph-ri-xi"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "Xen-tợ Ái-nhĩ-lan"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Xen-tợ"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Ga-li-ci"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Gua-ra-ni"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Gu-gia-ra-ti"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Man-xợ"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Hau-sa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Do-thái"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Hin-đi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hi-ri-mô-tu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Cợ-rô-a-ti-a"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Xoa-bi muộn"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hung-gia-lợi"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Ác-mê-ni"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "He-re-rô"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "In-tợ-lin-gua"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Nam-dương"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "In-tợ-lin-guợ"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "I-nu-piac"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "I-đô"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Băng-đảo"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Ý"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "I-nuc-ti-túc"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Nhật"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Gia-va"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Gi-oa-gi-ạ"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Ki-ku-yu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kha-xakh"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Ka-lă-li-sút"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Khơ-me"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Ka-na-đa"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Triều-tiên"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Ka-x-mi-ri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kuổ-đị"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Khô-mi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Xen-tợ Coanh-ouặn"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kia-gi-x"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "La-tinh"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lúc-xăm-buac"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Lim-bua-ga"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lin-ga-la"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Lào"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Li-tu-a-ni"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Lát-vi-a"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Ma-la-ga-xị"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Mă-xăn"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Mao-ri"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Ma-xê-đô-ni"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Ma-lay-am"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mông-cổ"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Mon-đa-vi"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Ma-ra-ti"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Mã-lai"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Man-tợ"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Miến-điện"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nau-ru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Na-uy (Bóc-mặn)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "N-đe-be-lê (Bắc)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Xác-xọnh thấp"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Ne-pa-li"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "N-đon-ga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Hoà-lan"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Na-uy (Ny-noạ-x-kh)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "N-đe-be-lê (Nam)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Xô-tô (Bắc)"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Na-va-cộ"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Chi-che-ouă"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Óc-ci-tan"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "O-ro-mô"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Ô-ri-yạ"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Óc-xe-ti-an"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pan-gia-bi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Pa-li"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Ba-lan"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pu-x-tô"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Bồ-đào-nha"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Bồ-đào-nha (Bra-xin)"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Quê-chua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Run-đi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Rô-ma-ni-a"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "Rô-ma-ny"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Nga"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Ki-nyă-ouanh-đa"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Xan-s-cợ-ríth"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Xa-đi-ni-a"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Xin-đi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Xa-mi (Bắc)"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Xan-gô"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Xin-ha-li"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Xlô-vák"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Xlô-ven"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Xa-mô-a"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Sô-na"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Xô-ma-li"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "An-ba-ni"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Xéc-bi"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Xéc-bi (La-tinh)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Xouă-ti"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Xô-tô (nam)"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Xun-đa-ni"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Thuỵ-điển"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Xouă-hi-li"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Ta-min"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Te-lu-gu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Ta-gíc"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Thái"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Ti-gợ-ri-nia"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Tuổc-men"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "T-xouă-nă"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Tông-ga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Thổ-nhĩ-kỳ"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "T-xông-ga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Ta-tă"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Tui"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Ta-hi-ti"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ui-gua"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "U-cợ-rainh"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Uổ-đu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "U-x-béc"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "Ven-đa"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Việt"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Vo-la-puc"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Oua-lunh"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Ouo-lo-ph"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xô-xa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Y-đít"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Yô-ru-ba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Xuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Trung quốc"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "Trung quốc (phổ thông)"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "Trung quốc (Hồng Kông)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "Trung quốc (truyền thống)"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Xu-lu"
diff --git a/translations/desktop_files/all_languages.desktop/wa.po b/translations/desktop_files/all_languages.desktop/wa.po
index dcb2bda14..02d984e5a 100644
--- a/translations/desktop_files/all_languages.desktop/wa.po
+++ b/translations/desktop_files/all_languages.desktop/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,13 +178,13 @@ msgstr "Inglès"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "Inglès britanike"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Inglès britanike"
 
 #. Name
@@ -199,714 +199,719 @@ msgstr "Castiyan"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Estonyin"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Basse"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "Farsi"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Finwès"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Fidjyin"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Faeroyès"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Francès"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Frizon"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Gayel"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Gayel"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Galicyin"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Gwarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Goudjarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Gayel del Iye di Man"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Ebreu"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Crowåte"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "Hôt sorbyin"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Hongrwès"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Årmenyin"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Interlingua (noû latén)"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indonezyin"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 #, fuzzy
 msgid "Interlingue"
 msgstr "Interlingua (noû latén)"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inyupiak"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "Izlandès"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Itålyin"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Djaponès"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Djavanès"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Djeyordjyin"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Kazaxh"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Xhmer"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Coreyin"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Cachmiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "Kurdi"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Cornike"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Kirguize"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Latén"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Lussimbordjwès"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limbordjwès"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Lawocyin"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Litwanyin"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Letonyin"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Malgache"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Marshalès"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Mawori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Macedonyin"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Mongol"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Moldåve"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Marati"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 #, fuzzy
 msgid "Malay"
 msgstr "Malgache"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Maltès"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Nawouro"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Norvedjyin (Bokmål)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele (bijhe)"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "Bas sacson"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Nepalès"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Neyerlandès"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Noû-Norvedjyin (Nynorsk)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele (nonne)"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "Soto (bijhe)"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Navaxho"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Tchitchewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossete"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Pundjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Pâli"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Polonès"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Pashto"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Portuguès"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "Portuguès do Braezi"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Kitchwa"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Kirundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Roumin"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Roumin"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Rûsse"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kiniarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Sardinyin"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Bijhe såmi"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Sinhalès"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Eslovake"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Eslovenyin"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Samowan"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Somalyin"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Albanyin"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Serbe"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "Siebe (alfabet latén)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Suwati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Soto (nonne)"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Soudanès"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Suwedwès"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Suwahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Tamoul"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Telougou"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Tadjik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Taylandès"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Tigrinia"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Turkmene"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Turk"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Tatår"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Tahityin"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Ouygour"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Oucrinnyin"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Ourdou"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Ouzbeke"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Vietnamyin"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Walon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Xhossa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Yidish"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Yorouba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Chinwès"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Zoulou"
diff --git a/translations/desktop_files/all_languages.desktop/xh.po b/translations/desktop_files/all_languages.desktop/xh.po
index 721386751..66f9137bc 100644
--- a/translations/desktop_files/all_languages.desktop/xh.po
+++ b/translations/desktop_files/all_languages.desktop/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -180,13 +180,13 @@ msgstr "Isingesi"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Isingesi"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Isingesi"
 
 #. Name
@@ -201,716 +201,721 @@ msgstr "Isipanishi"
 
 #. Name
 #: all_languages.desktop:74
-msgid "Estonian"
+msgid "Spanish (Argentina)"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:76
-msgid "Basque"
+msgid "Estonian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:78
-msgid "Farsi (Persian)"
+msgid "Basque"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:80
-msgid "Finnish"
+msgid "Persian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:82
-msgid "Fijian"
+msgid "Finnish"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:84
-msgid "Faroese"
+msgid "Fijian"
 msgstr ""
 
 #. Name
 #: all_languages.desktop:86
+msgid "Faroese"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Isifrentshi"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "isiGalacian"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Isihebhere"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "isitaliyane"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Isijapani"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 #, fuzzy
 msgid "Javanese"
 msgstr "Isijapani"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Isikorea"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Isilatvian"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 #, fuzzy
 msgid "Moldavian"
 msgstr "Isilatvian"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Isindebele, Emntla"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Isidatshi"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Isindebele, Emazantsi"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "Sami Yasemntla"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 #, fuzzy
 msgid "Polish"
 msgstr "Isingesi"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Isirashiya"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 #, fuzzy
 msgid "Sardinian"
 msgstr "Ukranian"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Sami Yasemntla"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "isiSlovak"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 #, fuzzy
 msgid "Slovenian"
 msgstr "isiSlovak"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Isishona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Isiswati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Isisuthu, Sasemzantsi"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Isitswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Ukranian"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "isixhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Isitshayina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Isizulu"
diff --git a/translations/desktop_files/all_languages.desktop/zh_CN.po b/translations/desktop_files/all_languages.desktop/zh_CN.po
index 04a571b53..5aa64ac8b 100644
--- a/translations/desktop_files/all_languages.desktop/zh_CN.po
+++ b/translations/desktop_files/all_languages.desktop/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "英语"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "英国英语"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "美国英语"
 
 #. Name
@@ -198,711 +198,716 @@ msgstr "西班牙语"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "爱沙尼亚语"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "巴斯克语"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "波斯语"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "芬兰语"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "斐济语"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "法罗群岛语"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "法语"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "弗里斯兰语"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "爱尔兰盖尔语"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "盖尔语"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "加利西亚语"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "瓜拉尼语"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "古吉拉特语"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "马恩岛语"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "豪撒语"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "希伯来语"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "北印度语"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "新里木托语"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "克罗地亚语"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "索布语"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "匈牙利语"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "赫雷罗语"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "拉丁国际语(国际辅助语)"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "印度尼西亚语"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "语际语"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "因纽佩特语"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "伊多语"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "冰岛语"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "意大利语"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "因纽特语"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "日语"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "爪哇语"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "乔治亚语"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "基库尤语"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "哈萨克语"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "格陵兰语"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "高棉语"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "坎纳德语"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "朝鲜语"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "克什米尔语"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "库尔德语"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "科米语"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "康瓦尔郡语"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "吉尔吉斯语"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "拉丁语"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "卢森堡语"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "林堡语"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "林加拉语"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "老挝语"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "拉脱维亚语"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "马尔加什语"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "马绍尔语"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "毛利语"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "马其顿语"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "德拉维族语"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "蒙古语"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "摩尔多瓦"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "马拉地语"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "马来西亚语"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "马耳他语"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "缅甸语"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "瑙鲁语"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "挪威语 (博克马尔语)"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele，北部"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "撒克逊语"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "尼泊尔语"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 #, fuzzy
 msgid "Ndonga"
 msgstr "汤加语"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "荷兰语"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "挪威语 (尼诺斯克语)"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele，南部"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 msgid "Northern Sotho"
 msgstr "北部梭托语"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "纳瓦霍语"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "齐切瓦语"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "奥西坦语"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "阿曼语"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "欧里亚语"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "奥塞梯语"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "旁遮普语"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "巴利语"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "波兰语"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "普什图语"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "巴西葡萄牙语"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "盖丘亚语"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "基隆迪语"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "吉普赛语"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "俄语"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "卢旺达语"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "梵语"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "撒丁语"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "北部沙米语"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "桑戈语"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "僧伽罗语"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "斯洛文尼亚语"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "萨摩亚语"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "修纳语"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "索马里语"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "阿尔巴尼亚语"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "塞尔维亚语(拉丁)"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "斯瓦特语"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "索托，南部"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "巽他语"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "瑞典语"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "斯瓦希里语"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "泰米尔语"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "泰卢固语"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "塔吉克语"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "泰语"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "提格里尼亚语"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "土库曼语"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "茨瓦纳语"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "汤加语"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "土耳其语"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "特松加语"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "鞑靼语"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "契维语"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "塔希提语"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "维吾尔语"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "乌尔都语"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "乌兹别克语"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr "闻达语"
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "越南语"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "沃拉普克语"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "瓦龙语"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "沃洛夫语"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "科萨语"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "依地语"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "约鲁巴语"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "壮语"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "中文"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "简体中文"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "繁体中文(香港)"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "繁体中文"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "祖鲁语"
diff --git a/translations/desktop_files/all_languages.desktop/zh_HK.po b/translations/desktop_files/all_languages.desktop/zh_HK.po
index ba6cf61df..b5283d64b 100644
--- a/translations/desktop_files/all_languages.desktop/zh_HK.po
+++ b/translations/desktop_files/all_languages.desktop/zh_HK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "英語"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "英式英語"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "美式英語"
 
 #. Name
@@ -198,716 +198,721 @@ msgstr "西班牙語"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "愛沙尼亞語"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "巴斯克語"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "波斯語"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "芬蘭語"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "斐濟語"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "法羅語"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "法語"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "弗利然語"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "蓋爾語"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "蓋爾語"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "瓜拉尼語"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "古吉拉特語"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "曼島語"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "豪薩語"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "希伯來語"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "北印度語"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri Motu語"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "克羅地亞語"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "塞爾維亞語"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "匈牙利語"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "亞美尼亞語"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Herero語"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "科技共通語"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "印尼語"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingue語"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiaq語"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "伊多語"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "冰島語"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "意大利語"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inuktitut語"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "日語"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "爪哇語"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "喬治亞語"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "吉庫猶語"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "哈薩克語"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalaallisut語"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "高棉語"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "坎那達語"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "韓國語"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "喀什米爾語"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "庫德語"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komi語"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "康瓦耳語"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "吉爾吉斯語"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "拉丁語"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "盧森堡語"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgan語"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingala語"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "寮國語"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "立陶宛語"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "拉脫維亞語"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "馬拉加西語"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "馬紹爾語"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "毛利語"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "馬其頓語"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "馬來亞拉姆語"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "蒙古語"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "摩爾達維亞語"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "馬拉地語"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "馬來語"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "馬爾他語"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "緬甸語"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "諾魯語"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 #, fuzzy
 msgid "Norwegian Bokmål"
 msgstr "挪威 Nynorsk 語"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele語，北部"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "尼泊爾語"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndonga語"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "荷蘭語"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "挪威 Nynorsk 語"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele語，南部"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "北薩米語"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "納瓦伙語"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Chichewa語"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitan語"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromo語"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Oriya語"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetian語"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Panjabi語"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Punjabi語"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "巴利語"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "波蘭語"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "普什圖語"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "葡萄牙語"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "巴西葡萄牙語"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "蓋楚瓦語"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundi語"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "羅馬尼亞語"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "羅馬尼亞語"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "俄語"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyarwanda語"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "梵語"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "薩丁尼亞語"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindhi語"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "北薩米語"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sango語"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "錫蘭語"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "斯洛伐克語"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "斯洛維尼亞語"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "薩摩牙語"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Shona語"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "索馬利語"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "阿爾巴尼亞語"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "塞爾維亞語"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "塞爾維亞語"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Swati語"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "梭托語，南部"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanese語"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "瑞典語"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "斯華西里語"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "坦米爾語"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "特拉古語"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "塔吉克語"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "泰國語"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "提格利尼亞語"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "土庫曼語"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "班圖語"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "東加語"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "土耳其語"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsonga語"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "韃靼語"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "契維語"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "大溪地語"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "維吾爾語"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "烏克蘭語"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "烏都語"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "烏茲別克語"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "越南語"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "華隆語"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Wolof語"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "科薩語"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "意第緒語"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "優魯巴語"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zhuang語"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "中文"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "簡體中文"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "繁體中文"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "袓魯語"
diff --git a/translations/desktop_files/all_languages.desktop/zh_TW.po b/translations/desktop_files/all_languages.desktop/zh_TW.po
index efeeb8e5d..0ff38e423 100644
--- a/translations/desktop_files/all_languages.desktop/zh_TW.po
+++ b/translations/desktop_files/all_languages.desktop/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -178,12 +178,12 @@ msgstr "英語"
 
 #. Name
 #: all_languages.desktop:66
-msgid "British English"
+msgid "English (British)"
 msgstr "（英式）英語"
 
 #. Name
 #: all_languages.desktop:68
-msgid "American English"
+msgid "English (American)"
 msgstr "美語"
 
 #. Name
@@ -198,711 +198,716 @@ msgstr "西班牙語"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "愛沙尼亞語"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "巴斯克語"
 
 #. Name
-#: all_languages.desktop:78
-msgid "Farsi (Persian)"
+#: all_languages.desktop:80
+msgid "Persian"
 msgstr "波斯語"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "芬蘭語"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "斐濟語"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "法羅語"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "法語"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "弗利然語"
 
 #. Name
-#: all_languages.desktop:90
-msgid "Irish Gaelic"
+#: all_languages.desktop:92
+msgid "Irish"
 msgstr "（愛爾蘭）蓋爾語"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "蓋爾語"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "加利西亞語"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "瓜拉尼語"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "古吉拉特語"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "曼島語"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "豪薩語"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "希伯來語"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "北印度語"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Hiri Motu語"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "克羅埃西亞語"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 msgid "Upper Sorbian"
 msgstr "塞爾維亞語"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "匈牙利語"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "亞美尼亞語"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Herero語"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "科技共通語"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "印尼語"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Interlingue語"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Inupiaq語"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "伊多語"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "冰島語"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "義大利語"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Inuktitut語"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "日語"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "爪哇語"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "喬治亞語"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "吉庫猶語"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "哈薩克語"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Kalaallisut語"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "高棉語"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "坎那達語"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "韓國語"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "喀什米爾語"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "庫德語"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Komi語"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "康瓦耳語"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "吉爾吉斯語"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "拉丁語"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "盧森堡語"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Limburgan語"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Lingala語"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "寮國語"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "立陶宛語"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "拉脫維亞語"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "馬拉加西語"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "馬紹爾語"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "毛利語"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "馬其頓語"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "馬來亞拉姆語"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "蒙古語"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "摩爾達維亞語"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "馬拉地語"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "馬來語"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "馬爾他語"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "緬甸語"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "諾魯語"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "挪威 Bokmål"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Ndebele語，北部"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr "薩克遜語"
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "尼泊爾語"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Ndonga語"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "荷蘭語"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "挪威 Nynorsk 語"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Ndebele語，南部"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "北薩米語"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "納瓦伙語"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Chichewa語"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Occitan語"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Oromo語"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Oriya語"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Ossetian語"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
-msgstr "Panjabi語"
+#: all_languages.desktop:234
+msgid "Punjabi"
+msgstr "Punjabi語"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "巴利語"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "波蘭語"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "普什圖語"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "葡萄牙語"
 
 #. Name
-#: all_languages.desktop:242
-msgid "Brazilian Portuguese"
+#: all_languages.desktop:244
+msgid "Portuguese (Brazil)"
 msgstr "巴西葡萄牙語"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "蓋楚瓦語"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Rundi語"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "羅馬尼亞語"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 msgid "Romany"
 msgstr "吉普賽語"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "俄語"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Kinyarwanda語"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "梵語"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "薩丁尼亞語"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Sindhi語"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "北薩米語"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Sango語"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "錫蘭語"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "斯洛伐克語"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "斯洛維尼亞語"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "薩摩牙語"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Shona語"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "索馬利語"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "阿爾巴尼亞語"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "塞爾維亞語"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 msgid "Serbian Latin"
 msgstr "賽爾維亞拉丁語"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Swati語"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "梭托語，南部"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Sundanese語"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "瑞典語"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "斯華西里語"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "坦米爾語"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "特拉古語"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "塔吉克語"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "泰國語"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "提格利尼亞語"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "土庫曼語"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "班圖語"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "東加語"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "土耳其語"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Tsonga語"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "韃靼語"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "契維語"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "大溪地語"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "維吾爾語"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "烏克蘭語"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "烏都語"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "烏茲別克語"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr "烏茲別克語（斯拉夫語系）"
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "越南語"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "華隆語"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Wolof語"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "科薩語"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "意第緒語"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "優魯巴語"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Zhuang語"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "中文"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr "簡體中文"
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr "正體中文（香港）"
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr "正體中文"
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "袓魯語"
diff --git a/translations/desktop_files/all_languages.desktop/zu.po b/translations/desktop_files/all_languages.desktop/zu.po
index 81341b31c..df6c5f144 100644
--- a/translations/desktop_files/all_languages.desktop/zu.po
+++ b/translations/desktop_files/all_languages.desktop/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-03 19:58+0200\n"
+"POT-Creation-Date: 2020-11-25 17:36+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"
@@ -179,13 +179,13 @@ msgstr "Isi-Ngisi"
 #. Name
 #: all_languages.desktop:66
 #, fuzzy
-msgid "British English"
+msgid "English (British)"
 msgstr "Isi-Ngisi"
 
 #. Name
 #: all_languages.desktop:68
 #, fuzzy
-msgid "American English"
+msgid "English (American)"
 msgstr "Isi-Ngisi"
 
 #. Name
@@ -200,717 +200,722 @@ msgstr "Isi-Penishi"
 
 #. Name
 #: all_languages.desktop:74
+msgid "Spanish (Argentina)"
+msgstr ""
+
+#. Name
+#: all_languages.desktop:76
 msgid "Estonian"
 msgstr "Isi-Estonian"
 
 #. Name
-#: all_languages.desktop:76
+#: all_languages.desktop:78
 msgid "Basque"
 msgstr "Isi-Basque"
 
 #. Name
-#: all_languages.desktop:78
+#: all_languages.desktop:80
 #, fuzzy
-msgid "Farsi (Persian)"
+msgid "Persian"
 msgstr "Isi-Frisiyani"
 
 #. Name
-#: all_languages.desktop:80
+#: all_languages.desktop:82
 msgid "Finnish"
 msgstr "Isi-Finishi"
 
 #. Name
-#: all_languages.desktop:82
+#: all_languages.desktop:84
 msgid "Fijian"
 msgstr "Isi-Fijiyani"
 
 #. Name
-#: all_languages.desktop:84
+#: all_languages.desktop:86
 msgid "Faroese"
 msgstr "Isi-Faroese"
 
 #. Name
-#: all_languages.desktop:86
+#: all_languages.desktop:88
 msgid "French"
 msgstr "Isi-Frentshi"
 
 #. Name
-#: all_languages.desktop:88
+#: all_languages.desktop:90
 msgid "Frisian"
 msgstr "Isi-Frisiyani"
 
 #. Name
-#: all_languages.desktop:90
+#: all_languages.desktop:92
 #, fuzzy
-msgid "Irish Gaelic"
+msgid "Irish"
 msgstr "Isi-Gayelikhi"
 
 #. Name
-#: all_languages.desktop:92
+#: all_languages.desktop:94
 msgid "Gaelic"
 msgstr "Isi-Gayelikhi"
 
 #. Name
-#: all_languages.desktop:94
+#: all_languages.desktop:96
 msgid "Galician"
 msgstr "Isi-Galashiyani"
 
 #. Name
-#: all_languages.desktop:96
+#: all_languages.desktop:98
 msgid "Guarani"
 msgstr "Isi-Guarani"
 
 #. Name
-#: all_languages.desktop:98
+#: all_languages.desktop:100
 msgid "Gujarati"
 msgstr "Isi-Gujarati"
 
 #. Name
-#: all_languages.desktop:100
+#: all_languages.desktop:102
 msgid "Manx"
 msgstr "Isi-Manx"
 
 #. Name
-#: all_languages.desktop:102
+#: all_languages.desktop:104
 msgid "Hausa"
 msgstr "Isi-Hausa"
 
 #. Name
-#: all_languages.desktop:104
+#: all_languages.desktop:106
 msgid "Hebrew"
 msgstr "Isi-Hebheru"
 
 #. Name
-#: all_languages.desktop:106
+#: all_languages.desktop:108
 msgid "Hindi"
 msgstr "Isi-Hindi"
 
 #. Name
-#: all_languages.desktop:108
+#: all_languages.desktop:110
 msgid "Hiri Motu"
 msgstr "Isi-Hiri Motu"
 
 #. Name
-#: all_languages.desktop:110
+#: all_languages.desktop:112
 msgid "Croatian"
 msgstr "Isi-Croatian"
 
 #. Name
-#: all_languages.desktop:112
+#: all_languages.desktop:114
 #, fuzzy
 msgid "Upper Sorbian"
 msgstr "Isi-Serbian"
 
 #. Name
-#: all_languages.desktop:114
+#: all_languages.desktop:116
 msgid "Hungarian"
 msgstr "Isi-Hangariyani"
 
 #. Name
-#: all_languages.desktop:116
+#: all_languages.desktop:118
 msgid "Armenian"
 msgstr "Isi-Armenian"
 
 #. Name
-#: all_languages.desktop:118
+#: all_languages.desktop:120
 msgid "Herero"
 msgstr "Isi-Herero"
 
 #. Name
-#: all_languages.desktop:120
+#: all_languages.desktop:122
 msgid "Interlingua"
 msgstr "Ulimi olufanayo"
 
 #. Name
-#: all_languages.desktop:122
+#: all_languages.desktop:124
 msgid "Indonesian"
 msgstr "Indoneshiya"
 
 #. Name
-#: all_languages.desktop:124
+#: all_languages.desktop:126
 msgid "Interlingue"
 msgstr "Izilimi ezifanayo"
 
 #. Name
-#: all_languages.desktop:126
+#: all_languages.desktop:128
 msgid "Inupiaq"
 msgstr "Isi-Inupiaq"
 
 #. Name
-#: all_languages.desktop:128
+#: all_languages.desktop:130
 msgid "Ido"
 msgstr "Isi-Ido"
 
 #. Name
-#: all_languages.desktop:130
+#: all_languages.desktop:132
 msgid "Icelandic"
 msgstr "isi-Icelandic"
 
 #. Name
-#: all_languages.desktop:132
+#: all_languages.desktop:134
 msgid "Italian"
 msgstr "Isi-Ntaliyane"
 
 #. Name
-#: all_languages.desktop:134
+#: all_languages.desktop:136
 msgid "Inuktitut"
 msgstr "Isi-Inuktitut"
 
 #. Name
-#: all_languages.desktop:136
+#: all_languages.desktop:138
 msgid "Japanese"
 msgstr "Isi-Jaliphani"
 
 #. Name
-#: all_languages.desktop:138
+#: all_languages.desktop:140
 msgid "Javanese"
 msgstr "Isi-Javanisi"
 
 #. Name
-#: all_languages.desktop:140
+#: all_languages.desktop:142
 msgid "Georgian"
 msgstr "Isi-Jojiyani"
 
 #. Name
-#: all_languages.desktop:142
+#: all_languages.desktop:144
 msgid "Kikuyu"
 msgstr "Isi-Kikuyu"
 
 #. Name
-#: all_languages.desktop:144
+#: all_languages.desktop:146
 msgid "Kazakh"
 msgstr "Isi-Kazakhi"
 
 #. Name
-#: all_languages.desktop:146
+#: all_languages.desktop:148
 msgid "Kalaallisut"
 msgstr "Isi-Kalaallisut"
 
 #. Name
-#: all_languages.desktop:148
+#: all_languages.desktop:150
 msgid "Khmer"
 msgstr "Isi-Khmer"
 
 #. Name
-#: all_languages.desktop:150
+#: all_languages.desktop:152
 msgid "Kannada"
 msgstr "Isi-Khanada"
 
 #. Name
-#: all_languages.desktop:152
+#: all_languages.desktop:154
 msgid "Korean"
 msgstr "Isi-Korean"
 
 #. Name
-#: all_languages.desktop:154
+#: all_languages.desktop:156
 msgid "Kashmiri"
 msgstr "Isi-Kashimiri"
 
 #. Name
-#: all_languages.desktop:156
+#: all_languages.desktop:158
 msgid "Kurdish"
 msgstr "isi-Kurdish"
 
 #. Name
-#: all_languages.desktop:158
+#: all_languages.desktop:160
 msgid "Komi"
 msgstr "Isi-Komi"
 
 #. Name
-#: all_languages.desktop:160
+#: all_languages.desktop:162
 msgid "Cornish"
 msgstr "Isi-Khonishi"
 
 #. Name
-#: all_languages.desktop:162
+#: all_languages.desktop:164
 msgid "Kirghiz"
 msgstr "Isi-Kirghizi"
 
 #. Name
-#: all_languages.desktop:164
+#: all_languages.desktop:166
 msgid "Latin"
 msgstr "Isi-Lathini"
 
 #. Name
-#: all_languages.desktop:166
+#: all_languages.desktop:168
 msgid "Luxembourgish"
 msgstr "Isi-Luxembourgish"
 
 #. Name
-#: all_languages.desktop:168
+#: all_languages.desktop:170
 msgid "Limburgan"
 msgstr "Isi-Lumburgan"
 
 #. Name
-#: all_languages.desktop:170
+#: all_languages.desktop:172
 msgid "Lingala"
 msgstr "Isi-Lingala"
 
 #. Name
-#: all_languages.desktop:172
+#: all_languages.desktop:174
 msgid "Lao"
 msgstr "Isi-Lao"
 
 #. Name
-#: all_languages.desktop:174
+#: all_languages.desktop:176
 msgid "Lithuanian"
 msgstr "Isi-Lithuanian"
 
 #. Name
-#: all_languages.desktop:176
+#: all_languages.desktop:178
 msgid "Latvian"
 msgstr "Isi-Latvian"
 
 #. Name
-#: all_languages.desktop:178
+#: all_languages.desktop:180
 msgid "Malagasy"
 msgstr "Isi-Malagasy"
 
 #. Name
-#: all_languages.desktop:180
+#: all_languages.desktop:182
 msgid "Marshallese"
 msgstr "Isi-Marshallese"
 
 #. Name
-#: all_languages.desktop:182
+#: all_languages.desktop:184
 msgid "Maori"
 msgstr "Isi-Maori"
 
 #. Name
-#: all_languages.desktop:184
+#: all_languages.desktop:186
 msgid "Macedonian"
 msgstr "Isi-Makhedoniya"
 
 #. Name
-#: all_languages.desktop:186
+#: all_languages.desktop:188
 msgid "Malayalam"
 msgstr "Isi-Malayalam"
 
 #. Name
-#: all_languages.desktop:188
+#: all_languages.desktop:190
 msgid "Mongolian"
 msgstr "Isi-Mongolian"
 
 #. Name
-#: all_languages.desktop:190
+#: all_languages.desktop:192
 msgid "Moldavian"
 msgstr "Isi-Moldavian"
 
 #. Name
-#: all_languages.desktop:192
+#: all_languages.desktop:194
 msgid "Marathi"
 msgstr "Isi-Marathi"
 
 #. Name
-#: all_languages.desktop:194
+#: all_languages.desktop:196
 msgid "Malay"
 msgstr "Isi-Malay"
 
 #. Name
-#: all_languages.desktop:196
+#: all_languages.desktop:198
 msgid "Maltese"
 msgstr "Isi-Maltase"
 
 #. Name
-#: all_languages.desktop:198
+#: all_languages.desktop:200
 msgid "Burmese"
 msgstr "Isi-Burmese"
 
 #. Name
-#: all_languages.desktop:200
+#: all_languages.desktop:202
 msgid "Nauru"
 msgstr "Isi-Nauru"
 
 #. Name
-#: all_languages.desktop:202
+#: all_languages.desktop:204
 msgid "Norwegian Bokmål"
 msgstr "Isi-Norwegian Bokmaal"
 
 #. Name
-#: all_languages.desktop:204
+#: all_languages.desktop:206
 msgid "Ndebele, North"
 msgstr "Isi-Ndebele, Sase-Ntshonalanga"
 
 #. Name
-#: all_languages.desktop:206
+#: all_languages.desktop:208
 msgid "Low Saxon"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:208
+#: all_languages.desktop:210
 msgid "Nepali"
 msgstr "Isi-Nepali"
 
 #. Name
-#: all_languages.desktop:210
+#: all_languages.desktop:212
 msgid "Ndonga"
 msgstr "Isi-Ndonga"
 
 #. Name
-#: all_languages.desktop:212
+#: all_languages.desktop:214
 msgid "Dutch"
 msgstr "Isi-Danishi"
 
 #. Name
-#: all_languages.desktop:214
+#: all_languages.desktop:216
 msgid "Norwegian Nynorsk"
 msgstr "Isi-Norwegian Nynorsk"
 
 #. Name
-#: all_languages.desktop:216
+#: all_languages.desktop:218
 msgid "Ndebele, South"
 msgstr "Isi-Ndebele, Sase-Mzansi"
 
 #. Name
-#: all_languages.desktop:218
+#: all_languages.desktop:220
 #, fuzzy
 msgid "Northern Sotho"
 msgstr "Isi-Sami Sase-Ntshonalanga"
 
 #. Name
-#: all_languages.desktop:220
+#: all_languages.desktop:222
 msgid "Navajo"
 msgstr "Isi-Navajo"
 
 #. Name
-#: all_languages.desktop:222
+#: all_languages.desktop:224
 msgid "Chichewa"
 msgstr "Isi-Chichewa"
 
 #. Name
-#: all_languages.desktop:224
+#: all_languages.desktop:226
 msgid "Occitan"
 msgstr "Isi-Osithani"
 
 #. Name
-#: all_languages.desktop:226
+#: all_languages.desktop:228
 msgid "Oromo"
 msgstr "Isi-Oromo"
 
 #. Name
-#: all_languages.desktop:228
+#: all_languages.desktop:230
 msgid "Oriya"
 msgstr "Isi-Oriya"
 
 #. Name
-#: all_languages.desktop:230
+#: all_languages.desktop:232
 msgid "Ossetian"
 msgstr "Isi-Ossethiyani"
 
 #. Name
-#: all_languages.desktop:232
-msgid "Panjabi"
+#: all_languages.desktop:234
+msgid "Punjabi"
 msgstr "Isi-Phanjabi"
 
 #. Name
-#: all_languages.desktop:234
+#: all_languages.desktop:236
 msgid "Pali"
 msgstr "Isi-Phali"
 
 #. Name
-#: all_languages.desktop:236
+#: all_languages.desktop:238
 msgid "Polish"
 msgstr "Isi-Pholishi"
 
 #. Name
-#: all_languages.desktop:238
+#: all_languages.desktop:240
 msgid "Pushto"
 msgstr "Dudula ku"
 
 #. Name
-#: all_languages.desktop:240
+#: all_languages.desktop:242
 msgid "Portuguese"
 msgstr "Isi-Phuthukesi"
 
 #. Name
-#: all_languages.desktop:242
+#: all_languages.desktop:244
 #, fuzzy
-msgid "Brazilian Portuguese"
+msgid "Portuguese (Brazil)"
 msgstr "Isi-Phuthukesi"
 
 #. Name
-#: all_languages.desktop:244
+#: all_languages.desktop:246
 msgid "Quechua"
 msgstr "Isi-Quechua"
 
 #. Name
-#: all_languages.desktop:246
+#: all_languages.desktop:248
 msgid "Rundi"
 msgstr "Isi-Rundi"
 
 #. Name
-#: all_languages.desktop:248
+#: all_languages.desktop:250
 msgid "Romanian"
 msgstr "Isi-Romania"
 
 #. Name
-#: all_languages.desktop:250
+#: all_languages.desktop:252
 #, fuzzy
 msgid "Romany"
 msgstr "Isi-Romania"
 
 #. Name
-#: all_languages.desktop:252
+#: all_languages.desktop:254
 msgid "Russian"
 msgstr "Isi-Rashiya"
 
 #. Name
-#: all_languages.desktop:254
+#: all_languages.desktop:256
 msgid "Kinyarwanda"
 msgstr "Isi-Kinyarwanda"
 
 #. Name
-#: all_languages.desktop:256
+#: all_languages.desktop:258
 msgid "Sanskrit"
 msgstr "Isi-Sanskrit"
 
 #. Name
-#: all_languages.desktop:258
+#: all_languages.desktop:260
 msgid "Sardinian"
 msgstr "Isi-Sardinian"
 
 #. Name
-#: all_languages.desktop:260
+#: all_languages.desktop:262
 msgid "Sindhi"
 msgstr "Isi-Sindi"
 
 #. Name
-#: all_languages.desktop:262
+#: all_languages.desktop:264
 msgid "Northern Sami"
 msgstr "Isi-Sami Sase-Ntshonalanga"
 
 #. Name
-#: all_languages.desktop:264
+#: all_languages.desktop:266
 msgid "Sango"
 msgstr "Isi-Sango"
 
 #. Name
-#: all_languages.desktop:266
+#: all_languages.desktop:268
 msgid "Sinhalese"
 msgstr "Isi-Sinhalese"
 
 #. Name
-#: all_languages.desktop:268
+#: all_languages.desktop:270
 msgid "Slovak"
 msgstr "Isi-Silovaki"
 
 #. Name
-#: all_languages.desktop:270
+#: all_languages.desktop:272
 msgid "Slovenian"
 msgstr "Isi-Slovenian"
 
 #. Name
-#: all_languages.desktop:272
+#: all_languages.desktop:274
 msgid "Samoan"
 msgstr "Isi-Samoan"
 
 #. Name
-#: all_languages.desktop:274
+#: all_languages.desktop:276
 msgid "Shona"
 msgstr "Isi-Shona"
 
 #. Name
-#: all_languages.desktop:276
+#: all_languages.desktop:278
 msgid "Somali"
 msgstr "Isi-Somali"
 
 #. Name
-#: all_languages.desktop:278
+#: all_languages.desktop:280
 msgid "Albanian"
 msgstr "Isi-Albanian"
 
 #. Name
-#: all_languages.desktop:280
+#: all_languages.desktop:282
 msgid "Serbian"
 msgstr "Isi-Serbian"
 
 #. Name
-#: all_languages.desktop:282
+#: all_languages.desktop:284
 #, fuzzy
 msgid "Serbian Latin"
 msgstr "Isi-Serbian"
 
 #. Name
-#: all_languages.desktop:284
+#: all_languages.desktop:286
 msgid "Swati"
 msgstr "Isi-Swati"
 
 #. Name
-#: all_languages.desktop:286
+#: all_languages.desktop:288
 msgid "Sotho, Southern"
 msgstr "Isi-Suthu, Sase-Mzantsi"
 
 #. Name
-#: all_languages.desktop:288
+#: all_languages.desktop:290
 msgid "Sundanese"
 msgstr "Isi-Sundanese"
 
 #. Name
-#: all_languages.desktop:290
+#: all_languages.desktop:292
 msgid "Swedish"
 msgstr "Isi-Swidishi"
 
 #. Name
-#: all_languages.desktop:292
+#: all_languages.desktop:294
 msgid "Swahili"
 msgstr "Isi-Swahili"
 
 #. Name
-#: all_languages.desktop:294
+#: all_languages.desktop:296
 msgid "Tamil"
 msgstr "Isi-Tamili"
 
 #. Name
-#: all_languages.desktop:296
+#: all_languages.desktop:298
 msgid "Telugu"
 msgstr "Isi-Telugu"
 
 #. Name
-#: all_languages.desktop:298
+#: all_languages.desktop:300
 msgid "Tajik"
 msgstr "Isi-Tajik"
 
 #. Name
-#: all_languages.desktop:300
+#: all_languages.desktop:302
 msgid "Thai"
 msgstr "Isi-Thayi"
 
 #. Name
-#: all_languages.desktop:302
+#: all_languages.desktop:304
 msgid "Tigrinya"
 msgstr "Isi-Tigrinya"
 
 #. Name
-#: all_languages.desktop:304
+#: all_languages.desktop:306
 msgid "Turkmen"
 msgstr "Amadoda Ase-Thekishi"
 
 #. Name
-#: all_languages.desktop:306
+#: all_languages.desktop:308
 msgid "Tswana"
 msgstr "Isi-Tswana"
 
 #. Name
-#: all_languages.desktop:308
+#: all_languages.desktop:310
 msgid "Tonga"
 msgstr "Isi-Tonga"
 
 #. Name
-#: all_languages.desktop:310
+#: all_languages.desktop:312
 msgid "Turkish"
 msgstr "Isi-Thekishi"
 
 #. Name
-#: all_languages.desktop:312
+#: all_languages.desktop:314
 msgid "Tsonga"
 msgstr "Isi-Tsonga"
 
 #. Name
-#: all_languages.desktop:314
+#: all_languages.desktop:316
 msgid "Tatar"
 msgstr "Isi-Tatar"
 
 #. Name
-#: all_languages.desktop:316
+#: all_languages.desktop:318
 msgid "Twi"
 msgstr "Isi-Twi"
 
 #. Name
-#: all_languages.desktop:318
+#: all_languages.desktop:320
 msgid "Tahitian"
 msgstr "Isi-Tahitian"
 
 #. Name
-#: all_languages.desktop:320
+#: all_languages.desktop:322
 msgid "Uighur"
 msgstr "Isi-Uighur"
 
 #. Name
-#: all_languages.desktop:322
+#: all_languages.desktop:324
 msgid "Ukrainian"
 msgstr "Isi-Ukraniyani"
 
 #. Name
-#: all_languages.desktop:324
+#: all_languages.desktop:326
 msgid "Urdu"
 msgstr "Isi-Urdu"
 
 #. Name
-#: all_languages.desktop:326
+#: all_languages.desktop:328
 msgid "Uzbek"
 msgstr "Isi-Uzbek"
 
 #. Name
-#: all_languages.desktop:328
+#: all_languages.desktop:330
 msgid "Uzbek (Cyrillic)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:330
+#: all_languages.desktop:332
 msgid "Venda"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:332
+#: all_languages.desktop:334
 msgid "Vietnamese"
 msgstr "Isi-Vietnamese"
 
 #. Name
-#: all_languages.desktop:334
+#: all_languages.desktop:336
 msgid "Volapük"
 msgstr "Isi-Volapük"
 
 #. Name
-#: all_languages.desktop:336
+#: all_languages.desktop:338
 msgid "Walloon"
 msgstr "Isi-Walloon"
 
 #. Name
-#: all_languages.desktop:338
+#: all_languages.desktop:340
 msgid "Wolof"
 msgstr "Isi-Wolof"
 
 #. Name
-#: all_languages.desktop:340
+#: all_languages.desktop:342
 msgid "Xhosa"
 msgstr "Isi-Xhosa"
 
 #. Name
-#: all_languages.desktop:342
+#: all_languages.desktop:344
 msgid "Yiddish"
 msgstr "Isi-Yidishi"
 
 #. Name
-#: all_languages.desktop:344
+#: all_languages.desktop:346
 msgid "Yoruba"
 msgstr "Isi-Yoruba"
 
 #. Name
-#: all_languages.desktop:346
+#: all_languages.desktop:348
 msgid "Zhuang"
 msgstr "Isi-Zhuang"
 
 #. Name
-#: all_languages.desktop:348
+#: all_languages.desktop:350
 msgid "Chinese"
 msgstr "Isi-Shayina"
 
 #. Name
-#: all_languages.desktop:350
-msgid "Chinese Simplified"
+#: all_languages.desktop:352
+msgid "Chinese (Simplified)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:352
+#: all_languages.desktop:354
 msgid "Chinese (Hong Kong)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:354
-msgid "Chinese Traditional"
+#: all_languages.desktop:356
+msgid "Chinese (Traditional)"
 msgstr ""
 
 #. Name
-#: all_languages.desktop:356
+#: all_languages.desktop:358
 msgid "Zulu"
 msgstr "Isi-Zulu"
diff --git a/translations/desktop_files/interfaces-desktops/tr.po b/translations/desktop_files/interfaces-desktops/tr.po
index fe0fe76ae..ebd4b5b5e 100644
--- a/translations/desktop_files/interfaces-desktops/tr.po
+++ b/translations/desktop_files/interfaces-desktops/tr.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Mehmet Dokuz <madanadam@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-02 14: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-03-02 13:11+0000\n"
+"Last-Translator: Mehmet Dokuz <madanadam@gmail.com>\n"
+"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/interfaces-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.11\n"
 
 #. Comment
 #: kspeech/dcoptexttospeech.desktop:5
@@ -64,6 +65,9 @@ msgid ""
 "TDE applications that provide text editing facilities should use this "
 "service."
 msgstr ""
+"Metin düzenleyici hizmeti, uygulamalara bir metin görüntüleyici ve "
+"düzenleyici sağlar. Metin düzenleme olanakları sağlayan TDE uygulamaları bu "
+"hizmeti kullanmalıdır."
 
 #. Comment
 #: tdetexteditor/tdetexteditor.desktop:6
diff --git a/translations/desktop_files/kmcop.desktop/it.po b/translations/desktop_files/kmcop.desktop/it.po
index 0fcc3ae2d..c17d31001 100644
--- a/translations/desktop_files/kmcop.desktop/it.po
+++ b/translations/desktop_files/kmcop.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-02 13: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-06-22 02:07+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/kmcop-kmcopdesktop/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.7\n"
 
 #. Name
 #: kmcop.desktop:3
 msgid "KMCOP"
-msgstr ""
+msgstr "KMCOP"
 
 #. Comment
 #: kmcop.desktop:4
diff --git a/translations/desktop_files/kmcop.desktop/ru.po b/translations/desktop_files/kmcop.desktop/ru.po
index e6e144265..8bf3f14fd 100644
--- a/translations/desktop_files/kmcop.desktop/ru.po
+++ b/translations/desktop_files/kmcop.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-02 13: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-01-12 18:00+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/kmcop-kmcopdesktop/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.4\n"
 
 #. Name
 #: kmcop.desktop:3
 msgid "KMCOP"
-msgstr ""
+msgstr "KMCOP"
 
 #. Comment
 #: kmcop.desktop:4
diff --git a/translations/desktop_files/knotify.desktop/it.po b/translations/desktop_files/knotify.desktop/it.po
index 8e6148da1..ee6f74eb5 100644
--- a/translations/desktop_files/knotify.desktop/it.po
+++ b/translations/desktop_files/knotify.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-02 13:55+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-22 02:07+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/knotify-knotifydesktop/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.7\n"
 
 #. Name
 #: knotify.desktop:3
 msgid "KNotify"
-msgstr ""
+msgstr "KNotify"
 
 #. Comment
 #: knotify.desktop:4
diff --git a/translations/desktop_files/knotify.desktop/ru.po b/translations/desktop_files/knotify.desktop/ru.po
index 3ee975529..23365d76a 100644
--- a/translations/desktop_files/knotify.desktop/ru.po
+++ b/translations/desktop_files/knotify.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>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-02 13:55+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-12 16:45+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/knotify-knotifydesktop/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
 #: knotify.desktop:3
@@ -24,4 +26,4 @@ msgstr "Системные сообщения"
 #. Comment
 #: knotify.desktop:4
 msgid "TDE Notification Daemon"
-msgstr "Системные сообщения TDE"
+msgstr "Демон уведомлений TDE"
diff --git a/translations/desktop_files/mimetypes/af.po b/translations/desktop_files/mimetypes/af.po
index d843db76d..e8528a20c 100644
--- a/translations/desktop_files/mimetypes/af.po
+++ b/translations/desktop_files/mimetypes/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Gesinkroniseerde Multimedia Integrasie Taal"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL Lêer"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Skrip (moontlik uitvoerbaar)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Uitvoerbare Lêer"
 
@@ -1400,6 +1405,13 @@ msgid "HTML Document"
 msgstr "HTML Dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 Dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Eenvoudig Teks Dokument"
diff --git a/translations/desktop_files/mimetypes/ar.po b/translations/desktop_files/mimetypes/ar.po
index 7ce56813a..4799e24af 100644
--- a/translations/desktop_files/mimetypes/ar.po
+++ b/translations/desktop_files/mimetypes/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -147,6 +147,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -564,7 +569,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "ملف قابل للتنفيذ"
 
@@ -1436,6 +1441,13 @@ msgid "HTML Document"
 msgstr "مستند HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "مستند Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "مستند نصي"
diff --git a/translations/desktop_files/mimetypes/az.po b/translations/desktop_files/mimetypes/az.po
index c757a0868..fe86b9d74 100644
--- a/translations/desktop_files/mimetypes/az.po
+++ b/translations/desktop_files/mimetypes/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Sinxron Multimediya Birləşdirmə Dili"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -563,7 +568,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "İcraçı Fayl"
 
@@ -1436,6 +1441,13 @@ msgid "HTML Document"
 msgstr "HTML Sənədi"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 Sənədi"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Xam Mətn Sənədi"
diff --git a/translations/desktop_files/mimetypes/be.po b/translations/desktop_files/mimetypes/be.po
index 74ca5fd3b..1c3e4bd0a 100644
--- a/translations/desktop_files/mimetypes/be.po
+++ b/translations/desktop_files/mimetypes/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Сінхранізаваная мова мультымедыйнай інтэграцыі SMIL"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Файл Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Сцэнар (магчыма, выканальны)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Выканальны файл"
 
@@ -1403,6 +1408,13 @@ msgid "HTML Document"
 msgstr "Дакумент HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Дакумент Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Просты тэкст"
diff --git a/translations/desktop_files/mimetypes/bg.po b/translations/desktop_files/mimetypes/bg.po
index 451b9a924..3c323e402 100644
--- a/translations/desktop_files/mimetypes/bg.po
+++ b/translations/desktop_files/mimetypes/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Синхронизиран мултимедиен език за интеграция (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Файл XUL на Мозила"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Скрипт (вероятно изпълним)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Изпълним файл"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "Уеб страница (HTML)"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Документ на Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Текстов файл"
diff --git a/translations/desktop_files/mimetypes/bn.po b/translations/desktop_files/mimetypes/bn.po
index 9983a2c01..33788a15d 100644
--- a/translations/desktop_files/mimetypes/bn.po
+++ b/translations/desktop_files/mimetypes/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "মোজিলা এক্স-ইউ-এল ফাইল"
@@ -549,7 +554,7 @@ msgid "Script (possibly executable)"
 msgstr "স্ক্রিপ্ট (সম্ভবত এক্সিকিউটেবল)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "এক্সিকিউটেবল ফাইল"
 
@@ -1409,6 +1414,13 @@ msgid "HTML Document"
 msgstr "এইচ-টি-এম-এল (HTML) নথী"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "কার্বন-১৪ নথী"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "প্লেইন টেক্সট নথী"
diff --git a/translations/desktop_files/mimetypes/br.po b/translations/desktop_files/mimetypes/br.po
index 93dc8fd35..70a66a577 100644
--- a/translations/desktop_files/mimetypes/br.po
+++ b/translations/desktop_files/mimetypes/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Areg enframmañ liesvedia goubredet"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Restr Mozilla XUL"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Urzhiaoueg (marteze ur sevenadus)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Restr sevenadus"
 
@@ -1404,6 +1409,13 @@ msgid "HTML Document"
 msgstr "Teul HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Teul Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Teul skrid eeun"
diff --git a/translations/desktop_files/mimetypes/bs.po b/translations/desktop_files/mimetypes/bs.po
index 90242bb1d..eb84716c7 100644
--- a/translations/desktop_files/mimetypes/bs.po
+++ b/translations/desktop_files/mimetypes/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL datoteka"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skripta (možda izvršiva)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Izvršna datoteka"
 
@@ -1401,6 +1406,13 @@ msgid "HTML Document"
 msgstr "HTML dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Dokument sa čistim tekstom"
diff --git a/translations/desktop_files/mimetypes/ca.po b/translations/desktop_files/mimetypes/ca.po
index 91765935f..f61886571 100644
--- a/translations/desktop_files/mimetypes/ca.po
+++ b/translations/desktop_files/mimetypes/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Llenguatge d'integració multimèdia sincronitzada"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Fitxer XUL de Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Guió (possiblement executable)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Fitxer executable"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "Document HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Document de Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Document de text pla"
diff --git a/translations/desktop_files/mimetypes/cs.po b/translations/desktop_files/mimetypes/cs.po
index ee9c813eb..d54838131 100644
--- a/translations/desktop_files/mimetypes/cs.po
+++ b/translations/desktop_files/mimetypes/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
-"PO-Revision-Date: 2020-08-22 23:31+0000\n"
+"POT-Creation-Date: 2023-06-30 18:14+0000\n"
+"PO-Revision-Date: 2023-07-02 17:55+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
 "tdelibs/mimetypes/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: all.desktop:4
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Jazyk pro integraci synchronizovaných multimédií"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr "Soubor ebuild pro Gentoo"
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Soubor Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (pravděpodobně spustitelný)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Spustitelný soubor"
 
@@ -1397,6 +1402,11 @@ msgid "HTML Document"
 msgstr "Dokument HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr "Dokument Markdown"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Prostý text"
diff --git a/translations/desktop_files/mimetypes/csb.po b/translations/desktop_files/mimetypes/csb.po
index d517f7a21..608198b70 100644
--- a/translations/desktop_files/mimetypes/csb.po
+++ b/translations/desktop_files/mimetypes/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Zsynchronizowóny Jãzëk Integracëji Mùltimediów"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Lopk XUL Mozilli"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (mòżlëwi że wëkònëwólny)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Programa"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "Dokùment HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokùment Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Tekstowi lopk"
diff --git a/translations/desktop_files/mimetypes/cy.po b/translations/desktop_files/mimetypes/cy.po
index 4a2d5ceb0..31c830fc8 100644
--- a/translations/desktop_files/mimetypes/cy.po
+++ b/translations/desktop_files/mimetypes/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Iaith Integreiddio Aml-gyfryngau wedi'i Chysoni (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -551,7 +556,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ffeil Gweithredadwy"
 
@@ -1417,6 +1422,13 @@ msgid "HTML Document"
 msgstr "Dogfen HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dogfen Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Dogfen Testun Plaen"
diff --git a/translations/desktop_files/mimetypes/da.po b/translations/desktop_files/mimetypes/da.po
index a3f2ec5fd..ebcbe14ed 100644
--- a/translations/desktop_files/mimetypes/da.po
+++ b/translations/desktop_files/mimetypes/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synkroniseret multimedie-integrationssprog"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fil"
@@ -550,7 +555,7 @@ msgid "Script (possibly executable)"
 msgstr "Script der muligvis kan udføres."
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Kørbar fil"
 
@@ -1401,6 +1406,13 @@ msgid "HTML Document"
 msgstr "HTML-dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Almindeligt tekstdokument"
diff --git a/translations/desktop_files/mimetypes/de.po b/translations/desktop_files/mimetypes/de.po
index f6325d69e..1caf47844 100644
--- a/translations/desktop_files/mimetypes/de.po
+++ b/translations/desktop_files/mimetypes/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchronisierte Multimedia-Integrationssprache"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-Datei"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (eventuell ausführbar)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ausführbare Datei"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "HTML-Dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-Dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Einfacher Text"
diff --git a/translations/desktop_files/mimetypes/el.po b/translations/desktop_files/mimetypes/el.po
index ecf467faa..76a596be0 100644
--- a/translations/desktop_files/mimetypes/el.po
+++ b/translations/desktop_files/mimetypes/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Συγχρονισμένη γλώσσα ενσωμάτωσης πολυμέσων"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Αρχείο Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Αρχείο εντολών κελύφους (πιθανόν εκτελέσιμο)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Εκτελέσιμο αρχείο"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "Έγγραφο HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Έγγραφο Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Έγγραφο απλού κειμένου"
diff --git a/translations/desktop_files/mimetypes/en_GB.po b/translations/desktop_files/mimetypes/en_GB.po
index d772373e9..8443a76d0 100644
--- a/translations/desktop_files/mimetypes/en_GB.po
+++ b/translations/desktop_files/mimetypes/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-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchronised Multimedia Integration Language"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -546,7 +551,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr ""
 
@@ -1398,6 +1403,11 @@ msgid "HTML Document"
 msgstr ""
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr ""
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr ""
diff --git a/translations/desktop_files/mimetypes/eo.po b/translations/desktop_files/mimetypes/eo.po
index d0aac7bb0..d2a279089 100644
--- a/translations/desktop_files/mimetypes/eo.po
+++ b/translations/desktop_files/mimetypes/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "SMIL"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL Dosiero"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Eble lanĉigebla skripto."
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Programo"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-dokumento"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokumento"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Plena teksto"
diff --git a/translations/desktop_files/mimetypes/es.po b/translations/desktop_files/mimetypes/es.po
index 8ce9385be..2e3e45796 100644
--- a/translations/desktop_files/mimetypes/es.po
+++ b/translations/desktop_files/mimetypes/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Lenguaje de integración multimedia sincronizada"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Archivo XUL de Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Procedimiento (probablemente ejecutable)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Archivo ejecutable"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "Documento HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Documento de Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Documento simple de texto"
diff --git a/translations/desktop_files/mimetypes/et.po b/translations/desktop_files/mimetypes/et.po
index 9ada67316..58561ff89 100644
--- a/translations/desktop_files/mimetypes/et.po
+++ b/translations/desktop_files/mimetypes/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Sünkroniseeritud Multimeedia Integreerimise Keel"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fail"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Käivitatav skript"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Käivitatav fail"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "HTML-dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Tavaline tekstifail"
diff --git a/translations/desktop_files/mimetypes/eu.po b/translations/desktop_files/mimetypes/eu.po
index d1eea51b0..1f68a8455 100644
--- a/translations/desktop_files/mimetypes/eu.po
+++ b/translations/desktop_files/mimetypes/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Sinkronizatutako Multimedia integrazioaren lengoaia"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL fitxategia"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (exekutagarria litekeena)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Fitxategi exekutagarria"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "HTML dokumentua"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokumentua"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Testu arrunt dokumentua"
diff --git a/translations/desktop_files/mimetypes/fa.po b/translations/desktop_files/mimetypes/fa.po
index 97f511ea2..eb8bce5fd 100644
--- a/translations/desktop_files/mimetypes/fa.po
+++ b/translations/desktop_files/mimetypes/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "زبان مجتمع‌سازی چند رسانه‌ای همگام‌شده"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "پروندۀ Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "دست‌نوشته( احتمالاً قابل اجرا)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "پروندۀ اجرایی"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "سند زنگام"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "سند Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "سند متن ساده"
diff --git a/translations/desktop_files/mimetypes/fi.po b/translations/desktop_files/mimetypes/fi.po
index 3cb6fa0e0..d63d11ca6 100644
--- a/translations/desktop_files/mimetypes/fi.po
+++ b/translations/desktop_files/mimetypes/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synkronoitu multimedianintergoimiskieli"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-tiedosto"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skripti (mahdollisesti suoritettava)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ohjelma"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-asiakirja"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-asiakirja"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Normaali tekstiasiakirja"
diff --git a/translations/desktop_files/mimetypes/fr.po b/translations/desktop_files/mimetypes/fr.po
index ccd1fce5b..e292b609b 100644
--- a/translations/desktop_files/mimetypes/fr.po
+++ b/translations/desktop_files/mimetypes/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Langage d'intégration multimédia synchronisée"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Fichier XUL Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (peut-être exécutable)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Fichier exécutable"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "Document HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Document Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Texte simple"
diff --git a/translations/desktop_files/mimetypes/fy.po b/translations/desktop_files/mimetypes/fy.po
index ffadd8609..3ffeea6e4 100644
--- a/translations/desktop_files/mimetypes/fy.po
+++ b/translations/desktop_files/mimetypes/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchronized Multimedia Integration Language (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL Triem"
@@ -550,7 +555,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (Wierskynlik útfierber)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Utfierber triem"
 
@@ -1410,6 +1415,13 @@ msgid "HTML Document"
 msgstr "HTML Dokumint"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokumint"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Gewoane tekst dokumint"
diff --git a/translations/desktop_files/mimetypes/ga.po b/translations/desktop_files/mimetypes/ga.po
index a0bd62bce..55299d0be 100644
--- a/translations/desktop_files/mimetypes/ga.po
+++ b/translations/desktop_files/mimetypes/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchronized Multimedia Integration Language (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Comhad Mozilla XUL"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (b'fhéidir inrite)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Comhad Inrite"
 
@@ -1403,6 +1408,13 @@ msgid "HTML Document"
 msgstr "Cáipéis HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Cáipéis Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Cáipéis Téacs Simplí"
diff --git a/translations/desktop_files/mimetypes/gl.po b/translations/desktop_files/mimetypes/gl.po
index 0d985f8b8..8bc34313b 100644
--- a/translations/desktop_files/mimetypes/gl.po
+++ b/translations/desktop_files/mimetypes/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Linguaxe de Integración de Multimedia Sincronizado"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Ficheiro XUL de Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Guión (posibelmente executábel)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ficheiro Executábel"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "Documento HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Documento de Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Documento de Texto en Plan"
diff --git a/translations/desktop_files/mimetypes/he.po b/translations/desktop_files/mimetypes/he.po
index 63c278ee8..42a6a0675 100644
--- a/translations/desktop_files/mimetypes/he.po
+++ b/translations/desktop_files/mimetypes/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "שפת שילוב מולטימדיה מסונכרנת"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "קובץ XUL של מוזילה"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "תסריט (כנראה כניתן להרצה)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "קובץ תוכנית"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "מסמך HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "מסמך Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "טקסט רגיל"
diff --git a/translations/desktop_files/mimetypes/hi.po b/translations/desktop_files/mimetypes/hi.po
index c2a56133a..b995a7992 100644
--- a/translations/desktop_files/mimetypes/hi.po
+++ b/translations/desktop_files/mimetypes/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "सिंक्रोनाइज्ड मल्टीमीडिया इंटीग्रेशन भाषा"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "मोज़िला एक्सयूएल फ़ाइल"
@@ -549,7 +554,7 @@ msgid "Script (possibly executable)"
 msgstr "स्क्रिप्ट (संभवतया चलाने योग्य)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "निष्पादक फ़ाइल"
 
@@ -1407,6 +1412,13 @@ msgid "HTML Document"
 msgstr "HTML दस्तावेज़ "
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "कारबन14 दस्तावेज़"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "सादा पाठ दस्तावेज़"
diff --git a/translations/desktop_files/mimetypes/hr.po b/translations/desktop_files/mimetypes/hr.po
index b1fa335d6..dc9b4c716 100644
--- a/translations/desktop_files/mimetypes/hr.po
+++ b/translations/desktop_files/mimetypes/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL datoteka"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skripta (vjerojatno izvršna datoteka)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Izvršna datoteka"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "HTML dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Običan tekstualni dokument"
diff --git a/translations/desktop_files/mimetypes/hu.po b/translations/desktop_files/mimetypes/hu.po
index dec9cf1d4..a028cf5df 100644
--- a/translations/desktop_files/mimetypes/hu.po
+++ b/translations/desktop_files/mimetypes/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Szinkronizált multimédiaintegrációs nyelv"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fájl"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Szkript (általában futtatható)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Programfájl"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-dokumentum"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokumentum"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Egyszerű szöveg"
diff --git a/translations/desktop_files/mimetypes/id.po b/translations/desktop_files/mimetypes/id.po
index 3c0aacc49..4724ef929 100644
--- a/translations/desktop_files/mimetypes/id.po
+++ b/translations/desktop_files/mimetypes/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Bahasa Integrasi Sinkronisasi Multimedia"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Berkas XUL Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skrip (mungkin dapat dieksekusi)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "File Dapat Dieksekusi"
 
@@ -1401,6 +1406,13 @@ msgid "HTML Document"
 msgstr "Dokumen HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokumen Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Dokumen Teks Murni"
diff --git a/translations/desktop_files/mimetypes/is.po b/translations/desktop_files/mimetypes/is.po
index 48e55d38c..689b05ab4 100644
--- a/translations/desktop_files/mimetypes/is.po
+++ b/translations/desktop_files/mimetypes/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "SMIL-skjal (Synchronized Multimedia Integration Language)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL skrá"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skeljaforrit (sem er ef til vill keyranlegt)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Keyrsluforrit"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "HTML skjal"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 skjal"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Textaskjal"
diff --git a/translations/desktop_files/mimetypes/it.po b/translations/desktop_files/mimetypes/it.po
index d594f5092..c8c1f368d 100644
--- a/translations/desktop_files/mimetypes/it.po
+++ b/translations/desktop_files/mimetypes/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>, 2021, 2022, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+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-30 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/tdelibs/mimetypes/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
 #: all.desktop:4
@@ -132,7 +133,7 @@ msgstr "Documento PostScript"
 #. Comment
 #: application/relaxng.desktop:2
 msgid "RELAX NG"
-msgstr ""
+msgstr "RELAX NG"
 
 #. Comment
 #: application/sieve.desktop:5
@@ -145,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Linguaggio d'integrazione multimediale sincronizzata"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr "File ebuild di Gentoo"
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "File XUL Mozilla"
@@ -212,9 +218,8 @@ msgstr "Diagramma OASIS OpenDocument"
 
 #. Comment
 #: application/vnd.oasis.opendocument.database.desktop:6
-#, fuzzy
 msgid "OASIS OpenDocument Database"
-msgstr "Diagramma OASIS OpenDocument"
+msgstr "Database OASIS OpenDocument"
 
 #. Comment
 #: application/vnd.oasis.opendocument.formula.desktop:6
@@ -539,7 +544,7 @@ msgstr "File TeX DVI"
 #. Comment
 #: application/x-egon.desktop:6
 msgid "Egon Animator"
-msgstr ""
+msgstr "Animatore Egon"
 
 #. Comment
 #: application/x-executable-script.desktop:2
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (eventualmente eseguibile)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "File eseguibile"
 
@@ -784,7 +789,7 @@ msgstr "Documento Microsoft Write"
 #. Comment
 #: application/x-nzb.desktop:3
 msgid "NewzBin Usenet Index"
-msgstr ""
+msgstr "Indice Usenet NewzBin"
 
 #. Comment
 #: application/x-object.desktop:6
@@ -1149,7 +1154,7 @@ msgstr "Audio WAV"
 #. Comment
 #: image/cgm.desktop:6
 msgid "Computer Graphics Metafile"
-msgstr ""
+msgstr "Metafile Computer Graphics"
 
 #. Comment
 #: image/fax-g3.desktop:6
@@ -1339,12 +1344,12 @@ msgstr "Cartella"
 #. Comment
 #: inode/fifo.desktop:2
 msgid "Pipe"
-msgstr ""
+msgstr "Concatena in pipe"
 
 #. Comment
 #: inode/socket.desktop:2
 msgid "Socket"
-msgstr ""
+msgstr "Socket"
 
 #. Comment
 #: message/news.desktop:6
@@ -1397,6 +1402,11 @@ msgid "HTML Document"
 msgstr "Documento HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr "Documento Markdown"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Documento di testo semplice"
@@ -1504,7 +1514,7 @@ msgstr "File di registro di un'applicazione"
 #. Comment
 #: text/x-makefile.desktop:3
 msgid "Makefile"
-msgstr ""
+msgstr "Makefile"
 
 #. Comment
 #: text/x-moc.desktop:3
@@ -1564,32 +1574,32 @@ msgstr "Foglio di stile XSLT"
 #. Comment
 #: uri/mms.desktop:5
 msgid "mms: URIs"
-msgstr "URI mms:"
+msgstr "URI mms"
 
 #. Comment
 #: uri/mmst.desktop:5
 msgid "mmst: URIs"
-msgstr "URI mmst:"
+msgstr "URI mmst"
 
 #. Comment
 #: uri/mmsu.desktop:5
 msgid "mmsu: URIs"
-msgstr "URI mmsu:"
+msgstr "URI mmsu"
 
 #. Comment
 #: uri/pnm.desktop:5
 msgid "pnm: URIs"
-msgstr "URI pnm:"
+msgstr "URI pnm"
 
 #. Comment
 #: uri/rtspt.desktop:5
 msgid "rtspt: URIs"
-msgstr "URI rtspt:"
+msgstr "URI rtspt"
 
 #. Comment
 #: uri/rtspu.desktop:5
 msgid "rtspu: URIs"
-msgstr "URI rtspu:"
+msgstr "URI rtspu"
 
 #. Comment
 #: video/avi.desktop:7 video/x-msvideo.desktop:6
diff --git a/translations/desktop_files/mimetypes/ja.po b/translations/desktop_files/mimetypes/ja.po
index ff7607750..c20304904 100644
--- a/translations/desktop_files/mimetypes/ja.po
+++ b/translations/desktop_files/mimetypes/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "同期マルチメディア統合言語"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL ファイル"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "スクリプト (おそらく実行可能)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "実行ファイル"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "HTML ドキュメント"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 ドキュメント"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "プレーンテキストドキュメント"
diff --git a/translations/desktop_files/mimetypes/ka.po b/translations/desktop_files/mimetypes/ka.po
index 0b535c65a..a11507057 100644
--- a/translations/desktop_files/mimetypes/ka.po
+++ b/translations/desktop_files/mimetypes/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "სინქრონიზებული მულტიმედია ინტეგრირების ენა"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL ფაილი"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "სკრიპტი (შესაძლოა პროგრამული)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "პროგრამა"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML დოკუმენტი"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 დოკუმენტი"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "ჩვეულებრივი ტექსტური დოკუმენტი"
diff --git a/translations/desktop_files/mimetypes/kk.po b/translations/desktop_files/mimetypes/kk.po
index 38079f26b..06b478b52 100644
--- a/translations/desktop_files/mimetypes/kk.po
+++ b/translations/desktop_files/mimetypes/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL файлы"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Скрипт (орындалатыны мүмкін)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Орындалатын файл"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML құжаты"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 құжаты"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Жай мәтін құжаты"
diff --git a/translations/desktop_files/mimetypes/km.po b/translations/desktop_files/mimetypes/km.po
index 6d5a3b7c4..2f88717d5 100644
--- a/translations/desktop_files/mimetypes/km.po
+++ b/translations/desktop_files/mimetypes/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "ភាសា​សមាហរណកម្មពហុព័ត៌មាន​ដែល​បាន​ធ្វើ​សមកាលកម្ម"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "ឯកសារ Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "ស្គ្រីប (អាច​ប្រតិបត្តិ​បាន)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "ឯកសារ​ប្រតិបត្តិ"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "ឯកសារ HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "ឯកសារ Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "ឯកសារ​អត្ថបទ​ធម្មតា"
diff --git a/translations/desktop_files/mimetypes/ko.po b/translations/desktop_files/mimetypes/ko.po
index 32ba9b374..fe9f9f2af 100644
--- a/translations/desktop_files/mimetypes/ko.po
+++ b/translations/desktop_files/mimetypes/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "동기화된 멀티미디어 통합 언어"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -558,7 +563,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "실행 파일"
 
@@ -1435,6 +1440,13 @@ msgid "HTML Document"
 msgstr "HTML 문서"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 문서"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "보통 글월 문서"
diff --git a/translations/desktop_files/mimetypes/lb.po b/translations/desktop_files/mimetypes/lb.po
index dde03a93a..e8f2ab0f3 100644
--- a/translations/desktop_files/mimetypes/lb.po
+++ b/translations/desktop_files/mimetypes/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchroniséiert Multimedia-Integratiounssprooch"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla-XUL-Datei"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (eventuell ausféierbar)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ausféierbar Datei"
 
@@ -1400,6 +1405,13 @@ msgid "HTML Document"
 msgstr "HTML-Dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-Dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Einfachen Text"
diff --git a/translations/desktop_files/mimetypes/lt.po b/translations/desktop_files/mimetypes/lt.po
index b3ad3845c..a07f5082d 100644
--- a/translations/desktop_files/mimetypes/lt.po
+++ b/translations/desktop_files/mimetypes/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Sinchronizuota daugialypės terpės integravimo kalba"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL byla"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Scenarijus (gal būt - vykdomoji byla)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Vykdoma byla"
 
@@ -1402,6 +1407,13 @@ msgid "HTML Document"
 msgstr "HTML dokumentas"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokumentas"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Paprasto teksto dokumentas"
diff --git a/translations/desktop_files/mimetypes/lv.po b/translations/desktop_files/mimetypes/lv.po
index 400bd7c34..9ae645ea6 100644
--- a/translations/desktop_files/mimetypes/lv.po
+++ b/translations/desktop_files/mimetypes/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Sinhronizēta Multimēdiju Integrācijas Valoda"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL fails"
@@ -550,7 +555,7 @@ msgid "Script (possibly executable)"
 msgstr "Skripts (iespējams, ka izpildāms)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Izpildāms fails"
 
@@ -1415,6 +1420,13 @@ msgid "HTML Document"
 msgstr "HTML dokuments"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 Dokuments"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Atklāta teksta dokuments"
diff --git a/translations/desktop_files/mimetypes/mi.po b/translations/desktop_files/mimetypes/mi.po
index a1d22391a..600f4f66a 100644
--- a/translations/desktop_files/mimetypes/mi.po
+++ b/translations/desktop_files/mimetypes/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -148,6 +148,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -565,7 +570,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr ""
 
@@ -1455,6 +1460,12 @@ msgid "HTML Document"
 msgstr ""
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+msgid "Markdown document"
+msgstr "Konae PostScript"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/mimetypes.pot b/translations/desktop_files/mimetypes/mimetypes.pot
index 53ecb8255..e2dc8755d 100644
--- a/translations/desktop_files/mimetypes/mimetypes.pot
+++ b/translations/desktop_files/mimetypes/mimetypes.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -57,22 +57,19 @@ msgid "MBOX Mail Folder"
 msgstr ""
 
 #. Comment
-#: application/msexcel.desktop:7
-#: application/vnd.ms-excel.desktop:6
+#: application/msexcel.desktop:7 application/vnd.ms-excel.desktop:6
 #: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop:6
 msgid "Microsoft Excel Spreadsheet"
 msgstr ""
 
 #. Comment
-#: application/mspowerpoint.desktop:7
-#: application/vnd.ms-powerpoint.desktop:6
+#: application/mspowerpoint.desktop:7 application/vnd.ms-powerpoint.desktop:6
 #: application/vnd.openxmlformats-officedocument.presentationml.presentation.desktop:6
 msgid "Microsoft PowerPoint Presentation"
 msgstr ""
 
 #. Comment
-#: application/msword.desktop:8
-#: application/vnd.ms-word.desktop:6
+#: application/msword.desktop:8 application/vnd.ms-word.desktop:6
 #: application/vnd.openxmlformats-officedocument.wordprocessingml.document.desktop:6
 msgid "Microsoft Word Document"
 msgstr ""
@@ -148,13 +145,17 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
 
 #. Comment
-#: application/vnd.ms-access.desktop:5
-#: application/x-msaccess.desktop:6
+#: application/vnd.ms-access.desktop:5 application/x-msaccess.desktop:6
 msgid "Microsoft Access Database"
 msgstr ""
 
@@ -520,8 +521,7 @@ msgid "dBASE Document"
 msgstr ""
 
 #. Comment
-#: application/x-deb.desktop:6
-#: application/x-debian-package.desktop:7
+#: application/x-deb.desktop:6 application/x-debian-package.desktop:7
 msgid "Debian Package"
 msgstr ""
 
@@ -551,7 +551,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr ""
 
@@ -661,8 +661,7 @@ msgid "Java Web Start application"
 msgstr ""
 
 #. Comment
-#: application/x-javascript.desktop:6
-#: text/javascript.desktop:5
+#: application/x-javascript.desktop:6 text/javascript.desktop:5
 msgid "JavaScript File"
 msgstr ""
 
@@ -862,8 +861,7 @@ msgid "Shared Library"
 msgstr ""
 
 #. Comment
-#: application/x-shellscript.desktop:2
-#: text/x-shellscript.desktop:2
+#: application/x-shellscript.desktop:2 text/x-shellscript.desktop:2
 msgid "Shell Script"
 msgstr ""
 
@@ -1068,8 +1066,7 @@ msgid "C64 SID Music"
 msgstr ""
 
 #. Comment
-#: audio/vnd.rn-realaudio.desktop:7
-#: audio/x-pn-realaudio.desktop:5
+#: audio/vnd.rn-realaudio.desktop:7 audio/x-pn-realaudio.desktop:5
 msgid "RealAudio File"
 msgstr ""
 
@@ -1404,6 +1401,11 @@ msgid "HTML Document"
 msgstr ""
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr ""
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr ""
diff --git a/translations/desktop_files/mimetypes/mk.po b/translations/desktop_files/mimetypes/mk.po
index f9aa42147..995a0928a 100644
--- a/translations/desktop_files/mimetypes/mk.po
+++ b/translations/desktop_files/mimetypes/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Јазик за синхронизирано интегрирање на мултимедија"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-датотека"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Скрипта (можно да е извршна)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Извршна датотека"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-документ"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-документ"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Обичен текст"
diff --git a/translations/desktop_files/mimetypes/mn.po b/translations/desktop_files/mimetypes/mn.po
index 85828e3ed..7ec820a1d 100644
--- a/translations/desktop_files/mimetypes/mn.po
+++ b/translations/desktop_files/mimetypes/mn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Синхрончилсон Multimedia-интеграци хэл"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -563,7 +568,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Программ"
 
@@ -1435,6 +1440,13 @@ msgid "HTML Document"
 msgstr "HTML Баримт"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-Баримт"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Энгийн текст баримт"
diff --git a/translations/desktop_files/mimetypes/ms.po b/translations/desktop_files/mimetypes/ms.po
index fc28b41e8..60103735e 100644
--- a/translations/desktop_files/mimetypes/ms.po
+++ b/translations/desktop_files/mimetypes/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Bahasa Multimedia Bersepadu Diseragamkan (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Fail Mozilla XUL"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Skrip (mungkin boleh laksana)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Fail Boleh Laksana"
 
@@ -1400,6 +1405,13 @@ msgid "HTML Document"
 msgstr "Dokumen HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokumen Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Dokumen Teks Kosong"
diff --git a/translations/desktop_files/mimetypes/mt.po b/translations/desktop_files/mimetypes/mt.po
index 67403407a..1eabd4d66 100644
--- a/translations/desktop_files/mimetypes/mt.po
+++ b/translations/desktop_files/mimetypes/mt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Lingwa Multimedia Integrata Sinkronizzata (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -572,7 +577,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Programm"
 
@@ -1463,6 +1468,13 @@ msgid "HTML Document"
 msgstr "Dokument WML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokument Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/nb.po b/translations/desktop_files/mimetypes/nb.po
index a284bb55b..50f6bb3b0 100644
--- a/translations/desktop_files/mimetypes/nb.po
+++ b/translations/desktop_files/mimetypes/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synkronisert integrasjonsspråk for multimedia"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fil"
@@ -549,7 +554,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (kan kanskje kjøres)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Program"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "HTML-dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Rent tekstdokument"
diff --git a/translations/desktop_files/mimetypes/nds.po b/translations/desktop_files/mimetypes/nds.po
index b37bedb32..264f2664e 100644
--- a/translations/desktop_files/mimetypes/nds.po
+++ b/translations/desktop_files/mimetypes/nds.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "XUL-Datei vun Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (villicht utföhrbor)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Utföhrbor Datei"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-Dokment"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-Dokment"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Eenfach Textdokment"
diff --git a/translations/desktop_files/mimetypes/ne.po b/translations/desktop_files/mimetypes/ne.po
index e9f61e772..e9cd1fd0c 100644
--- a/translations/desktop_files/mimetypes/ne.po
+++ b/translations/desktop_files/mimetypes/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "समक्रमण गरिएका मल्टिमेडिया अनुकूलन भाषा"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "मोजिला XUL फाइल"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "स्क्रिप्ट (सम्भावित कार्यान्वयनयोग्य)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "कार्यान्वयनयोग्य फाइल"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML कागजात"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "कार्बन १४ कागजात"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "सादा पाठ कागजात"
diff --git a/translations/desktop_files/mimetypes/nl.po b/translations/desktop_files/mimetypes/nl.po
index c32e288d7..644fe4ab9 100644
--- a/translations/desktop_files/mimetypes/nl.po
+++ b/translations/desktop_files/mimetypes/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchronized Multimedia Integration Language (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-bestand"
@@ -553,7 +558,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (mogelijk uitvoerbaar)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Uitvoerbaar bestand"
 
@@ -1404,6 +1409,13 @@ msgid "HTML Document"
 msgstr "HTML-document"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-document"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Platte tekst-document"
diff --git a/translations/desktop_files/mimetypes/nn.po b/translations/desktop_files/mimetypes/nn.po
index 3ea140448..db7904818 100644
--- a/translations/desktop_files/mimetypes/nn.po
+++ b/translations/desktop_files/mimetypes/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fil"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (kan kanskje køyrast)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Køyrbar fil"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Reint tekstdokument"
diff --git a/translations/desktop_files/mimetypes/nso.po b/translations/desktop_files/mimetypes/nso.po
index 89b1b3356..ff505fab7 100644
--- a/translations/desktop_files/mimetypes/nso.po
+++ b/translations/desktop_files/mimetypes/nso.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -150,6 +150,11 @@ msgstr ""
 "Leleme leo le Sumiswago ka nako etee la Bokagare bja Media wa Bontshintshi"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -576,7 +581,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Faele yeo e Phethagatsegago"
 
@@ -1467,6 +1472,13 @@ msgid "HTML Document"
 msgstr "Tokomane ya WML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Tokomane ya Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/oc.po b/translations/desktop_files/mimetypes/oc.po
index 07a149151..d18b18964 100644
--- a/translations/desktop_files/mimetypes/oc.po
+++ b/translations/desktop_files/mimetypes/oc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -148,6 +148,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Linguage d'integracion multimèdia sincronizat"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -566,7 +571,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr ""
 
@@ -1459,6 +1464,12 @@ msgid "HTML Document"
 msgstr ""
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+msgid "Markdown document"
+msgstr "Document PostScript"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/pa.po b/translations/desktop_files/mimetypes/pa.po
index f3a514849..b14337f78 100644
--- a/translations/desktop_files/mimetypes/pa.po
+++ b/translations/desktop_files/mimetypes/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "ਮੌਜੀਲਾ XUL ਫਾਇਲ"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "ਸਕ੍ਰਿਪਟ (ਸੰਭਵ ਤੌਰ ਤੇ ਚੱਲਣਯੋਗ)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "ਚੱਲਣਯੋਗ ਫਾਇਲ"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "HTML ਦਸਤਾਵੇਜ਼"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 ਦਸਤਾਵੇਜ਼"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "ਇਕਸਾਰ ਪਾਠ ਦਸਤਾਵੇਜ਼"
diff --git a/translations/desktop_files/mimetypes/pl.po b/translations/desktop_files/mimetypes/pl.po
index b98590c25..e17318a4c 100644
--- a/translations/desktop_files/mimetypes/pl.po
+++ b/translations/desktop_files/mimetypes/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>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+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-30 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/tdelibs/mimetypes/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: all.desktop:4
@@ -145,6 +147,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Zsynchronizowany Język Integracji Multimediów"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr "Plik ebuild Gentoo"
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Plik XUL Mozilli"
@@ -212,9 +219,8 @@ msgstr "Dokument wykresu OASIS OpenDocument"
 
 #. Comment
 #: application/vnd.oasis.opendocument.database.desktop:6
-#, fuzzy
 msgid "OASIS OpenDocument Database"
-msgstr "Dokument wykresu OASIS OpenDocument"
+msgstr "Baza danych OASIS OpenDocument"
 
 #. Comment
 #: application/vnd.oasis.opendocument.formula.desktop:6
@@ -547,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Skrypt (być może wykonywalny)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Program"
 
@@ -1397,6 +1403,11 @@ msgid "HTML Document"
 msgstr "Dokument HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr "Dokument Markdown"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Plik tekstowy"
diff --git a/translations/desktop_files/mimetypes/pt.po b/translations/desktop_files/mimetypes/pt.po
index 51d3423fd..4d9b0913b 100644
--- a/translations/desktop_files/mimetypes/pt.po
+++ b/translations/desktop_files/mimetypes/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Ficheiro XUL do Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "'Script' (possivelmente executável)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ficheiro Executável"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "Documento em HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Documento do Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Documento em Texto Simples"
diff --git a/translations/desktop_files/mimetypes/pt_BR.po b/translations/desktop_files/mimetypes/pt_BR.po
index f2dbe0839..00280f02e 100644
--- a/translations/desktop_files/mimetypes/pt_BR.po
+++ b/translations/desktop_files/mimetypes/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-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Linguagem de integração de multimídia sincronizada"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Arquivo XUL do Mozilla"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Script que é provavelmente executável"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Executável"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "Documento HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Documento do Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Documento de Texto Puro"
diff --git a/translations/desktop_files/mimetypes/ro.po b/translations/desktop_files/mimetypes/ro.po
index d38ac671a..67bd9a2f6 100644
--- a/translations/desktop_files/mimetypes/ro.po
+++ b/translations/desktop_files/mimetypes/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Limbaj de integrare multimedia sincronizat (SMIL)"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Fişier XUL Mozilla"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (care ar putea fi executat)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Fişier executabil"
 
@@ -1400,6 +1405,13 @@ msgid "HTML Document"
 msgstr "Document HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Document Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Document text simplu"
diff --git a/translations/desktop_files/mimetypes/ru.po b/translations/desktop_files/mimetypes/ru.po
index 9444fb7f6..56ee833ad 100644
--- a/translations/desktop_files/mimetypes/ru.po
+++ b/translations/desktop_files/mimetypes/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.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+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-30 18:14+0000\n"
+"PO-Revision-Date: 2023-07-23 18:16+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/mimetypes/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
 #: all.desktop:4
@@ -132,7 +135,7 @@ msgstr "Документ PostScript"
 #. Comment
 #: application/relaxng.desktop:2
 msgid "RELAX NG"
-msgstr ""
+msgstr "RELAX NG"
 
 #. Comment
 #: application/sieve.desktop:5
@@ -142,7 +145,12 @@ msgstr "Скрипт почтового фильтра SIEVE"
 #. Comment
 #: application/smil.desktop:6
 msgid "Synchronized Multimedia Integration Language"
-msgstr ""
+msgstr "Синхронизированный язык интеграции мультимедиа (SMIL)"
+
+#. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr "Файл Gentoo ebuild"
 
 #. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
@@ -212,9 +220,8 @@ msgstr "Диаграмма OASIS OpenDocument"
 
 #. Comment
 #: application/vnd.oasis.opendocument.database.desktop:6
-#, fuzzy
 msgid "OASIS OpenDocument Database"
-msgstr "Диаграмма OASIS OpenDocument"
+msgstr "База данных OASIS OpenDocument"
 
 #. Comment
 #: application/vnd.oasis.opendocument.formula.desktop:6
@@ -547,7 +554,7 @@ msgid "Script (possibly executable)"
 msgstr "Сценарий (возможно исполняемый)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Приложение"
 
@@ -784,7 +791,7 @@ msgstr "Документ Microsoft Write"
 #. Comment
 #: application/x-nzb.desktop:3
 msgid "NewzBin Usenet Index"
-msgstr ""
+msgstr "Usenet-индекс NewzBin"
 
 #. Comment
 #: application/x-object.desktop:6
@@ -1397,6 +1404,11 @@ msgid "HTML Document"
 msgstr "Документ HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr "Документ Markdown"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Обычный текст"
@@ -1504,7 +1516,7 @@ msgstr "Журнал работы программы"
 #. Comment
 #: text/x-makefile.desktop:3
 msgid "Makefile"
-msgstr ""
+msgstr "Makefile"
 
 #. Comment
 #: text/x-moc.desktop:3
diff --git a/translations/desktop_files/mimetypes/rw.po b/translations/desktop_files/mimetypes/rw.po
index e34a8fea6..cfe938941 100644
--- a/translations/desktop_files/mimetypes/rw.po
+++ b/translations/desktop_files/mimetypes/rw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Ururimi rw'Ikorana-bindi Mutwaramakuru Ruringaniye"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL Idosiye"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Agaporogaramu (mu buryo bushoboka gatangizwa)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Idosiye Itangizwa"
 
@@ -1408,6 +1413,13 @@ msgid "HTML Document"
 msgstr "HTML Inyandiko"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 Inyandiko"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Inyandiko Mwandiko Itunganye"
diff --git a/translations/desktop_files/mimetypes/se.po b/translations/desktop_files/mimetypes/se.po
index 3ad0d1f89..0ceaf73ed 100644
--- a/translations/desktop_files/mimetypes/se.po
+++ b/translations/desktop_files/mimetypes/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synkroniserejuvvon multimedia integrerengiella"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fiila"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skripta (dáidá leat vuolggahahtti)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Vuolggahahtti fiila"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "HTML-dokumeanta"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokumeanta"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Čabu teakstadokumeanta"
diff --git a/translations/desktop_files/mimetypes/sk.po b/translations/desktop_files/mimetypes/sk.po
index 57f1fc394..0f595d7a1 100644
--- a/translations/desktop_files/mimetypes/sk.po
+++ b/translations/desktop_files/mimetypes/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synchronizovaný Multimediálny Integrujúci jazyk"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Súbor Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (možno spustiteľný)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Spustiteľný súbor"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "HTML dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokument darbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Jednoduchý textový dokument"
diff --git a/translations/desktop_files/mimetypes/sl.po b/translations/desktop_files/mimetypes/sl.po
index c97dfa144..2479c96ad 100644
--- a/translations/desktop_files/mimetypes/sl.po
+++ b/translations/desktop_files/mimetypes/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Jezik za usklajeno vključitev večpredstavnosti"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Datoteka Mozilla XUL"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (verjetno izvedljiv)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Izvedljivi program"
 
@@ -1398,6 +1403,13 @@ msgid "HTML Document"
 msgstr "Dokument HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokument za Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Navaden besedilni dokument"
diff --git a/translations/desktop_files/mimetypes/sq.po b/translations/desktop_files/mimetypes/sq.po
index 687e78443..3d2992095 100644
--- a/translations/desktop_files/mimetypes/sq.po
+++ b/translations/desktop_files/mimetypes/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Gjuhë për Integrimin e Multimediave të Sinkronizuara"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -563,7 +568,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Skedë Ekzekutuese"
 
@@ -1451,6 +1456,13 @@ msgid "HTML Document"
 msgstr "HTML Dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Dokument nga Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Dokument Teksti të thjeshtë"
diff --git a/translations/desktop_files/mimetypes/sr.po b/translations/desktop_files/mimetypes/sr.po
index dd36310e7..fc10f039c 100644
--- a/translations/desktop_files/mimetypes/sr.po
+++ b/translations/desktop_files/mimetypes/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Синхронизовани мултимедијални језик за интеграцију"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL фајл"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Скрипта (можда извршна)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Извршни фајл"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML документ"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 документ"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Обични текстуални документ"
diff --git a/translations/desktop_files/mimetypes/sr@Latn.po b/translations/desktop_files/mimetypes/sr@Latn.po
index f6f63e3e2..0d4754650 100644
--- a/translations/desktop_files/mimetypes/sr@Latn.po
+++ b/translations/desktop_files/mimetypes/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-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Sinhronizovani multimedijalni jezik za integraciju"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL fajl"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skripta (možda izvršna)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Izvršni fajl"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Obični tekstualni dokument"
diff --git a/translations/desktop_files/mimetypes/ss.po b/translations/desktop_files/mimetypes/ss.po
index 2fc92f29d..7fa44eb1c 100644
--- a/translations/desktop_files/mimetypes/ss.po
+++ b/translations/desktop_files/mimetypes/ss.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -152,6 +152,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -565,7 +570,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 #, fuzzy
 msgid "Executable File"
 msgstr "Lifayela le Tcl "
@@ -1457,6 +1462,13 @@ msgid "HTML Document"
 msgstr "Lidokhumente le WML "
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Lidokhumente le Karbon14 "
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/sv.po b/translations/desktop_files/mimetypes/sv.po
index e719bd54d..db84470e8 100644
--- a/translations/desktop_files/mimetypes/sv.po
+++ b/translations/desktop_files/mimetypes/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Synkroniserat integrationsspråk för multimedia"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fil"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Skript (möjligen körbart)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Körbar fil"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML-dokument"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14-dokument"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Vanligt textdokument"
diff --git a/translations/desktop_files/mimetypes/ta.po b/translations/desktop_files/mimetypes/ta.po
index bc0491c78..e1f876a2c 100644
--- a/translations/desktop_files/mimetypes/ta.po
+++ b/translations/desktop_files/mimetypes/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "மோசில்லா XUL ஆவணம்"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "சிறுநிரல் (இயக்க முடிந்த)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "செயலிக் கோப்பு"
 
@@ -1407,6 +1412,13 @@ msgid "HTML Document"
 msgstr "HTML ஆவணம்"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 ஆவணம்"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "இயல்பான உரை ஆவணம்"
diff --git a/translations/desktop_files/mimetypes/te.po b/translations/desktop_files/mimetypes/te.po
index 5d2b9976e..c8587d9c0 100644
--- a/translations/desktop_files/mimetypes/te.po
+++ b/translations/desktop_files/mimetypes/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "సింక్రొనైజ్ చేయబడిన బహుళ మాద్యమ ఏకీకరణ భాష"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "మోజిల్ల XUL దస్త్రం"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "స్క్రిప్ట్ (కార్యక్రమం కావచ్చు)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "కార్యక్రమపు దస్త్రం"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML పత్రం"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "కార్బన్౧౪ పత్రం"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "సాదా వాచక పత్రం"
diff --git a/translations/desktop_files/mimetypes/tg.po b/translations/desktop_files/mimetypes/tg.po
index 4c933dc88..28f8a7a19 100644
--- a/translations/desktop_files/mimetypes/tg.po
+++ b/translations/desktop_files/mimetypes/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Забони такмили Мултимедияи ҳамоҳанг"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Файли Mozilla XUL "
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Скрипт (мумкин аст, ки ба кор бурда бошад)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Барнома"
 
@@ -1401,6 +1406,13 @@ msgid "HTML Document"
 msgstr "Хуҷҷати HTML "
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Ҳуҷҷати Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Хуҷҷати Матни Содда"
diff --git a/translations/desktop_files/mimetypes/th.po b/translations/desktop_files/mimetypes/th.po
index aa5047d15..add717679 100644
--- a/translations/desktop_files/mimetypes/th.po
+++ b/translations/desktop_files/mimetypes/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "ภาษาSynchronized Multimedia Integration"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "แฟ้ม XULของมอซิลลา"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "สคริปต์ (อาจจะประมวลผลได้)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "แฟ้มประมวลผลได้"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "เอกสาร HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "เอกสารของ Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "เอกสารข้อความธรรมดา"
diff --git a/translations/desktop_files/mimetypes/tr.po b/translations/desktop_files/mimetypes/tr.po
index fe8cff10d..eddab3b1b 100644
--- a/translations/desktop_files/mimetypes/tr.po
+++ b/translations/desktop_files/mimetypes/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Senkronize Çoklu ortam Birleştirme Dili"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL Dosyası"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Betik (çalıştırılabilir)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Çalıştırılabilir Dosya"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML Belgesi"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 Belgesi"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Düz Metin Dosya"
diff --git a/translations/desktop_files/mimetypes/tt.po b/translations/desktop_files/mimetypes/tt.po
index 984702ee9..e97e9bc82 100644
--- a/translations/desktop_files/mimetypes/tt.po
+++ b/translations/desktop_files/mimetypes/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL Bireme"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Ämerlek (eşçän buluı bar)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Eşçän Birem"
 
@@ -1406,6 +1411,13 @@ msgid "HTML Document"
 msgstr "HTML İstälek"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 İstälege"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Taqır Mäten İstälege"
diff --git a/translations/desktop_files/mimetypes/uk.po b/translations/desktop_files/mimetypes/uk.po
index 92450ce4e..987f8fea3 100644
--- a/translations/desktop_files/mimetypes/uk.po
+++ b/translations/desktop_files/mimetypes/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, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
-"PO-Revision-Date: 2020-07-21 13:31+0000\n"
+"POT-Creation-Date: 2023-06-30 18:14+0000\n"
+"PO-Revision-Date: 2023-11-01 14:13+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdelibs/mimetypes/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"
 
 #. Comment
 #: all.desktop:4
@@ -147,6 +147,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Мова для синхронного спілкування мультимедіа"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr "Файл Gentoo ebuild"
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Файл Mozilla XUL"
@@ -548,7 +553,7 @@ msgid "Script (possibly executable)"
 msgstr "Скрипт, який, можливо, можна виконати"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Програма"
 
@@ -890,7 +895,7 @@ msgstr "Архів Tar"
 #. Comment
 #: application/x-tarz.desktop:3
 msgid "Compressed Tar Archive"
-msgstr "Стиснутий архів tar"
+msgstr "Стиснутий Tar Архів"
 
 #. Comment
 #: application/x-tbz.desktop:2
@@ -920,17 +925,17 @@ msgstr "Документ TGIF"
 #. Comment
 #: application/x-tgz.desktop:6
 msgid "Gzipped Tar Archive"
-msgstr "Архів tar стиснутий gzip"
+msgstr "Архів Tar, стиснутий GZip"
 
 #. Comment
 #: application/x-tlz.desktop:7
 msgid "LZIP Tar Archive"
-msgstr "Архів tar стиснутий gzip"
+msgstr "Архів Tar, стиснутий LZip"
 
 #. Comment
 #: application/x-tlzma.desktop:7
 msgid "LZMA Tar Archive"
-msgstr "Архів tar стиснутий gzip"
+msgstr "Архів Tar, стиснутий LZMA"
 
 #. Comment
 #: application/x-trash.desktop:6
@@ -950,12 +955,12 @@ msgstr "Документ Troff"
 #. Comment
 #: application/x-txz.desktop:6
 msgid "Xzipped Tar Archive"
-msgstr "Архів tar стиснутий gzip"
+msgstr "Архів Tar, стиснутий XZip"
 
 #. Comment
 #: application/x-tzo.desktop:3
 msgid "Lzopped Tar Archive"
-msgstr "Архів tar стиснутий lzop"
+msgstr "Архів Tar, стиснутий LZop"
 
 #. Comment
 #: application/x-vnd.kde.kexi.desktop:7
@@ -1398,6 +1403,11 @@ msgid "HTML Document"
 msgstr "Документ HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+msgid "Markdown document"
+msgstr "Документ Markdown"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Звичайний текст"
diff --git a/translations/desktop_files/mimetypes/uz.po b/translations/desktop_files/mimetypes/uz.po
index 8e5c22dd2..994c6bbf9 100644
--- a/translations/desktop_files/mimetypes/uz.po
+++ b/translations/desktop_files/mimetypes/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "SMI tili"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-fayli"
@@ -550,7 +555,7 @@ msgid "Script (possibly executable)"
 msgstr "Ehtimol ishga tushirib boʻladigan skript"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ishga tushirib boʻladigan fayl"
 
@@ -1401,6 +1406,13 @@ msgid "HTML Document"
 msgstr "HTML hujjati"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 hujjati"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Oddiy matn fayli"
diff --git a/translations/desktop_files/mimetypes/uz@cyrillic.po b/translations/desktop_files/mimetypes/uz@cyrillic.po
index 8198af507..67efbd13d 100644
--- a/translations/desktop_files/mimetypes/uz@cyrillic.po
+++ b/translations/desktop_files/mimetypes/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-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "SMI тили"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL-файли"
@@ -550,7 +555,7 @@ msgid "Script (possibly executable)"
 msgstr "Эҳтимол ишга тушириб бўладиган скрипт"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ишга тушириб бўладиган файл"
 
@@ -1401,6 +1406,13 @@ msgid "HTML Document"
 msgstr "HTML ҳужжати"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 ҳужжати"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Оддий матн файли"
diff --git a/translations/desktop_files/mimetypes/ven.po b/translations/desktop_files/mimetypes/ven.po
index 3af6e8194..dcf082baf 100644
--- a/translations/desktop_files/mimetypes/ven.po
+++ b/translations/desktop_files/mimetypes/ven.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Luambo lwo tangananaho lwa zwishumiswa zwa vhudavhidzani"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -575,7 +580,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Faela ino tumulea"
 
@@ -1465,6 +1470,13 @@ msgid "HTML Document"
 msgstr "Manwalwa a WML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Manwalwa a Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/vi.po b/translations/desktop_files/mimetypes/vi.po
index 36bf1826a..1c7a2daf6 100644
--- a/translations/desktop_files/mimetypes/vi.po
+++ b/translations/desktop_files/mimetypes/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Ngôn ngữ hợp nhất đa phương tiện đã đồng bộ."
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Tài liệu XUL Mozilla."
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "Tập lệnh (có lẽ có khả năng thực hiện)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Tập tin có khả năng thực hiện"
 
@@ -1399,6 +1404,13 @@ msgid "HTML Document"
 msgstr "Tài liệu HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Tài liệu Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Tài liệu văn bản thô"
diff --git a/translations/desktop_files/mimetypes/wa.po b/translations/desktop_files/mimetypes/wa.po
index 8baab229d..0549cc1e6 100644
--- a/translations/desktop_files/mimetypes/wa.po
+++ b/translations/desktop_files/mimetypes/wa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -146,6 +146,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr ""
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -565,7 +570,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Fitchî enondåve"
 
@@ -1440,6 +1445,13 @@ msgid "HTML Document"
 msgstr "Documint HTML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Documint Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "Documint e peur tecse"
diff --git a/translations/desktop_files/mimetypes/xh.po b/translations/desktop_files/mimetypes/xh.po
index 557bf33eb..08d42f981 100644
--- a/translations/desktop_files/mimetypes/xh.po
+++ b/translations/desktop_files/mimetypes/xh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Ulwimi oluhamba ngendlela enye lodityaniso lwe Multimedia"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -578,7 +583,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ifayile Ephumezekayo"
 
@@ -1469,6 +1474,13 @@ msgid "HTML Document"
 msgstr "Uxwebhu lwe WML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Uxwebhu lwe Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/mimetypes/zh_CN.po b/translations/desktop_files/mimetypes/zh_CN.po
index fc22e0e4b..491f60403 100644
--- a/translations/desktop_files/mimetypes/zh_CN.po
+++ b/translations/desktop_files/mimetypes/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-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "同步多媒体集成语言"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL 文件"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "脚本(可能可执行)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "可执行文件"
 
@@ -1397,6 +1402,13 @@ msgid "HTML Document"
 msgstr "HTML 文档"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 文档"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "纯文本文档"
diff --git a/translations/desktop_files/mimetypes/zh_HK.po b/translations/desktop_files/mimetypes/zh_HK.po
index 606f825a0..172bbc0d7 100644
--- a/translations/desktop_files/mimetypes/zh_HK.po
+++ b/translations/desktop_files/mimetypes/zh_HK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "同步多媒體整合式語言"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL 檔案"
@@ -553,7 +558,7 @@ msgid "Script (possibly executable)"
 msgstr "Script (可能是可執行檔)"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "可執行檔"
 
@@ -1410,6 +1415,13 @@ msgid "HTML Document"
 msgstr "HTML 文件"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 文件"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "純文字檔案"
diff --git a/translations/desktop_files/mimetypes/zh_TW.po b/translations/desktop_files/mimetypes/zh_TW.po
index 1ffc9666c..84b7994f5 100644
--- a/translations/desktop_files/mimetypes/zh_TW.po
+++ b/translations/desktop_files/mimetypes/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-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -145,6 +145,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "同步多媒體整合式語言"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr "Mozilla XUL 檔案"
@@ -547,7 +552,7 @@ msgid "Script (possibly executable)"
 msgstr "文稿（可能可執行）"
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "可執行檔"
 
@@ -1402,6 +1407,13 @@ msgid "HTML Document"
 msgstr "HTML 文件"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Karbon14 文件"
+
+#. Comment
 #: text/plain.desktop:3
 msgid "Plain Text Document"
 msgstr "純文字檔案"
diff --git a/translations/desktop_files/mimetypes/zu.po b/translations/desktop_files/mimetypes/zu.po
index 860f9f2fb..08b4af3b9 100644
--- a/translations/desktop_files/mimetypes/zu.po
+++ b/translations/desktop_files/mimetypes/zu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-02 16:07+0200\n"
+"POT-Creation-Date: 2023-06-30 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"
@@ -149,6 +149,11 @@ msgid "Synchronized Multimedia Integration Language"
 msgstr "Ukuqoqelwa ndawonye Kolimi Lwabasiki bebunda Abahambiswa ndawonye"
 
 #. Comment
+#: application/vnd.gentoo.ebuild.desktop:3
+msgid "Gentoo ebuild file"
+msgstr ""
+
+#. Comment
 #: application/vnd.mozilla.xul+xml.desktop:7
 msgid "Mozilla XUL File"
 msgstr ""
@@ -576,7 +581,7 @@ msgid "Script (possibly executable)"
 msgstr ""
 
 #. Comment
-#: application/x-executable.desktop:2
+#: application/x-executable.desktop:2 application/x-pie-executable.desktop:2
 msgid "Executable File"
 msgstr "Ifayela Eliphumelelisekayo"
 
@@ -1467,6 +1472,13 @@ msgid "HTML Document"
 msgstr "Uhlu lwamafayela lwe-WML"
 
 #. Comment
+#: text/markdown.desktop:2
+#, fuzzy
+#| msgid "Karbon14 Document"
+msgid "Markdown document"
+msgstr "Uhlu lwamafayela lwe-Karbon14"
+
+#. Comment
 #: text/plain.desktop:3
 #, fuzzy
 msgid "Plain Text Document"
diff --git a/translations/desktop_files/networkstatus.desktop/ru.po b/translations/desktop_files/networkstatus.desktop/ru.po
index eeaa6e42c..36a46e2de 100644
--- a/translations/desktop_files/networkstatus.desktop/ru.po
+++ b/translations/desktop_files/networkstatus.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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-01-21 09:11+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/networkstatusdesktop/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.4.2\n"
 
 #. Name
 #: networkstatus.desktop:2
 msgid "Network Status Daemon"
-msgstr "Служба состояния сети"
+msgstr "Демон состояния сети"
 
 #. Comment
 #: networkstatus.desktop:3
diff --git a/translations/desktop_files/tdeabc-desktops/bg.po b/translations/desktop_files/tdeabc-desktops/bg.po
index 8d4c2cfa9..9d801ab9d 100644
--- a/translations/desktop_files/tdeabc-desktops/bg.po
+++ b/translations/desktop_files/tdeabc-desktops/bg.po
@@ -1,20 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Emanoil Kotsev <deloptes@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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: 2021-01-26 00:00+0000\n"
+"Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
+"Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdeabc-desktop-files/bg/>\n"
 "Language: bg\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.4.2\n"
 
 #. Name
 #: formats/binary.desktop:2
@@ -24,32 +25,32 @@ msgstr "Двоичен"
 #. Name
 #: plugins/dir/dir.desktop:2
 msgid "Directory"
-msgstr ""
+msgstr "Директория"
 
 #. Name
 #: plugins/evolution/evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. Name
 #: plugins/file/file.desktop:2
 msgid "File"
-msgstr ""
+msgstr "файл"
 
 #. Name
 #: plugins/ldaptdeio/ldaptdeio.desktop:2
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #. Name
 #: plugins/net/net.desktop:2
 msgid "Network"
-msgstr ""
+msgstr "Мрежа"
 
 #. Name
 #: plugins/sql/sql.desktop:2
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. Name
 #: tdeab2tdeabc.desktop:2
@@ -64,4 +65,4 @@ msgstr "Програма за конвертиране на libkab до libtdeab
 #. Name
 #: tdeabc_manager.desktop:2
 msgid "Contacts"
-msgstr ""
+msgstr "Контакти"
diff --git a/translations/desktop_files/tdeabc-desktops/el.po b/translations/desktop_files/tdeabc-desktops/el.po
index 40f4018e2..3229e9a25 100644
--- a/translations/desktop_files/tdeabc-desktops/el.po
+++ b/translations/desktop_files/tdeabc-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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: 2021-01-09 14:00+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Greek <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdelibs/tdeabc-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.4\n"
 
 #. Name
 #: formats/binary.desktop:2
@@ -29,7 +30,7 @@ msgstr "Κατάλογος"
 #. Name
 #: plugins/evolution/evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. Name
 #: plugins/file/file.desktop:2
@@ -39,7 +40,7 @@ msgstr "Αρχείο"
 #. Name
 #: plugins/ldaptdeio/ldaptdeio.desktop:2
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #. Name
 #: plugins/net/net.desktop:2
@@ -49,12 +50,12 @@ msgstr "Δίκτυο"
 #. Name
 #: plugins/sql/sql.desktop:2
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. Name
 #: tdeab2tdeabc.desktop:2
 msgid "tdeab2tdeabc"
-msgstr ""
+msgstr "tdeab2tdeabc"
 
 #. Comment
 #: tdeab2tdeabc.desktop:3
diff --git a/translations/desktop_files/tdeabc-desktops/it.po b/translations/desktop_files/tdeabc-desktops/it.po
index 3858d0d14..d6b4c0deb 100644
--- a/translations/desktop_files/tdeabc-desktops/it.po
+++ b/translations/desktop_files/tdeabc-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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: 2021-06-30 15:14+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdeabc-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.7.1\n"
 
 #. Name
 #: formats/binary.desktop:2
@@ -29,17 +30,17 @@ msgstr "Cartella"
 #. Name
 #: plugins/evolution/evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. Name
 #: plugins/file/file.desktop:2
 msgid "File"
-msgstr ""
+msgstr "File"
 
 #. Name
 #: plugins/ldaptdeio/ldaptdeio.desktop:2
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #. Name
 #: plugins/net/net.desktop:2
@@ -49,7 +50,7 @@ msgstr "Rete"
 #. Name
 #: plugins/sql/sql.desktop:2
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. Name
 #: tdeab2tdeabc.desktop:2
diff --git a/translations/desktop_files/tdeabc-desktops/ru.po b/translations/desktop_files/tdeabc-desktops/ru.po
index 1c04c922f..ebb2ead14 100644
--- a/translations/desktop_files/tdeabc-desktops/ru.po
+++ b/translations/desktop_files/tdeabc-desktops/ru.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.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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: 2021-01-09 14:00+0000\n"
+"Last-Translator: blu.256 <mavridisf@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdeabc-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.4\n"
 
 #. Name
 #: formats/binary.desktop:2
@@ -29,7 +31,7 @@ msgstr "Каталог"
 #. Name
 #: plugins/evolution/evolution.desktop:2
 msgid "Evolution"
-msgstr ""
+msgstr "Evolution"
 
 #. Name
 #: plugins/file/file.desktop:2
@@ -39,7 +41,7 @@ msgstr "Файл"
 #. Name
 #: plugins/ldaptdeio/ldaptdeio.desktop:2
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #. Name
 #: plugins/net/net.desktop:2
@@ -49,12 +51,12 @@ msgstr "Сеть"
 #. Name
 #: plugins/sql/sql.desktop:2
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. Name
 #: tdeab2tdeabc.desktop:2
 msgid "tdeab2tdeabc"
-msgstr ""
+msgstr "tdeab2tdeabc"
 
 #. Comment
 #: tdeab2tdeabc.desktop:3
diff --git a/translations/desktop_files/tdecertpart.desktop/it.po b/translations/desktop_files/tdecertpart.desktop/it.po
index f4dbfc8ca..bee9c7664 100644
--- a/translations/desktop_files/tdecertpart.desktop/it.po
+++ b/translations/desktop_files/tdecertpart.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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: 2021-07-02 02:13+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdecertpartdesktop/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.7.1\n"
 
 #. Name
 #: tdecertpart.desktop:3
 msgid "KCertPart"
-msgstr ""
+msgstr "KCertPart"
 
 #. Comment
 #: tdecertpart.desktop:4
diff --git a/translations/desktop_files/tdecertpart.desktop/ru.po b/translations/desktop_files/tdecertpart.desktop/ru.po
index 05a974a5e..7feaddb2a 100644
--- a/translations/desktop_files/tdecertpart.desktop/ru.po
+++ b/translations/desktop_files/tdecertpart.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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 19: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: 2021-01-12 18:00+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdecertpartdesktop/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.4\n"
 
 #. Name
 #: tdecertpart.desktop:3
 msgid "KCertPart"
-msgstr ""
+msgstr "KCertPart"
 
 #. Comment
 #: tdecertpart.desktop:4
diff --git a/translations/desktop_files/tdecore-eventsrc/ru.po b/translations/desktop_files/tdecore-eventsrc/ru.po
index 46add6f05..dcdce701a 100644
--- a/translations/desktop_files/tdecore-eventsrc/ru.po
+++ b/translations/desktop_files/tdecore-eventsrc/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>, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 20:06+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-10 03:01+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdecore-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
@@ -39,7 +41,7 @@ msgstr "Автозавершение: поворот"
 #. Comment
 #: eventsrc:12
 msgid "The end of the list of matches has been reached"
-msgstr "Достигнут конец списка совпадений."
+msgstr "Достигнут конец списка совпадений"
 
 #. Name
 #: eventsrc:16
@@ -49,7 +51,7 @@ msgstr "Автозавершение: нет совпадений"
 #. Comment
 #: eventsrc:17
 msgid "No matching completion was found"
-msgstr "Не найдено совпадений."
+msgstr "Не найдено совпадений"
 
 #. Name
 #: eventsrc:21
@@ -59,7 +61,7 @@ msgstr "Автозавершение: частичное совпадение"
 #. Comment
 #: eventsrc:22
 msgid "There is more than one possible match"
-msgstr "Найдено более чем одно совпадение."
+msgstr "Найдено более чем одно совпадение"
 
 #. Name
 #: eventsrc:26
@@ -74,12 +76,12 @@ msgstr "Не удаётся открыть выбранный файл для з
 #. Name
 #: eventsrc:31
 msgid "Fatal Error"
-msgstr "Фатальная ошибка"
+msgstr "Критическая ошибка"
 
 #. Comment
 #: eventsrc:32
 msgid "There was a serious error causing the program to exit"
-msgstr "Серьёзный сбой, приведший к выходу из программы."
+msgstr "Серьёзный сбой, приведший к выходу из программы"
 
 #. Name
 #: eventsrc:37
diff --git a/translations/desktop_files/tdehtml-desktops/cs.po b/translations/desktop_files/tdehtml-desktops/cs.po
index 3a54af99a..81566a03d 100644
--- a/translations/desktop_files/tdehtml-desktops/cs.po
+++ b/translations/desktop_files/tdehtml-desktops/cs.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# Slávek Banko <slavek.banko@axis.cz>, 2020.
+# Slávek Banko <slavek.banko@axis.cz>, 2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 20:19+0200\n"
-"PO-Revision-Date: 2020-08-16 19:10+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/"
 "tdelibs/tdehtml-desktop-files/cs/>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1.1\n"
+"X-Generator: Weblate 4.10\n"
 
 #. Name
 #: java/kjavaappletviewer.desktop:3
@@ -45,4 +45,4 @@ msgstr "Zabudovatelná komponenta pro zobrazování obrázků"
 #. Name
 #: tdemultipart/tdemultipart.desktop:3
 msgid "Embeddable Component for multipart/mixed"
-msgstr "Zabudovatelná komponenta pro typ ‚multipart/mixed‘"
+msgstr "Zabudovatelná komponenta pro typ „multipart/mixed“"
diff --git a/translations/desktop_files/tdehtml-desktops/it.po b/translations/desktop_files/tdehtml-desktops/it.po
index 3f2977cce..12eadad8d 100644
--- a/translations/desktop_files/tdehtml-desktops/it.po
+++ b/translations/desktop_files/tdehtml-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 20: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: 2021-07-02 02:13+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdehtml-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.7.1\n"
 
 #. Name
 #: java/kjavaappletviewer.desktop:3
@@ -24,7 +25,7 @@ msgstr "Visualizzatore integrato di applet Java"
 #. Name
 #: tdehtml.desktop:3
 msgid "TDEHTML"
-msgstr ""
+msgstr "TDEHTML"
 
 #. Comment
 #: tdehtml.desktop:4
diff --git a/translations/desktop_files/tdehtml-desktops/ru.po b/translations/desktop_files/tdehtml-desktops/ru.po
index 676f0391b..02a9190f4 100644
--- a/translations/desktop_files/tdehtml-desktops/ru.po
+++ b/translations/desktop_files/tdehtml-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 20: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: 2021-01-12 18:00+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdehtml-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.4\n"
 
 #. Name
 #: java/kjavaappletviewer.desktop:3
@@ -24,7 +26,7 @@ msgstr "Встраиваемый модуль просмотра аплетов
 #. Name
 #: tdehtml.desktop:3
 msgid "TDEHTML"
-msgstr ""
+msgstr "TDEHTML"
 
 #. Comment
 #: tdehtml.desktop:4
diff --git a/translations/desktop_files/tdeio-desktops/it.po b/translations/desktop_files/tdeio-desktops/it.po
index 8f66da7d3..9d04c03fa 100644
--- a/translations/desktop_files/tdeio-desktops/it.po
+++ b/translations/desktop_files/tdeio-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 21: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"
+"PO-Revision-Date: 2021-07-12 12:13+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdeio-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.7.1\n"
 
 #. Name
 #: application.desktop:4
@@ -44,7 +45,7 @@ msgstr "Supporto per la memorizzazione temporanea delle password"
 #. Name
 #: kscan.desktop:4
 msgid "KScan"
-msgstr ""
+msgstr "KScan"
 
 #. Name
 #: kurifilterplugin.desktop:4
@@ -74,7 +75,7 @@ msgstr "Modulo demone KSSL per KDED"
 #. Name
 #: misc/tdeio_uiserver.desktop:4
 msgid "tdeio_uiserver"
-msgstr ""
+msgstr "tdeio_uiserver"
 
 #. Comment
 #: misc/tdeio_uiserver.desktop:5
diff --git a/translations/desktop_files/tdeio-desktops/ru.po b/translations/desktop_files/tdeio-desktops/ru.po
index 9f9602161..221e2cfa9 100644
--- a/translations/desktop_files/tdeio-desktops/ru.po
+++ b/translations/desktop_files/tdeio-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.
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 21: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"
+"PO-Revision-Date: 2024-04-12 16:45+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdeio-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
 #: application.desktop:4
@@ -74,7 +77,7 @@ msgstr "Управление сертификатами SSL"
 #. Name
 #: misc/tdeio_uiserver.desktop:4
 msgid "tdeio_uiserver"
-msgstr ""
+msgstr "tdeio_uiserver"
 
 #. Comment
 #: misc/tdeio_uiserver.desktop:5
@@ -84,12 +87,12 @@ msgstr "Сервер монитора передачи данных TDE"
 #. Name
 #: misc/tdewalletd/tdewalletd.desktop:9
 msgid "TDEWallet Daemon Module"
-msgstr "Служба бумажника"
+msgstr "Модуль демона TDEWallet"
 
 #. Comment
 #: misc/tdewalletd/tdewalletd.desktop:10
 msgid "TDEWallet daemon module for KDED"
-msgstr "Управление бумажником TDE"
+msgstr "Модуль демона TDEWallet для KDED"
 
 #. Comment
 #: renamedlgplugin.desktop:4
diff --git a/translations/desktop_files/tdeioslave-desktops/it.po b/translations/desktop_files/tdeioslave-desktops/it.po
index 1700e7fd3..d17906000 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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 21:43+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-07-12 12:13+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/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.7.1\n"
 
 #. Name
 #: bzip2/kbzip2filter.desktop:3
@@ -50,12 +51,12 @@ msgstr "Tiene traccia di tutti i cookie del sistema"
 #. Comment
 #: iso/isoservice.desktop:7 iso/isoservice.desktop:8
 msgid "ISO9660 View"
-msgstr ""
+msgstr "Vista ISO9660"
 
 #. Name
 #: iso/tdeio_iso.desktop:3
 msgid "ISO9660 Image Viewer"
-msgstr ""
+msgstr "Visualizzatore immagini ISO9660"
 
 #. Name
 #: xz/kxzfilter.desktop:3
@@ -65,4 +66,4 @@ msgstr "Filtro XZ"
 #. Description
 #: iso/iso.protocol:10
 msgid "A tdeioslave for ISO9660 filesystems"
-msgstr ""
+msgstr "Un tdeioslave per filesystem ISO9660"
diff --git a/translations/desktop_files/tdeioslave-desktops/ru.po b/translations/desktop_files/tdeioslave-desktops/ru.po
index f8b53f532..f8e0f0783 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
+# Alexander Golubev <fatzer2@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-03 21:43+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-12 18:00+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/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.4\n"
 
 #. Name
 #: bzip2/kbzip2filter.desktop:3
@@ -50,12 +52,12 @@ msgstr "Управление закладками-cookie в KDED"
 #. Comment
 #: iso/isoservice.desktop:7 iso/isoservice.desktop:8
 msgid "ISO9660 View"
-msgstr ""
+msgstr "Просмотр ISO9660"
 
 #. Name
 #: iso/tdeio_iso.desktop:3
 msgid "ISO9660 Image Viewer"
-msgstr ""
+msgstr "Просмотр образов ISO9660"
 
 #. Name
 #: xz/kxzfilter.desktop:3
@@ -65,4 +67,4 @@ msgstr "Фильтр XZ"
 #. Description
 #: iso/iso.protocol:10
 msgid "A tdeioslave for ISO9660 filesystems"
-msgstr ""
+msgstr "tdeioslave для файловой системы ISO9660"
diff --git a/translations/desktop_files/tdemarkdown-desktops/cs.po b/translations/desktop_files/tdemarkdown-desktops/cs.po
new file mode 100644
index 000000000..e9337ea1b
--- /dev/null
+++ b/translations/desktop_files/tdemarkdown-desktops/cs.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Slávek Banko <slavek.banko@axis.cz>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-04-15 14:26+0200\n"
+"PO-Revision-Date: 2022-04-19 23:20+0000\n"
+"Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
+"Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
+"tdelibs/tdemarkdown-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.11.2\n"
+
+#. Name
+#: markdown_part.desktop:2
+msgid "Markdown Viewer"
+msgstr "Prohlížeč Markdown"
+
+#. Comment
+#: markdown_part.desktop:4
+msgid "Embeddable lightweight markdown viewing component"
+msgstr "Zabudovatelná nenáročná komponenta pro zobrazování Markdown"
diff --git a/translations/desktop_files/tdemarkdown-desktops/it.po b/translations/desktop_files/tdemarkdown-desktops/it.po
new file mode 100644
index 000000000..9782bc561
--- /dev/null
+++ b/translations/desktop_files/tdemarkdown-desktops/it.po
@@ -0,0 +1,28 @@
+# 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: 2022-04-15 14:26+0200\n"
+"PO-Revision-Date: 2022-04-21 11:21+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdemarkdown-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
+#: markdown_part.desktop:2
+msgid "Markdown Viewer"
+msgstr "Visualizzatore di file Markdown"
+
+#. Comment
+#: markdown_part.desktop:4
+msgid "Embeddable lightweight markdown viewing component"
+msgstr "Componente incorporabile per la visualizzazione di file markdown"
diff --git a/translations/desktop_files/tdemarkdown-desktops/ru.po b/translations/desktop_files/tdemarkdown-desktops/ru.po
new file mode 100644
index 000000000..97412f683
--- /dev/null
+++ b/translations/desktop_files/tdemarkdown-desktops/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: 2022-04-15 14:26+0200\n"
+"PO-Revision-Date: 2023-06-04 17:55+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdemarkdown-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
+#: markdown_part.desktop:2
+msgid "Markdown Viewer"
+msgstr "Просмотрщик Markdown"
+
+#. Comment
+#: markdown_part.desktop:4
+msgid "Embeddable lightweight markdown viewing component"
+msgstr "Встраиваемый лёгкий компонент просмотра разметки"
diff --git a/translations/desktop_files/tdemarkdown-desktops/tdemarkdown-desktops.pot b/translations/desktop_files/tdemarkdown-desktops/tdemarkdown-desktops.pot
new file mode 100644
index 000000000..4825c35bc
--- /dev/null
+++ b/translations/desktop_files/tdemarkdown-desktops/tdemarkdown-desktops.pot
@@ -0,0 +1,27 @@
+# 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: 2022-04-15 14:26+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Name
+#: markdown_part.desktop:2
+msgid "Markdown Viewer"
+msgstr ""
+
+#. Comment
+#: markdown_part.desktop:4
+msgid "Embeddable lightweight markdown viewing component"
+msgstr ""
diff --git a/translations/desktop_files/tdemarkdown-desktops/uk.po b/translations/desktop_files/tdemarkdown-desktops/uk.po
new file mode 100644
index 000000000..2570ee13b
--- /dev/null
+++ b/translations/desktop_files/tdemarkdown-desktops/uk.po
@@ -0,0 +1,29 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# Roman Savochenko <roman@oscada.org>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-04-15 14:26+0200\n"
+"PO-Revision-Date: 2022-04-24 16:20+0000\n"
+"Last-Translator: Roman Savochenko <roman@oscada.org>\n"
+"Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdemarkdown-desktop-files/uk/>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.11.2\n"
+
+#. Name
+#: markdown_part.desktop:2
+msgid "Markdown Viewer"
+msgstr "Markdown Переглядач"
+
+#. Comment
+#: markdown_part.desktop:4
+msgid "Embeddable lightweight markdown viewing component"
+msgstr "Вбудовуваний легкий компонент перегляду markdown"
diff --git a/translations/desktop_files/tdeprint-desktops/it.po b/translations/desktop_files/tdeprint-desktops/it.po
index affc9d884..b8724d2cc 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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-04 16: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"
+"PO-Revision-Date: 2021-07-28 06:14+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/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.7.2\n"
 
 #. Name
 #: filters/enscript.desktop:2
 msgid "enscript"
-msgstr ""
+msgstr "enscript"
 
 #. Comment
 #: filters/enscript.desktop:4
@@ -29,7 +30,7 @@ msgstr "Filtro di testi Enscript"
 #. Name
 #: filters/imagetops.desktop:2
 msgid "imagetops"
-msgstr ""
+msgstr "imagetops"
 
 #. Comment
 #: filters/imagetops.desktop:4
@@ -39,7 +40,7 @@ msgstr "Filtro generico da immagine a PostScript"
 #. Name
 #: filters/pdf2ps.desktop:2
 msgid "pdf2ps"
-msgstr ""
+msgstr "pdf2ps"
 
 #. Comment
 #: filters/pdf2ps.desktop:4
@@ -49,7 +50,7 @@ msgstr "Convertitore da PDF a PostScript"
 #. Name
 #: filters/pdfwrite.desktop:2
 msgid "pdfwrite"
-msgstr ""
+msgstr "pdfwrite"
 
 #. Comment
 #: filters/pdfwrite.desktop:4
@@ -79,7 +80,7 @@ msgstr ""
 #. Name
 #: filters/ps2pdf.desktop:2
 msgid "ps2pdf"
-msgstr ""
+msgstr "ps2pdf"
 
 #. Comment
 #: filters/ps2pdf.desktop:4
@@ -89,7 +90,7 @@ msgstr "Convertitore da PostScript a PDF"
 #. Name
 #: filters/psbook.desktop:2
 msgid "psbook"
-msgstr ""
+msgstr "psbook"
 
 #. Comment
 #: filters/psbook.desktop:4
@@ -99,7 +100,7 @@ msgstr "Stampa libretto (da usare con la stampa fronte/retro dal lato corto)"
 #. Name
 #: filters/psbook1.desktop:2
 msgid "psbook1"
-msgstr ""
+msgstr "psbook1"
 
 #. Comment
 #: filters/psbook1.desktop:4
@@ -109,7 +110,7 @@ msgstr "Stampa libretto - pagine pari (passo 1)"
 #. Name
 #: filters/psbook2.desktop:2
 msgid "psbook2"
-msgstr ""
+msgstr "psbook2"
 
 #. Comment
 #: filters/psbook2.desktop:4
@@ -119,7 +120,7 @@ msgstr "Stampa libretto - pagine dispari (passo 2)"
 #. Name
 #: filters/psnup.desktop:2
 msgid "psnup"
-msgstr ""
+msgstr "psnup"
 
 #. Comment
 #: filters/psnup.desktop:4
@@ -129,7 +130,7 @@ msgstr "Più pagine sullo stesso foglio"
 #. Name
 #: filters/psresize.desktop:2
 msgid "psresize"
-msgstr ""
+msgstr "psresize"
 
 #. Comment
 #: filters/psresize.desktop:4
@@ -139,7 +140,7 @@ msgstr "Adatta il contenuto della stampa ad una diversa dimensione della carta"
 #. Name
 #: filters/psselect.desktop:2
 msgid "psselect"
-msgstr ""
+msgstr "psselect"
 
 #. Comment
 #: filters/psselect.desktop:4
@@ -203,9 +204,8 @@ msgstr "Spedisci file PDF"
 
 #. Comment
 #: specials.desktop:48
-#, fuzzy
 msgid "KSendFax"
-msgstr "Invia al fax"
+msgstr "KSendFax"
 
 #. Description
 #: specials.desktop:49
@@ -230,12 +230,12 @@ msgstr "Demone di stampa per TDE"
 #. Name
 #: tools/escputil/escputil.desktop:2
 msgid "EPSON InkJet"
-msgstr ""
+msgstr "EPSON InkJet"
 
 #. Comment
 #: cups/cups.print:3
 msgid "CUPS (Common UNIX Print System)"
-msgstr ""
+msgstr "CUPS (Sistema di stampa UNIX comune)"
 
 #. Comment
 #: ext/ext.print:3
@@ -245,7 +245,7 @@ msgstr "Stampa attraverso un programma esterno (generico)"
 #. Comment
 #: foomatic/foomatic.print:3
 msgid "Foomatic (CUPS, LPRng, PDQ)"
-msgstr ""
+msgstr "Foomatic (CUPS, LPRng, PDQ)"
 
 #. Comment
 #: lpd/lpd.print:3
diff --git a/translations/desktop_files/tdeprint-desktops/ru.po b/translations/desktop_files/tdeprint-desktops/ru.po
index 7b8f5d632..4acf84c0a 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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-04 16: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"
+"PO-Revision-Date: 2021-01-21 09:11+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/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.4.2\n"
 
 #. Name
 #: filters/enscript.desktop:2
 msgid "enscript"
-msgstr ""
+msgstr "enscript"
 
 #. Comment
 #: filters/enscript.desktop:4
@@ -29,7 +31,7 @@ msgstr "Фильтр текста Enscript"
 #. Name
 #: filters/imagetops.desktop:2
 msgid "imagetops"
-msgstr ""
+msgstr "imagetops"
 
 #. Comment
 #: filters/imagetops.desktop:4
@@ -39,7 +41,7 @@ msgstr "Преобразование изображений в PostScript"
 #. Name
 #: filters/pdf2ps.desktop:2
 msgid "pdf2ps"
-msgstr ""
+msgstr "pdf2ps"
 
 #. Comment
 #: filters/pdf2ps.desktop:4
@@ -49,7 +51,7 @@ msgstr "Преобразование PDF в PostScript"
 #. Name
 #: filters/pdfwrite.desktop:2
 msgid "pdfwrite"
-msgstr ""
+msgstr "pdfwrite"
 
 #. Comment
 #: filters/pdfwrite.desktop:4
@@ -79,7 +81,7 @@ msgstr ""
 #. Name
 #: filters/ps2pdf.desktop:2
 msgid "ps2pdf"
-msgstr ""
+msgstr "ps2pdf"
 
 #. Comment
 #: filters/ps2pdf.desktop:4
@@ -89,7 +91,7 @@ msgstr "Преобразование PostScript в PDF"
 #. Name
 #: filters/psbook.desktop:2
 msgid "psbook"
-msgstr ""
+msgstr "psbook"
 
 #. Comment
 #: filters/psbook.desktop:4
@@ -100,7 +102,7 @@ msgstr ""
 #. Name
 #: filters/psbook1.desktop:2
 msgid "psbook1"
-msgstr ""
+msgstr "psbook1"
 
 #. Comment
 #: filters/psbook1.desktop:4
@@ -110,7 +112,7 @@ msgstr "Памфлетная печать - чётные страницы (ша�
 #. Name
 #: filters/psbook2.desktop:2
 msgid "psbook2"
-msgstr ""
+msgstr "psbook2"
 
 #. Comment
 #: filters/psbook2.desktop:4
@@ -120,7 +122,7 @@ msgstr "Памфлетная печать - нечётные страницы (�
 #. Name
 #: filters/psnup.desktop:2
 msgid "psnup"
-msgstr ""
+msgstr "psnup"
 
 #. Comment
 #: filters/psnup.desktop:4
@@ -130,7 +132,7 @@ msgstr "Печать нескольких страниц на листе"
 #. Name
 #: filters/psresize.desktop:2
 msgid "psresize"
-msgstr ""
+msgstr "psresize"
 
 #. Comment
 #: filters/psresize.desktop:4
@@ -140,7 +142,7 @@ msgstr "Масштабирование печати для размещения
 #. Name
 #: filters/psselect.desktop:2
 msgid "psselect"
-msgstr ""
+msgstr "psselect"
 
 #. Comment
 #: filters/psselect.desktop:4
@@ -204,9 +206,8 @@ msgstr "Отправить файл PDF"
 
 #. Comment
 #: specials.desktop:48
-#, fuzzy
 msgid "KSendFax"
-msgstr "Отправить по факсу"
+msgstr "KSendFax"
 
 #. Description
 #: specials.desktop:49
@@ -221,17 +222,17 @@ msgstr "Утилита отправки факсов (ksendfax)"
 #. Name
 #: tdeprintd.desktop:11
 msgid "TDE Print Daemon"
-msgstr "Служба печати"
+msgstr "Демон печати TDE"
 
 #. Comment
 #: tdeprintd.desktop:12
 msgid "Print daemon for TDE"
-msgstr "Служба печати TDE"
+msgstr "Демон печати TDE"
 
 #. Name
 #: tools/escputil/escputil.desktop:2
 msgid "EPSON InkJet"
-msgstr ""
+msgstr "EPSON InkJet"
 
 #. Comment
 #: cups/cups.print:3
@@ -246,7 +247,7 @@ msgstr "Печать посредством внешней программы (�
 #. Comment
 #: foomatic/foomatic.print:3
 msgid "Foomatic (CUPS, LPRng, PDQ)"
-msgstr ""
+msgstr "Foomatic (CUPS, LPRng, PDQ)"
 
 #. Comment
 #: lpd/lpd.print:3
diff --git a/translations/desktop_files/tderesources-desktops/ru.po b/translations/desktop_files/tderesources-desktops/ru.po
index 230311acf..4285a7868 100644
--- a/translations/desktop_files/tderesources-desktops/ru.po
+++ b/translations/desktop_files/tderesources-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-04 17: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-01-12 18:00+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tderesources-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.4\n"
 
 #. Name
 #: tderesources.desktop:14
@@ -32,6 +34,8 @@ msgid ""
 "resources;konnector resource;contact resource;calendar resource;notes "
 "resource;imap;"
 msgstr ""
+"resources;konnector resource;contact resource;calendar resource;notes "
+"resource;imap;ресурсы;"
 
 #. Comment
 #: tderesources_manager.desktop:4
diff --git a/translations/desktop_files/tdespell2-desktops/it.po b/translations/desktop_files/tdespell2-desktops/it.po
index 31ed9a118..3fda20651 100644
--- a/translations/desktop_files/tdespell2-desktops/it.po
+++ b/translations/desktop_files/tdespell2-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>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-04 17: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: 2021-07-22 05:14+0000\n"
+"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdespell-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.7.2\n"
 
 #. Name
 #: plugins/aspell/tdespell_aspell.desktop:14
@@ -23,9 +24,8 @@ msgstr "Aspell"
 
 #. Name
 #: plugins/hspell/tdespell_hspell.desktop:14
-#, fuzzy
 msgid "HSpell"
-msgstr "Aspell"
+msgstr "HSpell"
 
 #. Name
 #: plugins/ispell/tdespell_ispell.desktop:14
diff --git a/translations/desktop_files/tdespell2-desktops/ru.po b/translations/desktop_files/tdespell2-desktops/ru.po
index dba4b8853..b44f1d675 100644
--- a/translations/desktop_files/tdespell2-desktops/ru.po
+++ b/translations/desktop_files/tdespell2-desktops/ru.po
@@ -1,35 +1,37 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Alexander Golubev <fatzer2@gmail.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-04 17: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: 2021-01-12 18:00+0000\n"
+"Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdespell-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.4\n"
 
 #. Name
 #: plugins/aspell/tdespell_aspell.desktop:14
 msgid "ASpell"
-msgstr ""
+msgstr "ASpell"
 
 #. Name
 #: plugins/hspell/tdespell_hspell.desktop:14
 msgid "HSpell"
-msgstr ""
+msgstr "HSpell"
 
 #. Name
 #: plugins/ispell/tdespell_ispell.desktop:14
 msgid "ISpell"
-msgstr ""
+msgstr "ISpell"
 
 #. Comment
 #: tdespellclient.desktop:5
diff --git a/translations/desktop_files/tdespell2-desktops/tr.po b/translations/desktop_files/tdespell2-desktops/tr.po
index d01be1304..6052deaf3 100644
--- a/translations/desktop_files/tdespell2-desktops/tr.po
+++ b/translations/desktop_files/tdespell2-desktops/tr.po
@@ -1,35 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Mehmet Dokuz <madanadam@gmail.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-04 17: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-03-02 13:11+0000\n"
+"Last-Translator: Mehmet Dokuz <madanadam@gmail.com>\n"
+"Language-Team: Turkish <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/tdelibs/tdespell-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.11\n"
 
 #. Name
 #: plugins/aspell/tdespell_aspell.desktop:14
 msgid "ASpell"
-msgstr ""
+msgstr "ASpell"
 
 #. Name
 #: plugins/hspell/tdespell_hspell.desktop:14
 msgid "HSpell"
-msgstr ""
+msgstr "HSpell"
 
 #. Name
 #: plugins/ispell/tdespell_ispell.desktop:14
 msgid "ISpell"
-msgstr ""
+msgstr "ISpell"
 
 #. Comment
 #: tdespellclient.desktop:5
diff --git a/win/common.pro b/win/common.pro
index f5c2f1af7..41db8d906 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -3,7 +3,7 @@
 # (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl
 #
 
-# to avoid a need for using Q_WS_WIN in C source code
+# to avoid a need for using TQ_WS_WIN in C source code
 DEFINES += _WINDOWS WIN32_LEAN_AND_MEAN
 
 # custom definitions, options on which KDElibs do not depend
@@ -172,7 +172,7 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EXCEPTIONS_ON # /GX for msvc
 QMAKE_LFLAGS += /FORCE:MULTIPLE
 
 # Specify that filename is a C++ source file, even if it doesn�t have 
-# a .cpp or .cxx extension, thus .cc files are compiled properly with msvc
+# a .cpp or .cxx extension, thus files are compiled properly with msvc
 QMAKE_CXXFLAGS += /TP
 
 INCLUDEPATH	+= moc $(KDELIBS)/win $(KDELIBS)
diff --git a/win/pro_files/dcop/dcopidl/dcopidl.pro b/win/pro_files/dcop/dcopidl/dcopidl.pro
index 2febfaa2c..df3e48a19 100644
--- a/win/pro_files/dcop/dcopidl/dcopidl.pro
+++ b/win/pro_files/dcop/dcopidl/dcopidl.pro
@@ -15,7 +15,7 @@ DEFINES += YY_ALWAYS_INTERACTIVE
 
 SOURCES = \
 main.cpp \
-scanner.cc \
-yacc.cc
+scanner.cpp \
+yacc.cpp
 
 HEADERS		=
diff --git a/win/pro_files/tdeio/tdeio.pro b/win/pro_files/tdeio/tdeio.pro
index 706208b2a..9d92be52c 100644
--- a/win/pro_files/tdeio/tdeio.pro
+++ b/win/pro_files/tdeio/tdeio.pro
@@ -102,19 +102,19 @@ tdeio/statusbarprogress.cpp \
 tdeio/tcpslavebase.cpp \
 tdeio/yacc.c \
 \
-bookmarks/kbookmark.cc \
-bookmarks/kbookmarkbar.cc \
-bookmarks/kbookmarkdombuilder.cc \
-bookmarks/kbookmarkdrag.cc \
-bookmarks/kbookmarkexporter.cc \
-bookmarks/kbookmarkimporter.cc \
-bookmarks/kbookmarkimporter_crash.cc \
-bookmarks/kbookmarkimporter_ie.cc \
-bookmarks/kbookmarkimporter_kde1.cc \
-bookmarks/kbookmarkimporter_ns.cc \
-bookmarks/kbookmarkimporter_opera.cc \
-bookmarks/kbookmarkmanager.cc \
-bookmarks/kbookmarkmenu.cc \
+bookmarks/kbookmark.cpp \
+bookmarks/kbookmarkbar.cpp \
+bookmarks/kbookmarkdombuilder.cpp \
+bookmarks/kbookmarkdrag.cpp \
+bookmarks/kbookmarkexporter.cpp \
+bookmarks/kbookmarkimporter.cpp \
+bookmarks/kbookmarkimporter_crash.cpp \
+bookmarks/kbookmarkimporter_ie.cpp \
+bookmarks/kbookmarkimporter_kde1.cpp \
+bookmarks/kbookmarkimporter_ns.cpp \
+bookmarks/kbookmarkimporter_opera.cpp \
+bookmarks/kbookmarkmanager.cpp \
+bookmarks/kbookmarkmenu.cpp \
 \
 tdefile/kcombiview.cpp \
 tdefile/kcustommenueditor.cpp \
@@ -154,27 +154,27 @@ tdefile/kurlrequesterdlg.cpp \
 \
 misc/uiserver.cpp \
 \
-kssl/ksslcertdlg.cc \
-kssl/ksslinfodlg.cc \
-kssl/ksslcsessioncache.cc \
-kssl/ksslsession.cc \
-kssl/ksslsettings.cc \
-kssl/ksslcertchain.cc \
-kssl/ksslcertificate.cc \
-kssl/ksslcertificatecache.cc \
-kssl/ksslcertificatehome.cc \
-kssl/ksslcertificatefactory.cc \
-kssl/kssl.cc \
-kssl/ksslconnectioninfo.cc \
-kssl/ksslkeygen.cc \
-kssl/ksslpkcs7.cc \
-kssl/ksslpkcs12.cc \
-kssl/ksslx509v3.cc \
-kssl/ksslx509map.cc \
-kssl/ksslsigners.cc \
-kssl/ksslpeerinfo.cc \
-kssl/kopenssl.cc \
-kssl/ksmimecrypto.cc
+kssl/ksslcertdlg.cpp \
+kssl/ksslinfodlg.cpp \
+kssl/ksslcsessioncache.cpp \
+kssl/ksslsession.cpp \
+kssl/ksslsettings.cpp \
+kssl/ksslcertchain.cpp \
+kssl/ksslcertificate.cpp \
+kssl/ksslcertificatecache.cpp \
+kssl/ksslcertificatehome.cpp \
+kssl/ksslcertificatefactory.cpp \
+kssl/kssl.cpp \
+kssl/ksslconnectioninfo.cpp \
+kssl/ksslkeygen.cpp \
+kssl/ksslpkcs7.cpp \
+kssl/ksslpkcs12.cpp \
+kssl/ksslx509v3.cpp \
+kssl/ksslx509map.cpp \
+kssl/ksslsigners.cpp \
+kssl/ksslpeerinfo.cpp \
+kssl/kopenssl.cpp \
+kssl/ksmimecrypto.cpp
 
 #removed tdeio/kautomount.cpp \
 
diff --git a/win/pro_files/tdemdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro
index 62b30c186..757be67fb 100644
--- a/win/pro_files/tdemdi/test/test.pro
+++ b/win/pro_files/tdemdi/test/test.pro
@@ -9,7 +9,7 @@ CONFIG -= windows
 CONFIG += debug
 CONFIG += console
 
-unix:DEFINES   = NO_INCLUDE_MOCFILES TQT_NO_COMPAT
+unix:DEFINES   = NO_INCLUDE_MOCFILES
 unix:LIBS       += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts
 unix:INCLUDEPATH     += . .. $(TDEDIR)/include
 
diff --git a/win/qeventloopex.h b/win/qeventloopex.h
index 648ddf228..2fed3ecf9 100644
--- a/win/qeventloopex.h
+++ b/win/qeventloopex.h
@@ -30,7 +30,7 @@ class QEventLoopExPrivate;
 
 class QEventLoopEx : public TQEventLoop
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	QEventLoopEx( TQObject *parent = 0, const char *name = 0 );
diff --git a/win/tools/kmoc b/win/tools/kmoc
index 2fef8ea60..8e79c8246 100755
--- a/win/tools/kmoc
+++ b/win/tools/kmoc
@@ -6,7 +6,7 @@
 
 mkdir -p moc
 find . -maxdepth 1 -name \*.h | while read ; do 
-	grep Q_OBJECT $REPLY > /dev/null || continue
+	grep TQ_OBJECT $REPLY > /dev/null || continue
 	moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"`
 	if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi
 done
diff --git a/win/win32_utils2.cpp b/win/win32_utils2.cpp
index 2e46d2acb..946d62e5a 100644
--- a/win/win32_utils2.cpp
+++ b/win/win32_utils2.cpp
@@ -26,51 +26,62 @@
 #include <shellapi.h>
 #include <tchar.h>
 
-KDEWIN32_EXPORT 
-TQString getWin32RegistryValue(HKEY key, const TQString& subKey, const TQString& item, bool *ok)
-{
-#define FAILURE \
-	{ if (ok) \
-		*ok = false; \
-	return TQString::null; }
+#define FAILURE            \
+	{                        \
+		if (ok)                \
+		{                      \
+			*ok = false;         \
+		}                      \
+		return TQString::null; \
+	}
 
+KDEWIN32_EXPORT
+TQString getWin32RegistryValue(HKEY key, const TQString &subKey, const TQString &item, bool *ok)
+{
 	if (!subKey)
+	{
 		FAILURE;
+	}
 	HKEY hKey;
 	TCHAR *lszValue;
-	DWORD dwType=REG_SZ;
+	DWORD dwType = REG_SZ;
 	DWORD dwSize;
-	if (ERROR_SUCCESS!=RegOpenKeyEx(key, subKey.ucs2(), NULL, KEY_READ, &hKey))
+	if (ERROR_SUCCESS != RegOpenKeyEx(key, subKey.ucs2(), NULL, KEY_READ, &hKey))
+	{
 		FAILURE;
+	}
 
-	if (ERROR_SUCCESS!=RegQueryValueEx(hKey, item.ucs2(), NULL, NULL, NULL, &dwSize))
+	if (ERROR_SUCCESS != RegQueryValueEx(hKey, item.ucs2(), NULL, NULL, NULL, &dwSize))
+	{
 		FAILURE;
+	}
 
 	lszValue = new TCHAR[dwSize];
 
-	if (ERROR_SUCCESS!=RegQueryValueEx(hKey, item.ucs2(), NULL, &dwType, (LPBYTE)lszValue, &dwSize)) {
-		delete [] lszValue;
+	if (ERROR_SUCCESS != RegQueryValueEx(hKey, item.ucs2(), NULL, &dwType, (LPBYTE)lszValue, &dwSize))
+	{
+		delete[] lszValue;
 		FAILURE;
 	}
 	RegCloseKey(hKey);
 
 	TQString res = TQString::fromUcs2(lszValue);
-	delete [] lszValue;
+	delete[] lszValue;
 	return res;
 }
 
 KDEWIN32_EXPORT
-bool showWin32FilePropertyDialog(const TQString& fileName)
+bool showWin32FilePropertyDialog(const TQString &fileName)
 {
 	TQString path_ = TQDir::convertSeparators(TQFileInfo(fileName).absFilePath());
 
 	SHELLEXECUTEINFO execInfo;
-	memset(&execInfo,0,sizeof(execInfo));
+	memset(&execInfo, 0, sizeof(execInfo));
 	execInfo.cbSize = sizeof(execInfo);
-	execInfo.fMask = SEE_MASK_INVOKEIDLIST | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI;
+	execInfo.fMask  = SEE_MASK_INVOKEIDLIST | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI;
 	const TQString verb("properties");
-	execInfo.lpVerb = (TCHAR*)verb.ucs2();
-	execInfo.lpFile = (TCHAR*)path_.ucs2();
+	execInfo.lpVerb = (TCHAR *)verb.ucs2();
+	execInfo.lpFile = (TCHAR *)path_.ucs2();
 	return ShellExecuteEx(&execInfo);
 }
 
@@ -78,77 +89,98 @@ KDEWIN32_EXPORT
 TQCString getWin32LocaleName()
 {
 	bool ok;
-	TQString localeNumber = getWin32RegistryValue(HKEY_CURRENT_USER, "Control Panel\\International", 
-		"Locale", &ok);
+	TQString localeNumber = getWin32RegistryValue(HKEY_CURRENT_USER, "Control Panel\\International",
+	                                              "Locale", &ok);
 	if (!ok)
+	{
 		return TQCString();
-	TQString localeName = getWin32RegistryValue(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout\\DosKeybCodes", 
-		localeNumber, &ok);
+	}
+	TQString localeName = getWin32RegistryValue(HKEY_LOCAL_MACHINE,
+	                                            "SYSTEM\\CurrentControlSet\\Control\\Keyboard Layout\\DosKeybCodes", localeNumber,
+	                                            &ok);
 	if (!ok)
+	{
 		return TQCString();
+	}
 	return localeName.latin1();
 }
 
 KDEWIN32_EXPORT
-TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
+TQString convertKFileDialogFilterToQFileDialogFilter(const TQString &filter)
 {
 	TQString kde_filters = filter;
 	int pos;
 	// Strip the escape characters from
 	// escaped '/' characters.
 
-	TQString copy (kde_filters);
+	TQString copy(kde_filters);
 	for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos)
+	{
 		copy.remove(pos, 1);
+	}
 
 	//<js>
 	//we need to convert KDE filter format to Qt format
 	//Qt format: "some text (*.first *.second)" or "All (*)"
 	//KDE format: "*.first *.second" or "*"
-	TQStringList filters = TQStringList::split("\n",kde_filters);
+	TQStringList filters = TQStringList::split("\n", kde_filters);
 	TQString current;
 	TQString converted; //finally - converted filter
-	for (TQStringList::ConstIterator it = filters.constBegin(); it!=filters.constEnd();++it) {
+	for (TQStringList::ConstIterator it = filters.constBegin(); it != filters.constEnd(); ++it)
+	{
 		current = *it;
-		TQString new_f;//filter part
-		TQString new_name;//filter name part
+		TQString new_f; //filter part
+		TQString new_name; //filter name part
 		int p = (*it).find('|');
-		if (p!=-1) {
-			new_f = current.left(p);
-			new_name = current.mid(p+1);
+		if (p != -1)
+		{
+			new_f    = current.left(p);
+			new_name = current.mid(p + 1);
 		}
-		else {
-			new_f = current;
+		else
+		{
+			new_f    = current;
 			new_name = current; //nothing better
 		}
 		//remove (.....) from name
-		p=new_name.find('(');
+		p = new_name.find('(');
 		int p2 = new_name.findRev(')');
 		TQString new_name1, new_name2;
-		if (p!=-1)
+		if (p != -1)
+		{
 			new_name1 = new_name.left(p);
-		if (p2!=-1)
-			new_name2 = new_name.mid(p2+1);
+		}
+		if (p2 != -1)
+		{
+			new_name2 = new_name.mid(p2 + 1);
+		}
 		if (!new_name1.isEmpty() || !new_name2.isEmpty())
+		{
 			new_name = new_name1.stripWhiteSpace() + " " + new_name2.stripWhiteSpace();
-		new_name.replace('(',"");
-		new_name.replace(')',"");
+		}
+		new_name.replace('(', "");
+		new_name.replace(')', "");
 		new_name = new_name.stripWhiteSpace();
 
 		// make filters unique: remove uppercase extensions (case doesn't matter on win32, BTW)
 		TQStringList allfiltersUnique;
-		TQStringList origList( TQStringList::split(" ", new_f) );
+		TQStringList origList(TQStringList::split(" ", new_f));
 		for (TQStringList::ConstIterator it = origList.constBegin();
-			it!=origList.constEnd(); ++it)
+		     it != origList.constEnd(); ++it)
 		{
 			if ((*it) == (*it).lower())
+			{
 				allfiltersUnique += *it;
+			}
 		}
 
 		if (!converted.isEmpty())
+		{
 			converted += ";;";
+		}
 
 		converted += (new_name + " (" + allfiltersUnique.join(" ") + ")");
 	}
 	return converted;
 }
+