Set .rtime. At last !

* proctime.c: (glibtop_get_proc_time_s): Set .rtime. At last !
ankit@redhat.com * Changed some wrong rendered characters
2004-10-26 20:26:25 +00:00 · 2004-10-26 12:06:56 +00:00 · 2004-10-22 15:35:57 +00:00 · 2004-10-11 18:11:48 +00:00 · 2004-10-11 18:01:25 +00:00 · 2004-10-10 17:21:57 +00:00
366 changed files with 32492 additions and 16004 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -34,3 +34,8 @@ libgtop*.tar.gz
 *-debstamp
 libgtop*.pc
 autom4te.cache
+COPYING
+INSTALL
+install-sh
+missing
+mkinstalldirs
--- a/1
+++ b/1
@@ -1,2 +1,3 @@
 Martin Baulig (martin@home-of-linux.org)
 Drazen Kacar (dave@srce.hr)
+Beno<EFBFBD>t Dejean (tazforever@dlfp.org)
--- a/539
+++ b/539
@@ -1,11 +1,378 @@
+2004-10-11  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS: Released 2.8.1.
+
+2004-10-10  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/init.c: Replaced C99 initializer.
+	
+	* lib/read.c: (do_read): 1-line cleanup.
+
+2004-10-09  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: Depends on glib 2.4.0
+
+2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
+
+	* glibtop.h: Added missing include <glibtop/close.h>.
+
+2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: CFLAGS: Removed -W, added -Winline.
+
+2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>
+                                                                                
+        * configure.in: Added 'or' to ALL_LINGUAS.
+ 
+2004-09-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: bumped to 2.8.1.
+	
+	* sysdeps/common/fsusage.c:
+	* sysdeps/common/gnuslib.c: (glibtop_make_connection),
+	(connect_to_unix_server), (glibtop_internet_addr):
+	* sysdeps/linux/glibtop_server.c: (get_pageshift):
+	* sysdeps/linux/glibtop_server.h:
+	* sysdeps/linux/open.c: (glibtop_open_s):
+	* sysdeps/linux/ppp.c: (is_ISDN_on): Cleanups. Thanks to Kjartan Maraas.
+	Closes #151557.
+
+2004-09-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: 2.8.0
+
+2004-08-30  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS: Released 2.7.92.
+
+2004-08-28  Benoît Dejean  <tazforever@dlfp.org>
+
+	* backends/server/command.c: (glibtop_call_i): Zeroed all args.	
+	
+	* configure.in: Bumped soname (thanks to seb128 and Dodji even if i've
+	fully understand everything.	
+	
+	* include/glibtop/array.h:
+	* include/glibtop/compat_10.h:
+	* include/glibtop/glib-arrays.h:
+	* include/glibtop/interfaces.h:
+	* include/glibtop/proccwd.h:
+	* lib/glib-arrays.c:
+	* sysdeps/names/interfaces.c:
+	* sysdeps/names/proccwd.c: Got rid of never-used / never-implemented files.
+
+2004-08-28  Akagic Amila  <bono@linux.org.ba>
+
+        * configure.in: Added 'bs' to ALL_LINGUAS.
+
+2004-08-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/command.c: (glibtop_call_l): Zeroed all args.
+
+2004-08-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Add «nb» to ALL_LINGUAS.
+
+2004-08-15  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: LibGTop 2.7.91.
+
+2004-08-09  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: Added HAVE_IFADDRS_H
+	* sysdeps/linux/netload.c: (glibtop_get_netload_s): Disable IPv6
+	support is ifaddrs.h is not available.
+
+	Closes #149376.
+
+2004-08-09  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: Added -gnu89 to CFLAGS.
+
+	* examples/Makefile.am: Fixed LDFLAGS.
+
+	* sysdeps/common/fsusage.c: (glibtop_get_fsusage_s):
+	* sysdeps/linux/fsusage.c: (linux_2_6_0):
+	* sysdeps/linux/proctime.c: (glibtop_get_proc_time_s):
+	* sysdeps/linux/sysinfo.c: (init_sysinfo): Fixed C89 issues.
+
+	Closes #149375.
+
+2004-08-03  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: LibGTop 2.7.90.
+
+2004-07-20  Benoît Dejean  <tazforever@dlfp.org>
+
+	* configure.in: LibGTop 2.7.5.
+
+2004-07-20  Benoît Dejean  <tazforever@dlfp.org>
+
+	* NEWS:
+	* configure.in: Released LibGTop 2.7.4.
+
+2004-07-18  Benoît Dejean  <tazforever@dlfp.org>
+
+	* doc/reference.texi:
+	* include/glibtop/command.h:
+	* include/glibtop/glib-arrays.h:
+	* include/glibtop/proclist.h:
+	* lib/glib-arrays.c: (glibtop_get_proclist_as_array_l):
+	* lib/lib.pl:
+	* scripts/c_types.pl:
+	* src/daemon/main.c: (handle_parent_connection):
+	* src/daemon/slave.c: (handle_slave_connection):
+	* support/mkstemp.c:
+	* sysdeps/aix/proclist.c: (glibtop_get_proclist_s):
+	* sysdeps/freebsd/cpu.c: (glibtop_get_cpu_p):
+	* sysdeps/freebsd/prockernel.c: (glibtop_get_proc_kernel_p):
+	* sysdeps/freebsd/proclist.c: (glibtop_get_proclist_p):
+	* sysdeps/freebsd/procmem.c: (glibtop_get_proc_mem_p):
+	* sysdeps/kernel/proclist.c: (glibtop_get_proclist_s):
+	* sysdeps/linux/proclist.c: (glibtop_get_proclist_s):
+	* sysdeps/osf1/proclist.c: (glibtop_get_proclist_p):
+	* sysdeps/solaris/proclist.c: (glibtop_get_proclist_s):
+	* sysdeps/stub/proclist.c: (glibtop_get_proclist_s):
+	* sysdeps/stub_suid/proclist.c: (glibtop_get_proclist_p):
+	* sysdeps/sun4/proclist.c: (glibtop_get_proclist_p): Glibify a bit more.
+	Closes #147618.
+
+2004-07-17  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/fsusage.h: Added read, write. This members provides
+	total read and write in bytes since boot_time.
+	
+	* include/glibtop/netload.h: Added hwaddress : provides harware address,
+	eg MAC address. mtu, address and subnet are now guint32.
+
+2004-07-15  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/procstate.h: Added GLIBTOP_PROCESS_DEAD constant.
+
+2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/procargs.h: Added new glibtop_get_proc_argv*() functions.
+	These are more easier to use than glibtop_get_proc_args*(). They return
+	a NULL-terminated array of string (like main's char* argv[]).
+
+2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/netinfo.h:
+	* structures.def:
+	* sysdeps/names/netinfo.c: Removed netinfo.[ch] that were never used.
+
+2004-07-03  Benoît Dejean  <tazforever@dlfp.org>
+
+	* sysdeps/names/fsusage.c: Added missing fsusage names.
+
+2004-07-03  Benoît Dejean  <tazforever@dlfp.org>
+
+	* glibtop.h: Moved foward declaration of glibtop to break circular
+	#includes dependencies.
+
+2004-06-18  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/error.h: Also tries C99 __VA_ARGS__ before using
+	functions.
+
+	* include/glibtop/error.h: Moved 8 static error functions to
+	sysdeps/common/error.c. This is the end of an big useless code
+	bloat : expect ~8KB of object size reduction.
+
+	* include/glibtop/procuid.h: s/int/gint32/g
+
+	* lib/errors.c: (glibtop_error_quark):
+	* lib/read.c: (do_read), (glibtop_read_l):
+	* lib/read_data.c: (glibtop_read_data_l): Minor cleanups.
+
+	* sysdeps/names/netload.c:
+	* include/glibtop/netload.h: Added IPv6 feature : provides address,
+	prefix and scope. This breaks the ABI. Not documented yet : check
+	this file.
+
+2004-06-13  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/sysinfo.h: Changed get_sysinfo prototype so that it
+	returns a const pointer. Added missing macro.
+
+2004-06-12  Benoît Dejean  <tazforever@dlfp.org>
+
+	* include/glibtop/fsusage.h: block_size is now defined as a guint32
+	instead of a fuzzy gint.
+
+	* lib/sysdeps.c: (glibtop_get_sysdeps_r): Small cleanup.
+
+	* lib/init.c: Added missing initializer.
+
+2004-06-09  Benoît Dejean <TazForEver@dlfp.org>
+
+	* *.{c,h} : whitespace clean up.
+
+2004-06-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* lib/parameter.c:
+	* support/popt.c: (poptGetContext): Cleaned.
+
+	* support/vsnprintf.c: s/strncpy/g_strlcpy
+
+2004-05-28  Benoît Dejean <TazForEver@free.fr>
+
+	* examples/*: Added missing #include.
+	* ChangeLog: Converted to UTF-8.
+
+2004-04-16  Iñaki Larrañaga  <dooteo@euskalgnu.org>
+
+	* configure.in: Added "eu" (Basque) to ALL_LINGUAS.
+
+2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
+
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in: version 2.6.0
+
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: fix typo in the #defines for
+	FSUSAGE_BLOCK_SIZE (patch by Benoît Dejean <TazForEver@free.fr>)
+
+2004-03-30  Adam Weinberger  <adamw@gnome.org>
+
+	* configure.in: Added en_CA (Canadian English) to ALL_LINGUAS.
+
+2004-03-22  Gareth Owen  <gowen72@yahoo.com>
+
+	* configure.in: Added en_GB to ALL_LINGUAS
+
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "pa" (Punjabi) to ALL_LINGUAS.
+
+2004-03-15  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: set GLIBTOP_MAX_FSUSAGE properly,
+	use gint in the headers instead of int (Closes: #125049)
+
+2004-03-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Up versions etc.
+	* po/am.po: Update foo.
+	* po/ar.po:
+	* po/az.po:
+	* po/be.po:
+	* po/bg.po:
+	* po/bn.po:
+	* po/ca.po:
+	* po/cs.po:
+	* po/cy.po:
+	* po/da.po:
+	* po/de.po:
+	* po/el.po:
+	* po/es.po:
+	* po/et.po:
+	* po/fa.po:
+	* po/fi.po:
+	* po/fr.po:
+	* po/ga.po:
+	* po/gl.po:
+	* po/he.po:
+	* po/hi.po:
+	* po/hr.po:
+	* po/hu.po:
+	* po/id.po:
+	* po/it.po:
+	* po/ja.po:
+	* po/ko.po:
+	* po/lt.po:
+	* po/lv.po:
+	* po/mk.po:
+	* po/ml.po:
+	* po/mn.po:
+	* po/ms.po:
+	* po/nl.po:
+	* po/nn.po:
+	* po/no.po:
+	* po/pl.po:
+	* po/pt.po:
+	* po/pt_BR.po:
+	* po/ro.po:
+	* po/ru.po:
+	* po/sk.po:
+	* po/sl.po:
+	* po/sq.po:
+	* po/sr.po:
+	* po/sr@Latn.po:
+	* po/sv.po:
+	* po/ta.po:
+	* po/tr.po:
+	* po/uk.po:
+	* po/vi.po:
+	* po/zh_CN.po:
+	* po/zh_TW.po:
+
+2004-03-11  Bastien Nocera  <hadess@hadess.net>
+
+	* NEWS: update the NEWS file for the release
+
+2004-03-11  Bastien Nocera  <hadess@hadess.net>
+
+	* include/Makefile.am: fix distchecking
+
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* include/glibtop/fsusage.h: Added block_size field. (Closes: #125049)
+
+2004-03-05  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/procmap.h: patch by Benoît Dejean <bnet@ifrance.com>
+	to break the API, I mean, to make it easier to generate Python bindings
+	(Closes: #129701)
+
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in:
+	* include/libgtop-i18n.h:
+	* lib/lib.pl:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* sysdeps/names/cpu.c:
+	* sysdeps/names/fsusage.c:
+	* sysdeps/names/loadavg.c:
+	* sysdeps/names/mem.c:
+	* sysdeps/names/mountlist.c:
+	* sysdeps/names/msg_limits.c:
+	* sysdeps/names/netload.c:
+	* sysdeps/names/ppp.c:
+	* sysdeps/names/procargs.c:
+	* sysdeps/names/prockernel.c:
+	* sysdeps/names/proclist.c:
+	* sysdeps/names/procmap.c:
+	* sysdeps/names/procmem.c:
+	* sysdeps/names/procsegment.c:
+	* sysdeps/names/procsignal.c:
+	* sysdeps/names/procstate.c:
+	* sysdeps/names/proctime.c:
+	* sysdeps/names/procuid.c:
+	* sysdeps/names/sem_limits.c:
+	* sysdeps/names/shm_limits.c:
+	* sysdeps/names/swap.c:
+	* sysdeps/names/sysdeps.c:
+	* sysdeps/names/uptime.c: remove dependency on libgnome,
+	check for linux/isdn.h for distros using the 2.6 kernel headers
+
 2004-02-07  Kevin Vandersloot

 	* configure.in: release 2.5.1

 2004-02-02  Sebastien Bacher  <seb128@debian.org>

-	* sysdeps/linux/mem.c: (glibtop_get_mem_s): patch from 
-	Benoît Dejean <bnet@ifrance.com> to fix libtop_mem.used 
+	* sysdeps/linux/mem.c: (glibtop_get_mem_s): patch from
+	BenoÃ®t Dejean <bnet@ifrance.com> to fix libtop_mem.used
 	and glibtop_mem.shared values (Closes: #129863).

 Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
@@ -31,7 +398,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* configure.in: remove linking to libgtop and checks for 64-bit
 	integer bytes (fixes warning on build on glib 2.0 systems)

-2003-11-02  Ćœygimantas BeruÄka  <uid0@tuxfamily.org>
+2003-11-02  ÄÅygimantas BeruÃÂka  <uid0@tuxfamily.org>

 	* configure.in: Added "lt" to ALL_LINGUAS.

@@ -250,13 +617,13 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: make it compile

-2003-10-19  Carlos PerellĂł MarĂn <carlos@gnome.org>
+2003-10-19  Carlos PerellÄÅ MarÄÂn <carlos@gnome.org>

 	* support/*: Reverted libgtop changes. It's a common module
 	and I should not modify it.
 	* Added/removed files. Now the move should be done.

-2003-10-19  Carlos PerellĂł MarĂn <carlos@gnome.org>
+2003-10-19  Carlos PerellÄÅ MarÄÂn <carlos@gnome.org>

 	* libgtop-GNOME-2-0-branch moved to HEAD.

@@ -268,7 +635,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: Added "ta" (Tamil) to the languages' list.

-2003-09-13  Carlos PerellĂł MarĂn <carlos@gnome.org>
+2003-09-13  Carlos PerellÄÅ MarÄÂn <carlos@gnome.org>

 	* configure.in (ALL_LINGUAS):  Removed es_ES.

@@ -321,7 +688,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: release 2.0.2

-2003-05-10  Danilo Ć egan  <dsegan@gmx.net>
+2003-05-10  Danilo ÄÂ egan  <dsegan@gmx.net>

 	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.

@@ -341,7 +708,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: Added he to ALL_LINGUAS.

-2003-02-25  T?Â”ivo Leedj?Â€rv  <toivo@linux.ee>
+2003-02-25  T?Ãâivo Leedj?Ãâ¬rv  <toivo@linux.ee>

 	* configure.in: Added et to ALL_LINGUAS.

@@ -375,7 +742,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 2003-01-16  Daniel Yacob <locales@geez.org>

 	* configure.in: added am to ALL_LINGUAS
-	
+
 2003-01-12  Kevin Vandersloot <kfv101@psu.edu>

 	* configure.in: release 2.0.1
@@ -388,7 +755,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* Framework for AIX support

-2002-08-07  Vincent Berger <Vincent.Berger@ext.bull.net> 
+2002-08-07  Vincent Berger <Vincent.Berger@ext.bull.net>

 	* support/: Add alloca management for AIX
 	* configure.in: correct checking for nm
@@ -470,7 +837,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* acininclude.m4: add back the support stuf but make it really
 	work

-	* configure.in: bump version number, add back GNOME_SUPPORT 
+	* configure.in: bump version number, add back GNOME_SUPPORT
 	check since that was causing a build failure

 	* release 1.90.1
@@ -517,7 +884,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* port stable libgtop to GNOME 2.0. Too much to detail.
 	pkgconfig is now used. Libs are named libgtop-2.0 etc for
-	parallel install. 
+	parallel install.

 2001-10-17  Abel Chueng  <maddog@linux.org.hk>

@@ -663,7 +1030,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 1999-09-22  Kjartan Maraas  <kmaraas@online.no>

 	* configure.in: Added "da" to ALL_LINGUAS.
-	
+
 1999-09-19  Martin Baulig  <martin@home-of-linux.org>

 	* libgtopConf.sh.in: Added MODULE_VERSION on Miguel's
@@ -888,7 +1255,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	contain all possible features.

 	* configure.in: LibGTop will now require GLIB >= 1.1.12.
-	
+
 1999-01-05  Martin Baulig  <martin@home-of-linux.org>

 	* configure.in: Make it abort if the `dc' utility is not installed.
@@ -1054,7 +1421,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	here.

 	[NOTE for people porting libgtop:
-	
+
 	 Please use all 64 bits of the `guint64' and not just 32 - the
 	 signal number (as it is used in calls to kill () ...) should be
 	 a bit-index into this field; if a process ignores for instance
@@ -1235,7 +1602,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* LIBGTOP-VERSION: Set version number to 0.25.0. There is now really
 	a feature freeze until it's released, bug fixes only ...
-	
+
 	* include/glibtop/procmap (glibtop_map_entry): Added `flags' and
 	`filename' fields.

@@ -1243,7 +1610,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* libgtopConf.sh.in: Likewise.

 	* libgtopConf.sh.in: Added `LIBGTOP_EXTRA_LIBS'.
-	
+
 	* sysdeps/linux/procmap.c: Added implementation.

 1998-08-17  Martin Baulig  <martin@home-of-linux.org>
@@ -1333,7 +1700,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* LIBGTOP-VERSION: Added `LIBGTOP_SERVER_VERSION'.
 	* src/daemon/gnuserv.c, lib/open.c: Improved version check between
 	client and server.
-	
+
 	* include/glibtop/output.h: Removed.

 	* sysdeps/stub_suid: New directory. This is mainly used as example
@@ -1344,7 +1711,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* sysdeps/osf1/*.c (glibtop_init_<no-suid-feature>_s): New functions.
 	(glibtop_init_<suid-feature>_p): New functions.
-	
+
 1998-08-07  Martin Baulig  <martin@home-of-linux.org>

 	* glibtop.h (_glibtop): New fields `error_method', `sysdeps' and
@@ -1520,7 +1887,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* lib/open.c (glibtop_open_l): Unconditionally calling
 	`glibtop_init_s' after server initialization.
-	
+
 	* lib/lib.awk: Removed references to functions from
 	`libgtop_sysdeps_suid.la' to avoid undefined symbols.

@@ -1541,20 +1908,20 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* sysdeps/linux/close.c (glibtop_close_s): Renamed this
 	function from `glibtop_close_l'.
-	
+
 	* sysdeps/osf1/Makefile.am (lib_LTLIBRARIES): Added
 	`libgtop_sysdeps_suid.la' for the suid server.
-	
+
 	* sysdeps/osf1/open_suid.c (glibtop_open_p): New file.
 	Contains all stuff that was formerly in `open.c'.
-	
+
 	* sysdeps/osf1/open.c: Moved everything from here into
 	the new file `open_suid.c'.
-	
+
 	* sysdeps/osf1/open.c (glibtop_open_s): New function.
-	
+
 	* sysdeps/osf1/close_suid.c (glibtop_close_p): New file.
-	
+
 	* sysdeps/osf1/close.c (glibtop_close_s): New function.

 	* sysdeps/osf1/*.c: Using the new init, open and close
@@ -1597,7 +1964,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 1998-07-18  Martin Baulig  <martin@home-of-linux.org>

 	* lib/{init, open}.c: Added `GLIBTOP_METHOD_PIPE' again.
-	
+
 	* src/server/main.c: Removed gettext stuff.

 1998-07-17  Martin Baulig  <baulig@Stud.Informatik.uni-trier.de>
@@ -1606,10 +1973,10 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	library functions with '_l' prefix instead of directly calling
 	sysdeps code with '_r' prefix. This is necessary for client/server
 	mode.
-	
+
 	* lib/lib.awk (glibtop_get_*): Now correctly using
 	`(1 << GLIBTOP_SYSDEPS_*)' instead of `GLIBTOP_SYSDEPS_*'.
-	
+
 	* sysdeps/sun4/proclist.c (glibtop_get_proclist_p): Added
 	implementation of that feature.

@@ -1617,7 +1984,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* sysdeps/sun4/proc_{mem, time, signal, kernel, segment}.c: Added
 	some basic implementation; this isn't really working yet.
-	
+
 	* sysdeps/linux/sem_limits.c: Applied patch from Albert K T Hui
 	<avatar@deva.net> for glibc 2.1.

@@ -1637,7 +2004,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 1998-07-14  Martin Baulig  <baulig@Stud.Informatik.uni-trier.de>

 	* src/daemon/server_config.h.in: Added some comments.
-	
+
 	* src/daemon/server_config.pl: New file. This is a script you can use
 	to create `server_config.h'. It will query you for some configuration
 	options.
@@ -1662,11 +2029,11 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* src/daemon/slave.c: New file.

 	* src/daemon/*.c: Done some more work on the daemon.
-	
+
 	* sysdeps/common/gnuslib.c: Removed IPC stuff.
-	
+
 	* include/glibtop/gnuserv.h: Removed IPC stuff.
-	
+
 	* include/glibtop/command.h (glibtop_response_unit): Added
 	typedef for `struct _glibtop_response_unit'.

@@ -1696,7 +2063,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* sysdeps/linux/procstate.c: Added missing `fclose'.

 	* include/glibtop/gnuserv.h (UNIX_DOMAIN_SOCKETS): Defining.
-	
+
 	* include/glibtop/open.h (GLIBTOP_METHOD_UNIX): Added.

 	* lib/init.c: Added new method `GLIBTOP_METHOD_UNIX'.
@@ -1784,12 +2151,12 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* lib/xmalloc.c (g_strdup): New function.

 	* lib/gnuclient.c: Removed.
-	
+
 	* lib/{command, write, read}.c: Changed client <-> server
 	interface to make less system calls.

 	* src/daemon/main.c: Changed server side of interface.
-	
+
 	* include/glibtop/command.h (struct _glibtop_response): New
 	structure to return data from the server to the client.

@@ -1860,7 +2227,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* include/glibtop/sysdeps.h (glibtop_types_sysdeps):
 	Forgot to change declaration on Jun 6.
-	
+
 	* sysdeps/names/sysdeps.c (glibtop_types_sysdeps):
 	Using numeric constants from `types.h' instead of string
 	constants; forgot to change this on Jun 6. Added information
@@ -1887,30 +2254,30 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 1998-06-07  Martin Baulig  <martin@home-of-linux.org>

 	* examples/ChangeLog: New file.
-	
+
 	* macros/gnome-libgtop-sysdeps.m4: Include
 	`glibtop_machine.h' for Linux.
-	
+
 	* sysdeps/linux/glibtop_machine.h: New file.
-	
+
 	* sysdeps/linux/*.c: Performance optimizations. We now use
 	`open' and `read' instead of `fopen' and `fscanf'.
-	
+
 	* *.[ch]: Using single underscore instead of two underscores
 	for function prefixes (regexp: ``s,__([rspl])\b,_$1,g'') to
 	avoid ambiguity with mangled C++ names.
-	
+
 1998-06-06  Martin Baulig  <martin@home-of-linux.org>

 	* sysdeps/osf1/glibtop_server.h: New file.
-	
+
 	* sysdeps/osf1/*.c: renamed all functions implementing
 	features that don't need to be suid to '__s'.

 	* sysdeps/names/procdata.c: Removed that file.
-	
+
 	* include/glibtop/*.h (glibtop_types_*): Changed declaration.
-	
+
 	* glibtop.h: Added `#include <types.h>'.

 	* include/glibtop/types.h: New file - numeric constants
@@ -1936,10 +2303,10 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 1998-06-03  Martin Baulig  <baulig@merkur.uni-trier.de>

 	* libgtop.spec: New file.
-	
+
 	* Makefile.am (EXTRA_DIST): Added `autogen.sh' and
 	`libgtop.spec'.
-	
+
 	* configure.in (LIBGTOP_INCS): is now identically to
 	`LIBGTOP_GUILE_INCS'.

@@ -1976,7 +2343,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* NEWS: added more detailed description of today's and
 	yesterday's changes.
-	
+
 	* include/glibtop/*.h: to use the ChangeLog entry from May 28:
 	'__l' is a function defined in the client part;
 	'__s' is a function defined in the sysdeps part and
@@ -2009,26 +2376,26 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* src/server/main.c: we now use the '__p' functions,
 	but only if the appropriate 'GLIBTOP_SUID_<feature>'
 	has a non-zero value.
-	
-	* configure.in (@machine_incs@): always use 
+
+	* configure.in (@machine_incs@): always use
 	`-I$(top_srcdir)/sysdeps/@sysdeps_dir@'; it's no
 	longer conditional.

 	* examples/Makefile.am: removed the '_linux' examples.
-	
+
 	* sysdeps/linux/*.c: renamed all functions implementing
 	features to '__s'.
-	
+
 	* lib/*.c: renamed all functions implementing features
 	to '__l'; we only emit code for those functions if the
 	corresponding 'GLIBTOP_SUID_<feature>' has a positive value.
-	
+
 	* include/glibtop/*.h: added some new function suffixes:
 	'__l' is a function defined in the client part;
 	'__s' is a function defined in the sysdeps part and
 	'__p' is a function that needs special priviledges.
 	'__r' is mapped either on '__l' or on '__s'.
-	
+
 	* sysdeps/linux/glibtop_server.h: New file -
 	defines system dependent constants 'GLIBTOP_SUID_<feature>'
 	being either 'GLIBTOP_SYSDEPS_<feature>'+1 depending upon
@@ -2094,9 +2461,9 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	'libgtop_use_machine_h', 'libgtop_guile_found',
 	'libgtop_want_names', 'libgtop_want_guile_names',
 	'libgtop_want_examples'.
-	
+
 	* gtopConf.sh.in: renamed to 'libgtopConf.sh.in'.
-	
+
 	* acinclude.m4 (AC_LC_SYSDEPS): rewrote that macro -
 	moved some of the code to 'macros/gnome-libgtop-sysdeps.m4';
 	renamed variables: look at the ChangeLog entry for the
@@ -2159,7 +2526,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* NEWS: added more detailed description of
 	today's changes.
-	
+
 	* examples/third.c: added required check for
 	'GLIBGTOP_GUILE_NAMES'.

@@ -2193,20 +2560,20 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* sysdeps/osf1/procuid.c (glibtop_get_proc_uid__r):
 	added implementation for DEC OSF/1.
-	
+
 	* sysdeps/sun4/uptime.c: forgot to checkin

 	* sysdeps/sun4/loadavg.c: forgot to checkin
-	
+
 	* sysdeps/osf1/uptime.c: forgot to checkin
-	
+
 	* sysdeps/osf1/loadavg.c: forgot to checkin

 1998-05-19  Martin Baulig  <baulig@merkur.uni-trier.de>

 	* sysdeps/stub/uptime.c: forgot this file all the
 	time - stub for glibtop_uptime
-	
+
 	* sysdeps/stub/loadavg.c: forgot this file all the
 	time - stub for glibtop_loadavg

@@ -2225,7 +2592,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* include/glibtop: added references to
 	'glibtop_types_* []' and 'glibtop_guile_types_*'.
-		
+
 	* sysdeps/guile/names: added implementations of
 	'glibtop_types_*' and 'glibtop_description_*'.

@@ -2240,7 +2607,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* sysdeps/guile: all guile functions now return
 	the 'flags' member as first element of the list.

-	* include/glibtop/procstate.h (glibtop_proc_state): 
+	* include/glibtop/procstate.h (glibtop_proc_state):
 	added 'uid' and 'gid' members; the library tries hard
 	to set those values; it will never set the corresponding
 	'flags' value unless the values are correct.
@@ -2282,7 +2649,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* sysdeps/guile/sysdeps.c: changes to reflect the
 	new flags of procdata.
-	
+
 	* sysdeps/common/sysdeps.c: changes to reflect the
 	new flags of procdata.

@@ -2342,9 +2709,9 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* src/mico/proclist.idl: new file - simple mico interface

 	* src/version.c: moved to src/server
-	
+
 	* src/output.c: moved to src/server
-	
+
 	* src/main.c: moved to src/server

 1998-04-11  Martin Baulig  <martin@home-of-linux.org>
@@ -2414,7 +2781,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	this directory

 	* sysdeps/common/sem_limits.c: moved to sysdeps/names
-	
+
 	* sysdeps/common/msg_limits.c: moved to sysdeps/names

 	* sysdeps/common/sem_limits.c: moved to sysdeps/names
@@ -2448,25 +2815,25 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 		some arbitrary data

 	* lib/proclist.c: new file - library function for glibtop_proclist
-	
+
 	* sysdeps/linux/proclist.c: new file - implementation for glibtop_proclist
-	
+
 	* sysdeps/stub/proclist.c: new file - stub for glibtop_proclist
-	
+
 	* include/glibtop/proclist.h: new file - glibtop_proclist

 	* include/glibtop/union.h: new file

 	* lib/read_data.c: new file
-	
+
 	* include/glibtop/read_data.h: new file

 	* sysdeps/common/xmalloc.c: new file - moved here from lib
-	
+
 	* sysdeps/common/error.c: new file - moved here from lib
-	
+
 	* lib/xmalloc.c: moved to sysdeps/common
-	
+
 	* lib/error.c: moved to sysdeps/common

 1998-04-05  Martin Baulig  <martin@home-of-linux.org>
@@ -2503,9 +2870,9 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* sysdeps/common/msg_limits.c: new file - limit names

 	* sysdeps/common/sem_limits.c: new file - limit names
-	
+
 	* include/glibtop/shm_limits.h: new file - glibtop_shm_limits
-	
+
 	* include/glibtop/msg_limits.h: new file - glibtop_msg_limits

 	* include/glibtop/sem_limits.h: new file - glibtop_sem_limits
@@ -2530,13 +2897,13 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* lib/ipc_limits.c: new file - library function for
 		glibtop_ipc_limits
-	
+
 	* sysdeps/linux/ipc_limits.c: new file - implementation for
 		glibtop_ipc_limits
-	
+
 	* sysdeps/stub/ipc_limits.c: new file - stub for
 		glibtop_ipc_limits
-	
+
 	* include/glibtop/ipc_limits.h: new file - glibtop_ipc_limits -
 		sysv ipc limits

@@ -2544,7 +2911,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* lib/uptime.c: new file - library function for
 		glibtop_uptime
-	
+
 	* lib/loadavg.c: new file - library function for
 		glibtop_loadavg

@@ -2568,14 +2935,14 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* sysdeps/stub/sysinfo.c: removed - splitted into
 		uptime.c and loadavg.c
-	
+
 	* src/main.c: added GLIBTOP_CMND_UPTIME and
 		GLIBTOP_CMND_LOADAVG implementation

 	* include/glibtop/loadavg.h: new file - glibtop_loadavg
-	
+
 	* include/glibtop/uptime.h: new file - glibtop_uptime
-	
+
 	* include/glibtop/loadavg.h: removed - splitted into
 		uptime.h and loadavg.h

@@ -2584,10 +2951,10 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* lib/sysdeps.c: new file - library function for glibtop_sysdeps

 	* sysdeps/linux/sysdeps.c: new file - copied from sysdeps/stub
-	
+
 	* sysdeps/stub/sysdeps.c: new file - implementation for glibtop_sysinfo -
 		this is really the implementation and not just a stub
-	
+
 	* src/sysdeps.c: moved to sysdeps/stub - this file is now part
 		of the library

--- a/1
+++ b/1
@@ -1,2 +1,3 @@
 Email: martin@home-of-linux.org
 Email: dave@srce.hr
+Beno<EFBFBD>t Dejean (tazforever@dlfp.org)
--- a/56
+++ b/56
@@ -1,3 +1,59 @@
+October 11, 2004: Overview of Changes from 2.8.0 to 2.8.1
+=========================================================
+* Improved Solaris and AIX support.
+
+
+August 13, 2004: Overview of Changes from 2.7.92 to 2.8.0
+=========================================================
+* No changes
+
+
+August 30, 2004:
+===============
+* Applied some *BSD patches.
+* Removed old files.
+
+
+August 15, 2004:
+===============
+* Fixed compilation with C89-only compilers and old libc.
+
+
+August 3, 2004:
+==============
+* Some cleanups.
+* Fixed the behaviour of some linux proc_*() functions.
+* Updated the documentation.
+
+
+July 19, 2004: Overview of Changes from 2.6.1 to 2.7.4
+======================================================
+* Plenty of code cleanups. Uninlined a lot of functions. ~5-10KB object size
+  reduction.
+* Glibify a bit more.
+* API changes:
+ - glibtop_fsusage provides total read and writes since boot_time.
+ - glibtop_netload provides hardware address. IPv6 enable.
+ - Added glibtop_get_proc_argv.
+
+Work in progress :
+* Finish glibtop_fsusage implementation for Linux.
+* Some fuctions don't conform to the documentation, e.g. proctime.
+
+March 11, 2004:
+===============
+
+* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
+  in the loos.
+
+  - plenty of code cleanups
+
+  - removed the dependency on libgnome, only glib required now
+
+  - Linux 2.6 support, NetBSD support and better FreeBSD support
+
+  - Make the block size available for filesystem statistics
+
 February 27, 2001:
 =================

--- a/backends/server/ChangeLog
+++ b/backends/server/ChangeLog
@@ -1,3 +1,16 @@
+2004-08-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* server.c: (handle_slave_connection): Replaced //comment by /*C89*/. 
+
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* command.c: (glibtop_call_i):
+	* demarshal.pl:
+	* marshal.pl:
+	* read_data.c: (glibtop_read_data_i):
+	* server.c: (handle_slave_connection): fix g_malloc usage on non-Linux
+	platforms (patch by Benoît Dejean <bnet@ifrance.com>)
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* backend-server.c: (_open_server):
--- a/backends/server/command.c
+++ b/backends/server/command.c
@@ -34,14 +34,8 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 		size_t recv_size, void *recv_ptr,
 		int *retval_ptr)
 {
-    glibtop_command cmnd;
-    glibtop_response resp;
-#if 0
-    int retval;
-#endif
-
-    memset (&cmnd, 0, sizeof (glibtop_command));
-    memset (&resp, 0, sizeof (glibtop_response));
+    glibtop_command cmnd = {0};
+    glibtop_response resp = {0};

    cmnd.command = command;

@@ -57,7 +51,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
    }

    cmnd.data_size = data_size;
-	
+
    glibtop_write_i (priv, sizeof (glibtop_command), &cmnd);

    if (data_size) {
@@ -75,7 +69,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	     (long) resp.recv_size, (long) resp.data_size,
 	     recv_ptr, (long) recv_size);
 #endif
-    
+
    if (retval_ptr)
 	*retval_ptr = resp.glibtop_errno;

@@ -89,7 +83,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	glibtop_read_i (priv, recv_size, recv_ptr);

    if (resp.data_size) {
-	void *ptr = g_malloc (server, resp.data_size);
+	void *ptr = g_malloc (resp.data_size);

 	glibtop_read_i (priv, resp.data_size, ptr);

--- a/backends/server/demarshal.pl
+++ b/backends/server/demarshal.pl
@@ -246,7 +246,7 @@ sub output {
  if ($line_fields[3] eq '') {
    $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
  } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (server, _LIBGTOP_RECV_len);\n";
+    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (_LIBGTOP_RECV_len);\n";
  }
  $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";

@@ -298,7 +298,7 @@ sub output {
    $recv_buf_code .= "\n";
    $recv_buf_code .= "\t_LIBGTOP_TEMP_len += sizeof (off_t) + 1;\n";
    $recv_buf_code .= "\t_LIBGTOP_TEMP_len += array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (server, _LIBGTOP_TEMP_len);";
+    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (_LIBGTOP_TEMP_len);";
    $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = _LIBGTOP_ARRAY_base;\n";
    $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset = array.number * sizeof (off_t);\n";
    $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset += sizeof (off_t);\n";
--- a/backends/server/marshal.pl
+++ b/backends/server/marshal.pl
@@ -181,7 +181,7 @@ sub output {
    $send_buf_code = "\t/* send buffer */\n";
    $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
    if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (server, _LIBGTOP_SEND_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_SEND_len+1)";
    } else {
      $send_buf_code .= '(void *) &'.$first_param_name;
    }
@@ -190,7 +190,7 @@ sub output {
    $send_buf_code .= "\t/* data buffer */\n";
    $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
    if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (server, _LIBGTOP_DATA_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
    } else {
      $send_buf_code .= 'NULL';
    }
@@ -231,7 +231,7 @@ sub output {
      $local_var_code .= "\tchar *_LIBGTOP_ARRAY_ptr, **ptrlist;\n";
      $local_var_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
      $local_var_code .= "\tint i;\n";
-      $call_code .= "\tptrlist = g_malloc (server, array->number+1 * sizeof (char *));\n";
+      $call_code .= "\tptrlist = g_malloc (array->number+1 * sizeof (char *));\n";
      $call_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) retval;\n";
      $call_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) retval;\n";
      $call_code .= "\t_LIBGTOP_ARRAY_off_ptr++;\n\n";
--- a/backends/server/read_data.c
+++ b/backends/server/read_data.c
@@ -45,10 +45,10 @@ glibtop_read_data_i (backend_server_private *priv)
    fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
 #endif

-    if (!size) return NULL;	
+    if (!size) return NULL;
+
+    ptr = g_malloc (size);

-    ptr = g_malloc (priv->server, size);
-	
    ret = read (priv->input [0], ptr, size);

    if (ret < 0)
--- a/backends/server/server.c
+++ b/backends/server/server.c
@@ -86,7 +86,7 @@ main(int argc, char *argv[])
    }

    server = glibtop_global_server;
-	
+
    if (!server->_priv)
 	server->_priv = g_malloc (sizeof (glibtop_server_private));

@@ -109,7 +109,7 @@ handle_slave_connection (int input, int output)
    glibtop_command _cmnd, *cmnd = &_cmnd;
    glibtop *server = glibtop_global_server;

-    // glibtop_send_version_i (glibtop_global_server, output);
+    /* glibtop_send_version_i (glibtop_global_server, output); */

    while (do_read (input, cmnd, sizeof (glibtop_command))) {
 	size_t recv_size = 0, send_size = 0, recv_data_size = 0;
@@ -155,7 +155,7 @@ handle_slave_connection (int input, int output)
 		     cmnd->data_size);
 #endif

-	    data_ptr = g_malloc (server, cmnd->data_size);
+	    data_ptr = g_malloc (cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
 	}

@@ -185,5 +185,5 @@ handle_slave_connection (int input, int output)
 	resp.data_size = recv_data_size;

 	do_output (output, &resp, recv_ptr, recv_data_ptr);
-    }		
+    }
 }
