[Goodies-commits] r2350 - in xfce4-taskmanager/trunk: . po src

Nick Schermer nick at xfce.org
Sat Jan 13 11:12:31 CET 2007 

Author: nick
Date: 2007-01-13 10:12:31 +0000 (Sat, 13 Jan 2007)
New Revision: 2350

Added:
   xfce4-taskmanager/trunk/THANKS
   xfce4-taskmanager/trunk/configure.in.in
   xfce4-taskmanager/trunk/po/LINGUAS
Removed:
   xfce4-taskmanager/trunk/configure.ac
Modified:
   xfce4-taskmanager/trunk/ChangeLog
   xfce4-taskmanager/trunk/Makefile.am
   xfce4-taskmanager/trunk/autogen.sh
   xfce4-taskmanager/trunk/po/ChangeLog
   xfce4-taskmanager/trunk/po/cs.po
   xfce4-taskmanager/trunk/po/de.po
   xfce4-taskmanager/trunk/po/eu.po
   xfce4-taskmanager/trunk/po/fi.po
   xfce4-taskmanager/trunk/po/fr.po
   xfce4-taskmanager/trunk/po/gl.po
   xfce4-taskmanager/trunk/po/hu.po
   xfce4-taskmanager/trunk/po/ja.po
   xfce4-taskmanager/trunk/po/nl.po
   xfce4-taskmanager/trunk/po/pl.po
   xfce4-taskmanager/trunk/po/pt_BR.po
   xfce4-taskmanager/trunk/po/ru.po
   xfce4-taskmanager/trunk/po/vi.po
   xfce4-taskmanager/trunk/po/xfce4-taskmanager.pot
   xfce4-taskmanager/trunk/po/zh_TW.po
   xfce4-taskmanager/trunk/src/Makefile.am
   xfce4-taskmanager/trunk/src/callbacks.c
   xfce4-taskmanager/trunk/src/callbacks.h
   xfce4-taskmanager/trunk/src/functions.c
   xfce4-taskmanager/trunk/src/functions.h
   xfce4-taskmanager/trunk/src/interface.c
   xfce4-taskmanager/trunk/src/interface.h
   xfce4-taskmanager/trunk/src/main.c
   xfce4-taskmanager/trunk/src/types.h
   xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c
   xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.h
Log:
Apply patch from ?\195?\129lvaro Lopes to fix CPU usage per task, with more then 1 CPU.
Added a THANKS file.
Remove some svn executable properties and add svn keywords.
Added LINGUAS support and removed the configure.ac > configure.in.in file.
Improved the configure.in.in and Makefiles.


Modified: xfce4-taskmanager/trunk/ChangeLog
===================================================================
--- xfce4-taskmanager/trunk/ChangeLog	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/ChangeLog	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,23 +1,33 @@
-2007-01-12 Nick Schermer <nick at xfce.org>
+2007-01-12	Nick Schermer <nick at xfce.org>
+
+	* Apply patch from Álvaro Lopes to fix CPU usage per task, with
+	  more then 1 CPU.
+	* Added a THANKS file.
+	* Remove some svn executable properties and add svn keywords.
+	* Added LINGUAS support and removed the configure.ac > configure.in.in file.
+	* Improved the configure.in.in and Makefiles.
+
+2007-01-12	Nick Schermer <nick at xfce.org>
+
 	* Apply patch from bug 2714.
 	* Fix all typo and compiler warnings.
 
-2006-06-26 20:20	Johannes
+2006-06-26	Johannes Zellner <webmaster at nebulon.de>
 
 	* rewrite of the taskmanager ;)
 	* now using seperate files for each os to get the processinfos
 	
-2005-07-05 19:38	Johannes
+2005-07-05	Johannes Zellner <webmaster at nebulon.de>
 
 	* added finnish translation
 	* fixed a memory leak in functions.c
 	
-2005-06-30 23:47  Johannes
+2005-06-30	Johannes Zellner <webmaster at nebulon.de>
 
 	* bugfix in the sorting function
 	* name of about-dialog changed
 	* scrollbars only showed when needed
 	
-2005-06-30 22:09  Johannes
+2005-06-30 	Johannes Zellner <webmaster at nebulon.de>
 
 	* started completly new ;)

