Drop automake build support.

Add basic cmake build instructions.
Delete empty file NEWS.
Rework of the README file (splitted with the FAQ).
Add FAQ file.
Rework of the desktop file.
Few cosmetics here and there.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit c4ba990dcc1531424959545520236b033847905b)

22 files changed, 122 insertions, 623 deletions

diff --git a/.gitmodules b/.gitmodules
index bdec8fc..69dd7b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "admin"]
-	path = admin
-	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
 [submodule "cmake"]
 	path = cmake
 	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2284762..6c2218f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,16 +41,16 @@ tde_setup_paths( )
 
 ##### optional stuff
 
-option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_ALL_OPTIONS    "Enable all optional support" OFF )
 option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
-option( WITH_NVCONTROL "Build with NVidia control support" ${WITH_ALL_OPTIONS}                      )
+option( WITH_NVCONTROL      "Build with NVidia control support"                 ${WITH_ALL_OPTIONS} )
 
 
 ##### user requested modules
 
-option( BUILD_ALL "Build all" ON                             )
-option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
-option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+option( BUILD_ALL          "Build all" ON )
+option( BUILD_DOC          "Build documentation" ${BUILD_ALL} )
+option( BUILD_TRANSLATIONS "Build translations"  ${BUILD_ALL} )
 
 
 ##### configure checks
@@ -70,7 +70,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 ##### directories
 
 add_subdirectory( src )
-tde_conditional_add_subdirectory( BUILD_DOC doc         )
+tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) 
 
 
diff --git a/FAQ b/FAQ
new file mode 100644
index 0000000..9b46f2a
--- /dev/null
+++ b/FAQ
@@ -0,0 +1,39 @@
+Termal sensors provided by hddtemp daemon:
+==========================================
+Make sure hddtemp runs on 127.0.0.1 port 7634 before kima starts.
+
+
+CPU Frequency Daemon Notes:
+===========================
+If you have cpufreqd configured and running on your machine, Kima will 
+provide a sub-menu called "Performance Profiles" where you can choose 
+one of the preconfigured profiles for cpufreqd.
+Choosing one of the profiles will automatically put cpufreqd in manual 
+mode.
+You can use "Select dynamically" option from the menu to return back to 
+the dynamic scaling.
+Please don't forget to enable cpufreqd remote controlling in 
+cpufreqd.conf (enable_remote=1) and give enough permissions to cpufreqd 
+socket ("remote_group" option in cpufreqd.conf, see man pages for details).
+
+Known limitations:
+ - cpufreqd should be started before Kima (it's not a problem when you 
+   do everything from your startup scripts)
+ - Since cpufreqd does not provide means to detect its current mode 
+   (manual/dynamic), in rare cases "Select dynamically" check can be 
+   inconsistent with the real daemon state. This is inconvenient but 
+   does not affect program functionality.
+
+
+NVidia thermal source notes:
+============================
+By default the nvidia-settings tool is used to obtain the GPU temperature.
+The configure switch "-with-nvcontrol=/absolute/path/to/libnvcontrol-dir" 
+can be used to increase Kimas performance.
+Using this switch the libXNVCtrl.a gets statically compiled/linked into 
+libkima.so and is used to query the temperature(s) of your NVidia card. 
+The most recent nvidia-settings sourcecode can be downloaded 
+from: ftp://download.nvidia.com/XFree86/nvidia-settings.
+
+Here is an usage example:
+./configure --prefix=$(tde-config --prefix) --with-nvcontrol=/home/$USER/nvidia-settings-1.0/src/libXNVCtrl
diff --git a/INSTALL b/INSTALL
index 02a4a07..39b3ada 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,167 +1,29 @@
 Basic Installation
 ==================
 
-   These are generic installation instructions.
+kima relies on cmake to build.
 
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+Here are suggested default options:
 
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
 
-The simplest way to compile this package is:
+Requirements:
+=============
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+- tdelibs
 
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
+Optional:
+=========
 