--- a/backends/server/version.c
+++ b/backends/server/version.c
@@ -37,7 +37,7 @@ glibtop_send_version_i (glibtop *server, int fd)
 	     sizeof (glibtop_response),
 	     sizeof (glibtop_union),
 	     sizeof (glibtop_sysdeps));
-	
+
    size = strlen (buffer) + 1;

 #ifdef DEBUG
--- a/backends/sysdeps/backend-sysdeps.c
+++ b/backends/sysdeps/backend-sysdeps.c
@@ -60,7 +60,7 @@ _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
 	    (*init_fkt) (server);

 	server->info->sysdeps.pointer_size = sizeof (void*)*8;
-		
+
 	server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
    }

--- a/configure.in
+++ b/configure.in
@@ -7,13 +7,13 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM

 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=5
+LIBGTOP_MINOR_VERSION=8
 LIBGTOP_MICRO_VERSION=1
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)

 dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=2
+LIBGTOP_CURRENT=4

 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -91,11 +91,6 @@ export cross_compiling

 AM_PROG_LIBTOOL

-dnl Let the user enable compiler warnings
-dnl GNOME_COMPILE_WARNINGS
-
-dnl GNOME_INIT_HOOK(gnome_found=yes)
-
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)

 GNOME_LIBGTOP_SYSDEPS
@@ -128,7 +123,7 @@ else
 fi

 if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static"
 else
  static_targets=""
 fi
@@ -139,13 +134,24 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)

-GLIB_REQUIRED=2.0.0
+GLIB_REQUIRED=2.4.0

-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)

-dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
+AC_MSG_CHECKING(for popt.h)
+if test x$POPT = xyes ; then
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_ERROR([libgtop requires the popt development libraries])
+fi
+
+AC_CHECK_HEADER(ifaddrs.h, [HAVE_IFADDRS_H=yes], [HAVE_IFADDRS_H=no])
+if test x$HAVE_IFADDRS_H = xyes ; then
+	AC_DEFINE(HAVE_IFADDRS_H, 1, [defined if you have ifaddrs.h])
+fi

 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -179,6 +185,12 @@ AC_CHECK_FUNCS(dlerror,,)
 LIBS="$oLIBS"
 AC_SUBST(DL_LIB)

+dnl Linux
+AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
+if test x$HAVE_ISDN_H = xyes ; then
+	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
+fi
+
 dnl AIX
 AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
 AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
@@ -243,7 +255,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb nl nn no or pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -337,6 +349,18 @@ machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"

 AC_SUBST(machine_incs)

+if test "$GCC" = "yes" ; then
+        CFLAGS="\
+	-Winline \
+	-Wall \
+	-std=gnu89 \
+	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	-Wnested-externs -Wpointer-arith \
+	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
+	$CFLAGS"
+fi
+
 INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'

 AC_SUBST(INCLUDES)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -8,3 +8,4 @@ auto-macros.texi
 version.texi
 stamp-vti
 *.html *.pdf
+mdate-sh
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,17 @@
+2004-08-03  Benoît Dejean  <tazforever@dlfp.org>
+
+	* reference.texi: Updated.
+
+2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* reference.texi: updated.
+	Added glibtop_get_proc_argv.
+	Added glibtop_fsusage.block_size.
+
+2004-03-05  Bastien Nocera  <hadess@hadess.net>
+
+	* reference.texi: update for new API
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* reference.texi: s/u_int64_t/guint64/
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -359,11 +359,11 @@ Library function @code{glibtop_get_proclist}:
@cartouche
 unsigned *
 glibtop_get_proclist (glibtop_proclist *buf,
-                      int64_t which, int64_t arg);
+                      gint64 which, gint64 arg);

 unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-                        int64_t which, int64_t arg);
+                        gint64 which, gint64 arg);
@end cartouche
@end example

@@ -572,6 +572,7 @@ There are some constants for the @code{state} field:
 #define GLIBTOP_PROCESS_ZOMBIE                  8
 #define GLIBTOP_PROCESS_STOPPED                 16
 #define GLIBTOP_PROCESS_SWAPPING                32
+#define GLIBTOP_PROCESS_DEAD                    64
@end cartouche
@end example
@end ifset
@@ -717,7 +718,7 @@ Number of pages of virtual memory.
@item resident
 Number of residnet set (non-swapped) pages.
@item share
-Number of pages of shared (mmap'd) memory.
+Number of pages of shared (mmap\'d) memory.
@item rss
 Number of pages the process has in real memory, minus 3 for administrative
 purposes.
@@ -830,6 +831,7 @@ struct _glibtop_proc_time
@end cartouche
@end example

+
@table @code
@item start_time
 Start time of process in seconds since the epoch
@@ -856,6 +858,18 @@ SMP user-mode CPU time accumulated by process
 SMP kernel-mode CPU time accumulated by process
@end table

+
+Please note that under Linux, @code{start_time} value may be strange.
+Linux kernel defines @code{INITIAL_JIFFIES} which implies a time
+shift. Because @code{INITIAL_JIFFIES} is not user-space defined, we
+cannot use it to compute accurate @code{start_time}. On Linux2.6,
+@code{INITIAL_JIFFIES} is 300 so @code{start_time} is always 3s
+different from real start time of the given process. You may also get
+shift results if your system clock is not synchronised with your
+hardware clock. See @samp{man hwclock}.
+
+
+
@page
@node glibtop_proc_signal, glibtop_proc_kernel, glibtop_proc_time, System Dependent
@subsection Process Signal information
@@ -1079,7 +1093,7 @@ Library function @code{glibtop_get_proc_args}:
@example
@cartouche
 char *
-glibtop_get_proc_args_l (glibtop_proc_args *buf, pid_t pid,
+glibtop_get_proc_args(glibtop_proc_args *buf, pid_t pid,
                         unsigned max_len);

 char *
@@ -1110,6 +1124,30 @@ the lenght of this string is returned in the @code{size} field.

 Remember to @code{g_free} the returned string to avoid a memory leak.

+@strong{New functions}
+
+@example
+@cartouche
+char **
+glibtop_get_proc_argv(glibtop_proc_args *buf, pid_t pid,
+                         unsigned max_len);
+
+char **
+glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
+                         pid_t pid, unsigned max_len);
+@end cartouche
+@end example
+
+Returns a NULL-terminated array of strings with all arguments of
+process @code{pid} (up to @code{max_len} characters, use zero to get
+all arguments). @code{glibtop_get_proc_argv()} and
+@code{glibtop_get_proc_argv_l()} are wrappers to
+@code{glibtop_get_proc_args()} and @code{glibtop_get_proc_args_l()}
+that return process' arguments like the C @code{argv}.
+
+Remember to @code{g_strfreev} the returned array to avoid a memory
+leak.
+
@page
@node glibtop_proc_map, glibtop_netload, glibtop_proc_args, System Dependent
@subsection Process Memory Maps
@@ -1175,13 +1213,13 @@ fields are valid:

@example
@cartouche
-#define GLIBTOP_MAP_ENTRY_START         1
-#define GLIBTOP_MAP_ENTRY_END           2
-#define GLIBTOP_MAP_ENTRY_OFFSET        3
-#define GLIBTOP_MAP_ENTRY_PERM          4
-#define GLIBTOP_MAP_ENTRY_INODE         5
-#define GLIBTOP_MAP_ENTRY_DEVICE        6
-#define GLIBTOP_MAP_ENTRY_FILENAME      7
+#define GLIBTOP_MAP_ENTRY_START         0
+#define GLIBTOP_MAP_ENTRY_END           1
+#define GLIBTOP_MAP_ENTRY_OFFSET        2
+#define GLIBTOP_MAP_ENTRY_PERM          3
+#define GLIBTOP_MAP_ENTRY_INODE         4
+#define GLIBTOP_MAP_ENTRY_DEVICE        5
+#define GLIBTOP_MAP_ENTRY_FILENAME      6
@end cartouche
@end example

@@ -1494,6 +1532,7 @@ struct _glibtop_fsusage
        bavail,
        files,
        ffree;
+    guint32   block_size;
@};
@end cartouche
@end example
@@ -1509,6 +1548,8 @@ Free blocks available to ordinary users.
 Total file nodes.
@item ffree
 Free file nodes.
+@item block_size
+Block size in bytes.
@end table

 Blocks are usually 512 bytes.
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -14,3 +14,10 @@ second_linux
 smp_static sysdeps_static netload_static procmap_static mountlist_static
 smp sysdeps netload procmap mountlist
 timings timings_static
+pprint
+pprint_static
+procargs
+procargs_static
+df
+df_static
+
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,70 @@
+2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (main): Re-added pprint_get_msg_limits()
+
+i2004-09-25  Benoît Dejean  <tazforever@dlfp.org>
+
+	* df.c: (main):
+	* pprint.c: (main):
+	* procargs.c: (main): Added missing call to glibgtop_init() / glibtop_close()
+
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* ../configure.in
+	* df.c: (print_fsusage), (main): Added new example, just like 'df'.
+
+2004-09-22  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (main): Disable pprint_get_msg_limits() because it can fail.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_swap), (main): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: (show_args), (main): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_mountlist), (pprint_get_netload),
+	(pprint_get_uptime), (main): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* pprint.c: (pprint_get_mountlist): Updated.
+
+2004-09-21  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: (show_args), (main): Updated.
+
+2004-09-20  Benoît Dejean  <tazforever@dlfp.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* pprint.c: (pprint_get_cpu), (pprint_get_fsusage),
+	(pprint_get_loadavg), (pprint_get_mem), (pprint_get_mountlist),
+	(pprint_get_msg_limits), (main): Added new example : pretty prints
+	the result of glibtop_*. Work in progress.
+	
+	Now builds procargs.
+	
+	* ../configure.in: Added to static list.
+
+2004-07-07  Benoît Dejean  <tazforever@dlfp.org>
+
+	* procargs.c: Added glibtop_get_proc_argv demo.
+
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* mountlist.c: Updated to display block size too.
+
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* smp.c: use libgtop-i18n.h
+
 2003-10-21  Bastien Nocera  <hadess@hadess.net>

 	* Makefile.am:
@@ -42,7 +109,7 @@

 Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>

-	* timings.c: Added timersub defenition, to make code compilable on 
+	* timings.c: Added timersub defenition, to make code compilable on
 	BSDI.

 1999-03-24  Martin Baulig  <martin@home-of-linux.org>
@@ -108,11 +175,11 @@ Fri Apr  9 00:14:52 1999 Timur Bakeyev  <timur@gnu.org>
 1998-06-12  Martin Baulig  <martin@home-of-linux.org>

 	* test.scm: New file.
-	
+
 1998-06-07  Martin Baulig  <martin@home-of-linux.org>

 	* Makefile.am (CFLAGS): Disable optimize.
-	
+
 	* first.c (PROFILE_COUNT): Number of times each function
 	should be called. Defaults to 1; to profile the code, you
 	can increase this when compiling.
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES		= @INCLUDES@

 DEFS			= @DEFS@

-noinst_PROGRAMS	= 	first second\
+noinst_PROGRAMS	= 	first second pprint procargs df \
 			  mountlist procmap netload sysdeps timings \
 			  @static_targets@ @smp_examples@

@@ -14,7 +14,8 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
 			  third third_static smp smp_static \
 			  netload_static sysdeps_static \
-			  timings_static
+			  timings_static pprint_static procargs_static \
+			  df_static

 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -24,7 +25,7 @@ first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static

 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm

 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
@@ -71,7 +72,7 @@ mountlist_static_LDFLAGS= -static


 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la -lm

 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
@@ -84,3 +85,27 @@ timings_static_SOURCES	= $(timings_SOURCES)
 timings_static_LDADD	= $(timings_LDADD)
 timings_static_LDFLAGS	= -static

+
+pprint_SOURCES	        = pprint.c
+pprint_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+pprint_static_SOURCES   = $(pprint_SOURCES)
+pprint_static_LDADD	= $(pprint_LDADD)
+pprint_static_LDFLAGS   = -static
+
+
+procargs_SOURCES	  = procargs.c
+procargs_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
+
+procargs_static_SOURCES   = $(procargs_SOURCES)
+procargs_static_LDADD	  = $(procargs_LDADD)
+procargs_static_LDFLAGS   = -static
+
+
+df_SOURCES	  = df.c
+df_LDADD		  = $(top_builddir)/lib/libgtop-2.0.la
+
+df_static_SOURCES   = $(df_SOURCES)
+df_static_LDADD	  = $(df_LDADD)
+df_static_LDFLAGS   = -static
+
--- a/examples/df.c
+++ b/examples/df.c
@@ -0,0 +1,48 @@
+#include <glibtop.h>
+
+#include <glibtop/fsusage.h>
+#include <glibtop/mountlist.h>
+
+#include <stdio.h>
+
+
+static void print_fsusage(const char *mountpoint)
+{
+  glibtop_fsusage buf;
+
+  glibtop_get_fsusage(&buf, mountpoint);
+
+  printf("%-20s %-10llu %-10llu %-10llu %.1f\n",
+	 mountpoint,
+	 buf.blocks * buf.block_size >> 20,
+	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
+	 buf.bavail * buf.block_size >> 20,
+	 (buf.blocks - buf.bavail) * 100.0 / buf.blocks
+	 );
+}
+
+
+int main()
+{
+  glibtop_mountlist buf;
+  glibtop_mountentry *entries;
+  size_t i;
+
+  glibtop_init();
+
+  printf("%-20s %-10s %-10s %-10s %-10s\n",
+	 "Filesystem", "Size", "Used", "Avail", "Use%");
+
+  entries = glibtop_get_mountlist(&buf, FALSE);
+
+  for(i = 0; i < buf.number; ++i)
+    {
+      print_fsusage(entries[i].mountdir);
+    }
+
+  g_free(entries);
+
+  glibtop_close();
+
+  return 0;
+}
--- a/examples/first.c
+++ b/examples/first.c
@@ -22,6 +22,8 @@
 */

 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -53,7 +55,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -133,7 +135,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_shm_limits (&data.shm_limits);
-	
+
 	printf ("Shm Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.shm_limits.flags,
 		(unsigned long) data.shm_limits.shmmax,
@@ -157,7 +159,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_sem_limits (&data.sem_limits);
-	
+
 	printf ("Sem Limits   (0x%08lx): "
 		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.sem_limits.flags,
@@ -215,7 +217,7 @@ main (int argc, char *argv [])
 		(unsigned long) sysdeps.ppp);

 	printf ("\n");
-	
+
 	ptr = glibtop_get_proclist (&data.proclist, 0, 0);

 	printf ("Proclist     (0x%08lx): %lu, %lu, %lu\n",
@@ -306,7 +308,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -22,6 +22,8 @@
 */

 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -48,11 +50,11 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-	
+
 	printf ("Method = %d\n", method);

 	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
@@ -88,18 +90,18 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);

-	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
-		"", "Blocks", "Free", "Avail", "Files", "Free");
+	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
+		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");

 	for (index = 0; index < mount_list.number; index++) {
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);

-		printf ("Usage: %-16s %9Lu %9Lu %9Lu %9Lu %9Lu\n",
+		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
-			fsusage.ffree);
+			fsusage.ffree, fsusage.block_size);
 	}

 	g_free (mount_entries);
--- a/examples/netload.c
+++ b/examples/netload.c
@@ -22,6 +22,8 @@
 */

 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -52,7 +54,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -75,7 +77,7 @@ main (int argc, char *argv [])

 	if (argc != 2)
 		glibtop_error ("Usage: %s interface", argv [0]);
-	
+
 	glibtop_get_netload (&netload, argv [1]);

 	addr.s_addr = netload.address;
--- a/examples/pprint.c
+++ b/examples/pprint.c
@@ -0,0 +1,246 @@
+#include <glibtop.h>
+
+#include <glibtop/union.h>
+
+
+#include <stdio.h>
+#include <stddef.h>
+
+
+#define buf_offsetof(MEMBER) ((ptrdiff_t)&(buf.MEMBER) - (ptrdiff_t)&buf)
+
+#define HEADER_PPRINT(FUNC) printf(#FUNC "\tsizeof = %lu B\n", \
+(unsigned long) sizeof buf)
+
+#define PPRINT(DATA, FORMAT) printf("\t%4lu B %3lu " #DATA " = " FORMAT "\n", \
+(unsigned long) sizeof buf.DATA, (unsigned long) buf_offsetof(DATA), buf.DATA)
+
+#define PPRINT_ARRAY(ARRAY, SIZE, FORMAT) do { \
+size_t i; \
+printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
+(unsigned long) sizeof buf.ARRAY, (unsigned long) buf_offsetof(ARRAY),\
+(unsigned long) G_N_ELEMENTS(buf.ARRAY)); \
+for(i = 0; i < (SIZE - 1); ++i) printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
+printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
+} while(0)
+
+#define FOOTER_PPRINT() putchar('\n')
+
+
+
+static void pprint_get_cpu()
+{
+  glibtop_cpu buf;
+
+  glibtop_get_cpu(&buf);
+
+  HEADER_PPRINT(glibtop_get_cpu);
+  PPRINT(flags, "%#llx");
+  PPRINT(total, "%llu");
+  PPRINT(user, "%llu");
+  PPRINT(nice, "%llu");
+  PPRINT(sys, "%llu");
+  PPRINT(idle, "%llu");
+  PPRINT(frequency, "%llu");
+  PPRINT_ARRAY(xcpu_total, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_user, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_nice, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_sys, GLIBTOP_NCPU, "%llu");
+  PPRINT_ARRAY(xcpu_idle, GLIBTOP_NCPU, "%llu");
+  PPRINT(xcpu_flags, "%llx");
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_fsusage(const char *mountpoint)
+{
+  glibtop_fsusage buf;
+
+  glibtop_get_fsusage(&buf, mountpoint);
+
+  HEADER_PPRINT(glibtop_get_fsusage);
+  PPRINT(flags, "%#llx");
+  PPRINT(blocks, "%llu");
+  PPRINT(bfree, "%llu");
+  PPRINT(bavail, "%llu");
+  PPRINT(files, "%llu");
+  PPRINT(ffree, "%llu");
+  PPRINT(block_size, "%u");
+  PPRINT(read, "%llu");
+  PPRINT(write, "%llu");
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_loadavg()
+{
+  glibtop_loadavg buf;
+
+  glibtop_get_loadavg(&buf);
+
+  HEADER_PPRINT(glibtop_get_loadavg);
+  PPRINT(flags, "%#llx");
+  PPRINT_ARRAY(loadavg, 3, "%f");
+  PPRINT(nr_running, "%llu");
+  PPRINT(nr_tasks, "%llu");
+  PPRINT(last_pid, "%llu");
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_mem()
+{
+  glibtop_mem buf;
+
+  glibtop_get_mem(&buf);
+
+  HEADER_PPRINT(glibtop_get_mem);
+  PPRINT(flags, "%#llx");
+  PPRINT(total, "%llu");
+  PPRINT(used, "%llu");
+  PPRINT(free, "%llu");
+  PPRINT(shared, "%llu");
+  PPRINT(buffer, "%llu");
+  PPRINT(cached, "%llu");
+  PPRINT(user, "%llu");
+  PPRINT(locked, "%llu");
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_mountlist(gboolean allfs)
+{
+  glibtop_mountlist buf;
+  glibtop_mountentry *entries;
+  size_t i;
+
+  entries = glibtop_get_mountlist(&buf, allfs);
+
+  HEADER_PPRINT(glibtop_get_mountlist);
+  PPRINT(flags, "%#llx");
+  PPRINT(number, "%llu");
+  PPRINT(total, "%llu");
+  PPRINT(size, "%llu");
+
+  printf("\t%4llu B entries[%llu] = \n\t\t{\n", buf.total, buf.number);
+
+  for(i = 0; i < buf.number; ++i)
+    {
+      printf("\t\t .%lu = { .dev = %#llx,"
+	     " .devname = \"%s\","
+	     " .mountir = \"%s\","
+	     " .type = \"%s\" }\n",
+	     (unsigned long) i, entries[i].dev,
+	     entries[i].devname,
+	     entries[i].mountdir,
+	     entries[i].type);
+    }
+
+  printf("\t\t}\n");
+  FOOTER_PPRINT();
+
+  g_free(entries);
+}
+
+
+
+static void pprint_get_msg_limits()
+{
+  glibtop_msg_limits buf;
+
+  glibtop_get_msg_limits(&buf);
+
+  HEADER_PPRINT(glibtop_get_msg_limits);
+  PPRINT(flags, "%#llx");
+  PPRINT(msgpool, "%llu");
+  PPRINT(msgmap, "%llu");
+  PPRINT(msgmax, "%llu");
+  PPRINT(msgmnb, "%llu");
+  PPRINT(msgmni, "%llu");
+  PPRINT(msgssz, "%llu");
+  PPRINT(msgtql, "%llu");
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_netload(const char *iface)
+{
+  glibtop_netload buf;
+
+  glibtop_get_netload(&buf, iface);
+
+  HEADER_PPRINT(glibtop_get_netload);
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_swap()
+{
+  glibtop_swap buf;
+
+  glibtop_get_swap(&buf);
+
+  HEADER_PPRINT(glibtop_get_swap);
+  PPRINT(flags, "%#llx");
+  PPRINT(total, "%llu");
+  PPRINT(used, "%llu");
+  PPRINT(free, "%llu");
+  PPRINT(pagein, "%llu");
+  PPRINT(pageout, "%llu");
+  FOOTER_PPRINT();
+}
+
+
+
+static void pprint_get_uptime()
+{
+  glibtop_uptime buf;
+
+  glibtop_get_uptime(&buf);
+
+  HEADER_PPRINT(glibtop_get_uptime);
+  PPRINT(flags, "%#llx");
+  PPRINT(uptime, "%f");
+  PPRINT(idletime, "%f");
+  PPRINT(boot_time, "%llu");
+  FOOTER_PPRINT();
+}
+
+
+
+int main()
+{
+  glibtop_init();
+
+  pprint_get_cpu();
+
+  pprint_get_fsusage("/");
+
+  pprint_get_loadavg();
+
+  pprint_get_mem();
+
+  pprint_get_mountlist(TRUE);
+  pprint_get_mountlist(FALSE);
+
+  pprint_get_msg_limits();
+
+/*   pprint_get_netload("lo"); */
+
+
+  pprint_get_swap();
+
+/* pprint_get_sysinfo(); */
+
+  pprint_get_uptime();
+
+  glibtop_close();
+
+  return 0;
+}
--- a/examples/procargs.c
+++ b/examples/procargs.c
@@ -0,0 +1,47 @@
+#include <glibtop.h>
+#include <glibtop/procargs.h>
+
+#include <stdlib.h>
+
+#include <unistd.h>
+
+static void show_args(pid_t pid, unsigned max_len)
+{
+  glibtop_proc_args buf;
+  char ** const pargv = glibtop_get_proc_argv(&buf, pid, max_len);
+
+  char **parg = pargv;
+
+  printf("<%ld>\t", (long)pid);
+
+  while(*parg)
+    {
+      printf("\"%s\" ", *parg);
+      parg++;
+    }
+
+  putchar('\n');
+
+  g_strfreev(pargv);
+}
+
+
+int main(int argc, char **argv)
+{
+  glibtop_init();
+
+  show_args(getpid(), 0);
+  show_args(getpid(), 15);
+
+  while(*++argv)
+    {
+      pid_t pid = strtol(*argv, NULL, 10);
+      show_args(pid, 0);
+      show_args(pid, 15);
+    }
+
+  glibtop_close();
+
+  return 0;
+}
+
--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -22,6 +22,8 @@
 */

 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -59,7 +61,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -95,7 +97,7 @@ main (int argc, char *argv [])
 		const char *filename = NULL;
 		unsigned device, device_major, device_minor;
 		char perm [5];
-		
+
 		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;

@@ -152,7 +154,7 @@ main (int argc, char *argv [])
 		}

 		if (filename && (filename != maps [i].filename))
-			g_free (filename);
+			g_free ((void*)filename);
 	}

 	g_free (maps);
--- a/examples/second.c
+++ b/examples/second.c
@@ -23,6 +23,8 @@

 #include <locale.h>
 #include <math.h>
+#include <stdio.h>
+#include <libintl.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -44,11 +46,11 @@ output (pid_t pid)
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
-	int ncpu;
+	unsigned int ncpu;
 #endif

 	printf ("\n");
-		
+
 	glibtop_get_proc_state (&data.proc_state, pid);

 	printf ("Proc_State   PID  %5d (0x%08lx): "
@@ -57,9 +59,9 @@ output (pid_t pid)
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-		
+
 	glibtop_get_proc_uid (&data.proc_uid, pid);
-	
+
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -71,7 +73,7 @@ output (pid_t pid)
 		data.proc_uid.priority, data.proc_uid.nice);

 	glibtop_get_proc_mem (&data.proc_mem, pid);
-		
+
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_mem.flags,
@@ -81,7 +83,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_mem.share,
 		(unsigned long) data.proc_mem.rss,
 		(unsigned long) data.proc_mem.rss_rlim);
-		
+
 	glibtop_get_proc_segment (&data.proc_segment, pid);

 	printf ("Proc_Segment PID  %5d (0x%08lx): "
@@ -97,7 +99,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_stack);

 	glibtop_get_proc_time (&data.proc_time, pid);
-		
+
 	printf ("Proc_Time    PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_time.flags,
@@ -112,7 +114,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_time.frequency);

 	glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -158,7 +160,7 @@ output (pid_t pid)
 	ncpu = glibtop_global_server->ncpu;

 	glibtop_get_proc_time (&data.proc_time, pid);
-		
+
 	total = (unsigned long) data.proc_time.utime +
 		(unsigned long) data.proc_time.stime;

@@ -240,7 +242,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init ();

 	glibtop_get_sysdeps (&sysdeps);
@@ -286,7 +288,7 @@ main (int argc, char *argv [])
 	for (i = 0; i < proclist.number; i++) {

 		pid = ptr [i];
-		
+
 		output (pid);
 	}

--- a/examples/smp.c
+++ b/examples/smp.c
@@ -24,12 +24,14 @@
 #include <config.h>

 #include <locale.h>
+#include <libintl.h>
 #include <math.h>
+#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/cpu.h>

-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"

 int
 main (int argc, char *argv [])
@@ -45,7 +47,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init();

 	glibtop_get_cpu (&cpu);
@@ -100,7 +102,7 @@ main (int argc, char *argv [])
 	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", _("Percent:"),
 		_("Total (%)"), _("User (%)"), _("Nice (%)"), _("Sys (%)"),
 		_("Idle (%)"), separator);
-	
+
 	printf (_("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n"),
 		(unsigned long) cpu.flags, (double) total * 100.0 / total,
 		(double) user  * 100.0 / total,
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -22,6 +22,8 @@
 */

 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -46,7 +48,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
--- a/examples/third.c
+++ b/examples/third.c
@@ -22,9 +22,11 @@
 */

 #include <locale.h>
+#include <libintl.h>
+#include <stdio.h>

 #include <glibtop.h>
-     
+
 #include <glibtop/open.h>
 #include <glibtop/close.h>

@@ -33,7 +35,7 @@

 void main_prog(int argc, char *argv[]);

-int     
+int
 main (int argc, char *argv[])
 {
 	setlocale (LC_ALL, "");
--- a/examples/timings.c
+++ b/examples/timings.c
@@ -22,6 +22,8 @@
 */

 #include <locale.h>
+#include <stdio.h>
+#include <libintl.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -85,7 +87,7 @@ main (int argc, char *argv [])
 		"Feature", "Flags", "Count", "utime", "stime");
 	printf ("-------------------------------------------"
 		"---------------\n");
-	
+
 	glibtop_init_r (&glibtop_global_server, 0, 0);

 	getrusage (RUSAGE_SELF, &total_start);
@@ -301,7 +303,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-	
+
 	getrusage (RUSAGE_SELF, &rusage_end);

 	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
@@ -332,7 +334,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);
-	
+
 	getrusage (RUSAGE_SELF, &total_end);

 	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,
--- a/glibtop.h
+++ b/glibtop.h
@@ -24,6 +24,9 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__

+typedef struct _glibtop		glibtop;
+
+
 #include <glibtop/global.h>

 #include <glibtop_server.h>
@@ -37,10 +40,11 @@
 #define GLIBTOP_MOUNTENTRY_LEN	79
 #endif

-typedef struct _glibtop		glibtop;

 #include <glibtop/sysdeps.h>

+#include <glibtop/close.h>
+
 struct _glibtop
 {
 	unsigned flags;
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS		= glibtop

+EXTRA_DIST	= libgtop-i18n.h
+
--- a/include/glibtop/array.h
+++ b/include/glibtop/array.h
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_ARRAY_H__
-#define __GLIBTOP_ARRAY_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_ARRAY_NUMBER		0
-#define GLIBTOP_ARRAY_SIZE		1
-#define GLIBTOP_ARRAY_TOTAL		2
-
-#define GLIBTOP_MAX_ARRAY		3
-
-typedef struct _glibtop_array	glibtop_array;
-
-struct _glibtop_array
-{
-    guint64 flags,
-	number,		/* GLIBTOP_ARRAY_NUMBER	*/
-	size,		/* GLIBTOP_ARRAY_SIZE	*/
-	total;		/* GLIBTOP_ARRAY_TOTAL	*/
-};
-
-#endif
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -82,7 +82,7 @@ union _glibtop_response_union

 struct _glibtop_response
 {
-	int64_t offset;
+	gint64 offset;
 	guint64 size, data_size;
 	glibtop_response_union u;
 };
--- a/include/glibtop/compat_10.h
+++ b/include/glibtop/compat_10.h
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_COMPAT10_H__
-#define __GLIBTOP_COMPAT10_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-/* glibtop_cpu */
-
-#define GLIBTOP_XCPU_TOTAL		GLIBTOP_CPU_XCPU_TOTAL
-#define GLIBTOP_XCPU_USER		GLIBTOP_CPU_XCPU_USER
-#define GLIBTOP_XCPU_NICE		GLIBTOP_CPU_XCPU_NICE
-#define GLIBTOP_XCPU_SYS		GLIBTOP_CPU_XCPU_SYS
-#define GLIBTOP_XCPU_IDLE		GLIBTOP_CPU_XCPU_IDLE
-#define GLIBTOP_XCPU_FLAGS		GLIBTOP_CPU_XCPU_FLAGS
-
-/* glibtop_proclist */
-
-#define GLIBTOP_PROCLIST_NUMBER		GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_PROCLIST_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_PROCLIST_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_PROCLIST		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_proclist;
-
-/* glibtop_mountlist */
-
-#define GLIBTOP_MOUNTLIST_NUMBER	GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_MOUNTLIST_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_MOUNTLIST_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_MOUNTLIST		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_mountlist;
-
-/* glibtop_proc_args */
-
-#define GLIBTOP_PROC_ARGS_SIZE		0
-
-#define GLIBTOP_MAX_PROC_ARGS		1
-
-typedef struct _glibtop_array		glibtop_proc_args;
-
-/* glibtop_proc_map */
-
-#define GLIBTOP_PROC_MAP_NUMBER		GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_PROC_MAP_SIZE		GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_PROC_MAP_TOTAL		GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_PROC_MAP		GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_proc_map;
-
-/* glibtop_interface_names */
-
-#define GLIBTOP_INTERFACE_NAMES_NUMBER	GLIBTOP_ARRAY_NUMBER
-#define GLIBTOP_INTERFACE_NAMES_SIZE	GLIBTOP_ARRAY_SIZE
-#define GLIBTOP_INTERFACE_NAMES_TOTAL	GLIBTOP_ARRAY_TOTAL
-
-#define GLIBTOP_MAX_INTERFACE_NAMES	GLIBTOP_MAX_ARRAY
-
-typedef struct _glibtop_array		glibtop_interface_names;
-
-#endif
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -28,60 +28,17 @@

 G_BEGIN_DECLS

-#ifndef G_GNUC_UNUSED
-#if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#define G_GNUC_UNUSED				\
-  __attribute__((unused))
-#else	/* !__GNUC__ */
-#define	G_GNUC_UNUSED
-#endif	/* !__GNUC__ */
-#endif /* defined G_GNUC_UNUSED */
-
 void glibtop_error_vr (glibtop *server, char *format, va_list args);
 void glibtop_warn_vr (glibtop *server, char *format, va_list args);

 void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
 void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);

-static void G_GNUC_UNUSED
-glibtop_error_r (glibtop *server, char *format, ...)
-{
-	va_list args;
+void G_GNUC_UNUSED glibtop_error_r (glibtop *server, char *format, ...);
+void G_GNUC_UNUSED glibtop_warn_r (glibtop *server, char *format, ...);
+void G_GNUC_UNUSED glibtop_error_io_r (glibtop *server, char *format, ...);
+void G_GNUC_UNUSED glibtop_warn_io_r (glibtop *server, char *format, ...);

-	va_start (args, format);
-	glibtop_error_vr (server, format, args);
-	va_end (args);
-}
-
-static void G_GNUC_UNUSED
-glibtop_warn_r (glibtop *server, char *format, ...)
-{
-	va_list args;
-
-	va_start (args, format);
-	glibtop_warn_vr (server, format, args);
-	va_end (args);
-}
-
-static void G_GNUC_UNUSED
-glibtop_error_io_r (glibtop *server, char *format, ...)
-{
-	va_list args;
-
-	va_start (args, format);
-	glibtop_error_io_vr (server, format, errno, args);
-	va_end (args);
-}
-
-static void G_GNUC_UNUSED
-glibtop_warn_io_r (glibtop *server, char *format, ...)
-{
-	va_list args;
-
-	va_start (args, format);
-	glibtop_warn_io_vr (server, format, errno, args);
-	va_end (args);
-}

 #ifdef  __GNUC__

@@ -91,43 +48,20 @@ glibtop_warn_io_r (glibtop *server, char *format, ...)
 #define glibtop_error_io(p1, args...)	glibtop_error_io_r(glibtop_global_server , p1 , ## args)
 #define glibtop_warn_io(p1, args...)	glibtop_warn_io_r(glibtop_global_server , p1 , ## args)

-#else /* no __GNUC__ */
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L

-static void
-glibtop_error (char *format, ...)
-{
-	va_list args;
-	va_start (args, format);
-	glibtop_error_vr (glibtop_global_server, format, args);
-	va_end (args);
-}
+#define glibtop_error(p1, ...)	glibtop_error_r(glibtop_global_server , p1 , __VA_ARGS__)
+#define glibtop_warn(p1, ...)	glibtop_warn_r(glibtop_global_server , p1 , __VA_ARGS__)

-static void
-glibtop_warn (char *format, ...)
-{
-	va_list args;
-	va_start (args, format);
-	glibtop_warn_vr (glibtop_global_server, format, args);
-	va_end (args);
-}
+#define glibtop_error_io(p1, ...)	glibtop_error_io_r(glibtop_global_server , p1 , __VA_ARGS__)
+#define glibtop_warn_io(p1, ...)	glibtop_warn_io_r(glibtop_global_server , p1 , __VA_ARGS__)

-static void
-glibtop_error_io (char *format, ...)
-{
-	va_list args;
-	va_start (args, format);
-	glibtop_error_io_vr (glibtop_global_server, format, errno, args);
-	va_end (args);
-}
+#else /* no __GNUC__, no C99*/

-static void
-glibtop_warn_io (char *format, ...)
-{
-	va_list args;
-	va_start (args, format);
-	glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
-	va_end (args);
-}
+void glibtop_error (char *format, ...);
+void glibtop_warn (char *format, ...);
+void glibtop_error_io (char *format, ...);
+void glibtop_warn_io (char *format, ...);

 #endif /* no __GNUC__ */

--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -1,7 +1,6 @@
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.

   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.

@@ -34,19 +33,24 @@ G_BEGIN_DECLS
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
+#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
+#define GLIBTOP_FSUSAGE_READ           6
+#define GLIBTOP_FSUSAGE_WRITE          7
+#define GLIBTOP_MAX_FSUSAGE		8

-#define GLIBTOP_MAX_FSUSAGE		5

 typedef struct _glibtop_fsusage		glibtop_fsusage;

 struct _glibtop_fsusage
 {
 	guint64	flags,
-		blocks,		/* Total blocks. */
+		blocks,		/* Total number of blocks. */
 		bfree,		/* Free blocks available to superuser. */
 		bavail,		/* Free blocks available to non-superuser. */
 		files,		/* Total file nodes. */
 		ffree;		/* Free file nodes. */
+	guint32	block_size;	/* Size of a block in bytes. */
+	guint64 read, write;    /* Total blocks read and written */
 };

 #define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)
--- a/include/glibtop/glib-arrays.h
+++ b/include/glibtop/glib-arrays.h
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_GLIB_ARRAYS_H__
-#define __GLIBTOP_GLIB_ARRAYS_H__
-
-#include <glibtop.h>
-#include <glibtop/array.h>
-#include <glibtop/global.h>
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-GPtrArray *
-glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid);
-
-GArray *
-glibtop_get_proclist_as_array_l (glibtop_client *client, int64_t which, int64_t arg);
-
-GPtrArray *
-glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid);
-
-GPtrArray *
-glibtop_get_mountlist_as_array_l (glibtop_client *client, int all_fs);
-
-G_END_DECLS
-#endif
--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -9,15 +9,15 @@

 Copyright (C) 1989 Free Software Foundation, Inc.

- Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on
         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
         Emacs distribution.

 Please mail bugs and suggestions to the author at the above address.
 */

-/* HISTORY 
- * 11-Nov-1990		bristor@simba	
+/* HISTORY
+ * 11-Nov-1990		bristor@simba
 *    Added EOT stuff.
 */

@@ -76,7 +76,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 */

 #if 0
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */ 
+#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
 #endif
 #define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
 #define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
@@ -106,7 +106,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 * since it limits the size of requests and responses. Don't make it bigger
 * than your system's max message size though (usually a couple of k) or else
 * msgsend will start failing. For sockets, using the system BUFSIZ is usually
- * what you want. 
+ * what you want.
 */

 #if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
--- a/include/glibtop/interfaces.h
+++ b/include/glibtop/interfaces.h
@@ -1,203 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_INTERFACES_H__
-#define __GLIBTOP_INTERFACES_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/compat_10.h>
-#include <glibtop/array.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_INTERFACE_IF_FLAGS	0
-#define GLIBTOP_INTERFACE_TRANSPORT	1
-#define GLIBTOP_INTERFACE_TYPE		2
-#define GLIBTOP_INTERFACE_NUMBER	3
-#define GLIBTOP_INTERFACE_INSTANCE	4
-#define GLIBTOP_INTERFACE_NUM_LOGICAL	5
-#define GLIBTOP_INTERFACE_NAME		6
-
-#define GLIBTOP_MAX_INTERFACE		7
-
-#define GLIBTOP_IFADDR_TRANSPORT	0
-#define GLIBTOP_IFADDR_ADDR_LEN		1
-#define GLIBTOP_IFADDR_ADDRESS		2
-#define GLIBTOP_IFADDR_SUBNET		3
-#define GLIBTOP_IFADDR_SCOPE		4
-
-#define GLIBTOP_MAX_IFADDR		5
-
-typedef struct _glibtop_interface	glibtop_interface;
-typedef struct _glibtop_ifaddr		glibtop_ifaddr;
-
-typedef enum _glibtop_interface_type	glibtop_interface_type;
-typedef enum _glibtop_transport		glibtop_transport;
-typedef enum _glibtop_protocol		glibtop_protocol;
-
-typedef enum _glibtop_ipv6_scope	glibtop_ipv6_scope;
-
-typedef enum _glibtop_strategy		glibtop_strategy;
-typedef enum _glibtop_interface_flags	glibtop_interface_flags;
-
-enum _glibtop_protocol {
-    GLIBTOP_PROTOCOL_OTHERS	= 0,
-    GLIBTOP_PROTOCOL_ICMP	= 1 << 0,
-    GLIBTOP_PROTOCOL_TCP	= 1 << 1,
-    GLIBTOP_PROTOCOL_UDP	= 1 << 2,
-    GLIBTOP_PROTOCOL_IGMP	= 1 << 3,
-    GLIBTOP_PROTOCOL_RAW	= 1 << 4,
-    GLIBTOP_PROTOCOL_ICMP6	= 1 << 5,
-    GLIBTOP_PROTOCOL_TCP6	= 1 << 6,
-    GLIBTOP_PROTOCOL_UDP6	= 1 << 7,
-    GLIBTOP_PROTOCOL_IGMP6	= 1 << 8,
-    GLIBTOP_PROTOCOL_RAW6	= 1 << 9
-};
-
-enum _glibtop_transport {
-    GLIBTOP_TRANSPORT_DEFAULT	= 0,
-    GLIBTOP_TRANSPORT_IPV4	= 1 << 0,
-    GLIBTOP_TRANSPORT_IPV6	= 1 << 1,
-    GLIBTOP_TRANSPORT_IPX	= 1 << 2,
-    GLIBTOP_TRANSPORT_X25	= 1 << 3,
-    GLIBTOP_TRANSPORT_DECNET	= 1 << 4,
-    GLIBTOP_TRANSPORT_APPLETALK	= 1 << 5,
-    GLIBTOP_TRANSPORT_NETBEUI	= 1 << 6
-};
-
-#define GLIBTOP_TRANSPORT_ALL	GLIBTOP_UNLIMITED
-#define GLIBTOP_PROTOCOL_ALL	GLIBTOP_UNLIMITED
-
-enum _glibtop_interface_type {
-    GLIBTOP_INTERFACE_ALL		= 0,
-    GLIBTOP_INTERFACE_OTHER,
-    /* Network interfaces */
-    GLIBTOP_INTERFACE_ETHERNET		= 101,
-    GLIBTOP_INTERFACE_FDDI,
-    GLIBTOP_INTERFACE_FRAME_RELAY,
-    GLIBTOP_INTERFACE_TOKEN_RING,
-    GLIBTOP_INTERFACE_ARCNET,
-    GLIBTOP_INTERFACE_ATM,
-    /* Dummy interfaces */
-    GLIBTOP_INTERFACE_LOOPBACK		= 501,
-    GLIBTOP_INTERFACE_DUMMY,
-    /* Dialup interfaces */
-    GLIBTOP_INTERFACE_PARA		= 801,
-    GLIBTOP_INTERFACE_SLIP,
-    GLIBTOP_INTERFACE_PPP,
-    GLIBTOP_INTERFACE_ISDN
-};
-
-enum _glibtop_ipv6_scope {
-    GLIBTOP_IPV6_SCOPE_GLOBAL		= 0,
-    GLIBTOP_IPV6_SCOPE_LOOPBACK		= 1 << 1,
-    GLIBTOP_IPV6_SCOPE_LINKLOCAL	= 1 << 2,
-    GLIBTOP_IPV6_SCOPE_SITELOCAL	= 1 << 3,
-    GLIBTOP_IPV6_SCOPE_COMPATv4		= 1 << 4,
-    GLIBTOP_IPV6_SCOPE_UNKNOWN		= 1 << 5
-};
-
-enum _glibtop_strategy {
-    GLIBTOP_INTERFACES_ALL		= 0,
-    GLIBTOP_INTERFACES_BEST_MATCHING,
-    GLIBTOP_INTERFACES_ONLY_THIS_ONE,
-    GLIBTOP_INTERFACES_INCLUDE_LOGICAL	= 1 << 7
-};
-
-#define GLIBTOP_STRATEGY_FLAGS_MASK	(1 << 7)
-
-enum _glibtop_interface_flags {
-    GLIBTOP_IF_FLAGS_UP = 1,
-    GLIBTOP_IF_FLAGS_BROADCAST,
-    GLIBTOP_IF_FLAGS_DEBUG,
-    GLIBTOP_IF_FLAGS_LOOPBACK,
-    GLIBTOP_IF_FLAGS_POINTOPOINT,
-    GLIBTOP_IF_FLAGS_RUNNING,
-    GLIBTOP_IF_FLAGS_NOARP,
-    GLIBTOP_IF_FLAGS_PROMISC,
-    GLIBTOP_IF_FLAGS_ALLMULTI,
-    GLIBTOP_IF_FLAGS_OACTIVE,
-    GLIBTOP_IF_FLAGS_SIMPLEX,
-    GLIBTOP_IF_FLAGS_LINK0,
-    GLIBTOP_IF_FLAGS_LINK1,
-    GLIBTOP_IF_FLAGS_LINK2,
-    GLIBTOP_IF_FLAGS_ALTPHYS,
-    GLIBTOP_IF_FLAGS_MULTICAST
-};
-
-struct _glibtop_ifaddr
-{
-    guint64	flags,
-	transport;			/* GLIBTOP_IFADDR_TRANSPORT	*/
-    u_int8_t	addr_len,		/* GLIBTOP_IFADDR_ADDR_LEN	*/
-	address [GLIBTOP_IFADDR_LEN];	/* GLIBTOP_IFADDR_ADDRESS	*/
-    guint64	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
-	scope;				/* GLIBTOP_IFADDR_SCOPE	*/
-};
-
-struct _glibtop_interface
-{
-    guint64	flags,
-	if_flags,		/* GLIBTOP_INTERFACE_IF_FLAGS		*/
-	transport,		/* GLIBTOP_INTERFACE_TRANSPORT		*/
-	type,			/* GLIBTOP_INTERFACE_TYPE		*/
-	number,			/* GLIBTOP_INTERFACE_NUMBER		*/
-	instance,		/* GLIBTOP_INTERFACE_INSTANCE		*/
-	num_logical;		/* GLIBTOP_INTERFACE_NUM_LOGICAL	*/
-    char name [GLIBTOP_INTERFACE_LEN];
-};
-
-#if GLIBTOP_SUID_INTERFACE_NAMES
-#define glibtop_get_interface_names_r	glibtop_get_interface_names_p
-#else
-#define glibtop_get_interface_names_r	glibtop_get_interface_names_s
-#endif
-
-glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
-
-#if GLIBTOP_SUID_INTERFACE_NAMES
-int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
-#else
-int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_interface_names [];
-extern const unsigned glibtop_types_interface_names [];
-extern const char *glibtop_labels_interface_names [];
-extern const char *glibtop_descriptions_interface_names [];
-
-#endif
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/netinfo.h
+++ b/include/glibtop/netinfo.h
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_NETINFO_H__
-#define __GLIBTOP_NETINFO_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_NETINFO_IF_FLAGS	0
-#define GLIBTOP_NETINFO_TRANSPORT	1
-#define GLIBTOP_NETINFO_MTU		2
-#define GLIBTOP_NETINFO_SUBNET		3
-#define GLIBTOP_NETINFO_ADDRESS		4
-
-#define GLIBTOP_MAX_NETINFO		5
-
-typedef struct _glibtop_netinfo	glibtop_netinfo;
-
-#include <glibtop/interfaces.h>
-
-struct _glibtop_netinfo
-{
-    guint64	flags,
-	if_flags,			/* GLIBTOP_NETINFO_IF_FLAGS	*/
-	transport,			/* GLIBTOP_NETINFO_TRANSPORT	*/
-	mtu;				/* GLIBTOP_NETINFO_MTU		*/
-};
-
-#if GLIBTOP_SUID_NETINFO
-#define glibtop_get_netinfo_r		glibtop_get_netinfo_p
-#else
-#define glibtop_get_netinfo_r		glibtop_get_netinfo_s
-#endif
-
-glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
-
-#if GLIBTOP_SUID_NETINFO
-int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
-#else
-int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_netinfo [];
-extern const unsigned glibtop_types_netinfo [];
-extern const char *glibtop_labels_netinfo [];
-extern const char *glibtop_descriptions_netinfo [];
-
-#endif
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -43,8 +43,12 @@ G_BEGIN_DECLS
 #define GLIBTOP_NETLOAD_ERRORS_OUT	11
 #define GLIBTOP_NETLOAD_ERRORS_TOTAL	12
 #define GLIBTOP_NETLOAD_COLLISIONS	13
+#define GLIBTOP_NETLOAD_ADDRESS6	14
+#define GLIBTOP_NETLOAD_PREFIX6		15
+#define GLIBTOP_NETLOAD_SCOPE6		16
+#define GLIBTOP_NETLOAD_HWADDRESS	17

-#define GLIBTOP_MAX_NETLOAD		14
+#define GLIBTOP_MAX_NETLOAD		18

 typedef struct _glibtop_netload	glibtop_netload;

@@ -67,14 +71,25 @@ enum {
 	GLIBTOP_IF_FLAGS_MULTICAST
 };

+enum GLIBTOP_IF_IN6_SCOPE
+{
+	GLIBTOP_IF_IN6_SCOPE_UNKNOWN = 0,
+	GLIBTOP_IF_IN6_SCOPE_LINK    = 1,
+	GLIBTOP_IF_IN6_SCOPE_SITE    = 2,
+	GLIBTOP_IF_IN6_SCOPE_GLOBAL  = 4,
+	GLIBTOP_IF_IN6_SCOPE_HOST    = 8
+};
+
 struct _glibtop_netload
 {
 	guint64	flags,
-		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
-		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
+		if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
+
+	guint32	mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
-		address,		/* GLIBTOP_NETLOAD_ADDRESS	*/
-		packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+		address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
+
+	guint64	packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
 		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
 		packets_total,		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
 		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
@@ -84,6 +99,12 @@ struct _glibtop_netload
 		errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
 		errors_total,		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
 		collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
+
+	guint8 address6[16];		/* GLIBTOP_NETLOAD_ADDRESS6     */
+	guint8 prefix6[16];		/* GLIBTOP_NETLOAD_PREXIF6      */
+	guint8 scope6;			/* GLIBTOP_NETLOAD_SCOPE6       */
+
+	guint8 hwaddress[8];		/* GLIBTOP_NETLOAD_HWADDRESS    */
 };

 #define glibtop_get_netload(netload,interface)	glibtop_get_netload_l(glibtop_global_server, netload, interface)
--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -30,7 +30,7 @@
 G_BEGIN_DECLS

 #define GLIBTOP_PPP_STATE	0
-#define GLIBTOP_PPP_BYTES_IN	1	
+#define GLIBTOP_PPP_BYTES_IN	1
 #define GLIBTOP_PPP_BYTES_OUT	2

 #define GLIBTOP_MAX_PPP		3
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -41,31 +41,71 @@ struct _glibtop_proc_args
 		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };

-#define glibtop_get_proc_args(proc_args,pid,max_len) glibtop_get_proc_args_l(glibtop_global_server, proc_args, pid, max_len)
-
-#if GLIBTOP_SUID_PROC_ARGS
-#define glibtop_get_proc_args_r		glibtop_get_proc_args_p
-#else
-#define glibtop_get_proc_args_r		glibtop_get_proc_args_s
-#endif

 char *
 glibtop_get_proc_args_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);

+#define glibtop_get_proc_args(proc_args,pid,max_len) glibtop_get_proc_args_l(glibtop_global_server, proc_args, pid, max_len)
+
+
+
 #if GLIBTOP_SUID_PROC_ARGS
-void glibtop_init_proc_args_p (glibtop *server);

-char *
-glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len);
-#else
-void glibtop_init_proc_args_s (glibtop *server);
+# define glibtop_get_proc_args_r		glibtop_get_proc_args_p

-char *
-glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
+  void glibtop_init_proc_args_p (glibtop *server);
+
+  char *
+  glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
+			   pid_t pid, unsigned max_len);
+
+
+#else /* !GLIBTOP_SUID_PROC_ARGS */
+
+# define glibtop_get_proc_args_r		glibtop_get_proc_args_s
+
+  void glibtop_init_proc_args_s (glibtop *server);
+
+  char *
+  glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
+			   pid_t pid, unsigned max_len);
+#endif /* GLIBTOP_SUID_PROC_ARGS */
+
+
+
+/*
+ * NEW functions
+ */
+
+char **
+glibtop_get_proc_argv_l (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len);
-#endif
+
+#define glibtop_get_proc_argv(proc_args,pid,max_len) glibtop_get_proc_argv_l(glibtop_global_server, proc_args, pid, max_len)
+
+
+#if GLIBTOP_SUID_PROC_ARGS
+
+# define glibtop_get_proc_argv_r		glibtop_get_proc_args_p
+# define glibtop_init_proc_argv_p		glibtop_init_proc_args_p
+
+  char **
+  glibtop_get_proc_argv_p (glibtop *server, glibtop_proc_args *buf,
+			   pid_t pid, unsigned max_len);
+
+
+#else /* !GLIBTOP_SUID_PROC_ARGS */
+
+# define glibtop_get_proc_argv_r		glibtop_get_proc_args_s
+# define glibtop_init_proc_argv_s		glibtop_init_proc_args_s
+
+  char **
+  glibtop_get_proc_argv_s (glibtop *server, glibtop_proc_args *buf,
+			   pid_t pid, unsigned max_len);
+#endif /* GLIBTOP_SUID_PROC_ARGS */
+
+

 #ifdef GLIBTOP_NAMES

--- a/include/glibtop/proccwd.h
+++ b/include/glibtop/proccwd.h
@@ -1,81 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_PROCCWD_H__
-#define __GLIBTOP_PROCCWD_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/array.h>
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_PROC_CWD_SIZE			0
-#define GLIBTOP_PROC_CWD_DEVICE			1
-#define GLIBTOP_PROC_CWD_INODE			2
-
-#define GLIBTOP_MAX_PROC_CWD			3
-
-typedef struct _glibtop_proc_cwd	glibtop_proc_cwd;
-
-/* Cwd stuff */
-
-struct _glibtop_proc_cwd
-{
-    guint64	flags,
-	size,
-	device,
-	inode;
-};
-
-#if GLIBTOP_SUID_PROC_CWD
-#define glibtop_get_proc_cwd_r		glibtop_get_proc_cwd_p
-#else
-#define glibtop_get_proc_cwd_r		glibtop_get_proc_cwd_s
-#endif
-
-char *glibtop_get_proc_cwd_l (glibtop_client *client, glibtop_proc_cwd *buf, pid_t pid);
-
-#if GLIBTOP_SUID_PROC_CWD
-int glibtop_init_proc_cwd_p (glibtop_server *server, glibtop_closure *closure);
-char *glibtop_get_proc_cwd_p (glibtop_server *server, glibtop_closure *closure, glibtop_proc_cwd *buf, pid_t pid);
-#else
-int glibtop_init_proc_cwd_s (glibtop_server *server, glibtop_closure *closure);
-char *glibtop_get_proc_cwd_s (glibtop_server *server, glibtop_closure *closure, glibtop_proc_cwd *buf, pid_t pid);
-#endif
-
-#ifdef GLIBTOP_NAMES
-
-/* You need to link with -lgtop_names to get this stuff here. */
-
-extern const char *glibtop_names_proc_cwd [];
-extern const unsigned glibtop_types_proc_cwd [];
-extern const char *glibtop_labels_proc_cwd [];
-extern const char *glibtop_descriptions_proc_cwd [];
-
-#endif
-
-#endif
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -72,20 +72,20 @@ struct _glibtop_proclist

 unsigned *
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
-			int64_t which, int64_t arg);
+			gint64 which, gint64 arg);

 #if GLIBTOP_SUID_PROCLIST
 void glibtop_init_proclist_p (glibtop *server);

 unsigned *
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
-			int64_t which, int64_t arg);
+			gint64 which, gint64 arg);
 #else
 void glibtop_init_proclist_s (glibtop *server);

 unsigned *
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
-			int64_t which, int64_t arg);
+			gint64 which, gint64 arg);
 #endif

 #ifdef GLIBTOP_NAMES
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -35,15 +35,15 @@ G_BEGIN_DECLS

 #define GLIBTOP_MAX_PROC_MAP		3

-#define GLIBTOP_MAP_ENTRY_START		1
-#define GLIBTOP_MAP_ENTRY_END		2
-#define GLIBTOP_MAP_ENTRY_OFFSET	3
-#define GLIBTOP_MAP_ENTRY_PERM		4
-#define GLIBTOP_MAP_ENTRY_INODE		5
-#define GLIBTOP_MAP_ENTRY_DEVICE	6
-#define GLIBTOP_MAP_ENTRY_FILENAME	7
+#define GLIBTOP_MAP_ENTRY_START		0
+#define GLIBTOP_MAP_ENTRY_END		1
+#define GLIBTOP_MAP_ENTRY_OFFSET	2
+#define GLIBTOP_MAP_ENTRY_PERM		3
+#define GLIBTOP_MAP_ENTRY_INODE		4
+#define GLIBTOP_MAP_ENTRY_DEVICE	5
+#define GLIBTOP_MAP_ENTRY_FILENAME	6

