4 files changed, 78 insertions, 17 deletions
diff --git a/userconfig/CMakeLists.txt b/userconfig/CMakeLists.txt
new file mode 100644
index 0000000..c04eb7d
--- /dev/null
+++ b/userconfig/CMakeLists.txt
@@ -0,0 +1,61 @@
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${PYTHON_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIBRARY_DIRS}
+)
+
+
+##### generate kcm control module code
+
+set( MODULE_NAME userconfig )
+
+set( _MODULEDIR_       ${DATA_INSTALL_DIR}/guidance )
+set( _EXTRAMODULE_     ${TDE_GUIDANCE_DIST_PKG_PATH} )
+set( _MODULENAME_      ${MODULE_NAME} )
+set( _FACTORYFUNCTION_ create_${MODULE_NAME} )
+
+configure_file(
+  ${CMAKE_SOURCE_DIR}/templates/kcm_module_stub.cpp.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/kcm_${MODULE_NAME}.cpp @ONLY
+)
+
+
+##### kcm_userconfig (module) #######################
+
+tde_add_kpart( kcm_${MODULE_NAME} AUTOMOC
+  SOURCES ${CMAKE_CURRENT_BINARY_DIR}/kcm_${MODULE_NAME}.cpp
+
+  LINK
+    tdecore-shared tdeui-shared
+    ${PYTHON_LIBRARIES} ${PYTHONIZE_LIBRARIES}
+    ${CMAKE_DL_LIBS}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other files
+
+tde_create_translated_desktop(
+  SOURCE ${MODULE_NAME}.desktop
+  DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
+install(
+  FILES unixauthdb.py
+  DESTINATION ${TDE_GUIDANCE_DIST_PKG_PATH}
+)
+
+install(
+  PROGRAMS ${MODULE_NAME}.py
+  DESTINATION ${TDE_GUIDANCE_DIST_PKG_PATH}
+)
+
+tde_install_symlink( ${TDE_GUIDANCE_DIST_PKG_PATH}/${MODULE_NAME}.py ${BIN_INSTALL_DIR}/${MODULE_NAME} )
diff --git a/userconfig/unixauthdb.py b/userconfig/unixauthdb.py
index e2e80c1..1523acf 100755
--- a/userconfig/unixauthdb.py
+++ b/userconfig/unixauthdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 ###########################################################################
 #    Copyright (C) 2004-2006 by Simon Edwards                                      
 #    <[email protected]>                                                             
diff --git a/userconfig/userconfig.desktop b/userconfig/userconfig.desktop
index 3ab05ad..1a7e285 100644
--- a/userconfig/userconfig.desktop
+++ b/userconfig/userconfig.desktop
@@ -11,7 +11,20 @@ Name[pt_BR]=Gerenciamento de Usuários
 Name[sr]=Управљање корисницима
 Name[sr@Latn]=Upravljanje korisnicima
 Name[sv]=Användarhantering
-Name[xx]=xxUser Managementxx
+
+GenericName=User Account Editor
+GenericName[el]=Επεξεργαστής λογαριασμών χρηστών
+GenericName[es]=Editor de cuenta de usuario
+GenericName[et]=Kasutajakonto redaktor
+GenericName[it]=Editor degli account degli utenti
+GenericName[ja]=ユーザアカウントエディタ
+GenericName[nl]=Gebruikeraccounts bewerken
+GenericName[pt]=Editor de Contas dos Utilizadores
+GenericName[pt_BR]=Editor de Contas de Usuários
+GenericName[sr]=Уређивач корисничких налога
+GenericName[sr@Latn]=Uređivač korisničkih naloga
+GenericName[sv]=Editor för användarkonton
+
 Comment=Users & Groups Administration
 Comment[el]=Διαχείριση χρηστών & ομάδων
 Comment[es]=Administrador de usuarios y grupos
@@ -24,7 +37,7 @@ Comment[pt_BR]=Administração de Usuários & Grupos
 Comment[sr]=Администрирање корисника и група
 Comment[sr@Latn]=Administriranje korisnika i grupa
 Comment[sv]=Administration av användare och grupper
-Comment[xx]=xxUsers & Groups Administrationxx
+
 Icon=userconfig
 Encoding=UTF-8
 X-TDE-ModuleType=Library
@@ -34,16 +47,3 @@ X-TDE-RootOnly=true
 Type=Application
 Exec=tdecmshell System/userconfig
 Categories=Qt;TDE;X-TDE-settings-system;
-GenericName=User Account Editor
-GenericName[el]=Επεξεργαστής λογαριασμών χρηστών
-GenericName[es]=Editor de cuenta de usuario
-GenericName[et]=Kasutajakonto redaktor
-GenericName[it]=Editor degli account degli utenti
-GenericName[ja]=ユーザアカウントエディタ
-GenericName[nl]=Gebruikeraccounts bewerken
-GenericName[pt]=Editor de Contas dos Utilizadores
-GenericName[pt_BR]=Editor de Contas de Usuários
-GenericName[sr]=Уређивач корисничких налога
-GenericName[sr@Latn]=Uređivač korisničkih naloga
-GenericName[sv]=Editor för användarkonton
-GenericName[xx]=xxUser Account Editorxx
diff --git a/userconfig/userconfig.py b/userconfig/userconfig.py
index 76140e8..325f0c3 100755
--- a/userconfig/userconfig.py
+++ b/userconfig/userconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- coding: UTF-8 -*-
 ###########################################################################
 # userconfig.py - description                                             #