*** empty log message ***

Added Dzongkha translation
po/or.po: Updated Oriya translation.
2006-04-02 15:05:43 +00:00 · 2006-03-30 15:27:29 +00:00 · 2006-03-21 18:47:07 +00:00 · 2006-02-21 18:39:54 +00:00 · 2006-02-21 18:30:05 +00:00 · 2006-01-09 08:58:34 +00:00
273 changed files with 961 additions and 1930 deletions
--- a/167
+++ b/167
@@ -1,167 +1,12 @@
-2006-04-10  Benoît Dejean  <benoit@placenet.org>
+2006-03-30  Guntupalli Karunakar  <karunakar@indlinux.org>
+
+        * configure.in: Added "dz" (Dzongkha) to ALL_LINGUAS.
+
+2006-02-21  Benoît Dejean  <benoit@placenet.org>

 	* NEWS:
-
-	Released 2.14.1.
-
-2006-04-10  Benoît Dejean  <benoit@placenet.org>
-
-	* lib/open.c: (glibtop_open_l):
-	* lib/read.c: (glibtop_read_l):
-	* lib/write.c: (glibtop_write_l):
-
-	Fixed a bunch of signedness warnings.
-
-2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
-
-	* libgtop-sysdeps.m4:
-	* sysdeps/freebsd/msg_limits.c:
-
-	Use configure checks to detect whether we need to define either
-	KERNEL or _KERNEL to get the definition of 'struct msginfo' in a
-	BSD system.  This replaces the previous checks in the code that
-	relied on __FreeBSD__ and similar macros.
 	
-	Before this change, the explicit definition of _KERNEL in the
-	msg_limits.c file broke the build in NetBSD because it made the
-	system headers pull in stuff unavailable to userland.
-
-	Fixes bug #337207.
-
-2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
-
-	* libgtop-sysdeps.m4:
-	* sysdeps/freebsd/Makefile.am:
-
-	Check for the kvm library and use it to link the suid freebsd
-	sysdeps code (only if available).  This library provides all the
-	kvm_* functions used in it and is needed, at least, under NetBSD.
-
-	Fixes bug #337247.
-
-2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
-
-	* sysdeps/aix/glibtop_server.h:
-	* sysdeps/freebsd/glibtop_server.h:
-	* sysdeps/osf1/glibtop_server.h:
-	* sysdeps/stub/glibtop_server.h:
-	* sysdeps/stub_suid/glibtop_server.h:
-
-	Synch the list of GLIBTOP_SUID_* constants with those expected by
-	the lib/sysdeps.c file.  Fixes the build under, at least, NetBSD
-	and FreeBSD.
-
-	Fixes bug #337246.
-
-2006-04-02  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	
-	Bumped version to 2.14.1.
-	Removed no longer needed gcc flag.
-
-2006-04-02  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	* src/daemon/daemon.h:
-	* src/daemon/gnuserv.c: (main):
-	
-	Reverted. See #336837
-
-2006-03-18  Vladimer Sichinava  <vlsichinava@gmail.com>
-
-        * configure.in: Added "ka" (Georgian) to ALL_LINGUAS
-
-2006-03-13  Benoît Dejean  <benoit@placenet.org>
-
-	* NEWS:
-	* configure.in:
-
-	Released 2.14.0.
-
-2006-02-27  Benoît Dejean  <benoit@placenet.org>
-
-	* NEWS:
-	* configure.in:
-
-	Released 2.13.92.
-
-2006-02-20  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	
-	Bump version to 2.13.4.
-	Reordered libs. Closes #329153.
-
-2006-01-23  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	* NEW:
-	
-	Released 2.13.3.
-
-2006-01-02  Benoît Dejean  <benoit@placenet.org>
-
-	* NEWS:
-	* configure.in:
-
-	Released 2.13.2.
-
-2006-01-02  James Henstridge  <james@jamesh.id.au>
-
-	* configure.in (LT_VERSION_INFO): add quotes around symbol definition.
-
-2005-12-15  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	* NEWS:
-	
-	Released 2.13.1.
-
-2005-12-13  Benoît Dejean  <benoit@placenet.org>
-
-	* NEWS:
-
-	Released 2.13.0.
-
-2005-12-12  James Henstridge  <james@jamesh.id.au>
-
-	* doc/auto-macros.texi.in: remove unused file.
-
-	* doc/libgtop2.texi: don't include auto-macros.texi.
-
-	* doc/Makefile.am: don't build auto-macros.texi, since none of its
-	macros are used in the documentation any more.
-
-	* include/glibtop/global.h: don't include <config.h> from headers.
-
-	* .../*.c: make sure <config.h> is the first thing included.
-
-	* acinclude.m4: m4_include() libgtop-sysdeps.m4 rather than
-	inlining it.
-
-	* acinclude.m4, libgtop-sysdeps.m4: use third argument to
-	AC_DEFINE() to set the comment.
-
-	* configure.in: modernise a bit.
-
-	* acconfig.h: remove file, since it is deprecated
-
-	* autogen.sh: require automake 1.9 instead of 1.4.
-
-2005-12-09  Benoît Dejean  <benoit@placenet.org>
-
-	* configure.in:
-	* glibtop.h:
-	* include/glibtop/cpu.h:
-	* include/glibtop/procmap.h:
-
-	Increased GLIBTOP_NCPU to 32.
-	Added real_ncpu to struct glibtop.
-	Added smaps members to glibtop_map_entry.
-
-	Bumped version number to 2.13.0
-	Broke ABI again. Sorry.
+	Released 2.12.3.

 2005-12-08  Benoît Dejean  <benoit@placenet.org>

--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 Email: martin@home-of-linux.org
 Email: dave@srce.hr
-Current maintainer : Benoît Dejean (benoit@placenet.org)
+Benoît Dejean (tazforever@dlfp.org)
--- a/42
+++ b/42
@@ -1,41 +1,7 @@
-April 10, 2006: Overview of changes in 2.14.1
-=============================================
-* Updated translations.
-* Fixed NetBSD port (Julio M. Merino Vidal  <jmmv@NetBSD.org>).
-* Fixed some warnings.
-
-Mars 13, 2006: Overview of changes in 2.14.0
-============================================
-* Updated translations.
-
-February 27, 2006: Overview of changes in 2.13.92
-=================================================
-* Fixed proc_state documentation.
-* Updated mountlist ignore list.
-
-January 23, 2006: Overview of changes in 2.13.3
-===============================================
-* linux:
-	- fixe get_procmap for linux < 2.6.14.
-
-January 2, 2006: Overview of changes in 2.13.2
-==============================================
-* Fixed libtool versioning (James Henstridge)
-
-December 15, 2005: Overview of changes in 2.13.1
-================================================
-* linux:
-    - fixed proclist
-    - implemented server->real_ncpu
-
-December 13, 2005: Overview of changes in 2.13.0
-================================================
-* Requires automake-1.9 (James Henstridge)
-* Supports up to 32 CPU
-* Supports Linux smaps
-* linux: fixed SMP detection
-
-This release is not ABI compatible with previous releases. Sorry.
+February 21, 2006: Overview of changes from 2.12.2 to 2.12.3
+============================================================
+* Fixed documentation.
+* linux: glibtop_get_proc_map small optimization.

 November 29, 2005: Overview of changes from 2.12.0 to 2.12.1
 ============================================================
--- a/acconfig.h
+++ b/acconfig.h
@@ -0,0 +1,168 @@
+
+/* Define if gethostname () must be declared. */
+#undef NEED_DECLARATION_GETHOSTNAME
+
+/* Define if setreuid () must be declared. */
+#undef NEED_DECLARATION_SETREUID
+
+/* Define if setregid () must be declared. */
+#undef NEED_DECLARATION_SETREGID
+
+/* Define if getpagesize () must be declared. */
+#undef NEED_DECLARATION_GETPAGESIZE
+
+/* Define if program_invocation_name must be declared. */
+#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
+
+@TOP@
+
+#undef ENABLE_NLS
+#undef HAVE_CATGETS
+#undef GETTEXT_PACKAGE
+#undef HAVE_GETTEXT
+#undef HAVE_LC_MESSAGES
+#undef HAVE_STPCPY
+#undef HAVE_STRUCT_OSOCKADDR
+#undef PACKAGE
+#undef VERSION
+#undef HAVE_LIBSM
+#undef HAVE_LIBINTL_H
+#undef HAVE_GTK_SIGNAL_HANDLER_PENDING
+
+/* Do not remove this comments and the empty lines; they are needed */
+#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+/* Define if you have the Andrew File System.  */
+#undef AFS
+
+/* Define one of the following to indicate how a program can
+   get a list of mounted filesystems.  */
+
+/* Define if there is no specific function for reading the list of
+   mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]  */
+#undef MOUNTED_FREAD
+
+/* Define if (like SVR2) there is no specific function for reading the
+   list of mounted filesystems, and your system has these header files:
+   <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]  */
+#undef MOUNTED_FREAD_FSTYP
+
+/* Define if there is a function named getfsstat for reading the list
+   of mounted filesystems.  [DEC Alpha running OSF/1]  */
+#undef MOUNTED_GETFSSTAT
+
+/* Define if there is a function named getmnt for reading the list of
+   mounted filesystems.  [Ultrix]  */
+#undef MOUNTED_GETMNT
+
+/* Define if there is a function named getmntent for reading the list
+   of mounted filesystems, and that function takes a single argument.
+   [4.3BSD, SunOS, HP-UX, Dynix, Irix]  */
+#undef MOUNTED_GETMNTENT1
+
+/* Define if there is a function named getmntent for reading the list of
+   mounted filesystems, and that function takes two arguments.  [SVR4]  */
+#undef MOUNTED_GETMNTENT2
+
+/* Define if there is a function named getmntinfo for reading the list
+   of mounted filesystems.  [4.4BSD]  */
+#undef MOUNTED_GETMNTINFO
+
+/* Define if there is a function named listmntent that can be used to
+   list all mounted filesystems. [UNICOS] */
+#undef MOUNTED_LISTMNTENT
+
+/* Define if there is a function named mntctl that can be used to read
+   the list of mounted filesystems, and there is a system header file
+   that declares `struct vmount.'  [AIX]  */
+#undef MOUNTED_VMOUNT
+
+/* Define one of the following to indicate how a program can obtain
+   filesystems usage information.  */
+
+/*  Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]  */
+#undef STAT_STATFS3_OSF1
+
+/* Define if there is no specific function for reading filesystems usage
+   information and you have the <sys/filsys.h> header file.  [SVR2]  */
+#undef STAT_READ_FILSYS
+
+/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
+   [4.3BSD, SunOS 4, HP-UX, AIX PS/2]  */
+#undef STAT_STATFS2_BSIZE
+
+/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
+   [4.4BSD, NetBSD]  */
+#undef STAT_STATFS2_FSIZE
+
+/* Define if statfs takes 2 args and the second argument has
+   type struct fs_data.  [Ultrix]  */
+#undef STAT_STATFS2_FS_DATA
+
+/* Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]  */
+#undef STAT_STATFS4
+
+/* Define if there is a function named statvfs.  [SVR4]  */
+#undef STAT_STATVFS
+
+/* Define if the block counts reported by statfs may be truncated to 2GB
+   and the correct values may be stored in the f_spare array.
+   [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
+   SunOS 4.1.1 seems not to be affected.]  */
+#undef STATFS_TRUNCATES_BLOCK_COUNTS
+
+
+/* to fix a bug in autoheader on DEC OSF1. */
+#undef HAVE_PROGRAM_INVOCATION_NAME
+
+#undef HAVE_SOCKETS
+#undef HAVE_SOCKADDR_SUN_LEN
+
+#undef HAVE_LIBJPEG
+#undef HAVE_LIBGIF
+#undef HAVE_LIBTIFF
+#undef HAVE_LIBZ
+#undef HAVE_LIBPNG
+#undef HAVE_GMP2_INCLUDE_DIR
+#undef HAVE_GUILE
+
+#undef ssize_t
+#undef guint64
+#undef int64_t
+
+#undef HAVE_GLIBTOP_MACHINE_H
+
+#undef GLIBTOP_GUILE
+#undef GLIBTOP_GUILE_NAMES
+#undef GLIBTOP_EXAMPLES
+#undef GLIBTOP_INODEDB
+
+#undef NEED_LIBGTOP
+
+#undef HAVE_LIBGTOP_SMP
+
+#undef HAVE_XAUTH
+
+/* Define if your have the I4B package. */
+#undef HAVE_I4B
+#undef HAVE_I4B_ACCT
+
+/* Define to enable debugging. */
+#undef LIBGTOP_ENABLE_DEBUG
+#undef LIBGTOP_FATAL_WARNINGS
+
+/* Same as LINUX_VERSION_CODE either from <linux/version.h> or from
+ * the running kernel (if we don't have configured kernel sources).
+ */
+#undef GLIBTOP_LINUX_VERSION_CODE
+
+/* Solaris release code (eg. 251 for Solaris 2.5.1). */
+#undef GLIBTOP_SOLARIS_RELEASE
+
+/* Define if you want to use LibGTop without GNOME. */
+#undef WITHOUT_GNOME
+
+/* Define if you have the <procfs.h> header file */
+#undef HAVE_PROCFS_H
+
+/* Define if you have the <sys/procfs.h> header file */
+#undef HAVE_SYS_PROCFS_H
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -30,7 +30,7 @@ changequote([,]), [#include <sys/types.h>
 ], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
 AC_MSG_RESULT($ac_cv_type_$1)
 if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2, [Define to $2 if <sys/types.h> does not define.])