-#define GLIBTOP_MAX_MAP_ENTRY		8
+#define GLIBTOP_MAX_MAP_ENTRY		7

 #define GLIBTOP_MAP_FILENAME_LEN	215

--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -47,6 +47,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_PROCESS_ZOMBIE                  8
 #define GLIBTOP_PROCESS_STOPPED                 16
 #define GLIBTOP_PROCESS_SWAPPING                32
+#define GLIBTOP_PROCESS_DEAD                    64

 typedef struct _glibtop_proc_state	glibtop_proc_state;

@@ -55,7 +56,7 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;
 struct _glibtop_proc_state
 {
 	guint64 flags;
-	char cmd[40];		/* basename of executable file in 
+	char cmd[40];		/* basename of executable file in
 				 * call to exec(2) */
 	unsigned state;		/* single-char code for process state
 				 * (S=sleeping) */
@@ -90,7 +91,7 @@ void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t p
 void glibtop_init_proc_state_s (glibtop *server);
 void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
-     
+
 #ifdef GLIBTOP_NAMES

 /* You need to link with -lgtop_names to get this stuff here. */
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -51,14 +51,14 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 struct _glibtop_proc_time
 {
 	guint64	flags,
-		start_time,	/* start time of process -- 
+		start_time,	/* start time of process --
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */
 		utime,		/* user-mode CPU time accumulated by process */
 		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and 
+		cutime,		/* cumulative utime of process and
 				 * reaped children */
-		cstime,		/* cumulative stime of process and 
+		cstime,		/* cumulative stime of process and
 				 * reaped children */
 		timeout,	/* The time (in jiffies) of the process's
 				 * next timeout */
--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -59,7 +59,7 @@ typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 struct _glibtop_proc_uid
 {
 	guint64 flags;
-	int uid,		/* user id */
+	gint32 uid,		/* user id */
 		euid,		/* effective user id */
 		gid,		/* group id */
 		egid,		/* effective group id */
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -32,9 +32,10 @@

 G_BEGIN_DECLS

-#define GLIBTOP_SYSINFO_CPUINFO		0
+#define GLIBTOP_SYSINFO_NCPU		0
+#define GLIBTOP_SYSINFO_CPUINFO		1

-#define GLIBTOP_MAX_SYSINFO		1
+#define GLIBTOP_MAX_SYSINFO		2

 typedef struct _glibtop_sysinfo	glibtop_sysinfo;

@@ -43,21 +44,21 @@ typedef struct _glibtop_entry	glibtop_entry;
 struct _glibtop_entry
 {
 	GPtrArray	*labels;
-	GHashTable	*values;
-	GHashTable	*descriptions;
+	GHashTable	*values; /* key -> description */
+	GHashTable	*descriptions; /* unused */
 };

 struct _glibtop_sysinfo
 {
 	guint64	flags, ncpu;
-	glibtop_entry	cpuinfo [GLIBTOP_NCPU];
+	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };

 #define glibtop_get_sysinfo()	glibtop_get_sysinfo_s(glibtop_global_server)

 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s

-glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
+const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);

 G_END_DECLS

--- a/include/libgtop-i18n.h
+++ b/include/libgtop-i18n.h
@@ -0,0 +1,11 @@
+
+#include <config.h>
+
+#include <libintl.h>
+#define _(String) gettext (String)
+#ifdef gettext_noop
+#   define N_(String) gettext_noop (String)
+#else
+#   define N_(String) (String)
+#endif
+
--- a/kernel/sysctl/libgtop.c
+++ b/kernel/sysctl/libgtop.c
@@ -212,7 +212,7 @@ get_wchan (struct task_struct *p)
 	    return ((unsigned long *)schedule_frame)[12];
 	}
 	return pc;
-    }	
+    }
 #elif defined(__mc68000__)
    {
 	unsigned long fp, pc;
@@ -318,7 +318,7 @@ static inline void
 task_mem (struct task_struct *p, libgtop_proc_segment_t *proc_segment)
 {
    struct mm_struct * mm = p->mm;
-    
+
    if (mm && mm != &init_mm) {
 	struct vm_area_struct * vma = mm->mmap;
 	unsigned long data = 0, stack = 0;
@@ -486,7 +486,7 @@ get_statm (struct task_struct *tsk, libgtop_proc_mem_t *proc_mem)
 	}
    }

-    proc_mem->segment.vsize = vsize;    
+    proc_mem->segment.vsize = vsize;
    proc_mem->segment.data = data;
    proc_mem->segment.stack = stack;
    proc_mem->segment.exec = exec;
@@ -498,7 +498,7 @@ get_statm (struct task_struct *tsk, libgtop_proc_mem_t *proc_mem)
    proc_mem->trs = trs;
    proc_mem->lrs = lrs;
    proc_mem->drs = drs;
-    proc_mem->dt = dt; 
+    proc_mem->dt = dt;
 }

 static void
@@ -522,7 +522,7 @@ collect_sigign_sigcatch (struct task_struct *p, sigset_t *ign,
    }
 }

-static void 
+static void
 task_sig (struct task_struct *p, libgtop_proc_signal_t *proc_signal)
 {
    sigset_t ignore, catch;
@@ -670,7 +670,7 @@ libgtop_sysctl (ctl_table *table, int nlen, int *name)

 	    if ((which & LIBGTOP_EXCLUDE_NOTTY) && (tsk->tty == NULL))
 		continue;
-			
+
 	    proclist->pids [tindex++] = tsk->pid;
 	}

@@ -702,7 +702,7 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
    case LIBGTOP_PROC_STATE:
 	proc_state = table->data;
 	memset (proc_state, 0, sizeof (libgtop_proc_state_t));
-	
+
 	proc_state->uid = tsk->uid;
 	proc_state->gid = tsk->gid;
 	proc_state->flags = tsk->flags;
@@ -711,12 +711,12 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->euid = tsk->euid;
 	proc_state->suid = tsk->suid;
 	proc_state->fsuid = tsk->fsuid;
-		
+
 	proc_state->gid = tsk->gid;
 	proc_state->egid = tsk->egid;
 	proc_state->sgid = tsk->sgid;
 	proc_state->fsgid = tsk->fsgid;
-		
+
 	proc_state->pid = tsk->pid;
 	proc_state->pgrp = tsk->pgrp;
 	proc_state->ppid = tsk->p_pptr->pid;
@@ -757,12 +757,12 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->it_real_incr = tsk->it_real_incr;
 	proc_state->it_prof_incr = tsk->it_prof_incr;
 	proc_state->it_virt_incr = tsk->it_virt_incr;
-	
+
 	proc_state->min_flt = tsk->min_flt;
 	proc_state->cmin_flt = tsk->cmin_flt;
 	proc_state->maj_flt = tsk->maj_flt;
 	proc_state->cmaj_flt = tsk->cmaj_flt;
-		
+
 	proc_state->nswap = tsk->nswap;
 	proc_state->cnswap = tsk->cnswap;

@@ -794,7 +794,7 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->ngroups = tsk->ngroups;
 	for (i = 0; i < min (tsk->ngroups, LIBGTOP_MAX_GROUPS); i++)
 	    proc_state->groups [i] = tsk->groups [i];
-	
+
 	if (tsk->state & TASK_INTERRUPTIBLE)
 	    proc_state->state |= LIBGTOP_TASK_INTERRUPTIBLE;
 	if (tsk->state & TASK_UNINTERRUPTIBLE)
@@ -1023,7 +1023,7 @@ proc_args_ctl_handler (ctl_table *table, int *name, int nlen,

    if (put_user (len, oldlenp))
 	goto err_fault_free_page;
-    
+
    if (copy_to_user (oldval, (void *) page, len))
 	goto err_fault_free_page;

@@ -1113,7 +1113,7 @@ proc_maps_ctl_handler (ctl_table *table, int *name, int nlen,
 	    proc_maps->filename [LIBGTOP_MAP_PATH_LEN-1] = '\0';
 	    proc_maps->header.filename_offset = line - proc_maps->filename;

-	    proc_maps->header.device = 
+	    proc_maps->header.device =
 		map->vm_file->f_dentry->d_inode->i_dev;
 	    proc_maps->header.inode =
 		map->vm_file->f_dentry->d_inode->i_ino;
@@ -1243,13 +1243,13 @@ proc_net_ctl_handler (ctl_table *table, int *name, int nlen,
    netload.rx_frame_errors = stats->rx_frame_errors;
    netload.rx_fifo_errors = stats->rx_fifo_errors;
    netload.rx_missed_errors = stats->rx_missed_errors;
-    
+
    netload.tx_aborted_errors = stats->tx_aborted_errors;
    netload.tx_carrier_errors = stats->tx_carrier_errors;
    netload.tx_fifo_errors = stats->tx_fifo_errors;
    netload.tx_heartbeat_errors = stats->tx_heartbeat_errors;
    netload.tx_window_errors = stats->tx_window_errors;
-    
+
    netload.rx_compressed = stats->rx_compressed;
    netload.tx_compressed = stats->tx_compressed;

--- a/kernel/sysctl/libgtop.h
+++ b/kernel/sysctl/libgtop.h
@@ -218,7 +218,7 @@ struct libgtop_netload
    unsigned long tx_dropped;		/* no space available in linux	*/
    unsigned long multicast;		/* multicast packets received	*/
    unsigned long collisions;
-    
+
    /* detailed rx_errors: */
    unsigned long rx_length_errors;
    unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
@@ -226,14 +226,14 @@ struct libgtop_netload
    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
    unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
    unsigned long rx_missed_errors;	/* receiver missed packet	*/
-    
+
    /* detailed tx_errors */
    unsigned long tx_aborted_errors;
    unsigned long tx_carrier_errors;
    unsigned long tx_fifo_errors;
    unsigned long tx_heartbeat_errors;
    unsigned long tx_window_errors;
-    
+
    /* for cslip etc */
    unsigned long rx_compressed;
    unsigned long tx_compressed;
--- a/kernel/table.h
+++ b/kernel/table.h
@@ -15,7 +15,7 @@
 #define TABLE_KERN_PROC_UID		5
 #define TABLE_KERN_PROC_RUID		6

-#define TABLE_KERN_PROC_MASK		15	
+#define TABLE_KERN_PROC_MASK		15

 #define TABLE_EXCLUDE_IDLE		0x1000
 #define TABLE_EXCLUDE_SYSTEM		0x2000
@@ -178,7 +178,7 @@ union table
 	struct table_proc_mem proc_mem;
 	struct table_proc_segment proc_segment;
 	struct table_proc_time proc_time;
-	struct table_proc_state proc_state;	
+	struct table_proc_state proc_state;
 	struct table_proc_signal proc_signal;
 	struct table_proc_kernel proc_kernel;
 };
--- a/kernel/table20/main.c
+++ b/kernel/table20/main.c
@@ -50,7 +50,7 @@ static struct task_struct *
 get_task (pid_t pid)
 {
 	struct task_struct ** p;
-	
+
 	p = task;
 	while (++p < task+NR_TASKS) {
 		if (*p && (*p)->pid == pid)
@@ -171,7 +171,7 @@ get_wchan (struct task_struct *p)
 	{
 		unsigned long schedule_frame;
 		unsigned long pc;
-		
+
 		pc = thread_saved_pc(&p->tss);
 		if (pc >= (unsigned long) interruptible_sleep_on && pc < (unsigned long) add_timer) {
 			schedule_frame = ((unsigned long *)p->tss.ksp)[6];
@@ -246,7 +246,7 @@ sys_table (int type, union table *buf, const void *param)
 		tbl.proclist.last_pid = last_pid;
 		break;
 	case TABLE_CPU:
-		tbl.cpu.total = jiffies;    
+		tbl.cpu.total = jiffies;
 		tbl.cpu.user  = kstat.cpu_user;
 		tbl.cpu.nice  = kstat.cpu_nice;
 		tbl.cpu.sys   = kstat.cpu_system;
@@ -294,21 +294,21 @@ sys_table (int type, union table *buf, const void *param)
 		tbl.proc_uid.euid = tsk->euid;
 		tbl.proc_uid.suid = tsk->suid;
 		tbl.proc_uid.fsuid = tsk->fsuid;
-		
+
 		tbl.proc_uid.gid = tsk->gid;
 		tbl.proc_uid.egid = tsk->egid;
 		tbl.proc_uid.sgid = tsk->sgid;
 		tbl.proc_uid.fsgid = tsk->fsgid;
-		
+
 		tbl.proc_uid.pid = tsk->pid;
 		tbl.proc_uid.pgrp = tsk->pgrp;
 		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-		
+
 		tbl.proc_uid.session = tsk->session;
 	        tbl.proc_uid.tty = tsk->tty ?
 			kdev_t_to_nr (tsk->tty->device) : 0;
 		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-		
+
 		tbl.proc_uid.priority = tsk->priority;
 		tbl.proc_uid.counter = tsk->counter;
 		tbl.proc_uid.def_priority = DEF_PRIORITY;
@@ -322,7 +322,7 @@ sys_table (int type, union table *buf, const void *param)
 			unsigned long sig_ign = 0, sig_caught = 0;
 			unsigned long bit = 1;
 			int i;
-			
+
 			for (i = 0; i < 32; i++) {
 				switch((unsigned long) action->sa_handler) {
 				case 0:
@@ -376,7 +376,7 @@ sys_table (int type, union table *buf, const void *param)
 			while (vma) {
 				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
 				int pages = 0, shared = 0, dirty = 0, total = 0;
-				
+
 				vsize += vma->vm_end - vma->vm_start;

 				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
@@ -428,10 +428,10 @@ sys_table (int type, union table *buf, const void *param)
 		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
 		tbl.proc_kernel.maj_flt = tsk->maj_flt;
 		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-		
+
 		tbl.proc_kernel.kesp = tsk->kernel_stack_page ? KSTK_EIP(tsk) : 0;
 		tbl.proc_kernel.keip = tsk->kernel_stack_page ? KSTK_ESP(tsk) : 0;
-		
+
 		tbl.proc_kernel.nswap = tsk->nswap;
 		tbl.proc_kernel.cnswap = tsk->cnswap;

@@ -442,10 +442,10 @@ sys_table (int type, union table *buf, const void *param)
 			for (rule = chain->chain; rule; rule = rule->next) {
 				const char *name = rule->ipfw.fw_vianame;
 				int k;
-				
+
 				if (name [0] && !strncmp (param, name, 5))
 					continue;
-				
+
 				for (k = 0; k < NUM_SLOTS; k++) {
 					tbl.netacct.packets +=
 						rule->counters[k].pcnt;
--- a/kernel/table20/unistd-i386.h
+++ b/kernel/table20/unistd-i386.h
@@ -237,7 +237,7 @@ if (__res>=0) \
 	return (type) __res; \
 errno=-__res; \
 return -1; \
-} 
+}

 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
 	  type5,arg5) \
--- a/kernel/table21/module.c
+++ b/kernel/table21/module.c
@@ -140,7 +140,7 @@ static unsigned long get_wchan(struct task_struct *p)
 		return ((unsigned long *)schedule_frame)[12];
 	    }
 	    return pc;
-	}	
+	}
 #elif defined(__mc68000__)
 	{
 	    unsigned long fp, pc;
@@ -388,7 +388,7 @@ table_fkt (int type, union table *buf, const void *param)
 			if ((plistargs.which & TABLE_EXCLUDE_NOTTY) &&
 			    (tsk->tty == NULL))
 				continue;
-			
+
 			tbl.proclist.pids [tindex++] = tsk->pid;
 		}
 		tbl.proclist.nr_running = nr_running;
@@ -397,7 +397,7 @@ table_fkt (int type, union table *buf, const void *param)
 		read_unlock(&tasklist_lock);
 		break;
 	case TABLE_CPU:
-		tbl.cpu.total = jiffies;    
+		tbl.cpu.total = jiffies;
 		tbl.cpu.user  = kstat.cpu_user;
 		tbl.cpu.nice  = kstat.cpu_nice;
 		tbl.cpu.sys   = kstat.cpu_system;
@@ -446,21 +446,21 @@ table_fkt (int type, union table *buf, const void *param)
 		tbl.proc_uid.euid = tsk->euid;
 		tbl.proc_uid.suid = tsk->suid;
 		tbl.proc_uid.fsuid = tsk->fsuid;
-		
+
 		tbl.proc_uid.gid = tsk->gid;
 		tbl.proc_uid.egid = tsk->egid;
 		tbl.proc_uid.sgid = tsk->sgid;
 		tbl.proc_uid.fsgid = tsk->fsgid;
-		
+
 		tbl.proc_uid.pid = tsk->pid;
 		tbl.proc_uid.pgrp = tsk->pgrp;
 		tbl.proc_uid.ppid = tsk->p_pptr->pid;
-		
+
 		tbl.proc_uid.session = tsk->session;
 	        tbl.proc_uid.tty = tsk->tty ?
 			kdev_t_to_nr (tsk->tty->device) : 0;
 		tbl.proc_uid.tpgid = tsk->tty ? tsk->tty->pgrp : -1;
-		
+
 		tbl.proc_uid.priority = tsk->priority;
 		tbl.proc_uid.counter = tsk->counter;
 		tbl.proc_uid.def_priority = DEF_PRIORITY;
@@ -520,7 +520,7 @@ table_fkt (int type, union table *buf, const void *param)
 			while (vma) {
 				pgd_t *pgd = pgd_offset(tsk->mm, vma->vm_start);
 				int pages = 0, shared = 0, dirty = 0, total = 0;
-				
+
 				vsize += vma->vm_end - vma->vm_start;

 				statm_pgd_range (pgd, vma->vm_start, vma->vm_end,
@@ -584,10 +584,10 @@ table_fkt (int type, union table *buf, const void *param)
 		tbl.proc_kernel.cmin_flt = tsk->cmin_flt;
 		tbl.proc_kernel.maj_flt = tsk->maj_flt;
 		tbl.proc_kernel.cmaj_flt = tsk->cmaj_flt;
-		
+
 		tbl.proc_kernel.kesp = KSTK_ESP(tsk);
 		tbl.proc_kernel.keip = KSTK_EIP(tsk);
-		
+
 		tbl.proc_kernel.nswap = tsk->nswap;
 		tbl.proc_kernel.cnswap = tsk->cnswap;

--- a/kernel/table21/unistd-i386.h
+++ b/kernel/table21/unistd-i386.h
@@ -259,7 +259,7 @@ __asm__ volatile ("int $0x80" \
 	: "0" (__NR_##name),"b" ((long)(arg1)),"c" ((long)(arg2)), \
 	  "d" ((long)(arg3)),"S" ((long)(arg4))); \
 __syscall_return(type,__res); \
-} 
+}

 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
 	  type5,arg5) \
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
 libgtop.la
 *.lo
 lib.c
+error.loT
--- a/lib/command.c
+++ b/lib/command.c
@@ -31,13 +31,11 @@ void *
 glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 		const void *send_buf, size_t recv_size, void *recv_buf)
 {
-	glibtop_command cmnd;
-	glibtop_response response;
+	glibtop_command cmnd = {0};
+	glibtop_response response = {0};

 	glibtop_init_r (&server, 0, 0);

-	memset (&cmnd, 0, sizeof (glibtop_command));
-
 	cmnd.command = command;

 	/* If send_size is less than _GLIBTOP_PARAM_SIZE (normally 16 Bytes), we
@@ -50,7 +48,7 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 	} else {
 		cmnd.data_size = send_size;
 	}
-	
+
 	glibtop_write_l (server, sizeof (glibtop_command), &cmnd);

 	glibtop_read_l (server, sizeof (glibtop_response), &response);
--- a/lib/error.c
+++ b/lib/error.c
@@ -32,7 +32,7 @@
 static void
 print_server_name (glibtop_server *server)
 {
-    fprintf (stderr, "%s: ", server ? 
+    fprintf (stderr, "%s: ", server ?
 	     (server->name ? server->name : DEFAULT_NAME)
 	     : DEFAULT_NAME);
 }
@@ -40,7 +40,7 @@ print_server_name (glibtop_server *server)
 void
 glibtop_error_vr (glibtop_server *server, char *format, va_list args)
 {
-    print_server_name (server);	
+    print_server_name (server);
    vfprintf (stderr, format, args);
    fprintf (stderr, "\n");

--- a/lib/errors.c
+++ b/lib/errors.c
@@ -32,7 +32,7 @@ GQuark
 glibtop_error_quark (void)
 {
    static GQuark q = 0;
-    if (q == 0)
+    if (G_UNLIKELY(q == 0))
 	q = g_quark_from_static_string ("glibtop-error-quark");

    return q;
--- a/lib/glib-arrays.c
+++ b/lib/glib-arrays.c
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop 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.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/union.h>
-
-#include <glibtop/glib-arrays.h>
-
-GArray *
-glibtop_get_proclist_as_array_l (glibtop_client *client, int64_t which,
-				 int64_t arg)
-{
-    glibtop_array array;
-    GArray *retval;
-    unsigned *ptr;
-    int i;
-
-    ptr = glibtop_get_proclist_l (client, &array, which, arg);
-    if (!ptr) return NULL;
-
-    retval = g_array_new (FALSE, TRUE, sizeof (guint));
-    retval = g_array_set_size (retval, array.number);
-
-    for (i = 0; i < array.number; i++)
-	g_array_index (retval, guint, i) = ptr [i];
-
-    g_free (ptr);
-
-    return retval;
-}
-
-GPtrArray *
-glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid)
-{
-    glibtop_array array;
-    GPtrArray *retval;
-    char **ptr;
-    int i;
-
-    ptr = glibtop_get_proc_args_l (client, &array, pid);
-    if (!ptr) return NULL;
-
-    retval = g_ptr_array_new ();
-    g_ptr_array_set_size (retval, array.number);
-
-    for (i = 0; i < array.number; i++) {
-	retval->pdata [i] = g_strdup (ptr [i]);
-	g_free (ptr [i]);
-    }
-
-    g_free (ptr);
-
-    return retval;
-}
-
-GPtrArray *
-glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid)
-{
-    glibtop_array array;
-    GPtrArray *retval;
-    glibtop_map_entry *ptr;
-    int i;
-
-    ptr = glibtop_get_proc_map_l (client, &array, pid);
-    if (!ptr) return NULL;
-
-    retval = g_ptr_array_new ();
-    g_ptr_array_set_size (retval, array.number);
-
-    for (i = 0; i < array.number; i++)
-	retval->pdata [i] = g_memdup (ptr+i, sizeof (glibtop_map_entry));
-
-    g_free (ptr);
-
-    return retval;
-}
-
-GPtrArray *
-glibtop_get_mountlist_as_array_l (glibtop_client *client, int all_fs)
-{
-    glibtop_array array;
-    GPtrArray *retval;
-    glibtop_mountentry *ptr;
-    int i;
-
-    ptr = glibtop_get_mountlist_l (client, &array, all_fs);
-    if (!ptr) return NULL;
-
-    retval = g_ptr_array_new ();
-    g_ptr_array_set_size (retval, array.number);
-
-    for (i = 0; i < array.number; i++)
-	retval->pdata [i] = g_memdup (ptr+i, sizeof (glibtop_mountentry));
-
-    g_free (ptr);
-
-    return retval;
-}
--- a/lib/glibtop-backend.c
+++ b/lib/glibtop-backend.c
@@ -53,7 +53,7 @@ GType
 glibtop_backend_get_type (void)
 {
    static GType glibtop_backend_type = 0;
-  
+
    if (!glibtop_backend_type) {
 	static const GTypeInfo glibtop_backend_info = {
 	    sizeof (glibtop_backend_class),
@@ -66,7 +66,7 @@ glibtop_backend_get_type (void)
 	    16,			/* n_preallocs */
 	    (GInstanceInitFunc) glibtop_backend_init,
 	};
-      
+
 	glibtop_backend_type = g_type_register_static
 	    (G_TYPE_OBJECT, "glibtop_backend", &glibtop_backend_info, 0);
    }
@@ -80,7 +80,7 @@ glibtop_backend_class_init (glibtop_backend_class *class)
    GObjectClass *gobject_class;

    gobject_class = (GObjectClass *) class;
-  
+
    parent_class = g_type_class_ref (G_TYPE_OBJECT);

    gobject_class->finalize = glibtop_backend_finalize;
@@ -100,12 +100,12 @@ glibtop_backend_finalize (GObject *object)
 {
    glibtop_backend *glibtop;
    glibtop_backend_private *priv = NULL;
-  
+
    glibtop = GLIBTOP_BACKEND (object);
    priv = glibtop->_priv;

    g_free (priv);
-  
+
    if (G_OBJECT_CLASS (parent_class)->finalize)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
--- a/lib/glibtop-client.c
+++ b/lib/glibtop-client.c
@@ -47,7 +47,7 @@ GType
 glibtop_client_get_type (void)
 {
    static GType glibtop_client_type = 0;
-  
+
    if (!glibtop_client_type) {
 	static const GTypeInfo glibtop_client_info = {
 	    sizeof (glibtop_client_class),
@@ -60,7 +60,7 @@ glibtop_client_get_type (void)
 	    16,			/* n_preallocs */
 	    (GInstanceInitFunc) glibtop_client_init,
 	};
-      
+
 	glibtop_client_type = g_type_register_static
 	    (G_TYPE_OBJECT, "glibtop_client", &glibtop_client_info, 0);
    }
@@ -99,7 +99,7 @@ glibtop_client_class_init (glibtop_client_class *klass)
    GObjectClass *gobject_class;

    gobject_class = (GObjectClass *) klass;
-  
+
    parent_class = g_type_class_peek_parent (klass);

    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR] =
@@ -122,7 +122,7 @@ glibtop_client_class_init (glibtop_client_class *klass)

    klass->error = glibtop_client_error_handler;
    klass->warning = glibtop_client_warning_handler;
-  
+
    gobject_class->finalize = glibtop_client_finalize;
 }

@@ -130,7 +130,7 @@ static void
 glibtop_client_init (glibtop_client *glibtop)
 {
    glibtop_client_private *priv;
-  
+
    priv = g_new0 (glibtop_client_private, 1);
    glibtop->_priv = priv;
 }
@@ -141,16 +141,16 @@ glibtop_client_finalize (GObject *object)
    glibtop_client *glibtop;
    glibtop_client_private *priv = NULL;
    GSList *c;
-  
+
    glibtop = GLIBTOP_CLIENT (object);
    priv = glibtop->_priv;

    for (c = priv->backend_list; c; c = c->next)
 	g_object_unref (G_OBJECT (c->data));
    g_slist_free (priv->backend_list);
-  
+
    g_free (priv);
-  
+
    if (G_OBJECT_CLASS (parent_class)->finalize)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -180,7 +180,7 @@ glibtop_client_propagate_error (glibtop_client *client, GError *error)
    g_signal_emitv (params,
 		    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR],
 		    0, NULL);
-  
+
    g_value_unset (params + 1);
    g_value_unset (params + 0);
 }
@@ -204,7 +204,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error)
    g_signal_emitv (params,
 		    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_WARNING],
 		    0, NULL);