+- libxnvctrl |(NVidia )
+- Xext       |
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 8a2284f..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-SUBDIRS = $(TOPSUBDIRS)
-
-$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-
-$(top_srcdir)/subdirs:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-
-MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
-
-package-messages:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
-	$(MAKE) -C po merge
-
-EXTRA_DIST = admin COPYING configure.in.in
-
-dist-hook:
-	cd $(top_distdir) && perl admin/am_edit -padmin
-	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
diff --git a/Makefile.cvs b/Makefile.cvs
deleted file mode 100644
index 4c0afd1..0000000
--- a/Makefile.cvs
+++ /dev/null
@@ -1,10 +0,0 @@
-all: 
-	@echo "This Makefile is only for the CVS repository"
-	@echo "This will be deleted before making the distribution"
-	@echo ""
-	$(MAKE) -f admin/Makefile.common cvs
-
-dist:
-	$(MAKE) -f admin/Makefile.common dist
-
-.SILENT:
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/NEWS
+++ /dev/null
diff --git a/README b/README
index f1437e8..27e2ffd 100644
--- a/README
+++ b/README
@@ -1,68 +1,65 @@
-Description:
-============
-This applet monitors various temperature, frequency and fan sources in your kicker panel. 
-Make sure you have enabled a supported kernel module.
 
+ kima - a kicker's applet for TDE.
+ 
+ 
+This applet monitors various temperature, frequency and fan sources from
+your kicker panel. 
 
-Licence:
-========
-GPLv2
 
 
 Features:
 =========
+
 supported thermal sources:
- - the Linux ACPI Thermal Zone driver. The corresponding kernel module is called thermal.
- - the thermal sources of the Linux ACPI driver for the IBM ThinkPad laptops. The corresponding kernel module is called ibm-acpi.
- - the IBM Hard Drive Active Protection System (HDAPS) driver. The corresponding kernel module is called hdaps.
- - the Omnibook Configuration Tools & Patches. The corresponding kernel module is called omnibook.
- - the iBook G4 CPU and GPU thermal zones. It may work on other Apple machines as well (please let me know).
+ - the Linux ACPI Thermal Zone driver. The corresponding kernel module
+   is called thermal.
+ - the thermal sources of the Linux ACPI driver for the IBM ThinkPad
+   laptops. The corresponding kernel module is called ibm-acpi.
+ - the IBM Hard Drive Active Protection System (HDAPS) driver.
+   The corresponding kernel module is called hdaps.
+ - the Omnibook Configuration Tools & Patches.
+   The corresponding kernel module is called omnibook.
+ - the iBook G4 CPU and GPU thermal zones.
  - the thermal sensors available through hwmon (I2C, lm_sensors, ...).
- - the CPU thermal sensor of the i8k kernel driver for Dell Inspiron and Latitude notebooks.
- - the GPU thermal sensors of nvidia-settings (provided by the nVidia GPU card driver tools, see NVidia notes below)
- - the termal sensors provided by hddtemp daemon (make sure hddtemp runs on 127.0.0.1 port 7634 before kima starts)
+ - the CPU thermal sensor of the i8k kernel driver for Dell Inspiron and
+   Latitude notebooks.
+ - the GPU thermal sensors of nvidia-settings.
+   (provided by the nVidia GPU card driver tools, see  FAQ notes below)
+ - the termal sensors provided by hddtemp daemon.
+
 
 supported frequency sources:
  - the Linux kernel /proc/cpuinfo interface
  - the Linux kernel cpufreq subsystem
 
+
 supported fan sources:
  - the fan sensors available through hwmon (I2C, lm_sensors, ...).
- - the fan sources of the Linux ACPI driver for the IBM ThinkPad laptops. The corresponding kernel module is called ibm-acpi.
- - the fan sources of the i8k kernel driver for Dell Inspiron and Latitude notebooks.
-
-misc sources:
- - battery source that displays the state of charge of your batteries through libhal
- - uptime source that displays the current system uptime
+ - the fan sources of the Linux ACPI driver for the IBM ThinkPad laptops.
+   The corresponding kernel module is called ibm-acpi.
+ - the fan sources of the i8k kernel driver for Dell Inspiron and
+   Latitude notebooks.
 