+  AC_DEFINE($1, $2)
 fi
 ])

@@ -72,7 +72,7 @@ if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
  AC_MSG_RESULT(yes)
  gcc_need_declarations="$gcc_need_declarations $1"
  gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  AC_DEFINE_UNQUOTED($gcc_tr_decl, 1, [Define if $1 () must be declared.])
+  AC_DEFINE_UNQUOTED($gcc_tr_decl)
 else
  AC_MSG_RESULT(no)
 fi
@@ -157,8 +157,7 @@ yes
 AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
 if test $fu_cv_sys_mounted_cray_listmntent = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT, 1,
-          [Define if there is a function named listmntent that can be used to list all mounted filesystems. [UNICOS]])
+AC_DEFINE(MOUNTED_LISTMNTENT)
 fi
 fi

@@ -177,8 +176,7 @@ AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
 if test $fu_cv_sys_mounted_getmntent1 = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1, 1,
-          [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes a single argument. [4.3BSD, SunOS, HP-UX, Dynix, Irix]])
+AC_DEFINE(MOUNTED_GETMNTENT1)
 fi
 fi

@@ -192,8 +190,7 @@ fu_cv_sys_mounted_getmntent2=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
 if test $fu_cv_sys_mounted_getmntent2 = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2, 1,
-          [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes two arguments.  [SVR4]])
+AC_DEFINE(MOUNTED_GETMNTENT2)
 fi
 fi

@@ -218,8 +215,7 @@ fu_cv_sys_mounted_getsstat=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
 if test $fu_cv_sys_mounted_getsstat = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT, 1,
-          [Define if there is a function named getfsstat for reading the list of mounted filesystems.  [DEC Alpha running OSF/1]])
+AC_DEFINE(MOUNTED_GETFSSTAT)
 fi
 fi

@@ -233,8 +229,7 @@ fu_cv_sys_mounted_vmount=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
 if test $fu_cv_sys_mounted_vmount = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT, 1,
