release 2.0.0

2002-05-10  Kevin Vandersloot <kfv101@psu.edu>

	* configure.in: release 2.0.0

.cvsignore

@@ -13,7 +13,6 @@ gtopConf.sh
 i386-bsdi
 i686-pc-linux-gnu
 intl
-libgtop-0.01.tar.gz
 libgtop-mirror.sh.swp
 libgtopConf.sh
 libtool
@@ -21,6 +20,7 @@ ltconfig
 ltmain.sh
 macros
 stamp-h
+stamp-h.in
 sun4
 sun4sol2
 support
@@ -30,7 +30,6 @@ i686-pc-linux-gnu-linux
 libgtop-config
 ABOUT-NLS
 libgtop.spec
-libgtop-0.99.*.tar.gz
-libgtop-0.99.*
+libgtop*.tar.gz
 *-debstamp
-libgtop-1.*.*.tar.gz
+libgtop*.pc

ChangeLog

@@ -1,12 +1,34 @@
-2003-05-11  Andrew Sobala  <aes@gnome.org>
+2002-05-10  Kevin Vandersloot <kfv101@psu.edu>
 
-	* up version to 1.0.14
+	* configure.in: release 2.0.0
 
-2002-12-11  Stanislav Brabec  <sbrabec@suse.cz>
+2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
 