-misc:
- - cpufreqd control module to switch cpufreqd profiles via cpufreqd remote interface
 
+misc sources:
+ - battery source that displays the state of charge of your batteries
+   through libhal.
+ - uptime source that displays the current system uptime.
 
-installation:
-=============
-run configure:
-	./configure --prefix=$(tde-config --prefix)
 
-build the sources:
-	make
+misc:
+ - cpufreqd control module to switch cpufreqd profiles via cpufreqd
+   remote interface.
 
-install the applet (with appropriate rights):
-	su -c "make install"
 
-finally add the applet to your TDE panel (RMB on kicker)
 
+CONTRIBUTING
+==============
 
-CPU Frequency Daemon Notes:
-===========================
-If you have cpufreqd configured and running on your machine, Kima will provide a sub-menu called "Performance Profiles" where you can choose one of the preconfigured profiles for cpufreqd. Choosing one of the profiles will automatically put cpufreqd in manual mode. You can use "Select dynamically" option from the menu to return back to the dynamic scaling. Please don't forget to enable cpufreqd remote controlling in cpufreqd.conf (enable_remote=1) and give enough permissions to cpufreqd socket ("remote_group" option in cpufreqd.conf, see man pages for details).
-Known limitations:
- - cpufreqd should be started before Kima (it's not a problem when you do everything from your startup scripts)
- - Since cpufreqd does not provide means to detect its current mode (manual/dynamic), in rare cases "Select dynamically" check can be inconsistent with the real daemon state. This is inconvenient but does not affect program functionality.
+If you wish to contribute to Kima, you might do so:
 
+- TDE Gitea Workspace (TGW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/gitea
 
-NVidia thermal source notes:
-============================
-By default the nvidia-settings tool is used to obtain the GPU temperature. The configure switch "-with-nvcontrol=/absolute/path/to/libnvcontrol-dir" can be used to increase Kimas performance. Using this switch the libXNVCtrl.a gets statically compiled/linked into libkima.so and is used to query the temperature(s) of your NVidia card. The most recent nvidia-settings sourcecode can be downloaded from: ftp://download.nvidia.com/XFree86/nvidia-settings. Here is an  usage example:
- ./configure --prefix=$(tde-config --prefix) --with-nvcontrol=/home/$USER/nvidia-settings-1.0/src/libXNVCtrl
-	
\ No newline at end of file
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/weblate
diff --git a/admin b/admin
deleted file mode 160000
-Subproject 20b5a47aa3db7c7a75c6574be638f3d07a26cfe
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 83d8902..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,268 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-#undef HAVE_CARBON_CARBON_H
-
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#undef HAVE_CRT_EXTERNS_H
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
-
-/* defined if compiling with NVControl support */
-#undef HAVE_NVCONTROL
-
-/* Define if you have res_init */
-#undef HAVE_RES_INIT
-
-/* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* Define a safe value for MAXPATHLEN */
-#undef KDEMAXPATHLEN
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
-
-/* The size of `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Defined if compiling without arts */
-#undef WITHOUT_ARTS
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-
-#if !defined(HAVE_RES_INIT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int res_init(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCAT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcat(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCPY_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcpy(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-
-/* define to 1 if -fvisibility is supported */
-#undef __KDE_HAVE_GCC_VISIBILITY
-
-
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-
-
-/* type to use in place of socklen_t if not defined */
-#undef kde_socklen_t
-
-/* type to use in place of socklen_t if not defined (deprecated, use
-   kde_socklen_t) */
-#undef ksize_t
diff --git a/configure.files b/configure.files
deleted file mode 100644
index 030bce8..0000000
--- a/configure.files
+++ /dev/null
@@ -1,2 +0,0 @@
-./admin/configure.in.min
-configure.in.in
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index bb7eea1..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#MIN_CONFIG(3.0.0)
-
-KDE_ENABLE_HIDDEN_VISIBILITY
-
-AM_INIT_AUTOMAKE(kima, 0.7.3.2)
-AC_C_BIGENDIAN
-AC_CHECK_KDEMAXPATHLEN
-
-dnl check for (optional) nvcontrol
-AC_ARG_WITH(nvcontrol,
-  AC_HELP_STRING([--with-nvcontrol=nvcontrol-dir],[uses libXNVCtrl.a instead of nvidia-settings for the NVidia thermal source]),
-  [with_nvcontrol=yes
-   nvcontrol_CFLAGS=-I$withval
-   nvcontrol_LIBS="-L$withval -lXNVCtrl"
-   AC_CHECK_FILE([$withval/NVCtrlLib.h], , AC_MSG_ERROR([Did not find NVCtrlLib.h. Make sure that you passed the correct path for NVControl. See README for details.]))
-   AC_DEFINE(HAVE_NVCONTROL, , [defined if compiling with NVControl support])])
-AC_SUBST(nvcontrol_CFLAGS)
-AC_SUBST(nvcontrol_LIBS)
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index e370376..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# the SUBDIRS is filled automatically by am_edit. If files are 
-# in this directory they are installed into the english dir
-
-KDE_LANG = en
-KDE_DOCS = kima
-SUBDIRS = $(AUTODIRS)  
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
deleted file mode 100644
index e9c3f0c..0000000
--- a/doc/en/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = kima
-KDE_LANG = en
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 597c341..75c89f8 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,5 +1,14 @@
-file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
 
-if( _srcs )
-   tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
-endif( )
+foreach( _po ${po_files} )
+  get_filename_component( _lang ${_po} NAME_WE )
+  if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
+    if( "${_po}" MATCHES "^([^/]*)/.*" )
+      string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" )
+    else( )
+      set( _component "${PROJECT_NAME}" )
+    endif( )
+    tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} )
+  endif( )
+endforeach( )
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index 4f7bfb7..0000000
--- a/po/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-#POFILES = AUTO
-POFILES = de.po es.po hu.po sv.po tr.po id.po
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbecc95..beffc1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory( cpufreqd )
-add_subdirectory( sources )
+add_subdirectory( sources  )
 
 include_directories(
   ${CMAKE_BINARY_DIR}
@@ -36,7 +36,7 @@ tde_add_kpart( libkima AUTOMOC
 
 ##### other data
 
-install(
-    FILES ${PROJECT_NAME}.desktop
+tde_create_translated_desktop(
+    ${PROJECT_NAME}.desktop
     DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
 )
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index d6db9c8..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src/cpufreqd -I$(top_srcdir)/src/sources \
-	$(all_includes)
-METASOURCES = AUTO
-
-kde_module_LTLIBRARIES = libkima.la
-
-libkima_la_SOURCES = kima.cpp flowlayout.cpp sourcelistitem.cpp prefs.ui
-libkima_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkima_la_LIBADD = $(top_builddir)/src/cpufreqd/libcpufreqd.la \
-	$(top_builddir)/src/sources/libsources.la $(LIB_TDEUI)
-
-kima_DATA = kima.desktop
-kimadir = $(kde_datadir)/kicker/applets
-
-KDE_ICON = hwinfo
-EXTRA_DIST = $(kima_DATA)
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp */*.cpp -o $(podir)/kima.pot
-noinst_HEADERS = kima.h flowlayout.h sourcelistitem.h
-
-SUBDIRS = cpufreqd sources
diff --git a/src/cpufreqd/Makefile.am b/src/cpufreqd/Makefile.am
deleted file mode 100644
index 3b81871..0000000
--- a/src/cpufreqd/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src/cpufreqd -I$(top_srcdir)/src/sources 	$(all_includes)
-METASOURCES = AUTO
-libcpufreqd_la_LDFLAGS = $(all_libraries)
-noinst_LTLIBRARIES = libcpufreqd.la
-libcpufreqd_la_SOURCES = cpufreqd.cpp cpufreqdconnection.cpp \
-	cpufreqdprofile.cpp
-noinst_HEADERS = cpufreqd.h cpufreqdconnection.h cpufreqdprofile.h cpufreqd.h \
-	cpufreqdconnection.h cpufreqdprofile.h
diff --git a/src/kima.desktop b/src/kima.desktop
index c26d4e3..67587b8 100644
--- a/src/kima.desktop
+++ b/src/kima.desktop
@@ -10,35 +10,14 @@ Icon=hwinfo
 
 Name=Kima
 Name[de]=Kima
-
+Name[fr]=Kima
 Comment=Kicker applet that monitors various temperature, frequency and fan sources
-#Comment[ca]=
-#Comment[cy]=
-#Comment[da]=
 Comment[de]=Kicker-Applet, dass verschiedene Temperatur-, Frequenz- und Lüftersensoren anzeigt.
-#Comment[el]=
 Comment[es]=Un applet para el Kicker que monitorea varias fuentes de temperatura y velocidad de los procesadores y del cooler
-#Comment[et]=
-Comment[fr]=Kicker applet que montre la température actuelle de CPU et la fréquence actuelle de CPU.
-#Comment[hi]=
-#Comment[hu]=
-#Comment[is]=
+Comment[fr]=Un applet Kicker qui montre la température du CPU, sa fréquence ainsi que la vitesse du ventilateur(CPU).
 Comment[it]=CpuInfo è una semplice Applet per Kicker che visualizza la frequenza e la temperatura della CPU.
-#Comment[ja]=
-#Comment[nb]=
-#Comment[nl]=
 Comment[pl]=Aplet Kickera pokazujacy obecna temperature i frekwencje procesora.
-#Comment[pt]=
-#Comment[pt_BR]=
-#Comment[ru]=
-#Comment[sl]=
-#Comment[sr]=
-#Comment[sr@Latn]=
 Comment[sv]=Kicker-miniprogram som övervakar olika temperatur-, frekvens- och fläktkällor
-#Comment[ta]=
-#Comment[tg]=
 Comment[tr]=Çeşitli fan, ısı ve frekans kaynaklarını izlemeye yarayan panel programcığı
-#Comment[zh_CN]=
 Comment[id]=Applet Kicker yang memantau berbagai sumber temperatur, frekuensi, dan putaran kipas
-
-Terminal=0
+Terminal=false
diff --git a/src/sources/Makefile.am b/src/sources/Makefile.am
deleted file mode 100644
index ed4262e..0000000
--- a/src/sources/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src/cpufreqd -I$(top_srcdir)/src/sources $(all_includes)
-METASOURCES = AUTO
-libsources_la_LDFLAGS = $(all_libraries)
-libsources_la_LIBADD = $(LIB_QT) $(LIB_TDECORE)
-noinst_LTLIBRARIES = libsources.la
-libsources_la_SOURCES = acpithermalsrc.cpp batterysrc.cpp cpuinfofreqsrc.cpp \
-	hddtempsrc.cpp hwmonfansrc.cpp hwmonthermalsrc.cpp i8ksrc.cpp ibmacpifansrc.cpp \
-	ibmacpithermalsrc.cpp ibmhdaps.cpp ibookg4thermalsrc.cpp labelsource.cpp labelsourcePrefs.ui \
-	nvidiathermalsrc.cpp omnibookthermalsrc.cpp source.cpp sourceprefs.ui \
-	sysfreqsrc.cpp threadedtrigger.cpp triggeredsource.cpp updateevent.cpp \
-	uptimesrc.cpp
-
-noinst_HEADERS = acpithermalsrc.h batterysrc.h cpuinfofreqsrc.h hddtempsrc.h \
-	hwmonfansrc.h hwmonthermalsrc.h i8ksrc.h ibmacpifansrc.h ibmacpithermalsrc.h \
-	ibmhdaps.h ibookg4thermalsrc.h labelsource.h nvidiathermalsrc.h \
-	omnibookthermalsrc.h source.h sysfreqsrc.h \
-	threadedtrigger.h triggeredsource.h updateevent.h uptimesrc.h
-
-AM_CXXFLAGS = @nvcontrol_CFLAGS@
-LIBS += @nvcontrol_LIBS@
diff --git a/subdirs b/subdirs
deleted file mode 100644
index 0e67810..0000000
--- a/subdirs
+++ /dev/null
@@ -1,3 +0,0 @@
-doc
-po
-src