-  
+
    g_value_unset (params + 1);
    g_value_unset (params + 0);
 }
--- a/lib/init.c
+++ b/lib/init.c
@@ -29,7 +29,7 @@
 #define DEFAULT_PORT 42800
 #endif

-static glibtop _glibtop_global_server;
+static glibtop _glibtop_global_server = { 0 };
 glibtop *glibtop_global_server = &_glibtop_global_server;

 static void
@@ -50,7 +50,7 @@ _init_server (glibtop *server, const unsigned features)
 	if (server->server_rsh == NULL) {
 		const char *temp = getenv ("LIBGTOP_RSH") ?
 			getenv ("LIBGTOP_RSH") : "/usr/bin/ssh";
-		
+
 		server->server_rsh = g_strdup (temp);
 	}

@@ -78,15 +78,15 @@ _init_server (glibtop *server, const unsigned features)

 	/* If the first character of 'server_command' is a colon,
 	 * the first field is the method to connect to the server. */
-	
+
 	/* Everything up to the next colon is the method. */
-	
+
 	command = g_strdup (server->server_command+1);
 	temp = strstr (command, ":");
 	if (temp) *temp = 0;
-	
+
 	/* Dispatch method. */
-			
+
 	if (!strcmp (command, "direct")) {
 		/* Use sysdeps dir instead of connecting to server
 		 * even if using the server would be required on
@@ -106,16 +106,16 @@ _init_server (glibtop *server, const unsigned features)
 		} else {
 			char *temp2 = strstr (temp+1, ":");
 			if (temp2) *temp2 = 0;
-					
+
 			/* Override default. */
 			if (server->server_host)
 				g_free ((char *) server->server_host);

 			server->server_host = g_strdup (temp+1);
-					
+
 			temp = temp2;
 		}
-			
+
 		if (temp == NULL) {
 			/* If no value was set, we use DEFAULT_PORT. */
 			if (server->server_port == 0)
@@ -123,10 +123,10 @@ _init_server (glibtop *server, const unsigned features)
 		} else {
 			char *temp2 = strstr (temp+1, ":");
 			if (temp2) *temp2 = 0;
-					
+
 			if (sscanf (temp+1, "%ld", &server->server_port) != 1)
 				server->server_port = DEFAULT_PORT;
-					
+
 			temp = temp2 ? temp2 + 1 : temp2;
 		}

@@ -146,7 +146,7 @@ _init_server (glibtop *server, const unsigned features)
 				 server->server_command+1);

 	}
-			
+
 	g_free (command);
 }

@@ -173,27 +173,27 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 	if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
 		if (flags & GLIBTOP_FEATURES_EXCEPT)
 			features = ~features & GLIBTOP_SYSDEPS_ALL;
-		
+
 		if (features == 0)
 			features = GLIBTOP_SYSDEPS_ALL;
-		
+
 		if (flags & GLIBTOP_FEATURES_NO_SERVER) {
 			server->method = GLIBTOP_METHOD_DIRECT;
 			features = 0;
 		}
-		
+
 		server->features = features;
-		
+
 		_init_server (server, features);
-		
+
 		server->flags |= _GLIBTOP_INIT_STATE_INIT;
-		
+
 		switch (server->method) {
 		case GLIBTOP_METHOD_PIPE:
 		case GLIBTOP_METHOD_UNIX:
 			if (glibtop_server_features & features)
 				break;
-			
+
 			server->method = GLIBTOP_METHOD_DIRECT;
 			break;
 		}
@@ -205,11 +205,11 @@ glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 		return server;

 	/* Open server, but only if not already opened. */
-	
+
 	if ((server->flags & _GLIBTOP_INIT_STATE_OPEN) == 0)
 		glibtop_open_l (glibtop_global_server, "glibtop",
 				features, flags);
-	
+
 	return server;
 }

@@ -218,7 +218,7 @@ glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 {
 	glibtop *server;
 	glibtop_init_func_t *init_fkt;
-	
+
 	if (server_ptr == NULL)
 		return NULL;

@@ -239,7 +239,7 @@ glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)

 		for (init_fkt = _glibtop_init_hook_s; *init_fkt; init_fkt++)
 			(*init_fkt) (server);
-		
+
 		server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
 	}

--- a/lib/inodedb.c
+++ b/lib/inodedb.c
@@ -59,9 +59,9 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases,

 	pwd = getpwuid (getuid ());
 	if (!pwd) glibtop_error_io_r (server, "getpwuid");
-	
+
 	sprintf (filename, "%s/var/libgtop/inodedb.db", pwd->pw_dir);
-	
+
 	if (stat (filename, &statb))
 		databases &= ~GLIBTOP_INODEDB_USER;