Modified: xfce4-taskmanager/trunk/Makefile.am
===================================================================
--- xfce4-taskmanager/trunk/Makefile.am	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/Makefile.am	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,13 +1,19 @@
+# $Id$
+
+SUBDIRS =								\
+	po								\
+	src
+
+distclean-local:
+	rm -rf *.cache *~
+
+rpm: dist
+	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+	@rm -f $(PACKAGE)-$(VERSION).tar.gz
+
 EXTRA_DIST =								\
-	AUTHORS								\
-	COPYING								\
-	ChangeLog							\
-	INSTALL								\
-	NEWS								\
-	README								\
-	TODO			\
-	intltool-extract.in			\
-	intltool-merge.in			\
+	intltool-extract.in						\
+	intltool-merge.in						\
 	intltool-update.in
 	
 DISTCLEANFILES =							\
@@ -15,8 +21,5 @@
 	intltool-merge							\
 	intltool-update
 
-SUBDIRS =  po src
-DIST_SUBDIRS = src po
 
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:


Property changes on: xfce4-taskmanager/trunk/Makefile.am
___________________________________________________________________
Name: svn:keywords
   - author date id revision
   + Id

Added: xfce4-taskmanager/trunk/THANKS
===================================================================
--- xfce4-taskmanager/trunk/THANKS	                        (rev 0)
+++ xfce4-taskmanager/trunk/THANKS	2007-01-13 10:12:31 UTC (rev 2350)
@@ -0,0 +1,3 @@
+Patches:
+========
+Álvaro Lopes <alvieboy at alvie.com>
\ No newline at end of file

Modified: xfce4-taskmanager/trunk/autogen.sh
===================================================================
--- xfce4-taskmanager/trunk/autogen.sh	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/autogen.sh	2007-01-13 10:12:31 UTC (rev 2350)
@@ -2,11 +2,9 @@
 #
 # $Id$
 #
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2007
 #         The Xfce development team. All rights reserved.
 #
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -18,6 +16,20 @@
   exit 1
 }
 
+# verify that po/LINGUAS is present
+(test -f po/LINGUAS) >/dev/null 2>&1 || {
+  cat >&2 <<EOF
+autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
+            or try to checkout again.
+EOF
+  exit 1
+}
+
+# substitute revision and linguas
+linguas=`sed -e '/^#/d' po/LINGUAS`
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+sed -e "s/@LINGUAS@/${linguas}/g" \
+    -e "s/@REVISION@/${revision}/g" \
+    < "configure.in.in" > "configure.in"
+
 exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:

Deleted: xfce4-taskmanager/trunk/configure.ac

Copied: xfce4-taskmanager/trunk/configure.in.in (from rev 2346, xfce4-taskmanager/trunk/configure.ac)
===================================================================
--- xfce4-taskmanager/trunk/configure.in.in	                        (rev 0)
+++ xfce4-taskmanager/trunk/configure.in.in	2007-01-13 10:12:31 UTC (rev 2350)
@@ -0,0 +1,79 @@
+dnl $Id$
+dnl
+dnl xfce4-taskmanager - A small taskmanager based on the Xfce 4 libraries.
+dnl
+dnl 2005-2007 Johannes Zellner <webmaster at nebulon.de>
+
+dnl ***************************
+dnl *** Version information ***
+dnl ***************************
+m4_define([taskmanager_version], [0.4.0-rc2])
+
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2007
+        The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-taskmanager], [taskmanager_version()], [http://bugzilla.xfce.org/], [xfce4-taskmanager])
+AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
+AC_REVISION([$Id])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE()
+
+dnl *******************************
+dnl *** Check for UNIX variants ***
+dnl *******************************
+AC_AIX()
+AC_ISC_POSIX()
+AC_MINIX()
+
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
+AC_PROG_INTLTOOL()
+
+dnl ************************************
+dnl *** Checks for library functions ***
+dnl ************************************
+AC_DISABLE_STATIC()
+AC_C_CONST()
+
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************.
+AC_HEADER_STDC()
+AC_CHECK_HEADERS([dirent.h pwd.h sys/types.h sys/stat.h sys/param.h \
+                  stdio.h stdlib.h string.h unistd.h stdlib.h signal.h])
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.2.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.2.0])
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+BM_DEBUG_SUPPORT()
+
+AC_OUTPUT([
+Makefile
+src/Makefile
+po/Makefile.in
+])
+