-	* sysdeps/guile/Makefile.am, sysdeps/guile/names/Makefile.am:
-	Changed order of arguments for guile-snarf - .c file must be first
-	(fixes bug #82684).
+	* configure.in (ALL_LINGUAS): Removed all es_* and added only es_ES.
+
+2002-05-08  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* configure.in: Added Vietnamese (vi) to ALL_LINGUAS
+
+2002-03-12  James Henstridge  <james@daa.com.au>
+
+	* acinclude.m4 (LIBGTOP_HEACKER_TESTS): AM_CONDITIONAL()
+	statements can't be conditionally executed (automake compat fix).
+	(GNOME_LIBGTOP_SYSDEPS): move the conditional here so that it is
+	always executed.
+
+2002-02-10  Kevin Vandersloot <kfv101@psu.edu>
+
+	* configure.in: bump version
+
+	* release 1.90.2
+
+2002-02-09  Bastien Nocera  <hadess@hadess.net>
+
+	reviewed by: Kevin Vandersloot <kfv101@psu.edu>
+
+	* configure.in: remove need for dc, and clean up
+	* stamp-h.in, .cvsignore: remove
 
 2002-02-05  Abel Cheung  <maddog@linux.org.hk>
 
@@ -14,12 +36,68 @@
 
 2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
 
-        * configure.in: Added ms in ALL_LINGUAS.
-        * po/ms.po: Added Malay Translation.
+	* configure.in: Added ms in ALL_LINGUAS.
+	* po/ms.po: Added Malay Translation.
+	* po/.cvsignore: Added 'libgtop-2.0.pot'.
 
-2001-10-26  Kevin Vandersloot <kfv101@psu.edu>
+2001-01-14  Abel Cheung  <maddog@linux.org.hk>
 
-	* up version to 1.0.13
+	* configure.in: Sync'ed ALL_LINGUAS with files in po directory,
+	and renamed GETTEXT_PACKAGE to avoid conflict with libgtop 1.0.x.
+
+2002-01-10  Kevin Vandersloot <kfv101@psu.edu>
+
+	* acininclude.m4: add back the support stuf but make it really
+	work
+
+	* configure.in: bump version number, add back GNOME_SUPPORT 
+	check since that was causing a build failure
+
+	* release 1.90.1
+
+2002-01-09  Kevin Vandersloot <kfv101@psu.edu>
+
+	* acinclude.m4: remove gnome support check. Fixes the build
+	for those with automake < 1.4p5.
+
+	* configure.in: remove check for GNOME_SUPPORT
+
+2001-14-27  Miles Lane <miles@megapathdsl.net>
+
+	* acconfig.h:  Added "#undef HAVE_GETTEXT" entry.
+	* LIBGTOP_VERSION:  Removed file.
+	* configure.in:  added glib-gettextize support and
+	  moved in the *VERSION* stuff from LIBGTOP_VERSION.
+
+2001-11-27  Kevin Vandersloot <kfv101@psu.edu>
+
+	* acinclude.m4: copy some of the macros that were formerly
+	in gnome-macros
+
+	* configure.in, sysdeps/Makefile.am: comment out guile
+	support for now.
+
+	* release 1.90.0
+
+2001-11-26  Kevin Vandersloot <kfv101@psu.edu>
+
+	* src/daemon/gnuserv.c:  Apply patch fixing security issue from
+        intexxia labs - #1048-261101
+
+2001-11-26  Abel Cheung <maddog@linux.org.hk>
+
+	* src/inodedb/file_by_inode.c: Rename to file_by_inode2.c
+	* src/inodedb/mkinodedb.c: Rename to mkinodedb2.c
+
+	* po/POTFILES.in: Reflect above change
+
+	* */.cvsignore: Add various files
+
+2001-11-25  Kevin Vandersloot <kfv101@psu.edu>
+
+	* port stable libgtop to GNOME 2.0. Too much to detail.
+	pkgconfig is now used. Libs are named libgtop-2.0 etc for
+	parallel install. 
 
 2001-10-17  Abel Chueng  <maddog@linux.org.hk>
 

LIBGTOP-VERSION

@@ -7,11 +7,11 @@
 # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
 #
 LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=14
+LIBGTOP_MINOR_VERSION=90
+LIBGTOP_MICRO_VERSION=0
 
-LIBGTOP_INTERFACE_AGE=12
-LIBGTOP_BINARY_AGE=12
+LIBGTOP_INTERFACE_AGE=0
+LIBGTOP_BINARY_AGE=0
 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
 LIBGTOP_VERSION_SUFFIX=

Makefile.am

@@ -10,16 +10,16 @@ if BUILD_GNOME_SUPPORT
 support = support
 endif
 
-SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
+SUBDIRS = po $(support) misc include sysdeps lib src \
 	  $(examples_SUBDIRS) doc
 
 libgtopinclude_HEADERS = glibtop.h
-libgtopincludedir = $(includedir)/libgtop-1.0
+libgtopincludedir = $(includedir)/libgtop-2.0
 
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
 	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \
-	libgtop-mirror.sh
+	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4
 
 dist-hook:
 	cp libgtop.spec $(distdir)
@@ -29,19 +29,22 @@ release:
 
 ## Put `exec' in the name because this should be installed by
 ## `install-exec', not `install-data'.
-confexecdir	= $(libdir)
-confexec_DATA	= $(top_builddir)/libgtopConf.sh \
-		  $(top_builddir)/libgtop-features.def
+## confexecdir	= $(libdir)
+## confexec_DATA	= $(top_builddir)/libgtopConf.sh \
+##		  $(top_builddir)/libgtop-features.def
+		  
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgtop-2.0.pc
 
 CLEANFILES=libgtopConf.sh
 
-bin_SCRIPTS = $(top_builddir)/libgtop-config
+## bin_SCRIPTS = $(top_builddir)/libgtop-config
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
-@MAINT@ include macros/macros.dep
-@MAINT@macros/macros.dep: macros/Makefile.am
-@MAINT@	cd macros && $(MAKE) macros.dep
+## @MAINT@ include macros/macros.dep
+## @MAINT@macros/macros.dep: macros/Makefile.am
+## @MAINT@	cd macros && $(MAKE) macros.dep
 
 @MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
 
@@ -52,7 +55,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
 libgtopConf.sh: libgtopConf.sh.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-1.0#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' \
@@ -79,11 +82,11 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
 	  && mv libgtopConf.tmp libgtopConf.sh
 
-libgtop-config: libgtop-config.in Makefile
-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
-	  && mv libgtop-config.tmp libgtop-config && \
-		chmod 755 libgtop-config
+# libgtop-config: libgtop-config.in Makefile
+#	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+#	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+#	  && mv libgtop-config.tmp libgtop-config && \
+#		chmod 755 libgtop-config
 
 libgtop-features.def: features.def
 	@LN_S@ $< $@

NEWS

@@ -1,12 +1,3 @@
-November 26, 2001:
-================
-
-* Released LIbGTop 1.0.13
-
-  - security fix
-
-  - update for parallel install with libgtop-2.0
-
 February 27, 2001:
 =================
 

acconfig.h

@@ -18,6 +18,7 @@
 
 #undef ENABLE_NLS
 #undef HAVE_CATGETS
+#undef GETTEXT_PACKAGE
 #undef HAVE_GETTEXT
 #undef HAVE_LC_MESSAGES
 #undef HAVE_STPCPY

acinclude.m4

@@ -0,0 +1,877 @@
+dnl This is just copied m4s from need-declaration.m4 gnome-fileutils.m4
+dnl gnome-supprt-checks.m4 and a little from gnome-libgtop-check.m4
+dnl and finally libgtop-sysdeps.m4
+
+dnl
+dnl LIBGTOP_CHECK_TYPE
+dnl
+dnl Improved version of AC_CHECK_TYPE which takes into account
+dnl that we need to #include some other header files on some
+dnl systems to get some types.
+
+dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT)
+AC_DEFUN([AC_LIBGTOP_CHECK_TYPE],
+[AC_REQUIRE([AC_HEADER_STDC])dnl
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL(ac_cv_type_$1,
+[AC_EGREP_CPP(dnl
+changequote(<<,>>)dnl
+<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
+changequote([,]), [#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+/* For Tru64 */
+#ifdef HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
+], 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)
+fi
+])
+
+dnl
+dnl GNOME_LIBGTOP_TYPES
+dnl
+dnl some typechecks for libgtop.
+dnl
+
+AC_DEFUN([GNOME_LIBGTOP_TYPES],
+[
+        AC_CHECK_HEADERS(sys/bitypes.h)
+        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
+        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
+])
+
+dnl See whether we need a declaration for a function.
+dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES])
+AC_DEFUN([GCC_NEED_DECLARATION],
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_CACHE_VAL(gcc_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+$2],
+[char *(*pfn) = (char *(*)) $1],
+eval "gcc_cv_decl_needed_$1=no", eval "gcc_cv_decl_needed_$1=yes")])
+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)
+else
+  AC_MSG_RESULT(no)
+fi
+])dnl
+
+dnl Check multiple functions to see whether each needs a declaration.
+dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES])
+AC_DEFUN([GCC_NEED_DECLARATIONS],
+[for ac_func in $1
+do
+GCC_NEED_DECLARATION($ac_func, $2)
+done
+]
+)
+
+dnl
+dnl GNOME_FILEUTILS_CHECKS
+dnl
+dnl checks that are needed for the diskusage applet.
+dnl
+
+AC_DEFUN([GNOME_FILEUTILS_CHECKS],
+[
+AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
+mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
+sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
+
+AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
+getcwd getmntinfo gettimeofday isascii lchown \
+listmntent memcpy mkfifo strchr strerror strrchr vprintf)
+
+dnl Set some defaults when cross-compiling
+
+if test x$cross_compiling = xyes ; then
+        case "$host_os" in
+        linux*)
+          fu_cv_sys_mounted_getmntent1=yes
+          fu_cv_sys_stat_statfs2_bsize=yes
+          ;;
+        sunos*)
+          fu_cv_sys_stat_statfs4=yes
+          ;;
+        freebsd*)
+          fu_cv_sys_stat_statfs2_bsize=yes
+          ;;
+        osf*)
+          fu_cv_sys_stat_statfs3_osf1=yes
+          ;;
+        esac
+fi
+
+# Determine how to get the list of mounted filesystems.
+list_mounted_fs=
+
+# If the getmntent function is available but not in the standard library,
+# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
+AC_FUNC_GETMNTENT
+
+# This test must precede the ones for getmntent because Unicos-9 is
+# reported to have the getmntent function, but its support is incompatible
+# with other getmntent implementations.
+
+# NOTE: Normally, I wouldn't use a check for system type as I've done for
+# `CRAY' below since that goes against the whole autoconf philosophy.  But
+# I think there is too great a chance that some non-Cray system has a
+# function named listmntent to risk the false positive.
+
+if test -z "$list_mounted_fs"; then
+# Cray UNICOS 9
+AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
+AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
+[fu_cv_sys_mounted_cray_listmntent=no
+AC_EGREP_CPP(yes,
+[#ifdef _CRAY
+yes
+#endif
+], [test $ac_cv_func_listmntent = yes \
+&& fu_cv_sys_mounted_cray_listmntent=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)
+fi
+fi
+
+if test $ac_cv_func_getmntent = yes; then
+
+# This system has the getmntent function.
+# Determine whether it's the one-argument variant or the two-argument one.
+
+if test -z "$list_mounted_fs"; then
+# 4.3BSD, SunOS, HP-UX, Dynix, Irix
+AC_MSG_CHECKING([for one-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
+[test $ac_cv_header_mntent_h = yes \
+&& fu_cv_sys_mounted_getmntent1=yes \
+|| fu_cv_sys_mounted_getmntent1=no])
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR4
+AC_MSG_CHECKING([for two-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
+[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
+fu_cv_sys_mounted_getmntent2=yes,
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+fi
+
+fi
+
+if test -z "$list_mounted_fs"; then
+# DEC Alpha running OSF/1.
+AC_MSG_CHECKING([for getfsstat function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
+[AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fs_types.h>],
+[struct statfs *stats;
+int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
+fu_cv_sys_mounted_getsstat=yes,
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# AIX.
+AC_MSG_CHECKING([for mntctl function and struct vmount])
+AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
+[AC_TRY_CPP([#include <fshelp.h>],
+fu_cv_sys_mounted_vmount=yes,
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR3
+AC_MSG_CHECKING([for FIXME existence of three headers])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
+[AC_TRY_CPP([
+#include <sys/statfs.h>
+#include <sys/fstyp.h>
+#include <mnttab.h>],
+fu_cv_sys_mounted_fread_fstyp=yes,
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# 4.4BSD and DEC OSF/1.
+AC_MSG_CHECKING([for getmntinfo function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
+[
+ok=
+if test $ac_cv_func_getmntinfo = yes; then
+AC_EGREP_HEADER(f_type;, sys/mount.h,
+ok=yes)
+fi
+test -n "$ok" \
+&& fu_cv_sys_mounted_getmntinfo=yes \
+|| fu_cv_sys_mounted_getmntinfo=no
+])
+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)
+fi
+fi
+
+# FIXME: add a test for netbsd-1.1 here
+
+if test -z "$list_mounted_fs"; then
+# Ultrix
+AC_MSG_CHECKING([for getmnt function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
+[AC_TRY_CPP([
+#include <sys/fs_types.h>
+#include <sys/mount.h>],
+fu_cv_sys_mounted_getmnt=yes,
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR2
+AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread,
+[AC_TRY_CPP([#include <mnttab.h>],
+fu_cv_sys_mounted_fread=yes,
+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)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+# FIXME -- no need to abort building the whole package
+# Cannot build mountlist.c or anything that needs its functions
+fi
+
+AC_CHECKING(how to get filesystem space usage)
+space=no
+
+# Perform only the link test since it seems there are no variants of the
+# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
+# because that got a false positive on SCO OSR5.  Adding the declaration
+# of a `struct statvfs' causes this test to fail (as it should) on such
+# systems.  That system is reported to work fine with STAT_STATFS4 which
+# is what it gets when this test fails.
+if test $space = no; then
+# SVR4
+AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
+[AC_TRY_LINK([#include <sys/types.h>
+#include <sys/statvfs.h>],
+[struct statvfs fsd; statvfs (0, &fsd);],
+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)
+fi
+fi
+
+if test $space = no; then
+# DEC Alpha running OSF/1
+AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
+[AC_TRY_RUN([
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+int main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+return (statfs (".", &fsd, sizeof (struct statfs)));
+}],
+fu_cv_sys_stat_statfs3_osf1=yes,
+fu_cv_sys_stat_statfs3_osf1=no,
+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)
+fi
+fi
+
+if test $space = no; then
+# AIX
+AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
+member (AIX, 4.3BSD)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
+[AC_TRY_RUN([
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+#include <sys/vfs.h>
+#endif
+int main ()
+{
+struct statfs fsd;
+fsd.f_bsize = 0;
+return (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_bsize=yes,
+fu_cv_sys_stat_statfs2_bsize=no,
+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)
+fi
+fi
+
+if test $space = no; then
+# SVR3
+AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
+[AC_TRY_RUN([#include <sys/types.h>
+#include <sys/statfs.h>
+int main ()
+{
+struct statfs fsd;
+return (statfs (".", &fsd, sizeof fsd, 0));
+}],
+fu_cv_sys_stat_statfs4=yes,
+fu_cv_sys_stat_statfs4=no,
+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)
+fi
+fi
+
+if test $space = no; then
+# 4.4BSD and NetBSD
+AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
+member (4.4BSD and NetBSD)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
+[AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+int main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+return (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_fsize=yes,
+fu_cv_sys_stat_statfs2_fsize=no,
+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)
+fi
+fi
+
+if test $space = no; then
+# Ultrix
+AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
+AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
+[AC_TRY_RUN([#include <sys/types.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#ifdef HAVE_SYS_FS_TYPES_H
+#include <sys/fs_types.h>
+#endif
+int main ()
+{
+struct fs_data fsd;
+/* Ultrix's statfs returns 1 for success,
+0 for not mounted, -1 for failure.  */
+return (statfs (".", &fsd) != 1);
+}],
+fu_cv_sys_stat_fs_data=yes,
+fu_cv_sys_stat_fs_data=no,
+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)
+fi
+fi
+
+if test $space = no; then
+# SVR2
+AC_TRY_CPP([#include <sys/filsys.h>],
+AC_DEFINE(STAT_READ_FILSYS) space=yes)
+fi
+
+if test -n "$list_mounted_fs" && test $space != no; then
+DF_PROG="df"
+# LIBOBJS="$LIBOBJS fsusage.o"
+# LIBOBJS="$LIBOBJS mountlist.o"
+fi
+
+# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
+# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
+# enable the work-around code in fsusage.c.
+AC_MSG_CHECKING([for statfs that truncates block counts])
+AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
+[AC_TRY_COMPILE([
+#if !defined(sun) && !defined(__sun)
+choke -- this is a workaround for a Sun-specific problem
+#endif
+#include <sys/types.h>
+#include <sys/vfs.h>],
+[struct statfs t; long c = *(t.f_spare);],
+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)
+fi
+AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
+
+AC_CHECKING(for AFS)
+test -d /afs && AC_DEFINE(AFS)
+])
+
+dnl GNOME_SUPPORT_CHECKS
+dnl    Check for various support functions needed by the standard
+dnl    Gnome libraries.  Sets LIBOBJS, might define some macros.
+dnl    This should only be used when building the Gnome libs; 
+dnl    Gnome clients should not need this macro.
+AC_DEFUN([GNOME_SUPPORT_CHECKS],[
+  # we need an `awk' to build `gnomesupport.h'
+  AC_REQUIRE([AC_PROG_AWK])
+
+  # this should go away soon
+  need_gnome_support=yes
+
+  save_LIBOBJS="$LIBOBJS"
+  LIBOBJS=
+
+  AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+
+  # for `scandir'
+  AC_HEADER_DIRENT
+
+  # copied from `configure.in' of `libiberty'
+  vars="program_invocation_short_name program_invocation_name sys_errlist"
+  for v in $vars; do
+    AC_MSG_CHECKING([for $v])
+    AC_CACHE_VAL(gnome_cv_var_$v,
+      [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
+		   [eval "gnome_cv_var_$v=yes"],
+		   [eval "gnome_cv_var_$v=no"])])
+    if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
+      AC_MSG_RESULT(yes)
+      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      AC_DEFINE_UNQUOTED($n)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  done
+
+  AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)
+  AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)
+
+  AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o")
+
+  # to include `error.c' error.c has some HAVE_* checks
+  AC_CHECK_FUNCS(vprintf doprnt strerror_r)
+  # stolen from am_func_error_at_line
+  AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
+  [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
+              am_cv_lib_error_at_line=yes,
+              am_cv_lib_error_at_line=no)])
+  if test $am_cv_lib_error_at_line = no; then
+   LIBOBJS="$LIBOBJS error.o"
+  fi
+  AC_SUBST(LIBOBJS)dnl
+  
+  # This is required if we declare setreuid () and setregid ().
+  AC_TYPE_UID_T
+
+  # see if we need to declare some functions.  Solaris is notorious for
+  # putting functions into the `libc' but not listing them in the headers
+  AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h dirent.h)
+  GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
+  GCC_NEED_DECLARATION(scandir,[
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
+])
+
+  # Turn our LIBOBJS into libtool objects.  This is gross, but it
+  # requires changes to autoconf before it goes away.
+  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+  AC_SUBST(need_gnome_support)
+  AC_SUBST(LTLIBOBJS)
+
+  LIBOBJS="$save_LIBOBJS"
+  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
+])
+
+
+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([LIBGTOP_HACKER_TESTS],[
+	AC_REQUIRE([AC_CANONICAL_HOST])
+
+	AC_ARG_WITH(linux-table,
+      [  --with-linux-table      Use the table () function from Martin Baulig],
+	[linux_table="$withval"],[linux_table=auto])
+	case "$host_os" in
+	linux*)
+	  if test $linux_table = yes ; then
+	    AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
+	  elif test $linux_table = auto ; then
+	    AC_MSG_CHECKING(for table function in Linux Kernel)
+	    AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <unistd.h>
+#include <linux/unistd.h>
+#include <linux/table.h>
+
+#include <syscall.h>
+
+static inline _syscall3 (int, table, int, type, union table *, tbl, const void *, param);
+
+int
+main (void)
+{
+	union table tbl;
+	int ret;
+
+	ret = table (TABLE_VERSION, NULL, NULL);
+
+	if (ret == -1)
+		exit (-errno);
+
+	exit (ret < 1 ? ret : 0);
+}
+], linux_table=yes, linux_table=no, linux_table=no)
+	    AC_MSG_RESULT($linux_table)
+	  fi
+	  if test $linux_table = yes ; then
+	    AC_DEFINE(HAVE_LINUX_TABLE)
+	  fi
+	  ;;
+	esac
+])
+
+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)
+
+	linux_table=auto
+	if test x$hacker_mode = xyes ; then
+	  LIBGTOP_HACKER_TESTS
+	fi
+	AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
+
+	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
+	    ;;
+	  *)
+	    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*)
+	  if test x$linux_table = xyes ; then
+	    libgtop_sysdeps_dir=kernel
+	    libgtop_use_machine_h=no
+	  else
+	    libgtop_sysdeps_dir=linux
+	    libgtop_use_machine_h=no
+	    libgtop_have_sysinfo=yes
+	  fi
+	  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'
+	  ;;
+	*)
+	  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)
+])
+
+  

autogen.sh

@@ -14,4 +14,8 @@ PKG_NAME="Gnome Top Library"
     exit 1
 }
 
-. $srcdir/macros/autogen.sh
+which gnome-autogen.sh || {
+    echo "You need to install gnome-common from the GNOME CVS"
+    exit 1
+}
+USE_GNOME2_MACROS=1 . gnome-autogen.sh

configure.in

@@ -6,24 +6,23 @@ AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
-dnl This is required at several places
-AC_CHECK_PROG(ac_dc_found, dc, yes, no)
-if test x$ac_dc_found != xyes ; then
-AC_MSG_ERROR([
-*** The "dc" utility was not found on your system.
-***
-*** When using RedHat Linux, you need to install the "bc" package.
-***
-*** It is now part of the "bc" package, so you should look at
-*** ftp://ftp.gnu.org/pub/gnu/bc/ if you want to compile it yourself.
-***
-*** Other systems and distributions may also have it in their "bc" package,
-*** so if there's no "dc" one, please look for "bc".
-***])
-fi
+LIBGTOP_MAJOR_VERSION=2
+LIBGTOP_MINOR_VERSION=0
+LIBGTOP_MICRO_VERSION=0
+LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
+AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
+LIBGTOP_INTERFACE_AGE=0
+LIBGTOP_BINARY_AGE=0
 
-. $srcdir/LIBGTOP-VERSION
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+# 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.
+LIBGTOP_SERVER_VERSION=5
+
+# Version code calculation
+LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`
 
 AC_SUBST(LIBGTOP_MAJOR_VERSION)
 AC_SUBST(LIBGTOP_MINOR_VERSION)
@@ -47,12 +46,12 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
-AM_ACLOCAL_INCLUDE(. macros)
+ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."
 
 AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
-AC_ARG_PROGRAM
+dnl AC_ARG_PROGRAM
 
 dnl We need this at some places.
 libgtop_top_builddir=`pwd`
@@ -85,42 +84,43 @@ export cross_compiling
 AM_PROG_LIBTOOL
 
 dnl Let the user enable compiler warnings
-GNOME_COMPILE_WARNINGS
+dnl GNOME_COMPILE_WARNINGS
 
-GNOME_INIT_HOOK(gnome_found=yes)
+dnl GNOME_INIT_HOOK(gnome_found=yes)
 
-if test "x$gnome_found" != xyes; then
-  if test "x$want_gnome" != xno ; then
-    AC_MSG_ERROR([
-*** GNOME was not found on this system. ***
-
-*** If you want to use LibGTop without GNOME, you need
-*** to give configure the --without-gnome parameter.
-])
-  else
-    AC_DEFINE(WITHOUT_GNOME)
-  fi
-  GNOME_SUPPORT_CHECKS
-else
-  if test "x$want_gnome" != xno ; then
-    AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
-  else
-    GNOME_SUPPORT_CHECKS
-  fi
-fi
+dnl if test "x$gnome_found" != xyes; then
+dnl   if test "x$want_gnome" != xno ; then
+dnl     AC_MSG_ERROR([
+dnl *** GNOME was not found on this system. ***
+dnl 
+dnl *** If you want to use LibGTop without GNOME, you need
+dnl *** to give configure the --without-gnome parameter.
+dnl ])
+dnl   else
+dnl     AC_DEFINE(WITHOUT_GNOME)
+dnl   fi
+dnl   GNOME_SUPPORT_CHECKS
+dnl else
+dnl   if test "x$want_gnome" != xno ; then
+dnl     AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+dnl   else
+dnl     GNOME_SUPPORT_CHECKS
+dnl   fi
+dnl fi
+AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
 
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
-AC_ARG_WITH(libgtop-guile,
-[  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
-[build_guile="$withval"], [build_guile=yes])
+dnl AC_ARG_WITH(libgtop-guile,
+dnl [  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
+dnl [build_guile="$withval"], [build_guile=yes])
 
-if test x$build_guile != xno ; then
-  GNOME_CHECK_GUILE
-fi
+dnl if test x$build_guile != xno ; then
+dnl  GNOME_CHECK_GUILE
+dnl fi
 
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
@@ -178,11 +178,17 @@ AC_SUBST(guile_subdirs)
 
 AM_PROG_LIBTOOL
 
-AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+GLIB_REQUIRED=2.0.0
+
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
 
 dnl You need to uncomment the following line if you want to use
 dnl libGTop without Gnome.
-dnl GNOME_SUPPORT_CHECKS
+GNOME_SUPPORT_CHECKS
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -243,18 +249,18 @@ AC_CHECK_LIB(kvm, kvm_open,[
 dnl For DEC OSF1
 AC_CHECK_LIB(mach, vm_statistics)
 
-dnl For some broken libc5 systems (Debian 1.3)                                                           
-saved_CFLAGS=$CFLAGS                                                                                     
-CFLAGS="$CFLAGS -D_GNU_SOURCE"                                                                           
+dnl For some broken libc5 systems (Debian 1.3)
+saved_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -D_GNU_SOURCE"
 GCC_NEED_DECLARATION(program_invocation_name, [                           
-#include <errno.h>                                                                                       
-#include <stdio.h>                                                                                       
-#include <stdlib.h>                                                                                      
-#include <string.h>                                                                                      
-])                                                                                                       
-CFLAGS=$saved_CFLAGS                                                                                     
-                                                                                                         
-dnl Check for Internet sockets.
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+])
+
+CFLAGS=$saved_CFLAGS
+
 AC_CHECK_FUNC(socket,
  [AC_CHECK_HEADER(netinet/in.h,
    [AC_CHECK_HEADER(arpa/inet.h, [
@@ -276,9 +282,14 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-dnl ## all 'es_??' are only needed for format numbers different of 'es'
-ALL_LINGUAS="az ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko ms nl no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
-AM_GNOME_GETTEXT
+dnl ## 'es_ES' is only needed for format numbers different of 'es'
+ALL_LINGUAS="az ca da de el es es_ES fi fr ga gl hu ja ko ms nl nn no pl pt pt_BR ru sk sl sv tr uk vi zh_CN zh_TW"
+
+GETTEXT_PACKAGE=libgtop-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT
 
 AC_PATH_XTRA
 
@@ -322,7 +333,7 @@ if test "x$gnome_found" = xyes ; then
   LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
   SUPPORTINCS="$GNOME_INCLUDEDIR"
 else
-  LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la'
+  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
   SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
 fi
 
@@ -338,7 +349,7 @@ AC_SUBST(SUPPORTINCS)
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)/libgtop-1.0'
+LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
 
 if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -367,7 +378,7 @@ sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
 
 if test x$ac_cv_guile_found = xyes ; then
-  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile"
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile-2.0"
   libgtop_guile_found=yes
 else
   libgtop_guile_found=no
@@ -383,11 +394,11 @@ fi
 
 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
 
-LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
-LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
 
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names"
-LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names"
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0"
 
 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
@@ -411,12 +422,12 @@ else
   guile_def=""
 fi
 
-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_srcdir)/intl $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-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)
 
 AC_SUBST(LIBGTOP_EXTRA_LIBS)
-
+AC_SUBST(GLIB_LIBS)
 AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
@@ -429,7 +440,7 @@ AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)
 
 if test x$libgtop_need_server = xyes ; then
-   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la"
+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
    server_programs='libgtop_server'
 else
    sysdeps_suid_lib=
@@ -442,7 +453,6 @@ AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
-intl/Makefile
 misc/Makefile
 include/Makefile
 include/glibtop/Makefile
@@ -466,4 +476,5 @@ lib/Makefile
 examples/Makefile
 doc/Makefile
 support/Makefile
-macros/Makefile])
+libgtop-2.0.pc
+])

doc/.cvsignore

@@ -0,0 +1,10 @@
+texinfo.tex
+*.info
+Makefile.in
+Makefile
+*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg
+*.ps
+auto-macros.texi
+version.texi
+stamp-vti
+*.html *.pdf

doc/ChangeLog

@@ -0,0 +1,49 @@
+2002-03-12  James Henstridge  <james@daa.com.au>
+
+	* Makefile.am (MAKEINFO): using += seems to screw up the build
+	with newer automakes.  Set it explicitly (using @MAKEINFO@) seems
+	to be compatible with both.
+
+2001-11-26  Abel Cheung  <maddog@linux.org.hk>
+
+	* libgtop.texi, Makefile.am: Renamed to libgtop2.texi
+	* about.texi: Very minor update.
+
+1999-10-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* about.texi: Added a note about LibGTop and GNOME.
+
+	* reference.texi (glibtop_proc_state): Fix description of the `state'
+ 	field for LibGTop 1.0.x.
+
+1999-09-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am (MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here.
+
+1999-05-16  Martin Baulig  <martin@home-of-linux.org>
+
+	* main.texi: This is now the main file which will @include all
+	chapter files so we can use `texinfo-multiple-files-update'.
+
+	* reference.texi: Added all missing sections with a "not yet written"
+	notice.
+
+1999-05-16  Martin Baulig  <martin@home-of-linux.org>
+
+	* white-paper.texi: Initial version of the LibGTop White Paper.
+
+	* Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in'
+ 	which will contain some `@set' commands for the LibGTop version etc.
+
+	* auto-macros.texi.in: New file. This is a template for
+	`auto-macros.texi' which will be automatically generated.
+
+1999-05-09  Martin Baulig  <martin@home-of-linux.org>
+
+	* about.texi: Split the `libgtop.texi' into one file pro chapter,
+	this is the "About LibGTop".
+
+	* reference.texi: The "LibGTop Reference Manual".
+
+	* libgtop.texi: Initial version of the new LibGTop Manual.
+

doc/Makefile.am

@@ -0,0 +1,45 @@
+info_TEXINFOS		= libgtop2.texi
+
+libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
+			  auto-macros.texi version.texi main.texi \
+			  white-paper.texi
+
+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_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \
+	  -e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_LIBS\%#$(LIBGTOP_GUILE_LIBS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_INCS\%#$(LIBGTOP_GUILE_INCS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_NAMES_LIBS\%#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_NAMES_INCS\%#$(LIBGTOP_GUILE_NAMES_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_guile_found\%#$(libgtop_guile_found)#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

doc/about.texi

@@ -33,10 +33,10 @@ latest release tarballs from
 @noindent
 or any of its mirror sites.
 
-The latest stable version of LibGTop is 1.0.1 which is also the one that comes
-together with GNOME 1.0. In CVS, there is a @code{LIBGTOP_STABLE_1_0} branch
-which is rooted at the @code{LIBGTOP_1_0_1} tag while actual development occurs
-in the @code{HEAD} which currently has version 1.1.0.
+The latest stable version of LibGTop is 1.0.12 which is also the one that comes
+together with GNOME 1.0. It belongs to @code{LIBGTOP_STABLE_1_0} branch in CVS.
+Actual development occurs in the @code{libgtop-GNOME-2-0-port} which is
+currently versioned 1.90.0.
 
 @node Supported Platforms, Mailing List, Availability, About
 @section Supported Platforms
@@ -47,7 +47,7 @@ The stable branch currently supports the following platforms:
 @item All versions of Linux
 
 LibGTop was tested under Linux 2.0.x and 2.2.x on the ix86 and the alpha, but
-it should also work without problems on SparcLinux.
+it should also work without problems on SparcLinux or Linux 2.4.x.
 
 Note: I'm speaking of the Linux kernel here, not the GNU/Linux operating system.
 
@@ -116,6 +116,7 @@ me a lot in the early beginning.
 @item Timur Bakeyev for the BSDI port.
 @item Drazen Kacar and the other people on the LibGTop development mailing
 list for the Solaris port.
+@item Kevin Vandersloot for the effort to port to GNOME 2.0.
 @item All people sending me patches, having good ideas, ...
 @item Everyone I have forgotten in this list ...
 @end itemize

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%
+

doc/libgtop2.texi

@@ -0,0 +1,89 @@
+\input texinfo   @c -*-texinfo-*-
+@c %**start of header
+@setfilename libgtop2.info
+@settitle LibGTop Reference Manual
+@setchapternewpage odd
+@c %**end of header
+
+@include auto-macros.texi
+@include version.texi
+
+@ifinfo
+This is the LibGTop Reference Manual version @value{VERSION}
+(last modified @value{UPDATED}).
+
+Copyright 1999 Free Software Foundation, Inc.
+     
+Permission is granted to make and distribute verbatim
+copies of this manual provided the copyright notice and
+this permission notice are preserved on all copies.
+     
+@ignore
+Permission is granted to process this file through TeX
+and print the results, provided the printed document
+carries a copying permission notice identical to this
+one except for the removal of this paragraph (this
+paragraph not being relevant to the printed manual).
+     
+@end ignore
+Permission is granted to copy and distribute modified
+versions of this manual under the conditions for
+verbatim copying, provided also that the sections
+entitled ``Copying'' and ``GNU General Public License''
+are included exactly as in the original, and provided
+that the entire resulting derived work is distributed
+under the terms of a permission notice identical to this
+one.
+     
+Permission is granted to copy and distribute
+translations of this manual into another language,
+under the above conditions for modified versions,
+except that this permission notice may be stated in a
+translation approved by the Free Software Foundation.
+
+@format
+@dircategory Libraries:
+@direntry
+* LibGTop2: (libgtop2).			Library to get system specific data
+					such as cpu and memory usage, active
+					processes
+@end direntry
+@end format
+
+@end ifinfo
+
+@titlepage
+@title LibGTop Reference Manual
+@subtitle Version @value{VERSION} - @value{UPDATED}
+@author Martin Baulig
+
+@page
+@vskip 0pt plus 1filll
+Copyright @copyright{} 1999 Free Software Foundation, Inc.
+
+Permission is granted to make and distribute verbatim
+copies of this manual provided the copyright notice and
+this permission notice are preserved on all copies.
+     
+Permission is granted to copy and distribute modified
+versions of this manual under the conditions for
+verbatim copying, provided also that the sections
+entitled ``Copying'' and ``GNU General Public License''
+are included exactly as in the original, and provided
+that the entire resulting derived work is distributed
+under the terms of a permission notice identical to this
+one.
+     
+Permission is granted to copy and distribute
+translations of this manual into another language,
+under the above conditions for modified versions,
+except that this permission notice may be stated in a
+translation approved by the Free Software Foundation.
+@end titlepage
+
+@contents
+
+@include main.texi
+
+@bye
+

doc/white-paper.texi

@@ -0,0 +1,90 @@
+@node White Paper, Reference Manual, About, Top
+@chapter LibGTop White Paper
+
+@menu
+* Introduction::                Introduction
+* Overview::                    Overview
+@end menu
+
+@node Introduction, Overview, White Paper, White Paper
+@section Introduction
+
+Many modern UNIX systems like Solaris, BSD or Digitial Unix only allow
+priviledged processes to read information like CPU and Memory Usage or
+information about running processes.
+
+@itemize @bullet
+@item
+BSD, for instance, doesn't have any other way to get those data than reading
+directly from @file{/dev/kmem} and you need to be in the @code{kmem} group to
+be able to read this.
+
+@item
+Other systems, like Digital Unix, allow all users to get things like CPU and
+Memory statistics, but only root may read information about any process other
+than the current one (you may not even get information about your own processes
+if you're not root).
+
+@item
+Linux has a very nice @file{/proc} filesystem, but reading and parsing
+@file{/proc} is very slow and inefficient.
+
+@item
+Solaris is a bit better, but you still need to be in the @code{sys} group or
+even root to get some data.
+@end itemize
+
+Because of this system utilities like @code{ps}, @code{uptime} or @code{top}
+often are setgid kmem or setuid root. Usually, they're also very specific to
+the system they're written for and not easily portable to other systems without
+a lot of work.
+
+This, of cause, becomes a problem for graphical tools like @code{gtop} - making
+a GTK+ program setgid or even setuid would be a security hole as big as you can
+drive the entire X11 source code through. For the GNOME project, we also needed
+some kind of library which provides all the required information in a portable
+since there's more than just one single program that wants to use them - for
+instance @code{gtop} and the @code{multiload}, @code{cpumemusage} and
+@code{netload} panel applets.
+
+@node Overview,  , Introduction, White Paper
+@section Overview
+
+This section should give you a short overview on how LibGTop was developed, which
+things needed to be considered and how it works.
+
+@menu
+* Interface Design::            Things that need to be considered
+* Server Implementation::       The LibGTop "server"
+@end menu
+
+@node Interface Design, Server Implementation, Overview, Overview
+@subsection Interface Design
+
+At the very beginning, it was necessary to collect all the data the library part
+should provide and put them into some C structures. This was not that easiy as it
+might sound since LibGTop should be portable to any modern UNIX system with a common
+library part on all those systems, but the data that should be returned vary from
+system to system. For instance some systems support shared memory, but some others
+may not.
+
+The header files where we define these C structures (which are system-independent) are
+shared between client and server. This way we can call the system dependent code
+directly where we do not need any special privileges to do so.
+
+All of those structures contain a @code{flags} member which is interpreted as a bit
+mask and tells the caller of the library functions which of the fields in the returned
+structure are valid and which are not.
+
+@node Server Implementation,  , Interface Design, Overview
+@subsection Server Implementation
+
+The LibGTop @dfn{server} is a setgid/setuid binary which contains all the system
+dependent code which needs special privileges. It is only build if it's required
+on the current system (for instance, the Linux kernel provides all the required
+data via its @file{/proc} filesystem so we do not need the server at all) and it
+only contains the @dfn{features} which need privileges.
+
+Whenever we do not need any privileges to get all the data for some of the requested
+structures (here called @dfn{features}) the library calls the sysdeps code directly
+rather than using the server.

examples/ChangeLog

@@ -1,3 +1,11 @@
+2001-01-14  Abel Cheung  <maddog@linux.org.hk>
+
+	* \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE.
+
+	* Makefile.am, first.c, second.c, sysdeps.c: Make them at least
+	compile for now, by disabling chunks which should belong to
+	HEAD branch.
+
 1999-05-28  Martin Baulig  <martin@home-of-linux.org>
 
 	* first.c, second.c, sysdeps.c: Use LibGTop version conditionals

examples/Makefile.am

@@ -22,9 +22,9 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  timings_static
 
 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 first_static_SOURCES	= $(first_SOURCES)
@@ -32,9 +32,9 @@ first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static
 
 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 second_static_SOURCES	= $(second_SOURCES)
@@ -42,9 +42,9 @@ second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static
 
 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 
@@ -54,9 +54,9 @@ procmap_static_LDADD	= $(procmap_LDADD)
 procmap_static_LDFLAGS	= -static
 
 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 netload_static_SOURCES	= $(netload_SOURCES)
@@ -64,24 +64,24 @@ netload_static_LDADD	= $(netload_LDADD)
 netload_static_LDFLAGS	= -static
 
 sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
 sysdeps_static_LDFLAGS	= -static
 
-third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la
-third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names.la
+third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names-2.0.la
+third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
 
 third_SOURCES		= third.c
-third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile.la \
+third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \
 			  $(third_guile_names_LIBS) $(third_names_LIBS) \
-			  $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+			  $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@
 
 third_static_SOURCES	= $(third_SOURCES)
@@ -89,9 +89,9 @@ third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static
 
 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 mountlist_static_SOURCES= $(mountlist_SOURCES)
@@ -100,9 +100,9 @@ mountlist_static_LDFLAGS= -static
 
 
 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 smp_static_SOURCES	= $(smp_SOURCES)
@@ -110,9 +110,9 @@ smp_static_LDADD	= $(smp_LDADD)
 smp_static_LDFLAGS	= -static
 
 timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 timings_static_SOURCES	= $(timings_SOURCES)

examples/first.c

@@ -52,8 +52,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
@@ -116,16 +116,9 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_uptime (&data.uptime);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Uptime       (0x%08lx): %f, %f, %lu\n",
-		(unsigned long) data.uptime.flags,
-		data.uptime.uptime, data.uptime.idletime,
-		(unsigned long) data.uptime.boot_time);
-#else
 	printf ("Uptime       (0x%08lx): %f, %f\n",
 		(unsigned long) data.uptime.flags,
 		data.uptime.uptime, data.uptime.idletime);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_loadavg (&data.loadavg);
@@ -249,52 +242,15 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", (int) pid,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %c, %lu, %lu\n",
 		(int) pid, (unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Uid     PID  %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
-		(int) pid, (unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -304,7 +260,6 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, pid);
@@ -322,30 +277,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) pid,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_segment.flags,
@@ -357,7 +288,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, pid);
@@ -378,19 +308,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
 	
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  PID  %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -398,7 +315,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, pid);
@@ -437,52 +353,15 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", (int) ppid,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   PPID %5d (0x%08lx): '%s', %c, %lu, %lu\n",
 		(int) ppid, (unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Uid     PPID %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
-		(int) ppid, (unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     PPID %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) ppid,
 		(unsigned long) data.proc_uid.flags,
@@ -492,7 +371,6 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, ppid);
@@ -510,30 +388,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment PPID %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) ppid,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment PPID %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) ppid,
 		(unsigned long) data.proc_segment.flags,
@@ -545,7 +399,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, ppid);
@@ -566,26 +419,12 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, ppid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  PPID %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n",
-		(int) ppid, (unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  PPID %5d (0x%08lx): %lu %lu %lu %lu\n",
 		(int) ppid, (unsigned long) data.proc_signal.flags,
 		(unsigned long) data.proc_signal.signal,
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, ppid);
@@ -624,52 +463,15 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_state (&data.proc_state, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", 1,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   INIT %5d (0x%08lx): '%s', %c, %lu, %lu\n", 1,
 		(unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_uid (&data.proc_uid, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Uid     INIT %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d", 1,
-		(unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     INIT %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", 1,
 		(unsigned long) data.proc_uid.flags,
@@ -679,7 +481,6 @@ main (int argc, char *argv [])
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_mem (&data.proc_mem, 1);
@@ -697,30 +498,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment INIT %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", 1,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment INIT %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", 1,
 		(unsigned long) data.proc_segment.flags,
@@ -732,7 +509,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, 1);
@@ -753,19 +529,6 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, 1);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  INIT %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n", 1,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  INIT %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", 1,
 		(unsigned long) data.proc_signal.flags,
@@ -773,7 +536,6 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_kernel (&data.proc_kernel, 1);

examples/mountlist.c

@@ -47,8 +47,8 @@ main (int argc, char *argv [])
 	char buffer [BUFSIZ];
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 

examples/netload.c

@@ -51,8 +51,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 

examples/procmap.c

@@ -58,8 +58,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 

examples/second.c

@@ -51,52 +51,15 @@ output (pid_t pid)
 		
 	glibtop_get_proc_state (&data.proc_state, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000		
-	printf ("Proc_State   PID  %5d (0x%08lx): '%s', %u - "
-		"%u, %u, %u, %u - %u, %u, %u\n", (int) pid,
-		(unsigned long) data.proc_state.flags,
-		data.proc_state.cmd, data.proc_state.state,
-		data.proc_state.uid, data.proc_state.gid,
-		data.proc_state.ruid, data.proc_state.rgid,
-		data.proc_state.has_cpu, data.proc_state.processor,
-		data.proc_state.last_processor);
-#else
 	printf ("Proc_State   PID  %5d (0x%08lx): "
 		"'%s', %c, %lu, %lu\n", (int) pid,
 		(unsigned long) data.proc_state.flags,
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-#endif
 		
 	glibtop_get_proc_uid (&data.proc_uid, pid);
 	
-#if LIBGTOP_VERSION_CODE > 1001000	
-	printf ("Proc_Uid     PID  %5d (0x%08lx): "
-		"%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d - %d",
-		(int) pid, (unsigned long) data.proc_uid.flags,
-		data.proc_uid.uid, data.proc_uid.euid,
-		data.proc_uid.gid, data.proc_uid.egid,
-		data.proc_uid.suid, data.proc_uid.sgid,
-		data.proc_uid.fsuid, data.proc_uid.fsgid,
-		data.proc_uid.pid, data.proc_uid.ppid,
-		data.proc_uid.pgrp, data.proc_uid.session,
-		data.proc_uid.tty, data.proc_uid.tpgid,
-		data.proc_uid.priority, data.proc_uid.nice,
-		data.proc_uid.ngroups);
-		
-	if (data.proc_uid.ngroups) {
-		for (i = 0; i < data.proc_uid.ngroups; i++) {
-			if (i)
-				printf (" %d", data.proc_uid.groups [i]);
-			else
-				printf (" (%d", data.proc_uid.groups [i]);
-		}
-		printf (")");
-	}
-
-	printf ("\n");
-#else
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -106,7 +69,6 @@ output (pid_t pid)
 		data.proc_uid.pgrp, data.proc_uid.session,
 		data.proc_uid.tty, data.proc_uid.tpgid,
 		data.proc_uid.priority, data.proc_uid.nice);
-#endif
 
 	glibtop_get_proc_mem (&data.proc_mem, pid);
 		
@@ -122,30 +84,6 @@ output (pid_t pid)
 		
 	glibtop_get_proc_segment (&data.proc_segment, pid);
 
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Segment PID  %5d (0x%08lx): "
-		"%lu %lu %lu %lu %lu 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx 0x%lx "
-		"0x%lx 0x%lx 0x%lx 0x%lx\n", (int) pid,
-		(unsigned long) data.proc_segment.flags,
-		(unsigned long) data.proc_segment.text_rss,
-		(unsigned long) data.proc_segment.shlib_rss,
-		(unsigned long) data.proc_segment.data_rss,
-		(unsigned long) data.proc_segment.stack_rss,
-		(unsigned long) data.proc_segment.dirty_size,
-		(unsigned long) data.proc_segment.start_code,
-		(unsigned long) data.proc_segment.end_code,
-		(unsigned long) data.proc_segment.start_data,
-		(unsigned long) data.proc_segment.end_data,
-		(unsigned long) data.proc_segment.start_brk,
-		(unsigned long) data.proc_segment.end_brk,
-		(unsigned long) data.proc_segment.start_stack,
-		(unsigned long) data.proc_segment.start_mmap,
-		(unsigned long) data.proc_segment.arg_start,
-		(unsigned long) data.proc_segment.arg_end,
-		(unsigned long) data.proc_segment.env_start,
-		(unsigned long) data.proc_segment.env_end);
-#else
 	printf ("Proc_Segment PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_segment.flags,
@@ -157,7 +95,6 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_code,
 		(unsigned long) data.proc_segment.end_code,
 		(unsigned long) data.proc_segment.start_stack);
-#endif
 
 	glibtop_get_proc_time (&data.proc_time, pid);
 		
@@ -176,19 +113,6 @@ output (pid_t pid)
 
 	glibtop_get_proc_signal (&data.proc_signal, pid);
 	
-#if LIBGTOP_VERSION_CODE > 1001000
-	printf ("Proc_Signal  PID  %5d (0x%08lx): "
-		"%lx %lx %lx %lx %lx %lx %lx %lx\n", (int) pid,
-		(unsigned long) data.proc_signal.flags,
-		(unsigned long) data.proc_signal.signal [0],
-		(unsigned long) data.proc_signal.signal [1],
-		(unsigned long) data.proc_signal.blocked [0],
-		(unsigned long) data.proc_signal.blocked [1],
-		(unsigned long) data.proc_signal.sigignore [0],
-		(unsigned long) data.proc_signal.sigignore [1],
-		(unsigned long) data.proc_signal.sigcatch [0],
-		(unsigned long) data.proc_signal.sigcatch [1]);
-#else
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -196,7 +120,6 @@ output (pid_t pid)
 		(unsigned long) data.proc_signal.blocked,
 		(unsigned long) data.proc_signal.sigignore,
 		(unsigned long) data.proc_signal.sigcatch);
-#endif
 
 	glibtop_get_proc_kernel (&data.proc_kernel, pid);
 
@@ -315,8 +238,8 @@ main (int argc, char *argv [])
 	unsigned *ptr, pid, i;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_init ();
 

examples/smp.c

@@ -39,8 +39,8 @@ main (int argc, char *argv [])
 	int ncpu, i;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_get_cpu (&cpu);
 

examples/sysdeps.c

@@ -44,8 +44,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);
 
@@ -73,9 +73,6 @@ main (int argc, char *argv [])
 
 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"
-#if LIBGTOP_VERSION_CODE > 1001000
-		"\tpointer_size:\t\t0x%08lx\n\n"
-#endif
 		"\tcpu:\t\t%d\t0x%08lx\n"
 		"\tmem:\t\t%d\t0x%08lx\n"
 		"\tswap:\t\t%d\t0x%08lx\n\n"
@@ -100,9 +97,6 @@ main (int argc, char *argv [])
 		"\tppp:\t\t%d\t0x%08lx\n\n",
 		(unsigned long) sysdeps.flags,
 		(unsigned long) sysdeps.features,
-#if LIBGTOP_VERSION_CODE > 1001000
-		(unsigned long) sysdeps.pointer_size,
-#endif
 		FEATURE_CHECK(CPU),
 		(unsigned long) sysdeps.cpu,
 		FEATURE_CHECK(MEM),

examples/third.c

@@ -38,8 +38,8 @@ int
 main (int argc, char *argv[])
 {
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 
 	gh_enter (argc, argv, main_prog);
 	exit (0);

examples/timings.c

@@ -79,8 +79,8 @@ main (int argc, char *argv [])
 	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 
 	printf ("%-12s (%-10s): %7s - %9s - %9s\n",
 		"Feature", "Flags", "Count", "utime", "stime");

include/glibtop/Makefile.am

@@ -1,4 +1,4 @@
-glibtopdir		= $(includedir)/libgtop-1.0/glibtop
+glibtopdir		= $(includedir)/libgtop-2.0/glibtop
 
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \

lib/Makefile.am

@@ -2,13 +2,13 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop.la
+lib_LTLIBRARIES			= libgtop-2.0.la
 
-libgtop_la_SOURCES		= init.c open.c close.c command.c read.c \
+libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c
 
-libgtop_la_LDFLAGS		= $(LT_VERSION_INFO)
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO)
 
 BUILT_SOURCES			= lib.c
 

libgtop-2.0.pc.in

@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+          
+Name: libgtop
+Description: Portable System Access Library
+Requires: glib-2.0
+Version: @VERSION@
+Libs: -L${libdir} @LIBGTOP_LIBS@
+Cflags: -I${includedir}/libgtop-2.0
+
+

po/.cvsignore

@@ -5,5 +5,9 @@ cat-id-tbl.c
 *.gmo
 *.mo
 libgtop.pot
+libgtop-2.0.pot
 Makefile.in.in
 messages
+stamp-cat-id
+po2tbl.sed
+missing

po/ChangeLog

@@ -1,34 +1,155 @@
-2003-05-13  Marcel Telka  <marcel@telka.sk>
+2002-06-10  Pablo Saratxaga  <pablo@mandrakesoft.com>
 
-	* sk.po: Updated Slovak translation.
+	* vi.po: Updated Vientamese file
 
-2003-05-13  Abel Cheung  <maddog@linux.org.hk>
+2002-06-02  Germ<72>n Poo Caama<6D>o <gpoo@ubiobio.cl>
 
-	* zh_TW.po: Updated traditional Chinese translation.
+	* es.po: Updated Spanish translation from
+	Juan Manuel Garc<72>a Molina <juanma_gm@wanadoo.es>
 
-2002-12-14  Christophe Merlet  <redfox@redfoxcenter.org>
+2002-06-02  Zbigniew Chyla  <cyba@gnome.pl>
 
-	* fr.po: Updated French translation.
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
 
+2002-06-02  Carlos Perell<6C> Mar<61>n <carlos@gnome-db.org>
+
+	* es.po: Fixed.
+
+2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
+
+	* LEEME.es: Updated.
+
+2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
+
+	* es.po, es_ES.po: Updated so the contry dependent string is
+	placed at es_ES.po for Spain and the US like number notation is
+	stored at es.po. It's much more easy mantain the es_ES.po file than
+	4 or 5 files from American countries.
+	* es_DO.pom, es_GT.po, es_HN.po, es_MX.po, es_PA.po, es_PE.po,
+	es_SV.po: Removed, we only need to update es.po and es_ES.po now.
+
+2002-05-19  Vlad Harchev  <hvv@hippo.ru>
+
+	* ru.po: updated russian translation from Dmitry G. Mastrukov
+	<dmitry@taurussoft.org>.
+
+2002-05-10  Valek Filippov  <frob@df.ru>
+
+	* ru.po: Updated russian translation from Dmitry Mastrukov.
+
+2002-05-08  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2002-05-08  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Added Vietnamese file
+
+2002-05-06  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * pt.po: Updated Portuguese translation and converted to UTF-8.
+
+2002-05-05  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Updated Swedish translation.
+
+2002-04-25  Changwoo Ryu  <cwryu@debian.org>
+
+	* ko.po: Updated Korean translation.
+
+2002-04-24  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation by Marcel Telka <marcel@telka.sk>.
+
+2002-04-23  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokm<6B>l) translation.
+	
+2002-04-19  Ole Laursen  <olau@hardworking.dk>
+
+	* da.po: Updated Danish translation.
+
+2002-04-19  Pauli Virtanen  <pauli.virtanen@hut.fi>
+
+	* fi.po: Updated Finnish translation.
+
+2002-04-09  Valek Filippov  <frob@df.ru>
+
+	* ru.po: Updated russian translation from Dmitry Mastrukov.
+
+2002-04-02  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * pt.po: Updated Portuguese translation.
+
+2002-03-31  Abel Cheung  <maddog@linux.org.hk>
+
+	* .cvsignore: Added file.
+	* POTFILES.in: Added missing popt files.
+
+2002-03-25  Duarte Loreto <happyguy_pt@hotmail.com>
+
+        * pt.po: Updated Portuguese translation. 
+
+2002-03-23  Hasbullah Bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Updated Malay Translation.
+
+2002-03-15  Valek Filippov  <frob@df.ru>
+
+	* ru.po: Updated russian translation.
+
+2002-03-06  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokm<6B>l) translation.
+	
+2002-03-06  Germ<72>n Poo-Caama<6D>o <gpoo@ubiobio.cl>
+
+	* es.po: Fixed spanish translation encoding.
+
+2002-03-06  Germ<72>n Poo-Caama<6D>o <gpoo@ubiobio.cl>
+
+	* es.po: Update spanish translation.
+
+2002-03-05  Matthias Warkus  <mawarkus@gnome.org>
+
+	* de.po: Fixed German translation.
+
+2002-03-01  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2002-02-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokm<6B>l) translation.
+	
 2002-02-09  Abel Cheung  <maddog@linux.org.hk>
 
 	* zh_TW.po: Updated traditional Chinese translation.
 
 2002-02-05  Abel Cheung  <maddog@linux.org.hk>
 
-	* zh_CN.GB2312.po -> zh_CN.po
+	* zh_CN.GB2312.po -> zh_CN.po: Convert to UTF-8 encoding.
 
-2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
+2002-01-27  Christian Rose  <menthos@menthos.com>
+
+	* README.tools, update.pl, update.sh: Removed, they are
+	obsoleted by intltool.
+	* sv.po: Updated and converted to UTF-8.
+
+2002-01-25 Roy-Magne Mo <rmo@sunnmore.net>
+
+	* nn.po: Updated Norwegian (nynorsk) translation.
+
+2002-01-14 Hasbullah Bin Pit <sebol@ikhlas.com>
 
 	* ms.po: Added Malay Translation.
 
-2001-12-07  Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-11-26  Abel Cheung  <maddog@linux.org.hk>
 
-	* az.po: Updated Azeri file
-
-2001-11-27  Roy-Magne Mo  <rmo@sunnmore.net>
-
-	* nn.po: Updated Norwegian (nynorsk) translation.
+	* stamp-cat-id: Removed, and add it to .cvsignore.
 
 2001-10-30  Zbigniew Chyla  <cyba@gnome.pl>
 
@@ -100,7 +221,7 @@
 	* fi.po: Reverted Jarkko Ranta's change; please do
 	not commit any compressed files in future.
 
-2001-02-10  Christophe Merlet  <christophe@merlet.net>
+2001-02-10  Christophe Merlet  <redfox@eikonex.org>
 
 	* fr.po: Updated French translation.
 
@@ -116,7 +237,7 @@
 
 	* ru.po: Updated russian translation.
 
-2001-02-05  Christophe Merlet  <christophe@merlet.net>
+2001-02-05  Christophe Merlet  <redfox@eikonex.org>
 
 	* fr.po: Updated French translation.
 

po/LEEME.es

@@ -1,17 +1,17 @@
-[ This file explains why there are various incomplete es_??.po in adition
+[ This file explains why there is a incomplete es_ES.po in adition
   to the es.po; that is on purpose ]
 
-Los diferentes archivos para las locales es_DO, es_GT, es_HN, es_MX, es_PA,
-es_PE y es_SV; solo existen porque en esos paises se usa una representaci<EFBFBD>n
-de los n<EFBFBD>meros diferente de la que se usa en los dem<EFBFBD>s paises de habla
-castellan (usan el sistema anglosaj<EFBFBD>n, esdecir 1,000 en vez de 1.000 para 
-'mil').
+El archivo para el locale es_ES solo existe porque en este paises se usa
+una representaci<EFBFBD>n de los n<EFBFBD>meros diferente de la que se usa en los dem<EFBFBD>s
+paises de habla espa<EFBFBD>ola, en el continente americano usan el sistema
+anglosaj<EFBFBD>n, esdecir 1,000 en vez de 1.000 para 'mil' y como son m<EFBFBD>s los paises
+que usan el sistema anglosaj<EFBFBD>n se ha dejado esa representaci<EFBFBD>n en el es.po.
 
 Por ello solo es necesario traducir aquellas ocurrencias donde aparezcan
 n<EFBFBD>meros; no hace falta perder el tiempo traduciendo en doble lo dem<EFBFBD>s;
 el sistema de internacionalizaci<EFBFBD>n de GNU gettext es lo suficientemente
 inteligente como para buscar las traducciones en la locale 'es' cuando no
-las encuentra en una 'es_XX' m<EFBFBD>s espec<EFBFBD>fica.
+las encuentra en una 'es_ES' m<EFBFBD>s espec<EFBFBD>fica.
 
 Tambi<EFBFBD>n podriase crear un es_ES para traducir aquellos terminos que difieren
 en Espa<EFBFBD>a y Am<EFBFBD>rica (ej: computadora/ordenador, archivo/fichero, <EFBFBD>cono/icono),
@@ -23,4 +23,7 @@ dem
 Pablo Saratxaga
 <srtxg@chanae.alphanet.ch>
 
+Actualizado por
+Carlos Perell<EFBFBD> Mar<EFBFBD>n
+<carlos@gnome-db.org>
 

po/POTFILES.in

@@ -22,8 +22,8 @@ include/glibtop/procsignal.h
 include/glibtop/procstate.h
 include/glibtop/proctime.h
 include/glibtop/procuid.h
-include/glibtop/read.h
 include/glibtop/read_data.h
+include/glibtop/read.h
 include/glibtop/sem_limits.h
 include/glibtop/shm_limits.h
 include/glibtop/signal.h
@@ -51,8 +51,8 @@ src/daemon/main.c
 src/daemon/server.c
 src/daemon/slave.c
 src/daemon/version.c
-src/inodedb/file_by_inode.c
-src/inodedb/mkinodedb.c
+src/inodedb/file_by_inode2.c
+src/inodedb/mkinodedb2.c
 support/easy-vsnprintf.c
 support/error.c
 support/error.h

po/README.tools

@@ -1,58 +0,0 @@
-The po/ directory includes two perlscripts, which is done to help 
-making the translations fully uptodate.
-
-The first script is called update.pl and is supposed to be run like this:
-
-	./update.pl [OPTIONS] ...LANGCODE
-
-This will updates the pot file (the po template, generated from the source code) 
-and merge them with the translations po files.
-
-For instance to do this for Danish, type the following
-
-	./update.pl da
-
-
-The update.pl script also supports other options, they are:
-
-  -V, --version                shows the version
-  -H, --help                   shows this help page
-  -P, --pot                    only generates the potfile
-  -M, --maintain               search for missing files in POTFILES.in
-
-Especially the --maintain option is very handy for package maintainer, to check
-if you included all the files that have marked strings in the POTFILES.in, so
-they will be in the generated po template, the socalled pot file.
-
-There is though one thing to take notice of with this option, please check the 
-configure.in file to make sure that the files you add to POTFILES.in are being
-build, otherwise this can leed to "make dist" throuble.
-
-
-The other utility is the desk.pl script, which will check the cvs module for
-missing translation in files like *.desktop, *.directory, *.soundlist and so on.
-
-Run the script like this:
-
-	./desk.pl [OPTIONS] ...LANGCODE ENTRY
-
-An example use could be.
-
-	./desk.pl da
-
-which will check all the files for missing Name[da] entries, or 
-
-	./desk.pl no Comment
-
-which will check all the files for missing Comment[no] entries. "Comment" can
-here be replaced with whatever you like
-
-All scripts support the --help option for further help, though it's not very
-extensive for the moment.
-
-Kenneth Christiansen
-
-kenneth@gnu.org  
-kenneth@gnome.org
-
-Both scripts are copyright 2000 The Free Software Foundation and me.

po/da.po

@@ -1,23 +1,24 @@
-# Danish translation for libgtop
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Kenneth Christiansen <kenneth@ripen.dk>, 1998,1999.
-# Keld Simonsen <keld@dkuug.dk> 2000.
+# Danish translation of libgtop.
+# Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+# Kenneth Christiansen <kenneth@ripen.dk>, 1998, 1999.
+# Keld Simonsen <keld@dkuug.dk>, 2000.
+# Ole Laursen <olau@hardworking.dk>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 0.99.3\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
-"PO-Revision-Date: 2000-05-18 14:13+02:00\n"
-"Last-Translator: Kenneth Christiansen <kenneth@ripen.dk>\n"
-"Language-Team: Dansk/Danish <da@li.org>\n"
+"Project-Id-Version: libgtop\n"
+"POT-Creation-Date: 2002-04-19 20:58+0200\n"
+"PO-Revision-Date: 2002-04-19 20:57+0200\n"
+"Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
+"Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr "Tik (%ld per sekund):"
+msgstr "Tik (%ld pr. sekund):"
 
 #: examples/smp.c:71
 msgid "Total"
@@ -31,7 +32,7 @@ msgstr "Bruger"
 # sysdeps/names/procuid.c:51
 #: examples/smp.c:71 sysdeps/names/procuid.c:58
 msgid "Nice"
-msgstr "God"
+msgstr "Venlig"
 
 #: examples/smp.c:71
 msgid "Sys"
@@ -72,7 +73,7 @@ msgstr "Bruger (%)"
 # sysdeps/names/procuid.c:51
 #: examples/smp.c:95
 msgid "Nice (%)"
-msgstr "God (%)"
+msgstr "Venlig (%)"
 
 #: examples/smp.c:95
 msgid "Sys (%)"
@@ -104,18 +105,18 @@ msgstr "Spin:"
 #: lib/read.c:75
 #, c-format
 msgid "read %d bytes"
-msgstr "l<EFBFBD>s %d byte"
+msgstr "læs %d byte"
 
 # lib/read_data.c:49
 #: lib/read_data.c:49
 msgid "read data size"
-msgstr "l<EFBFBD>s st<EFBFBD>rrelse p<EFBFBD> data"
+msgstr "læs størrelse på data"
 
 # lib/read_data.c:66
 #: lib/read_data.c:66
 #, c-format
 msgid "read data %d bytes"
-msgstr "l<EFBFBD>s data %d byte"
+msgstr "læs data %d byte"
 
 # lib/write.c:48
 #: lib/write.c:48
@@ -126,7 +127,7 @@ msgstr "skriv %d byte"
 # src/daemon/gnuserv.c:446
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "Sl<EFBFBD> fejlfinding til"
+msgstr "Slå fejlfinding til"
 
 # src/daemon/gnuserv.c:446
 #: src/daemon/gnuserv.c:448
@@ -136,7 +137,7 @@ msgstr "DEBUG"
 # src/daemon/gnuserv.c:448
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr "Sl<EFBFBD> meddelsom udskrift til"
+msgstr "Slå meddelsom udskrift til"
 
 # src/daemon/gnuserv.c:448
 #: src/daemon/gnuserv.c:450
@@ -171,7 +172,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Fejl ved flag %s: %s.\n"
-"K<EFBFBD>r '%s --help' for at f<EFBFBD> liste over alle tilg<EFBFBD>ngelige tilvalgsflag.\n"
+"Kør '%s --help' for at få liste over alle tilgængelige tilvalgsflag.\n"
 
 # support/error.c:109
 #: support/error.c:109
@@ -182,71 +183,79 @@ msgstr "Ukendt systemfejl"
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flaget `%s' er flertydigt\n"
+msgstr "%s: tilvalget '%s' er flertydigt\n"
 
 # support/getopt.c:693
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flaget `--%s' tillader ikke argumenter\n"
+msgstr "%s: tilvalget '--%s' tillader ikke parametre\n"
 
 # support/getopt.c:698
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flaget `%c%s' tillader ikke argumenter\n"
+msgstr "%s: tilvalget '%c%s' tillader ikke parametre\n"
 
 # support/getopt.c:715 support/getopt.c:888
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flaget `%s' kr<EFBFBD>ver et argument\n"
+msgstr "%s: tilvalget '%s' kræver en parameter\n"
 
 # support/getopt.c:744
 #. --option
 #: support/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukendt flag `--%s'\n"
+msgstr "%s: ukendt tilvalg '--%s'\n"
 
 # support/getopt.c:748
 #. +option or -option
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukendt flag `%c%s'\n"
+msgstr "%s: ukendt tilvalg '%c%s'\n"
 
 # support/getopt.c:774
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig flag -- %c\n"
+msgstr "%s: ugyldigt tilvalg - %c\n"
 
 # support/getopt.c:777
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig flag -- %c\n"
+msgstr "%s: ugyldigt tilvalg - %c\n"
 
 # support/getopt.c:807 support/getopt.c:937
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flaget kr<EFBFBD>ver et argument -- %c\n"
+msgstr "%s: tilvalget kræver en parameter - %c\n"
 
 # support/getopt.c:854
 #: support/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flaget `-W %s' er flertydigt\n"
+msgstr "%s: tilvalget '-W %s' er flertydigt\n"
 
 # support/getopt.c:872
 #: support/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flaget `-W %s' tillader ikke argumenter\n"
+msgstr "%s: tilvalget '-W %s' tillader ikke parametre\n"
+
+#: support/popthelp.c:35
+msgid "Show this help message"
+msgstr "Vis denne hjælpebesked"
+
+#: support/popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Vis en kort brugsvejledning"
 
 # sysdeps/names/cpu.c:45
 #: sysdeps/names/cpu.c:43
@@ -261,7 +270,7 @@ msgstr "Processortid i brugertilstand"
 # sysdeps/names/cpu.c:47
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "Processortid i brugertilstand (god)"
+msgstr "Processortid i brugertilstand (venlig)"
 
 # sysdeps/names/cpu.c:48
 #: sysdeps/names/cpu.c:46
@@ -281,27 +290,27 @@ msgstr "Tikfrekvens"
 # sysdeps/names/cpu.c:51
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr "SMP total processortid"
+msgstr "Total SMP-processortid"
 
 # sysdeps/names/cpu.c:52
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "SMP processortid i brugertilstand"
+msgstr "SMP-processortid i brugertilstand"
 
 # sysdeps/names/cpu.c:53
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "SMP processortid i brugertilstand (god)"
+msgstr "SMP-processortid i brugertilstand (venlig)"
 
 # sysdeps/names/cpu.c:54
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "SMP Processortid i systemtilstand"
+msgstr "SMP-processortid i systemtilstand"
 
 # sysdeps/names/cpu.c:55
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr "SMP processortid i passiv tilstand"
+msgstr "SMP-processortid i passiv tilstand"
 
 # sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
@@ -316,7 +325,7 @@ msgstr "Antal klokketik systemet har tilbragt i brugertilstand"
 # sysdeps/names/cpu.c:63 sysdeps/names/cpu.c:69
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
-msgstr "Antal klokketik systemet har tilbragt i brugertilstand (god)"
+msgstr "Antal klokketik systemet har tilbragt i brugertilstand (venlig)"
 
 # sysdeps/names/cpu.c:64 sysdeps/names/cpu.c:70
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
@@ -326,7 +335,7 @@ msgstr "Antal klokketik systemet har tilbragt i systemtilstand"
 # sysdeps/names/cpu.c:65 sysdeps/names/cpu.c:71
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr "Antal klokketik systemet har tilbragt p<> passive opgaver"
+msgstr "Antal klokketik systemet har tilbragt passivt"
 
 # sysdeps/names/cpu.c:66
 #: sysdeps/names/cpu.c:63
@@ -346,7 +355,7 @@ msgstr "Ledige blokke"
 # sysdeps/names/fsusage.c:43
 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr "Tilg<EFBFBD>ngelige blokke"
+msgstr "Tilgængelige blokke"
 
 # sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
@@ -361,12 +370,12 @@ msgstr "Ledige filnoder"
 # sysdeps/names/fsusage.c:51
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Ledige blokke tilg<EFBFBD>ngelig for superbruger"
+msgstr "Ledige blokke tilgængelig for superbruger"
 
 # sysdeps/names/fsusage.c:52
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "Ledige blokke tilg<EFBFBD>ngelige til ikke-superbrugere"
+msgstr "Ledige blokke tilgængelige til ikke-superbrugere"
 
 # sysdeps/names/loadavg.c:41
 #: sysdeps/names/loadavg.c:39
@@ -376,12 +385,12 @@ msgstr "Middelbelastning"
 # sysdeps/names/loadavg.c:42
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr "K<EFBFBD>rende opgaver"
+msgstr "Kørende processer"
 
 # sysdeps/names/loadavg.c:43
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "Antal opgaver"
+msgstr "Antal processer"
 
 # sysdeps/names/loadavg.c:44 sysdeps/names/loadavg.c:52
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
@@ -391,17 +400,17 @@ msgstr "Sidste PID"
 # sysdeps/names/loadavg.c:49
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "Antal samtidig k<EFBFBD>rende job med snit over 1, 5 og 15 minutter"
+msgstr "Antal samtidig kørende processer med snit over 1, 5 og 15 minutter"
 
 # sysdeps/names/loadavg.c:50
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "Antal opgaver som k<EFBFBD>rer nu"
+msgstr "Antal processer som kører nu"
 
 # sysdeps/names/loadavg.c:51
 #: sysdeps/names/loadavg.c:49
 msgid "Total number of tasks"
-msgstr "Totalt antal opgaver"
+msgstr "Totalt antal processer"
 
 # sysdeps/names/mem.c:43
 #: sysdeps/names/mem.c:41
@@ -436,7 +445,7 @@ msgstr "Cachet"
 # sysdeps/names/mem.c:50
 #: sysdeps/names/mem.c:48
 msgid "Locked"
-msgstr "L<EFBFBD>st"
+msgstr "Låst"
 
 # sysdeps/names/mem.c:55
 #: sysdeps/names/mem.c:53
@@ -461,12 +470,12 @@ msgstr "Delt hukommelse i kb"
 # sysdeps/names/mem.c:59
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> buffere i kb"
+msgstr "Størrelse på buffere i kb"
 
 # sysdeps/names/mem.c:60
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> mellemlagret hukommelse i kb"
+msgstr "Størrelse på mellemlagret hukommelse i kb"
 
 # sysdeps/names/mem.c:61
 #: sysdeps/names/mem.c:59
@@ -476,7 +485,7 @@ msgstr "Hukommelse brugt af brugerprocesser i kb"
 # sysdeps/names/mem.c:62
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Hukommelse i l<EFBFBD>ste sider i kb"
+msgstr "Hukommelse i låste sider i kb"
 
 # sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 # sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
@@ -494,7 +503,7 @@ msgstr "Antal elementer i listen"
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
 #: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46
 msgid "Total size of list"
-msgstr "Total st<EFBFBD>rrelse p<EFBFBD> listen"
+msgstr "Total størrelse af listen"
 
 # sysdeps/names/mountlist.c:42 sysdeps/names/mountlist.c:49
 # sysdeps/names/proclist.c:42 sysdeps/names/proclist.c:49
@@ -503,12 +512,12 @@ msgstr "Total st
 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
 #: sysdeps/names/procmap.c:40 sysdeps/names/procmap.c:47
 msgid "Size of a single list element"
-msgstr "St<EFBFBD>rrelsen p<EFBFBD> et enkelt element i listen"
+msgstr "Størrelsen på et enkelt element i listen"
 
 # sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr "St<EFBFBD>rrelse i kilobyte p<EFBFBD> meddelelseslageret"
+msgstr "Størrelse i kilobyte på meddelelseslageret"
 
 # sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
@@ -518,22 +527,22 @@ msgstr "Antal elementer i meddelelseskort"
 # sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr "Maks st<EFBFBD>rrelse af meddelelse"
+msgstr "Maks størrelse af meddelelse"
 
 # sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Standard st<EFBFBD>rrelse p<EFBFBD> k<EFBFBD>en"
+msgstr "Standardstørrelse af køen"
 
 # sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr "Maks antal k<EFBFBD>er p<EFBFBD> systemet"
+msgstr "Maks. antal køer på systemet"
 
 # sysdeps/names/msg_limits.c:47 sysdeps/names/msg_limits.c:58
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> meddelelsessegment"
+msgstr "Størrelse på meddelelsessegment"
 
 # sysdeps/names/msg_limits.c:48 sysdeps/names/msg_limits.c:59
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
@@ -542,7 +551,7 @@ msgstr "Antal systemmeddelelseshoveder"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
-msgstr "Gr<EFBFBD>nseflade-flag"
+msgstr "Grænseflade-flag"
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
@@ -576,7 +585,7 @@ msgstr "Byte ind"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes Out"
-msgstr "byte ud"
+msgstr "Byte ud"
 
 #: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
 msgid "Bytes Total"
@@ -600,7 +609,7 @@ msgstr "Kollisioner"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr "Maks overf<EFBFBD>rselsenhed"
+msgstr "Maks. overførselsenhed"
 
 # sysdeps/names/procstate.c:45
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
@@ -609,34 +618,34 @@ msgstr "PPP-tilstand"
 
 #: sysdeps/names/ppp.c:39
 msgid "Input bytes"
-msgstr "Inddata byte"
+msgstr "Inddata-byte"
 
 #: sysdeps/names/ppp.c:40
 msgid "Output bytes"
-msgstr "Uddate byte"
+msgstr "Uddata-byte"
 
 # sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 # sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
 # sysdeps/names/procmap.c:40 sysdeps/names/procmap.c:47
 #: sysdeps/names/ppp.c:46
 msgid "Number of input bytes"
-msgstr "Antal af inddata byte"
+msgstr "Antal af inddata-byte"
 
 # sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 # sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
 # sysdeps/names/procmap.c:40 sysdeps/names/procmap.c:47
 #: sysdeps/names/ppp.c:47
 msgid "Number of output bytes"
-msgstr "Antal af uddata byte"
+msgstr "Antal af uddata-byte"
 
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr "St<EFBFBD>rrelse"
+msgstr "Størrelse"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
-msgstr "L<EFBFBD>ngde i byte af den returnerede streng."
+msgstr "Længde i byte af den returnerede streng."
 
 # sysdeps/names/prockernel.c:44
 #: sysdeps/names/prockernel.c:42
@@ -699,10 +708,10 @@ msgstr ""
 "Processens kerneflag.\n"
 "\n"
 "Under Linux har alle flag matematik bitten sat, fordi crt0.s tjekker efter "
-"matematikemulering, s<EFBFBD> dette er ikke inkluderet i udskriften.\n"
+"matematikemulering, så dette er ikke inkluderet i udskriften.\n"
 "\n"
 "Dette er nok en fejl, siden ikke alle processer er et kompileret C program.\n"
-"Matematikbitten b<EFBFBD>r v<EFBFBD>re decimal 4, og den tracede bit er decimal 10."
+"Matematikbitten bør være decimal 4, og den tracede bit er decimal 10."
 
 # sysdeps/names/prockernel.c:61
 #. Min_Flt
@@ -711,8 +720,8 @@ msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
 msgstr ""
-"Antal mindre fejl processen har lavet, dem som ikke har gjort det n<EFBFBD>dvendig "
-"at l<EFBFBD>se en hukommelsesside ind fra disk."
+"Antal mindre fejl processen har lavet, dem som ikke har gjort det nødvendig "
+"at læse en hukommelsesside ind fra disk."
 
 # sysdeps/names/prockernel.c:64
 #. Maj_Flt
@@ -721,20 +730,20 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"Antal st<EFBFBD>rre fejl processen har lavet, dem som har gjort det n<EFBFBD>dvendig at "
-"l<EFBFBD>se en hukommelsesside ind fra disk."
+"Antal større fejl processen har lavet, dem som har gjort det nødvendig at "
+"læse en hukommelsesside ind fra disk."
 
 # sysdeps/names/prockernel.c:67
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:65
 msgid "The number of minor faults that the process and its children have made."
-msgstr "Antal mindre fejl processen og dens b<EFBFBD>rn har lavet."
+msgstr "Antal mindre fejl processen og dens børn har lavet."
 
 # sysdeps/names/prockernel.c:70
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:68
 msgid "The number of major faults that the process and its children have made."
-msgstr "Antal st<EFBFBD>rre fejl processen og dens b<EFBFBD>rn har lavet."
+msgstr "Antal større fejl processen og dens børn har lavet."
 
 # sysdeps/names/prockernel.c:73
 #. KStk_ESP
@@ -743,14 +752,14 @@ msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
 msgstr ""
-"Den nuv<EFBFBD>rende v<EFBFBD>rdi af esp (32-bit stakpeger), som fundet i kernens stakside "
+"Den nuværende værdi af esp (32-bit stakpeger), som fundet i kernens stakside "
 "for processen."
 
 # sysdeps/names/prockernel.c:76
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "Den nuv<EFBFBD>rende EIP (32-bit instruktionspeger)."
+msgstr "Den nuværende EIP (32-bit instruktionspeger)."
 
 # sysdeps/names/prockernel.c:78
 #. NWChan
@@ -762,20 +771,20 @@ msgid ""
 "see the WCHAN field in action)"
 msgstr ""
 "Dette er \"kanalen\" i hvilken processen venter. Dette er adressen til "
-"systemkaldet, og kan sl<EFBFBD>s op i en navneliste hvis du beh<EFBFBD>ver et tekstnavn. "
-"(Hvis du har en opdateret /etc/psdatabase, s<EFBFBD> pr<EFBFBD>v ps -l for at se WCHAN "
+"systemkaldet, og kan slås op i en navneliste hvis du behøver et tekstnavn. "
+"(Hvis du har en opdateret /etc/psdatabase, så prøv ps -l for at se WCHAN "
 "feltet i aktion)"
 
 # sysdeps/names/prockernel.c:83
 #. WChan
 #: sysdeps/names/prockernel.c:81
 msgid "This is the textual name of the `nwchan' field."
-msgstr "Dette er tekstnavnet p<EFBFBD> `nwchan' feltet."
+msgstr "Dette er tekstnavnet på `nwchan' feltet."
 
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
-msgstr "Virtuel"
+msgstr "Virtuelt"
 
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:47
@@ -785,22 +794,22 @@ msgstr "Resident"
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:47
 msgid "Share"
-msgstr "Del"
+msgstr "Delt"
 
 # sysdeps/names/procmem.c:50
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
-msgstr "St<EFBFBD>rrelse af resident s<EFBFBD>t"
+msgstr "Størrelse af resident sæt"
 
 # sysdeps/names/procmem.c:50
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr "St<EFBFBD>rrelsesgr<EFBFBD>nse af resident s<EFBFBD>t"
+msgstr "Størrelsesgrænse af resident sæt"
 
 # sysdeps/names/procmem.c:55
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
-msgstr "Total antal hukommelsessider"
+msgstr "Totalt antal hukommelsessider"
 
 # sysdeps/names/procmem.c:56
 #: sysdeps/names/procmem.c:54
@@ -810,7 +819,7 @@ msgstr "Antal sider virtuel hukommelse"
 # sysdeps/names/procmem.c:57
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr "Antal residente s<EFBFBD>t (ikke-swappede) sider"
+msgstr "Antal residente sæt (ikke-swappede) sider"
 
 # sysdeps/names/procmem.c:58
 #: sysdeps/names/procmem.c:56
@@ -826,15 +835,15 @@ msgid ""
 "which are swapped out."
 msgstr ""
 "Antal sider processen har i fysisk hukommelse, minus 3 for administrative "
-"opgaver. Dette er kun de sider som t<EFBFBD>ller mht. tekst, data eller stak plads. "
-"Dette inkluderer ikke sider som ikke er indl<EFBFBD>st ved behov, eller som er "
+"opgaver. Dette er kun de sider som tæller mht. tekst, data eller stak plads. "
+"Dette inkluderer ikke sider som ikke er indlæst ved behov, eller som er "
 "swappet ud."
 
 # sysdeps/names/procmem.c:64
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "Nuv<EFBFBD>rende gr<EFBFBD>nse i byte p<EFBFBD> processens rss (som regel 2,147,483,647)."
+msgstr "Nuværende grænse i byte på processens rss (som regel 2,147,483,647)."
 
 # sysdeps/names/procsegment.c:50
 #: sysdeps/names/procsegment.c:42
@@ -859,7 +868,7 @@ msgstr "Stack_RSS"
 # sysdeps/names/procsegment.c:51
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
-msgstr "Beskidt st<EFBFBD>rrelse"
+msgstr "Beskidt størrelse"
 
 # sysdeps/names/procsegment.c:51
 #: sysdeps/names/procsegment.c:43
@@ -879,42 +888,42 @@ msgstr "Start_Stak"
 # sysdeps/names/procsegment.c:59
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> tekst resident s<EFBFBD>t"
+msgstr "Størrelse på tekst-resident sæt"
 
 # sysdeps/names/procsegment.c:60
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident s<EFBFBD>t for delt bibliotek"
+msgstr "Størrelse på resident sæt for delt bibliotek"
 
 # sysdeps/names/procsegment.c:61
 #: sysdeps/names/procsegment.c:50
 msgid "Data resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident s<EFBFBD>t for data"
+msgstr "Størrelse på resident sæt for data"
 
 # sysdeps/names/procsegment.c:62
 #: sysdeps/names/procsegment.c:51
 msgid "Stack resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident s<EFBFBD>t for stak"
+msgstr "Størrelse på resident sæt for stak"
 
 # sysdeps/names/procsegment.c:63
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr "Total st<EFBFBD>rrelse p<EFBFBD> beskidte sider"
+msgstr "Total størrelse på beskidte sider"
 
 # sysdeps/names/procsegment.c:64
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
-msgstr "Adresse p<EFBFBD> begyndelse af kodesegment"
+msgstr "Adresse på begyndelse af kodesegment"
 
 # sysdeps/names/procsegment.c:65
 #: sysdeps/names/procsegment.c:54
 msgid "Address of end of code segment"
-msgstr "Adresse p<EFBFBD> slutning af kodesegmentet"
+msgstr "Adresse på slutning af kodesegmentet"
 
 # sysdeps/names/procsegment.c:70
 #: sysdeps/names/procsegment.c:55
 msgid "Address of the bottom of stack segment"
-msgstr "Adresse p<EFBFBD> bunden af staksegmentet"
+msgstr "Adresse på bunden af staksegmentet"
 
 # sysdeps/names/procsignal.c:42
 #: sysdeps/names/procsignal.c:40
@@ -979,7 +988,7 @@ msgstr "GID (GruppeID)"
 # sysdeps/names/procstate.c:52
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
-msgstr "Basenavnet p<EFBFBD> den k<EFBFBD>rbare fil i et kald til exec()"
+msgstr "Basenavnet på den kørbare fil i et kald til exec()"
 
 # sysdeps/names/procstate.c:53
 #: sysdeps/names/procstate.c:46
@@ -1029,12 +1038,12 @@ msgstr "CSTid"
 # sysdeps/names/proctime.c:47
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr "Tidsudl<EFBFBD>b"
+msgstr "Tidsudløb"
 
 # sysdeps/names/proctime.c:47
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "It_Reel_V<EFBFBD>rdi"
+msgstr "It_Reel_Værdi"
 
 # sysdeps/names/proctime.c:48
 #: sysdeps/names/proctime.c:46
@@ -1059,7 +1068,7 @@ msgstr "Processens starttid i sekunder siden epoken"
 # sysdeps/names/proctime.c:55
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Re<EFBFBD>l tid akkumuleret af processen (skal v<EFBFBD>re utid + stid)"
+msgstr "Reél tid akkumuleret af processen (skal være utid + stid)"
 
 # sysdeps/names/proctime.c:56
 #: sysdeps/names/proctime.c:53
@@ -1074,17 +1083,17 @@ msgstr "kernetilstand processortid akkumuleret af processen"
 # sysdeps/names/proctime.c:58
 #: sysdeps/names/proctime.c:55
 msgid "cumulative utime of process and reaped children"
-msgstr "kumulativ utid for processen og d<EFBFBD>de b<EFBFBD>rn"
+msgstr "kumulativ utid for processen og døde børn"
 
 # sysdeps/names/proctime.c:59
 #: sysdeps/names/proctime.c:56
 msgid "cumulative stime of process and reaped children"
-msgstr "kumulativ stime for processen og dens d<EFBFBD>de b<EFBFBD>rn"
+msgstr "kumulativ stime for processen og dens døde børn"
 
 # sysdeps/names/proctime.c:60
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "Tiden (i jiffi'er) for processens n<EFBFBD>ste tidsudl<EFBFBD>b"
+msgstr "Tiden (i jiffi'er) for processens næste tidsudløb"
 
 # sysdeps/names/proctime.c:61
 #: sysdeps/names/proctime.c:58
@@ -1092,7 +1101,7 @@ msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"Tiden (i jiffi'er) f<EFBFBD>r n<EFBFBD>ste SIGALARM bliver sendt til processen p<EFBFBD> grund af "
+"Tiden (i jiffi'er) før næste SIGALARM bliver sendt til processen på grund af "
 "en intervalklokke."
 
 # sysdeps/names/proctime.c:63
@@ -1193,7 +1202,7 @@ msgstr "ProcesID"
 # sysdeps/names/procuid.c:66
 #: sysdeps/names/procuid.c:68
 msgid "PID of parent process"
-msgstr "PID til for<EFBFBD>lderprocessen"
+msgstr "PID til forælderprocessen"
 
 # sysdeps/names/procuid.c:67
 #: sysdeps/names/procuid.c:69
@@ -1208,7 +1217,7 @@ msgstr "SessionsID"
 # sysdeps/names/procuid.c:69
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr "Fuldt enhedsnummer p<EFBFBD> kontrollerende terminal"
+msgstr "Komplet enhedsnummer på kontrollerende terminal"
 
 # sysdeps/names/procuid.c:70
 #: sysdeps/names/procuid.c:72
@@ -1218,17 +1227,17 @@ msgstr "Terminalprocessens gruppeID"
 # sysdeps/names/procuid.c:71
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr "Kerne planl<EFBFBD>gnings prioritet"
+msgstr "Kerneplanlægningsprioritet"
 
 # sysdeps/names/procuid.c:72
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Standard unix god-niveau for processen"
+msgstr "Standard Unix-venlighedsniveau for processen"
 
 # sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "Antal opf<EFBFBD>ringer i semafor-kortet"
+msgstr "Antal opføringer i semafor-kortet"
 
 # sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
@@ -1238,27 +1247,27 @@ msgstr "Maks antal tabeller"
 # sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "Maks antal semaforer p<EFBFBD> hele systemet"
+msgstr "Maks. antal semaforer på hele systemet"
 
 # sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr "Antal fortryd-strukturer p<EFBFBD> hele systemet"
+msgstr "Antal fortryd-strukturer på hele systemet"
 
 # sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
-msgstr "Maks semaforer per tabel"
+msgstr "Maks. semaforer per tabel"
 
 # sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr "Maks operationer per semop kald"
+msgstr "Maks. operationer per semop kald"
 
 # sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "Maks antal genopretningsfors<EFBFBD>g per proces"
+msgstr "Maks. antal genopretningsforsøg per proces"
 
 # sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
@@ -1268,37 +1277,37 @@ msgstr "sizeof struct sem_undo"
 # sysdeps/names/sem_limits.c:52 sysdeps/names/sem_limits.c:66
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
-msgstr "Maksv<EFBFBD>rdi for semafor"
+msgstr "Maks.værdi for semafor"
 
 # sysdeps/names/sem_limits.c:53 sysdeps/names/sem_limits.c:67
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "Juster maksv<EFBFBD>rdi ved udgang"
+msgstr "Justér maks.værdi ved udgang"
 
 # sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "Maks segmentst<EFBFBD>rrelse"
+msgstr "Maks. segmentstørrelse"
 
 # sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "Minimum segmentst<EFBFBD>rrelse"
+msgstr "Minimum segmentstørrelse"
 
 # sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
-msgstr "Maks antal segmenter"
+msgstr "Maks. antal segmenter"
 
 # sysdeps/names/shm_limits.c:44 sysdeps/names/shm_limits.c:53
 #: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max shared segments per process"
-msgstr "Maks delte segmenter per proces"
+msgstr "Maks. delte segmenter per proces"
 
 # sysdeps/names/shm_limits.c:45 sysdeps/names/shm_limits.c:54
 #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max total shared memory"
-msgstr "Maks delt hukommelse"
+msgstr "Maks. delt hukommelse"
 
 # sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
@@ -1368,22 +1377,22 @@ msgstr "Middelbelastning"
 # sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:86
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
-msgstr "Gr<EFBFBD>nser for delt hukommelse"
+msgstr "Grænser for delt hukommelse"
 
 # sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:87
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
-msgstr "Gr<EFBFBD>nser for meldingsk<EFBFBD>er"
+msgstr "Grænser for meldingskøer"
 
 # sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:88
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
-msgstr "Gr<EFBFBD>nser for semafor"
+msgstr "Grænser for semafor"
 
 # sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:89
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
-msgstr "Liste over k<EFBFBD>rende processer"
+msgstr "Liste over kørende processer"
 
 # sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:90
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
@@ -1443,7 +1452,7 @@ msgstr "Brug af filsystemer"
 # sysdeps/names/sysdeps.c:73 sysdeps/names/sysdeps.c:101
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
-msgstr "Netv<EFBFBD>rksbelastning"
+msgstr "Netværksbelastning"
 
 # sysdeps/names/sysdeps.c:74 sysdeps/names/sysdeps.c:102
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
@@ -1482,7 +1491,7 @@ msgstr "Tid i sekunder som systemet har brugt i passive opgaver siden opstart"
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr "H<EFBFBD>ng p<EFBFBD>"
+msgstr "Læg på"
 
 #: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
@@ -1498,7 +1507,7 @@ msgstr "Ugyldig instruktion"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "Spore f<EFBFBD>lde"
+msgstr "Spore fælde"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
@@ -1510,11 +1519,11 @@ msgstr "EMT fejl"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "Flydende-tals undtagelse"
+msgstr "Flydende tals-undtagelse"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr "Dr<EFBFBD>b"
+msgstr "Dræb"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
@@ -1523,7 +1532,7 @@ msgstr "Bus-fejl"
 # sysdeps/names/sysdeps.c:68 sysdeps/names/sysdeps.c:96
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Segment overtr<EFBFBD>delse"
+msgstr "Segmentovertrædelse"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
@@ -1531,7 +1540,7 @@ msgstr "Ugyldig argument til systemkald"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Brudt r<EFBFBD>r"
+msgstr "Brudt datakanal"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
@@ -1543,7 +1552,7 @@ msgstr "Terminering"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Vigtig tilstand p<EFBFBD> sokkel"
+msgstr "Vigtig tilstand på sokkel"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1555,15 +1564,15 @@ msgstr "Tastaturstop"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr "Forts<EFBFBD>t"
+msgstr "Fortsæt"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
-msgstr "Barnets status er <EFBFBD>ndret"
+msgstr "Barnets status er ændret"
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "L<EFBFBD>sing fra tty i baggrunden"
+msgstr "Læsing fra tty i baggrunden"
 
 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
@@ -1575,11 +1584,11 @@ msgstr "I/O nu muligt"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "Processor-gr<EFBFBD>nse overskredet"
+msgstr "Processor-grænse overskredet"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Gr<EFBFBD>nse for filst<EFBFBD>rrelse overskredet"
+msgstr "Grænse for filstørrelse overskredet"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
@@ -1591,11 +1600,11 @@ msgstr "Profilerer alarmklokken"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "<EFBFBD>ndring i vinduesst<EFBFBD>rrelse"
+msgstr "Ændring i vinduesstørrelse"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Informationsforesp<EFBFBD>rsel"
+msgstr "Informationsforespørsel"
 
 # sysdeps/names/procsignal.c:49
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57

po/de.po

@@ -7,12 +7,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.x\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"POT-Creation-Date: 2002-03-05 14:02+0100\n"
 "PO-Revision-Date: 2001-02-15 17:03+0100\n"
 "Last-Translator: Christian Meyer <cm@ggtt.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
@@ -30,7 +30,7 @@ msgstr "Benutzer"
 
 #: examples/smp.c:71 sysdeps/names/procuid.c:58
 msgid "Nice"
-msgstr "Priorit<EFBFBD>t"
+msgstr "Nice"
 
 #: examples/smp.c:71
 msgid "Sys"
@@ -68,7 +68,7 @@ msgstr "Benutzer (%)"
 
 #: examples/smp.c:95
 msgid "Nice (%)"
-msgstr "Priorit<EFBFBD>t (%)"
+msgstr "Nice (%)"
 
 #: examples/smp.c:95
 msgid "Sys (%)"
@@ -125,11 +125,11 @@ msgstr "DIAGNOSE"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr "Ausf<EFBFBD>hrliche Ausgabe einschalten"
+msgstr "Ausführliche Ausgabe einschalten"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
-msgstr "AUSF<EFBFBD>HRLICH"
+msgstr "AUSFÜHRLICH"
 
 #: src/daemon/gnuserv.c:452
 msgid "Don't fork into background"
@@ -154,7 +154,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Fehler bei Option %s: %s.\n"
-"F<EFBFBD>hren Sie `%s --help' aus, um eine volle Liste der verf<EFBFBD>gbaren Optionen zu "
+"Führen Sie `%s --help' aus, um eine volle Liste der verfügbaren Optionen zu "
 "sehen.\n"
 
 #: support/error.c:109
@@ -179,7 +179,7 @@ msgstr "%s: Option `%c%s' erlaubt kein Argument\n"
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option `%s' ben<EFBFBD>tigt ein Argument\n"
+msgstr "%s: Option `%s' benötigt ein Argument\n"
 
 #. --option
 #: support/getopt.c:744
@@ -197,18 +197,18 @@ msgstr "%s: unbekannte Option: `%c%s'\n"
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: unzul<EFBFBD>ssige Option -- %c\n"
+msgstr "%s: unzulässige Option -- %c\n"
 
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: ung<EFBFBD>ltige Option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option ben<EFBFBD>tigt ein Argument -- %c\n"
+msgstr "%s: Option benötigt ein Argument -- %c\n"
 
 #: support/getopt.c:854
 #, c-format
@@ -230,7 +230,7 @@ msgstr "CPU-Zeit in Benutzermodus"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "CPU-Zeit in Benutzermodus (Priorit<EFBFBD>t)"
+msgstr "CPU-Zeit in Benutzermodus (nice)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
@@ -254,7 +254,7 @@ msgstr "CPU-Zeit aller Prozessoren im Benutzermodus"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "CPU-Zeit aller Prozessoren im Benutzermodus (Priorit<EFBFBD>t)"
+msgstr "CPU-Zeit aller Prozessoren im Benutzermodus (nice)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
@@ -275,9 +275,7 @@ msgstr ""
 
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
-msgstr ""
-"Anzahl der `Clock'-Impulse, die das System im Benutzer-Modus mit erh<72>hter "
-"Priorit<69>t verbracht hat"
+msgstr "Anzahl der `Clock'-Impulse, die das System im Benutzer-Modus mit niedriger Priorität (nice) verbracht hat"
 
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in system mode"
@@ -294,15 +292,15 @@ msgstr "Impulsfrequenz (Vorgabe ist 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr "Bl<EFBFBD>cke insgesamt"
+msgstr "Blöcke insgesamt"
 
 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
-msgstr "Freie Bl<EFBFBD>cke"
+msgstr "Freie Blöcke"
 
 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr "F<EFBFBD>r Benutzer verf<EFBFBD>gbare Bl<EFBFBD>cke"
+msgstr "Für Benutzer verfügbare Blöcke"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
@@ -314,11 +312,11 @@ msgstr "Freie Knoten"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Freie Bl<EFBFBD>cke inklusive f<EFBFBD>r den Administrator reservierter Bl<EFBFBD>cke"
+msgstr "Freie Blöcke inklusive für den Administrator reservierter Blöcke"
 
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "F<EFBFBD>r Benutzer verf<EFBFBD>gbare Bl<EFBFBD>cke"
+msgstr "Für Benutzer verfügbare Blöcke"
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
@@ -338,7 +336,7 @@ msgstr "Letzte PID"
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "Anzahl gleichzeitig laufender Jobs im Mittel <EFBFBD>ber 1, 5 und 15 Minuten"
+msgstr "Anzahl gleichzeitig laufender Jobs im Mittel über 1, 5 und 15 Minuten"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
@@ -370,7 +368,7 @@ msgstr "Pufferspeicher"
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr "Tempor<EFBFBD>rer Zwischenspeicher"
+msgstr "Temporärer Zwischenspeicher"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
@@ -394,11 +392,11 @@ msgstr "Gemeinsam genutzter Speicher in kB"
 
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr "Gr<EFBFBD><EFBFBD>e der Dateipuffer in kB"
+msgstr "Größe der Dateipuffer in kB"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "Gr<EFBFBD><EFBFBD>e des tempor<EFBFBD>ren Zwischenspeichers in kB"
+msgstr "Größe des temporären Zwischenspeichers in kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
@@ -418,29 +416,29 @@ msgstr "Zahl der Listenelemente"
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
 #: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46
 msgid "Total size of list"
-msgstr "Gesamtgr<EFBFBD><EFBFBD>e der Liste"
+msgstr "Gesamtgröße der Liste"
 
 #: sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
 #: sysdeps/names/procmap.c:40 sysdeps/names/procmap.c:47
 msgid "Size of a single list element"
-msgstr "Gr<EFBFBD><EFBFBD>e eines einzigen Listenelements"
+msgstr "Größe eines einzigen Listenelements"
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr "Gr<EFBFBD><EFBFBD>e des Nachrichtenbereiches in Kilobyte"
+msgstr "Größe des Nachrichtenbereiches in Kilobyte"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
-msgstr "Anzahl der Eintr<EFBFBD>ge in der Nachrichtentabelle"
+msgstr "Anzahl der Einträge in der Nachrichtentabelle"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr "Maximale Gr<EFBFBD><EFBFBD>e einer Nachricht"
+msgstr "Maximale Größe einer Nachricht"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Maximale Gr<EFBFBD><EFBFBD>e der Warteschlange (Vorgabe)"
+msgstr "Maximale Größe der Warteschlange (Vorgabe)"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
@@ -448,11 +446,11 @@ msgstr "Maximale Anzahl der Warteschlangen systemweit"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
-msgstr "Gr<EFBFBD><EFBFBD>e des Nachrichtensegments"
+msgstr "Größe des Nachrichtensegments"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Number of system message headers"
-msgstr "Anzahl der Systemnachrichtenk<EFBFBD>pfe"
+msgstr "Anzahl der Systemnachrichtenköpfe"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
@@ -512,7 +510,7 @@ msgstr "Kollisionen"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr "Maximal <20>bertragene Einheiten"
+msgstr "Maximale Übertragungseinheit"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
@@ -536,11 +534,11 @@ msgstr "Zahl der ausgehenden Bytes"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr "Prozessgr<EFBFBD><EFBFBD>e"
+msgstr "Prozessgröße"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
-msgstr "L<EFBFBD>nge in Bytes des zur<EFBFBD>ckgegebenen Strings."
+msgstr "Länge in Bytes des zurückgegebenen Strings."
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
@@ -593,7 +591,7 @@ msgstr ""
 "Kernelflags des Prozesses.\n"
 "\n"
 "Auf Linux hat momentan jedes Flag ein gesetztes `math bit', da crt0.s\n"
-"auf mathematische Emulation pr<EFBFBD>ft, also wird dies in der Ausgabe nicht\n"
+"auf mathematische Emulation prüft, also wird dies in der Ausgabe nicht\n"
 "ausgegeben.\n"
 "\n"
 "Dies ist wahrscheinlich ein Fehler, da nicht jeder Prozess ein\n"
@@ -636,14 +634,12 @@ msgstr "Anzahl schwerwiegender Seitenfehler eines Prozesses und seiner Kinder."
 msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
-msgstr ""
-"Aktueller Wert des 32-Bit Stack-Zeigers des Kernels entnommen aus der "
-"Stack-Seite des Prozesses im Kernel."
+msgstr "Aktueller Wert des 32-Bit-Stack-Zeigers des Kernels entnommen aus der Stack-Seite des Prozesses im Kernel."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "Aktueller 32-Bit Befehlszeiger des Prozessors."
+msgstr "Aktueller 32-Bit-Befehlszeiger des Prozessors."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -661,27 +657,27 @@ msgstr ""
 #. WChan
 #: sysdeps/names/prockernel.c:81
 msgid "This is the textual name of the `nwchan' field."
-msgstr "Dies ist der Text-Name des `nwchan' Feldes"
+msgstr "Dies ist der Name des Feldes `nwchan' im Klartext"
 
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
-msgstr "Virtuelle Prozessgr<67><72>e"
+msgstr "Virtuell"
 
 #: sysdeps/names/procmem.c:47
 msgid "Resident"
-msgstr "Residente Prozessgr<67><72>e"
+msgstr "Resident"
 
 #: sysdeps/names/procmem.c:47
 msgid "Share"
-msgstr "Gr<EFBFBD><EFBFBD>e des gemeinsam genutzten Speichers"
+msgstr "Gemeinsam genutzt"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
-msgstr "Gr<EFBFBD><EFBFBD>e des permanent belegten Speichers"
+msgstr "Größe des permanent belegten Speichers"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr "Maximale Gr<EFBFBD><EFBFBD>e des permanent belegten Speichers"
+msgstr "Maximale Größe des permanent belegten Speichers"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
@@ -706,7 +702,7 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"Anzahl der Seiten, die der Prozess im Speicher h<EFBFBD>lt minus drei f<EFBFBD>r "
+"Anzahl der Seiten, die der Prozess im Speicher hält minus drei für "
 "administrative Zwecke, d.h. alle Seiten im Text, Daten und Stack-Bereich "
 "ohne solche die nur bei Bedarf geladen werden (und momentan nicht geladen "
 "sind) und ausgelagerte Seiten."
@@ -715,7 +711,7 @@ msgstr ""
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"Gegenw<EFBFBD>rtiges Limit in Bytes f<EFBFBD>r die RSS des Prozesses (normalerweise "
+"Gegenwärtiges Limit in Bytes für die RSS des Prozesses (normalerweise "
 "2.147.483.647)."
 
 #: sysdeps/names/procsegment.c:42
@@ -736,7 +732,7 @@ msgstr "Stack_RSS"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
-msgstr "`Dirty' Gr<EFBFBD><EFBFBD>e"
+msgstr "`Dirty'-Größe"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
@@ -752,31 +748,31 @@ msgstr "Start_Stack"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr "Gr<EFBFBD><EFBFBD>e des permanenten Textsegments"
+msgstr "Größe des permanenten Textsegments"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
-msgstr "Gr<EFBFBD><EFBFBD>e permanenter Bibliotheken"
+msgstr "Größe permanenter Bibliotheken"
 
 #: sysdeps/names/procsegment.c:50
 msgid "Data resident set size"
-msgstr "Gr<EFBFBD><EFBFBD>e des permanenten Datensegments"
+msgstr "Größe des permanenten Datensegments"
 
 #: sysdeps/names/procsegment.c:51
 msgid "Stack resident set size"
-msgstr "Gr<EFBFBD><EFBFBD>e des permanenten Stack-Segments"
+msgstr "Größe des permanenten Stack-Segments"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr "Gr<EFBFBD><EFBFBD>e der `dirty pages' insgesamt"
+msgstr "Größe der `dirty pages' insgesamt"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
-msgstr "Adresse, an der das Programmcode-Segment anf<EFBFBD>ngt"
+msgstr "Adresse, an der das Programmcode-Segment anfängt"
 
 #: sysdeps/names/procsegment.c:54
 msgid "Address of end of code segment"
-msgstr "Adresse, an der das Programmcode-Segment aufh<EFBFBD>rt"
+msgstr "Adresse, an der das Programmcode-Segment aufhört"
 
 #: sysdeps/names/procsegment.c:55
 msgid "Address of the bottom of stack segment"
@@ -836,7 +832,7 @@ msgstr "Dateiname des Programms im Aufruf von exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "Single-Char Code f<EFBFBD>r Prozessstatus (S=schl<EFBFBD>ft)"
+msgstr "Ein-Zeichen-Code für Prozessstatus (S=schläft)"
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
@@ -876,7 +872,7 @@ msgstr "TimeOut"
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "It_Real_Value"
+msgstr "It_Wahrer_Wert"
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -921,14 +917,14 @@ msgstr ""
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
 msgstr ""
-"Zeit (in 1/100stel Sekunden) bis der Prozess seinen n<EFBFBD>chsten Timeout empf<EFBFBD>ngt"
+"Zeit (in 1/100stel Sekunden) bis der Prozess seinen nächsten Timeout empfängt"
 
 #: sysdeps/names/proctime.c:58
 msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"Zeit (in 1/100stel Sekunden) bevor das n<EFBFBD>chste SIGALRM Signal aufgrund eines "
+"Zeit (in 1/100stel Sekunden) bevor das nächste SIGALRM Signal aufgrund eines "
 "Intervall-Timers an den Prozess geschickt wird."
 
 #: sysdeps/names/proctime.c:60
@@ -937,12 +933,11 @@ msgstr "Impulsfrequenz"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
-msgstr ""
-"Zeit aller Prozessoren, die der Prozess im Benutzer-Modus verbracht hat"
+msgstr "Zeit, die der Prozess im Benutzer-Modus verbracht hat, alle Prozessoren zusammengerechnet"
 
 #: sysdeps/names/proctime.c:62
 msgid "SMP kernel-mode CPU time accumulated by process"
-msgstr "Zeit aller Prozessoren, die der Prozess im Kernel-Modus verbracht hat"
+msgstr "Zeit, die der Prozess im Kernel-Modus verbracht hat, alle Prozessoren zusammengerechnet"
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
@@ -986,7 +981,7 @@ msgstr "TPGid"
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "Priorit<EFBFBD>t"
+msgstr "Priorität"
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
@@ -1022,7 +1017,7 @@ msgstr "Sitzungs-ID"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr "Volle Ger<EFBFBD>tenummer des kontrolierenden Terminals"
+msgstr "Volle Gerätenummer des kontrolierenden Terminals"
 
 #: sysdeps/names/procuid.c:72
 msgid "Terminal process group ID"
@@ -1030,15 +1025,15 @@ msgstr "Terminalprozessgruppen-ID"
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr "Kernelbehandlungspriorit<EFBFBD>t"
+msgstr "Kernelzuteilungspriorität"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Standard UNIX `nice' Wert des Prozesses"
+msgstr "UNIX-Standard-`nice'-Wert des Prozesses"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "Anzahl Eintr<EFBFBD>ge in der Zeichentr<EFBFBD>gertabelle"
+msgstr "Anzahl Einträge in der Semaphortabelle"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
@@ -1046,7 +1041,7 @@ msgstr "Maximale Anzahl der Felder"
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "Maximale Anzahl Zeichentr<EFBFBD>ger im System"
+msgstr "Maximale Anzahl Semaphore im System"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
@@ -1054,7 +1049,7 @@ msgstr "Anzahl `Undo-Strukturen' im System"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
-msgstr "Maximale Anzahl der Zeichentr<74>ger pro Feld"
+msgstr "Maximale Anzahl Semaphoren pro Feld"
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
@@ -1062,7 +1057,7 @@ msgstr "Maximale Anzahl Operationen pro `semop-Aufruf'"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "Maximale Anzahl `Undo-Eintr<EFBFBD>ge' pro Prozess"
+msgstr "Maximale Anzahl `Undo-Einträge' pro Prozess"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1070,19 +1065,19 @@ msgstr "sizeof struct sem_undo"
 
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
-msgstr "Zeichentr<EFBFBD>ger Maximalwert"
+msgstr "Semaphoren-Maximalwert"
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "Maximaler `Adjust-on-Exit-Wert'"
+msgstr "Maximaler `Adjust-on-Exit'-Wert"
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "Maximale Segmentgr<EFBFBD><EFBFBD>e"
+msgstr "Maximale Segmentgröße"
 
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "Minimale Segmentgr<EFBFBD><EFBFBD>e"
+msgstr "Minimale Segmentgröße"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
@@ -1154,15 +1149,15 @@ msgstr "Systemlast"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
-msgstr "Limits f<EFBFBD>r gemeinsam genutzten Speicher"
+msgstr "Limits für gemeinsam genutzten Speicher"
 
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
-msgstr "Limits f<EFBFBD>r Nachrichtenwarteschlangen"
+msgstr "Limits für Nachrichtenwarteschlangen"
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
-msgstr "Festgelegtes Zeichentr<EFBFBD>gerlimit"
+msgstr "Festgelegtes Semaphorlimit"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
@@ -1174,7 +1169,7 @@ msgstr "Prozess-Statusinformation"
 
 #: sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:87
 msgid "Process UID and TTY information"
-msgstr "Prozess Eigent<EFBFBD>mer- und Terminal-Information"
+msgstr "Eigentümer- und Terminal-Information zum Prozess"
 
 #: sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:88
 msgid "Process Memory information"
@@ -1226,7 +1221,7 @@ msgstr "Kommandozeilenparameter des Prozesses"
 
 #: sysdeps/names/sysdeps.c:95
 msgid "List of currently mounted filesystems"
-msgstr "Liste gegenw<EFBFBD>rtig gemounteter Dateisysteme"
+msgstr "Liste gegenwärtig gemounteter Dateisysteme"
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
@@ -1247,23 +1242,23 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr "Unterbrechung"
+msgstr "Auflegen"
 
 #: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
-msgstr "Interrupt"
+msgstr "Unterbrechung"
 
 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr "Beenden"
+msgstr "Verlassen"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "Unzul<EFBFBD>ssige Anweisung"
+msgstr "Unzulässige Anweisung"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "Trace trap"
+msgstr "Trace-Trap"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
@@ -1271,15 +1266,15 @@ msgstr "Abbrechen"
 
 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr "EMT Fehler"
+msgstr "EMT-Fehler"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "Flie<EFBFBD>komma-Ausnahme"
+msgstr "Gleitkomma-Ausnahme"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr "T<EFBFBD>ten"
+msgstr "Töten"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
@@ -1287,35 +1282,35 @@ msgstr "Busfehler"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Segmentverletzung"
+msgstr "Segmentschutzverletzung"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Ung<EFBFBD>ltiges Argument f<EFBFBD>r Systemaufruf"
+msgstr "Ungültiges Argument für Systemaufruf"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Unterbrochene Weiterleitung"
+msgstr "Gebrochene Pipe"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr "Alarmuhr"
+msgstr "Wecker"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
-msgstr "Terminierung"
+msgstr "Beenden"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Dringende Anweisung auf Socket"
+msgstr "Dringender Socketzustand"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr "Stoppen"
+msgstr "Stopp"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Keyboard-Stopp"
+msgstr "Tastatur-Stopp"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
@@ -1323,7 +1318,7 @@ msgstr "Fortfahren"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
-msgstr "Kind-Status hat sich ge<EFBFBD>ndert"
+msgstr "Kind-Status hat sich geändert"
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
@@ -1335,27 +1330,27 @@ msgstr "Hintergrundschreiben auf tty"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "E/A nun m<EFBFBD>glich"
+msgstr "E/A nun möglich"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "CPU-Limit <EFBFBD>berschritten"
+msgstr "CPU-Limit überschritten"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Limit der Dateigr<EFBFBD><EFBFBD>e <EFBFBD>berschritten"
+msgstr "Limit der Dateigröße überschritten"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
-msgstr "Virtuelle Alarmuhr"
+msgstr "Virtueller Wecker"
 
 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr "Genaue Alarmuhr"
+msgstr "Genauer Wecker"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "Ver<EFBFBD>nderung der Fenstergr<EFBFBD><EFBFBD>e"
+msgstr "Veränderung der Fenstergröße"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"

po/es_ES.po

@@ -1,16 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Spain diffs with es.po for libgtop
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Carlos Perelló Marín <carlos@gnome-db.org>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
-"PO-Revision-Date: 1998-12-13 04:38+0100\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
-"Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
+"Project-Id-Version: glibtop 1.90.2\n"
+"POT-Creation-Date: 2002-05-28 15:54+0200\n"
+"PO-Revision-Date: 2002-05-28 15:50+0200\n"
+"Last-Translator: Carlos Perelló Marín <carlos@gnome-db.org>\n"
+"Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
@@ -211,6 +211,14 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
+#: support/popthelp.c:35
+msgid "Show this help message"
+msgstr ""
+
+#: support/popthelp.c:36
+msgid "Display brief usage message"
+msgstr ""
+
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
 msgstr ""
@@ -673,11 +681,11 @@ msgid ""
 msgstr ""
 
 #
-# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
+# In México, Dominican Republic, Guatemala, Honduras, Panama, Peru
 # and El Salvador, Number formats are the same as in the US, so no
-# translation is required for them.
-# But the msgstr MUST be filled; otherwise it will default to es.po
-# which uses different, non US, format for numbers.
+# translation is required for them (the use es.po string).
+# Spain use "." chars instead of "," so the msgstr MUST be filled; otherwise
+# it will default to es.po which uses the US format for numbers.
 # On the other hand, strings that are the same here and in es.po can
 # be left out.
 #
@@ -685,8 +693,8 @@ msgstr ""
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"Limite actual en bytes de conjunto compartido (RSS) del proceso "
-"(habitualmente 2,147,483,647)."
+"Límite actual en bytes de conjunto compartido (RSS) del proceso "
+"(habitualmente 2.147.483.647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"

po/fi.po

@@ -1,35 +1,33 @@
-# libgtop translation.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# Original translation by unknown.
-# Pauli Virtanen <pauli.virtanen@saunalahti.fi>, 2000.
+# libgtop (libgtop-GNOME-2-0-port) Finnish translation.
+# Suomennos: http://gnome-fi.sourceforge.net/
 #
-# GNOME Finnish Translation Team: http://gnome-fi.sourceforge.net/
-#
-# Check the signal names!
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Original translator is unknown.
+# Pauli Virtanen <pauli.virtanen@hut.fi>, 2000-2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop-LIBGTOP_STABLE_1_0\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
-"PO-Revision-Date: 2001-01-05 21:33+02:00\n"
-"Last-Translator: Pauli Virtanen <pauli.virtanen@saunalahti.fi>\n"
+"Project-Id-Version: libgtop 1.90.1\n"
+"POT-Creation-Date: 2002-04-19 19:59+0300\n"
+"PO-Revision-Date: 2002-04-03 00:12+0300\n"
+"Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr "Tikityksi<EFBFBD> (%ld sekunnissa):"
+msgstr "Tikityksiä (%ld sekunnissa):"
 
 #: examples/smp.c:71
 msgid "Total"
-msgstr "Yhteens<EFBFBD>"
+msgstr "Yhteensä"
 
 #: examples/smp.c:71 sysdeps/names/mem.c:47
 msgid "User"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>"
+msgstr "Käyttäjä"
 
 #: examples/smp.c:71 sysdeps/names/procuid.c:58
 msgid "Nice"
@@ -37,7 +35,7 @@ msgstr "Nice"
 
 #: examples/smp.c:71
 msgid "Sys"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>"
+msgstr "Järjestelmä"
 
 #: examples/smp.c:71
 msgid "Idle"
@@ -63,11 +61,11 @@ msgstr "Prosenttia:"
 
 #: examples/smp.c:95
 msgid "Total (%)"
-msgstr "Yhteens<EFBFBD> (%)"
+msgstr "Yhteensä (%)"
 
 #: examples/smp.c:95
 msgid "User (%)"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD> (%)"
+msgstr "Käyttäjä (%)"
 
 #: examples/smp.c:95
 msgid "Nice (%)"
@@ -75,7 +73,7 @@ msgstr "Nice (%)"
 
 #: examples/smp.c:95
 msgid "Sys (%)"
-msgstr "J<EFBFBD>rjestelm<EFBFBD> (%)"
+msgstr "Järjestelmä (%)"
 
 #: examples/smp.c:96
 msgid "Idle (%)"
@@ -111,7 +109,7 @@ msgstr "datan koon luku"
 #: lib/read_data.c:66
 #, c-format
 msgid "read data %d bytes"
-msgstr "%d datan tavun luku"
+msgstr "lue dataa %d tavua"
 
 #: lib/write.c:48
 #, c-format
@@ -120,23 +118,23 @@ msgstr "%d tavun kirjoitus"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "K<EFBFBD>yt<EFBFBD> virheenetsint<EFBFBD><EFBFBD>"
+msgstr "Käytä virheenetsintää"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
-msgstr "VIRHEENETSINT<EFBFBD>"
+msgstr "VIRHEENETSINTÄ"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr "N<EFBFBD>yt<EFBFBD> lis<EFBFBD>tietoja"
+msgstr "Näytä lisätietoja"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
-msgstr "LIS<EFBFBD>TIEDOT"
+msgstr "LISÄTIEDOT"
 
 #: src/daemon/gnuserv.c:452
 msgid "Don't fork into background"
-msgstr "<EFBFBD>l<EFBFBD> k<EFBFBD>ynnist<EFBFBD> taustaprosessia"
+msgstr "Älä käynnistä taustaprosessia"
 
 #: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
@@ -144,7 +142,7 @@ msgstr "EI-DEMONIA"
 
 #: src/daemon/gnuserv.c:454
 msgid "Invoked from inetd"
-msgstr "K<EFBFBD>ynnistetty inetd-prosssista"
+msgstr "Käynnistetty inetd-prosssista"
 
 #: src/daemon/gnuserv.c:454
 msgid "INETD"
@@ -157,11 +155,11 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Virhe valitsimessa %s: %s.\n"
-"Aja '%s --help' n<EFBFBD>hd<EFBFBD>ksesi luettelon mahdollisista valitsimista.\n"
+"Aja '%s --help' nähdäksesi luettelon mahdollisista valitsimista.\n"
 
 #: support/error.c:109
 msgid "Unknown system error"
-msgstr "Tuntematon j<EFBFBD>rjestelm<EFBFBD>virhe"
+msgstr "Tuntematon järjestelmävirhe"
 
 #: support/getopt.c:669
 #, c-format
@@ -222,21 +220,29 @@ msgstr "%s: valitsin '-W %s' ei ole yksiselitteinen\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: valitsin '-W %s' ei ota parametreja\n"
 
+#: support/popthelp.c:35
+msgid "Show this help message"
+msgstr "Näytä tämä ohjeviesti"
+
+#: support/popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Näytä lyhyt ohjeviesti"
+
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
-msgstr "Suoritinaika yhteens<EFBFBD>"
+msgstr "Suoritinaika yhteensä"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan suoritinaika"
+msgstr "Käyttäjätilan suoritinaika"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan suoritinaika (nice)"
+msgstr "Käyttäjätilan suoritinaika (nice)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>n suoritinaika"
+msgstr "Järjestelmän suoritinaika"
 
 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
@@ -248,43 +254,43 @@ msgstr "Tikitystaajuus"
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr "SMP-suoritinaika yhteens<EFBFBD>"
+msgstr "SMP-suoritinaika yhteensä"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan SMP-suoritinaika"
+msgstr "Käyttäjätilan SMP-suoritinaika"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan SMP-suoritinaika (nice)"
+msgstr "Käyttäjätilan SMP-suoritinaika (nice)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>n SMP-suoritinaika"
+msgstr "Järjestelmän SMP-suoritinaika"
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr "Joutok<EFBFBD>ynnin SMP-suoritinaika"
+msgstr "Joutokäynnin SMP-suoritinaika"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
-msgstr "Kellon tikityksi<EFBFBD> j<EFBFBD>rjestelm<EFBFBD>n k<EFBFBD>ynnistyksen j<EFBFBD>lkeen"
+msgstr "Kellon tikityksiä järjestelmän käynnistyksen jälkeen"
 
 #: sysdeps/names/cpu.c:59 sysdeps/names/cpu.c:65
 msgid "Number of clock ticks the system spent in user mode"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilassa kuluneita kellon tikityksi<EFBFBD>"
+msgstr "Käyttäjätilassa kuluneita kellon tikityksiä"
 
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilassa kuluneita kellon tikityksi<EFBFBD> (nice)"
+msgstr "Käyttäjätilassa kuluneita kellon tikityksiä (nice)"
 
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in system mode"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>ss<EFBFBD> kuluneita kellon tikityksi<EFBFBD>"
+msgstr "Järjestelmässä kuluneita kellon tikityksiä"
 
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr "Jouten kuluneita kellon tikityksi<EFBFBD>"
+msgstr "Jouten kuluneita kellon tikityksiä"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
@@ -292,7 +298,7 @@ msgstr "Tikitysten taajuus (oletusarvo 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr "Lohkoja yhteens<EFBFBD>"
+msgstr "Lohkoja yhteensä"
 
 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
@@ -304,7 +310,7 @@ msgstr "Saatavilla olevia lohkoja"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
-msgstr "Tiedostosolmuja yhteens<EFBFBD>"
+msgstr "Tiedostosolmuja yhteensä"
 
 #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
 msgid "Free file nodes"
@@ -312,11 +318,11 @@ msgstr "Vapaita tiedostosolmuja"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Vapaita p<EFBFBD><EFBFBD>k<EFBFBD>ytt<EFBFBD>j<EFBFBD>lle varattuja lohkoja"
+msgstr "Vapaita pääkäyttäjälle varattuja lohkoja"
 
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "Tavallisille k<EFBFBD>ytt<EFBFBD>jille vapaita lohkoja"
+msgstr "Tavallisille käyttäjille vapaita lohkoja"
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
@@ -324,11 +330,11 @@ msgstr "Keskikuormitus"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr "T<EFBFBD>it<EFBFBD> k<EFBFBD>ynniss<EFBFBD>"
+msgstr "Prosesseja käynnissä"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "T<EFBFBD>itten m<><6D>r<EFBFBD>"
+msgstr "Prosessien määrä"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
@@ -337,23 +343,24 @@ msgstr "Viimeisin prosessinnumero"
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
 msgstr ""
-"Samanaikaisten t<>itten m<EFBFBD><EFBFBD>rien keskiarvot 1:n, 5:n ja 15:ta minuutin ajalta"
+"Samaan aikaan käyvien prosessien määrien keskiarvot 1:n, 5:n ja 15:ta "
+"minuutin ajalta"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "K<EFBFBD>ynniss<EFBFBD> olevien t<EFBFBD>itten m<><6D>r<EFBFBD>"
+msgstr "Käynnissä olevien prosessien määrä"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Total number of tasks"
-msgstr "T<EFBFBD>itten kokonaism<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Prosessien kokonaismäärä"
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr "Muistia yhteens<EFBFBD>"
+msgstr "Muistia yhteensä"
 
 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr "K<EFBFBD>ytetty muisti"
+msgstr "Käytetty muisti"
 
 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
@@ -369,11 +376,11 @@ msgstr "Puskurit"
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr "V<EFBFBD>limuisti"
+msgstr "Välimuisti"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
-msgstr "Lukossa"
+msgstr "Lukittu"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
@@ -381,7 +388,7 @@ msgstr "Fyysisen muistin koko (kt)"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
-msgstr "K<EFBFBD>ytetyn muistin koko (kt)"
+msgstr "Käytetyn muistin koko (kt)"
 
 #: sysdeps/names/mem.c:55
 msgid "Free memory size in kB"
@@ -397,21 +404,21 @@ msgstr "Puskurimuistin koko (kt)"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "V<EFBFBD>limuistina k<EFBFBD>ytetyn muistin koko (kt)"
+msgstr "Välimuistina käytetyn muistin koko (kt)"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
-msgstr "K<EFBFBD>ytt<EFBFBD>jien prosessien k<EFBFBD>ytt<EFBFBD>m<EFBFBD> muisti (kt)"
+msgstr "Käyttäjien prosessien käyttämä muisti (kt)"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Lukossa olevien sivujen k<EFBFBD>ytt<EFBFBD>m<EFBFBD> muisti (kt)"
+msgstr "Lukittujen sivujen käyttämä muisti (kt)"
 
 #: sysdeps/names/mountlist.c:38 sysdeps/names/mountlist.c:45
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45
 msgid "Number of list elements"
-msgstr "Luettelon osien m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Luettelon osien määrä"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
@@ -431,7 +438,7 @@ msgstr "Viestialtaan koko kilotavuina"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
-msgstr "Viestikartan kohteiden m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Viestikartan kohteiden määrä"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
@@ -443,7 +450,7 @@ msgstr "Jonon suurimman koon oletusarvo"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr "Koko j<EFBFBD>rjestelm<EFBFBD>n suurin jonojen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Koko järjestelmän suurin jonojen määrä"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
@@ -451,11 +458,11 @@ msgstr "Viestilohkon koko"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Number of system message headers"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>n viestiotsikoiden m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Järjestelmän viestiotsikoiden määrä"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
-msgstr "Liittym<EFBFBD>n liput"
+msgstr "Liittymän liput"
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
@@ -471,7 +478,7 @@ msgstr "Osoite"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Packets In"
-msgstr "Paketteja sis<EFBFBD><EFBFBD>n"
+msgstr "Paketteja sisään"
 
 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
 msgid "Packets Out"
@@ -483,7 +490,7 @@ msgstr "Paketteja kaikkiaan"
 
 #: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
 msgid "Bytes In"
-msgstr "Tavuja sis<EFBFBD><EFBFBD>n"
+msgstr "Tavuja sisään"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes Out"
@@ -495,19 +502,19 @@ msgstr "Tavuja kaikkiaan"
 
 #: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
 msgid "Errors In"
-msgstr "Virheit<EFBFBD> sis<EFBFBD><EFBFBD>n"
+msgstr "Virheitä sisään"
 
 #: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
 msgid "Errors Out"
-msgstr "Virheit<EFBFBD> ulos"
+msgstr "Virheitä ulos"
 
 #: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
 msgid "Errors Total"
-msgstr "Virheit<EFBFBD> kaikkiaan"
+msgstr "Virheitä kaikkiaan"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr "T<EFBFBD>rm<EFBFBD>ykset"
+msgstr "Törmäykset"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
@@ -523,15 +530,15 @@ msgstr "Tulleita tavuja"
 
 #: sysdeps/names/ppp.c:40
 msgid "Output bytes"
-msgstr "L<EFBFBD>hteneit<EFBFBD> tavuja"
+msgstr "Lähteneitä tavuja"
 
 #: sysdeps/names/ppp.c:46
 msgid "Number of input bytes"
-msgstr "Tulleiden tavujen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Tulleiden tavujen määrä"
 
 #: sysdeps/names/ppp.c:47
 msgid "Number of output bytes"
-msgstr "L<EFBFBD>hteneiden tavujen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Lähteneiden tavujen määrä"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
@@ -591,12 +598,12 @@ msgid ""
 msgstr ""
 "Ytimen prosessia koskevat liput.\n"
 "\n"
-"Linuxissa kaikkien prosessien math-bitti on asetettu, sill<EFBFBD> crt0.s "
-"tarkistaa, onko matematiikkaemulaatiolle tarvetta, joten sit<EFBFBD> ei ole t<EFBFBD>ss<EFBFBD> "
+"Linuxissa kaikkien prosessien math-bitti on asetettu, sillä crt0.s "
+"tarkistaa, onko matematiikkaemulaatiolle tarvetta, joten sitä ei ole tässä "
 "luettelossa.\n"
 "\n"
-"T<EFBFBD>m<EFBFBD> on todenn<EFBFBD>k<EFBFBD>isesti ohjelmavirhe, koska kaikki prosessit eiv<EFBFBD>t ole "
-"C-ohjelmia.\n"
+"Tämä on todennäköisesti ohjelmavirhe, koska kaikki prosessit eivät ole C-"
+"ohjelmia.\n"
 "\n"
 "Math-bitti on desimaali 4 ja seurattu-bitti on desimaali 10."
 
@@ -606,8 +613,8 @@ msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
 msgstr ""
-"Prosessin tekemien v<EFBFBD>hempien sivunhakujen m<EFBFBD><EFBFBD>r<EFBFBD>. N<EFBFBD>it<EFBFBD> varten ei tarvinnut "
-"hakea muistisivua levylt<EFBFBD>."
+"Prosessin tekemien vähäisten sivunhakujen määrä. Näitä varten ei tarvinnut "
+"hakea muistisivua levyltä."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:62
@@ -615,18 +622,18 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"Prosessin tekemien suurempien sivunhakujen m<EFBFBD><EFBFBD>r<EFBFBD>. N<EFBFBD>it<EFBFBD> varten tarvitsi "
-"hakea muistisivu levylt<EFBFBD>."
+"Prosessin tekemien merkittävien sivunhakujen määrä. Näitä varten tarvitsi "
+"hakea muistisivu levyltä."
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:65
 msgid "The number of minor faults that the process and its children have made."
-msgstr "Prosessin ja sen lasten v<EFBFBD>hempien sivunhakujen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Prosessin ja sen lasten vähäisten sivunhakujen määrä"
 
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:68
 msgid "The number of major faults that the process and its children have made."
-msgstr "Prosessin ja sen lasten suurempien sivunhakujen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Prosessin ja sen lasten merkittävien sivunhakujen määrä"
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:71
@@ -634,13 +641,13 @@ msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
 msgstr ""
-"Esp:n (32-bittisen pino-osoittimen) t<EFBFBD>m<EFBFBD>nhetkinen arvo, joka saatiin "
-"prosessin pinosivulta ytimest<EFBFBD>."
+"Esp:n (32-bittisen pino-osoittimen) tämänhetkinen arvo, joka saatiin "
+"prosessin pinosivulta ytimestä."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "T<EFBFBD>m<EFBFBD>nhetkinen EIP (32-bittinen k<EFBFBD>skyosoitin)."
+msgstr "Tämänhetkinen EIP (32-bittinen käskyosoitin)."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -650,15 +657,15 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"T<EFBFBD>t<EFBFBD> \"kanavaa\" prosessi odottaa. T<EFBFBD>m<EFBFBD> on j<EFBFBD>rjestelm<EFBFBD>kutsun osoite jonka "
-"voi etsi<EFBFBD> nimiluettelosta, jos haluat sen nimen tekstin<EFBFBD>. (Jos sinulla on "
-"ajantasainen /etc/psdatabase, kokeile komentoa ps -l n<EFBFBD>hd<EFBFBD>ksesi "
-"WCHAN-kent<EFBFBD>n.)"
+"Tätä \"kanavaa\" prosessi odottaa. Tämä on järjestelmäkutsun osoite jonka "
+"voi etsiä nimiluettelosta, jos haluat sen nimen tekstinä. (Jos sinulla on "
+"ajantasainen /etc/psdatabase, kokeile komentoa ps -l nähdäksesi WCHAN-"
+"kentän.)"
 
 #. WChan
 #: sysdeps/names/prockernel.c:81
 msgid "This is the textual name of the `nwchan' field."
-msgstr "Nwchan-kent<EFBFBD>n tekstinimi"
+msgstr "Nwchan-kentän tekstinimi"
 
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
@@ -682,19 +689,19 @@ msgstr "Prosessin muistissa olevan koon raja"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
-msgstr "Muistisivuja yhteens<EFBFBD>"
+msgstr "Muistisivuja yhteensä"
 
 #: sysdeps/names/procmem.c:54
 msgid "Number of pages of virtual memory"
-msgstr "Virtuaalimuistisivuja yhteens<EFBFBD>"
+msgstr "Virtuaalimuistisivuja yhteensä"
 
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr "Fyysisess<EFBFBD> muistissa (ei sivutettuna) olevien sivujen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Fyysisessä muistissa (ei sivutettuna) olevien sivujen määrä"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
-msgstr "Jaetun muistin (mmap) sivujen m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Jaetun muistin (mmap) sivujen määrä"
 
 #: sysdeps/names/procmem.c:57
 msgid ""
@@ -703,16 +710,16 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"Prosessin fyysisess<EFBFBD> muistissa olevien sivujen m<EFBFBD><EFBFBD>r<EFBFBD>, josta 3 on "
-"j<EFBFBD>rjestelyj<EFBFBD> varten. T<EFBFBD>ss<EFBFBD> on vain koodi-, data- tai pinomuistia olevat "
-"sivut. Sivuja, joita ei ole viel<EFBFBD> haettu levylt<EFBFBD> tai jotka on sivutettu "
-"levylle, ei n<EFBFBD>y t<EFBFBD>ss<EFBFBD>."
+"Prosessin fyysisessä muistissa olevien sivujen määrä, josta 3 on "
+"järjestelyjä varten. Tässä on vain koodi-, data- tai pinomuistia olevat "
+"sivut. Sivuja, joita ei ole vielä haettu levyltä tai jotka on sivutettu "
+"levylle, ei näy tässä."
 
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"Nykyinen raja prosessin fyysisen muistin koolle (yleens<EFBFBD> 2 147 483 647)."
+"Nykyinen raja prosessin fyysisen muistin koolle (yleensä 2 147 483 647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -748,7 +755,7 @@ msgstr "Pinon_alku"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr "Koodin fyysisess<EFBFBD> muistissa oleva koko"
+msgstr "Koodin fyysisessä muistissa oleva koko"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
@@ -764,7 +771,7 @@ msgstr "Pinon muistissa oleva koko"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr "Likaisten sivujen koko yhteens<EFBFBD>"
+msgstr "Likaisten sivujen koko yhteensä"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
@@ -888,39 +895,39 @@ msgstr "XCPU_STime"
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
-msgstr "Prosessin k<EFBFBD>ynnist<EFBFBD>misen aika sekunteina alkukohdan j<EFBFBD>lkeen"
+msgstr "Prosessin käynnistämisen aika sekunteina alkukohdan jälkeen"
 
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Prosessin kuluttama todellinen aika (pit<EFBFBD>isi olla utime + stime)"
+msgstr "Prosessin kuluttama todellinen aika (pitäisi olla utime + stime)"
 
 #: sysdeps/names/proctime.c:53
 msgid "user-mode CPU time accumulated by process"
-msgstr "prosessin kuluttama k<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan suoritinaika"
+msgstr "prosessin kuluttama käyttäjätilan suoritinaika"
 
 #: sysdeps/names/proctime.c:54
 msgid "kernel-mode CPU time accumulated by process"
-msgstr "prosessin kuluttama j<EFBFBD>rjestelm<EFBFBD>tilan suoritinaika"
+msgstr "prosessin kuluttama järjestelmätilan suoritinaika"
 
 #: sysdeps/names/proctime.c:55
 msgid "cumulative utime of process and reaped children"
-msgstr "prosessin ja sen lasten kuluttama k<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan aika"
+msgstr "prosessin ja sen lasten kuluttama käyttäjätilan aika"
 
 #: sysdeps/names/proctime.c:56
 msgid "cumulative stime of process and reaped children"
-msgstr "prosessin ja sen lasten kuluttama j<EFBFBD>rjestelm<EFBFBD>tilan aika"
+msgstr "prosessin ja sen lasten kuluttama järjestelmätilan aika"
 
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "Prosessin seuraava aikaraja (jiffyin<EFBFBD>)"
+msgstr "Prosessin seuraava aikaraja (jiffyinä)"
 
 #: sysdeps/names/proctime.c:58
 msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"Aika (jiffyin<EFBFBD>) ennen kuin prosessi saa uuden ajastimen l<EFBFBD>hett<EFBFBD>m<EFBFBD>n "
-"SIGALRM-signaalin."
+"Aika (jiffyinä) ennen kuin prosessi saa uuden ajastimen lähettämän SIGALRM-"
+"signaalin."
 
 #: sysdeps/names/proctime.c:60
 msgid "Tick frequency"
@@ -928,11 +935,11 @@ msgstr "Tikitystaajuus"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
-msgstr "Prosessin kuluttama k<EFBFBD>ytt<EFBFBD>j<EFBFBD>tilan SMP-prosessiaika"
+msgstr "Prosessin kuluttama käyttäjätilan SMP-prosessiaika"
 
 #: sysdeps/names/proctime.c:62
 msgid "SMP kernel-mode CPU time accumulated by process"
-msgstr "Prosessin kuluttama j<EFBFBD>rjestelm<EFBFBD>tilan SMP-prosessiaika"
+msgstr "Prosessin kuluttama järjestelmätilan SMP-prosessiaika"
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
@@ -976,23 +983,23 @@ msgstr "TPGid"
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "T<EFBFBD>rkeys"
+msgstr "Tärkeys"
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>-ID"
+msgstr "Käyttäjä-ID"
 
 #: sysdeps/names/procuid.c:64
 msgid "Effective User ID"
-msgstr "Merkitsev<EFBFBD> k<EFBFBD>ytt<EFBFBD>j<EFBFBD>-ID"
+msgstr "Merkitsevä käyttäjä-ID"
 
 #: sysdeps/names/procuid.c:65
 msgid "Group ID"
-msgstr "Ryhm<EFBFBD>-ID"
+msgstr "Ryhmä-ID"
 
 #: sysdeps/names/procuid.c:66
 msgid "Effective Group ID"
-msgstr "Merkitsev<EFBFBD> ryhm<EFBFBD>-ID"
+msgstr "Merkitsevä ryhmä-ID"
 
 #: sysdeps/names/procuid.c:67
 msgid "Process ID"
@@ -1004,7 +1011,7 @@ msgstr "Emoprosessin PID"
 
 #: sysdeps/names/procuid.c:69
 msgid "Process group ID"
-msgstr "Prosessiryhm<EFBFBD>n PID"
+msgstr "Prosessiryhmän PID"
 
 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
@@ -1012,11 +1019,11 @@ msgstr "Istunto-ID"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr "Hallitsevan p<EFBFBD><EFBFBD>tteen koko laitenumero"
+msgstr "Hallitsevan päätteen koko laitenumero"
 
 #: sysdeps/names/procuid.c:72
 msgid "Terminal process group ID"
-msgstr "P<EFBFBD><EFBFBD>teprosessin ryhm<EFBFBD>-ID"
+msgstr "Pääteprosessin ryhmä-ID"
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
@@ -1028,31 +1035,31 @@ msgstr "Prosessin standardi unix nice -taso"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "Semaforikartan kohteiden m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Semaforikartan kohteiden määrä"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
-msgstr "Taulukkojen suurin m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Taulukkojen suurin määrä"
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "Koko j<EFBFBD>rjestelm<EFBFBD>n semaforien suurin m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Koko järjestelmän semaforien suurin määrä"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr "Koko j<EFBFBD>rjestelm<EFBFBD>n perumisrakenteiden m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Koko järjestelmän perumisrakenteiden määrä"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
-msgstr "Taulukon semaforien suurin m<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Taulukon semaforien suurin määrä"
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr "Suurin op-m<EFBFBD><EFBFBD>r<EFBFBD> yhdess<EFBFBD> semop-kutsussa"
+msgstr "Suurin op-määrä yhdessä semop-kutsussa"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "Suurin perumiskohteiden m<EFBFBD><EFBFBD>r<EFBFBD> per prosessi"
+msgstr "Suurin perumiskohteiden määrä per prosessi"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1064,7 +1071,7 @@ msgstr "Semaforin suurin arvo"
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "Loppus<EFBFBD><EFBFBD>d<EFBFBD>n suurin arvo"
+msgstr "Loppusäädön suurin arvo"
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
@@ -1076,23 +1083,23 @@ msgstr "Pienin lohkokoko"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
-msgstr "Suurin lohkom<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Suurin lohkomäärä"
 
 #: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max shared segments per process"
-msgstr "Suurin yhden prosessin jaettujen lohkojen m<EFBFBD><EFBFBD>r<EFBFBD> "
+msgstr "Suurin yhden prosessin jaettujen lohkojen määrä "
 
 #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max total shared memory"
-msgstr "Suurin jaetun muistin yhten<EFBFBD>ism<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Suurin jaetun muistin yhtenäismäärä"
 
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
 msgid "Total Swap Space"
-msgstr "Sivutustilaa yhteens<EFBFBD>"
+msgstr "Sivutustilaa yhteensä"
 
 #: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49
 msgid "Used Swap Space"
-msgstr "K<EFBFBD>ytetty<EFBFBD> sivutustilaa"
+msgstr "Käytettyä sivutustilaa"
 
 #: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
 msgid "Free Swap Space"
@@ -1100,7 +1107,7 @@ msgstr "Vapaata sivutustilaa"
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr "Sivutus sis<EFBFBD><EFBFBD>n"
+msgstr "Sivutus sisään"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
@@ -1109,11 +1116,11 @@ msgstr "Sivutus ulos"
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
 msgstr ""
-"J<EFBFBD>rjestelm<EFBFBD>n k<EFBFBD>ynnistymisen j<EFBFBD>lkeen palautettujen sivujen kokonaism<EFBFBD><EFBFBD>r<EFBFBD>"
+"Järjestelmän käynnistymisen jälkeen palautettujen sivujen kokonaismäärä"
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>n k<EFBFBD>ynnistymisen j<EFBFBD>lkeen vietyjen sivujen kokonaism<EFBFBD><EFBFBD>r<EFBFBD>"
+msgstr "Järjestelmän käynnistymisen jälkeen vietyjen sivujen kokonaismäärä"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
@@ -1121,19 +1128,19 @@ msgstr "Palvelimen ominaisuudet"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
-msgstr "Suorittimen k<EFBFBD>ytt<EFBFBD>"
+msgstr "Suorittimen käyttö"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr "Muistink<EFBFBD>ytt<EFBFBD>"
+msgstr "Muistinkäyttö"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr "Sivutuksen k<EFBFBD>ytt<EFBFBD>"
+msgstr "Sivutuksen käyttö"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>n k<EFBFBD>yntiaika"
+msgstr "Järjestelmän käyntiaika"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
@@ -1153,7 +1160,7 @@ msgstr "Semaforijoukon rajat"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
-msgstr "K<EFBFBD>ynniss<EFBFBD> olevien prosessien luettelo"
+msgstr "Käynnissä olevien prosessien luettelo"
 
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "Process Status information"
@@ -1197,7 +1204,7 @@ msgstr "Liitosluettelo"
 
 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
 msgid "File System Usage"
-msgstr "Tiedostoj<EFBFBD>rjestelm<EFBFBD>n k<EFBFBD>ytt<EFBFBD>"
+msgstr "Tiedostojärjestelmän käyttö"
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
@@ -1213,11 +1220,11 @@ msgstr "Prosessin komentoriviparametrit"
 
 #: sysdeps/names/sysdeps.c:95
 msgid "List of currently mounted filesystems"
-msgstr "Liitetyt tiedostoj<EFBFBD>rjestelm<EFBFBD>t"
+msgstr "Liitetyt tiedostojärjestelmät"
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr "K<EFBFBD>yntiaika"
+msgstr "Käyntiaika"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
@@ -1225,11 +1232,11 @@ msgstr "Joutoaika"
 
 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
-msgstr "Aika k<EFBFBD>ynnistyksest<EFBFBD> sekunneissa"
+msgstr "Aika käynnistyksestä sekunneissa"
 
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr "J<EFBFBD>rjestelm<EFBFBD>n joutoaika sekunteina k<EFBFBD>ynnistyksen j<EFBFBD>lkeen"
+msgstr "Järjestelmän joutoaika sekunteina käynnistyksen jälkeen"
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -1245,11 +1252,11 @@ msgstr "Lopetus"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "Virheellinen k<EFBFBD>sky"
+msgstr "Virheellinen käsky"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "J<EFBFBD>ljitys"
+msgstr "Jäljitys"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
@@ -1269,19 +1276,19 @@ msgstr "Tappo"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr "V<EFBFBD>yl<EFBFBD>virhe"
+msgstr "Väylävirhe"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Muistink<EFBFBD>sittelyvirhe"
+msgstr "Muistinkäsittelyvirhe"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Virheellinen j<EFBFBD>rjestelm<EFBFBD>kutsun parametri"
+msgstr "Virheellinen järjestelmäkutsun parametri"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Rikkin<EFBFBD>inen putki"
+msgstr "Rikkinäinen putki"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
@@ -1297,11 +1304,11 @@ msgstr "Kiireellinen tilanne pistokkeessa"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr "Pys<EFBFBD>ytys"
+msgstr "Pysäytys"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "N<EFBFBD>pp<EFBFBD>imist<EFBFBD>pys<EFBFBD>ytys"
+msgstr "Näppäimistöpysäytys"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
@@ -1345,12 +1352,12 @@ msgstr "Ikkunan koon muutos"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Tietojen pyynt<EFBFBD>"
+msgstr "Tietojen pyyntö"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>n m<EFBFBD><EFBFBD>rittelem<EFBFBD> signaali 1"
+msgstr "Käyttäjän määrittelemä signaali 1"
 
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
-msgstr "K<EFBFBD>ytt<EFBFBD>j<EFBFBD>n m<EFBFBD><EFBFBD>rittelem<EFBFBD> signaali 2"
+msgstr "Käyttäjän määrittelemä signaali 2"

po/fr.po

@@ -1,16 +1,16 @@
-# French translation of libgtop.
-# Copyright (C) 1998-2002 Free Software Foundation, Inc.
+# libgtop fr.po
+# Copyright (C) 1998-2001 Free Software Foundation, Inc.
 # Vincent Renardias <vincent@ldsol.com>, 1998-1999.
 # Fabrice Bellet <Fabrice.Bellet@imag.fr>, 1999.
-# Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2000-2002.
+# Christophe Merlet (RedFox) <redfox@eikonex.org>, 2000-2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 1.0.13\n"
-"POT-Creation-Date: 2002-12-14 12:44+0100\n"
-"PO-Revision-Date: 2002-12-14 12:44+0100\n"
-"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
-"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"Project-Id-Version: libgtop 1.0.10\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"PO-Revision-Date: 2001-02-10 11:33+0100\n"
+"Last-Translator: Christophe Merlet (RedFox) <redfox@eikonex.org>\n"
+"Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,7 @@ msgstr ""
 #: examples/smp.c:68
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr "Ticks (%ld par seconde)<EFBFBD>:"
+msgstr "Ticks (%ld par seconde) :"
 
 #: examples/smp.c:71
 msgid "Total"
@@ -46,17 +46,17 @@ msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
-"CPU          (0x%08lx)<EFBFBD>: %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"CPU          (0x%08lx) : %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 
 #: examples/smp.c:77
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr "CPU %3d      (0x%08lx)<EFBFBD>: %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "CPU %3d      (0x%08lx) : %12lu %12lu %12lu %12lu %12lu\n"
 
 #: examples/smp.c:94
 msgid "Percent:"
-msgstr "Pourcentage<EFBFBD>:"
+msgstr "Pourcentage :"
 
 #: examples/smp.c:95
 msgid "Total (%)"
@@ -84,17 +84,17 @@ msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
-"CPU          (0x%08lx)<EFBFBD>: %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"CPU          (0x%08lx) : %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 
 #: examples/smp.c:114
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr "CPU %3d      (0x%08lx)<EFBFBD>: %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "CPU %3d      (0x%08lx) : %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:120
 msgid "Spin:"
-msgstr "Spin<EFBFBD>:"
+msgstr "Spin :"
 
 #: lib/read.c:75
 #, c-format
@@ -154,7 +154,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Erreur sur l'option %s: %s.\n"
-"Executer <20><EFBFBD>%s --help<EFBFBD><EFBFBD> pour avoir la liste des options de la ligne de "
+"Executer <20> %s --help <EFBFBD> pour avoir la liste des options de la ligne de "
 "commande.\n"
 
 #: support/error.c:109
@@ -164,61 +164,61 @@ msgstr "Erreur syst
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>%s<EFBFBD><EFBFBD> est ambig<69>e\n"
+msgstr "%s : l'option <20> %s <EFBFBD> est ambig<69>e\n"
 
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>--%s<EFBFBD><EFBFBD> ne supporte pas d'arguments\n"
+msgstr "%s : l'option <20> --%s <EFBFBD> ne supporte pas d'arguments\n"
 
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>%c%s<EFBFBD><EFBFBD> ne supporte pas d'arguments\n"
+msgstr "%s : l'option <20> %c%s <EFBFBD> ne supporte pas d'arguments\n"
 
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>%s<EFBFBD><EFBFBD> n<>cessite un argument\n"
+msgstr "%s : l'option <20> %s <EFBFBD> n<>cessite un argument\n"
 
 #. --option
 #: support/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s<EFBFBD>: option inconnue <20><EFBFBD>--%s<EFBFBD><EFBFBD>\n"
+msgstr "%s : option inconnue <20> --%s <EFBFBD>\n"
 
 #. +option or -option
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s<EFBFBD>: option inconnue <20><EFBFBD>%c%s<EFBFBD><EFBFBD>\n"
+msgstr "%s : option inconnue <20> %c%s <EFBFBD>\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s<EFBFBD>: option ill<6C>gale -- %c\n"
+msgstr "%s : option ill<6C>gale -- %c\n"
 
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s<EFBFBD>: option non valide -- %c\n"
+msgstr "%s : option non valide -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s<EFBFBD>: l'option n<>cessite un argument -- %c\n"
+msgstr "%s : l'option n<>cessite un argument -- %c\n"
 
 #: support/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>-W %s<EFBFBD><EFBFBD> is ambig<69>e\n"
+msgstr "%s : l'option <20> -W %s <EFBFBD> is ambig<69>e\n"
 
 #: support/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s<EFBFBD>: l'option <20><EFBFBD>-W %s<EFBFBD><EFBFBD> ne supporte pas d'arguments\n"
+msgstr "%s : l'option <20> -W %s <EFBFBD> ne supporte pas d'arguments\n"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -653,7 +653,7 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"Il s'agit du <20><EFBFBD>canal<EFBFBD><EFBFBD> dans lequel le processus est en attente, constitu<74> "
+"Il s'agit du <20> canal <EFBFBD> dans lequel le processus est en attente, constitu<74> "
 "par l'adresse d'un appel syst<73>me dans lequel le processus est bloqu<71>. La "
 "correspondance entre l'adresse et le nom de l'appel syst<73>me est disponible "
 "si le fichier /etc/psdatabase est <20> jour par rapport <20><>la version du noyau "
@@ -1032,7 +1032,7 @@ msgstr "Priorit
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Niveau de <20><EFBFBD>nice<EFBFBD><EFBFBD> (standard unix) du processus"
+msgstr "Niveau de <20> nice <EFBFBD> (standard unix) du processus"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
@@ -1378,7 +1378,7 @@ msgstr "Signal utilisateur 2"
 #~ msgstr "Instruction EMT"
 
 #~ msgid "Kill, unblockable (POSIX)"
-#~ msgstr "Signal <20><EFBFBD>Kill<EFBFBD><EFBFBD>, non blocable (POSIX)"
+#~ msgstr "Signal <20> Kill <EFBFBD>, non blocable (POSIX)"
 
 #~ msgid "BUS error (4.2 BSD)"
 #~ msgstr "Erreur de Bus (BSD 4.2)"

po/ms.po

@@ -4,12 +4,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop (libgtop-GNOME-2-0-port)\n"
-"POT-Creation-Date: 2002-01-15 02:39+0800\n"
+"POT-Creation-Date: 2002-03-24 13:10+0800\n"
 "PO-Revision-Date: 2002-01-15 04:05+0800\n"
 "Last-Translator: Hasbullah Bin Pit (sebol) <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@list.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68

po/nn.po

@@ -2,13 +2,14 @@
 # Copyright (C) 2001 Roy-Magne Mo
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.13\n"
-"POT-Creation-Date: 2001-11-27 07:16+0100\n"
-"PO-Revision-Date: 2001-06-25 18:55+02:00\n"
+"POT-Creation-Date: 2002-01-25 05:49+0100\n"
+"PO-Revision-Date: 2002-01-25 05:50+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo@sunnmore.net>\n"
-"Language-Team: Norwegian (Nynorsk)\n"
+"Language-Team: Norwegian (Nynorsk) <nn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -328,7 +329,8 @@ msgid "Last PID"
 msgstr "Siste PID"
 
 #: sysdeps/names/loadavg.c:47
-msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
+msgid ""
+"Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
 msgstr ""
 
 #: sysdeps/names/loadavg.c:48
@@ -492,24 +494,20 @@ msgid "Bytes Total"
 msgstr "Byte ut"
 
 #: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
-#, fuzzy
 msgid "Errors In"
-msgstr "Feil"
+msgstr "Feil inn"
 
 #: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
-#, fuzzy
 msgid "Errors Out"
-msgstr "Feil"
+msgstr "Feil ut"
 
 #: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
-#, fuzzy
 msgid "Errors Total"
-msgstr "Feilfarge"
+msgstr "Feil total"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
-#, fuzzy
 msgid "Collisions"
-msgstr "Kolonnar:"
+msgstr "Kollisjonar"
 
 #: sysdeps/names/netload.c:64
 #, fuzzy
@@ -517,9 +515,8 @@ msgid "Maximum Transfer Unit"
 msgstr "Overf<72>ringseiningar"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-#, fuzzy
 msgid "PPP State"
-msgstr "Stat"
+msgstr "PPP tilstand"
 
 #: sysdeps/names/ppp.c:39
 #, fuzzy
@@ -620,19 +617,21 @@ msgstr ""
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:65
-msgid "The number of minor faults that the process and its children have made."
+msgid ""
+"The number of minor faults that the process and its children have made."
 msgstr ""
 
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:68
-msgid "The number of major faults that the process and its children have made."
+msgid ""
+"The number of major faults that the process and its children have made."
 msgstr ""
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:71
 msgid ""
-"The current value of esp (32-bit stack pointer), as found in the kernel "
-"stack page for the process."
+"The current value of esp (32-bit stack pointer), as found in the kernel stack "
+"page for the process."
 msgstr ""
 
 #. KStk_EIP
@@ -643,10 +642,10 @@ msgstr ""
 #. NWChan
 #: sysdeps/names/prockernel.c:76
 msgid ""
-"This is the \"channel\" in which the process is waiting.  This is the "
-"address of a system call, and can be looked up in a namelist if you need a "
-"textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
-"see the WCHAN field in action)"
+"This is the \"channel\" in which the process is waiting.  This is the address "
+"of a system call, and can be looked up in a namelist if you need a textual "
+"name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to see the "
+"WCHAN field in action)"
 msgstr ""
 
 #. WChan
@@ -1145,7 +1144,8 @@ msgid "Total number of swap pages that have been brought in since system boot"
 msgstr ""
 
 #: sysdeps/names/swap.c:53
-msgid "Total number of swap pages that have been brought out since system boot"
+msgid ""
+"Total number of swap pages that have been brought out since system boot"
 msgstr ""
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
@@ -1413,3 +1413,4 @@ msgstr "Eigendefinert 1"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Eigendefinert 2"
+

po/no.po

@@ -1,16 +1,16 @@
-# Norwegian translation for Libgtop (bokm<EFBFBD>l dialect)
+# Norwegian translation for Libgtop (bokmål dialect)
 # Copyright (C) 1998-2000 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 1998-2000.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.8\n"
-"POT-Creation-Date: 2001-02-13 13:30+0100\n"
-"PO-Revision-Date: 2000-08-16 14:00+0200\n"
+"POT-Creation-Date: 2002-04-23 22:22+0200\n"
+"PO-Revision-Date: 2002-04-23 22:22+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: examples/smp.c:68
@@ -101,7 +101,7 @@ msgstr "les %d bytes"
 
 #: lib/read_data.c:49
 msgid "read data size"
-msgstr "les st<EFBFBD>rrelse p<EFBFBD> data"
+msgstr "les størrelse på data"
 
 #: lib/read_data.c:66
 #, c-format
@@ -115,7 +115,7 @@ msgstr "skriv %d bytes"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "Sl<EFBFBD> p<EFBFBD> avlusing"
+msgstr "Slå på avlusing"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
@@ -123,7 +123,7 @@ msgstr "DEBUG"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr "Sl<EFBFBD> p<EFBFBD> utfyllende utskrift"
+msgstr "Slå på utfyllende utskrift"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
@@ -152,7 +152,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Feil ved flagg %s: %s.\n"
-"Kj<EFBFBD>r '%s --help' for <EFBFBD> se en full liste av tilgjengelige "
+"Kjør '%s --help' for å se en full liste av tilgjengelige "
 "kommandolinjeflagg.\n"
 
 #: support/error.c:109
@@ -218,6 +218,14 @@ msgstr "%s: flagget `-W %s' er flertydig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flagget `-W %s' tar ikke argumenter\n"
 
+#: support/popthelp.c:35
+msgid "Show this help message"
+msgstr "Vis denne hjelpmeldingen"
+
+#: support/popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Vis kort bruksinformasjon"
+
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
 msgstr "Total prosessortid"
@@ -320,7 +328,7 @@ msgstr "Gjennomsnittsbelastning"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr "Kj<EFBFBD>rende oppgaver"
+msgstr "Kjørende oppgaver"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
@@ -332,11 +340,11 @@ msgstr "Siste PID"
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "Antall samtidig kj<EFBFBD>rende jobber med snitt over 1, 5 og 15 minutter"
+msgstr "Antall samtidig kjørende jobber med snitt over 1, 5 og 15 minutter"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "Antall oppgaver som kj<EFBFBD>rer n<EFBFBD>"
+msgstr "Antall oppgaver som kjører nå"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Total number of tasks"
@@ -368,7 +376,7 @@ msgstr "Mellomlagret"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
-msgstr "L<EFBFBD>st"
+msgstr "Låst"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
@@ -388,11 +396,11 @@ msgstr "Delt minne i kB"
 
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> buffere i kB"
+msgstr "Størrelse på buffere i kB"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> mellomlagret minne i kB"
+msgstr "Størrelse på mellomlagret minne i kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
@@ -400,7 +408,7 @@ msgstr "Minne brukt av brukerprosesser i kB"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Minne i l<EFBFBD>ste sider i kB"
+msgstr "Minne i låste sider i kB"
 
 #: sysdeps/names/mountlist.c:38 sysdeps/names/mountlist.c:45
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
@@ -412,37 +420,37 @@ msgstr "Antall elementer i listen"
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
 #: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46
 msgid "Total size of list"
-msgstr "Total st<EFBFBD>rrelse p<EFBFBD> listen"
+msgstr "Total størrelse på listen"
 
 #: sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
 #: sysdeps/names/procmap.c:40 sysdeps/names/procmap.c:47
 msgid "Size of a single list element"
-msgstr "St<EFBFBD>rrelsen p<EFBFBD> et enkelt element i listen"
+msgstr "Størrelsen på et enkelt element i listen"
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr "St<EFBFBD>rrelse i kilobyte p<EFBFBD> meldingslageret"
+msgstr "Størrelse i kilobyte på meldingslageret"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
-msgstr "Antall oppf<EFBFBD>ringer i meldingskartet"
+msgstr "Antall oppføringer i meldingskartet"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr "Maks st<EFBFBD>rrelse p<EFBFBD> meldingen"
+msgstr "Maks størrelse på meldingen"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Forvalgt st<EFBFBD>rrelse p<EFBFBD> k<EFBFBD>en"
+msgstr "Forvalgt størrelse på køen"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr "Maks antall k<EFBFBD>er p<EFBFBD> systemet"
+msgstr "Maks antall køer på systemet"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> meldingssegment"
+msgstr "Størrelse på meldingssegment"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Number of system message headers"
@@ -506,7 +514,7 @@ msgstr "Kollisjoner"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr "Maksimum overf<EFBFBD>ringsenhet (MTU)"
+msgstr "Maksimum overføringsenhet (MTU)"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
@@ -530,7 +538,7 @@ msgstr "Antall bytes ut"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr "St<EFBFBD>rrelse"
+msgstr "Størrelse"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
@@ -587,11 +595,11 @@ msgstr ""
 "Prosessens kjerneflagg.\n"
 "\n"
 "Under Linux har alle flagg mattebiten satt fordi crt0.s sjekker etter "
-"matteemulering, s<EFBFBD> dette er ikke inkludert i utskriften.\n"
+"matteemulering, så dette er ikke inkludert i utskriften.\n"
 "\n"
 "Dette er sannsynligvis en feil, siden ikke alle prosesser er et kompilert\n"
 "C program.\n"
-"Mattebiten skal v<EFBFBD>re desimal 4, og den tracete biten er desimal 10."
+"Mattebiten skal være desimal 4, og den tracete biten er desimal 10."
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:59
@@ -600,7 +608,7 @@ msgid ""
 "required loading a memory page from disk."
 msgstr ""
 "Antallet mindre feil prosessen har laget; de som ikke har gjort det "
-"n<EFBFBD>dvendig <EFBFBD> lese en minneside inn fra disk."
+"nødvendig å lese en minneside inn fra disk."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:62
@@ -608,7 +616,7 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"Antallet st<EFBFBD>rre feil prosessen har laget; de som har gjort det n<EFBFBD>dvendig <EFBFBD> "
+"Antallet større feil prosessen har laget; de som har gjort det nødvendig å "
 "lese en minneside inn fra disk."
 
 #. CMin_Flt
@@ -619,7 +627,7 @@ msgstr "Antallet mindre feil prosessen og dens barn har laget."
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:68
 msgid "The number of major faults that the process and its children have made."
-msgstr "Antallet st<EFBFBD>rre feil prosessen og dens barn har laget."
+msgstr "Antallet større feil prosessen og dens barn har laget."
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:71
@@ -627,13 +635,13 @@ msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
 msgstr ""
-"Den n<EFBFBD>v<EFBFBD>rende verdien til esp (32-bits stakkpeker), som funnet i kjernens "
+"Den nåværende verdien til esp (32-bits stakkpeker), som funnet i kjernens "
 "stakkside for prosessen."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "Den n<EFBFBD>v<EFBFBD>rende EIP (32-bits instruksjonspeker)."
+msgstr "Den nåværende EIP (32-bits instruksjonspeker)."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -644,8 +652,8 @@ msgid ""
 "see the WCHAN field in action)"
 msgstr ""
 "Dette er \"kanalen\" hvor prosessen venter. Dette er adressen til "
-"systemkallet, og kan sl<EFBFBD>s opp i en navneliste hvis du trenger et tekstnavn. "
-"(Hvis du har en oppdatert /etc/psdatabase, s<EFBFBD> pr<EFBFBD>v ps -l for <EFBFBD> se WCHAN "
+"systemkallet, og kan slås opp i en navneliste hvis du trenger et tekstnavn. "
+"(Hvis du har en oppdatert /etc/psdatabase, så prøv ps -l for å se WCHAN "
 "feltet i aksjon)"
 
 #. WChan
@@ -667,11 +675,11 @@ msgstr "Del"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident sett"
+msgstr "Størrelse på resident sett"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr "St<EFBFBD>rrelsesgrense p<EFBFBD> resident sett"
+msgstr "Størrelsesgrense på resident sett"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
@@ -704,7 +712,7 @@ msgstr ""
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "N<EFBFBD>v<EFBFBD>rende grense i bytes p<EFBFBD> prosessens rss (vanligvis 2,147,483,647)."
+msgstr "Nåværende grense i bytes på prosessens rss (vanligvis 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -724,7 +732,7 @@ msgstr "Stack_RSS"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
-msgstr "Skitten st<EFBFBD>rrelse"
+msgstr "Skitten størrelse"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
@@ -740,35 +748,35 @@ msgstr "Start_Stack"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> tekst resident sett"
+msgstr "Størrelse på tekst resident sett"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident sett for delt biliotek"
+msgstr "Størrelse på resident sett for delt biliotek"
 
 #: sysdeps/names/procsegment.c:50
 msgid "Data resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident sett for data"
+msgstr "Størrelse på resident sett for data"
 
 #: sysdeps/names/procsegment.c:51
 msgid "Stack resident set size"
-msgstr "St<EFBFBD>rrelse p<EFBFBD> resident sett for stakk"
+msgstr "Størrelse på resident sett for stakk"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr "Total st<EFBFBD>rrelse p<EFBFBD> endrede sider"
+msgstr "Total størrelse på endrede sider"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
-msgstr "Adressen til begynnelsen p<EFBFBD> kodesegmentet"
+msgstr "Adressen til begynnelsen på kodesegmentet"
 
 #: sysdeps/names/procsegment.c:54
 msgid "Address of end of code segment"
-msgstr "Adressen til slutten p<EFBFBD> kodesegmentet"
+msgstr "Adressen til slutten på kodesegmentet"
 
 #: sysdeps/names/procsegment.c:55
 msgid "Address of the bottom of stack segment"
-msgstr "Adressen til bunnen p<EFBFBD> stakksegmentet"
+msgstr "Adressen til bunnen på stakksegmentet"
 
 #: sysdeps/names/procsignal.c:40
 msgid "Signal"
@@ -820,7 +828,7 @@ msgstr "GID (GruppeID)"
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
-msgstr "Basenavnet p<EFBFBD> den kj<EFBFBD>rbare filen i et kall til exec()"
+msgstr "Basenavnet på den kjørbare filen i et kall til exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
@@ -884,7 +892,7 @@ msgstr "Prosessens starttid i sekunder siden epoken"
 
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Reell tid akkumulert av prosessen (skal v<EFBFBD>re utid + stid)"
+msgstr "Reell tid akkumulert av prosessen (skal være utid + stid)"
 
 #: sysdeps/names/proctime.c:53
 msgid "user-mode CPU time accumulated by process"
@@ -896,11 +904,11 @@ msgstr "kjerne-modus prosessortid akkumulert av prosessen"
 
 #: sysdeps/names/proctime.c:55
 msgid "cumulative utime of process and reaped children"
-msgstr "kumultiv utime for prosessen og d<EFBFBD>de barn"
+msgstr "kumultiv utime for prosessen og døde barn"
 
 #: sysdeps/names/proctime.c:56
 msgid "cumulative stime of process and reaped children"
-msgstr "kumulativ stime for prosessen og dens d<EFBFBD>de barn"
+msgstr "kumulativ stime for prosessen og dens døde barn"
 
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
@@ -911,7 +919,7 @@ msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"Tiden (i jiffies) f<EFBFBD>r neste SIGALARM blir sendt til prosessen p<EFBFBD> grunn av en "
+"Tiden (i jiffies) før neste SIGALARM blir sendt til prosessen på grunn av en "
 "intervallklokke."
 
 #: sysdeps/names/proctime.c:60
@@ -1004,7 +1012,7 @@ msgstr "SesjonsID"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr "Fullt enhetsnummer p<EFBFBD> kontrollerende terminal"
+msgstr "Fullt enhetsnummer på kontrollerende terminal"
 
 #: sysdeps/names/procuid.c:72
 msgid "Terminal process group ID"
@@ -1016,11 +1024,11 @@ msgstr "Kernel scheduling prioritet"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Standard unix nice-niv<EFBFBD> for prosessen"
+msgstr "Standard unix nice-nivå for prosessen"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "Antall oppf<EFBFBD>ringer i semaforkartet"
+msgstr "Antall oppføringer i semaforkartet"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
@@ -1028,11 +1036,11 @@ msgstr "Maks antall tabeller"
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "Maks antall semaforer p<EFBFBD> hele systemet"
+msgstr "Maks antall semaforer på hele systemet"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr "Antall gjenopprettingsstrukturer p<EFBFBD> hele systemet"
+msgstr "Antall gjenopprettingsstrukturer på hele systemet"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
@@ -1044,7 +1052,7 @@ msgstr "Maks operasjoner per semop kall"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "Maks antall gjenopprettingsfors<EFBFBD>k per prosess"
+msgstr "Maks antall gjenopprettingsforsøk per prosess"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1060,11 +1068,11 @@ msgstr "Juster maksverdi ved utgang"
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "Maks segmentst<EFBFBD>rrelse"
+msgstr "Maks segmentstørrelse"
 
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "Minimum segmentst<EFBFBD>rrelse"
+msgstr "Minimum segmentstørrelse"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
@@ -1136,7 +1144,7 @@ msgstr "Grenser for delt minne"
 
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
-msgstr "Grenser for meldingsk<EFBFBD>er"
+msgstr "Grenser for meldingskøer"
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
@@ -1144,7 +1152,7 @@ msgstr "Grenser for semaforsett"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
-msgstr "Liste over kj<EFBFBD>rende prosesser"
+msgstr "Liste over kjørende prosesser"
 
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "Process Status information"
@@ -1272,7 +1280,7 @@ msgstr "Ugyldig argument til systemkall"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Brukket r<EFBFBD>r"
+msgstr "Brukket rør"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
@@ -1284,7 +1292,7 @@ msgstr "Terminering"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Viktig tilstand p<EFBFBD> socket"
+msgstr "Viktig tilstand på socket"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1312,7 +1320,7 @@ msgstr "Skriving til tty i bakgrunnen"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "I/O n<EFBFBD> mulig"
+msgstr "I/O nå mulig"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
@@ -1320,7 +1328,7 @@ msgstr "CPU-grense oversteget"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Grense for filst<EFBFBD>rrelse overskredet"
+msgstr "Grense for filstørrelse overskredet"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
@@ -1332,11 +1340,11 @@ msgstr "Profilerer alarmklokken"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "Endring i vindusst<EFBFBD>rrelse"
+msgstr "Endring i vindusstørrelse"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Informasjonsforesp<EFBFBD>rsel"
+msgstr "Informasjonsforespørsel"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"

po/pt.po

@@ -1,16 +1,16 @@
 # libgtop's Portuguese Translation
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Duarte Loreto <happyguy_pt@hotmail.com>, 2001
+# Duarte Loreto <happyguy_pt@hotmail.com>, 2001, 2002
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.4.1\n"
-"POT-Creation-Date: 2001-10-17 06:17-0400\n"
-"PO-Revision-Date: 2001-10-17 17:06+0000\n"
+"POT-Creation-Date: 2002-05-06 01:18+0100\n"
+"PO-Revision-Date: 2002-04-02 00:06+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
-"Language-Team: Portuguese <none@none.org>\n"
+"Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
@@ -92,7 +92,7 @@ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:120
 msgid "Spin:"
-msgstr "Rota<EFBFBD><EFBFBD>es:"
+msgstr "Rotações:"
 
 #: lib/read.c:75
 #, c-format
@@ -115,7 +115,7 @@ msgstr "escreveu %d bytes"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "Activar depura<EFBFBD><EFBFBD>o"
+msgstr "Activar depuração"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
@@ -131,7 +131,7 @@ msgstr "VERBOSE"
 
 #: src/daemon/gnuserv.c:452
 msgid "Don't fork into background"
-msgstr "N<EFBFBD>o fazer fork em background"
+msgstr "Não fazer fork em background"
 
 #: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
@@ -151,8 +151,9 @@ msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Erro na op<EFBFBD><EFBFBD>o %s: %s.\n"
-"Executar '%s --help' para obter uma lista completa das op<EFBFBD><EFBFBD>es de linha de comandos.\n"
+"Erro na opção %s: %s.\n"
+"Executar '%s --help' para obter uma lista completa das opções de linha de "
+"comandos.\n"
 
 #: support/error.c:109
 msgid "Unknown system error"
@@ -161,61 +162,69 @@ msgstr "Erro de sistema desconhecido"
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o `%s' <EFBFBD> amb<EFBFBD>gua\n"
+msgstr "%s: opção `%s' é ambígua\n"
 
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o `--%s' n<EFBFBD>o permite um argumento\n"
+msgstr "%s: opção `--%s' não permite um argumento\n"
 
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o `%c%s' n<EFBFBD>o permite um argumento\n"
+msgstr "%s: opção `%c%s' não permite um argumento\n"
 
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o `%s' requer um argumento\n"
+msgstr "%s: opção `%s' requer um argumento\n"
 
 #. --option
 #: support/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o desconhecida `--%s'\n"
+msgstr "%s: opção desconhecida `--%s'\n"
 
 #. +option or -option
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o desconhecida `%c%s'\n"
+msgstr "%s: opção desconhecida `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o ilegal -- %c\n"
+msgstr "%s: opção ilegal -- %c\n"
 
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o inv<EFBFBD>lida -- %c\n"
+msgstr "%s: opção inválida -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o requer um argumento -- %c\n"
+msgstr "%s: opção requer um argumento -- %c\n"
 
 #: support/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o `-W %s' <EFBFBD> amb<EFBFBD>gua\n"
+msgstr "%s: opção `-W %s' é ambígua\n"
 
 #: support/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: op<EFBFBD><EFBFBD>o `-W %s' n<EFBFBD>o permite um argumento\n"
+msgstr "%s: opção `-W %s' não permite um argumento\n"
+
+#: support/popthelp.c:35
+msgid "Show this help message"
+msgstr "Mostrar esta mensagem de ajuda"
+
+#: support/popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Mostrar breve mensagem de utilização"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -239,7 +248,7 @@ msgstr "Tempo CPU Inactivo"
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
-msgstr "Frequ<EFBFBD>ncia Batida"
+msgstr "Frequência Batida"
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
@@ -263,27 +272,27 @@ msgstr "Tempo Total CPU SMP Inactivo"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
-msgstr "N<EFBFBD>mero de batidas de rel<EFBFBD>gio desde o reiniciar do sistema"
+msgstr "Número de batidas de relógio desde o reiniciar do sistema"
 
 #: sysdeps/names/cpu.c:59 sysdeps/names/cpu.c:65
 msgid "Number of clock ticks the system spent in user mode"
-msgstr "N<EFBFBD>mero de batidas de rel<EFBFBD>gio em modo utilizador"
+msgstr "Número de batidas de relógio em modo utilizador"
 
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
-msgstr "N<EFBFBD>mero de batidas de rel<EFBFBD>gio em modo utilizador (nice)"
+msgstr "Número de batidas de relógio em modo utilizador (nice)"
 
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in system mode"
-msgstr "N<EFBFBD>mero de batidas de rel<EFBFBD>gio em modo sistema"
+msgstr "Número de batidas de relógio em modo sistema"
 
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr "N<EFBFBD>mero de batidas de rel<EFBFBD>gio inactivas"
+msgstr "Número de batidas de relógio inactivas"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
-msgstr "Frequ<EFBFBD>ncia batidas (defeito <EFBFBD> 100)"
+msgstr "Frequência batidas (defeito é 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
@@ -295,7 +304,7 @@ msgstr "Blocos livres"
 
 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr "Blocos dispon<EFBFBD>veis"
+msgstr "Blocos disponíveis"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
@@ -307,55 +316,56 @@ msgstr "Nodes de ficheiros livres"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Blocos livres dispon<EFBFBD>veis para o root"
+msgstr "Blocos livres disponíveis para o root"
 
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "Blocos livres dispon<EFBFBD>veis para os n<EFBFBD>o-root"
+msgstr "Blocos livres disponíveis para os não-root"
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
-msgstr "Carga M<EFBFBD>dia"
+msgstr "Carga Média"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr "Tarefas em Execu<EFBFBD><EFBFBD>o"
+msgstr "Tarefas em Execução"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "N<EFBFBD> de Tarefas"
+msgstr "Nº de Tarefas"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
-msgstr "<EFBFBD>ltimo PID"
+msgstr "Último PID"
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "N<EFBFBD>mero de processos em execu<63><75>o simult<6C>nea, em m<>dia sobre 1, 5 e 15 minutos"
+msgstr ""
+"Número de processos em execução simultânea, em média sobre 1, 5 e 15 minutos"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "N<EFBFBD>mero de tarefas actualmente em execu<EFBFBD><EFBFBD>o"
+msgstr "Número de tarefas actualmente em execução"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Total number of tasks"
-msgstr "N<EFBFBD>mero total de tarefas"
+msgstr "Número total de tarefas"
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr "Mem<EFBFBD>ria Total"
+msgstr "Memória Total"
 
 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr "Mem<EFBFBD>ria Ocupada"
+msgstr "Memória Ocupada"
 
 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
-msgstr "Mem<EFBFBD>ria Livre"
+msgstr "Memória Livre"
 
 #: sysdeps/names/mem.c:44
 msgid "Shared Memory"
-msgstr "Mem<EFBFBD>ria Partilhada"
+msgstr "Memória Partilhada"
 
 #: sysdeps/names/mem.c:45
 msgid "Buffers"
@@ -371,19 +381,19 @@ msgstr "Trancada"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr "Mem<EFBFBD>ria f<EFBFBD>sica total em kB"
+msgstr "Memória física total em kB"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
-msgstr "Mem<EFBFBD>ria ocupada em kB"
+msgstr "Memória ocupada em kB"
 
 #: sysdeps/names/mem.c:55
 msgid "Free memory size in kB"
-msgstr "Mem<EFBFBD>ria l<EFBFBD>vre em kB"
+msgstr "Memória lívre em kB"
 
 #: sysdeps/names/mem.c:56
 msgid "Shared memory size in kB"
-msgstr "Mem<EFBFBD>ria partilhada em kB"
+msgstr "Memória partilhada em kB"
 
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
@@ -391,21 +401,21 @@ msgstr "Tamanho dos buffers em kB"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "Tamanho da mem<EFBFBD>ria em cache em kB"
+msgstr "Tamanho da memória em cache em kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
-msgstr "Mem<EFBFBD>ria ocupada por processos do utilizador em kB"
+msgstr "Memória ocupada por processos do utilizador em kB"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Mem<EFBFBD>ria em p<EFBFBD>ginas trancadas em kB"
+msgstr "Memória em páginas trancadas em kB"
 
 #: sysdeps/names/mountlist.c:38 sysdeps/names/mountlist.c:45
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45
 msgid "Number of list elements"
-msgstr "N<EFBFBD>mero de elementos na lista"
+msgstr "Número de elementos na lista"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
@@ -425,19 +435,19 @@ msgstr "Tamanho em kB da fila de mensagens"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
-msgstr "N<EFBFBD>mero de entrasas no mapa de mensagens"
+msgstr "Número de entrasas no mapa de mensagens"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr "Tamanho m<EFBFBD>x das mensagens"
+msgstr "Tamanho máx das mensagens"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Tamanho m<EFBFBD>x defeito da fila"
+msgstr "Tamanho máx defeito da fila"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr "Filas m<EFBFBD>x em todo o sistema"
+msgstr "Filas máx em todo o sistema"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
@@ -445,7 +455,7 @@ msgstr "Tamanho de segmento de mensagem"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Number of system message headers"
-msgstr "N<EFBFBD>mero de cabe<EFBFBD>alhos de mensagem de sistema"
+msgstr "Número de cabeçalhos de mensagem de sistema"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
@@ -461,7 +471,7 @@ msgstr "Subrede"
 
 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Address"
-msgstr "Endere<EFBFBD>o"
+msgstr "Endereço"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Packets In"
@@ -501,11 +511,11 @@ msgstr "Total Erros"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr "Colis<EFBFBD>es"
+msgstr "Colisões"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr "<EFBFBD>nidade M<EFBFBD>xima Transfer<EFBFBD>ncia"
+msgstr "Únidade Máxima Transferência"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
@@ -521,11 +531,11 @@ msgstr "bytes Saidos"
 
 #: sysdeps/names/ppp.c:46
 msgid "Number of input bytes"
-msgstr "N<EFBFBD> de bytes entrados"
+msgstr "Nº de bytes entrados"
 
 #: sysdeps/names/ppp.c:47
 msgid "Number of output bytes"
-msgstr "N<EFBFBD> de bytes saidos"
+msgstr "Nº de bytes saidos"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
@@ -533,7 +543,7 @@ msgstr "Tamanho"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
-msgstr "Comprimento em bytes da express<EFBFBD>o retornada"
+msgstr "Comprimento em bytes da expressão retornada"
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
@@ -585,12 +595,13 @@ msgid ""
 msgstr ""
 "Flags de Kernel do processo.\n"
 "\n"
-"Em Linux, actualmente todas as flags t<EFBFBD>m o bit math activo, porque crt0.s "
-"verifica emula<EFBFBD><EFBFBD>o matem<EFBFBD>tica, pelo que isto n<EFBFBD>o <EFBFBD> incluido nos resultados.\n"
+"Em Linux, actualmente todas as flags têm o bit math activo, porque crt0.s "
+"verifica emulação matemática, pelo que isto não é incluido nos resultados.\n"
 "\n"
-"Isto poder<EFBFBD> ser um bug, j<EFBFBD> que nem todos os processos s<EFBFBD>o aplica<EFBFBD><EFBFBD>es compiladas em C.\n"
+"Isto poderá ser um bug, já que nem todos os processos são aplicações "
+"compiladas em C.\n"
 "\n"
-"O bit math dever<EFBFBD> ser um decimal 4, e o bit de trace <EFBFBD> decimal 10."
+"O bit math deverá ser um decimal 4, e o bit de trace é decimal 10."
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:59
@@ -598,8 +609,8 @@ msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
 msgstr ""
-"O n<EFBFBD>mero de faults menores que o processo fez, aquelas que n<EFBFBD>o requereram "
-"a leitura de uma p<EFBFBD>gina de mem<EFBFBD>ria do disco."
+"O número de faults menores que o processo fez, aquelas que não requereram a "
+"leitura de uma página de memória do disco."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:62
@@ -607,18 +618,18 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"O n<EFBFBD>mero de faults maiores que o processo fez, aquelas que requereram "
-"a leitura de uma p<EFBFBD>gina de mem<EFBFBD>ria do disco."
+"O número de faults maiores que o processo fez, aquelas que requereram a "
+"leitura de uma página de memória do disco."
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:65
 msgid "The number of minor faults that the process and its children have made."
-msgstr "O n<EFBFBD>mero de faults menores que o processo e seus filhos fizeram."
+msgstr "O número de faults menores que o processo e seus filhos fizeram."
 
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:68
 msgid "The number of major faults that the process and its children have made."
-msgstr "O n<EFBFBD>mero de faults maiores que o processo e seus filhos fizeram."
+msgstr "O número de faults maiores que o processo e seus filhos fizeram."
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:71
@@ -627,12 +638,12 @@ msgid ""
 "stack page for the process."
 msgstr ""
 "O valor actual de esp (apontador de pilha 32-bit), tal como encontrado na "
-"p<EFBFBD>gina de pilha do kernel para o processo."
+"página de pilha do kernel para o processo."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "O EIP (apontador de instru<EFBFBD><EFBFBD>o 32-bit) actual."
+msgstr "O EIP (apontador de instrução 32-bit) actual."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -642,15 +653,15 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"Este <EFBFBD> o \"canal\" onde o processo est<EFBFBD> <20> espera.  Este <EFBFBD> o endere<EFBFBD>o de uma "
+"Este é o \"canal\" onde o processo está à espera.  Este é o endereço de uma "
 "chamada de sistema, e pode ser procurado numa lista de nomes caso necessite "
-"de um nome textual.  (Caso tenha uma /etc/psdatabase actualizada, tente ps -l "
-"para ver o campo WCHAN em ac<EFBFBD><EFBFBD>o)"
+"de um nome textual.  (Caso tenha uma /etc/psdatabase actualizada, tente ps -"
+"l para ver o campo WCHAN em acção)"
 
 #. WChan
 #: sysdeps/names/prockernel.c:81
 msgid "This is the textual name of the `nwchan' field."
-msgstr "Este <EFBFBD> o nome textual do campo `nwchan'."
+msgstr "Este é o nome textual do campo `nwchan'."
 
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
@@ -674,19 +685,19 @@ msgstr "Limite Tamanho Residente"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
-msgstr "N<EFBFBD> total p<EFBFBD>ginas em mem<EFBFBD>ria"
+msgstr "Nº total páginas em memória"
 
 #: sysdeps/names/procmem.c:54
 msgid "Number of pages of virtual memory"
-msgstr "N<EFBFBD> de p<EFBFBD>ginas de mem<EFBFBD>ria virtual"
+msgstr "Nº de páginas de memória virtual"
 
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr "N<EFBFBD> de p<EFBFBD>ginas residentes (n<EFBFBD>o em swap)"
+msgstr "Nº de páginas residentes (não em swap)"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
-msgstr "N<EFBFBD> de p<EFBFBD>ginas de mem<EFBFBD>ria partilhada (mmap)"
+msgstr "Nº de páginas de memória partilhada (mmap)"
 
 #: sysdeps/names/procmem.c:57
 msgid ""
@@ -695,16 +706,15 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"N<EFBFBD>mero de p<EFBFBD>ginas que um processo tem em mem<EFBFBD>ria real, menos 3 para tarefas "
-"administrativas. Estas s<EFBFBD>o apenas as p<EFBFBD>ginas que contam para espa<EFBFBD>o de texto, "
-"dados ou pilha. N<EFBFBD>o inclui p<EFBFBD>ginas que n<EFBFBD>o foram mandadas carregar, ou que est<73>o "
-"em swap."
+"Número de páginas que um processo tem em memória real, menos 3 para tarefas "
+"administrativas. Estas são apenas as páginas que contam para espaço de "
+"texto, dados ou pilha. Não inclui páginas que não foram mandadas carregar, "
+"ou que estão em swap."
 
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr ""
-"Limite actual em bytes do rss do processo (normalmente 2,147,483,647)."
+msgstr "Limite actual em bytes do rss do processo (normalmente 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -728,15 +738,15 @@ msgstr "Tamanho Sujo"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr "C<EFBFBD>digo_In<EFBFBD>cio"
+msgstr "Código_Início"
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr "C<EFBFBD>digo_Fim"
+msgstr "Código_Fim"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr "In<EFBFBD>cio_Pilha"
+msgstr "Início_Pilha"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
@@ -756,19 +766,19 @@ msgstr "Tamanho residente de pilha"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr "Tamanho total de p<EFBFBD>ginas sujas"
+msgstr "Tamanho total de páginas sujas"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
-msgstr "Endere<EFBFBD>o do in<EFBFBD>cio do segmento de c<EFBFBD>digo"
+msgstr "Endereço do início do segmento de código"
 
 #: sysdeps/names/procsegment.c:54
 msgid "Address of end of code segment"
-msgstr "Endere<EFBFBD>o do fim do segmento de c<EFBFBD>digo"
+msgstr "Endereço do fim do segmento de código"
 
 #: sysdeps/names/procsegment.c:55
 msgid "Address of the bottom of stack segment"
-msgstr "Endere<EFBFBD>o do fundo do segmento de pilha"
+msgstr "Endereço do fundo do segmento de pilha"
 
 #: sysdeps/names/procsignal.c:40
 msgid "Signal"
@@ -788,19 +798,19 @@ msgstr "SigCatch"
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
-msgstr "M<EFBFBD>scara de sinais pendentes"
+msgstr "Máscara de sinais pendentes"
 
 #: sysdeps/names/procsignal.c:46
 msgid "Mask of blocked signals"
-msgstr "M<EFBFBD>scara de sinais bloqueados"
+msgstr "Máscara de sinais bloqueados"
 
 #: sysdeps/names/procsignal.c:47
 msgid "Mask of ignored signals"
-msgstr "M<EFBFBD>scara de sinais ignorados"
+msgstr "Máscara de sinais ignorados"
 
 #: sysdeps/names/procsignal.c:48
 msgid "Mask of caught signals"
-msgstr "M<EFBFBD>scara de sinais apanhados"
+msgstr "Máscara de sinais apanhados"
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
@@ -820,11 +830,11 @@ msgstr "GID"
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
-msgstr "Nome base do ficheiro execut<EFBFBD>vel na chamada a exec()"
+msgstr "Nome base do ficheiro executável na chamada a exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "C<EFBFBD>digo de caracter <EFBFBD>nico para estado de processo (S=Dormir)"
+msgstr "Código de caracter único para estado de processo (S=Dormir)"
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
@@ -836,7 +846,7 @@ msgstr "GID do processo"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr "Hora_In<EFBFBD>cio"
+msgstr "Hora_Início"
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
@@ -868,7 +878,7 @@ msgstr "Seu_Valor_Real"
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
-msgstr "Frequ<EFBFBD>ncia"
+msgstr "Frequência"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
@@ -880,11 +890,11 @@ msgstr "XCPU_TempoS"
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
-msgstr "Tempo de in<EFBFBD>cio do processo, em segundos, desde a epoch"
+msgstr "Tempo de início do processo, em segundos, desde a epoch"
 
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Tempo real acumulado pelo processo (dever<EFBFBD> ser TempoU + TempoS)"
+msgstr "Tempo real acumulado pelo processo (deverá ser TempoU + TempoS)"
 
 #: sysdeps/names/proctime.c:53
 msgid "user-mode CPU time accumulated by process"
@@ -904,19 +914,19 @@ msgstr "TempoS acumulado do processo e seus filhos"
 
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "O tempo (em jiffies) da pr<EFBFBD>xima expira<EFBFBD><EFBFBD>o do processo"
+msgstr "O tempo (em jiffies) da próxima expiração do processo"
 
 #: sysdeps/names/proctime.c:58
 msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"O tempo (em jiffies) antes do pr<EFBFBD>ximo SIGALRM ser enviado ao processo devido "
+"O tempo (em jiffies) antes do próximo SIGALRM ser enviado ao processo devido "
 "ao temporizador de intrevalo."
 
 #: sysdeps/names/proctime.c:60
 msgid "Tick frequency"
-msgstr "Frequ<EFBFBD>ncia de batida"
+msgstr "Frequência de batida"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
@@ -956,7 +966,7 @@ msgstr "PGrp"
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr "Sess<EFBFBD>o"
+msgstr "Sessão"
 
 #: sysdeps/names/procuid.c:57
 msgid "Tty"
@@ -1000,11 +1010,11 @@ msgstr "ID do grupo do processo"
 
 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
-msgstr "ID Sess<EFBFBD>o"
+msgstr "ID Sessão"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr "N<EFBFBD> completo do dispositivo do terminal de controlo"
+msgstr "Nº completo do dispositivo do terminal de controlo"
 
 #: sysdeps/names/procuid.c:72
 msgid "Terminal process group ID"
@@ -1016,35 +1026,35 @@ msgstr "Prioridade de agendamento do Kernel"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "N<EFBFBD>vel nice standard do processo"
+msgstr "Nível nice standard do processo"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "N<EFBFBD> de entradas no mapa de sem<EFBFBD>foro"
+msgstr "Nº de entradas no mapa de semáforo"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
-msgstr "N<EFBFBD> m<EFBFBD>x de arrays"
+msgstr "Nº máx de arrays"
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "M<EFBFBD>x sem<EFBFBD>foros em todo o sistema"
+msgstr "Máx semáforos em todo o sistema"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr "N<EFBFBD> de estruturas de desfazer em todo o sistema"
+msgstr "Nº de estruturas de desfazer em todo o sistema"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
-msgstr "M<EFBFBD>x de sem<EFBFBD>foros por array"
+msgstr "Máx de semáforos por array"
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr "M<EFBFBD>x ops por chamada sem<EFBFBD>foro"
+msgstr "Máx ops por chamada semáforo"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "N<EFBFBD> m<EFBFBD>x de entradas de desfazer por processo"
+msgstr "Nº máx de entradas de desfazer por processo"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1052,59 +1062,60 @@ msgstr "sizeof struct sem_undo"
 
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
-msgstr "Valor m<EFBFBD>x sem<EFBFBD>foro"
+msgstr "Valor máx semáforo"
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "Ajustar valor m<EFBFBD>x <EFBFBD> saida"
+msgstr "Ajustar valor máx à saida"
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "Tamanho m<EFBFBD>x segmento"
+msgstr "Tamanho máx segmento"
 
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "Tamanho m<EFBFBD>n segmento"
+msgstr "Tamanho mín segmento"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
-msgstr "N<EFBFBD> m<EFBFBD>ximo de segmentos"
+msgstr "Nº máximo de segmentos"
 
 #: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max shared segments per process"
-msgstr "N<EFBFBD> m<EFBFBD>x segmentos partilhados por processo"
+msgstr "Nº máx segmentos partilhados por processo"
 
 #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max total shared memory"
-msgstr "Mem<EFBFBD>ria partilhada total m<EFBFBD>x"
+msgstr "Memória partilhada total máx"
 
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
 msgid "Total Swap Space"
-msgstr "Espa<EFBFBD>o Total de Swap"
+msgstr "Espaço Total de Swap"
 
 #: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49
 msgid "Used Swap Space"
-msgstr "Espa<EFBFBD>o Swap Ocupado"
+msgstr "Espaço Swap Ocupado"
 
 #: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
 msgid "Free Swap Space"
-msgstr "Espa<EFBFBD>o Swap Livre"
+msgstr "Espaço Swap Livre"
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr "P<EFBFBD>ginas Entradas"
+msgstr "Páginas Entradas"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr "P<EFBFBD>ginas Saidas"
+msgstr "Páginas Saidas"
 
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
-msgstr "N<EFBFBD>mero total de p<>ginas swap que foram chamadas desde que o sistema arrancou"
+msgstr ""
+"Número total de páginas swap que foram chamadas desde que o sistema arrancou"
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
-msgstr "N<EFBFBD>mero total de p<EFBFBD>ginas colocadas em swap desde que o sistema arrancou"
+msgstr "Número total de páginas colocadas em swap desde que o sistema arrancou"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
@@ -1112,15 +1123,15 @@ msgstr "Funcionalidades Servidor"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
-msgstr "Utiliza<EFBFBD><EFBFBD>o CPU"
+msgstr "Utilização CPU"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr "Utiliza<EFBFBD><EFBFBD>o Mem<EFBFBD>ria"
+msgstr "Utilização Memória"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr "Utiliza<EFBFBD><EFBFBD>o Swap"
+msgstr "Utilização Swap"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
@@ -1128,11 +1139,11 @@ msgstr "Tempo em Funcionamento"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
-msgstr "Carga M<EFBFBD>dia"
+msgstr "Carga Média"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
-msgstr "Limites da Mem<EFBFBD>ria Partilhada"
+msgstr "Limites da Memória Partilhada"
 
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
@@ -1140,39 +1151,39 @@ msgstr "Limites da Fila de Mensagens"
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
-msgstr "Limites da Defini<EFBFBD><EFBFBD>o Sem<EFBFBD>foros"
+msgstr "Limites da Definição Semáforos"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
-msgstr "Lista de Processos em execu<EFBFBD><EFBFBD>o"
+msgstr "Lista de Processos em execução"
 
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "Process Status information"
-msgstr "Informa<EFBFBD><EFBFBD>o do Estado dos Processos"
+msgstr "Informação do Estado dos Processos"
 
 #: sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:87
 msgid "Process UID and TTY information"
-msgstr "Informa<EFBFBD><EFBFBD>o da TTY e UID dos Processos"
+msgstr "Informação da TTY e UID dos Processos"
 
 #: sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:88
 msgid "Process Memory information"
-msgstr "Informa<EFBFBD><EFBFBD>o de Mem<EFBFBD>ria dos Processos"
+msgstr "Informação de Memória dos Processos"
 
 #: sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:89
 msgid "Process Time information"
-msgstr "Informa<EFBFBD><EFBFBD>o de Tempo de Processamento"
+msgstr "Informação de Tempo de Processamento"
 
 #: sysdeps/names/sysdeps.c:63 sysdeps/names/sysdeps.c:90
 msgid "Process Signal information"
-msgstr "Informa<EFBFBD><EFBFBD>o de Sinais de Processos"
+msgstr "Informação de Sinais de Processos"
 
 #: sysdeps/names/sysdeps.c:64 sysdeps/names/sysdeps.c:91
 msgid "Process Kernel Data information"
-msgstr "Informa<EFBFBD><EFBFBD>o de Dados de Kernel de Processos"
+msgstr "Informação de Dados de Kernel de Processos"
 
 #: sysdeps/names/sysdeps.c:65 sysdeps/names/sysdeps.c:92
 msgid "Process Segment information"
-msgstr "Informa<EFBFBD><EFBFBD>o de Segmentos dos Processos"
+msgstr "Informação de Segmentos dos Processos"
 
 #: sysdeps/names/sysdeps.c:66
 msgid "Process Arguments"
@@ -1180,7 +1191,7 @@ msgstr "Argumentos dos Processos"
 
 #: sysdeps/names/sysdeps.c:67 sysdeps/names/sysdeps.c:94
 msgid "Process Memory Map"
-msgstr "Mapa de Mem<EFBFBD>ria dos Processos"
+msgstr "Mapa de Memória dos Processos"
 
 #: sysdeps/names/sysdeps.c:68
 msgid "Mount List"
@@ -1196,7 +1207,7 @@ msgstr "Carga de Rede"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
-msgstr "Estat<EFBFBD>ticas PPP"
+msgstr "Estatíticas PPP"
 
 #: sysdeps/names/sysdeps.c:93
 msgid "Command line arguments of the process"
@@ -1236,7 +1247,7 @@ msgstr "Sair"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "Instru<EFBFBD><EFBFBD>o ilegal"
+msgstr "Instrução ilegal"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
@@ -1252,7 +1263,7 @@ msgstr "Erro EMT"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "Excep<EFBFBD><EFBFBD>o de v<EFBFBD>rgula flutuante"
+msgstr "Excepção de vírgula flutuante"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
@@ -1264,11 +1275,11 @@ msgstr "Erro de Bus"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Viola<EFBFBD><EFBFBD>o de segmenta<EFBFBD><EFBFBD>o"
+msgstr "Violação de segmentação"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Argumento inv<EFBFBD>lido em chamada de sistema"
+msgstr "Argumento inválido em chamada de sistema"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
@@ -1284,7 +1295,7 @@ msgstr "Terminar"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Condi<EFBFBD><EFBFBD>o urgente no socket"
+msgstr "Condição urgente no socket"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1312,7 +1323,7 @@ msgstr "Escrita em background para tty"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "I/O agora poss<EFBFBD>vel"
+msgstr "I/O agora possível"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
@@ -1332,11 +1343,11 @@ msgstr "Alarme de profiling"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "Modifica<EFBFBD><EFBFBD>o de tamanho de janela"
+msgstr "Modificação de tamanho de janela"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Pedido de informa<EFBFBD><EFBFBD>o"
+msgstr "Pedido de informação"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"

po/sk.po

@@ -1,16 +1,16 @@
 # libgtop sk.po
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-# Marcel Telka <marcel@telka.sk>, 2001, 2003.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Marcel Telka <marcel@telka.sk>, 2001, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0\n"
-"POT-Creation-Date: 2003-05-13 18:49+0200\n"
-"PO-Revision-Date: 2003-05-13 18:54+0200\n"
-"Last-Translator: Marcel Telka <marcel@telka.sk>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"POT-Creation-Date: 2002-04-24 10:24+0200\n"
+"PO-Revision-Date: 2002-04-24 10:29+0100\n"
+"Last-Translator: Marcel Telka <Marcel@telka.sk>\n"
+"Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
@@ -113,39 +113,39 @@ msgstr "na
 msgid "write %d bytes"
 msgstr "zap<61>san<61> %d bajtov"
 
-#: src/daemon/gnuserv.c:453
+#: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
 msgstr "Povoli<6C> ladenie"
 
-#: src/daemon/gnuserv.c:453
+#: src/daemon/gnuserv.c:448
 msgid "DEBUG"
 msgstr "LADENIE"
 
-#: src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
 msgstr "Povoli<6C> detailn<6C> v<>pis"
 
-#: src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
 msgstr "DETAILNE"
 
-#: src/daemon/gnuserv.c:457
+#: src/daemon/gnuserv.c:452
 msgid "Don't fork into background"
 msgstr "Nerozvetvuj sa do pozadia"
 
-#: src/daemon/gnuserv.c:457
+#: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
 msgstr "NO-DAEMON"
 
-#: src/daemon/gnuserv.c:459
+#: src/daemon/gnuserv.c:454
 msgid "Invoked from inetd"
 msgstr "Vyvolan<61> cez inetd"
 
-#: src/daemon/gnuserv.c:459
+#: src/daemon/gnuserv.c:454
 msgid "INETD"
 msgstr "INETD"
 
-#: src/daemon/gnuserv.c:493
+#: src/daemon/gnuserv.c:488
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -220,11 +220,11 @@ msgstr "%s: vo
 
 #: support/popthelp.c:35
 msgid "Show this help message"
-msgstr "Zobrazi<EFBFBD> t<>to spr<70>vu pomocn<63>ka"
+msgstr "Uk<EFBFBD>za<EFBFBD> t<>to spr<70>vu pomocn<63>ka"
 
 #: support/popthelp.c:36
 msgid "Display brief usage message"
-msgstr "Zobrazi<7A> kr<EFBFBD>tky n<>vod na pou<6F>itie"
+msgstr "Zobrazi<7A> stru<EFBFBD>n<EFBFBD> spr<70>vu o pou<6F><75>van<61>"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"

po/sl.po

@@ -5,12 +5,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
-"POT-Creation-Date: 2001-01-22 17:29+0100\n"
+"POT-Creation-Date: 2002-04-30 01:04+0200\n"
 "PO-Revision-Date: 2000-05-22 02:46+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
@@ -36,7 +36,7 @@ msgstr "Sistem"
 
 #: examples/smp.c:71
 msgid "Idle"
-msgstr "Prazni <EFBFBD>as"
+msgstr "Prazni čas"
 
 #: examples/smp.c:73
 #, c-format
@@ -115,15 +115,15 @@ msgstr "zapisal %d bajtov"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "Vklju<EFBFBD>i razhro<EFBFBD><EFBFBD>evanje"
+msgstr "Vključi razhroščevanje"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
-msgstr "RAZHRO<EFBFBD><EFBFBD>UJ"
+msgstr "RAZHROŠČUJ"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr "Vklju<EFBFBD>i zgovoren izhod"
+msgstr "Vključi zgovoren izhod"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
@@ -151,8 +151,9 @@ msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Napaka ob mo<EFBFBD>nosti %s: %s.\n"
-"Po<EFBFBD>enite '%s --help', <EFBFBD>e <EFBFBD>elite videti popoln seznam mo<EFBFBD>nosti ukazne vrstice.\n" 
+"Napaka ob možnosti %s: %s.\n"
+"Poženite '%s --help', če želite videti popoln seznam možnosti ukazne "
+"vrstice.\n"
 
 #: support/error.c:109
 msgid "Unknown system error"
@@ -217,25 +218,33 @@ msgstr "%s: opcija `-W %s' je dvoumna\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dovoli argumenta\n"
 
+#: support/popthelp.c:35
+msgid "Show this help message"
+msgstr "Kaži to sporočilo s pomočjo"
+
+#: support/popthelp.c:36
+msgid "Display brief usage message"
+msgstr "Kaži kratko sporočilo o uporabi"
+
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
-msgstr "Celoten CPU <EFBFBD>as"
+msgstr "Celoten CPU čas"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr "CPU <EFBFBD>as v uporabni<EFBFBD>kem na<EFBFBD>inu"
+msgstr "CPU Čas v uporabniškem načinu"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "CPU <EFBFBD>as v uporabni<EFBFBD>kem na<EFBFBD>inu (nice)"
+msgstr "CPU čas v uporabniškem načinu (nice)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
-msgstr "CPU <EFBFBD>as v sistemskem na<EFBFBD>inu"
+msgstr "CPU čas v sistemskem načinu"
 
 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
-msgstr "CPU <EFBFBD>as v praznih poslih"
+msgstr "CPU čas v praznih poslih"
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
@@ -243,44 +252,44 @@ msgstr "Frekvenca merjenja"
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr "SMP celoten CPU <EFBFBD>as"
+msgstr "SMP celoten CPU čas"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "SMP CPU <EFBFBD>as v uporabni<EFBFBD>kem na<EFBFBD>inu"
+msgstr "SMP CPU čas v uporabniškem načinu"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "SMP CPU <EFBFBD>as v uporabni<EFBFBD>kem na<EFBFBD>inu (nice)"
+msgstr "SMP CPU čas v uporabniškem načinu (nice)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "SMP CPU <EFBFBD>as v sistemskem na<EFBFBD>inu"
+msgstr "SMP CPU čas v sistemskem načinu"
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr "SMP CPU <EFBFBD>as v praznih poslih"
+msgstr "SMP CPU čas v praznih poslih"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
-msgstr "<EFBFBD>tevilo klikov ure od zagona sistema"
+msgstr "Število klikov ure od zagona sistema"
 
 #: sysdeps/names/cpu.c:59 sysdeps/names/cpu.c:65
 msgid "Number of clock ticks the system spent in user mode"
-msgstr "<EFBFBD>tevilo klikov ure, ki jih je sistem prebil v uporabni<EFBFBD>kem na<EFBFBD>inu"
+msgstr "Število klikov ure, ki jih je sistem prebil v uporabniškem načinu"
 
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
 msgstr ""
-"<EFBFBD>tevilo klikov ure, ki jih je sistem prebil v uporabni<EFBFBD>kem na<EFBFBD>inu (nice)"
+"Število klikov ure, ki jih je sistem prebil v uporabniškem načinu (nice)"
 
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in system mode"
-msgstr "<EFBFBD>tevilo klikov ure, ki jih je sistem prebil v sistemskem na<EFBFBD>inu"
+msgstr "Število klikov ure, ki jih je sistem prebil v sistemskem načinu"
 
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr "<EFBFBD>tevilo klikov ure, ki jih je sistem prebil v praznih poslih"
+msgstr "Število klikov ure, ki jih je sistem prebil v praznih poslih"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
@@ -300,11 +309,11 @@ msgstr "Blokov na voljo"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
-msgstr "Skupno datote<EFBFBD>nih vozli<EFBFBD><EFBFBD>"
+msgstr "Skupno datotečnih vozlišč"
 
 #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
 msgid "Free file nodes"
-msgstr "Prostih datote<EFBFBD>nih vozli<EFBFBD><EFBFBD>"
+msgstr "Prostih datotečnih vozlišč"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
@@ -316,7 +325,7 @@ msgstr "Prosti bloki na voljo ne-superuporabikom"
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
-msgstr "Povpre<EFBFBD>na zasedenost"
+msgstr "Povprečna zasedenost"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
@@ -324,7 +333,7 @@ msgstr "Posli v teku"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "<EFBFBD>tevilo poslov"
+msgstr "Število poslov"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
@@ -332,15 +341,15 @@ msgstr "Zadnji PID"
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "<EFBFBD>tevilo poslov, ki se izvaja hkrati, povpre<EFBFBD>ja skozi 1, 5 in 15 minut"
+msgstr "Število poslov, ki se izvaja hkrati, povprečja skozi 1, 5 in 15 minut"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "<EFBFBD>tevilo poslov, ki trenutno te<EFBFBD>ejo"
+msgstr "Število poslov, ki trenutno tečejo"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Total number of tasks"
-msgstr "Skupno <EFBFBD>tevilo poslov"
+msgstr "Skupno število poslov"
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
@@ -372,11 +381,11 @@ msgstr "Zaklenjen"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr "Skupno fizi<EFBFBD>nega pomnilnika v kB"
+msgstr "Skupno fizičnega pomnilnika v kB"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
-msgstr "Koli<EFBFBD>ina pomnilnika v uporabi v kB"
+msgstr "Količina pomnilnika v uporabi v kB"
 
 #: sysdeps/names/mem.c:55
 msgid "Free memory size in kB"
@@ -396,7 +405,7 @@ msgstr "Velikost predpomnjenega pomnilnika v kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
-msgstr "Porabljenega pomnilnika za uporabni<EFBFBD>ke procese v kB"
+msgstr "Porabljenega pomnilnika za uporabniške procese v kB"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
@@ -406,7 +415,7 @@ msgstr "Pomnilnika v zaklenjenih straneh v kB"
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45
 msgid "Number of list elements"
-msgstr "<EFBFBD>tevilo elementov seznama"
+msgstr "Število elementov seznama"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
@@ -422,31 +431,31 @@ msgstr "Velikost enega elementa seznama"
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr "Velikost sporo<EFBFBD>ilnega bazena v kilobajtih"
+msgstr "Velikost sporočilnega bazena v kilobajtih"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
-msgstr "<EFBFBD>tevilo vnosov v karto sporo<EFBFBD>il"
+msgstr "Število vnosov v karto sporočil"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr "Najve<EFBFBD>ja velikost sporo<EFBFBD>ila"
+msgstr "Največja velikost sporočila"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Privzeto najve<EFBFBD>ja dol<EFBFBD>ina vrste"
+msgstr "Privzeto največja dolžina vrste"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo vrst sistemsko"
+msgstr "Največje število vrst sistemsko"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
-msgstr "Velikost segmenta za sporo<EFBFBD>ila"
+msgstr "Velikost segmenta za sporočila"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Number of system message headers"
-msgstr "<EFBFBD>tevilo glav za sistemska sporo<EFBFBD>ila"
+msgstr "Število glav za sistemska sporočila"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
@@ -502,11 +511,11 @@ msgstr "Skupaj napak"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr "Tr<EFBFBD>enj"
+msgstr "Trčenj"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr "Najve<EFBFBD>ja enota prenosa (MTU)"
+msgstr "Največja enota prenosa (MTU)"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
@@ -522,11 +531,11 @@ msgstr "Izhodnih bajtov"
 
 #: sysdeps/names/ppp.c:46
 msgid "Number of input bytes"
-msgstr "<EFBFBD>tevilo vhodnih bajtov"
+msgstr "Število vhodnih bajtov"
 
 #: sysdeps/names/ppp.c:47
 msgid "Number of output bytes"
-msgstr "<EFBFBD>tevilo izhodnih bajtov"
+msgstr "Število izhodnih bajtov"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
@@ -534,7 +543,7 @@ msgstr "Velikost"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
-msgstr "Dol<EFBFBD>ina vrnenega niza v bajtih"
+msgstr "Dolžina vrnenega niza v bajtih"
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
@@ -587,11 +596,11 @@ msgstr ""
 "Zastavice procesov, ki jih ima jedro.\n"
 "\n"
 "Trenutno ima vsaka zastavica v linuxu nastavljen matematicni bit, ker crt0.s "
-"preverja za matemati<EFBFBD>no emulacijo, tako da to ni vklju<EFBFBD>eno v izpis.\n"
+"preverja za matematično emulacijo, tako da to ni vključeno v izpis.\n"
 "\n"
 "To je verjetno napaka, saj ni vsak proces preveden C program.\n"
 "\n"
-"Matemati<EFBFBD>ni bit bi mogel biti decimalno 4 in sledljivi bit je decimalno 10."
+"Matematični bit bi mogel biti decimalno 4 in sledljivi bit je decimalno 10."
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:59
@@ -599,8 +608,8 @@ msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
 msgstr ""
-"<EFBFBD>tevilo majhnih spodrslajev, ki jih je proces sotril - tistih, ki ne "
-"povzro<EFBFBD>ijo nalaganja pomnilni<EFBFBD>ke strani z diska."
+"Število majhnih spodrslajev, ki jih je proces sotril - tistih, ki ne "
+"povzročijo nalaganja pomnilniške strani z diska."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:62
@@ -608,21 +617,21 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"<EFBFBD>tevilo velikih spodrslajev, ki jih je proces sotril - tistih, ki povzro<EFBFBD>ijo "
-"nalaganja pomnilni<EFBFBD>ke strani z diska."
+"Število velikih spodrslajev, ki jih je proces sotril - tistih, ki povzročijo "
+"nalaganja pomnilniške strani z diska."
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:65
 msgid "The number of minor faults that the process and its children have made."
 msgstr ""
-"<EFBFBD>tevilo majhnih spodrsljajev, ki so jih povzro<EFBFBD>ili proces in njegovi "
+"Število majhnih spodrsljajev, ki so jih povzročili proces in njegovi "
 "nasledniki."
 
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:68
 msgid "The number of major faults that the process and its children have made."
 msgstr ""
-"<EFBFBD>tevilo velikih spodrsljajev, ki so jih povzro<EFBFBD>ili proces in njegovi "
+"Število velikih spodrsljajev, ki so jih povzročili proces in njegovi "
 "nasledniki."
 
 #. KStk_ESP
@@ -646,9 +655,9 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"To je \"kanal\" v katerem <EFBFBD>aka proces. To je naslov sistemskega klica in se "
-"lahko najde v seznamu imen, <EFBFBD>e potrebujete tekstovno ime.  (<EFBFBD>e imate osve<EFBFBD>en "
-"/etc/psdatabase, poizkusite ps -l, da vidite polje WCHAN na delu)"
+"To je \"kanal\" v katerem čaka proces. To je naslov sistemskega klica in se "
+"lahko najde v seznamu imen, če potrebujete tekstovno ime.  (Če imate "
+"osvežen /etc/psdatabase, poizkusite ps -l, da vidite polje WCHAN na delu)"
 
 #. WChan
 #: sysdeps/names/prockernel.c:81
@@ -669,27 +678,27 @@ msgstr "Deljen"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
-msgstr "Velikost v fizi<EFBFBD>nem pomnilniku"
+msgstr "Velikost v fizičnem pomnilniku"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr "Limit velikosti v fizi<EFBFBD>nem pomnilniku"
+msgstr "Limit velikosti v fizičnem pomnilniku"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
-msgstr "Skupno <EFBFBD>tevilo strani v pomnilniku"
+msgstr "Skupno število strani v pomnilniku"
 
 #: sysdeps/names/procmem.c:54
 msgid "Number of pages of virtual memory"
-msgstr "<EFBFBD>tevilo strani navideznega pomnilnika"
+msgstr "Število strani navideznega pomnilnika"
 
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr "<EFBFBD>tevilo reziden<EFBFBD>nih strani"
+msgstr "Število rezidenčnih strani"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
-msgstr "<EFBFBD>tevilo deljenih (z mmap) strani"
+msgstr "Število deljenih (z mmap) strani"
 
 #: sysdeps/names/procmem.c:57
 msgid ""
@@ -698,16 +707,16 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"<EFBFBD>tevilo strani, ki jih ima proces v real pomnilniku, minus 3 za "
-"administrativne potrebe To so le strani, ki <EFBFBD>tejejo kot prostor za text, "
-"podatke ali sklad.To ne vklju<EFBFBD>uje strani, ki niso bile nalo<EFBFBD>ene po <EFBFBD>elji in "
+"Število strani, ki jih ima proces v real pomnilniku, minus 3 za "
+"administrativne potrebe To so le strani, ki štejejo kot prostor za text, "
+"podatke ali sklad.To ne vključuje strani, ki niso bile naložene po želji in "
 "tiste, ki sotrenutno v navideznem pomnilniku na disku."
 
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"Trenutni limit reziden<EFBFBD>nih bajtov procesa (rss) (navadno 2,147,483,647)."
+"Trenutni limit rezidenčnih bajtov procesa (rss) (navadno 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -731,7 +740,7 @@ msgstr "Velikost umazanije"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr "Za<EFBFBD>etnek_Kode"
+msgstr "Začetnek_Kode"
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
@@ -739,23 +748,23 @@ msgstr "Konec_Kode"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr "Za<EFBFBD>etek_Sklada"
+msgstr "Začetek_Sklada"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr "Velikost text v fizi<EFBFBD>nem pomnilniku"
+msgstr "Velikost text v fizičnem pomnilniku"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
-msgstr "Velikost deljenih knji<EFBFBD>nic v fizi<EFBFBD>nem pomnilniku"
+msgstr "Velikost deljenih knjižnic v fizičnem pomnilniku"
 
 #: sysdeps/names/procsegment.c:50
 msgid "Data resident set size"
-msgstr "Velikost podatkov v fizi<EFBFBD>nem pomnilniku"
+msgstr "Velikost podatkov v fizičnem pomnilniku"
 
 #: sysdeps/names/procsegment.c:51
 msgid "Stack resident set size"
-msgstr "Velikost sklada v fizi<EFBFBD>nem pomnilniku"
+msgstr "Velikost sklada v fizičnem pomnilniku"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
@@ -763,7 +772,7 @@ msgstr "Skupna velikost umazanih strani"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
-msgstr "Naslov za<EFBFBD>etka kodnega segmenta"
+msgstr "Naslov začetka kodnega segmenta"
 
 #: sysdeps/names/procsegment.c:54
 msgid "Address of end of code segment"
@@ -791,7 +800,7 @@ msgstr "SigUjet"
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
-msgstr "Maska <EFBFBD>akajo<EFBFBD>ih signalov"
+msgstr "Maska čakajočih signalov"
 
 #: sysdeps/names/procsignal.c:46
 msgid "Mask of blocked signals"
@@ -823,7 +832,7 @@ msgstr "GID"
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
-msgstr "Glavno ime izvr<EFBFBD>ilne datoteke v klicu exec()"
+msgstr "Glavno ime izvršilne datoteke v klicu exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
@@ -839,35 +848,35 @@ msgstr "GID procesa"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr "Za<EFBFBD>etni_<EFBFBD>as"
+msgstr "Začetni_Čas"
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr "R<EFBFBD>as"
+msgstr "RČas"
 
 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr "U<EFBFBD>as"
+msgstr "UČas"
 
 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr "S<EFBFBD>as"
+msgstr "SČas"
 
 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
-msgstr "CU<EFBFBD>as"
+msgstr "CUČas"
 
 #: sysdeps/names/proctime.c:45
 msgid "CSTime"
-msgstr "CS<EFBFBD>as"
+msgstr "CSČas"
 
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr "Iztek <EFBFBD>asa"
+msgstr "Iztek časa"
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr "It_Resni<EFBFBD>na_Vrednost"
+msgstr "It_Resnična_Vrednost"
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -875,47 +884,47 @@ msgstr "Frekvenca"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
-msgstr "XCPU_U<EFBFBD>as"
+msgstr "XCPU_UČas"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_STime"
-msgstr "XCPU_S<EFBFBD>as"
+msgstr "XCPU_SČas"
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
-msgstr "Za<EFBFBD>etni <EFBFBD>as procesa v sekundah od epoha"
+msgstr "Začetni čas procesa v sekundah od epoha"
 
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Resni<EFBFBD>ni akumuliran procesa (mora bi biti u<EFBFBD>as + s<EFBFBD>as)"
+msgstr "Resnični akumuliran procesa (mora bi biti učas + sčas)"
 
 #: sysdeps/names/proctime.c:53
 msgid "user-mode CPU time accumulated by process"
-msgstr "akumuliran CPU <EFBFBD>as procesa v uporabni<EFBFBD>kem na<EFBFBD>inu"
+msgstr "akumuliran CPU čas procesa v uporabniškem načinu"
 
 #: sysdeps/names/proctime.c:54
 msgid "kernel-mode CPU time accumulated by process"
-msgstr "akumuliran CPU <EFBFBD>as v sistemskem na<EFBFBD>inu"
+msgstr "akumuliran CPU čas v sistemskem načinu"
 
 #: sysdeps/names/proctime.c:55
 msgid "cumulative utime of process and reaped children"
-msgstr "komulativen u<EFBFBD>as procesa in prevzetih otrok"
+msgstr "komulativen učas procesa in prevzetih otrok"
 
 #: sysdeps/names/proctime.c:56
 msgid "cumulative stime of process and reaped children"
-msgstr "komulativen s<EFBFBD>as procesa in prevzetih otrok"
+msgstr "komulativen sčas procesa in prevzetih otrok"
 
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "<EFBFBD>as (v jiffijih) naslednjega timeouta procesa"
+msgstr "Čas (v jiffijih) naslednjega timeouta procesa"
 
 #: sysdeps/names/proctime.c:58
 msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"<EFBFBD>as (v jiffijih) preden bo poslan naslednji SIGALRM procesu zaradi "
-"intervalne <EFBFBD>toparice."
+"Čas (v jiffijih) preden bo poslan naslednji SIGALRM procesu zaradi "
+"intervalne štoparice."
 
 #: sysdeps/names/proctime.c:60
 msgid "Tick frequency"
@@ -923,11 +932,11 @@ msgstr "Frekvenca merjenja"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
-msgstr "<EFBFBD>as akumiliran s strani procesa v CPU SMP uporabni<EFBFBD>kem na<EFBFBD>inu"
+msgstr "Čas akumiliran s strani procesa v CPU SMP uporabniškem načinu"
 
 #: sysdeps/names/proctime.c:62
 msgid "SMP kernel-mode CPU time accumulated by process"
-msgstr "<EFBFBD>as akumuliranj s strani procesa v CPU SMP uporabni<EFBFBD>kem na<EFBFBD>inu"
+msgstr "Čas akumuliranj s strani procesa v CPU SMP uporabniškem načinu"
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
@@ -1015,39 +1024,39 @@ msgstr "ID skupine terminalskega procesa"
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr "Prioriteta razporejanja <EFBFBD>asa v jedru"
+msgstr "Prioriteta razporejanja časa v jedru"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Obi<EFBFBD>ajen unix nice nivo procesa"
+msgstr "Običajen unix nice nivo procesa"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "<EFBFBD>tevilo vnosov v karto semaforjev"
+msgstr "Število vnosov v karto semaforjev"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo seznamov"
+msgstr "Največje število seznamov"
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo semaforjev, sistemsko"
+msgstr "Največje Število semaforjev, sistemsko"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo struktur za razveljavitve, sistemsko"
+msgstr "Največje število struktur za razveljavitve, sistemsko"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo semaforjev na seznam"
+msgstr "Največje število semaforjev na seznam"
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr "Najve<EFBFBD> operacij na semop klic"
+msgstr "Največ operacij na semop klic"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "Najve<EFBFBD> vnosov za razveljavitve na proces"
+msgstr "Največ vnosov za razveljavitve na proces"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1055,31 +1064,31 @@ msgstr "velikost strukture sem_undo"
 
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
-msgstr "Najve<EFBFBD>ja vrednost Semaforja"
+msgstr "Največja vrednost Semaforja"
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "Nastavi na izhodu najve<EFBFBD>jo vrednost"
+msgstr "Nastavi na izhodu največjo vrednost"
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "Najve<EFBFBD>ja velikost segmenta"
+msgstr "Največja velikost segmenta"
 
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "Najmanj<EFBFBD>a velikost segmenta"
+msgstr "Najmanjša velikost segmenta"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo segmentov"
+msgstr "Največje število segmentov"
 
 #: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max shared segments per process"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo deljenih segmentov na proces"
+msgstr "Največje število deljenih segmentov na proces"
 
 #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max total shared memory"
-msgstr "Najve<EFBFBD>je <EFBFBD>tevilo skupno deljenega pomnilnika"
+msgstr "Največje število skupno deljenega pomnilnika"
 
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
 msgid "Total Swap Space"
@@ -1103,15 +1112,15 @@ msgstr "Stran Ven"
 
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
-msgstr "Skupno <EFBFBD>tevilo strani z diska, ki so bile nalo<EFBFBD>ene od zagona sistema"
+msgstr "Skupno število strani z diska, ki so bile naložene od zagona sistema"
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
-msgstr "Skupno <EFBFBD>tevilo strani z diska, ki so bile shranjene od zagona sistema"
+msgstr "Skupno število strani z diska, ki so bile shranjene od zagona sistema"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
-msgstr "Lastnosti stre<EFBFBD>nika"
+msgstr "Lastnosti strežnika"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
@@ -1127,11 +1136,11 @@ msgstr "Poraba navideznega pomnilnika na disku"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
-msgstr "<EFBFBD>as od zagona sistema"
+msgstr "Čas od zagona sistema"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
-msgstr "Povpre<EFBFBD>na zasedenost"
+msgstr "Povprečna zasedenost"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
@@ -1139,7 +1148,7 @@ msgstr "Omejitve deljenega pomnilnika"
 
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
-msgstr "Omejitve vrste s sporo<EFBFBD>ili"
+msgstr "Omejitve vrste s sporočili"
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
@@ -1163,7 +1172,7 @@ msgstr "Podatki o pomnilniku procesa"
 
 #: sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:89
 msgid "Process Time information"
-msgstr "Podatki o <EFBFBD>asu procesa"
+msgstr "Podatki o času procesa"
 
 #: sysdeps/names/sysdeps.c:63 sysdeps/names/sysdeps.c:90
 msgid "Process Signal information"
@@ -1183,7 +1192,7 @@ msgstr "Argumenti procesa"
 
 #: sysdeps/names/sysdeps.c:67 sysdeps/names/sysdeps.c:94
 msgid "Process Memory Map"
-msgstr "Pomnilni<EFBFBD>ka karta procesa"
+msgstr "Pomnilniška karta procesa"
 
 #: sysdeps/names/sysdeps.c:68
 msgid "Mount List"
@@ -1191,11 +1200,11 @@ msgstr "Seznam priklopov"
 
 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
 msgid "File System Usage"
-msgstr "Uporaba datote<EFBFBD>nih sistemov"
+msgstr "Uporaba datotečnih sistemov"
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
-msgstr "Zasedenost mre<EFBFBD>e"
+msgstr "Zasedenost mreže"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
@@ -1207,27 +1216,27 @@ msgstr "Argumenti ukazne vrstice za proces"
 
 #: sysdeps/names/sysdeps.c:95
 msgid "List of currently mounted filesystems"
-msgstr "Seznam trenutno priklopljenih datote<EFBFBD>nih sistemov"
+msgstr "Seznam trenutno priklopljenih datotečnih sistemov"
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr "<EFBFBD>as od zagona"
+msgstr "Čas od zagona"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
-msgstr "Prazni <EFBFBD>as"
+msgstr "Prazni čas"
 
 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
-msgstr "<EFBFBD>as v sekundah od zagona sistema"
+msgstr "Čas v sekundah od zagona sistema"
 
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr "<EFBFBD>as v sekundah, ki jih je sistem prebil v praznih procesih od zagona"
+msgstr "Čas v sekundah, ki jih je sistem prebil v praznih procesih od zagona"
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr "Odlo<EFBFBD>i"
+msgstr "Odloži"
 
 #: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
@@ -1255,7 +1264,7 @@ msgstr "Napaka EMT"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "Izjema plavajo<EFBFBD>e vejice"
+msgstr "Izjema plavajoče vejice"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
@@ -1267,7 +1276,7 @@ msgstr "Napaka vodila"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Segmentacijska kr<EFBFBD>itev"
+msgstr "Segmentacijska kršitev"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
@@ -1283,11 +1292,11 @@ msgstr "Budilka"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
-msgstr "Zaklju<EFBFBD>ek"
+msgstr "Zaključek"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Nujno stanje na vti<EFBFBD>u"
+msgstr "Nujno stanje na vtiču"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1315,15 +1324,15 @@ msgstr "Pisanje na tty v ozadju"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "V/I sedaj mo<EFBFBD>en"
+msgstr "V/I sedaj možen"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "Prekora<EFBFBD>ena omejitev procesorja"
+msgstr "Prekoračena omejitev procesorja"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Prekora<EFBFBD>ena omejitev dol<EFBFBD>ine datoteke"
+msgstr "Prekoračena omejitev dolžine datoteke"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
@@ -1343,11 +1352,11 @@ msgstr "Zahteva po podatkih"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
-msgstr "Uporabni<EFBFBD>ko definiran signal 1"
+msgstr "Uporabniško definiran signal 1"
 
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
-msgstr "Uporabni<EFBFBD>ko definiran signal 2"
+msgstr "Uporabniško definiran signal 2"
 
 #~ msgid "Quit (POSIX)"
 #~ msgstr "Izhod (POSIX)"
@@ -1359,67 +1368,61 @@ msgstr "Uporabni
 #~ msgstr "EMT ukaz"
 
 #~ msgid "Kill, unblockable (POSIX)"
-#~ msgstr "Ubij, nezmo<EFBFBD>en blokiranja (POSIX)"
+#~ msgstr "Ubij, nezmožen blokiranja (POSIX)"
 
 #~ msgid "BUS error (4.2 BSD)"
 #~ msgstr "Napaka na vodilu (4.4 BSD)"
 
 #~ msgid "Stop, unblockable (POSIX)"
-#~ msgstr "Ustavitev, nezmo<EFBFBD>en blokiranja (POSIX)"
+#~ msgstr "Ustavitev, nezmožen blokiranja (POSIX)"
 
 #~ msgid "Power failure restart (System V)"
-#~ msgstr "Prekinitev napajanja - vnovi<EFBFBD>en zagon (System V)"
-
-#~ msgid "Show this help message"
-#~ msgstr "Ka<4B>i to sporo<72>ilo s pomo<6D>jo"
-
-#~ msgid "Display brief usage message"
-#~ msgstr "Ka<4B>i kratko sporo<72>ilo o uporabi"
+#~ msgstr "Prekinitev napajanja - vnovičen zagon (System V)"
 
 #~ msgid "SMP CPU Flags"
 #~ msgstr "SMP CPU Zastavice"
 
 #~ msgid "Start_Data"
-#~ msgstr "Za<EFBFBD>etek_Podatkov"
+#~ msgstr "Začetek_Podatkov"
 
 #~ msgid "End_Data"
 #~ msgstr "Konec_Podatkov"
 
 #~ msgid "Start_Brk"
-#~ msgstr "Za<EFBFBD>etek_Brk"
+#~ msgstr "Začetek_Brk"
 
 #~ msgid "Brk"
 #~ msgstr "Brk"
 
 #~ msgid "Start_MMap"
-#~ msgstr "Za<EFBFBD>etek_MMap"
+#~ msgstr "Začetek_MMap"
 
 #~ msgid "Arg_Start"
-#~ msgstr "Za<EFBFBD>etek_Argumentov"
+#~ msgstr "Začetek_Argumentov"
 
 #~ msgid "Arg_End"
 #~ msgstr "Konec_Argumentov"
 
 #~ msgid "Env_Start"
-#~ msgstr "Za<EFBFBD>etek_Okolja"
+#~ msgstr "Začetek_Okolja"
 
 #~ msgid "Env_End"
 #~ msgstr "Konec_Okolja"
 
 #~ msgid "Address of beginning of data segment"
-#~ msgstr "Naslov za<EFBFBD>etka podatkovnega segmenta"
+#~ msgstr "Naslov začetka podatkovnega segmenta"
 
 #~ msgid "Address of end of data segment"
 #~ msgstr "Naslov konca podatkovnega segmenta"
 
 #~ msgid "Brk_Start"
-#~ msgstr "Brk_Za<EFBFBD>etek"
+#~ msgstr "Brk_Začetek"
 
 #~ msgid "Brk_End"
 #~ msgstr "Brk_Konec"
 
 #~ msgid "Start of mmap()ed areas"
-#~ msgstr "Za<EFBFBD>etek 'mmap'-iranih podro<EFBFBD>ij"
+#~ msgstr "Začetek 'mmap'-iranih področij"
 
 #~ msgid "RUID"
 #~ msgstr "RUID"
@@ -1479,13 +1482,13 @@ msgstr "Uporabni
 #~ msgstr "Shranjen ID skupine"
 
 #~ msgid "Filesystem User ID"
-#~ msgstr "Uporabni<EFBFBD>ki ID datote<EFBFBD>nega sistema"
+#~ msgstr "Uporabniški ID datotečnega sistema"
 
 #~ msgid "Filesystem Group ID"
-#~ msgstr "Skupinski ID datote<EFBFBD>nega sistema"
+#~ msgstr "Skupinski ID datotečnega sistema"
 
 #~ msgid "Number of additional process groups"
-#~ msgstr "<EFBFBD>tevilo dodatnih skupin procesov"
+#~ msgstr "Število dodatnih skupin procesov"
 
 #~ msgid "Additional process groups"
 #~ msgstr "Dodatne skupine procesov"
@@ -1497,22 +1500,22 @@ msgstr "Uporabni
 #~ msgstr "Procesov trenutni delovni imenik"
 
 #~ msgid "Pointer Size on the Server (in bits)"
-#~ msgstr "Velikost kazalca na stre<EFBFBD>niku (v bitih)"
+#~ msgstr "Velikost kazalca na strežniku (v bitih)"
 
 #~ msgid "Current working directory of the process"
 #~ msgstr "Trenutni delovni imenik procesa"
 
 #~ msgid "Boot time"
-#~ msgstr "<EFBFBD>as zagona"
+#~ msgstr "Čas zagona"
 
 #~ msgid "Boot time (seconds sice epoch)"
-#~ msgstr "<EFBFBD>as zagona (sekund od epoha)"
+#~ msgstr "Čas zagona (sekund od epoha)"
 
 #~ msgid "Unknown error"
 #~ msgstr "Neznana napaka"
 
 #~ msgid "Invalid argument"
-#~ msgstr "Napa<EFBFBD>en argument"
+#~ msgstr "Napačen argument"
 
 #~ msgid "No such parameter"
 #~ msgstr "Tak parameter ne obstaja"
@@ -1521,16 +1524,16 @@ msgstr "Uporabni
 #~ msgstr "Poskus spremembe vrednosti, ki se lahko le bere"
 
 #~ msgid "Parameter size mismatch"
-#~ msgstr "Napa<EFBFBD>na velikost parametrov"
+#~ msgstr "Napačna velikost parametrov"
 
 #~ msgid "Communication with LibGTop server failed"
-#~ msgstr "Komunikacija z LibGTop stre<EFBFBD>nikom ni uspela"
+#~ msgstr "Komunikacija z LibGTop strežnikom ni uspela"
 
 #~ msgid "No such process"
-#~ msgstr "Tak<EFBFBD>nega procesa ni"
+#~ msgstr "Takšnega procesa ni"
 
 #~ msgid "No kernel support"
 #~ msgstr "Ni podpore v jedru"
 
 #~ msgid "Incompatible kernel version"
-#~ msgstr "Nekompatibilna razli<EFBFBD>ica jedra"
+#~ msgstr "Nekompatibilna različica jedra"

po/stamp-cat-id

@@ -1 +0,0 @@
-timestamp

po/update.pl

@@ -1,166 +0,0 @@
-#!/usr/bin/perl -w
-
-#  GNOME po update utility.
-#  (C) 2000 The Free Software Foundation
-#
-#  Author(s): Kenneth Christiansen
-
-
-$VERSION = "1.2.5 beta 2";
-$LANG    = $ARGV[0];
-$PACKAGE  = "libgtop";
-
-if (! $LANG){
-    print "update.pl:  missing file arguments\n";
-    print "Try `update.pl --help' for more information.\n";
-    exit;
-}
-
-if ($LANG=~/^-(.)*/){
-
-    if ("$LANG" eq "--version" || "$LANG" eq "-V"){
-        print "GNOME PO Updater $VERSION\n";
-        print "Written by Kenneth Christiansen <kenneth\@gnome.org>, 2000.\n\n";
-        print "Copyright (C) 2000 Free Software Foundation, Inc.\n";
-        print "This is free software; see the source for copying conditions.  There is NO\n";
-        print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
-	exit;
-    }
-
-
-    elsif ($LANG eq "--help" || "$LANG" eq "-H"){
-        print "Usage: ./update.pl [OPTIONS] ...LANGCODE\n";
-        print "Updates pot files and merge them with the translations.\n\n";
-        print "  -V, --version                shows the version\n";
-        print "  -H, --help                   shows this help page\n";
-        print "  -P, --pot                    only generates the potfile\n";
-        print "  -M, --maintain               search for missing files in POTFILES.in\n";
-	print "\nExamples of use:\n";
-        print "update.sh --pot    just creates a new pot file from the source\n";
-	print "update.sh da       created new pot file and updated the da.po file\n\n";
-        print "Report bugs to <kenneth\@gnome.org>.\n";
-	exit;
-    }
-
-    elsif($LANG eq "--pot" || "$LANG" eq "-P"){
-                
-        print "Building the $PACKAGE.pot ...";
-
-        $b="xgettext --default-domain\=$PACKAGE --directory\=\.\."
-          ." --add-comments --keyword\=\_ --keyword\=N\_"
-          ." --files-from\=\.\/POTFILES\.in ";
-        $b1="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot "
-           ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)";
-         
-        `$b`;
-        `$b1`;
-
-        print "...done\n";
-
-        exit;
-    }
-        
-    elsif ($LANG eq "--maintain" || "$LANG" eq "-M"){
-
-        $a="find ../ -print | egrep '.*\\.(c|y|cc|c++|h|gob)' ";
-
-        open(BUF2, "POTFILES.in") || die "update.pl:  there's not POTFILES.in!!!\n";
-        print "Searching for missing _(\" \") entries...\n";
-        open(BUF1, "$a|");
-
-
-        @buf2 = <BUF2>;
-        @buf1 = <BUF1>;
-
-        if (-s "POTFILES.ignore"){
-            open FILE, "POTFILES.ignore";
-            while (<FILE>) {
-                if ($_=~/^[^#]/o){
-                    push @bup, $_;
-                }
-            }
-            print "POTFILES.ignore found! Ignoring files...\n";
-	    @buf2 = (@bup, @buf2);
-        }
-
-        foreach my $file (@buf1){
-            open FILE, "<$file";
-            while (<FILE>) {
-                if ($_=~/_\(\"/o){
-                    $file = unpack("x3 A*",$file) . "\n";
-                    push @buff1, $file;
-                    last;
-                }
-            }
-        }
-
-        @bufff1 = sort (@buff1);
-
-        @bufff2 = sort (@buf2);
-
-        my %in2;
-        foreach (@bufff2) {
-            $in2{$_} = 1;
-        }
-
-        foreach (@bufff1){
-            if (!exists($in2{$_})){
-                push @result, $_ }
-            }
-
-        if(@result){
-            open OUT, ">POTFILES.in.missing";
-            print OUT @result;
-            print "\nHere are the results:\n\n", @result, "\n";
-            print "File POTFILES.in.missing is being placed in directory...\n";
-            print "Please add the files that should be ignored in POTFILES.ignore\n";
-        }
-        else{
-            print "\nWell, it's all perfect! Congratulation!\n";
-        }         
-    }
-
-
-    else{
-        print "update.pl: invalid option -- $LANG\n";
-        print "Try `update.pl --help' for more information.\n";
-    }
-    exit;
-    }
-
-elsif(-s "$LANG.po"){
-
-    print "Building the $PACKAGE.pot ...";
-
-    $c="xgettext --default-domain\=$PACKAGE --directory\=\.\."
-      ." --add-comments --keyword\=\_ --keyword\=N\_"
-      ." --files-from\=\.\/POTFILES\.in ";  
-    $c1="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot "
-       ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)";
-
-    `$c`;
-    `$c1`;
-
-    print "...done";
-
-    print "\nNow merging $LANG.po with $PACKAGE.pot, and creating an updated $LANG.po ...\n";
-
-    
-    $d="mv $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po";
-
-    $f="msgfmt --statistics $LANG.po";
-
-    `$d`;
-    `$f`;
-
-    unlink "messages";
-    unlink "$LANG.po.old";
-
-    exit;
-}
-
-else{
-    print "update.pl:  sorry $LANG.po does not exist!\n";
-    print "Try `update.pl --help' for more information.\n";    
-    exit;
-}

po/update.sh

@@ -1,90 +0,0 @@
-#!/bin/sh
-
-VERSION="1.2.4"
-PACKAGE="libgtop"
-
-if [ "x$1" = "x--help" ]; then
-
-echo Usage: ./update.sh langcode
-echo --help                  display this help and exit
-echo --missing	             search for missing files in POTFILES.in
-echo --version		     shows the version
-echo
-echo Examples of use:
-echo ./update.sh ----- just creates a new pot file from the source
-echo ./update.sh da -- created new pot file and updated the da.po file 
-
-elif [ "x$1" = "x--version" ]; then
-
-echo "update.sh release $VERSION"
-
-elif [ "x$1" = "x--missing" ]; then
-
-echo "Searching for files containing _( ) but missing in POTFILES.in..."
-find ../ -print | egrep '.*\.(c|y|cc|c++|h|gob)' | xargs grep _\( | cut -d: -f1 | uniq | cut -d/ -f2- > POTFILES.in.missing
-
-echo Sorting... comparing...
-sort -d POTFILES.in -o POTFILES.in
-sort -d POTFILES.in.missing -o POTFILES.in.missing
-
-diff POTFILES.in POTFILES.in.missing -u0 | grep '^+' |grep -v '^+++'|grep -v '^@@' > POTFILES.in.missing
-
-if [ -s POTFILES.in.missing ]; then
-
-if [ -s POTFILES.ignore ]; then
-
-sort -d POTFILES.ignore -o POTFILES.tmp
-diff POTFILES.tmp POTFILES.in.missing -u0 | grep '^+' |grep -v '^+++'|grep -v '^@@' > POTFILES.in.missing
-rm POTFILES.tmp
-
-fi
-
-echo && echo "Here are the results:"
-echo && cat POTFILES.in.missing
-echo && echo "File POTFILES.in.missing is being placed in directory..."
-echo "Please add the files that should be ignored in POTFILES.ignore"
-
-else
-
-echo &&echo "There are no missing files, thanks God!"
-rm POTFILES.in.missing
-
-fi 
-
-elif [ "x$1" = "x" ]; then 
-
-echo "Building the $PACKAGE.pot ..."
-
-xgettext --default-domain=$PACKAGE --directory=.. \
-  --add-comments --keyword=_ --keyword=N_ \
-  --files-from=./POTFILES.in \
-&& test ! -f $PACKAGE.po \
-   || ( rm -f ./$PACKAGE.pot \
-&& mv $PACKAGE.po ./$PACKAGE.pot );
-
-else
-
-if [ -s $1.po ]; then
-
-xgettext --default-domain=$PACKAGE --directory=.. \
-  --add-comments --keyword=_ --keyword=N_ \
-  --files-from=./POTFILES.in \
-&& test ! -f $PACKAGE.po \
-   || ( rm -f ./PACKAGE.pot \
-&& mv $PACKAGE.po ./$PACKAGE.pot );
-
-echo "Building the $PACKAGE.pot ..."
-echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..." 
-
-mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po \
-&& rm $1.po.old;
-
-msgfmt --statistics $1.po
-
-else
-
-echo Sorry $1.po does not exist!
-
-fi;
-
-fi;

src/daemon/.cvsignore

@@ -1,7 +1,7 @@
 Makefile.in
 Makefile
-libgtop_daemon
-libgtop_server
+libgtop_daemon2
+libgtop_server2
 server.conf
 .libs
 .deps

src/daemon/ChangeLog

@@ -1,12 +1,3 @@
-2003-05-11  Andrew Sobala  <aes@gnome.org>
-
-	* gnuserv.c: (permitted): fix buffer overflow vulnerability
-
-2001-11-26  Kevin Vandersloot <kfv101@psu.edu>
-
-	* gnuserv.c: Apply patch fixing security issue from
-	intexxia labs - #1048-261101
-
 2001-02-14  Martin Baulig  <baulig@suse.de>
 
 	* Makefile.am (libgtop_server_LDADD): Removed @LIBSUPPORT@.

src/daemon/Makefile.am

@@ -14,43 +14,43 @@
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @INCLUDES@ -D_BSD \
+INCLUDES			= $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
 				  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \
 				  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \
 				  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
 
 if NEED_LIBGTOP
-suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
-suid_common			= $(top_builddir)/sysdeps/common/libgtop_suid_common.la
+suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la
+suid_common			= $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 else
 suid_sysdeps			=
 suid_common			=
 endif
 
-bin_PROGRAMS			= libgtop_daemon @server_programs@
+bin_PROGRAMS			= libgtop_daemon2 @server_programs@
 
-EXTRA_PROGRAMS			= libgtop_server
+EXTRA_PROGRAMS			= libgtop_server2
 
-libgtop_daemon_SOURCES		= gnuserv.c slave.c main.c io.c version.c \
+libgtop_daemon2_SOURCES		= gnuserv.c slave.c main.c io.c version.c \
 				  daemon.h server_config.h
-libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
-				  $(top_builddir)/sysdeps/common/libgtop_common.la \
-				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+				  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 				  @sysdeps_suid_lib@ \
 				  $(suid_sysdeps) $(suid_common)\
-				  $(GLIB_LIBS)\
+				  $(LIBGTOP_LIBS)\
 				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
 
 if ENABLE_STATIC
-libgtop_daemon_LDFLAGS		= -static
+libgtop_daemon2_LDFLAGS		= -static
 endif
 
-libgtop_server_SOURCES		= server.c slave.c io.c version.c daemon.h
-libgtop_server_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
-				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la
+libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
+libgtop_server2_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
+				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 
 if ENABLE_STATIC
-libgtop_server_LDFLAGS		= -static
+libgtop_server2_LDFLAGS		= -static
 endif
 
 EXTRA_DIST			= server_config.h.in server_config.pl

src/daemon/gnuserv.c

@@ -200,11 +200,6 @@ permitted (u_long host_addr, int fd)
 
 	auth_data_len = atoi (buf);
 
-	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
-	    syslog_message(LOG_WARNING, "Invalid data length supplied by client");
-	    return FALSE;
-	}
-
 	if (timed_read (fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len)
 	    return FALSE;
 

src/inodedb/Makefile.am

@@ -1,15 +1,15 @@
-bin_PROGRAMS		= mkinodedb file_by_inode
+bin_PROGRAMS		= mkinodedb2 file_by_inode2
 
 INCLUDES		= @INCLUDES@
 
-mkinodedb_LDADD		= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+mkinodedb2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
-file_by_inode_LDADD	= $(top_builddir)/lib/libgtop.la \
-			  $(top_builddir)/sysdeps/common/libgtop_common.la \
-			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
+file_by_inode2_LDADD	= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 			  @LIBSUPPORT@ @INTLLIBS@
 
 EXTRA_DIST		= README.inodedb

stamp-h.in

@@ -1 +0,0 @@
-timestamp

sysdeps/Makefile.am

@@ -1,8 +1,8 @@
-if GUILE
-guile_SUBDIRS		= guile
-else
+## if GUILE
+## guile_SUBDIRS		= guile
+## else
 guile_SUBDIRS		=
-endif
+## endif
 
 SUBDIRS			= @sysdeps_dir@ common names $(guile_SUBDIRS)
 

sysdeps/common/Makefile.am

@@ -12,17 +12,17 @@ endif
 
 CFLAGS				= @CFLAGS@ $(inodedb_DEFS)
 
-lib_LTLIBRARIES			= libgtop_common.la libgtop_suid_common.la
+lib_LTLIBRARIES			= libgtop_common-2.0.la libgtop_suid_common-2.0.la
 
-libgtop_common_la_SOURCES	= xmalloc.c error.c gnuslib.c \
+libgtop_common_2_0_la_SOURCES	= xmalloc.c error.c gnuslib.c \
 				  fsusage.c fsusage.h mountlist.c mountlist.h \
 				  $(inodedb_SRCLIST)
 
-libgtop_common_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_common_la_LIBADD	= $(LIBGTOP_EXTRA_LIBS)
+libgtop_common_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_common_2_0_la_LIBADD	= $(LIBGTOP_EXTRA_LIBS)
 
-libgtop_suid_common_la_SOURCES	= xmalloc.c error.c sysdeps_suid.c
+libgtop_suid_common_2_0_la_SOURCES	= xmalloc.c error.c sysdeps_suid.c
 
-libgtop_suid_common_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_suid_common_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 EXTRA_DIST			= inodedb.c

sysdeps/freebsd/Makefile.am

@@ -2,22 +2,22 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_suid_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c siglist.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 \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c procargs.c procmap.c netload.c \
 				  ppp.c
 
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h \
 				  glibtop_suid.h
 
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0

sysdeps/guile/Makefile.am

@@ -6,11 +6,11 @@ INCLUDES			= @INCLUDES@
 
 BUILT_SOURCES			= guile.c guile.x
 
-lib_LTLIBRARIES			= libgtop_guile.la
+lib_LTLIBRARIES			= libgtop_guile-2.0.la
 
-libgtop_guile_la_SOURCES	= $(BUILT_SOURCES)
+libgtop_guile_2_0_la_SOURCES	= $(BUILT_SOURCES)
 
-libgtop_guile_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_guile_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 Makefile: $(BUILT_SOURCES)
 
@@ -19,7 +19,7 @@ guile.c: guile.pl $(top_builddir)/config.h $(top_srcdir)/features.def
 	mv gnc-t guile.c
 
 guile.x: guile.c
-	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
 EXTRA_DIST			= guile.pl
 

sysdeps/guile/names/Makefile.am

@@ -2,13 +2,13 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_guile_names.la
+lib_LTLIBRARIES			= libgtop_guile_names-2.0.la
 
 BUILT_SOURCES			= guile-names.c guile-names.x
 
-libgtop_guile_names_la_SOURCES	= $(BUILT_SOURCES)
+libgtop_guile_names_2_0_la_SOURCES	= $(BUILT_SOURCES)
 
-libgtop_guile_names_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_guile_names_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 Makefile: $(BUILT_SOURCES)
 
@@ -17,7 +17,7 @@ guile-names.c: guile-names.pl $(top_builddir)/config.h $(top_srcdir)/features.de
 	mv gnc-t guile-names.c
 
 guile-names.x: guile-names.c
-	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
 EXTRA_DIST			= guile-names.pl
 

sysdeps/kernel/Makefile.am

@@ -2,19 +2,19 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c kernel.s cpu.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c kernel.s 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 \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c siglist.c procargs.c procmap.c \
 				  netload.c ppp.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= kernel.h
 

sysdeps/linux/Makefile.am

@@ -2,17 +2,17 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
+libgtop_sysdeps_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 \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c procargs.c procmap.c siglist.c \
 				  sysinfo.c netload.c ppp.c
-libgtop_sysdeps_la_LIBADD	= @GLIB_LIBS@
+libgtop_sysdeps_2_0_la_LIBADD	=  @GLIB_LIBS@
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0

sysdeps/names/Makefile.am

@@ -2,9 +2,9 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_names.la
+lib_LTLIBRARIES			= libgtop_names-2.0.la
 
-libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
+libgtop_names_2_0_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
 				  shm_limits.c msg_limits.c sem_limits.c \
 				  proclist.c sysdeps.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c \
@@ -12,5 +12,5 @@ libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
 				  mountlist.c procargs.c procmap.c netload.c \
 				  ppp.c
 
-libgtop_names_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_names_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 

sysdeps/osf1/Makefile.am

@@ -2,22 +2,22 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c ppp.c
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_la_LIBADD	= -lmach
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LIBADD	= -lmach
 
-libgtop_sysdeps_suid_la_SOURCES	= open_suid.c close_suid.c proclist.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open_suid.c close_suid.c proclist.c \
 				  procstate.c procuid.c proctime.c procmem.c \
 				  procsignal.c prockernel.c procsegment.c \
 				  procmap.c procargs.c netload.c
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_la_LIBADD	= -lmach
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LIBADD	= -lmach
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_suid.h

sysdeps/solaris/Makefile.am

@@ -2,27 +2,27 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c \
 				  safeio.c swap.c uptime.c loadavg.c \
 				  proclist.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c \
 				  prockernel.c procsegment.c procargs.c \
 				  procmap.c netload.c ppp.c procdata.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_la_LIBADD	= @DL_LIB@
+libgtop_sysdeps_2_0_la_LIBADD	= @DL_LIB@
 
-libgtop_sysdeps_suid_la_SOURCES	= open_suid.c close_suid.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open_suid.c close_suid.c \
 				  shm_limits.c msg_limits.c sem_limits.c
 
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_private.h glibtop_suid.h safeio.h
 

sysdeps/stub/Makefile.am

@@ -2,16 +2,16 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c siglist.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 \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c procargs.c procmap.c netload.c \
 				  ppp.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0

sysdeps/stub_suid/Makefile.am

@@ -2,22 +2,22 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
 
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_suid_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c siglist.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 \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c procargs.c procmap.c netload.c \
 				  ppp.c
 
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_suid.h

sysdeps/sun4/Makefile.am

@@ -2,21 +2,21 @@ LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 INCLUDES			= @INCLUDES@
 
-lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
+lib_LTLIBRARIES			= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
 
-libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
-libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_la_LIBADD	= -lkvm
+libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
+libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LIBADD	= -lkvm
 
-libgtop_sysdeps_suid_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
+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 \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c ppp.c
-libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
-libgtop_sysdeps_suid_la_LIBADD	= -lkvm
+libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
+libgtop_sysdeps_suid_2_0_la_LIBADD	= -lkvm
 
 libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-1.0
+libgtopincludedir		= $(includedir)/libgtop-2.0
 
 noinst_HEADERS			= glibtop_suid.h