@@ -108,7 +108,7 @@ glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb)
 {
 	if (inodedb->system_dbf)
 		gdbm_close (inodedb->system_dbf);
-	
+
 	if (inodedb->user_dbf)
 		gdbm_close (inodedb->user_dbf);

--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -27,7 +27,7 @@ print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
-print '#include <libgnome/gnome-i18n.h>';
+print '#include "libgtop-i18n.h"';
 print '';
 print '#include <glibtop/command.h>';

@@ -67,7 +67,7 @@ print '';
 print '/* Library functions. */';
 print '';

-$convert{'long'} = 'int64_t';
+$convert{'long'} = 'gint64';
 $convert{'ulong'} = 'guint64';
 $convert{'pid_t'} = 'pid_t';
 $convert{'int'} = 'int';
--- a/lib/open.c
+++ b/lib/open.c
@@ -62,17 +62,17 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		fprintf (stderr, "Connecting to '%s' port %ld.\n",
 			 server->server_host, server->server_port);
 #endif
-		
+
 		connect_type = glibtop_make_connection
 			(server->server_host, server->server_port,
 			 &server->socket);
-		
+
 #ifdef DEBUG
 		fprintf (stderr, "Connect Type is %d.\n", connect_type);
 #endif
-		
+
 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
-		
+
 		server->features = -1;
 		break;
 	case GLIBTOP_METHOD_UNIX:
@@ -83,7 +83,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		connect_type = glibtop_make_connection
 			("unix", 0, &server->socket);

-#ifdef DEBUG		
+#ifdef DEBUG
 		fprintf (stderr, "Connect Type is %d.\n", connect_type);
 #endif

@@ -101,7 +101,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 			glibtop_error_io_r (server, "cannot make a pipe");

 		server->pid  = fork ();
-		
+
 		if (server->pid < 0) {
 			glibtop_error_io_r (server, "fork failed");
 		} else if (server->pid == 0) {
@@ -119,7 +119,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		close (server->output [0]);

 		server->flags |= _GLIBTOP_INIT_STATE_SERVER;
-		
+
 		server->features = -1;
 		break;
 	}
@@ -141,25 +141,25 @@ glibtop_open_l (glibtop *server, const char *program_name,
 			 sizeof (glibtop_sysdeps));

 		size = strlen (version) + 1;
-	
+
 		glibtop_read_l (server, sizeof (nbytes), &nbytes);

 		if (nbytes != size)
 			glibtop_error_r (server,
 					 "Requested %u bytes but got %u.",
 					 size, nbytes);
-		
+
 		glibtop_read_l (server, nbytes, buffer);
-		
+
 		if (memcmp (version, buffer, size))
 			glibtop_error_r (server, "server version is not %s",
 					 LIBGTOP_VERSION);

 		/* Now ask it for its features. */
-		
+
 		glibtop_call_l (server, GLIBTOP_CMND_SYSDEPS, 0, NULL,
 				sizeof (glibtop_sysdeps), &sysdeps);
-		
+
 		server->features = sysdeps.features;

 		memcpy (&server->sysdeps, &sysdeps, sizeof (glibtop_sysdeps));
@@ -176,6 +176,6 @@ glibtop_open_l (glibtop *server, const char *program_name,
 #ifdef DEBUG
 	fprintf (stderr, "Calling sysdeps open function.\n");
 #endif
-	
+
 	glibtop_init_s (&server, features, flags);
 }
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -26,7 +26,7 @@

 #define _write_data(ptr,size)	\
 	if ((data_ptr == NULL) || (data_size < size)) return -size; \
-	if (ptr == NULL) { strcpy (data_ptr, ""); return 1; } \
+	if (ptr == NULL) { char * const p = data_ptr; *p = '\0'; return 1; } \
 	memcpy (data_ptr, ptr, size);	\
 	return size;

--- a/lib/read.c
+++ b/lib/read.c
@@ -23,7 +23,7 @@

 #include <config.h>
 #include <glibtop/read.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"


 /* Reads some data from server. */
@@ -31,37 +31,24 @@
 static void
 do_read (int s, void *ptr, size_t total_size)
 {
-	int nread;
-	size_t already_read = 0, remaining = total_size;
-	char *tmp_ptr;
-	
-	while (already_read < total_size) {
-		nread = recv (s, ptr, remaining, 0);
+	ssize_t nread;

-		if (nread == 0) {
-			close (s);
-			continue;
-		}
-		
-		if (nread <= 0) {
-			glibtop_error_io ("recv");
-			return;
-		}
-		
-		already_read += nread;
-		remaining -= nread;
-		/* (char *) ptr += nread; */
-		tmp_ptr = ptr;
-		tmp_ptr += nread;
-		ptr = tmp_ptr;
+	if(!total_size) return;
+
+	while (total_size && (nread = recv (s, ptr, total_size, 0)) > 0) {
+		total_size -= nread;
+		ptr = (char*)ptr + nread;
 	}
+
+	if(nread == 0)
+		close (s);
+	else if (nread < 0)
+		glibtop_error_io ("recv");
 }

 void
 glibtop_read_l (glibtop *server, size_t size, void *buf)
 {
-	int ret = 0;
-
 	glibtop_init_r (&server, 0, 0);

 #ifdef DEBUG
@@ -71,9 +58,11 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	if (server->socket) {
 		do_read (server->socket, buf, size);
 	} else {
-		ret = read (server->input [0], buf, size);
+		if(read (server->input [0], buf, size) < 0)
+			glibtop_error_io_r (
+				server,
+				ngettext ("read %d byte",
+					  "read %d bytes", size),
+				size);
 	}
-
-	if (ret < 0)
-		glibtop_error_io_r (server, ngettext ("read %d byte", "read %d bytes", size), size);
 }
--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -24,7 +24,7 @@
 #include <config.h>

 #include <glibtop/read_data.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"

 /* Reads some data from server. */

@@ -42,9 +42,9 @@ glibtop_read_data_l (glibtop *server)
 #endif

 	if (server->socket) {
-		ret = recv (server->socket, (void *)&size, sizeof (size_t), 0);
+		ret = recv (server->socket, &size, sizeof (size_t), 0);
 	} else {
-		ret = read (server->input [0], (void *)&size, sizeof (size_t));
+		ret = read (server->input [0], &size, sizeof (size_t));
 	}

 	if (ret < 0)
@@ -54,10 +54,10 @@ glibtop_read_data_l (glibtop *server)
 	fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
 #endif

-	if (!size) return NULL;	
+	if (!size) return NULL;

 	ptr = g_malloc (size);
-	
+
 	if (server->socket) {
 		ret = recv (server->socket, ptr, size, 0);
 	} else {
--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -178,5 +178,5 @@ glibtop_init_func_t _glibtop_init_hook_p [] = {
 void
 glibtop_get_sysdeps_r (glibtop *server, glibtop_sysdeps *buf)
 {
-	memcpy (buf, &server->sysdeps, sizeof (glibtop_sysdeps));
+	*buf = server->sysdeps;
 }
--- a/lib/write.c
+++ b/lib/write.c
@@ -24,7 +24,7 @@
 #include <config.h>

 #include <glibtop/write.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"

 /* Writes some data to server. */

--- a/misc/i4b_acct.h
+++ b/misc/i4b_acct.h
@@ -23,7 +23,7 @@
 *      without specific prior written permission.
 *   4. Altered versions must be plainly marked as such, and must not be
 *      misrepresented as being the original software and/or documentation.
- *   
+ *
 *   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 *   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 *   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,428 @@
+2004-09-26  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-09-24  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Updated.
+
+2004-09-20  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>
+                                                                                
+        * or.po: Updated Oriya translation.
+  
+2004-09-12  Laszlo Dvornik  <dvornik@gnome.hu>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2004-09-12  Dafydd Harries  <daf@muse.19inch.net>
+
+	* cy.po: Updated Welsh translation.
+
+2004-09-10  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation from
+	Benoit Dejean <TazForEver@dlfp.org>.
+
+2004-09-07  Akagic Amila  <bono@linux.org.ba>
+
+	* bs.po: Updated Bosnian translation.
+
+2004-09-06  Mugurel Tudor  <mugurelu@go.ro>
+
+        * ro.po: Updated Romanian translation
+        by Misu Moldovan <dumol@go.ro> 
+
+2004-09-06  Kostas Papadimas <pkst@gnome.org>
+
+	* el.po: Updated Greek translation.
+
+2004-09-05  Raphael Higino  <raphaelh@cvs.gnome.org>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2004-09-03  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation
+	
+2004-09-02  Hendrik Richter <hendrik@gnome-de.org>
+
+	* de.po: Updated German translation
+	
+2004-08-30  Nikos Charonitakis  <charosn@her.forthnet.gr>
+
+	* el.po: Updated Greek translation.
+
+2004-08-28  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2004-08-28  Akagic Amila  <bono@linux.org.ba>
+
+        * bs.po: Added Bosnian translation.
+
+2004-08-26  Iñaki Larrañaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
+2004-08-23  Maxim Dziumanenko <mvd@mylinux.com.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2004-08-23  Martin Willemoes Hansen  <mwh@sysrq.dk>
+
+	* da.po: Updated Danish translation.
+
+2004-08-21  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2004-08-21  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nb.po: Add this.
+
+2004-08-20  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-08-18  Pauli Virtanen  <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2004-08-18  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-08-15  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Fixed typo in Portuguese translation.
+
+2004-08-13  Tommi Vainikainen  <thv@iki.fi>
+
+	* fi.po: Unified some fields in po headers for Finnish team.
+
+2004-08-11  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: Updated Russian translation
+	from Russian team <gnome-cyr@gnome.org>.
+
+2004-08-10  Artur Flinta  <aflinta@cvs.gnome.org>
+
+	* pl.po: Updated Polish translation by GNOME PL Team.
+
+2004-08-08  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2004-08-07  Marcel Telka  <marcel@telka.sk>
+
+	* sk.po: Updated Slovak translation.
+
+2004-08-07  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2004-08-04  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2004-08-03  Benoît Dejean  <tazforever@dlfp.org>
+
+	* am.po:
+	* ar.po:
+	* az.po:
+	* be.po:
+	* bg.po:
+	* bn.po:
+	* ca.po:
+	* cs.po:
+	* cy.po:
+	* da.po:
+	* de.po:
+	* el.po:
+	* en_CA.po:
+	* en_GB.po:
+	* es.po:
+	* et.po:
+	* eu.po:
+	* fa.po:
+	* fi.po:
+	* fr.po:
+	* ga.po:
+	* gl.po:
+	* gu.po:
+	* he.po:
+	* hi.po:
+	* hr.po:
+	* hu.po:
+	* id.po:
+	* it.po:
+	* ja.po:
+	* ko.po:
+	* lt.po:
+	* lv.po:
+	* mi.po:
+	* mk.po:
+	* ml.po:
+	* mn.po:
+	* ms.po:
+	* nl.po:
+	* nn.po:
+	* no.po:
+	* pa.po:
+	* pl.po:
+	* pt.po:
+	* pt_BR.po:
+	* ro.po:
+	* ru.po:
+	* sk.po:
+	* sl.po:
+	* sq.po:
+	* sr.po:
+	* sr@Latn.po:
+	* sv.po:
+	* ta.po:
+	* tr.po:
+	* uk.po:
+	* vi.po:
+	* zh_CN.po:
+	* zh_TW.po: Updated.
+
+2004-08-03  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2004-08-01  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
+2004-07-31  Laszlo Dvornik  <dvornik@gnome.hu>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2004-07-31  Laszlo Dvornik  <dvornik@gnome.hu>
+
+	* hu.po: Updated Hungarian translation by Gabor Kelemen.
+
+2004-07-31  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
+
+	* es.po: Updated Spanih translation.
+
+2004-07-28  David Lodge  <dave@cirt.net>                                                                       
+        * en_GB.po: Updated British translation.
+                                                                                
+2004-07-26  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Updated Portuguese translation.
+
+2004-07-21  Metin Amiroff  <metin@karegen.com>
+
+	* az.po: Translation updated by Mətin Əmirov.
+
+2004-07-21  Takeshi AIHANA <aihana@gnome.gr.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2004-07-21  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * hi.po: Updated Hindi translation.
+
+2004-07-21  Vincent van Adrighem  <adrighem@gnome.org>
+
+	* nl.po: Translation updated by Jeroen van der Vegt.
+
+2004-07-20  Benoît Dejean  <tazforever@dlfp.org>
+
+	* am.po:
+	* ar.po:
+	* az.po:
+	* be.po:
+	* bg.po:
+	* bn.po:
+	* ca.po:
+	* cs.po:
+	* cy.po:
+	* da.po:
+	* de.po:
+	* el.po:
+	* en_CA.po:
+	* en_GB.po:
+	* es.po:
+	* et.po:
+	* eu.po:
+	* fa.po:
+	* fi.po:
+	* fr.po:
+	* ga.po:
+	* gl.po:
+	* gu.po:
+	* he.po:
+	* hi.po:
+	* hr.po:
+	* hu.po:
+	* id.po:
+	* it.po:
+	* ja.po:
+	* ko.po:
+	* lt.po:
+	* lv.po:
+	* mi.po:
+	* mk.po:
+	* ml.po:
+	* mn.po:
+	* ms.po:
+	* nl.po:
+	* nn.po:
+	* no.po:
+	* pa.po:
+	* pl.po:
+	* pt.po:
+	* pt_BR.po:
+	* ro.po:
+	* ru.po:
+	* sk.po:
+	* sl.po:
+	* sq.po:
+	* sr.po:
+	* sr@Latn.po:
+	* sv.po:
+	* ta.po:
+	* tr.po:
+	* uk.po:
+	* vi.po:
+	* zh_CN.po:
+	* zh_TW.po: Updated.
+
+2004-07-19  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Updated Albanian translation.
+
+2004-07-19  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Updated Czech translation.
+
+2004-07-18  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
+2004-07-18  Benoît Dejean  <tazforever@dlfp.org>
+
+	* POTFILES.in: Updated. Closes #147822.
+
+2004-07-08  Alexander Shopov  <ash@contact.bg>
+
+	* bg.po: Updated Bulgarian translation by
+	Rostislav Raykov <zbrox@i-space.org>
+		
+2004-06-28  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Translation updated.
+
+2004-06-26  John C Barstow  <jbowtie@amathaine.com>
+
+	* mi.po: Translation added.
+
+2004-05-14  Baris Cicek <baris@teamforce.name.tr>
+
+	* tr.po: Updated Turkish Translation
+
+2004-04-16  Iñaki Larrañaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Added Basque translation.
+
+2004-04-15  Andras Timar  <timar@gnome.hu>
+
+	* hu.po: Updated Hungarian translation.
+
+2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * gu.po: Added Gujurati translation by
+        Gujarati Team <magnet@magnet-i.com>.
+
+2004-03-30  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Added Canadian English translation.
+
+2004-03-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2004-03-22  Gareth Owen  <gowen72@yahoo.com>
+
+	* en_GB.po: Added British translation
+
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * pa.po: Punjabi translation by
+        Amanpreet Singh Alam <amanlinux@netscape.net>.
+
+2004-03-21  Andras Timar  <timar@gnome.hu>
+
+	* hu.po: Added Hungarian translation.
+
+2004-03-18  Mugurel Tudor  <mugurelu@go.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan  <dumol@go.ro>
+
+2004-03-16  Dafydd Harries  <daf@muse.19inch.net>
+
+	* cy.po: Updated Welsh translation.
+
+2004-03-15  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-03-15  Yuriy Syrota  <rasta@cvs.gnome.org>
+
+	* uk.po: Updated Ukrainian translation.
+
+2004-03-13  Ales Nyakhaychyk  <nab@mail.by>
+
+	* be.po: Updated Belarusian translation.
+
+2004-03-12  Tomasz Kłoczko <kloczek@pld.org.pl>
+
+	* hr.po: added Plural-Forms field in header and missing empty
+	entries.
+
+2004-03-11  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation done by
+	Medina <afmedina@uol.com.br>.
+
+2004-03-11  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: Updated Russian translation
+	from Russian team <gnome-cyr@gnome.org>.
+
+2004-03-10  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-03-07  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2004-03-06  Mətin Əmirov  <metin@karegen.com>
+
+	* az.po: Translation updated.
+
+2004-02-26  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+	* hi.po: Updated Hindi translation.
+
+2004-02-23  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Fixed Albanian translation.
+
+2004-02-21  Nikos Charonitakis  <frolix68@yahoo.gr>
+
+	* el.po: Updated Greek translation.
+
 2004-02-08  Changwoo Ryu  <cwryu@debian.org>

 	* ko.po: Updated Korean translation.
@@ -77,7 +502,7 @@
 2004-01-02  Sanlig Badral  <Badral@openmn.org>

    * mn.po: Updated Mongolian translation.
-    
+
 2003-12-14  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>

 	* es.po: Updated Spanish translation.
@@ -137,7 +562,7 @@
 2003-10-19  Carlos Perelló Marín <carlos@gnome.org>

 	* POTFILES.ignore: Removed, we use now POTFILES.skip
-	
+
 2003-10-01  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>

 	* pt_BR.po: Applied revision by Augusta Marques da Silva
@@ -238,19 +663,19 @@
 2003-06-04  Paul Duffy <dubhthach@frink.nuigalway.ie>

        * ga.po: Updated Irish Translation.
-	
+
 2003-05-25  Abel Cheung  <maddog@linux.org.hk>

 	* he.po: Mark wrong entry as fuzzy (msgfmt check failed).

 2003-05-16  Danilo ©egan  <dsegan@gmx.net>

-	* sr.po, sr@Latn.po: Updated Serbian translation by Serbian 
+	* sr.po, sr@Latn.po: Updated Serbian translation by Serbian
 	team (Prevod.org).

 2003-05-10  Danilo Segan  <dsegan@gmx.net>

-	* sr.po, sr@Latn.po: Added Serbian translation by Serbian team 
+	* sr.po, sr@Latn.po: Added Serbian translation by Serbian team
 	(Prevod.org).

 2003-04-20  Abel Cheung  <maddog@linux.org.hk>
@@ -330,7 +755,7 @@
 2003-01-16  Daniel Yacob <locales@geez.org>

 	* am.po: Added Amharic translation.
-	
+
 2003-01-16  Pablo Saratxaga  <pablo@mandrakesoft.com>

 	* vi.po: Updated Vietnamese file
@@ -474,7 +899,7 @@
 2002-04-23  Kjartan Maraas  <kmaraas@gnome.org>

 	* no.po: Updated Norwegian (bokm?¥l) translation.
-	
+
 2002-04-19  Ole Laursen  <olau@hardworking.dk>

 	* da.po: Updated Danish translation.
@@ -498,7 +923,7 @@

 2002-03-25  Duarte Loreto <happyguy_pt@hotmail.com>

-        * pt.po: Updated Portuguese translation. 
+        * pt.po: Updated Portuguese translation.

 2002-03-23  Hasbullah Bin Pit <sebol@ikhlas.com>

@@ -511,7 +936,7 @@
 2002-03-06  Kjartan Maraas  <kmaraas@gnome.org>

 	* no.po: Updated Norwegian (bokm?¥l) translation.
-	
+
 2002-03-06  Germ??n Poo-Caama?±o <gpoo@ubiobio.cl>

 	* es.po: Fixed spanish translation encoding.
@@ -532,7 +957,7 @@
 2002-02-12  Kjartan Maraas  <kmaraas@gnome.org>

 	* no.po: Updated Norwegian (bokm?¥l) translation.
-	
+
 2002-02-09  Abel Cheung  <maddog@linux.org.hk>

 	* zh_TW.po: Updated traditional Chinese translation.
@@ -575,7 +1000,7 @@
 2001-07-16  Kjartan Maraas  <kmaraas@gnome.org>

 	* nn.po: Added Norwegian (nynorsk) translation.
-	
+
 2001-03-25  Fatih Demir <kabalak@gtranslator.org>

 	* tr.po: %100'ification.
@@ -665,11 +1090,11 @@
 2000-09-19  Christian Meyer  <linux@chrisime.de>

 	* de.po: Minor fix.
-	
+
 2000-09-19  Christian Meyer  <linux@chrisime.de>

 	* de.po: Updated German translation.
-	
+
 2000-09-10  Christian Meyer  <linux@chrisime.de>

 	* de.po: Updated German translation.
@@ -679,7 +1104,7 @@
 2000-08-16  Kjartan Maraas  <kmaraas@gnome.org>

 	* no.po: Updated Norwegian translation.
-	
+
 2000-06-25  Takayuki KUSANO  <AE5T-KSN@asahi-net.or.jp>

 	* ja.po: Updated Japanese translation.
@@ -703,7 +1128,7 @@
 2000-05-17  Kjartan Maraas  <kmaraas@online.no>

 	* no.po: Updated translation.
-	
+
 2000-05-16  Kenneth Christiansen  <kenneth@gnome.org>

        * POTFILES.in: New strings added
@@ -758,7 +1183,7 @@
 1999-07-11  Kjartan Maraas  <kmaraas@online.no>

 	* no.po: Updated translation.
-	
+
 1999-07-11  Tomas Ogren  <stric@ing.umu.se>

 	* sv.po: New file
@@ -766,7 +1191,7 @@
 1999-01-27  Kjartan Maraas  <kmaraas@fib.hl.no>

 	* no.po: Updated translation
-	
+
 1998-12-22  Yukihiro Nakai  <Nakai@TokyoNet.AD.JP>

 	* ja.po: New file - added Japanese translation
@@ -778,7 +1203,7 @@
 1998-10-11  Kjartan Maraas  <kmaraas@fib.hl.no>

 	* no.po: New file - added norwegian translation.
-	
+
 1998-10-07  Martin Baulig  <martin@home-of-linux.org>

 	* de.po: New file - added german translation.
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -54,11 +54,9 @@ src/inodedb/file_by_inode2.c
 src/inodedb/mkinodedb2.c
 sysdeps/common/error.c
 sysdeps/common/fsusage.c
-sysdeps/common/fsusage.h
 sysdeps/common/gnuslib.c
 sysdeps/common/inodedb.c
 sysdeps/common/mountlist.c
-sysdeps/common/mountlist.h
 sysdeps/common/sysdeps_suid.c
 sysdeps/linux/close.c
 sysdeps/linux/cpu.c
--- a/po/am.po
+++ b/po/am.po
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/az.po
+++ b/po/az.po
@@ -1,5 +1,4 @@
 # translation of libgtop.HEAD.az.po to Azerbaijani Turkish
-# libgtop faylının Azərbaycan dilinə tərcüməsi.
 # Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 # Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001.
 # Mətin Əmirov <metin@karegen.com>, 2004.
@@ -8,42 +7,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD.az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-27 20:42+0100\n"
+"POT-Creation-Date: 2004-08-03 14:09+0200\n"
 "PO-Revision-Date: 2004-01-12 19:43+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
-"Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
+"Language-Team: Azerbaijani Turkish <translation-team-az@lists.sourceforge."
+"net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Tiklər (saniyə başına %ld):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Toplam"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "İstifadəçi"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Nice"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Sys"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Idle"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -52,36 +52,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d     (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Faiz:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Ümumi (%):"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "İstifadəçi (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Nice (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Sys (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Idle (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -90,16 +90,16 @@ msgstr ""
 "CPU           (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d     (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Ox:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -163,7 +163,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "%s şərhində xəta oldü %s.\n"
-"'%s --help' əmrindən bütün əmr sətiri seçənəkləri üçün işə salın.\n"
+"'%s --help' əmrindən bütün əmr sətiri seçimləri üçün işə salın.\n"

 #: sysdeps/names/cpu.c:44
 msgid "Total CPU Time"
@@ -235,13 +235,13 @@ msgstr "Sistemin idle oturumunda keçirdiyi saat tikləri"

 #: sysdeps/names/cpu.c:65
 msgid "Tick frequency (default is 100)"
-msgstr "Tick sıxlığı (əsas 100 dür)"
+msgstr "Tick sıxlığı (ön qurğulusu 100-dür)"

 #: sysdeps/names/cpu.c:71
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Hazırda hansı CPU-nun işlədiyini göstərən sahə"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Total blok sayısı"

@@ -253,19 +253,23 @@ msgstr "Boş blok sayısı"
 msgid "Available blocks"
 msgstr "Mövcud blok sayısı"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Ümumi dosye düyümləri"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Boş dosye düyümləri"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Blok böyüklüyü"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "İstifadəçi üçün ayrılan boş blokların sayısı"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "İstifadəçi üçün ayrılmayan boş blokların sayısı"

@@ -389,7 +393,7 @@ msgstr "Maksimal xəbər böyüklüyü"

 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Default max size of queue"
-msgstr "Maksimal əsas istək böyüklüyü"
+msgstr "Maksimal ön qurğulu istək böyüklüyü"

 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Max queues system wide"
@@ -403,7 +407,7 @@ msgstr "Xəbər parçası böyüklüyü"
 msgid "Number of system message headers"
 msgstr "Sistem xəbərləri başlıqları sayısı"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Ara üz bayraqları"

@@ -411,55 +415,67 @@ msgstr "Ara üz bayraqları"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Subnet"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "IPv4 Subnet"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Ünvan"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "IPv4 Ünvanı"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Alınan Paketlər"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Atılan Paketlər"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Ümumi Paket sayısı"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Alınan Byte"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Gedən Bayt"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
 msgstr "Ümumi Bayt"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Gələn xətalar"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Çıxan Xətalat"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Ümumi Xəta Sayısı"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Kollision"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "IPv6 Ünvanı"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "IPv6 Prefiksi"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "IPv6 Əhatə Sahəsi"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Maksimal Daşıma Vahidi"

@@ -659,7 +675,8 @@ msgstr ""
 "deyildir."

 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
 "Gedişatın rss'sinin baytlarla göstərilan hazırkı sərhədləri (çox vaxt "
 "2.147.483.647)."
@@ -802,15 +819,15 @@ msgstr "exec() cağırışındakı işə salınabilən dosyenin  əsas adı"

 #: sysdeps/names/procstate.c:50
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "əmaliyyət gedişatının Single-Char kodu (S=yuxudakı)"
+msgstr "Əmaliyyət gedişatının Single-Char kodu (S=yuxudakı)"

 #: sysdeps/names/procstate.c:51
 msgid "UID of process"
-msgstr "Gedişatın UIDi"
+msgstr "Gedişatın UID-si"

 #: sysdeps/names/procstate.c:52
 msgid "GID of process"
-msgstr "Gedişatın GIDi"
+msgstr "Gedişatın GID-si"

 #: sysdeps/names/procstate.c:53
 msgid "Real UID of process"
@@ -878,7 +895,8 @@ msgstr "XUCP_STime"

 #: sysdeps/names/proctime.c:52
 msgid "Start time of process in seconds since the epoch"
-msgstr "Gedişatın başlanğıc vaxtının epoch'dan e'tibarən keçən saniyəlarlə müddəti"
+msgstr ""
+"Gedişatın başlanğıc vaxtının epoch'dan e'tibarən keçən saniyəlarlə müddəti"

 #: sysdeps/names/proctime.c:53
 msgid "Real time accumulated by process (should be utime + stime)"
@@ -1294,7 +1312,7 @@ msgstr "Hökmsüz tə'limat"

 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "İzləmə trapı"
+msgstr "İzləmə yolu"

 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
@@ -1302,7 +1320,7 @@ msgstr "Ləğv Et"

 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr "EMT Xətası"
+msgstr "EMT xətası"

 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
@@ -1314,7 +1332,7 @@ msgstr "Öldür"

 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr "Bus Xətası"
+msgstr "Yol Xətası"

 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
@@ -1326,11 +1344,11 @@ msgstr "Sistem çağırışı üçün xətalı arqument"

 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Qırıq Boru"
+msgstr "Qırıq boru"

 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr "Zəngli Saat"
+msgstr "Zəngli saat"

 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
@@ -1358,11 +1376,11 @@ msgstr "Törəmə halı dəyişdi"

 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "tty'dən arxa plan gedişatı mə'lumatı"
+msgstr "tty-dən arxa plan gedişatı mə'lumatı"

 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr "tty'yə yazma əməliyyatı"
+msgstr "tty-yə yazma əməliyyatı"

 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
@@ -1399,4 +1417,3 @@ msgstr "İstifadəçi siqnal 1 təsvir etdi"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "İstifadəçi siqnal 2 təsvir etdi"
-
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/bn.po
+++ b/po/bn.po
--- a/po/bs.po
+++ b/po/bs.po
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,14 +1,14 @@
 # Catalan translation of libgtop.
-# Copyright © 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 # Softcatalà <gnome@softcatala.net>, 2000, 2001, 2002.
-# Jordi Mallach <jordi@sindominio.net>, 2002, 2003.
+# Jordi Mallach <jordi@sindominio.net>, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 2.0.0\n"
+"Project-Id-Version: libgtop 2.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-03 15:06+0100\n"
-"PO-Revision-Date: 2003-11-03 15:17+0100\n"
+"POT-Creation-Date: 2004-08-21 18:36+0200\n"
+"PO-Revision-Date: 2004-08-21 18:41+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,32 +16,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Polsos (%ld per segon):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Total"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Usuari"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Prioritari"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Sistema"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Inactiu"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -50,36 +50,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Percentage:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Total (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "ID de l'usuari (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Prioritari (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Sistema (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Inactiu (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -88,21 +88,21 @@ msgstr ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Rotació:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "llegeix %d byte"
-msgstr[1] "llegeix %d bytes"
+msgstr[0] "llegeix %d octet"
+msgstr[1] "llegeix %d octets"

 #: lib/read_data.c:51
 msgid "read data size"
@@ -112,15 +112,15 @@ msgstr "llegeix la mida de les dades"
 #, c-format
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
-msgstr[0] "llegeix %d byte de les dades"
-msgstr[1] "llegeix els %d bytes de les dades"
+msgstr[0] "llegeix %d octet de les dades"
+msgstr[1] "llegeix els %d octets de les dades"

 #: lib/write.c:51
 #, c-format
 msgid "write %d byte"
 msgid_plural "write %d bytes"
-msgstr[0] "escriu %d byte"
-msgstr[1] "escriu els %d bytes"
+msgstr[0] "escriu %d octet"
+msgstr[1] "escriu els %d octets"

 #: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
@@ -243,7 +243,7 @@ msgstr "Freqüència de polsos (per defecte és 100)"
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Camp de bit que indica quina CPU s'està executant actualment"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Nombre total de blocs"

@@ -255,19 +255,23 @@ msgstr "Blocs lliures"
 msgid "Available blocks"
 msgstr "Blocs disponibles"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Nombre total de nodes d'arxius"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Nodes d'arxiu lliures"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Mida del bloc"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Blocs lliures disponibles per al superusuari"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Blocs lliures disponibles per als no superusuaris"

@@ -380,7 +384,7 @@ msgstr "La mida d'un element de la llista"

 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Size in kilobytes of message pool"
-msgstr "Mida en kB de la bústia de missatges"
+msgstr "Mida en KB de la bústia de missatges"

 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Number of entries in message map"
@@ -406,7 +410,7 @@ msgstr "Mida dels segments de missatge"
 msgid "Number of system message headers"
 msgstr "Nombre d'encapçalaments de missatges del sistema"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Senyaladors d'interfície"

@@ -414,55 +418,67 @@ msgstr "Senyaladors d'interfície"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Subxarxa"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "Subxarxa IPv4"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Adreça"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "Adreça IPv4"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Els paquets a dins"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Els paquets a fora"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "El total de paquets "

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
-msgstr "Bytes a dins"
+msgstr "Octets a dins"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
-msgstr "Bytes a fora"
+msgstr "Octets a fora"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
-msgstr "El total de bytes"
+msgstr "Total d'octets"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Errors a dins"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Errors a fora"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "El total d'errors"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Col·lisions"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "Adreça IPv6"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "Prefix IPv6"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "Àmbit IPv6"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Unitat màxima de transferència"

@@ -472,19 +488,19 @@ msgstr "Estat del PPP"

 #: sysdeps/names/ppp.c:40
 msgid "Input bytes"
-msgstr "Bytes d'entrada"
+msgstr "Octets d'entrada"

 #: sysdeps/names/ppp.c:41
 msgid "Output bytes"
-msgstr "Bytes de sortida"
+msgstr "Octets de sortida"

 #: sysdeps/names/ppp.c:47
 msgid "Number of input bytes"
-msgstr "Nombre de bytes d'entrada"
+msgstr "Nombre d'octets d'entrada"

 #: sysdeps/names/ppp.c:48
 msgid "Number of output bytes"
-msgstr "Nombre de bytes de sortida"
+msgstr "Nombre d'octets de sortida"

 #: sysdeps/names/procargs.c:39 sysdeps/names/procmem.c:48
 msgid "Size"
@@ -492,7 +508,7 @@ msgstr "Mida"

 #: sysdeps/names/procargs.c:44
 msgid "Length in bytes of the returned string."
-msgstr "Longitud en bytes de la cadena retornada"
+msgstr "Longitud en octets de la cadena retornada"

 #: sysdeps/names/prockernel.c:43
 msgid "K_Flags"
@@ -544,9 +560,12 @@ msgid ""
 msgstr ""
 "Senyaladors del nucli del procés.\n"
 "\n"
-"A Linux, actualment cada senyalador té fixat el bit matemàtic, pel fet de comprovar crt0.sper a emulació matemàtica, per això no s'inclou a la sortida. \n"
+"A Linux, actualment cada senyalador té fixat el bit matemàtic, pel fet de "
+"comprovar crt0.sper a emulació matemàtica, per això no s'inclou a la "
+"sortida. \n"
 "\n"
-"Això és probablement un error fortuït, ja que no tots els processos són programes compilats en C. \n"
+"Això és probablement un error fortuït, ja que no tots els processos són "
+"programes compilats en C. \n"
 "\n"
 "El bit matemàtic hauria de ser un decimal 4, i el bit traçat és un decimal 10"

@@ -661,8 +680,7 @@ msgstr ""
 #: sysdeps/names/procmem.c:63
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr ""
-"Límit actual en octets de la rss del procés (normalment 2.147.483.647)."
+msgstr "Límit actual en octets de la rss del procés (normalment 2.147.483.647)."

 #: sysdeps/names/procsegment.c:43
 msgid "Text_RSS"
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 04:54+0100\n"
-"PO-Revision-Date: 2004-01-27 16:36+0100\n"
+"POT-Creation-Date: 2004-08-03 14:09+0200\n"
+"PO-Revision-Date: 2004-07-19 15:02+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,32 +17,32 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Tiky (%ld za sekundu):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Celkem"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Uživatel"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Nice"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Sys"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Nevyužito"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -51,36 +51,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Procent:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Celkem (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "Uživatel (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Nice (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Sys (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Nevyužito (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -89,16 +89,16 @@ msgstr ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Spin:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -244,7 +244,7 @@ msgstr "Frekvence tiků (implicitně 100)"
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Pole bitů indikující, které CPU právě běží"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Celkem bloků"

@@ -256,19 +256,23 @@ msgstr "Volných bloků"
 msgid "Available blocks"
 msgstr "Dostupných bloků"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Celkem uzlů souborů"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Volných uzlů souborů"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Velikost bloku"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Volné bloky dostupné superuživateli"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Volné bloky dostupné obyčejným uživatelům"

@@ -406,7 +410,7 @@ msgstr "Velikost segmentu zprávy"
 msgid "Number of system message headers"
 msgstr "Počet hlaviček zpráv v systému"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Příznaky rozhraní"

@@ -414,55 +418,67 @@ msgstr "Příznaky rozhraní"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Podsíť"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "Podsíť IPv4"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Adresa"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "Adresa IPv4"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Pakety dovnitř"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Pakety ven"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Pakety celkem"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Bajty dovnitř"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Bajty ven"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
 msgstr "Bajty celkem"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Chyby dovnitř"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Chyby ven"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Chyby celkem"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Kolize"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "Adresa IPv6"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "Prefix IPv6"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "Rozsah IPv6"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Maximální jednotka přenosu"

--- a/po/cy.po
+++ b/po/cy.po
--- a/po/da.po
+++ b/po/da.po
@@ -1,9 +1,10 @@
 # Danish translation of libgtop.
-# Copyright (C) 1998, 2002, 03 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 03, 04 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgtop package.
 # Kenneth Christiansen <kenneth@ripen.dk>, 1998, 1999.
 # Keld Simonsen <keld@dkuug.dk>, 2000.
 # Ole Laursen <olau@hardworking.dk>, 2002, 03.
-#
+# Martin Willemoes Hansen <mwh@sysrq.dk>, 2004.
 #
 # BEMÆRK: oversættelsen er overhovedet ikke blevet rettet igennem.
 #     
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-20 21:11+0100\n"
-"PO-Revision-Date: 2003-11-20 21:23+0100\n"
+"POT-Creation-Date: 2004-08-23 12:21+0200\n"
+"PO-Revision-Date: 2004-08-23 12:21+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
@@ -20,32 +21,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Tik (%ld pr. sekund):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Total"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Bruger"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Venlig"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Sys"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Passiv"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -54,36 +55,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Procent:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Total (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "Bruger (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Venlig (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Sys (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Passiv (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -92,16 +93,16 @@ msgstr ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Spin:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -243,7 +244,7 @@ msgstr "Tikfrekvens (standard er 100)"
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Bitfelt som angiver hvilken processor der aktuelt kører"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Totalt antal blokke"

@@ -255,19 +256,23 @@ msgstr "Ledige blokke"
 msgid "Available blocks"
 msgstr "Tilgængelige blokke"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Antal filknuder"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Ledige filknuder"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Blokstørrelse"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Ledige blokke tilgængelig for superbruger"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Ledige blokke tilgængelige til ikke-superbrugere"

@@ -405,7 +410,7 @@ msgstr "Størrelse på meddelelsessegment"
 msgid "Number of system message headers"
 msgstr "Antal systemmeddelelseshoveder"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Grænseflade-flag"

@@ -413,55 +418,67 @@ msgstr "Grænseflade-flag"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Undernet"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "IPv4-undernet"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Adresse"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "IPv4-adresse"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Pakker ind"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Pakker ud"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Pakker total"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Byte ind"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Byte ud"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
 msgstr "Byte total"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Fejl ind"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Fejl ud"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Fejl total"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Kollisioner"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "IPv6-adresse"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "IPv6-præfiks"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "IPv6-virkefelt"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Maks. overførselsenhed"

--- a/po/de.po
+++ b/po/de.po
@@ -2,6 +2,7 @@
 # Martin Baulig <martin@home-of-linux.org>, 1998-2000.
 # Christian Meyer <cm@ggtt.de>, 2000, 2001.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
+# Hendrik Richter <hendrik@gnome-de.org>, 2004
 #
 # hmm... ein paar englische Strings sollte man lieber in Ruhe lassen...! -cm-
 #
@@ -9,41 +10,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-04 18:30+0100\n"
+"POT-Creation-Date: 2004-09-02 18:47+0000\n"
 "PO-Revision-Date: 2004-01-04 18:32+0100\n"
-"Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
+"Last-Translator: Hendrik Richter <hendrik@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Takt (%ld pro Sekunde):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Gesamt"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Benutzer"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Nice"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Sys"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Leerlauf"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -52,36 +53,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Prozent:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Gesamt (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "Benutzer (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Nice (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Sys (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Leerlauf (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -90,16 +91,16 @@ msgstr ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Spin:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -246,7 +247,7 @@ msgstr "Impulsfrequenz (Vorgabe ist 100)"
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Bitfeld, das anzeigt, welche CPU momentan läuft"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Blöcke insgesamt"

@@ -258,19 +259,23 @@ msgstr "Freie Blöcke"
 msgid "Available blocks"
 msgstr "Für Benutzer verfügbare Blöcke"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Knoten insgesamt"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Freie Knoten"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Blockgröße"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Freie Blöcke inklusive für den Administrator reservierter Blöcke"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Für Benutzer verfügbare Blöcke"

@@ -408,7 +413,7 @@ msgstr "Größe des Nachrichtensegments"
 msgid "Number of system message headers"
 msgstr "Anzahl der Systemnachrichtenköpfe"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Schnittstellenoption"

@@ -416,55 +421,67 @@ msgstr "Schnittstellenoption"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Subnetz"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "IPv4 Subnetz"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Adresse"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "IPv4 Adresse"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Pakete rein"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Pakete raus"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Pakete gesamt"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Bytes rein"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Bytes raus"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
 msgstr "Bytes gesamt"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Fehler rein"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Fehler raus"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Fehler gesamt"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Kollisionen"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "IPv6 Adresse"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "IPv6 Präfix"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "IPv6 Adressbereich"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Maximale Übertragungseinheit"

--- a/po/el.po
+++ b/po/el.po
@@ -1,119 +1,124 @@
+# translation of el.po to 
 # translation of el.po to Greek
 # libgtop greek .po file
-# Copyright (C) 2000-2001,2003 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001,2003, 2004 Free Software Foundation, Inc.
 #
 # sarantis: ~134 messages, (unknown), initial translation.
 # simos: 240 messages, 19Feb2001, added more messages, still 65 left.
 # simos: 308 messages, 25Feb2001, completed.
 # simos: 310 messages, 07Nov2002, completed.
 # kostas: 322 messages,30Oct2003, update for Gnome 2.6
+# Nikos: add plurals, minor fixes, 21Feb2004.
+# Nikos: small update, 30Aug2004.
 # Sarantis Paskalis <paskalis@di.uoa.gr>, 2000.
 # Simos Xenitellis <simos@hellug.gr>, 2001.
-# Kostas Papadimas <pkst@gnome.org>, 2003
+# Kostas Papadimas <pkst@gnome.org>, 2003, 2004.
+# Nikos Charonitakis <charosn@her.forthnet.gr>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-30 22:45+0200\n"
-"PO-Revision-Date: 2003-10-30 22:52+0200\n"
+"POT-Creation-Date: 2004-09-06 12:46+0300\n"
+"PO-Revision-Date: 2004-09-06 12:48+0300\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
-"Language-Team: Greek <nls@tux.hellug.gr>\n"
+"Language-Team:  <nls@tux.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.3.1\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Κτύποι (%ld ανά δευτερόλεπτο):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Συνολικά"

 # sysdeps/names/mem.c:49
-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Χρήστης"

 # sysdeps/names/procuid.c:51
-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Ωραιοποίηση"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Σύστημα"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Ανενεργό"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
-"ΚΜΕ          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "ΚΜΕ %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Ποσοστό:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
-msgstr "Συνολικα (%)"
+msgstr "Συνολικά (%)"

 # sysdeps/names/mem.c:49
-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "Χρήστη (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Ωραιοποίηση (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Σύστημα (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Ανενεργό (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
-"ΚΜΕ          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "ΚΜΕ %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
-msgstr "Σπινάρισμα:"
+msgstr "Spin:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "ανάγνωση %d byte"
-msgstr[1] "ανάγνωση %d byte"
+msgstr[1] "ανάγνωση %d bytes"

 #: lib/read_data.c:51
 msgid "read data size"
@@ -124,14 +129,14 @@ msgstr "ανάγνωση μεγέθους δεδομένων"
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
 msgstr[0] "ανάγνωση δεδομένων %d byte"
-msgstr[1] "ανάγνωση δεδομένων %d byte"
+msgstr[1] "ανάγνωση δεδομένων %d bytes"

 #: lib/write.c:51
 #, c-format
 msgid "write %d byte"
 msgid_plural "write %d bytes"
 msgstr[0] "εγγραφή %d byte"
-msgstr[1] "γράψιμο %d byte"
+msgstr[1] "εγγραφή %d bytes"

 #: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
@@ -139,7 +144,7 @@ msgstr "Ενεργοποίηση εκσφαλμάτωσης"

 #: src/daemon/gnuserv.c:456
 msgid "DEBUG"
-msgstr "ΕΚΣΦΑΛΜΆΤΩΣΗ"
+msgstr "ΕΚΣΦΑΛΜΑΤΩΣΗ"

 #: src/daemon/gnuserv.c:458
 msgid "Enable verbose output"
@@ -147,7 +152,7 @@ msgstr "Ενεργοποίηση περιφραστικής εξόδου"

 #: src/daemon/gnuserv.c:458
 msgid "VERBOSE"
-msgstr "ΠΕΡΙΦΡΑΣΤΙΚΉ"
+msgstr "VERBOSE"

 #: src/daemon/gnuserv.c:460
 msgid "Don't fork into background"
@@ -172,8 +177,8 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Σφάλμα στην επιλογή %s: %s.\n"
-"Εκτελέστε '%s --help' για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
-"γραμμής εντολής.\n"
+"Εκτελέστε '%s --help' για να δείτε μια πλήρη λίστα των διαθέσιμων επιλογών "
+"της γραμμής εντολών.\n"

 # sysdeps/names/cpu.c:45
 #: sysdeps/names/cpu.c:44
@@ -270,9 +275,9 @@ msgid "Bit field indicating which CPU is currently running"
 msgstr "Το πεδίο bit δείχνει ποιά CPU εργάζεται αυτή την στιγμή"

 # sysdeps/names/fsusage.c:41 sysdeps/names/fsusage.c:50
-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
-msgstr "Συνολικά μπλοκ"
+msgstr "Σύνολο μπλοκ"

 # sysdeps/names/fsusage.c:42
 #: sysdeps/names/fsusage.c:41
@@ -285,22 +290,27 @@ msgid "Available blocks"
 msgstr "Διαθέσιμα μπλοκ"

 # sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Συνολικοί κόμβοι αρχείων"

 # sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:54
-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Ελεύθεροι κόμβοι αρχείων"

+# sysdeps/names/procsignal.c:42
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Μέγεθος μπλοκ"
+
 # sysdeps/names/fsusage.c:51
-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Ελεύθερα μπλοκ διαθέσιμα στον υπερχρήστη"

 # sysdeps/names/fsusage.c:52
-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Ελεύθερα μπλοκ διαθέσιμα σε μη-υπερχρήστες"

@@ -471,63 +481,75 @@ msgstr "Μέγεθος Τμήματος Μηνύματος (MSS)"
 msgid "Number of system message headers"
 msgstr "Αριθμός επικεφαλίδων μηνυμάτων συστήματος"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
-msgstr "Σημαίες Διασύνδεσεις"
+msgstr "Σημαίες Διασύνδεσης"

 #: sysdeps/names/netload.c:47
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Επίθεμα"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "IPv4 Subnet"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Διεύθυνση"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "Διεύθυνση IPv4"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Πακέτα Εισερχόμενα"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Πακέτα Εξερχόμενα"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Πακέτα Συνολικά"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Byte Εισερχόμενα"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Byte Εξερχόμενα"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
-msgstr "Byte Συνολικά"
+msgstr "Bytes Συνολικά"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Σφάλματα Εισερχόμενα"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Σφάλματα Εξερχόμενα"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Σφάλματα Συνολικά"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Συγκρούσεις"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "Διεύθυνση IPv6"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "Πρόθεμα IPv6"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "IPv6 Scope"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Μέγιστη Μονάδα Μεταφοράς"

@@ -679,7 +701,7 @@ msgstr ""
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:75
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "Ο τρέχων EIP (32-bit δείκτης εντολών)"
+msgstr "Ο τρέχων EIP (32-bit δείκτης εντολών)."

 # sysdeps/names/prockernel.c:78
 #. NWChan
@@ -709,7 +731,7 @@ msgstr "Εικονικό"
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:48
 msgid "Resident"
-msgstr "Παραμένον"
+msgstr "Παραμένουσα"

 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:48
@@ -762,7 +784,7 @@ msgstr ""
 # sysdeps/names/procmem.c:64
 #: sysdeps/names/procmem.c:63
 msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "Τρέχον όριο σε bytes στο rss της διεργασίας (συνήθως 2.147.483.547)"
+msgstr "Τρέχον όριο σε bytes στο rss της διεργασίας (συνήθως 2.147.483.547)."

 # sysdeps/names/procsegment.c:50
 #: sysdeps/names/procsegment.c:43
@@ -792,17 +814,17 @@ msgstr "Μέγεθος ακάθαρτου"
 # sysdeps/names/procsegment.c:51
 #: sysdeps/names/procsegment.c:44
 msgid "Start_Code"
-msgstr "Αρχή_Κώδικα"
+msgstr "Αρχή _Κώδικα"

 # sysdeps/names/procsegment.c:51
 #: sysdeps/names/procsegment.c:44
 msgid "End_Code"
-msgstr "Τέλος_Κώδικα"
+msgstr "Τέλος _Κώδικα"

 # sysdeps/names/procsegment.c:53
 #: sysdeps/names/procsegment.c:44
 msgid "Start_Stack"
-msgstr "Αρχή_Στοίβας"
+msgstr "Αρχή _Στοίβας"

 # sysdeps/names/procsegment.c:59
 #: sysdeps/names/procsegment.c:49
@@ -1545,7 +1567,7 @@ msgstr "Διακοπή"

 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr "Τερματισμός"
+msgstr "Έξοδος"

 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
@@ -1601,15 +1623,15 @@ msgstr "Επείγουσα συνθήκη σε υποδοχέα"

 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr "Σταμάτημα"
+msgstr "Διακοπή"

 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Σταμάτημα πληκτρολογίου"
+msgstr "Διακοπή πληκτρολογίου"

 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr "Συνέχιση"
+msgstr "Συνέχεια"

 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
@@ -1661,150 +1683,3 @@ msgstr "Σήμα 1 οριζόμενο από το χρήστη"
 msgid "User defined signal 2"
 msgstr "Σήμα 2 οριζόμενο από το χρήστη"

-# support/error.c:109
-#~ msgid "Unknown system error"
-#~ msgstr "Άγνωστο σφάλμα συστήματος"
-
-# support/getopt.c:669
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: η επιλογή `%s' είναι ασαφής\n"
-
-# support/getopt.c:693
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: η επιλογή `--%s' δεν επιτρέπει ορίσματα\n"
-
-# support/getopt.c:698
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: η επιλογή `%c%s' δεν επιτρέπει ορίσματα\n"
-
-# support/getopt.c:715 support/getopt.c:888
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: η επιλογή `%s' απαιτεί ένα όρισμα\n"
-
-# support/getopt.c:744
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: μη αναγνωρίσιμη επιλογή `--%s'\n"
-
-# support/getopt.c:748
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: μη αναγνωρίσιμη επιλογή `%c%s'\n"
-
-# support/getopt.c:774
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: ακατάλληλη επιλογή -- %c\n"
-
-# support/getopt.c:777
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: μη έγκυρη επιλογή -- %c\n"
-
-# support/getopt.c:807 support/getopt.c:937
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: η επιλογή απαιτεί όρισμα -- %c\n"
-
-# support/getopt.c:854
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: η επιλογή `-W %s' είναι αόριστη\n"
-
-# support/getopt.c:872
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: η επιλογή `-W %s' δεν επιτρέπει ορίσματα\n"
-
-#~ msgid "Show this help message"
-#~ msgstr "Εμφάνιση αυτού του μηνύματος βοήθειας"
-
-#~ msgid "Display brief usage message"
-#~ msgstr "Εμφάνιση σύντομου μηνύματος βοήθειας"
-
-# sysdeps/names/procsegment.c:52
-#~ msgid "Start_Data"
-#~ msgstr "Αρχή_Δεδομένων"
-
-# sysdeps/names/procsegment.c:52
-#~ msgid "End_Data"
-#~ msgstr "Τέλος_Δεδομένων"
-
-# sysdeps/names/procsegment.c:52
-#, fuzzy
-#~ msgid "Start_Brk"
-#~ msgstr "Αρχή_Brk"
-
-# sysdeps/names/procsegment.c:52
-#, fuzzy
-#~ msgid "Brk"
-#~ msgstr "Brk"
-
-# sysdeps/names/procsegment.c:53
-#, fuzzy
-#~ msgid "Start_MMap"
-#~ msgstr "Αρχή_MMap"
-
-# sysdeps/names/procsegment.c:53 sysdeps/names/procsegment.c:72
-#~ msgid "Arg_Start"
-#~ msgstr "Αρχή_Ορισμάτων"
-
-# sysdeps/names/procsegment.c:54 sysdeps/names/procsegment.c:73
-#, fuzzy
-#~ msgid "Arg_End"
-#~ msgstr "Τέλος_Ορισμάτων"
-
-# sysdeps/names/procsegment.c:54 sysdeps/names/procsegment.c:74
-#, fuzzy
-#~ msgid "Env_Start"
-#~ msgstr "Αρχή_Env"
-
-# sysdeps/names/procsegment.c:54 sysdeps/names/procsegment.c:75
-#, fuzzy
-#~ msgid "Env_End"
-#~ msgstr "Τέλος_Env"
-
-# sysdeps/names/procsegment.c:66
-#~ msgid "Address of beginning of data segment"
-#~ msgstr "Διεύθυνση αρχής του τμήματος δεδομένων"
-
-# sysdeps/names/procsegment.c:67
-#~ msgid "Address of end of data segment"
-#~ msgstr "Διεύθυνση τέλους του τμήματος δεδομένων"
-
-# sysdeps/names/procsegment.c:68
-#, fuzzy
-#~ msgid "Brk_Start"
-#~ msgstr "Brk_Start"
-
-# sysdeps/names/procsegment.c:69
-#, fuzzy
-#~ msgid "Brk_End"
-#~ msgstr "Brk_End"
-
-# sysdeps/names/procsegment.c:71
-#, fuzzy
-#~ msgid "Start of mmap()ed areas"
-#~ msgstr "Αρχή περιοχών mmap"
-
-# sysdeps/names/procstate.c:45
-#~ msgid "RUID"
-#~ msgstr "RUID"
-
-# sysdeps/names/procstate.c:46
-#~ msgid "RGID"
-#~ msgstr "RGID"
-
-# sysdeps/names/procstate.c:54
-#~ msgid "effective UID of process"
-#~ msgstr "ουσιαστικό UID διεργασίας"
-
-# sysdeps/names/procstate.c:55
-#~ msgid "effective GID of process"
-#~ msgstr "ουσιαστικό GID διεργασίας"
-
-# sysdeps/names/procstate.c:58
-#~ msgid "has_cpu"
-#~ msgstr "έχει_cpu"
-
-# sysdeps/names/procstate.c:59
-#~ msgid "processor"
-#~ msgstr "επεξεργαστής"
-
-# sysdeps/names/procstate.c:60
-#~ msgid "last_processor"
-#~ msgstr "τελευταίος_επεξεργαστής"
-
--- a/po/en_CA.po
+++ b/po/en_CA.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
@@ -1,3 +1,4 @@
+# traducción de es.po al Spanish
 # translation of libgtop.libgtop-GNOME-2-0-port.po to Spanish
 # Translation into spanish of glibtop
 # FIXME: the strings still left empty are the ones I've no idea how
@@ -7,48 +8,49 @@
 # Pablo Saratxaga <srtxg@chanae.alphanet.ch>, 2002.
 # Juan Manuel García Molina <juanma_gm@wanadoo.es>, 2002.
 # Francisco Javier F. Serrador <serrador@arrakis.es>, 2003.
+# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.libgtop-GNOME-2-0-port\n"
+"Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 11:49+0100\n"
-"PO-Revision-Date: 2003-12-14 11:56+0100\n"
-"Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
+"POT-Creation-Date: 2004-08-28 16:45+0200\n"
+"PO-Revision-Date: 2004-08-28 16:48+0200\n"
+"Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "First-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
-"X-Generator: KBabel 1.0.2\n"
-"Plural-Forms: nplurals=2; plural=(n == 1)"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Tics (%ld por segundo):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Total"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Usuario"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Nice"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Sis"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Inact"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -57,36 +59,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Porcentaje:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Total (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "Usuario (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Nice (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Sis (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Inact (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -95,16 +97,16 @@ msgstr ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Spin:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -245,9 +247,9 @@ msgstr "Frecuencia del tick (frecuencia de base es 100)"

 #: sysdeps/names/cpu.c:71
 msgid "Bit field indicating which CPU is currently running"
-msgstr "Campo de bits indicando qué CPU está ejecutándoe ahora"
+msgstr "Campo de bits indicando qué CPU está ejecutándose ahora"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Total de bloques"

@@ -259,19 +261,23 @@ msgstr "Bloques libres"
 msgid "Available blocks"
 msgstr "Bloques disponibles"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Total de nodos de archivos"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Nodos de archivo libres"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Tamaño de bloque"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Bloques libres disponibles para el superusuario"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Bloques libres disponibles para usuarios comunes"

@@ -411,7 +417,7 @@ msgstr "Tamaño de un mensaje segmento"
 msgid "Number of system message headers"
 msgstr "Cantidad de cabeceras de mensajes sistema"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Flags de la interfaz"

@@ -419,55 +425,67 @@ msgstr "Flags de la interfaz"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Subred"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "Subred IPv4"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Dirección"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "Dirección IPv4"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Paquetes de entrada"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Paquetes de salida"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Paquetes totales"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Bytes recibidos"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Bytes enviados"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
 msgstr "Bytes totales"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Errores recibidos"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Errores enviados"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Errores totales"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Colisiones"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "Dirección IPv6"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "Prefijo IPv6"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "Ámbito IPv6"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Unidad de transferencia máxima"

@@ -648,8 +666,7 @@ msgstr "Cantidad de páginas de memoria virtual"

 #: sysdeps/names/procmem.c:56
 msgid "Number of resident set (non-swapped) pages"
-msgstr ""
-"Cantidad de páginas de conjuntos residentes (que no están en intercambio)"
+msgstr "Cantidad de páginas de conjuntos residentes (que no están en intercambio)"

 #: sysdeps/names/procmem.c:57
 msgid "Number of pages of shared (mmap'd) memory"
@@ -674,8 +691,7 @@ msgstr ""
 # otherwise it will default to es.po which uses the US format for numbers.
 #
 #: sysdeps/names/procmem.c:63
-msgid ""
-"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
 "Límite actual en bytes de conjunto compartido (RSS) del proceso "
 "(habitualmente 2.147.483.647)."
@@ -850,7 +866,7 @@ msgstr "Último procesador"

 #: sysdeps/names/proctime.c:45
 msgid "Start_Time"
-msgstr "Tiempo_inicio"
+msgstr "T_iempo inicio"

 #: sysdeps/names/proctime.c:45
 msgid "RTime"
@@ -1463,3 +1479,4 @@ msgstr "Señal 2 definida por el usuario"

 #~ msgid "Display brief usage message"
 #~ msgstr "Muestra el mensaje de uso breve"
+
--- a/po/et.po
+++ b/po/et.po
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fa.po
+++ b/po/fa.po
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,41 +9,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.90.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-05 22:14+0200\n"
-"PO-Revision-Date: 2004-02-04 23:01+0200\n"
+"POT-Creation-Date: 2004-08-18 23:07+0300\n"
+"PO-Revision-Date: 2004-08-19 02:26+0300\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
-"Language-Team: Finnish <fi@li.org>\n"
+"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: examples/smp.c:74
+#: examples/smp.c:76
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr "Tikityksiä (%ld sekunnissa):"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Total"
 msgstr "Yhteensä"

-#: examples/smp.c:77 sysdeps/names/mem.c:48
+#: examples/smp.c:79 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Käyttäjä"

-#: examples/smp.c:77 sysdeps/names/procuid.c:51
+#: examples/smp.c:79 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Nice"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Sys"
 msgstr "Järjestelmä"

-#: examples/smp.c:77
+#: examples/smp.c:79
 msgid "Idle"
 msgstr "Jouten"

-#: examples/smp.c:79
+#: examples/smp.c:81
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
@@ -52,36 +52,36 @@ msgstr ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"

-#: examples/smp.c:83
+#: examples/smp.c:85
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"

-#: examples/smp.c:100
+#: examples/smp.c:102
 msgid "Percent:"
 msgstr "Prosenttia:"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Total (%)"
 msgstr "Yhteensä (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "User (%)"
 msgstr "Käyttäjä (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Nice (%)"
 msgstr "Nice (%)"

-#: examples/smp.c:101
+#: examples/smp.c:103
 msgid "Sys (%)"
 msgstr "Järjestelmä (%)"

-#: examples/smp.c:102
+#: examples/smp.c:104
 msgid "Idle (%)"
 msgstr "Jouten (%)"

-#: examples/smp.c:104
+#: examples/smp.c:106
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
@@ -90,16 +90,16 @@ msgstr ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"

-#: examples/smp.c:120
+#: examples/smp.c:122
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"

-#: examples/smp.c:126
+#: examples/smp.c:128
 msgid "Spin:"
 msgstr "Kierre:"

-#: lib/read.c:78
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -241,7 +241,7 @@ msgstr "Tikitysten taajuus (oletusarvo 100)"
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Bittikentät, jotka ilmaisevat, mikä suoritin on käynnissä"

-#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:50
 msgid "Total blocks"
 msgstr "Lohkoja yhteensä"

@@ -253,19 +253,23 @@ msgstr "Vapaita lohkoja"
 msgid "Available blocks"
 msgstr "Saatavilla olevia lohkoja"

-#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:53
 msgid "Total file nodes"
 msgstr "Tiedostosolmuja yhteensä"

-#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:54
 msgid "Free file nodes"
 msgstr "Vapaita tiedostosolmuja"

-#: sysdeps/names/fsusage.c:50
+#: sysdeps/names/fsusage.c:45 sysdeps/names/fsusage.c:55
+msgid "Block size"
+msgstr "Lohkokoko"
+
+#: sysdeps/names/fsusage.c:51
 msgid "Free blocks available to the superuser"
 msgstr "Vapaita pääkäyttäjälle varattuja lohkoja"

-#: sysdeps/names/fsusage.c:51
+#: sysdeps/names/fsusage.c:52
 msgid "Free blocks available to non-superusers"
 msgstr "Tavallisille käyttäjille vapaita lohkoja"

@@ -405,7 +409,7 @@ msgstr "Viestilohkon koko"
 msgid "Number of system message headers"
 msgstr "Järjestelmän viestiotsikoiden määrä"

-#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:67
 msgid "Interface Flags"
 msgstr "Liittymän liput"

@@ -413,55 +417,67 @@ msgstr "Liittymän liput"
 msgid "MTU"
 msgstr "MTU"

-#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
-msgid "Subnet"
-msgstr "Aliverkko"
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:69
+msgid "IPv4 Subnet"
+msgstr "IPv4-aliverkko"

-#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-msgid "Address"
-msgstr "Osoite"
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:70
+msgid "IPv4 Address"
+msgstr "IPv4-osoite"

-#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:71
 msgid "Packets In"
 msgstr "Paketteja sisään"

-#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:72
 msgid "Packets Out"
 msgstr "Paketteja ulos"

-#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:73
 msgid "Packets Total"
 msgstr "Paketteja kaikkiaan"

-#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:74
 msgid "Bytes In"
 msgstr "Tavuja sisään"

-#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:75
 msgid "Bytes Out"
 msgstr "Tavuja ulos"

-#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:76
 msgid "Bytes Total"
 msgstr "Tavuja kaikkiaan"

-#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:77
 msgid "Errors In"
 msgstr "Virheitä sisään"

-#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:78
 msgid "Errors Out"
 msgstr "Virheitä ulos"

-#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:79
 msgid "Errors Total"
 msgstr "Virheitä kaikkiaan"

-#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:80
 msgid "Collisions"
 msgstr "Törmäykset"

-#: sysdeps/names/netload.c:65
+#: sysdeps/names/netload.c:60 sysdeps/names/netload.c:81
+msgid "IPv6 Address"
+msgstr "IPv6-osoite"
+
+#: sysdeps/names/netload.c:61 sysdeps/names/netload.c:82
+msgid "IPv6 Prefix"
+msgstr "IPv6-etuliite"
+
+#: sysdeps/names/netload.c:62 sysdeps/names/netload.c:83
+msgid "IPv6 Scope"
+msgstr "IPv6-näkyvyysalue"
+
+#: sysdeps/names/netload.c:68
 msgid "Maximum Transfer Unit"
 msgstr "Maximum Transfer Unit"

@@ -800,7 +816,7 @@ msgstr "LPros"

 #: sysdeps/names/procstate.c:49
 msgid "Basename of executable file in call to exec()"
-msgstr "Funktiolle exec() annettu ohjelmatiedoston nimi ilman hakemistopolkua."
+msgstr "Funktiolle exec() annettu ohjelmatiedoston nimi ilman kansiopolkua."

 #: sysdeps/names/procstate.c:50
 msgid "Single-Char code for process state (S=sleeping)"
--- a/Show More
+++ b/Show More