Property changes on: xfce4-taskmanager/trunk/configure.in.in
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/po/ChangeLog
===================================================================
--- xfce4-taskmanager/trunk/po/ChangeLog	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/ChangeLog	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,3 +1,8 @@
+2007-01-13  Nick Schermer <nick at xfce.org>
+
+	* LINGUAS: Added LINGUAS support.
+	* *.po: Regenerated po files.
+
 2006-11-11  Maximilian Schleiss <maxschleiss at bluewin.ch>
 
 	* de.po: Updated the German translation

Added: xfce4-taskmanager/trunk/po/LINGUAS
===================================================================
--- xfce4-taskmanager/trunk/po/LINGUAS	                        (rev 0)
+++ xfce4-taskmanager/trunk/po/LINGUAS	2007-01-13 10:12:31 UTC (rev 2350)
@@ -0,0 +1,3 @@
+# set of available languages (in alphabetic order)
+cs de eu fi fr gl hu ja nl pl pt_BR ru vi zh_TW
+

Modified: xfce4-taskmanager/trunk/po/cs.po
===================================================================
--- xfce4-taskmanager/trunk/po/cs.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/cs.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-09-17 09:48+0100\n"
 "Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -16,80 +16,100 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../src/interface.c:43
-#: ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taskmanager"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "využití procesoru"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "využití paměti"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "více podrobností"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Příkaz"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Stav"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "Velikost virtuální paměti"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Uživatel"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Zastavit"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Pokračovat"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Ukončit signálem TERM"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Ukončit signálem KILL"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Zobrazit úlohy uživatele"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Zobrazit úlohy uživatele root"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Zobrazit jiné úlohy"
 
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/de.po
===================================================================
--- xfce4-taskmanager/trunk/po/de.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/de.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-11 14:40+0100\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-11-11 14:41+0100\n"
 "Last-Translator: Enrico Tröger <enrico.troeger at uvena.de>\n"
 "Language-Team: German <xfce4-dev at xfce.org>\n"
@@ -24,77 +24,77 @@
 msgid "Really terminate the task?"
 msgstr "Prozess wirklich beenden?"
 
-#: ../src/functions.c:112
+#: ../src/functions.c:124
 #, c-format
 msgid "%d kB of %d kB used"
 msgstr "%d kB of %d kB benutzt"
 
-#: ../src/functions.c:117
+#: ../src/functions.c:129
 #, c-format
 msgid "%0.0f %%"
 msgstr "%0.0f %%"
 
-#: ../src/interface.c:46 ../src/interface.c:266
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taskmanager"
 
-#: ../src/interface.c:60
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "CPU-Auslastung"
 
-#: ../src/interface.c:68
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "Speicherauslastung"
 
-#: ../src/interface.c:100
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "Mehr Info"
 
-#: ../src/interface.c:126
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Befehl"
 
-#: ../src/interface.c:132
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:138
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:144
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Status"
 
-#: ../src/interface.c:150
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "Speicher"
 
-#: ../src/interface.c:156
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:162
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Benutzer"
 
-#: ../src/interface.c:168
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:184
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/interface.c:189
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: ../src/interface.c:194
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Beenden"
 
-#: ../src/interface.c:199
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Kill"
 
@@ -109,3 +109,7 @@
 #: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Zeige Andere Prozesse"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/eu.po
===================================================================
--- xfce4-taskmanager/trunk/po/eu.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/eu.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-09-12 22:31+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -18,79 +18,100 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-atazakudeatzailea"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "cpu erabilera"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "memoria erabilera"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "xehetasun gehiago"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Komandoa"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID-a"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID-a"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Egoera"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "VM-Tamaina"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS-a"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Gelditu"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Jarraitu"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Terminala"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Hil"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Erabiltzaile atazak bistarazi"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Root atazak bistarazi"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Beste atazak bistarazi"
 
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/fi.po
===================================================================
--- xfce4-taskmanager/trunk/po/fi.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/fi.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 15:30+0300\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-09-13 15:33+0300\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -17,78 +17,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-prosessienhallinta"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "prosessorin käyttö"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "muistin käyttö"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "Lisätiedot"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Komento"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Tila"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "VM-koko"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Käyttäjä"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Lopeta"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Tapa"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Näytä käyttäjän prosessit"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Näytä pääkäyttäjän prosessit"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Näytä muut prosessit"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/fr.po
===================================================================
--- xfce4-taskmanager/trunk/po/fr.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/fr.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-09-11 17:51+0100\n"
 "Last-Translator: Maximilian Schleiss <maxschleiss at bluewin.ch>\n"
 "Language-Team: French <xfce-i18n at xfce.org>\n"