-          [Define if there is a function named mntctl that can be used to read the list of mounted filesystems, and there is a system header file that declares `struct vmount.'  [AIX]])
+AC_DEFINE(MOUNTED_VMOUNT)
 fi
 fi

@@ -251,8 +246,7 @@ fu_cv_sys_mounted_fread_fstyp=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
 if test $fu_cv_sys_mounted_fread_fstyp = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
-          [Define if (like SVR2) there is no specific function for reading the list of mounted filesystems, and your system has these header files: <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]])
+AC_DEFINE(MOUNTED_FREAD_FSTYP)
 fi
 fi

@@ -273,8 +267,7 @@ test -n "$ok" \
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
 if test $fu_cv_sys_mounted_getmntinfo = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO, 1,
-          [Define if there is a function named getmntinfo for reading the list of mounted filesystems.  [4.4BSD]])
+AC_DEFINE(MOUNTED_GETMNTINFO)
 fi
 fi

@@ -292,8 +285,7 @@ fu_cv_sys_mounted_getmnt=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
 if test $fu_cv_sys_mounted_getmnt = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT, 1,
-          [Define if there is a function named getmnt for reading the list of mounted filesystems.  [Ultrix]])
+AC_DEFINE(MOUNTED_GETMNT)
 fi
 fi

@@ -307,8 +299,7 @@ fu_cv_sys_mounted_fread=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_fread)
 if test $fu_cv_sys_mounted_fread = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD, 1,
-          [Define if there is no specific function for reading the list of mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]])
+AC_DEFINE(MOUNTED_FREAD)
 fi
 fi

@@ -337,8 +328,7 @@ fu_cv_sys_stat_statvfs=yes,
 fu_cv_sys_stat_statvfs=no)])
 if test $fu_cv_sys_stat_statvfs = yes; then
 space=yes
-AC_DEFINE(STAT_STATVFS, 1,
-          [Define if there is a function named statvfs.  [SVR4]])
+AC_DEFINE(STAT_STATVFS)
 fi
 fi

@@ -362,8 +352,7 @@ fu_cv_sys_stat_statfs3_osf1=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
 if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS3_OSF1, 1,
-          [Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]])
+AC_DEFINE(STAT_STATFS3_OSF1)
 fi
 fi

@@ -394,8 +383,7 @@ fu_cv_sys_stat_statfs2_bsize=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
 if test $fu_cv_sys_stat_statfs2_bsize = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE, 1,
-          [Define if statfs takes 2 args and struct statfs has a field named f_bsize. [4.3BSD, SunOS 4, HP-UX, AIX PS/2]])
+AC_DEFINE(STAT_STATFS2_BSIZE)
 fi
 fi

@@ -416,8 +404,7 @@ fu_cv_sys_stat_statfs4=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
 if test $fu_cv_sys_stat_statfs4 = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS4, 1,
-          [Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]])
+AC_DEFINE(STAT_STATFS4)
 fi
 fi

@@ -445,8 +432,7 @@ fu_cv_sys_stat_statfs2_fsize=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
 if test $fu_cv_sys_stat_statfs2_fsize = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE, 1,
-          [Define if statfs takes 2 args and struct statfs has a field named f_fsize. [4.4BSD, NetBSD]])
+AC_DEFINE(STAT_STATFS2_FSIZE)
 fi
 fi

@@ -477,17 +463,14 @@ fu_cv_sys_stat_fs_data=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
 if test $fu_cv_sys_stat_fs_data = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
-          [Define if statfs takes 2 args and the second argument has type struct fs_data.  [Ultrix]])
+AC_DEFINE(STAT_STATFS2_FS_DATA)
 fi
 fi

 if test $space = no; then
 # SVR2
 AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS, 1,
-          [Define if there is no specific function for reading filesystems usage information and you have the <sys/filsys.h> header file.  [SVR2]])
-space=yes)
+AC_DEFINE(STAT_READ_FILSYS) space=yes)
 fi

 if test -n "$list_mounted_fs" && test $space != no; then
@@ -512,14 +495,260 @@ fu_cv_sys_truncating_statfs=yes,
 fu_cv_sys_truncating_statfs=no,
 )])
 if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
-          [Define if the block counts reported by statfs may be truncated to 2GB and the correct values may be stored in the f_spare array. [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. SunOS 4.1.1 seems not to be affected.]])
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
 fi
 AC_MSG_RESULT($fu_cv_sys_truncating_statfs)

 AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
+test -d /afs && AC_DEFINE(AFS)
 ])


-m4_include([libgtop-sysdeps.m4])
+dnl This file is intended for use both internally in libgtop and in every program
+dnl that wants to use it.
+dnl
+dnl It defines the following variables:
+dnl
+dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
+dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
+dnl                              their own header file. In this case we need to
+dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
+dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
+dnl                              if true; defines conditional 'NEED_LIBGTOP'.
+
+AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
+	AC_REQUIRE([AC_CANONICAL_HOST])
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_use_machine_h)
+	AC_SUBST(libgtop_need_server)
+
+	AC_ARG_WITH(libgtop-examples,
+	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
+	build_examples="$withval"], [build_examples=no])
+
+	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
+
+	AC_ARG_ENABLE(hacker-mode,
+	[  --enable-hacker-mode    Enable building of unstable sysdeps],
+	[hacker_mode="$enableval"], [hacker_mode=no])
+
+	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
+
+	if test x$hacker_mode = xyes ; then
+	  LIBGTOP_HACKER_TESTS
+	fi
+
+	AC_ARG_WITH(libgtop-smp,
+	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
+	libgtop_smp="$withval"],[libgtop_smp=auto])
+
+	if test $libgtop_smp = auto ; then
+	  AC_MSG_CHECKING(whether to enable SMP support)
+	  case "$host_os" in
+	  linux*)
+	    libgtop_smp=yes
+	    ;;
+	  aix*)
+	    libgtop_smp=yes
+	    ;;
+	  *)
+	    libgtop_smp=no
+	    ;;
+	  esac
+	  AC_MSG_RESULT($libgtop_smp)
+	fi
+
+	if test $libgtop_smp = yes ; then
+	  AC_DEFINE(HAVE_LIBGTOP_SMP)
+	fi
+
+	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
+
+	AC_MSG_CHECKING(for libgtop sysdeps directory)
+
+	case "$host_os" in
+	linux*)
+	  libgtop_sysdeps_dir=linux
+	  libgtop_use_machine_h=no
+	  libgtop_have_sysinfo=yes
+	  libgtop_need_server=no
+	  ;;
+	freebsd*|netbsd*|openbsd*|bsdi*)
+	  libgtop_sysdeps_dir=freebsd
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+	solaris*)
+	  libgtop_sysdeps_dir=solaris
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+        aix*)
+	  libgtop_sysdeps_dir=aix
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_have_sysinfo=yes
+	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
+          ;;
+	*)
+	  if test x$hacker_mode = xyes ; then
+	    case "$host_os" in
+	    sunos4*)
+	      #Please note that this port is obsolete and not working at
+	      #all. It is only useful for people who want to fix it ... :-)
+	      libgtop_sysdeps_dir=sun4
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    osf*)
+	      libgtop_sysdeps_dir=osf1
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    *)
+	      libgtop_sysdeps_dir=stub
+	      libgtop_use_machine_h=no
+	      libgtop_need_server=no
+	      ;;
+	    esac
+	  else
+	    libgtop_sysdeps_dir=stub
+	    libgtop_use_machine_h=no
+	    libgtop_need_server=no
+	  fi
+	  ;;
+	esac
+
+	test -z "$libgtop_postinstall" && libgtop_postinstall=:
+
+	AC_MSG_RESULT($libgtop_sysdeps_dir)
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_postinstall)
+	AC_SUBST(libgtop_have_sysinfo)
+
+	case "$host_os" in
+	*bsd*)
+	  AC_CHECK_HEADERS(net/if_var.h)
+	  AC_MSG_CHECKING([for I4B])
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+],[
+	size_t size = sizeof (struct sppp);
+], have_i4b=yes, have_i4b=no)
+	  AC_MSG_RESULT($have_i4b)
+	  if test x$have_i4b = xyes; then
+	    AC_DEFINE(HAVE_I4B)
+	    AC_MSG_CHECKING([for I4B accounting])
+	    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+
+#include <machine/i4b_acct.h>
+],[
+	size_t size = sizeof (struct i4bisppp_softc);
+], have_i4b_acct=yes, have_i4b_acct=no)
+	    AC_MSG_RESULT($have_i4b_acct)
+	    if test x$have_i4b_acct = xyes ; then
+	      AC_DEFINE(HAVE_I4B_ACCT)
+	    else
+	      AC_WARN([
+*** I4B accounting disabled - you won't get any PPP statistics.
+*** Read "misc/i4b_acct.txt" in the LibGTop source directory
+*** to see how to enable it.])
+	    fi
+	  fi
+	  ;;
+	linux*)
+	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
+
+	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
+	    have_linux_version_h=no)
+
+	  if test x$have_linux_version_h = xyes ; then
+	    version_code=`cat /usr/include/linux/version.h | \
+	      grep \#define | grep LINUX_VERSION_CODE`
+	    os_version_code=`echo $version_code | \
+	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
+	  else
+	    os_version_code=`echo "$os_version_expr" | dc`
+	  fi
+
+	  AC_MSG_CHECKING(for Linux kernel version code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	solaris*)
+	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
+	  test -z "$os_micro_version" && os_micro_version=0
+	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
+	  os_version_code=`echo "$os_version_expr" | dc`
+
+	  AC_MSG_CHECKING(for Solaris release code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	esac
+
+	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
+	AC_MSG_RESULT($libgtop_use_machine_h)
+
+	AC_MSG_CHECKING(whether we need libgtop)
+	AC_MSG_RESULT($libgtop_need_server)
+
+	if test x$libgtop_need_server = xyes ; then
+	  AC_DEFINE(NEED_LIBGTOP)
+	fi
+
+	if test x$libgtop_use_machine_h = xyes ; then
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
+	fi
+
+	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
+])
+
+  
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,5 +18,4 @@ which gnome-autogen.sh || {
    echo "You need to install gnome-common from the GNOME CVS"
    exit 1
 }
-REQUIRED_AUTOMAKE_VERSION=1.9
-. gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
--- a/configure.in
+++ b/configure.in
@@ -2,49 +2,59 @@ dnl
 dnl Configure script for the Gnome library
 dnl

-m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [14])
-m4_define([libgtop_micro_version], [1])
-m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
+AC_INIT(copyright.txt)
+AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_SYSTEM
+
+LIBGTOP_MAJOR_VERSION=2
+LIBGTOP_MINOR_VERSION=12
+LIBGTOP_MICRO_VERSION=3
+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.
-m4_define([libgtop_current], [7])
+LIBGTOP_CURRENT=6

 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
-m4_define([libgtop_revision], [0])
+LIBGTOP_REVISION=0

 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-m4_define([libgtop_age], [0])
+LIBGTOP_AGE=1
+
+# you can set this to `-snap' for instance to create
+# a `libgtop-1.x.y-snap.tar.gz' tarball.
+LIBGTOP_VERSION_SUFFIX=

 # Increase each time you change the client/server protocol.
-m4_define([libgtop_server_version], [5])
+LIBGTOP_SERVER_VERSION=5

 # Version code calculation
-m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)])
+LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`

-AC_INIT([libgtop], [libgtop_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
-AC_CONFIG_SRCDIR(copyright.txt)
-AC_CONFIG_HEADERS(config.h)
-
-AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE
-AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
-
-AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version])
-AC_SUBST(LIBGTOP_MINOR_VERSION, [libgtop_minor_version])
-AC_SUBST(LIBGTOP_MICRO_VERSION, [libgtop_micro_version])
-AC_SUBST(LIBGTOP_SERVER_VERSION, [libgtop_server_version])
-AC_SUBST(LIBGTOP_VERSION, [libgtop_version])
-AC_SUBST(LIBGTOP_VERSION_CODE, [libgtop_version_code])
+AC_SUBST(LIBGTOP_MAJOR_VERSION)
+AC_SUBST(LIBGTOP_MINOR_VERSION)
+AC_SUBST(LIBGTOP_MICRO_VERSION)
+AC_SUBST(LIBGTOP_INTERFACE_AGE)
+AC_SUBST(LIBGTOP_BINARY_AGE)
+AC_SUBST(LIBGTOP_SERVER_VERSION)
+AC_SUBST(LIBGTOP_VERSION)
+AC_SUBST(LIBGTOP_VERSION_CODE)
+AC_SUBST(LIBGTOP_VERSION_SUFFIX)

 # libtool versioning
-AC_SUBST(LT_VERSION_INFO,
-         ["-version-info libgtop_current:libgtop_revision:libgtop_age"])
+LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
+LT_CURRENT=$LIBGTOP_CURRENT
+LT_REVISION=$LIBGTOP_REVISION
+LT_AGE=$LIBGTOP_AGE
+LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
+AC_SUBST(LT_VERSION_INFO)
+AC_SUBST(LT_RELEASE)
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)

 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."

@@ -99,8 +109,7 @@ fi
 AM_CONDITIONAL(INODEDB, test x$build_inodedb = xyes)

 if test x$build_inodedb = xyes ; then
-  AC_DEFINE(GLIBTOP_INODEDB, 1,
-            [Define if the libgtop inodedb should be built])
+  AC_DEFINE(GLIBTOP_INODEDB)
 fi

 GLIB_REQUIRED=2.6.0
@@ -161,9 +170,8 @@ if test x$HAVE_ISDN_H = xyes ; then
 fi

 dnl AIX
-AC_CHECK_LIB(perfstat, vmgetinfo,
-    AC_DEFINE(HAVE_VMGETINFO, 1,
-        [Define to 1 if you have the 'vmgetinfo' function in libperfstat]))
+AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
+AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))

 dnl Solaris
 case "$host_os" in
@@ -212,7 +220,7 @@ CFLAGS=$saved_CFLAGS
 AC_CHECK_FUNC(socket,
 [AC_CHECK_HEADER(netinet/in.h,
   [AC_CHECK_HEADER(arpa/inet.h, [
-  AC_DEFINE(HAVE_SOCKETS, 1, [Define if BSD sockets are supported])
+  AC_DEFINE(HAVE_SOCKETS)
      AC_MSG_CHECKING("for sun_len member in struct sockaddr_un")
      AC_TRY_LINK([
 #include <sys/types.h>
@@ -220,7 +228,7 @@ AC_CHECK_FUNC(socket,
 #include <sys/un.h>
      ],
      [static struct sockaddr_un x; x.sun_len = 1;],
-      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN, 1, [Define if struct sockaddr_un has a sun_len member])],
+      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN)],
      [AC_MSG_RESULT(no)])])])])

 dnl Checks for library functions.
@@ -230,15 +238,13 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

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

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                   [Define to the gettext package used by the library])
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")

 AM_GLIB_GNU_GETTEXT
-GLIB_DEFINE_LOCALEDIR([GTOPLOCALEDIR])

 AC_PATH_XTRA

@@ -265,7 +271,7 @@ test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no)
 test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
 test -z "$with_xauth" && with_xauth=yes
 if test "$with_xauth" = "yes"; then
-  AC_DEFINE(HAVE_XAUTH, 1, [Define if Xauth is supported])
+  AC_DEFINE(HAVE_XAUTH)
  XE_SPACE(libs_xauth, $X_LIBS -lXau)
 fi
 CPPFLAGS="$saved_CPPFLAGS"
@@ -275,8 +281,8 @@ dnl For diskusage stuff
 GNOME_FILEUTILS_CHECKS

 dnl Debugging
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]),)
-AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS, 1, [Define to enable fatal warnings]),)
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
+AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)

 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
@@ -300,14 +306,8 @@ fi

 LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"

-libgtop_save_prefix="$prefix"
-libgtop_save_exec_prefix="$exec_prefix"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-LIBGTOP_BINDIR=`eval echo "${bindir}"`
-LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
-prefix="$libgtop_save_prefix"
-exec_prefix="$libgtop_save_exec_prefix"
+LIBGTOP_BINDIR='$(bindir)'
+LIBGTOP_SERVER='$(bindir)/libgtop_server2'

 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
@@ -318,7 +318,7 @@ else
  LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
 fi

-LIBGTOP_EXTRA_LIBS="$GLIB_LIBS $LIBGTOP_EXTRA_LIBS"
+LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"

 LIBGTOP_LIBS="$LIBGTOP_LIBS"

@@ -336,27 +336,11 @@ if test "$GCC" = "yes" ; then
 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 	-Wnested-externs -Wpointer-arith \
 	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
 	$CFLAGS"
 fi

-INCLUDES="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
-
-# Add various defines to the config.h file ...
-AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif])
-AC_DEFINE([_IN_LIBGTOP], 1,
-          [Note that we are building libgtop rather than using it])
-AC_DEFINE([LIBGTOP_VERSION], ["libgtop_version"],
-          [The libgtop version number])
-AC_DEFINE([LIBGTOP_SERVER_VERSION], ["libgtop_server_version"],
-          [The libgtop server version])
-AC_DEFINE([LIBGTOP_VERSION_CODE], [libgtop_version_code],
-          [The libgtop version number as an integer])
-AC_DEFINE_UNQUOTED([LIBGTOP_SERVER], ["$LIBGTOP_SERVER"],
-                   [The path to the libgtop server])
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -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)

@@ -377,7 +361,7 @@ fi
 AC_SUBST(sysdeps_suid_lib)
 AC_SUBST(server_programs)

-AC_CONFIG_FILES([
+AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
@@ -403,5 +387,3 @@ doc/Makefile
 libgtop-2.0.pc
 libgtopconfig.h
 ])
-
-AC_OUTPUT
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,6 @@
 2006-02-21  Benoît Dejean  <benoit@placenet.org>

-	* reference.texi: Fixed glibtop_get_proc_state doc.
-	Patch by Emil Nowak <emil5@go2.pl>.
+	* reference.texi: Fixed reference to glibtop/procstate.h

 2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,38 @@
 info_TEXINFOS		= libgtop2.texi

 libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
-			  version.texi main.texi white-paper.texi
+			  auto-macros.texi version.texi main.texi \
+			  white-paper.texi

-AM_MAKEINFOFLAGS	= -I $(libgtop_top_builddir)/doc
+MAKEINFO		= @MAKEINFO@ -I @libgtop_top_builddir@/doc
+
+EXTRA_DIST		= auto-macros.texi.in
+
+auto-macros.texi: auto-macros.texi.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
+	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \
+	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
+	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
+	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
+	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
+	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
+	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
+	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
+	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
+	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
+	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
+	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
+	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
+	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
+	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
+	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
+	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
+	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
+	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
+	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
+	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
+	else \
+	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
+	fi
+	mv auto-macros.tmp auto-macros.texi
--- a/doc/auto-macros.texi.in
+++ b/doc/auto-macros.texi.in
@@ -0,0 +1,12 @@
+@c LibGTop major, minor and micro version.
+@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
+@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
+@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
+
+@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
+@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
+@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
+
+@c LibGTop server version, increased each time the protocol changes.
+@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
+
--- a/doc/libgtop2.texi
+++ b/doc/libgtop2.texi
@@ -5,6 +5,7 @@
@setchapternewpage odd
@c %**end of header

+@include auto-macros.texi
@include version.texi

@ifinfo
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -18,7 +18,6 @@ pprint
 pprint_static
 procargs
 procargs_static
-proclist
 df
 df_static
 netlist
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,25 +1,3 @@
-2006-02-27  Benoît Dejean  <benoit@placenet.org>
-
-	* pprint.c: (pprint_get_proc_mem), (main):
-
-	Added proc_mem example.
-
-2005-12-15  Benoît Dejean  <benoit@placenet.org>
-
-	* proclist.c: (print_pids), (main):
-	
-	Improved example.
-
-2005-12-12  Benoît Dejean  <benoit@placenet.org>
-
-	* .cvsignore:
-	* Makefile.am:
-	* proclist.c: (main):
-	* procmap.c: (main):
-
-	Added quick example for glibtop_get_proclist()
-	and updated procmap example to display smap.
-
 2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>

 	* pprint.c: (pprint_get_cpu), (pprint_get_loadavg),
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,7 +8,7 @@ DEFS			= @DEFS@

 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist
+			  openfiles smp

 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -48,6 +48,3 @@ netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la

 openfiles_SOURCES	= openfiles.c
 openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
-
-proclist_SOURCES	= proclist.c
-proclist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
--- a/examples/df.c
+++ b/examples/df.c
@@ -1,6 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
 #include <glibtop.h>

 #include <glibtop/fsusage.h>
--- a/examples/first.c
+++ b/examples/first.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/netlist.c
+++ b/examples/netlist.c
@@ -18,10 +18,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>

 #include <glibtop.h>
--- a/examples/netload.c
+++ b/examples/netload.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/openfiles.c
+++ b/examples/openfiles.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glibtop.h>
 #include <glibtop/procopenfiles.h>

--- a/examples/pprint.c
+++ b/examples/pprint.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glibtop.h>

 #include <glibtop/union.h>
@@ -268,24 +264,6 @@ static void pprint_get_proc_kernel(pid_t pid)
 }


-static void pprint_get_proc_mem(pid_t pid)
-{
-  glibtop_proc_mem buf;
-
-  glibtop_get_proc_mem(&buf, pid);
-
-  HEADER_PPRINT(glibtop_get_proc_mem);
-  PPRINT(flags, "%#llx");
-  PPRINT(size, "%llu");
-  PPRINT(vsize, "%llu");
-  PPRINT(resident, "%llu");
-  PPRINT(share, "%llu");
-  PPRINT(rss, "%llu");
-  PPRINT(rss_rlim, "%llu");
-  FOOTER_PPRINT();
-}
-
-

 int main()
 {
@@ -316,7 +294,6 @@ int main()
  pprint_get_uptime();

  pprint_get_proc_kernel(getpid());
-  pprint_get_proc_mem(getpid());

  glibtop_close();

--- a/examples/procargs.c
+++ b/examples/procargs.c
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <glibtop.h>
 #include <glibtop/procargs.h>

--- a/examples/proclist.c
+++ b/examples/proclist.c
@@ -1,43 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/proclist.h>
-
-#include <glib.h>
-
-#include <stdio.h>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-
-static void print_pids(guint64 which, guint64 arg)
-{
-	unsigned *pids;
-	unsigned i;
-	glibtop_proclist buf;
-
-	pids = glibtop_get_proclist(&buf, which, arg);
-
-	printf("glibtop_get_proclist(%#llx, %llu) -> %lu processes\n",
-	       which, arg, (unsigned long)buf.number);
-
-	for (i = 0; i < buf.number; ++i)
-		printf("%u ", pids[i]);
-
-	putchar('\n');
-	putchar('\n');
-
-	g_free(pids);
-}
-
-
-int main()
-{
-	glibtop_init();
-
-	print_pids(GLIBTOP_KERN_PROC_ALL, 0);
-	print_pids(GLIBTOP_KERN_PROC_UID, getuid());
-
-	glibtop_close();
-
-	return 0;
-}
--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
@@ -157,18 +153,6 @@ main (int argc, char *argv [])
 				 perm);
 		}

-
-		g_print("smaps flags:%#llx size:%llu rss:%llu "
-			"shared_clean:%llu shared_dirty:%llu "
-			"private_clean:%llu private_dirty: %llu\n",
-			maps[i].flags,
-			maps[i].size >> 10,
-			maps[i].rss >> 10,
-			maps[i].shared_clean >> 10,
-			maps[i].shared_dirty >> 10,
-			maps[i].private_clean >> 10,
-			maps[i].private_dirty >> 10);
-
 		if (filename && (filename != maps [i].filename))
 			g_free ((void*)filename);
 	}
--- a/examples/second.c
+++ b/examples/second.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <math.h>
 #include <stdio.h>
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/timings.c
+++ b/examples/timings.c
@@ -21,10 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <locale.h>
 #include <stdio.h>
 #include <libintl.h>
--- a/glibtop.h
+++ b/glibtop.h
@@ -77,7 +77,6 @@ struct _glibtop
 	int output [2];			/* Pipe client -> server */
 	int socket;			/* Accepted connection of a socket */
 	int ncpu;			/* Number of CPUs, zero if single-processor */
-	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
 	unsigned long os_version_code;	/* Version code of the operating system */
 	const char *name;		/* Program name for error messages */
 	const char *server_command;	/* Command used to invoke server */
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -52,11 +52,8 @@ G_BEGIN_DECLS

 #define GLIBTOP_MAX_CPU		18

-/* Nobody should really be using more than 4 processors.
-   Yes we are :)
-   Nobody should really be using more than 32 processors.
-*/
-#define GLIBTOP_NCPU		32
+/* Nobody should really be using more than 4 processors. */
+#define GLIBTOP_NCPU		4

 typedef struct _glibtop_cpu	glibtop_cpu;

--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -26,6 +26,10 @@

 #include <glib.h>

+#ifdef _IN_LIBGTOP
+#include <config.h>
+#endif
+
 #ifdef _IN_LIBGTOP

 #endif /* _IN_LIBGTOP */
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -43,15 +43,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_MAP_ENTRY_DEVICE	5
 #define GLIBTOP_MAP_ENTRY_FILENAME	6

-/* Smap support */
-#define GLIBTOP_MAP_ENTRY_SIZE			 7
-#define GLIBTOP_MAP_ENTRY_RSS			 8
-#define GLIBTOP_MAP_ENTRY_SHARED_CLEAN		 9
-#define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
-#define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
-#define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
-
-#define GLIBTOP_MAX_MAP_ENTRY		13
+#define GLIBTOP_MAX_MAP_ENTRY		7

 #define GLIBTOP_MAP_FILENAME_LEN	215

@@ -68,10 +60,6 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;
 struct _glibtop_map_entry
 {
 	guint64 flags, start, end, offset, perm, inode, device;
-	guint64 size,
-		rss,
-		shared_clean, shared_dirty,
-		private_clean, private_dirty;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };

--- a/lib/close.c
+++ b/lib/close.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/error.h>
--- a/lib/command.c
+++ b/lib/command.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop/read.h>
 #include <glibtop/write.h>
 #include <glibtop/read_data.h>
--- a/lib/glibtop-server.c
+++ b/lib/glibtop-server.c
@@ -23,7 +23,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop-server-private.h>

--- a/lib/init.c
+++ b/lib/init.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/sysdeps.h>
--- a/lib/inodedb.c
+++ b/lib/inodedb.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>
--- a/lib/open.c
+++ b/lib/open.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/read.h>
@@ -138,10 +137,10 @@ glibtop_open_l (glibtop *server, const char *program_name,

 		sprintf (version, LIBGTOP_VERSION_STRING,
 			 LIBGTOP_VERSION, LIBGTOP_SERVER_VERSION,
-			 (guint) sizeof (glibtop_command),
-			 (guint) sizeof (glibtop_response),
-			 (guint) sizeof (glibtop_union),
-			 (guint) sizeof (glibtop_sysdeps));
+			 sizeof (glibtop_command),
+			 sizeof (glibtop_response),
+			 sizeof (glibtop_union),
+			 sizeof (glibtop_sysdeps));

 		size = strlen (version) + 1;

--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/parameter.h>
 #include <glibtop/error.h>
--- a/lib/read.c
+++ b/lib/read.c
@@ -53,7 +53,7 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	glibtop_init_r (&server, 0, 0);

 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
+	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
 #endif

 	if (server->socket) {
@@ -64,6 +64,6 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 				server,
 				ngettext ("read %d byte",
 					  "read %d bytes", size),
-				(int)size);
+				size);
 	}
 }
--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -19,7 +19,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
--- a/lib/write.c
+++ b/lib/write.c
@@ -39,7 +39,7 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	if (size == 0) return;

 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
+	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
 #endif

 	if (server->socket) {
@@ -49,8 +49,5 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	}

 	if (ret < 0)
-		glibtop_error_io_r (server,
-				    ngettext("wrote %d byte",
-					     "wrote %d bytes", size),
-				    (int) size);
+		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
 }
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -54,7 +54,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	fi

 	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP, 1, [Define if libgtop supports SMP])
+	  AC_DEFINE(HAVE_LIBGTOP_SMP)
 	fi

 	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
@@ -126,9 +126,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

 	case "$host_os" in
 	*bsd*)
-	  AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
-	  AC_SUBST(KVM_LIBS)
-
 	  AC_CHECK_HEADERS(net/if_var.h)
 	  AC_MSG_CHECKING([for I4B])
 	  AC_TRY_COMPILE([
@@ -155,7 +152,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 ], have_i4b=yes, have_i4b=no)
 	  AC_MSG_RESULT($have_i4b)
 	  if test x$have_i4b = xyes; then
-	    AC_DEFINE(HAVE_I4B, 1, [Define if I4B is available])
+	    AC_DEFINE(HAVE_I4B)
 	    AC_MSG_CHECKING([for I4B accounting])
 	    AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -183,8 +180,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 ], have_i4b_acct=yes, have_i4b_acct=no)
 	    AC_MSG_RESULT($have_i4b_acct)
 	    if test x$have_i4b_acct = xyes ; then
-	      AC_DEFINE(HAVE_I4B_ACCT, 1,
-                        [Define if I4B accounting is supported])
+	      AC_DEFINE(HAVE_I4B_ACCT)
 	    else
 	      AC_WARN([
 *** I4B accounting disabled - you won't get any PPP statistics.
@@ -192,41 +188,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 *** to see how to enable it.])
 	    fi
 	  fi
-
-	  AC_MSG_CHECKING(what we need to define to get struct msginfo)
-	  AC_CACHE_VAL(msginfo_needs,
-	    msginfo_needs=
-	    for def in nothing KERNEL _KERNEL; do
-	      AC_COMPILE_IFELSE([#define $def
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <stdio.h>
-
-int
-main (void)
-{
-  struct msginfo mi;
-  mi.msgmax = 0;
-  return 0;
-}],
-	        [
-	          msginfo_needs=$def
-	          if test ${msginfo_needs} = KERNEL; then
-	            AC_DEFINE(STRUCT_MSGINFO_NEEDS_KERNEL, 1,
-	              [Define to 1 if we need to define KERNEL to get 'struct msginfo'])
-	          elif test ${msginfo_needs} = _KERNEL; then
-	            AC_DEFINE(STRUCT_MSGINFO_NEEDS__KERNEL, 1,
-	              [Define to 1 if we need to define _KERNEL to get 'struct msginfo'])
-	          fi
-	        ]
-	      )
-	      test -n "${msginfo_needs}" && break
-	    done
-	  )
-	  AC_MSG_RESULT($msginfo_needs)
-	  if test -z "${msginfo_needs}"; then
-	    AC_MSG_ERROR([Could not find the definition of 'struct msginfo'])
-	  fi
 	  ;;
 	linux*)
 	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
@@ -250,8 +211,7 @@ main (void)
 	  fi

 	  AC_MSG_CHECKING(for Linux kernel version code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code,
-              [Same as LINUX_VERSION_CODE either from <linux/version.h> or from the running kernel (if there are no configured kernel sources).])
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	solaris*)
@@ -263,8 +223,7 @@ main (void)
 	  os_version_code=`echo "$os_version_expr" | dc`

 	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code,
-              [Solaris release code (eg. 251 for Solaris 2.5.1).])
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	esac
@@ -276,12 +235,11 @@ main (void)
 	AC_MSG_RESULT($libgtop_need_server)

 	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP, 1, [Define if libgtop is required])
+	  AC_DEFINE(NEED_LIBGTOP)
 	fi

 	if test x$libgtop_use_machine_h = xyes ; then
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H, 1,
-                    [Define if machine.h in libgtop sysdeps dir])
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
 	fi

 	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,33 +1,19 @@
-2006-04-07  Ales Nyakhaychyk  <nab@mail.by>
+2006-04-02  Pema Geyleg  <pema.geyleg@gmail.com

-	* be.po: Updated Belarusian translation.
+	* dz.po: Added Dzongkha translation by Pema Geyleg

-2006-04-02  Kjartan Maraas  <kmaraas@gnome.org>
+2006-03-30  Guntupalli Karunakar  <karunakar@indlinux.org>

-	* POTFILES.skip: Remove non-existing files.
-	* nb.po: Updated Norwegian bokmål translation.
-	* no.po: Same.
-
-2006-03-27  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po:  Updated Hebrew translation.
+        * dz.po: Added Dzongkha translation.

 2006-03-22  Gora Mohanty  <gmohanty@cvs.gnome.org>

        * or.po: Updated Oriya translation.

-2006-03-18  Vladimer Sichinava  <vlsichinava@gmail.com>
+2006-01-09  Priit Laes  <plaes@cvs.gnome.org>

-	* ka.po: Updated Georgian translation.
-	
-2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
+	* et.po: Translation updated by Ivar Smolin.

-	* lt.po: Updated Lithuanian translation.
-
-2006-02-28  Clytie Siddall <clytie@riverland.net.au>
-
-	* lv.po: Updated Latvian translation by Raivis Dejus <orvils@gmail.com>.
-	
 2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>

 	* th.po: Added Thai translation.
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,6 @@
+support/error.c
+support/getopt.c
+support/popt.c
+support/popthelp.c
 examples/smp.c
 lib/lib.c
--- a/po/be.po
+++ b/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-07 13:38+0200\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2004-03-13 14:28+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.0.2\n"

-#: ../lib/read.c:65
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -27,59 +27,59 @@ msgstr[0] "прачытаны %d байт"
 msgstr[1] "прачытаны %d байты"
 msgstr[2] "прачытана %d байтаў"

-#: ../lib/read_data.c:53
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "памер прачытаных даньняў"

-#: ../lib/read_data.c:72
-#, c-format
+#: lib/read_data.c:72
+#, fuzzy, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "прачытаны %lu байт даных"
-msgstr[1] "прачытаны %lu байты даных"
-msgstr[2] "прачытана %lu байтаў даных"
+msgstr[0] "прачытаны %d байт"
+msgstr[1] "прачытаны %d байты"
+msgstr[2] "прачытана %d байтаў"

-#: ../lib/write.c:52
-#, c-format
+#: lib/write.c:52
+#, fuzzy, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "запісаны %d байт"
 msgstr[1] "запісаны %d байты"
 msgstr[2] "запісана %d байтаў"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Уключыць адладку"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "АДЛАДКА"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Уключыць дэталёвы вывад"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "ПАДРАБЯЗНА"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Ня нараджаць у рэжыме тла"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "БЯЗ-ДЭМАНУ"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Выкліканы з inetd"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"

-#: ../src/daemon/gnuserv.c:500
+#: src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -88,126 +88,126 @@ msgstr ""
 "Памылка ў ключох %s: %s.\n"
 "Запусьціце '%s --help' каб убачыць поўны сьпіс даступных ключоў.\n"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Разарваць"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Перарваць"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Выйсьці"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Недапушчальная інструкцыя"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Захоп трасыроўкі"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Перарываньне"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "Памылка EMT"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Выключэньне пункту, які плавае"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Забіць"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Памылка шыны"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Парушэньне сэгментацыі"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Кепскі аргумэнт у сыстэмным выкліку"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Парушаны канал"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Таймэр"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Завяршэньне"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Тэрміновыя умовы сокету"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Спыніць"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Спыненьне клявіятуры"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Працягнуць"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Стан нашчадку быў зьменены"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Чытаньне ў тле з tty"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Запіс у тле ў tty"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "Зараз магчымы ўвод/вывад"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "Перавышана мяжа ЦПУ"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Перавышана мяжа памеру файлу"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Віртуальны таймэр"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Прафіляваны таймэр"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Зьмена памераў акна"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Запыт інфармацыі"

-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Сыгнал карыстальніку 1"

-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Сыгнал карыстальніку 2"
--- a/po/dz.po
+++ b/po/dz.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2006-03-06 05:23+0100\n"
 "PO-Revision-Date: 2006-03-28 11:12-0500\n"
 "Last-Translator: \n"
-"Language-Team:  <en@li.org>\n"
+"Language-Team:  <pgeyleg@dit.gov.bt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/et.po
+++ b/po/et.po
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop HEAD\n"
+"Project-Id-Version: libgtop 2.12\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-02-08 15:28+0100\n"
 "PO-Revision-Date: 2005-03-09 10:47+0200\n"
--- a/po/he.po
+++ b/po/he.po
@@ -8,75 +8,71 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.libgtop-GNOME-2-0-port.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-27 17:02+0300\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2003-03-18 18:06+0200\n"
-"Last-Translator: Yair Hershkovitz <yairhr@gmail.com>\n"
+"Last-Translator: Gil 'Dolfin' Osher <dolfin@rpg.org.il>\n"
 "Language-Team: Hebrew <he@li.org>\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"
-
-# *** This library should not be translated (only copy the english msgs) ***
-# *** Old hebrew translation is commented for backup sake                ***

 #: lib/read.c:65
-#, c-format
+#, fuzzy, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "read %d byte"
-msgstr[1] "read %d bytes"
+msgstr[0] "קורא %d בתים"
+msgstr[1] "קורא %d בתים"

 #: lib/read_data.c:53
 msgid "read data size"
-msgstr "read data size"
+msgstr "קורא את גודל המידע"

 #: lib/read_data.c:72
-#, c-format
+#, fuzzy, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "read %lu byte of data"
-msgstr[1] "read %lu bytes of data"
+msgstr[0] "קורא %d בתים"
+msgstr[1] "קורא %d בתים"

 #: lib/write.c:52
-#, c-format
+#, fuzzy, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "wrote %d byte"
-msgstr[1] "wrote %d bytes"
+msgstr[0] "כותב %d בתים"
+msgstr[1] "כותב %d בתים"

 #: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
-msgstr "Enable debugging"
+msgstr "אפשר ניפוי"

 #: src/daemon/gnuserv.c:460
 msgid "DEBUG"
-msgstr "DEBUG"
+msgstr "ניפוי"

 #: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
-msgstr "Enable verbose output"
+msgstr "אפשר פלט מפורט"

 #: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
-msgstr "VERBOSE"
+msgstr "מפורט"

 #: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
-msgstr "Don't fork into background"
+msgstr "אל תשכפל לרקע"

 #: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
+msgstr ""

 #: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
-msgstr "Invoked from inetd"
+msgstr ""

 #: src/daemon/gnuserv.c:466
 msgid "INETD"
-msgstr "INETD"
+msgstr ""

 #: src/daemon/gnuserv.c:500
 #, c-format
@@ -84,326 +80,129 @@ msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"שגיאה באפשרות %s: %s.\n"
+"הפעל '%s --help' כדי לראות רשימה מלאה של אפשרויות שורות פקודה זמינות.\n"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "ניתוק"

 #: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-msgid "Hangup"
-msgstr "Hangup"
+msgid "Interrupt"
+msgstr "הפרעה"

 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-msgid "Interrupt"
-msgstr "Interrupt"
+msgid "Quit"
+msgstr "יציאה"

 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-msgid "Quit"
-msgstr "Quit"
+msgid "Illegal instruction"
+msgstr "הוראה לא חוקית"

 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-msgid "Illegal instruction"
-msgstr "Illegal instruction"
+msgid "Trace trap"
+msgstr ""

 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-msgid "Trace trap"
-msgstr "Trace trap"
+msgid "Abort"
+msgstr "ביטול"

 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-msgid "Abort"
-msgstr "Abort"
+msgid "EMT error"
+msgstr "שגיאת EMT"

 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-msgid "EMT error"
-msgstr "EMT error"
+msgid "Floating-point exception"
+msgstr ""

 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-msgid "Floating-point exception"
-msgstr "Floating-point exception"
+msgid "Kill"
+msgstr "הרוג"

 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-msgid "Kill"
-msgstr "Kill"
+msgid "Bus error"
+msgstr "שגיאת אפיק"

 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-msgid "Bus error"
-msgstr "Bus error"
+msgid "Segmentation violation"
+msgstr "הפרעת התחלקות"

 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-msgid "Segmentation violation"
-msgstr "Segmentation violation"
+msgid "Bad argument to system call"
+msgstr ""

 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-msgid "Bad argument to system call"
-msgstr "Bad argument to system call"
+msgid "Broken pipe"
+msgstr "צינור שבור"

 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-msgid "Broken pipe"
-msgstr "Broken pipe"
+msgid "Alarm clock"
+msgstr "שעון מעורר"

 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-msgid "Alarm clock"
-msgstr "Alarm clock"
+msgid "Termination"
+msgstr "סיום"

 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-msgid "Termination"
-msgstr "Termination"
+msgid "Urgent condition on socket"
+msgstr ""

 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-msgid "Urgent condition on socket"
-msgstr "Urgent condition on socket"
+msgid "Stop"
+msgstr "עצור"

 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-msgid "Stop"
-msgstr "Stop"
+msgid "Keyboard stop"
+msgstr "עצירת מקלדת"

 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-msgid "Keyboard stop"
-msgstr "Keyboard stop"
+msgid "Continue"
+msgstr "המשך"

 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-msgid "Continue"
-msgstr "Continue"
+msgid "Child status has changed"
+msgstr "מצב הילד השתנה"

 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-msgid "Child status has changed"
-msgstr "Child status has changed"
+msgid "Background read from tty"
+msgstr "קרית רקע מ tty"

 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-msgid "Background read from tty"
-msgstr "Background read from tty"
+msgid "Background write to tty"
+msgstr "כתיבת רקע מ tty"

 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-msgid "Background write to tty"
-msgstr "Background write to tty"
+msgid "I/O now possible"
+msgstr "קלט/פלט עכשיו אפשרי"

 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-msgid "I/O now possible"
-msgstr "I/O now possible"
+msgid "CPU limit exceeded"
+msgstr ""

 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-msgid "CPU limit exceeded"
-msgstr "CPU limit exceeded"
+msgid "File size limit exceeded"
+msgstr ""

 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-msgid "File size limit exceeded"
-msgstr "File size limit exceeded"
+msgid "Virtual alarm clock"
+msgstr "שעון מעורר וירוטאלי"

 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-msgid "Virtual alarm clock"
-msgstr "Virtual alarm clock"
+msgid "Profiling alarm clock"
+msgstr ""

 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-msgid "Profiling alarm clock"
-msgstr "Profiling alarm clock"
+msgid "Window size change"
+msgstr "שינוי גודל חלון"

 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-msgid "Window size change"
-msgstr "Window size change"
+msgid "Information request"
+msgstr "בקשת מידע"

 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-msgid "Information request"
-msgstr "Information request"
+msgid "User defined signal 1"
+msgstr "אות מוגדר משתמש 1"

 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-msgid "User defined signal 1"
-msgstr "User defined signal 1"
-
-#: sysdeps/osf1/siglist.c:59 sysdeps/sun4/siglist.c:59
 msgid "User defined signal 2"
-msgstr "User defined signal 2"
-
-#
-##: lib/read.c:65
-##, c-format
-#msgid "read %d byte"
-#msgid_plural "read %d bytes"
-#msgstr[0] ""
-#"נקראו %d בתים"
-#msgstr[1] ""
-#"נקראו %d בתים"
-#
-##: lib/read_data.c:53
-#msgid "read data size"
-#msgstr "קורא את גודל המידע"
-#
-##: lib/read_data.c:72
-##,, c-format
-#msgid "read %lu byte of data"
-#msgid_plural "read %lu bytes of data"
-#msgstr[0] ""
-#"נקראו %lu בתים של מידע"
-#msgstr[1] ""
-#"נקראו %lu בתים של מידע"
-#
-##: lib/write.c:52
-##, c-format
-#msgid "wrote %d byte"
-#msgid_plural "wrote %d bytes"
-#msgstr[0] ""
-#"נכתבו %d בתים"
-#msgstr[1] ""
-#"נכתבו %d בתים"
-#
-##: src/daemon/gnuserv.c:460
-#msgid "Enable debugging"
-#msgstr "אפשר ניפוי"
-#
-##: src/daemon/gnuserv.c:460
-#msgid "DEBUG"
-#msgstr "ניפוי"
-#
-##: src/daemon/gnuserv.c:462
-#msgid "Enable verbose output"
-#msgstr "אפשר פלט מפורט"
-#
-##: src/daemon/gnuserv.c:462
-#msgid "VERBOSE"
-#msgstr "מפורט"
-#
-##: src/daemon/gnuserv.c:464
-#msgid "Don't fork into background"
-#msgstr "אל תשכפל לרקע"
-#
-##: src/daemon/gnuserv.c:464
-#msgid "NO-DAEMON"
-#msgstr "NO-DAEMON"
-#
-##: src/daemon/gnuserv.c:466
-#msgid "Invoked from inetd"
-#msgstr ""
-#
-##: src/daemon/gnuserv.c:466
-#msgid "INETD"
-#msgstr ""
-#
-##: src/daemon/gnuserv.c:500
-##, c-format
-#msgid ""
-#"Error on option %s: %s.\n"
-#"Run '%s --help' to see a full list of available command line options.\n"
-#msgstr ""
-#"שגיאה באפשרות %s: %s.\n"
-#"הפעל '%s --help' כדי לראות רשימה מלאה של אפשרויות שורות פקודה זמינות.\n"
-#
-##: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
-#msgid "Hangup"
-#msgstr "ניתוק"
-#
-##: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
-#msgid "Interrupt"
-#msgstr "הפרעה"
-#
-##: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
-#msgid "Quit"
-#msgstr "יציאה"
-#
-##: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
-#msgid "Illegal instruction"
-#msgstr "הוראה לא חוקית"
-#
-##: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
-#msgid "Trace trap"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
-#msgid "Abort"
-#msgstr "ביטול"
-#
-##: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
-#msgid "EMT error"
-#msgstr "שגיאת EMT"
-#
-##: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
-#msgid "Floating-point exception"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
-#msgid "Kill"
-#msgstr "הרוג"
-#
-##: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-#msgid "Bus error"
-#msgstr "שגיאת אפיק"
-#
-##: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
-#msgid "Segmentation violation"
-#msgstr "הפרעת התחלקות"
-#
-##: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
-#msgid "Bad argument to system call"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
-#msgid "Broken pipe"
-#msgstr "צינור שבור"
-#
-##: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
-#msgid "Alarm clock"
-#msgstr "שעון מעורר"
-#
-##: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
-#msgid "Termination"
-#msgstr "סיום"
-#
-##: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
-#msgid "Urgent condition on socket"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
-#msgid "Stop"
-#msgstr "עצור"
-#
-##: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
-#msgid "Keyboard stop"
-#msgstr "עצירת מקלדת"
-#
-##: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
-#msgid "Continue"
-#msgstr "המשך"
-#
-##: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
-#msgid "Child status has changed"
-#msgstr "מצב הילד השתנה"
-#
-##: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
-#msgid "Background read from tty"
-#msgstr "קרית רקע מ tty"
-#
-##: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
-#msgid "Background write to tty"
-#msgstr "כתיבת רקע מ tty"
-#
-##: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
-#msgid "I/O now possible"
-#msgstr "קלט/פלט עכשיו אפשרי"
-#
-##: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
-#msgid "CPU limit exceeded"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
-#msgid "File size limit exceeded"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
-#msgid "Virtual alarm clock"
-#msgstr "שעון מעורר וירוטאלי"
-#
-##: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
-#msgid "Profiling alarm clock"
-#msgstr ""
-#
-##: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
-#msgid "Window size change"
-#msgstr "שינוי גודל חלון"
-#
-##: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-#msgid "Information request"
-#msgstr "בקשת מידע"
-#
-##: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-#msgid "User defined signal 1"
-#msgstr "אות מוגדר משתמש 1"
-#
-##: sysdeps/osf1/siglist.c:59 sysdeps/sun4/siglist.c:59
-#msgid "User defined signal 2"
-#msgstr "אות מוגדר משתמש 2"
+msgstr "אות מוגדר משתמש 2"
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,220 +0,0 @@
-# translation of libgtop.po to Georgian
-# Copyright (C) 2006 Gnome Georgian Translators
-# This file is distributed under the same license as the libgtop package.
-#
-# Alexander Didebulidze <didebuli@in.tum.de>, 2006.
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-25 08:57+0100\n"
-"PO-Revision-Date: 2006-03-18 03:28+0100\n"
-"Last-Translator: Alexander Didebulidze <didebuli@in.tum.de>\n"
-"Language-Team: Georgian <gnome@inet.ge>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0"
-
-#: ../lib/read.c:65
-#, c-format
-#, fuzzy
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "byte"
-
-#: ../lib/read_data.c:53
-#, fuzzy
-msgid "read data size"
-msgstr "სიდიდე"
-
-#: ../lib/read_data.c:72
-#, c-format
-#, fuzzy
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "byte"
-
-#: ../lib/write.c:52
-#, c-format
-#, fuzzy
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "byte"
-
-#: ../src/daemon/gnuserv.c:460
-msgid "Enable debugging"
-msgstr ""
-
-#: ../src/daemon/gnuserv.c:460
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: ../src/daemon/gnuserv.c:462
-msgid "Enable verbose output"
-msgstr ""
-
-#: ../src/daemon/gnuserv.c:462
-msgid "VERBOSE"
-msgstr "VERBOSE"
-
-#: ../src/daemon/gnuserv.c:464
-msgid "Don't fork into background"
-msgstr ""
-
-#: ../src/daemon/gnuserv.c:464
-msgid "NO-DAEMON"
-msgstr ""
-
-#: ../src/daemon/gnuserv.c:466
-msgid "Invoked from inetd"
-msgstr ""
-
-#: ../src/daemon/gnuserv.c:466
-msgid "INETD"
-msgstr "INETD"
-
-#: ../src/daemon/gnuserv.c:500
-#, c-format
-#, fuzzy
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr "შეცდომა -სკენ a ხაზი n"
-
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Hangup"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Interrupt"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Quit"
-msgstr "გამოსვლა"
-
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Illegal instruction"
-msgstr "არალეგალური ინსტრუქცია"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-#, fuzzy
-msgid "Trace trap"
-msgstr "გამოთვალე"
-
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Abort"
-msgstr "შეწყვეტა"
-
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "EMT error"
-msgstr "EMT შეცდომა"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Floating-point exception"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Kill"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-#, fuzzy
-msgid "Bus error"
-msgstr "შეცდომა"
-
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Segmentation violation"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-#, fuzzy
-msgid "Bad argument to system call"
-msgstr "-სკენ"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Broken pipe"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Alarm clock"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Termination"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Urgent condition on socket"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Stop"
-msgstr "შეჩერება"
-
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-#, fuzzy
-msgid "Keyboard stop"
-msgstr "კლავიატურა"
-
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Continue"
-msgstr "გაგრძელება"
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Child status has changed"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-#, fuzzy
-msgid "Background read from tty"
-msgstr "ფონი"
-
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-#, fuzzy
-msgid "Background write to tty"
-msgstr "ფონი -სკენ"
-
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "I/O now possible"
-msgstr "I/O ახლა შესაძლებელია"
-
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-#, fuzzy
-msgid "CPU limit exceeded"
-msgstr "CPU"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-#, fuzzy
-msgid "File size limit exceeded"
-msgstr "ფაილი სიდიდე"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Virtual alarm clock"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Profiling alarm clock"
-msgstr ""
-
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-#, fuzzy
-msgid "Window size change"
-msgstr "ფანჯარა სიდიდე"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-#, fuzzy
-msgid "Information request"
-msgstr "ინფორმაცია"
-
-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
-#, fuzzy
-msgid "User defined signal 1"
-msgstr "მომხმარებელი 1"
-
-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
-#, fuzzy
-msgid "User defined signal 2"
-msgstr "მომხმარებელი 2"
-
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,8 +1,8 @@
 # Lithuanian translation of libgtop library.
-# Copyright (C) 2003-2006 Free Software Foundation.
+# Copyright (C) 2003-2005 Free Software Foundation.
 # This file is distributed under the same license as the libgtop package.
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2003.
-# Žygimantas Beručka <zygis@gnome.org>, 2003-2006.
+# Žygimantas Beručka <uid0@akl.lt>, 2003-2005
 # 
 # 
 msgid ""
@@ -10,20 +10,21 @@ msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-25 18:15+0200\n"
-"PO-Revision-Date: 2006-03-03 12:24+0200\n"
-"Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
+"PO-Revision-Date: 2005-01-30 03:52+0200\n"
+"Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"

 #: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "perskaitytas %d baitas"
-msgstr[1] "perskaityti %d baitai"
+msgstr[0] "perskaityta %d baitas"
+msgstr[1] "perskaityta %d baitai"
 msgstr[2] "perskaityta %d baitų"

 #: lib/read_data.c:53
@@ -34,16 +35,16 @@ msgstr "perskaitytų duomenų dydis"
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "perskaitytas %lu baitas duomenų"
-msgstr[1] "perskaityti %lu baitai duomenų"
+msgstr[0] "perskaityta %lu baitas duomenų"
+msgstr[1] "perskaityta %lu baitai duomenų"
 msgstr[2] "perskaityta %lu baitų duomenų"

 #: lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "įrašytas %d baitas"
-msgstr[1] "įrašyti %d baitai"
+msgstr[0] "įrašyta %d baitas"
+msgstr[1] "įrašyta %d baitai"
 msgstr[2] "įrašyta %d baitų"

 #: src/daemon/gnuserv.c:460
@@ -85,7 +86,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Klaidingi parametrai %s: %s.\n"
-"Paleiskite „%s --help“ norėdami pamatyti visus galimus komandinės eilutės "
+"Paleiskite '%s --help' norėdami pamatyti visus galimus komandinės eilutės "
 "parametrus.\n"

 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
@@ -186,7 +187,7 @@ msgstr "CPU apribojimai viršyti"

 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Rinkmenų dydžio apribojimai viršyti"
+msgstr "Bylų dydžio apribojimai viršyti"

 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
@@ -206,8 +207,8 @@ msgstr "Informacijos užklausa"

 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
-msgstr "Pirmas naudotojo nurodytas signalas (USR1)"
+msgstr "Pirmas vartotojiškas signalas (USR1)"

 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
-msgstr "Antras naudotojo nurodytas signalas (USR2)"
+msgstr "Antras vartotojiškas signalas (USR2)"
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,83 +1,77 @@
-# Latvian translation for LibGTop
-# Copyright © 2006 Gnome i18n Project for Latvian.
+# libgtop for Latvian.
+# Copyright (C) 2002 Free Software Foundation, Inc.
 # Peteris Krisjanis <peteris.krisjanis@os.lv>, 2002.
-# Raivis Dejus <orvils@gmail.com>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop HEAD\n"
+"Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-24 08:54+0100\n"
-"PO-Revision-Date: 2006-02-24 21:20+0200\n"
-"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
-"Language-Team: Latvian <locale@laka.lv>\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
+"PO-Revision-Date: 2002-08-31 09:57+0200\n"
+"Last-Translator: Artis Trops <hornet@navigators.lv>\n"
+"Language-Team: Latvian <ll10nt@os.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-"X-Generator: KBabel 1.10.2\n"

-#: ../lib/read.c:65
-#, c-format
+#: lib/read.c:65
+#, fuzzy, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "lasīt %d baitu"
+msgstr[0] "lasīt %d baitus"
 msgstr[1] "lasīt %d baitus"
-msgstr[2] "lasīt %d baitu"

-#: ../lib/read_data.c:53
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "lasīt datu izmēru"

-#: ../lib/read_data.c:72
-#, c-format
+#: lib/read_data.c:72
+#, fuzzy, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "lasīt %lu baitu"
-msgstr[1] "lasīt %lu baitus"
-msgstr[2] "lasīt %lu baitu"
+msgstr[0] "lasīt %d baitus"
+msgstr[1] "lasīt %d baitus"

-#: ../lib/write.c:52
-#, c-format
+#: lib/write.c:52
+#, fuzzy, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "ierakstīju %d baitu"
-msgstr[1] "ierakstīju %d baitus"
-msgstr[2] "ierakstīju %d baitu"
+msgstr[0] "rakstīt %d baitus"
+msgstr[1] "rakstīt %d baitus"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Aktivizēt atkļūdošanu"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "DEBUG"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Aktivizēt vārdisku izvadi"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "VERBOSE"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Nesadalīties fona"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "NO-DAEMON"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Izsaukt no inetd"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"

-#: ../src/daemon/gnuserv.c:500
+#: src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -87,126 +81,126 @@ msgstr ""
 "Palaidiet '%s --help' lai redzētu pilnu pieejamo komandu rindas opciju "
 "sarakstu.\n"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Iekārt"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Pātraukt"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Iziet"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Neatļauta instrukcija"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Izsekot slazdu"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Pātraukt"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT kļūda"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Peldošā punkta izņēmums"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Nobeigt"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Šinas kļūda"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Segmentācijas pārkāpums"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Slikts arguments sistēmas izsaukumam"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Pātraukts kanāls"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Brīdinājuma pulkstenis"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Pātraukšana"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Steidzama situācija kontaktā"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Stop"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Tastatūra stop"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Turpināt"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Bērna statuss ir izmainījies"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Fona lasīšana no tty"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Fona rakstīšana uz tty"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "I/O tagad iespējams"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU limits pārsniegts"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Faila izmēra limits pārsniegts"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Virtuāls brīdinājuma pulkstenis"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Profilēšanas modinātājs"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Loga izmēru maiņa"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Informācijas pieprasījums"

-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Lietotāja definēts signāls 1"

-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
-msgstr "Lietotāja definēts signāls 2"
+msgstr "Lietotāja definēts signāls 2"
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 14:48+0200\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2005-01-28 17:05+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -15,64 +15,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

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

-#: ../lib/read_data.c:53
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "les størrelse på data"

-#: ../lib/read_data.c:72
+#: lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "leste %lu byte med data"
 msgstr[1] "leste %lu bytes med data"

-#: ../lib/write.c:52
+#: lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "skrev %d byte"
 msgstr[1] "skrev %d bytes"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Slå på avlusing"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "DEBUG"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Slå på utfyllende utskrift"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "VERBOSE"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Ikke forgren til bakgrunnen"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "NO-DAEMON"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Kalt fra inetd"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"

-#: ../src/daemon/gnuserv.c:500
+#: src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -82,126 +82,126 @@ msgstr ""
 "Kjør '%s --help' for å se en full liste av tilgjengelige "
 "kommandolinjeflagg.\n"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Frakobling"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Avbrudd"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Avslutt"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Ugyldig instruksjon"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Spor felle"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Aborter"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT-feil"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Flyttallsunntak"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Drep"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Buss-feil"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Segmentoverskridelse"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Ugyldig argument til systemkall"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Brukket rør"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Alarmklokke"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Terminering"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Viktig tilstand på socket"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Stopp"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Tastaturstopp"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Fortsett"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Barnets status er endret"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Lesing fra tty i bakgrunnen"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Skriving til tty i bakgrunnen"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "I/O nå mulig"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU-grense oversteget"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Grense for filstørrelse overskredet"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Virtuell alarmklokke"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Profilerer alarmklokken"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Endring i vindusstørrelse"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Informasjonsforespørsel"

-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Brukerdefinert signal 1"

-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Brukerdefinert signal 2"
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-02 14:48+0200\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2005-01-28 17:05+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -15,64 +15,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

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

-#: ../lib/read_data.c:53
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "les størrelse på data"

-#: ../lib/read_data.c:72
+#: lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "leste %lu byte med data"
 msgstr[1] "leste %lu bytes med data"

-#: ../lib/write.c:52
+#: lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "skrev %d byte"
 msgstr[1] "skrev %d bytes"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Slå på avlusing"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "DEBUG"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Slå på utfyllende utskrift"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "VERBOSE"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Ikke forgren til bakgrunnen"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "NO-DAEMON"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Kalt fra inetd"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"

-#: ../src/daemon/gnuserv.c:500
+#: src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -82,126 +82,126 @@ msgstr ""
 "Kjør '%s --help' for å se en full liste av tilgjengelige "
 "kommandolinjeflagg.\n"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Frakobling"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Avbrudd"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Avslutt"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Ugyldig instruksjon"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Spor felle"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Aborter"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT-feil"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Flyttallsunntak"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Drep"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Buss-feil"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Segmentoverskridelse"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Ugyldig argument til systemkall"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Brukket rør"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Alarmklokke"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Terminering"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Viktig tilstand på socket"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Stopp"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Tastaturstopp"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Fortsett"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Barnets status er endret"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Lesing fra tty i bakgrunnen"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Skriving til tty i bakgrunnen"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "I/O nå mulig"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU-grense oversteget"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Grense for filstørrelse overskredet"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Virtuell alarmklokke"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Profilerer alarmklokken"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Endring i vindusstørrelse"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Informasjonsforespørsel"

-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Brukerdefinert signal 1"

-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Brukerdefinert signal 2"
--- a/po/or.po
+++ b/po/or.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD.or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-22 00:12+0530\n"
+"POT-Creation-Date: 2006-03-22 00:18+0530\n"
 "PO-Revision-Date: 2006-03-22 00:13+0530\n"
 "Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
 "Language-Team: Oriya <oriya-group@lists.sarovar.org>\n"
@@ -85,126 +85,126 @@ msgstr ""
 "%s ପସନ୍ଦରେ ତୃଟି: %s.\n"
 "ଉପଲବ୍ଧ ପୂରା ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ ପସନ୍ଦର ତାଲିକା ଦେଖିବା ପାଇଁ '%s --help' ଚଳାନ୍ତୁ.\n"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "ସଂଯୋଗ ଛିନ୍ନ କରନ୍ତୁ"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "ବ୍ଯାହତ କରନ୍ତୁ"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "ବିଦାୟ ନିଅନ୍ତୁ"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "ଅବୈଧ ଅନୁଦେଶ"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "ଅନୁସନ୍ଧାନ ଯନ୍ତା"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "ପରିତ୍ଯାଗ"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "ଇ.ଏମ.ଟି. ତ୍ରୁଟି"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "ଅସ୍ଥାୟୀ ବିନ୍ଦୁ ତ୍ରୁଟି"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "ସମାପନ"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "ପରିପଥ ତ୍ରୁଟି"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "ଖଣ୍ଡକରଣ ଉଲଂଘନ"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "ତନ୍ତ୍ର ଡାକରାକୁ ଅବୈଧ ସ୍ବତନ୍ତ୍ରଚର"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "ଭଙ୍ଗା ପାଇପ"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "ସତର୍କ ଘଡ଼ି"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "ସମାପ୍ତି"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "ସକେଟରେ ଅତ୍ଯାଶ୍ଯକ ଅବସ୍ଥା"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "ବନ୍ଦ"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "ଚାବିପଟି ବନ୍ଦ"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "ଚାଲୁ ରଖନ୍ତୁ"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "ନିର୍ଭରକ ଅବସ୍ଥିତି ବଦଳି ଯାଇଛି"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "ଟି.ଟି.ୱାଇ.ଠାରୁ ପୃଷ୍ଠଭୂମି ପଠନ"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "ଟି.ଟି.ୱାଇ.କୁ ପୃଷ୍ଠଭୂମି ଲିଖନ"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "ବର୍ତ୍ତମାନ ନିବେଶ/ନିର୍ଗମ ସମ୍ଭବ"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "କେନ୍ଦ୍ରୀୟ ସଂସାଧକ ସୀମା ପାର ହୋଇଯାଇଛି"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "ଫାଇଲ ଆକାର ସୀମା ପାର ହୋଇଯାଇଛି"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "ଆଭାସୀ ସତର୍କ ଘଡ଼ି"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "ସତର୍କ ଘଡ଼ିର ରୂପରେଖ ପ୍ରସ୍ତୁତି"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "ୱିଣ୍ଡୋ ଆକାର ବଦଳା"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "ସୂଚନା ଅନୁରୋଧ"

-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "ଚାଳକ ନିର୍ଦ୍ଦିଷ୍ଟ ସଙ୍କେତ ୧"

-#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "ଚାଳକ ନିର୍ଦ୍ଦିଷ୍ଟ ସଙ୍କେତ ୨"
--- a/src/daemon/io.c
+++ b/src/daemon/io.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include "daemon.h"
 #include <glibtop/error.h>

--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include "daemon.h"

 #ifdef LIBGTOP_ENABLE_DEBUG
--- a/src/daemon/server.c
+++ b/src/daemon/server.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include "daemon.h"

 static glibtop _glibtop_global_server;
--- a/src/daemon/slave.c
+++ b/src/daemon/slave.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include "daemon.h"
 #include <glibtop/error.h>

--- a/src/daemon/version.c
+++ b/src/daemon/version.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/version.h>
--- a/src/inodedb/file_by_inode2.c
+++ b/src/inodedb/file_by_inode2.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>
--- a/src/inodedb/mkinodedb2.c
+++ b/src/inodedb/mkinodedb2.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>
--- a/sysdeps/aix/close.c
+++ b/sysdeps/aix/close.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop/close.h>

 /* Closes pipe to gtop server. */
--- a/sysdeps/aix/cpu.c
+++ b/sysdeps/aix/cpu.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <stdlib.h>
 #include <sys/systemcfg.h>
 #include <sys/sysinfo.h>
--- a/sysdeps/aix/glibtop_server.h
+++ b/sysdeps/aix/glibtop_server.h
@@ -45,7 +45,6 @@ G_BEGIN_DECLS
 #define GLIBTOP_SUID_PROC_ARGS		0
 #define GLIBTOP_SUID_PROC_MAP		0
 #define GLIBTOP_SUID_NETLOAD		(1 << GLIBTOP_SYSDEPS_NETLOAD)
-#define GLIBTOP_SUID_NETLIST		0
 #define GLIBTOP_SUID_PPP		0

 G_END_DECLS
--- a/sysdeps/aix/loadavg.c
+++ b/sysdeps/aix/loadavg.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <nlist.h>
 #include <glibtop.h>
 #include <glibtop/loadavg.h>
--- a/sysdeps/aix/mem.c
+++ b/sysdeps/aix/mem.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>

--- a/sysdeps/aix/msg_limits.c
+++ b/sysdeps/aix/msg_limits.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <sys/msg.h>

 #include <glibtop.h>
--- a/sysdeps/aix/netlist.c
+++ b/sysdeps/aix/netlist.c
@@ -18,7 +18,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/netlist.h>

--- a/sysdeps/aix/netload.c
+++ b/sysdeps/aix/netload.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
--- a/sysdeps/aix/nosuid.c
+++ b/sysdeps/aix/nosuid.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <sys/systemcfg.h>

 #include <glibtop.h>
--- a/sysdeps/aix/open.c
+++ b/sysdeps/aix/open.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <glibtop.h>
--- a/sysdeps/aix/ppp.c
+++ b/sysdeps/aix/ppp.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/ppp.h>
--- a/sysdeps/aix/procargs.c
+++ b/sysdeps/aix/procargs.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <procinfo.h>

 #include <glibtop.h>
--- a/sysdeps/aix/prockernel.c
+++ b/sysdeps/aix/prockernel.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <procinfo.h>
 #include <sys/proc.h>

--- a/sysdeps/aix/proclist.c
+++ b/sysdeps/aix/proclist.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <procinfo.h>

 #include <glibtop.h>
--- a/sysdeps/aix/procmap.c
+++ b/sysdeps/aix/procmap.c
@@ -22,7 +22,6 @@
 */


-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/procmap.h>
--- a/sysdeps/aix/procmem.c
+++ b/sysdeps/aix/procmem.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>
--- a/sysdeps/aix/procsegment.c
+++ b/sysdeps/aix/procsegment.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>
--- a/sysdeps/aix/procsignal.c
+++ b/sysdeps/aix/procsignal.c
@@ -21,7 +21,6 @@
   Boston, MA) +2111-1307, USA.
 */

-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>
--- a/sysdeps/aix/procstate.c
+++ b/sysdeps/aix/procstate.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <procinfo.h>
 #include <sys/thread.h>

--- a/sysdeps/aix/proctime.c
+++ b/sysdeps/aix/proctime.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <unistd.h>

 #include <glibtop.h>
--- a/sysdeps/aix/procuid.c
+++ b/sysdeps/aix/procuid.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <unistd.h>
 #include <sys/vminfo.h>
 #include <sys/resource.h>
--- a/sysdeps/aix/sem_limits.c
+++ b/sysdeps/aix/sem_limits.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/sem_limits.h>
 #include <glibtop/error.h>
--- a/sysdeps/aix/shm_limits.c
+++ b/sysdeps/aix/shm_limits.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <sys/shm.h>

 #include <glibtop.h>
--- a/sysdeps/aix/siglist.c
+++ b/sysdeps/aix/siglist.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/signal.h>

--- a/sysdeps/aix/swap.c
+++ b/sysdeps/aix/swap.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <sys/vminfo.h>

 #include <glibtop.h>
--- a/sysdeps/aix/uptime.c
+++ b/sysdeps/aix/uptime.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <sys/times.h>

 #include <glibtop.h>
--- a/sysdeps/aix/utils.c
+++ b/sysdeps/aix/utils.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <nlist.h>

 #include <procinfo.h>
--- a/sysdeps/common/ChangeLog
+++ b/sysdeps/common/ChangeLog
@@ -1,14 +1,3 @@
-2006-04-09  Benoît Dejean  <benoit@placenet.org>
-
-	* Makefile.am: Fixed trivial warning.
-
-2006-02-21  Benoît Dejean  <benoit@placenet.org>
-
-	* mountlist.c: (ignore_mount_entry): Also ignores linprocfs, mfs
-	and devfs.
-	Closes #331856.
-	Patch by Andreas Kohn <andreas.kohn@gmail.com>
-
 2005-04-26  Jörgen Scheibengruber  <mfcn@gmx.de>

 	* mountlist.c: (ignore_mount_entry): Added tmpfs to ignore list.
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -9,7 +9,7 @@ inodedb_SRCLIST			=
 inodedb_DEFS			=
 endif

-AM_CFLAGS				= @CFLAGS@ $(inodedb_DEFS)
+CFLAGS				= @CFLAGS@ $(inodedb_DEFS)

 noinst_LTLIBRARIES		= libgtop_common-2.0.la libgtop_suid_common-2.0.la

--- a/sysdeps/common/gnuslib.c
+++ b/sysdeps/common/gnuslib.c
@@ -29,7 +29,6 @@
 * ../etc/gnuserv.README relative to the directory containing this file)
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
--- a/sysdeps/common/inodedb.c
+++ b/sysdeps/common/inodedb.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -540,10 +540,7 @@ static gboolean ignore_mount_entry(const struct mount_entry *me)
 	static const char ignored[][12] = {
 		"autofs",
 		"binfmt_misc",
-		"devfs",
 		"devpts",
-		"linprocfs",
-		"mfs",
 		"mntfs",
 		"mqueue",
 		"none",
--- a/sysdeps/common/procargs.c
+++ b/sysdeps/common/procargs.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glibtop/procargs.h>

 #include <glib.h>
--- a/sysdeps/common/sysdeps_suid.c
+++ b/sysdeps/common/sysdeps_suid.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/union.h>
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,50 +1,3 @@
-2006-04-09  Benoît Dejean  <benoit@placenet.org>
-
-	* fsusage.c: (_glibtop_freebsd_get_fsusage_read_write):
-	
-	Fixed typo.
-
-2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
-
-	* sysdeps/freebsd/fsusage.c:
-
-	Use statvfs(2) if available instead of statfs(2).  The latter was
-	replaced by the former and is no longer available under, e.g. NetBSD.
-
-	Fixes bug #337235.
-
-2006-04-04  Benoît Dejean  <benoit@placenet.org>
-
-	* sysinfo.c: (init_sysinfo):
-	
-	Store only strings in values' values. g_strdup these strings.
-	Even if values is never destroyed, set key_destroy_func to NULL.
-	
-	Leave description to NULL.
-
-2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
-
-	* sysdeps/freebsd/Makefile.am:
-	* sysdeps/freebsd/sysinfo.c:
-
-	Bring back to life (from the 1.x versions) the sysinfo.c file for
-	the freebsd sysdeps.  The new file comes from the FreeBSD ports
-	repository and has some minor style changes by me.  This is required
-	to get the glibtop_get_sysinfo_s function used by the sysdeps common
-	code.
-
-	Fixes bug #337251.
-
-2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
-
-	* sysdeps/freebsd/proctime.c:
-
-	Remove obsolete and non-functional code that breaks the build under
-	NetBSD.  It was guarded by a conditional but could not compile
-	anyway because it referred to an undefined variable.
-
-	Fixes bug #337234.
-
 2005-02-28  Benoît Dejean  <TazForEver@dlfp.org>

 	* fsusage.c: (_glibtop_freebsd_get_fsusage_read_write): Forgot to add
--- a/sysdeps/freebsd/Makefile.am
+++ b/sysdeps/freebsd/Makefile.am
@@ -3,11 +3,10 @@ INCLUDES			= @INCLUDES@

 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la

-libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c sysinfo.c
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c

 libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)

-libgtop_sysdeps_suid_2_0_la_LIBADD	= $(KVM_LIBS)
 libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
--- a/sysdeps/freebsd/close.c
+++ b/sysdeps/freebsd/close.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/close.h>

--- a/sysdeps/freebsd/cpu.c
+++ b/sysdeps/freebsd/cpu.c
@@ -21,7 +21,6 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/cpu.h>
--- a/sysdeps/freebsd/fsusage.c
+++ b/sysdeps/freebsd/fsusage.c
@@ -1,4 +1,3 @@
-#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/fsusage.h>
@@ -9,11 +8,7 @@

 #include <unistd.h>
 #include <sys/param.h>
-#if defined (HAVE_SYS_STATVFS_H)
-#include <sys/statvfs.h>
-#else
 #include <sys/mount.h>
-#endif

 #include <stdio.h>
 #include <string.h>
@@ -31,17 +26,9 @@ _glibtop_freebsd_get_fsusage_read_write(glibtop *server,
 				      const char *path)
 {
 	int result;
-#if defined (STAT_STATVFS)
-	struct statvfs sfs;
-#else
 	struct statfs sfs;
-#endif

-#if defined (STAT_STATVFS)
-	result = statvfs (path, &sfs);
-#else
 	result = statfs (path, &sfs);
-#endif

 	if (result == -1) {
 		return;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pema Geyleg	0d0f8ca467	* empty log message *	2006-04-02 15:05:43 +00:00
Guntupalli Karunakar	f752847e59	Added Dzongkha translation	2006-03-30 15:27:29 +00:00
Gora Mohanty	36cfd2e35d	po/or.po: Updated Oriya translation. po/Changelog: Changed to reflect this.	2006-03-21 18:47:07 +00:00
Benoît Dejean	617c8a2122	Released 2.12.3. * NEWS: Released 2.12.3.	2006-02-21 18:39:54 +00:00
Benoît Dejean	d733f8063d	Fixed reference to glibtop/procstate.h * reference.texi: Fixed reference to glibtop/procstate.h	2006-02-21 18:30:05 +00:00
Priit Laes	dbed81644f	Translation updated by Ivar Smolin. 2006-01-09 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated by Ivar Smolin.	2006-01-09 08:58:34 +00:00