@@ -16,80 +16,100 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43
-#: ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "Gestionnaire de tâches Xfce4"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "Utilisation du processeur"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "Mémoire utilisée"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "Plus de détails"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Processus"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "État"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "Mémoire"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Continue"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Terminer"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Tuer"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Processus utilisateur"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Processus système"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Autres processus"
 
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/gl.po
===================================================================
--- xfce4-taskmanager/trunk/po/gl.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/gl.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-08-17 19:43+0000\n"
 "Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
 "Language-Team: Galician <gl at li.org>\n"
@@ -16,78 +16,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr ""
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr ""
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr ""
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr ""
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr ""
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Estado"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr ""
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr ""
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Usuario"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr ""
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr ""
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr ""
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr ""
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr ""
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Amosar as tarefas do usuario"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Amosar as tarefas de root"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Amosar outras tarefas"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/hu.po
===================================================================
--- xfce4-taskmanager/trunk/po/hu.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/hu.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-11-26 17:43+0100\n"
 "Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
@@ -15,80 +15,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43
-#: ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-folyamatkezelő"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "cpu használat"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "memória használat"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "részletek"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Parancs"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Állapot"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "VM-méret"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Felhasználó"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Megállítás"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Folytatás"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Leállítás"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Kilövés"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Felhasználói folyamatok megjelenítése"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Root folyamatok megjelenítése"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Más folyamatok megjelenítése"
 
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/ja.po
===================================================================
--- xfce4-taskmanager/trunk/po/ja.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/ja.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-04-01 17:57+0900\n"
 "Last-Translator: Daichi Kawahata <daichi at xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp at ml.fdiary.net>\n"
@@ -18,78 +18,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taskmanager"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr ""
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr ""
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "さらに詳しく"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "コマンド"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "状態"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "VMサイズ"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "ユーザー"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr ""
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "中止"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "続行"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "中断"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Kill"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "ユーザータスクを表示"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "ルートタスクを表示"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "その他のタスクを表示"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/nl.po
===================================================================
--- xfce4-taskmanager/trunk/po/nl.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/nl.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: xfce 4-taskmanager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2007-01-08 13:13+0100\n"
 "Last-Translator: Stephan Arts <stephan at xfce.org>\n"
 "Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -16,78 +16,100 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taakbeheer"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "cpu gebruik"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "geheugen gebruik"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "meer details"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Commando"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Status"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "VM-Grootte"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Verder"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Term"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Kill"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Toon gebruikers taken"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Toon root taken"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Toon andere taken"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/pl.po
===================================================================
--- xfce4-taskmanager/trunk/po/pl.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/pl.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-04-08 13:19+0900\n"
 "Last-Translator: Piotr Maliński <admin at rk.edu.pl>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -16,78 +16,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taskmanager"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "wykorzystanie procesora"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "wykorzystanie pamięci"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "więcej szczegółów"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Polecenie"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Stan"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "VM-Rozmiar"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Użytkownik"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Konsola"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Zabij"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Pokaż procesy użytkownika"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Pokaż procesy roota"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Pokaż inne procesy"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/pt_BR.po
===================================================================
--- xfce4-taskmanager/trunk/po/pt_BR.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/pt_BR.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-10-22 15:22-0200\n"
 "Last-Translator: Adriano Winter Bess <adriano at xfce.org>\n"
 "Language-Team: Brazilian Portuguese <xfce-i18n at xfce.org>\n"
@@ -17,78 +17,100 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taskmanager"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr "uso de cpu"
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr "uso de memória"
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "mais detalhes"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Comando"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Status"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "Tamanho VM"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Usuario"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Terminar"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Matar"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Exibir processos do usuario"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Exibir processos do root"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Exibir outros processos"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/ru.po
===================================================================
--- xfce4-taskmanager/trunk/po/ru.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/ru.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-03-24 21:52+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev at gmail.com>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -16,78 +16,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "Диспетчер задач Xfce 4"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr ""
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr ""
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "подробнее"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Команда"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Состояние"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "Память"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Пользователь"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr ""
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Остановить"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Продолжить"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Завершить"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Убить"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Показать задачи пользователя"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Показать задачи суперпользователя"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Показать другие задачи"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/vi.po
===================================================================
--- xfce4-taskmanager/trunk/po/vi.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/vi.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-02-19 22:52+0300\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi at vnlinux.org>\n"
 "Language-Team: Vietnamese <none at li.org>\n"
@@ -15,78 +15,100 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-taskmanager"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr ""
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr ""
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "chi tiết hơn"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "Câu lệnh"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "Trạng thái"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "Kích cỡ-VM"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "Người dùng"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr ""
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "Dừng"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Thoát"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "Diệt"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "Hiển thị công việc người dùng"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "Hiển thị công việc của root"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "Hiển thị những công việc khác"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/xfce4-taskmanager.pot
===================================================================
--- xfce4-taskmanager/trunk/po/xfce4-taskmanager.pot	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/xfce4-taskmanager.pot	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,78 +16,100 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr ""
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr ""
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr ""
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr ""
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr ""
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr ""
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr ""
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr ""
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr ""
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr ""
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr ""
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr ""
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr ""
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr ""
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr ""
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr ""
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr ""
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr ""
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr ""
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/po/zh_TW.po
===================================================================
--- xfce4-taskmanager/trunk/po/zh_TW.po	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/po/zh_TW.po	2007-01-13 10:12:31 UTC (rev 2350)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-10 21:29+0200\n"
+"POT-Creation-Date: 2007-01-13 11:01+0100\n"
 "PO-Revision-Date: 2006-07-29 00:09+0800\n"
 "Last-Translator: Cosmo Chene <cosmolax at ubuntu.org.tw>\n"
 "Language-Team: Tradictional Chinese <zh-l10n at linux.org.tw>\n"
@@ -16,78 +16,100 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/interface.c:43 ../src/interface.c:257
+#: ../src/callbacks.c:60
+msgid "Really kill the task?"
+msgstr ""
+
+#: ../src/callbacks.c:61
+msgid "Really terminate the task?"
+msgstr ""
+
+#: ../src/functions.c:124
+#, c-format
+msgid "%d kB of %d kB used"
+msgstr ""
+
+#: ../src/functions.c:129
+#, c-format
+msgid "%0.0f %%"
+msgstr ""
+
+#: ../src/interface.c:45 ../src/interface.c:272
 msgid "xfce4-taskmanager"
 msgstr "xfce4-工作管理員"
 
-#: ../src/interface.c:56
+#: ../src/interface.c:59
 msgid "cpu usage"
 msgstr ""
 
-#: ../src/interface.c:61
+#: ../src/interface.c:67
 msgid "memory usage"
 msgstr ""
 
-#: ../src/interface.c:91
+#: ../src/interface.c:99
 msgid "more details"
 msgstr "更多細節"
 
-#: ../src/interface.c:117
+#: ../src/interface.c:125
 msgid "Command"
 msgstr "命令"
 
-#: ../src/interface.c:123
+#: ../src/interface.c:131
 msgid "PID"
 msgstr "PID"
 
-#: ../src/interface.c:129
+#: ../src/interface.c:137
 msgid "PPID"
 msgstr "PPID"
 
-#: ../src/interface.c:135
+#: ../src/interface.c:143
 msgid "State"
 msgstr "狀態"
 
-#: ../src/interface.c:141
+#: ../src/interface.c:149
 msgid "VM-Size"
 msgstr "虛擬記憶體容量"
 
-#: ../src/interface.c:147
+#: ../src/interface.c:155
 msgid "RSS"
 msgstr "RSS"
 
-#: ../src/interface.c:153
+#: ../src/interface.c:161
 msgid "User"
 msgstr "使用者"
 
-#: ../src/interface.c:159
+#: ../src/interface.c:167
 msgid "CPU%"
 msgstr "CPU%"
 
-#: ../src/interface.c:175
+#: ../src/interface.c:183
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/interface.c:180
+#: ../src/interface.c:188
 msgid "Continue"
 msgstr "繼續"
 
-#: ../src/interface.c:185
+#: ../src/interface.c:193
 msgid "Term"
 msgstr "Term"
 
-#: ../src/interface.c:190
+#: ../src/interface.c:198
 msgid "Kill"
 msgstr "強行中止"
 
-#: ../src/interface.c:221
+#: ../src/interface.c:230
 msgid "Show user tasks"
 msgstr "顯示使用者工作"
 
-#: ../src/interface.c:226
+#: ../src/interface.c:235
 msgid "Show root tasks"
 msgstr "顯示 root 工作"
 
-#: ../src/interface.c:231
+#: ../src/interface.c:240
 msgid "Show other tasks"
 msgstr "顯示其他工作"
+
+#: ../src/interface.c:245
+msgid "Show memory used by cache as free"
+msgstr ""

Modified: xfce4-taskmanager/trunk/src/Makefile.am
===================================================================
--- xfce4-taskmanager/trunk/src/Makefile.am	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/Makefile.am	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,27 +1,33 @@
- at SET_MAKE@
+# $Id$
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES =								\
+	-I$(top_srcdir)/include						\
+	-DG_LOG_DOMAIN=\"xfce4-taskmanager\"				\
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
-bin_PROGRAMS = xfce4-taskmanager
+bin_PROGRAMS =								\
+	xfce4-taskmanager
 
-xfce4_taskmanager_SOURCES = \
-	main.c \
-	callbacks.c callbacks.h \
-	functions.c functions.h \
-	interface.c interface.h \
-	xfce-taskmanager-linux.c xfce-taskmanager-linux.h \
+xfce4_taskmanager_SOURCES =						\
+	main.c								\
+	callbacks.c							\
+	callbacks.h							\
+	functions.c							\
+	functions.h							\
+	interface.c							\
+	interface.h							\
+	xfce-taskmanager-linux.c					\
+	xfce-taskmanager-linux.h					\
 	types.h
 
-xfce4_taskmanager_CFLAGS =							\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"                           \
-	@XFCE4_GUI_CFLAGS@ \
-	@GTK_CFLAGS@ 
+xfce4_taskmanager_CFLAGS =						\
+	$(LIBXFCEGUI4_CFLAGS)						\
+	$(LIBXFCE4UTIL_CFLAGS)						\
+	$(GTK_CFLAGS)
 	
-xfce4_taskmanager_LDADD = 							\
-	@XFCE4_GUI_LIBS@ \
-	@GTK_LIBS@ 
+xfce4_taskmanager_LDADD = 						\
+	$(LIBXFCEGUI4_LIBS)						\
+	$(LIBXFCE4UTIL_LIBS)						\
+	$(GTK_LIBS)
 
-ACLOCAL_AMFLAGS = -I m4
-
-dist-bz2: dist
-	zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: xfce4-taskmanager/trunk/src/callbacks.c
===================================================================
--- xfce4-taskmanager/trunk/src/callbacks.c	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/callbacks.c	2007-01-13 10:12:31 UTC (rev 2350)
@@ -11,7 +11,7 @@
  *  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 Library General Public License for more details.
+ *  GNU Library  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


Property changes on: xfce4-taskmanager/trunk/src/callbacks.c
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: xfce4-taskmanager/trunk/src/callbacks.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/functions.c
===================================================================
--- xfce4-taskmanager/trunk/src/functions.c	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/functions.c	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,21 +1,20 @@
-/*
- *  xfce4-taskmanager - very simple taskmanger
+/* $Id$
  *
- *  Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
  *
- *  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 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 Library General Public License for more details.
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "functions.h"
@@ -29,8 +28,14 @@
 	GArray *new_task_list;
 	gchar *cpu_tooltip, *mem_tooltip;
 	gdouble cpu_usage;
+	guint num_cpus;
 	guint memory_used;
 
+	if (sys_stat!=NULL)
+	    num_cpus = sys_stat->cpu_count;
+	else
+	    num_cpus = 1;
+
 	/* gets the new task list */
 	new_task_list = (GArray*) get_task_list();
 
@@ -50,8 +55,7 @@
 				
 				tmp->time = new_tmp->time;
 				
-				
-				tmp->time_percentage = (gdouble)(tmp->time - tmp->old_time) * (gdouble)(1000.0 / REFRESH_INTERVAL);
+				tmp->time_percentage = (gdouble)(tmp->time - tmp->old_time) * (gdouble)(1000.0 / (REFRESH_INTERVAL*num_cpus));
 				if((gint)tmp->ppid != (gint)new_tmp->ppid || strcmp(tmp->state,new_tmp->state) || (unsigned int)tmp->size != (unsigned int)new_tmp->size || (unsigned int)tmp->rss != (unsigned int)new_tmp->rss || (unsigned int)tmp->time != (unsigned int)tmp->old_time)
 				{
 					tmp->ppid = new_tmp->ppid;


Property changes on: xfce4-taskmanager/trunk/src/functions.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/functions.h
===================================================================
--- xfce4-taskmanager/trunk/src/functions.h	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/functions.h	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,21 +1,20 @@
-/*
- *  xfce4-taskmanager - very simple taskmanger
+/* $Id$
  *
- *  Copyright (c) 2005 Johannes Zellner, <webmaster at nebulon.de>
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
  *
- *  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 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 Library General Public License for more details.
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef FUNCTIONS_H


Property changes on: xfce4-taskmanager/trunk/src/functions.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/interface.c
===================================================================
--- xfce4-taskmanager/trunk/src/interface.c	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/interface.c	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,21 +1,20 @@
-/*
- *  xfce4-taskmanager - very simple taskmanger
+/* $Id$
  *
- *  Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
  *
- *  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 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 Library General Public License for more details.
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "interface.h"


Property changes on: xfce4-taskmanager/trunk/src/interface.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/interface.h
===================================================================
--- xfce4-taskmanager/trunk/src/interface.h	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/interface.h	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,21 +1,20 @@
-/*
- *  xfce4-taskmanager - very simple taskmanger
+/* $Id$
  *
- *  Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
  *
- *  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 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 Library General Public License for more details.
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef INTERFACE_H


Property changes on: xfce4-taskmanager/trunk/src/interface.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/main.c
===================================================================
--- xfce4-taskmanager/trunk/src/main.c	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/main.c	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,21 +1,20 @@
-/*
- *  xfce4-taskmanager - very simple taskmanger
+/* $Id$
  *
- *  Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
  *
- *  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 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 Library General Public License for more details.
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifdef HAVE_CONFIG_H


Property changes on: xfce4-taskmanager/trunk/src/main.c
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/types.h
===================================================================
--- xfce4-taskmanager/trunk/src/types.h	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/types.h	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,21 +1,20 @@
-/*
- *  xfce4-taskmanager - very simple taskmanger
+/* $Id$
  *
- *  Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
  *
- *  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 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 Library General Public License for more details.
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #ifndef TYPES_H


Property changes on: xfce4-taskmanager/trunk/src/types.h
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c
===================================================================
--- xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,3 +1,21 @@
+/* $Id$
+ *
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ *
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
 
 #include "xfce-taskmanager-linux.h"
 


Property changes on: xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.c
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:keywords
   + Id

Modified: xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.h
===================================================================
--- xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.h	2007-01-12 22:46:08 UTC (rev 2349)
+++ xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.h	2007-01-13 10:12:31 UTC (rev 2350)
@@ -1,3 +1,22 @@
+/* $Id$
+ *
+ * Copyright (c) 2006 Johannes Zellner, <webmaster at nebulon.de>
+ *
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
 #ifndef LINUX_H
 #define LINUX_H
 
@@ -12,7 +31,7 @@
 #include "types.h"
 
 struct task get_task_details(gint pid);
-GArray *get_task_list(void);
+GArray *get_task_list(void); 
 gboolean get_system_status(system_status *sys_stat);
 gboolean get_cpu_usage_from_proc(system_status *sys_stat);
 


Property changes on: xfce4-taskmanager/trunk/src/xfce-taskmanager-linux.h
___________________________________________________________________
Name: svn:executable
   - *
Name: svn:keywords
   + Id

More information about the Goodies-commits mailing list