Fixed Czech translation

2003-10-01  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>

        * pt_BR.po: Applied revision by Augusta Marques da Silva
        <augusta.marques@gmx.net>.

.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,3 +1,333 @@
+2003-09-30  Laurent Dhima  <laurenti@alblinux.net>
+
+	* configure.in: Added "sq" to ALL_LINGUAS.
+
+2003-09-17  Fatih Demir <kabalak@gtranslator.org>
+
+	* configure.in: Added "ta" (Tamil) to the languages' list.
+
+2003-09-13  Carlos Perelló Marín <carlos@gnome.org>
+
+	* configure.in (ALL_LINGUAS):  Removed es_ES.
+
+2003-09-08  Kevin Vandersloot
+
+	* configure.in: release 2.0.5
+
+2003-09-06  Taneem Ahmed  <taneem@bengalinux.org>
+
+	* configure.in: Added "bn" to ALL_LINGUAS.
+
+2003-08-24  Kevin Vandersloot
+
+	* configure.in: release 2.0.4
+
+2003-08-13  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+	* configure.in: Added "hi" (Hindi) in ALL_LINGUAS.
+
+2003-08-13  Andrew Sobala  <aes@gnome.org>
+
+	* configure.in: release 2.0.3
+
+2003-08-09  Dafydd Harries  <daf@parnassus.ath.cx>
+
+	* configure.in: Added "cy" (Welsh) to ALL_LINGUAS.
+
+2003-08-03  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* Makefile.am: Change subdirectory build order so that
+	'distclean' target work (and other targets remain working).
+	Fixes bug #84622.
+
+2003-06-10  Kjartan Maraas  <set EMAIL_ADDRESS environment variable>
+
+	* libgtop-2.0.pc.in: Fix missing build flags. Patch from
+	Julio Merino. Fixes bug #103086.
+	* sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation
+	under Linux. Patch from <rwahl@gmx.de>. Fixes bug #68626.
+
+2003-06-10  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* sysdeps/freebsd/glibtop_machine.h:
+	* sysdeps/kernel/glibtop_private.h:
+	* sysdeps/solaris/glibtop_machine.h:
+	* sysdeps/solaris/glibtop_private.h: Comment out text after
+	#endif to make some compilers happy.
+
+2003-05-11  Andrew Sobala  <aes@gnome.org>
+
+	* configure.in: release 2.0.2
+
+2003-05-10  Danilo Šegan  <dsegan@gmx.net>
+
+	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.
+
+2003-04-17  Abel Cheung  <maddog@linux.org.hk>
+
+	* configure.in: Added "mk" to ALL_LINGUAS.
+
+2003-03-13  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "ml" to ALL_LINGUAS.
+
+2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>
+
+	* configure.in: Added "fa" to ALL_LINGUAS.
+
+2003-03-08  Gil "Dolfin" Osher <dolfin@rpg.org.il>
+
+	* configure.in: Added he to ALL_LINGUAS.
+
+2003-02-25  T?µivo Leedj?¤rv  <toivo@linux.ee>
+
+	* configure.in: Added et to ALL_LINGUAS.
+
+2003-02-16  Mohammad DAMT  <mdamt@bisnisweb.com>
+
+	* po/id.po: Added Indonesian translation
+	* configure.in: Added "id" to ALL_LINGUAS
+
+2003-01-31  James Henstridge  <james@daa.com.au>
+
+	* acinclude.m4 (GNOME_SUPPORT_CHECKS): use AC_LIBOBJ() to set
+	LIBOBJS variable, since newer autoconf's barf on direct access.
+	This also takes care of setting LTLIBOBJS for us.
+
+2003-01-29  Abel Cheung  <maddog@linux.org.hk>
+
+	* configure.in: Added ar to ALL_LINGUAS
+
+2003-01-25  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* configure.in: Added "it" (Italian) to ALL_LINGUAS.
+
+2003-01-23  Marius Andreiana <marius galuna.ro>
+
+	* configure.in: Added "ro" to ALL_LINGUAS
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* configure.in: Added "mn" to ALL_LINGUAS.
+
+2003-01-16  Daniel Yacob <locales@geez.org>
+
+	* configure.in: added am to ALL_LINGUAS
+	
+2003-01-12  Kevin Vandersloot <kfv101@psu.edu>
+
+	* configure.in: release 2.0.1
+
+2002-12-30  Bastien Nocera <hadess@hadess.net>
+
+	* Added sysdeps/aix directory that was missing
+
+2002-10-08  Laurent Vivier <Laurent.Vivier@bull.net>
+
+	* Framework for AIX support
+
+2002-08-07  Vincent Berger <Vincent.Berger@ext.bull.net> 
+
+	* support/: Add alloca management for AIX
+	* configure.in: correct checking for nm
+
+2002-11-03  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* configure.in: Added Belarusian to ALL_LINGUAS
+
+2002-09-26  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* configure.in: Added cs to ALL_LINGUAS.
+
+2002-09-26  jacob berkman  <jacob@ximian.com>
+
+	* configure.in (ALL_LINGUAS): remove cs until the file actually
+	gets added
+
+2002-09-26  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* configure.in: Added cs to ALL_LINGUAS.
+
+2002-08-20  Peteris Krisjanis <peteris.krisjanis@os.lv>
+
+	* configure.in: (ALL_LINGUAS) Added Latvian (lv).
+
+2002-06-25  Yanko Kaneti <yaneti@declera.com>
+
+	* configure.in: (ALL_LINGUAS) Added Bulgarian (bg).
+
+2002-05-10  Kevin Vandersloot <kfv101@psu.edu>
+
+	* configure.in: release 2.0.0
+
+2002-05-28  Carlos Perello Marin <carlos@gnome-db.org>
+
+	* 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>
+
+	* configure.in (ALL_LINGUAS): zh_CN.GB2312 -> zh_CN
+
+2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
+
+	* configure.in: Added ms in ALL_LINGUAS.
+	* po/ms.po: Added Malay Translation.
+	* po/.cvsignore: Added 'libgtop-2.0.pot'.
+
+2001-01-14  Abel Cheung  <maddog@linux.org.hk>
+
+	* 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>
+
+	* configure.in, Makefile.am, include/glibtop/Makefile.am: headers
+	moved to $(includedir)/libgtop-1.0/glibtop.
+
+2001-09-16  Abel Chueng  <maddog@linux.org.hk>
+
+	* configure.in: Added "zh_TW" to ALL_LINGUAS.
+
+2001-02-13  Martin Baulig  <baulig@suse.de>
+
+	Released LibGTop 1.0.12 "Gerolzhofen".
+
+	* NEWS: Added news entry to 1.0.12.
+
+	* LIBGTOP-VERSION: Set version number to 1.0.12, binary age 11,
+	interface age 11.
+
+2001-02-19  Simos Xenitellis  <simos@hellug.gr>
+
+	* configure.in: Added "el" to ALL_LINGUAS.
+
+2001-02-15  Martin Baulig  <baulig@suse.de>
+
+	Released LibGTop 1.0.11 "Jasmin".
+
+	* NEWS: Added news entry for 1.0.11.
+
+2001-02-14  Martin Baulig  <baulig@suse.de>
+
+	Merged from LIBGTOP_1_1_2_PATCHES.
+
+	* libgtop-sysdeps.m4 (GLIBTOP_SOLARIS_RELEASE): Define this on Solaris;
+	we use version codes like 270 for SunOS 5.7 and 251 for SunOS 2.5.1.
+
+	* LIBGTOP-VERSION (LIBGTOP_VERSION_SUFFIX): Added this so you can
+	have your tarballs called `libgtop-1.x.y-snap.tar.gz' or whatever.
+	This only affects the `VERSION' variable and thus how the resulting
+	tarball will be called, but not `LIBGTOP_VERSION_CODE' etc.
+
+	* configure.in, acconfig.h: Added checks for <procfs.h>
+	and <sys/procfs.h>
+
+	* configure.in (DL_LIB): Check for dlopen() and AC_SUBST this.
+
+	* Makefile.am: Make `aclocal.m4' also depend on `LIBGTOP-VERSION'
+	when in maintainer-mode.
+
+2001-02-14  Martin Baulig  <baulig@suse.de>
+
+	* include/glibtop/limits.h: Removed; this file doesn't exist
+	in the stable branch.
+
+2001-02-13  Martin Baulig  <baulig@suse.de>
+
+	* LIBGTOP-VERSION: Set version number to 1.0.11, binary age 10,
+	interface age 10.
+
+2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* configure.in: Added sk to ALL_LINGUAS
+
+2001-02-08  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
+
+	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
+
+2000-11-21  Martin Baulig  <baulig@suse.de>
+
+	* libgtop-config.h.in: Added `--cflags', `--libs' and `--extra-libs'
+	parameters.
+
 2000-11-20  Martin Baulig  <baulig@suse.de>
 
 	Released LibGTop 1.0.10 "November Rain".

LIBGTOP-VERSION

@@ -7,11 +7,14 @@
 # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
 #
 LIBGTOP_MAJOR_VERSION=1
-LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=10
+LIBGTOP_MINOR_VERSION=90
+LIBGTOP_MICRO_VERSION=0
 
-LIBGTOP_INTERFACE_AGE=9
-LIBGTOP_BINARY_AGE=9
+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=
 
 # Increase each time you change the client/server protocol.
 LIBGTOP_SERVER_VERSION=5
@@ -21,5 +24,5 @@ LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VER
 LIBGTOP_VERSION_CODE=`echo "$LIBGTOP_MAJOR_VERSION 1000000 * $LIBGTOP_MINOR_VERSION 1000 * + $LIBGTOP_MICRO_VERSION + p q" | dc`
 
 # For automake.
-VERSION=$LIBGTOP_VERSION
+VERSION=$LIBGTOP_VERSION$LIBGTOP_VERSION_SUFFIX
 PACKAGE=libgtop

Makefile.am

@@ -10,15 +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
 
-include_HEADERS = glibtop.h
+libgtopinclude_HEADERS = glibtop.h
+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)
@@ -28,21 +29,24 @@ 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
+@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
 
 ## We create libgtopConf.sh here and not from configure because we want
 ## to get the paths expanded correctly.  Macros like srcdir are given
@@ -51,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)#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' \
@@ -78,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,3 +1,35 @@
+February 27, 2001:
+=================
+
+* Released LibGTop 1.0.12 "Gerolzhofen".
+
+  - fix for Solaris 8 from Laszlo PETER (msg_limits, sem_limits).
+
+  - fix for FreeBSD 4.2 from Rolf Grossmann (FreeBSD now uses
+    `_KERNEL' instead of `KERNEL'). Bug #51334.
+
+  - for BSDI, comment out `subnet' field in netload; this should make
+    it compile, but there may be other problems. Bug #13345.
+
+  This release is for GNOME 1.4 Beta2.
+
+February 14, 2001:
+=================
+
+* Released LibGTop 1.0.11 "Jasmin":
+
+  [The release which was supposed to be called "Gerolzhofen".]
+
+  - merged in the Solaris code from LIBGTOP_1_1_2_PATCHES.
+
+  - minor OpenBSD fixes.
+
+  - again a bunch of updated translations.
+
+  Please test the Solaris stuff and report and bugs and
+  problems as soon as possible; I'll make a new release
+  for the 2nd beta of GNOME 1.4 if necessary.
+
 November 20, 2000:
 =================
 

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
@@ -156,6 +157,14 @@
  */
 #undef GLIBTOP_LINUX_VERSION_CODE
 
+/* Solaris release code (eg. 251 for Solaris 2.5.1). */
+#undef GLIBTOP_SOLARIS_RELEASE
+
 /* Define if you want to use LibGTop without GNOME. */
 #undef WITHOUT_GNOME
 
+/* Define if you have the <procfs.h> header file */
+#undef HAVE_PROCFS_H
+
+/* Define if you have the <sys/procfs.h> header file */
+#undef HAVE_SYS_PROCFS_H

acinclude.m4

@@ -0,0 +1,880 @@
+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"
+# AC_LIBOBJ(fsusage)
+# AC_LIBOBJ(mountlist)
+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
+
+  AC_CHECK_FUNCS(getopt_long,,
+   [AC_LIBOBJ(getopt)
+    AC_LIBOBJ(getopt1)])
+
+  # 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,,AC_LIBOBJ(canonicalize))
+
+  # 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
+    AC_LIBOBJ(error)
+  fi
+  
+  # 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
+])
+
+  AC_SUBST(need_gnome_support)
+
+  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
+	    ;;
+	  aix*)
+	    libgtop_smp=yes
+	    ;;
+	  *)
+	    libgtop_smp=no
+	    ;;
+	  esac
+	  AC_MSG_RESULT($libgtop_smp)
+	fi
+
+	if test $libgtop_smp = yes ; then
+	  AC_DEFINE(HAVE_LIBGTOP_SMP)
+	fi
+
+	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
+
+	AC_MSG_CHECKING(for libgtop sysdeps directory)
+
+	case "$host_os" in
+	linux*)
+	  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'
+	  ;;
+        aix*)
+	  libgtop_sysdeps_dir=aix
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_have_sysinfo=yes
+	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
+          ;;
+	*)
+	  if test x$hacker_mode = xyes ; then
+	    case "$host_os" in
+	    sunos4*)
+	      #Please note that this port is obsolete and not working at
+	      #all. It is only useful for people who want to fix it ... :-)
+	      libgtop_sysdeps_dir=sun4
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    osf*)
+	      libgtop_sysdeps_dir=osf1
+	      libgtop_use_machine_h=yes
+	      libgtop_need_server=yes
+	      ;;
+	    *)
+	      libgtop_sysdeps_dir=stub
+	      libgtop_use_machine_h=no
+	      libgtop_need_server=no
+	      ;;
+	    esac
+	  else
+	    libgtop_sysdeps_dir=stub
+	    libgtop_use_machine_h=no
+	    libgtop_need_server=no
+	  fi
+	  ;;
+	esac
+
+	test -z "$libgtop_postinstall" && libgtop_postinstall=:
+
+	AC_MSG_RESULT($libgtop_sysdeps_dir)
+
+	AC_SUBST(libgtop_sysdeps_dir)
+	AC_SUBST(libgtop_postinstall)
+	AC_SUBST(libgtop_have_sysinfo)
+
+	case "$host_os" in
+	*bsd*)
+	  AC_CHECK_HEADERS(net/if_var.h)
+	  AC_MSG_CHECKING([for I4B])
+	  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+],[
+	size_t size = sizeof (struct sppp);
+], have_i4b=yes, have_i4b=no)
+	  AC_MSG_RESULT($have_i4b)
+	  if test x$have_i4b = xyes; then
+	    AC_DEFINE(HAVE_I4B)
+	    AC_MSG_CHECKING([for I4B accounting])
+	    AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+
+#ifdef HAVE_NET_IF_VAR_H
+#include <net/if_var.h>
+#endif
+
+#include <net/netisr.h>
+#include <net/route.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <net/if_sppp.h>
+#else
+#include <i4b/sppp/if_sppp.h>
+#endif
+
+#include <machine/i4b_acct.h>
+],[
+	size_t size = sizeof (struct i4bisppp_softc);
+], have_i4b_acct=yes, have_i4b_acct=no)
+	    AC_MSG_RESULT($have_i4b_acct)
+	    if test x$have_i4b_acct = xyes ; then
+	      AC_DEFINE(HAVE_I4B_ACCT)
+	    else
+	      AC_WARN([
+*** I4B accounting disabled - you won't get any PPP statistics.
+*** Read "misc/i4b_acct.txt" in the LibGTop source directory
+*** to see how to enable it.])
+	    fi
+	  fi
+	  ;;
+	linux*)
+	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
+	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
+
+	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
+	    have_linux_version_h=no)
+
+	  if test x$have_linux_version_h = xyes ; then
+	    version_code=`cat /usr/include/linux/version.h | \
+	      grep \#define | grep LINUX_VERSION_CODE`
+	    os_version_code=`echo $version_code | \
+	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
+	  else
+	    os_version_code=`echo "$os_version_expr" | dc`
+	  fi
+
+	  AC_MSG_CHECKING(for Linux kernel version code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	solaris*)
+	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
+	  test -z "$os_micro_version" && os_micro_version=0
+	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
+	  os_version_code=`echo "$os_version_expr" | dc`
+
+	  AC_MSG_CHECKING(for Solaris release code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
+	  AC_MSG_RESULT($os_version_code)
+	  ;;
+	esac
+
+	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
+	AC_MSG_RESULT($libgtop_use_machine_h)
+
+	AC_MSG_CHECKING(whether we need libgtop)
+	AC_MSG_RESULT($libgtop_need_server)
+
+	if test x$libgtop_need_server = xyes ; then
+	  AC_DEFINE(NEED_LIBGTOP)
+	fi
+
+	if test x$libgtop_use_machine_h = xyes ; then
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
+	fi
+
+	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
+])
+
+  

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=5
+LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
+AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
+LIBGTOP_INTERFACE_AGE=5
+LIBGTOP_BINARY_AGE=5
 
-. $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)
@@ -33,6 +32,7 @@ AC_SUBST(LIBGTOP_BINARY_AGE)
 AC_SUBST(LIBGTOP_SERVER_VERSION)
 AC_SUBST(LIBGTOP_VERSION)
 AC_SUBST(LIBGTOP_VERSION_CODE)
+AC_SUBST(LIBGTOP_VERSION_SUFFIX)
 
 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
@@ -46,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`
@@ -70,10 +70,8 @@ AC_CHECK_TOOL(CC,gcc)
 AC_CHECK_TOOL(RANLIB,ranlib)
 AC_CHECK_TOOL(AS,as)
 AC_CHECK_TOOL(AR,ar)
-AC_CHECK_TOOL(NM,nm)
 
-NM=`which $NM`
-export CC CXX RANLIB LD AS AR NM
+export CC CXX RANLIB LD AS AR
 
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -84,42 +82,44 @@ 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. ***
+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
 
-*** 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
+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)],
@@ -177,11 +177,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
@@ -199,23 +205,65 @@ AC_CHECK_TYPE(ssize_t, int)
 AC_CHECK_HEADERS(memory.h)
 AC_CHECK_HEADERS(string.h strings.h, break)
 AC_REPLACE_FUNCS(strerror)
-AC_CHECK_LIB(kvm, kvm_open)
+
+dnl dlopen() and dlsym()
+DL_LIB=
+AC_CHECK_FUNCS(dlopen,,[
+  AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", [
+    AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld", [
+      AC_CHECK_FUNCS(dlopen, DL_LIB="", DL_LIB="")
+    ])
+  ])
+])
+oLIBS="$LIBS"
+LIBS="$LIBS $DL_LIB"
+AC_CHECK_FUNCS(dlerror,,)
+LIBS="$oLIBS"
+AC_SUBST(DL_LIB)
+
+dnl AIX
+AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the `vmgetinfo' function in libperfstat])
+AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
+
+dnl Solaris
+AC_CHECK_LIB(kstat, kstat_open)
+AC_CHECK_FUNCS(getloadavg swapctl)
+AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
+
+dnl Some versions of Solaris require -lelf for -lkvm
+AC_CHECK_LIB(kvm, kvm_open,[
+  LIBS="-lkvm $LIBS"
+],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
+   AC_CACHE_VAL(ac_cv_lib_kvm_with_elf,
+   [ac_save_LIBS="$LIBS"
+    LIBS="-lkvm -lelf $LIBS"
+    AC_TRY_LINK([char kvm_open();], [kvm_open()],
+                ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no)
+    LIBS="$ac_save_LIBS"
+   ])
+   if test "$ac_cv_lib_kvm_with_elf" = "yes"; then
+     AC_MSG_RESULT(yes)
+     LIBS="-lkvm -lelf $LIBS"
+   else
+     AC_MSG_RESULT(no)
+   fi
+])
 
 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, [
@@ -237,9 +285,13 @@ 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="da de es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr gl ja ko nl no pl sv"
-AM_GNOME_GETTEXT
+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hu id it ja ko lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+
+GETTEXT_PACKAGE=libgtop-2.0
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT
 
 AC_PATH_XTRA
 
@@ -283,7 +335,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
 
@@ -299,7 +351,7 @@ AC_SUBST(SUPPORTINCS)
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)'
+LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
 
 if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -322,13 +374,13 @@ LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"
 LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
 LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
-LIBGTOP_SERVER='$(bindir)/libgtop_server'
+LIBGTOP_SERVER='$(bindir)/libgtop_server2'
 
 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
@@ -344,11 +396,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"
@@ -372,12 +424,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)
@@ -390,8 +442,8 @@ 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"
-   server_programs='libgtop_server'
+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
+   server_programs='libgtop_server2'
 else
    sysdeps_suid_lib=
    server_programs=
@@ -403,7 +455,6 @@ AC_OUTPUT([
 Makefile
 libgtop.spec
 po/Makefile.in
-intl/Makefile
 misc/Makefile
 include/Makefile
 include/glibtop/Makefile
@@ -419,6 +470,8 @@ sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
 sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
+sysdeps/solaris/Makefile
+sysdeps/aix/Makefile
 src/Makefile
 src/daemon/Makefile
 src/inodedb/Makefile
@@ -426,4 +479,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

@@ -22,6 +22,7 @@
 */
 
 #include <locale.h>
+#include <math.h>
 
 #include <glibtop.h>
 #include <glibtop/open.h>
@@ -51,52 +52,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 +70,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 +85,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 +96,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 +114,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 +121,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 +239,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

@@ -22,6 +22,7 @@
 */
 
 #include <locale.h>
+#include <math.h>
 
 #include <glibtop.h>
 #include <glibtop/cpu.h>
@@ -39,9 +40,11 @@ main (int argc, char *argv [])
 	int ncpu, i;
 
 	setlocale (LC_ALL, "");
-	bindtextdomain (PACKAGE, GTOPLOCALEDIR);
-	textdomain (PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 	
+	glibtop_init();
+
 	glibtop_get_cpu (&cpu);
 
 	ncpu = glibtop_global_server->ncpu ? glibtop_global_server->ncpu : 1;

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)/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,14 @@ 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)
+libgtop_2_0_la_LIBADD		= $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib) $(INTLLIBS)
 
 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@ @LIBGTOP_EXTRA_LIBS@
+Cflags: -I${includedir}/libgtop-2.0
+
+

libgtop-config.in

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 usage="\
-    Usage: libgtop-config [--version] [--config] [--features-def-file]"
+Usage: libgtop-config [--version] [--config] [--features-def-file] [--cflags] [--libs] [--extra-libs]"
 
 config_file="@LIBGTOP_LIBDIR@/libgtopConf.sh"
 . $config_file
@@ -29,6 +29,15 @@ while test $# -gt 0; do
     --features-def-file)
       echo $features_def_file
       ;;
+    --cflags)
+      echo $LIBGTOP_INCS
+      ;;
+    --libs)
+      echo $LIBGTOP_LIBS
+      ;;
+    --extra-libs)
+      echo $LIBGTOP_EXTRA_LIBS
+      ;;
     *)
       echo "${usage}" 1>&2
       exit 1

libgtop-sysdeps.m4

@@ -73,7 +73,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	AC_ARG_ENABLE(hacker-mode,
 	[  --enable-hacker-mode    Enable building of unstable sysdeps],
-	[hacker_mode="$withval"], [hacker_mode=no])
+	[hacker_mode="$enableval"], [hacker_mode=no])
 
 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
 
@@ -91,6 +91,9 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  linux*)
 	    libgtop_smp=yes
 	    ;;
+	  aix*)
+	    libgtop_smp=yes
+	    ;;
 	  *)
 	    libgtop_smp=no
 	    ;;
@@ -124,12 +127,27 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
 	  ;;
+	solaris*)
+	  libgtop_sysdeps_dir=solaris
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
+	  ;;
+	aix*)
+	  libgtop_sysdeps_dir=aix
+	  libgtop_use_machine_h=yes
+	  libgtop_need_server=yes
+	  libgtop_have_sysinfo=yes
+	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
+	  ;;
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
 	    sunos4*)
+	      #Please note that this port is obsolete and not working at
+	      #all. It is only useful for people who want to fix it ... :-)
 	      libgtop_sysdeps_dir=sun4
-	        libgtop_use_machine_h=yes
+	      libgtop_use_machine_h=yes
 	      libgtop_need_server=yes
 	      ;;
 	    osf*)
@@ -177,7 +195,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>
 
-#if (defined __FreeBSD__) || (defined __NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -249,6 +267,18 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  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)

po/.cvsignore

@@ -3,6 +3,11 @@ Makefile.in
 POTFILES
 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,3 +1,523 @@
+2004-01-28  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Fixed Czech translation.
+
+2003-10-01  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Applied revision by Augusta Marques da Silva
+	<augusta.marques@gmx.net>.
+
+2003-09-30  Laurent Dhima  <laurenti@alblinux.net>
+
+	 * sq.po: Added Albanian translation.
+
+2003-09-17  Fatih Demir <kabalak@gtranslator.org>
+
+	* ta.po: Committed new Tamil translation by Dinesh.
+
+2003-09-13  Carlos Perelló Marín <carlos@gnome.org>
+
+	* es_ES.po, LEEME.es: Removed, it's only for one string that is a
+	comment and procman is not using it. This modules is not maintained
+	and all people tells that should die so I don't think that any other
+	application will use it in the near future. This one is related with
+	the bug #105676
+
+2003-09-08  Mugurel Tudor  <mugurelu@go.ro>
+
+	* ro.po: Updated Romanian translation by
+		Mişu Moldovan  <dumol@go.ro>
+
+2003-09-06  Taneem Ahmed  <taneem@bengalinux.org>
+
+	* bn.po: Added Bangla translation by Vat
+	of Ankur group <gnome-translation@bengalinux.org>.
+
+2003-08-28  Pablo Gonzalo del Campo  <pablodc@bigfoot.com>
+
+        * es.po: Revision of Spanish translation by
+                 Francisco Javier F. Serrador <serrador@arrakis.es>.
+
+2003-08-28  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2003-08-25  Duarte Loreto <happyguy_pt@hotmail.com>
+
+	* pt.po: Fixed typos in Portuguese translation.
+
+2003-08-18  Metin Amiroff <metin@karegen.com>
+
+	* az.po: Updated Azerbaijani translation.
+
+2003-08-13  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+	* hi.po: Added Hindi translation.
+
+2003-08-09  Dafydd Harries  <daf@parnassus.ath.cx>
+
+	* cy.po: Added Welsh translation.
+
+2003-08-09  Wang Jian  <lark@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation by
+	Funda Wang <fundawang@linux.net.cn>.
+
+2003-08-08  Danilo Šegan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation.
+
+2003-07-21  Arafat Medini <lumina@silverpen.de>
+
+	* ar.po: Updated Arabic translation.
+
+2003-07-19  Arafat Medini <lumina@silverpen.de>
+
+	* ar.po: Updated Arabic translation.
+
+2003-07-19  Arafat Medini  <lumina@silverpen.de>
+
+	 * ar.po: Updated Arabic translation.
+
+2003-07-13  Metin Amiroff  <metin@karegen.com>
+
+	* az.po: Updated Azerbaijani translation.
+
+2003-06-25  Mohammad DAMT  <mdamt@bisnisweb.com>
+
+	* id.po: Updated Indonesian translation
+
+2003-06-23  Vincent van Adrighem  <V.vanAdrighem@dirck.mine.nu>
+
+	* nl.po: Dutch translation updated by Kees van den Broek.
+
+2003-06-14  Arafat Medini  <lumina@silverpen.de>
+
+	 * ar.po: Updated Arabic translation.
+
+2003-06-12  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Updated traditional Chinese translation.
+
+2003-06-04  Paul Duffy <dubhthach@frink.nuigalway.ie>
+
+        * ga.po: Updated Irish Translation.
+	
+2003-05-25  Abel Cheung  <maddog@linux.org.hk>
+
+	* he.po: Mark wrong entry as fuzzy (msgfmt check failed).
+
+2003-05-16  Danilo ©egan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Updated Serbian translation by Serbian 
+	team (Prevod.org).
+
+2003-05-10  Danilo Segan  <dsegan@gmx.net>
+
+	* sr.po, sr@Latn.po: Added Serbian translation by Serbian team 
+	(Prevod.org).
+
+2003-04-20  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Updated traditional Chinese translation.
+
+2003-03-18  Gil "Dolfin" Osher <dolfin@rpg.org.il>
+
+	* he.po: Updated Hebrew translation.
+
+2003-03-13  Christian Rose  <menthos@menthos.com>
+
+	* ml.po: Added Malayalam translation by
+	FSF-India <locale@gnu.org.in>.
+
+2003-03-10  Roozbeh Pournader  <roozbeh@sharif.edu>
+
+	* fa.po: Added Persian translation.
+
+2003-03-08  Gil "Dolfin" Osher <dolfin@rpg.org.il>
+
+	* he.po: Added Hebrew translation.
+
+2003-03-06  Yuriy Syrota  <rasta renome.rovno.ua>
+
+	* uk.po: Updated Ukrainian translation.
+
+2003-02-25  T?µivo Leedj?€rv  <toivo@linux.ee>
+
+	* et.po: Added Estonian translation.
+
+2003-02-23  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Updated traditional Chinese translation.
+
+2003-02-22  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Barbarism fixes from Jordi Mas.
+
+2003-02-22  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Updated traditional Chinese translation.
+
+2003-02-16  Mohammad DAMT  <mdamt@bisnisweb.com>
+
+	* id.po: Added Indonesian translation
+
+2003-02-09  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Some fixes for problems catched in translation review.
+
+2003-02-07  Miloslav Trmac  <mitr@volny.cz>
+
+	* cs.po: Fixed typos in Czech translation.
+
+2003-01-25  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Added Italian translation.
+
+2003-01-23  Marius Andreiana <marius galuna.ro>
+
+	* ro.po: added ( thanks to Mi?Ÿu Moldovan )
+
+2003-01-22  Christian Rose  <menthos@menthos.com>
+
+	* mn.po: Added Mongolian translation by
+	Sanlig Badral <badral@chinggis.com>.
+
+2003-01-20  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Updated Vietnamese file
+
+2003-01-18  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Updated traditional Chinese translation.
+
+2003-01-16  Daniel Yacob <locales@geez.org>
+
+	* am.po: Added Amharic translation.
+	
+2003-01-16  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Updated Vietnamese file
+
+2003-01-03  Andras Timar  <timar@gnome.hu>
+
+        * hu.po: Updated Hungarian translation.
+
+2002-12-14  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French translation and converted to UTF-8.
+
+2002-11-25  Yanko Kaneti  <yaneti@declera.com>
+
+	* *.po: Convert all to UTF-8.
+
+2002-11-07  Simos Xenitellis  <simos74@gmx.net>
+
+	* el.po: Updated Greek translation.
+
+2002-11-04  Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>
+
+	* nl.po: Jeroen van der Vegt updated Dutch translation.
+
+2002-11-03  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* be.po: Added Belarusian translation
+	* from Belarusian team <i18n@infonet.by>.
+
+2002-09-26  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* cs.po: Added Czech translation from Miloslav Trmac
+	<mitr@volny.cz>.
+
+2002-09-19  Fatih Demir <kabalak@gtranslator.org>
+
+	* tr.po: Committed updated Turkish translation by ?–mer.
+
+2002-09-02  Peteris Krisjanis <peteris.krisjanis@os.lv>
+
+	* lv.po: Updated Latvian translation.
+
+2002-08-22  Andras Timar  <timar@gnome.hu>
+
+        * hu.po: Updated Hungarian translation.
+
+2002-08-20  Peteris Krisjanis <peteris.krisjanis@os.lv>
+
+	* lv.po (added): Latvian translation.
+
+2002-08-07  Christian Neumair  <christian-neumair@web.de>
+
+	* de.po: Updated German translation.
+
+2002-07-13  Jordi Mallach  <jordi@sindominio.net>
+
+	* ca.po: Updated Catalan translation.
+
+2002-06-25  Yanko Kaneti <yaneti@declera.com>
+
+	* bg.po (added): Bulgarian translation by
+	Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>.
+
+2002-06-22  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* ca.po: Updated Catalan file
+
+2002-06-17  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Updated Vietnamese file
+
+2002-06-13  Takayuki KUSANO  <AE5T-KSN@asahi-net.or.jp>
+
+	* ja.po: Updated Japanese translation.
+
+2002-06-10  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* vi.po: Updated Vientamese file
+
+2002-06-02  Germ??n Poo Caama?±o <gpoo@ubiobio.cl>
+
+	* es.po: Updated Spanish translation from
+	Juan Manuel Garc?­a Molina <juanma_gm@wanadoo.es>
+
+2002-06-02  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2002-06-02  Carlos Perell?³ Mar?­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?¥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?¥l) translation.
+	
+2002-03-06  Germ??n Poo-Caama?±o <gpoo@ubiobio.cl>
+
+	* es.po: Fixed spanish translation encoding.
+
+2002-03-06  Germ??n Poo-Caama?±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?¥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: Convert to UTF-8 encoding.
+
+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-11-26  Abel Cheung  <maddog@linux.org.hk>
+
+	* stamp-cat-id: Removed, and add it to .cvsignore.
+
+2001-10-30  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
+2001-10-17  Carlos Perell?³ Mar?­n <carlos@gnome-db.org>
+
+	* pt.po: Added by Duarte Loreto <happyguy_pt@hotmail.com>
+
+2001-09-16  Abel Cheung  <maddog@linux.org.hk>
+
+	* zh_TW.po: Added traditoinal Chinese translation.
+
+2001-07-16  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* nn.po: Added Norwegian (nynorsk) translation.
+	
+2001-03-25  Fatih Demir <kabalak@gtranslator.org>
+
+	* tr.po: %100'ification.
+
+2001-03-23  Fatih Demir <kabalak@gtranslator.org>
+
+	* tr.po: Updated Turkish translation by G?¶rkem.
+
+2001-03-15  Valek Filippov  <frob@df.ru>
+
+	* ru.po: Updated russian translation.
+
+2001-03-09  Pablo Saratxaga  <pablo@mandrakesoft.com>
+
+	* az.po: converted to 8bit encoding as requested for Gnome 1.4
+
+2001-02-25  Simos Xenitellis  <simos@hellug.gr>
+
+	* el.po: Updated Greek translation.
+
+2001-02-23  Simos Xenitellis  <simos@hellug.gr>
+
+	* el.po: Some more strings.
+
+2001-02-19  Simos Xenitellis  <simos@hellug.gr>
+
+	* el.po: Update of Greek translation.
+
+2001-02-15  Christian Meyer  <cm@ggtt.de>
+
+	* de.po: Some minor changes.
+
+2001-02-14  Jarkko Ranta  <jjranta@cc.joensuu.fi>
+
+	* fi.po: Updated Finnish translation
+
+2001-02-14  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Updated Slovak translation from Marcel Telka <marcel@telka.sk>
+
+2001-02-13  Szabolcs Ban  <shooby@gnome.hu>
+
+	* hu.po: Updated Hungarian translation from Robert Vanyi
+
+2001-02-13  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
+
+	* sk.po: Added Slovak translation from Marcel Telka <marcel@telka.sk>
+
+2001-02-13  Martin Baulig  <baulig@suse.de>
+
+	* fi.po: Reverted Jarkko Ranta's change; please do
+	not commit any compressed files in future.
+
+2001-02-10  Christophe Merlet  <christophe@merlet.net>
+
+	* fr.po: Updated French translation.
+
+2001-02-09  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation.
+
+2001-02-08  Jarkko Ranta  <jjranta@cc.joensuu.fi>
+
+	* fi.po: Updated Finnish translation by Pauli Virtanen
+
+2001-02-08  Valek Filippov  <frob@df.ru>
+
+	* ru.po: Updated russian translation.
+
+2001-02-05  Christophe Merlet  <christophe@merlet.net>
+
+	* fr.po: Updated French translation.
+
+2001-01-05  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* az.po: Added Azeri file
+	* ja.po: fixed a syntax error (missing %c )
+
 2000-10-15  Yukihiro Nakai  <nakai@gnome.gr.jp>
 
 	* ja.po: Update Japanese translation.
@@ -36,7 +556,7 @@
 
 	* es.po: Updated Spanish translation.
 
-2000-05-18  Martin Norb<EFBFBD>ck  <d95mback@dtek.chalmers.se>
+2000-05-18  Martin Norb?€ck  <d95mback@dtek.chalmers.se>
 
 	* sv.po: Updated Swedish translation.
 
@@ -74,7 +594,7 @@
 
 	* gl.po: Added Galician translation.
 
-1999-09-29  Kenneth ll<EFBFBD>phaane Christiansen  <kenneth@ripen.dk>
+1999-09-29  Kenneth ll?©phaane Christiansen  <kenneth@ripen.dk>
 
 	* da.po: Updated.
 

po/LEEME.es

@@ -1,26 +0,0 @@
-[ This file explains why there are various incomplete 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').
-
-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.
-
-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),
-si alg<EFBFBD>n espa<EFBFBD>ol tiene ganas de encargarse de ello, bienvenido.
-Notese que solo es necesario traducir aquellas cadenas de texto para las
-cuales se usan terminos diferentes en Espa<EFBFBD>a; no es necesario traducir las
-dem<EFBFBD>s, con que est<EFBFBD>n en la traducci<EFBFBD>n general 'es' ya basta. 
- 
-Pablo Saratxaga
-<srtxg@chanae.alphanet.ch>
-
-

po/POTFILES.in

@@ -51,12 +51,14 @@ 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
 support/getopt.c
+support/popt.c
+support/popthelp.c
 sysdeps/common/error.c
 sysdeps/common/fsusage.c
 sysdeps/common/fsusage.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/am.po

@@ -1,92 +1,98 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translations into the Amharic Language.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgtop package.
+# Ge'ez Frontier Foundation <locales@geez.org>, 2002.
+#
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+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: libgtop VERSION\n"
+"POT-Creation-Date: 2003-01-16 08:20+0100\n"
+"PO-Revision-Date: 2003-01-16 08:39+EDT\n"
+"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
+"Language-Team: Amharic <locales@geez.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
+#: examples/smp.c:71
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Total"
-msgstr ""
+msgstr "አጠቃላይ"
 
-#: examples/smp.c:71 sysdeps/names/mem.c:47
+#: examples/smp.c:74 sysdeps/names/mem.c:47
 msgid "User"
-msgstr ""
+msgstr "ተጠቃሚ"
 
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
+#: examples/smp.c:74 sysdeps/names/procuid.c:58
 msgid "Nice"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Sys"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Idle"
 msgstr ""
 
-#: examples/smp.c:73
+#: examples/smp.c:76
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
+"ሲፒዩ          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
 
-#: examples/smp.c:77
+#: examples/smp.c:80
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
+msgstr "ሲፒዩ %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 
-#: examples/smp.c:94
+#: examples/smp.c:97
 msgid "Percent:"
-msgstr ""
+msgstr "መቶኛ፦"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Total (%)"
-msgstr ""
+msgstr "አጠቃላይ (%)"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "User (%)"
-msgstr ""
+msgstr "ተጠቃሚ (%)"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Nice (%)"
 msgstr ""
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Sys (%)"
 msgstr ""
 
-#: examples/smp.c:96
+#: examples/smp.c:99
 msgid "Idle (%)"
 msgstr ""
 
-#: examples/smp.c:98
+#: examples/smp.c:101
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
+"ሲፒዩ          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
 
-#: examples/smp.c:114
+#: examples/smp.c:117
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
+msgstr "ሲፒዩ %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
-#: examples/smp.c:120
+#: examples/smp.c:123
 msgid "Spin:"
 msgstr ""
 
@@ -115,7 +121,7 @@ msgstr ""
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
-msgstr ""
+msgstr "አስተካክል"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
@@ -211,6 +217,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 ""
@@ -447,7 +461,7 @@ msgstr ""
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
-msgstr ""
+msgstr "MTU"
 
 #: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
 msgid "Subnet"
@@ -455,7 +469,7 @@ msgstr ""
 
 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Address"
-msgstr ""
+msgstr "አድራሻ"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Packets In"
@@ -523,7 +537,7 @@ msgstr ""
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr ""
+msgstr "መጠን"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
@@ -672,37 +686,26 @@ msgid ""
 "which are swapped out."
 msgstr ""
 
-#
-# 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.
-# On the other hand, strings that are the same here and in es.po can
-# be left out.
-#
 #: sysdeps/names/procmem.c:62
 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)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
-msgstr ""
+msgstr "Text_RSS"
 
 #: sysdeps/names/procsegment.c:42
 msgid "ShLib_RSS"
-msgstr ""
+msgstr "ShLib_RSS"
 
 #: sysdeps/names/procsegment.c:42
 msgid "Data_RSS"
-msgstr ""
+msgstr "Data_RSS"
 
 #: sysdeps/names/procsegment.c:42
 msgid "Stack_RSS"
-msgstr ""
+msgstr "Stack_RSS"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
@@ -710,15 +713,15 @@ msgstr ""
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr ""
+msgstr "Start_Code"
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr ""
+msgstr "End_Code"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr ""
+msgstr "Start_Stack"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
@@ -754,7 +757,7 @@ msgstr ""
 
 #: sysdeps/names/procsignal.c:40
 msgid "Signal"
-msgstr ""
+msgstr "ሲግናል"
 
 #: sysdeps/names/procsignal.c:40
 msgid "Blocked"
@@ -762,11 +765,11 @@ msgstr ""
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigIgnore"
-msgstr ""
+msgstr "SigIgnore"
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigCatch"
-msgstr ""
+msgstr "SigCatch"
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
@@ -786,19 +789,19 @@ msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
-msgstr ""
+msgstr "Cmd"
 
 #: sysdeps/names/procstate.c:40
 msgid "State"
-msgstr ""
+msgstr "ሁኔታ"
 
 #: sysdeps/names/procstate.c:40
 msgid "UID"
-msgstr ""
+msgstr "UID"
 
 #: sysdeps/names/procstate.c:40
 msgid "GID"
-msgstr ""
+msgstr "GID"
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
@@ -810,43 +813,43 @@ msgstr ""
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
-msgstr ""
+msgstr "የሂደት UID"
 
 #: sysdeps/names/procstate.c:48
 msgid "GID of process"
-msgstr ""
+msgstr "የሂደት GID"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr ""
+msgstr "Start_Time"
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr ""
+msgstr "Rሰዓት"
 
 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr ""
+msgstr "Uሰዓት"
 
 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr ""
+msgstr "Sሰዓት"
 
 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
-msgstr ""
+msgstr "CUሰዓት"
 
 #: sysdeps/names/proctime.c:45
 msgid "CSTime"
-msgstr ""
+msgstr "CSሰዓት"
 
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr ""
+msgstr "TimeOut"
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr ""
+msgstr "It_Real_Value"
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -854,11 +857,11 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
-msgstr ""
+msgstr "XCPU_UTime"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_STime"
-msgstr ""
+msgstr "XCPU_STime"
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
@@ -908,51 +911,51 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
-msgstr ""
+msgstr "Uid"
 
 #: sysdeps/names/procuid.c:56
 msgid "EUid"
-msgstr ""
+msgstr "EUid"
 
 #: sysdeps/names/procuid.c:56
 msgid "Gid"
-msgstr ""
+msgstr "Gid"
 
 #: sysdeps/names/procuid.c:56
 msgid "EGid"
-msgstr ""
+msgstr "EGid"
 
 #: sysdeps/names/procuid.c:56
 msgid "Pid"
-msgstr ""
+msgstr "Pid"
 
 #: sysdeps/names/procuid.c:57
 msgid "PPid"
-msgstr ""
+msgstr "PPid"
 
 #: sysdeps/names/procuid.c:57
 msgid "PGrp"
-msgstr ""
+msgstr "PGrp"
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr ""
+msgstr "ክፍለ ጊዜ"
 
 #: sysdeps/names/procuid.c:57
 msgid "Tty"
-msgstr ""
+msgstr "Tty"
 
 #: sysdeps/names/procuid.c:58
 msgid "TPGid"
-msgstr ""
+msgstr "TPGid"
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr ""
+msgstr "ቅድሚያ"
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
-msgstr ""
+msgstr "የተጠቃሚው id"
 
 #: sysdeps/names/procuid.c:64
 msgid "Effective User ID"
@@ -960,7 +963,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:65
 msgid "Group ID"
-msgstr ""
+msgstr "የመድረክ ID"
 
 #: sysdeps/names/procuid.c:66
 msgid "Effective Group ID"
@@ -968,7 +971,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:67
 msgid "Process ID"
-msgstr ""
+msgstr "የሂደት ID"
 
 #: sysdeps/names/procuid.c:68
 msgid "PID of parent process"
@@ -976,11 +979,11 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:69
 msgid "Process group ID"
-msgstr ""
+msgstr "የሂደት መድረክ ID"
 
 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
-msgstr ""
+msgstr "የአሁኑን ክፍለ ID"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
@@ -1072,11 +1075,11 @@ msgstr ""
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr ""
+msgstr "የማስታወሻ ገጽ አስገባ"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr ""
+msgstr "የማስታወሻ ገጽ ውጤት"
 
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
@@ -1088,7 +1091,7 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
-msgstr ""
+msgstr "የሰርቨር ምርጫዎች"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
@@ -1176,7 +1179,7 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
-msgstr ""
+msgstr "የPPP ቍጥር መረጃ ጥናት"
 
 #: sysdeps/names/sysdeps.c:93
 msgid "Command line arguments of the process"
@@ -1212,7 +1215,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr ""
+msgstr "ውጣ"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
@@ -1224,11 +1227,11 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
-msgstr ""
+msgstr "ውድቅ"
 
 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr ""
+msgstr "የEMT ስህተት"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
@@ -1236,11 +1239,11 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr ""
+msgstr "አቋርጥ"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr ""
+msgstr "የBus ስህተት"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
@@ -1252,7 +1255,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr ""
+msgstr "የተሰበረ መተላለፊያ"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
@@ -1268,7 +1271,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr ""
+msgstr "አቁም"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
@@ -1276,7 +1279,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr ""
+msgstr "ቀጥል"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"

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: 2000-11-12 02:15+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/et.po

@@ -1,92 +1,97 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# libgtop eesti tõlge.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgtop package.
+# Tõivo Leedjärv <toivo@linux.ee>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+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: libgtop\n"
+"POT-Creation-Date: 2003-02-24 22:57+0200\n"
+"PO-Revision-Date: 2003-02-25 01:05+0200\n"
+"Last-Translator: Tõivo Leedjärv <toivo@linux.ee>\n"
+"Language-Team: Estonian <gnome-et@linux.ee>\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
+#: examples/smp.c:71
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Total"
-msgstr ""
+msgstr "Kokku"
 
-#: examples/smp.c:71 sysdeps/names/mem.c:47
+#: examples/smp.c:74 sysdeps/names/mem.c:47
 msgid "User"
-msgstr ""
+msgstr "Kasutaja"
 
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
+#: examples/smp.c:74 sysdeps/names/procuid.c:58
 msgid "Nice"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Sys"
-msgstr ""
+msgstr "Süsteem"
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Idle"
-msgstr ""
+msgstr "Kasutamata"
 
-#: examples/smp.c:73
+#: examples/smp.c:76
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
+"Protsessor   (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
 
-#: examples/smp.c:77
+#: examples/smp.c:80
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
+msgstr "Prots. %3d   (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 
-#: examples/smp.c:94
+#: examples/smp.c:97
 msgid "Percent:"
-msgstr ""
+msgstr "Protsenti:"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Total (%)"
-msgstr ""
+msgstr "Kokku (%)"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "User (%)"
-msgstr ""
+msgstr "Kasutaja (%)"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Nice (%)"
 msgstr ""
 
-#: examples/smp.c:95
-msgid "Sys (%)"
-msgstr ""
-
-#: examples/smp.c:96
-msgid "Idle (%)"
-msgstr ""
-
 #: examples/smp.c:98
+msgid "Sys (%)"
+msgstr "Süsteem (%)"
+
+#: examples/smp.c:99
+msgid "Idle (%)"
+msgstr "Kasutamata (%)"
+
+#: examples/smp.c:101
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
+"Protsessor   (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
 
-#: examples/smp.c:114
+#: examples/smp.c:117
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
+msgstr "Prots. %3d   (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
-#: examples/smp.c:120
+#: examples/smp.c:123
 msgid "Spin:"
 msgstr ""
 
@@ -211,25 +216,33 @@ 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 ""
+msgstr "Protsessori aeg kokku"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr ""
+msgstr "Protsessori aeg kasutajale"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr ""
+msgstr "Protsessori aeg kasutajale (nice)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
-msgstr ""
+msgstr "Protsessori aeg süsteemile"
 
 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
-msgstr ""
+msgstr "Protsessori aeg jõude"
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
@@ -237,23 +250,23 @@ msgstr ""
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr ""
+msgstr "SMP protsessori aeg kokku"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr ""
+msgstr "SMP Protsessori aeg kasutajale"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr ""
+msgstr "SMP Protsessori aeg kasutajale (nice)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr ""
+msgstr "SMP Protsessori aeg süsteemile"
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr ""
+msgstr "SMP Protsessori aeg jõude"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
@@ -281,35 +294,35 @@ msgstr ""
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr ""
+msgstr "Blokke kokku"
 
 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
-msgstr ""
+msgstr "Blokke vaba"
 
 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr ""
+msgstr "Saadaval blokke"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
-msgstr ""
+msgstr "Failisõlmi kokku"
 
 #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
 msgid "Free file nodes"
-msgstr ""
+msgstr "Failisõlmi vaba"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr ""
+msgstr "Vabu blokke saadaval juurkasutajale"
 
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr ""
+msgstr "Vabu blokke saadaval tavakasutajatele"
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
-msgstr ""
+msgstr "Keskmine koormus"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
@@ -337,55 +350,55 @@ msgstr ""
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr ""
+msgstr "Mälu kokku"
 
 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr ""
+msgstr "Kasutatud mälu"
 
 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
-msgstr ""
+msgstr "Vaba mälu"
 
 #: sysdeps/names/mem.c:44
 msgid "Shared Memory"
-msgstr ""
+msgstr "Jagatud mälu"
 
 #: sysdeps/names/mem.c:45
 msgid "Buffers"
-msgstr ""
+msgstr "Puhvrid"
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr ""
+msgstr "Puhverdatud"
 
 #: sysdeps/names/mem.c:48
-msgid "Locked"
+msgid "Lukustatud"
 msgstr ""
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr ""
+msgstr "Kokku füüsilist mälu kB"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
-msgstr ""
+msgstr "Kasutatud mälu kB"
 
 #: sysdeps/names/mem.c:55
 msgid "Free memory size in kB"
-msgstr ""
+msgstr "Vaba mälu kB"
 
 #: sysdeps/names/mem.c:56
 msgid "Shared memory size in kB"
-msgstr ""
+msgstr "Jagatud mälu kB"
 
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr ""
+msgstr "Puhvrite suurus kB"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr ""
+msgstr "Puhverdatud mälu kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
@@ -451,51 +464,51 @@ msgstr ""
 
 #: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
 msgid "Subnet"
-msgstr ""
+msgstr "Alamvõrk"
 
 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Address"
-msgstr ""
+msgstr "Aadress"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Packets In"
-msgstr ""
+msgstr "Pakette sisse"
 
 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
 msgid "Packets Out"
-msgstr ""
+msgstr "Pakette välja"
 
 #: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
 msgid "Packets Total"
-msgstr ""
+msgstr "Kokku pakette"
 
 #: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
 msgid "Bytes In"
-msgstr ""
+msgstr "Baite sisse"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes Out"
-msgstr ""
+msgstr "Baite välja"
 
 #: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
 msgid "Bytes Total"
-msgstr ""
+msgstr "Kokku baite"
 
 #: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
 msgid "Errors In"
-msgstr ""
+msgstr "Vigu sisse"
 
 #: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
 msgid "Errors Out"
-msgstr ""
+msgstr "Vigu välja"
 
 #: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
 msgid "Errors Total"
-msgstr ""
+msgstr "Kokku vigu"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr ""
+msgstr "Põrkumisi"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
@@ -672,21 +685,10 @@ msgid ""
 "which are swapped out."
 msgstr ""
 
-#
-# 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.
-# On the other hand, strings that are the same here and in es.po can
-# be left out.
-#
 #: sysdeps/names/procmem.c:62
 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)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -1092,23 +1094,23 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
-msgstr ""
+msgstr "Protsessori koormus"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr ""
+msgstr "Mälukasutus"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr ""
+msgstr "Saale kasutus"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
-msgstr ""
+msgstr "Süsteemi tööaeg"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
-msgstr ""
+msgstr "Keskmine koormus"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
@@ -1168,11 +1170,11 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
 msgid "File System Usage"
-msgstr ""
+msgstr "Failisüsteemide kasutus"
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
-msgstr ""
+msgstr "Võrgu koormus"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
@@ -1188,19 +1190,19 @@ msgstr ""
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr ""
+msgstr "Tööaeg"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
-msgstr ""
+msgstr "Puhkeaeg"
 
 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
-msgstr ""
+msgstr "Aega süsteemi käivitamisest (sekundites)"
 
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr ""
+msgstr "Kui kaua on protsessor käivitamisest alates jõude seisnud (sekundites)"
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"

po/fa.po

@@ -1,92 +1,92 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Persian translation of libgtop.
+# Copyright (C) 2003 The FarsiWeb Project Group
+# Roozbeh Pournader <roozbeh@sharif.edu>, 2003.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+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: libgtop\n"
+"POT-Creation-Date: 2003-03-10 05:20+0100\n"
+"PO-Revision-Date: 2003-03-10 15:31+0330\n"
+"Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
+"Language-Team: Persian <farsi@lists.sharif.edu>\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
+#: examples/smp.c:71
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Total"
-msgstr ""
+msgstr "مجموع"
 
-#: examples/smp.c:71 sysdeps/names/mem.c:47
+#: examples/smp.c:74 sysdeps/names/mem.c:47
 msgid "User"
-msgstr ""
+msgstr "کاربر"
 
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
+#: examples/smp.c:74 sysdeps/names/procuid.c:58
 msgid "Nice"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Sys"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Idle"
-msgstr ""
+msgstr "عاطل"
 
-#: examples/smp.c:73
+#: examples/smp.c:76
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
 
-#: examples/smp.c:77
+#: examples/smp.c:80
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr ""
 
-#: examples/smp.c:94
+#: examples/smp.c:97
 msgid "Percent:"
-msgstr ""
+msgstr "درصد:"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Total (%)"
-msgstr ""
+msgstr "مجموع (%)"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "User (%)"
-msgstr ""
+msgstr "کاربر (%)"
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Nice (%)"
 msgstr ""
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Sys (%)"
 msgstr ""
 
-#: examples/smp.c:96
+#: examples/smp.c:99
 msgid "Idle (%)"
-msgstr ""
+msgstr "عاطل (%)"
 
-#: examples/smp.c:98
+#: examples/smp.c:101
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
 
-#: examples/smp.c:114
+#: examples/smp.c:117
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr ""
 
-#: examples/smp.c:120
+#: examples/smp.c:123
 msgid "Spin:"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr ""
+msgstr "به کار انداختن اشکال‌زدایی"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
@@ -131,7 +131,7 @@ msgstr ""
 
 #: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
-msgstr ""
+msgstr "NO-DAEMON"
 
 #: src/daemon/gnuserv.c:454
 msgid "Invoked from inetd"
@@ -211,9 +211,17 @@ 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 ""
+msgstr "مجموع زمان واحد پردازش مرکزی"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
@@ -233,7 +241,7 @@ msgstr ""
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
-msgstr ""
+msgstr "فرکانس تیک"
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
@@ -277,11 +285,11 @@ msgstr ""
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
-msgstr ""
+msgstr "فرکانس تیک (پیش‌فرض ۱۰۰ است)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr ""
+msgstr "مجموع بلوک‌ها"
 
 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
@@ -313,15 +321,15 @@ msgstr ""
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr ""
+msgstr "تکالیف در حال اجرا"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr ""
+msgstr "تعداد تکالیف"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
-msgstr ""
+msgstr "آخرین PID"
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
@@ -337,7 +345,7 @@ msgstr ""
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr ""
+msgstr "کل حافظه"
 
 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
@@ -349,7 +357,7 @@ msgstr ""
 
 #: sysdeps/names/mem.c:44
 msgid "Shared Memory"
-msgstr ""
+msgstr "حافظه‌ی اشتراکی"
 
 #: sysdeps/names/mem.c:45
 msgid "Buffers"
@@ -365,7 +373,7 @@ msgstr ""
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr ""
+msgstr "کل حافظه‌ی فیزیکی به کیلوبایت"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
@@ -405,7 +413,7 @@ msgstr ""
 #: 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 ""
+msgstr "مجموع اندازه‌ی فهرست"
 
 #: sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
@@ -423,7 +431,7 @@ msgstr ""
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr ""
+msgstr "حداکثر اندازه‌ی پیغام"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
@@ -447,15 +455,15 @@ msgstr ""
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
-msgstr ""
+msgstr "MTU"
 
 #: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
 msgid "Subnet"
-msgstr ""
+msgstr "زیرشبکه"
 
 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Address"
-msgstr ""
+msgstr "نشانی"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Packets In"
@@ -471,15 +479,15 @@ msgstr ""
 
 #: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
 msgid "Bytes In"
-msgstr ""
+msgstr "بایت ورودی"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes Out"
-msgstr ""
+msgstr "بایت خروجی"
 
 #: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
 msgid "Bytes Total"
-msgstr ""
+msgstr "کل بایت‌ها"
 
 #: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
 msgid "Errors In"
@@ -495,7 +503,7 @@ msgstr ""
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr ""
+msgstr "برخوردها"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
@@ -503,27 +511,27 @@ msgstr ""
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
-msgstr ""
+msgstr "وضعیت PPP"
 
 #: sysdeps/names/ppp.c:39
 msgid "Input bytes"
-msgstr ""
+msgstr "بایت‌های ورودی"
 
 #: sysdeps/names/ppp.c:40
 msgid "Output bytes"
-msgstr ""
+msgstr "بایت‌های خروجی"
 
 #: sysdeps/names/ppp.c:46
 msgid "Number of input bytes"
-msgstr ""
+msgstr "تعداد بایت‌های ورودی"
 
 #: sysdeps/names/ppp.c:47
 msgid "Number of output bytes"
-msgstr ""
+msgstr "تعداد بایت‌های خروجی"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr ""
+msgstr "اندازه"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
@@ -630,15 +638,15 @@ msgstr ""
 
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
-msgstr ""
+msgstr "مجازی"
 
 #: sysdeps/names/procmem.c:47
 msgid "Resident"
-msgstr ""
+msgstr "مقیم"
 
 #: sysdeps/names/procmem.c:47
 msgid "Share"
-msgstr ""
+msgstr "به اشتراک گذاشتن"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
@@ -672,21 +680,9 @@ msgid ""
 "which are swapped out."
 msgstr ""
 
-#
-# 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.
-# On the other hand, strings that are the same here and in es.po can
-# be left out.
-#
 #: sysdeps/names/procmem.c:62
-msgid ""
-"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"Limite actual en bytes de conjunto compartido (RSS) del proceso "
-"(habitualmente 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -758,7 +754,7 @@ msgstr ""
 
 #: sysdeps/names/procsignal.c:40
 msgid "Blocked"
-msgstr ""
+msgstr "بلوکه‌شده"
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigIgnore"
@@ -790,7 +786,7 @@ msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "State"
-msgstr ""
+msgstr "وضعیت"
 
 #: sysdeps/names/procstate.c:40
 msgid "UID"
@@ -818,7 +814,7 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr ""
+msgstr "زمان آغاز"
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
@@ -850,7 +846,7 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
-msgstr ""
+msgstr "فرکانس"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
@@ -896,7 +892,7 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:60
 msgid "Tick frequency"
-msgstr ""
+msgstr "فرکانس تیک"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
@@ -936,11 +932,11 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr ""
+msgstr "نشست"
 
 #: sysdeps/names/procuid.c:57
 msgid "Tty"
-msgstr ""
+msgstr "Tty"
 
 #: sysdeps/names/procuid.c:58
 msgid "TPGid"
@@ -948,11 +944,11 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr ""
+msgstr "اولویت"
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
-msgstr ""
+msgstr "شناسه‌ی کاربر"
 
 #: sysdeps/names/procuid.c:64
 msgid "Effective User ID"
@@ -960,7 +956,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:65
 msgid "Group ID"
-msgstr ""
+msgstr "شناسه‌ی گروه"
 
 #: sysdeps/names/procuid.c:66
 msgid "Effective Group ID"
@@ -968,7 +964,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:67
 msgid "Process ID"
-msgstr ""
+msgstr "شناسه‌ی فراروند"
 
 #: sysdeps/names/procuid.c:68
 msgid "PID of parent process"
@@ -980,7 +976,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
-msgstr ""
+msgstr "شناسه‌ی نشست"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
@@ -1072,11 +1068,11 @@ msgstr ""
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr ""
+msgstr "صفحه ورودی"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr ""
+msgstr "صفحه خروجی"
 
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
@@ -1088,15 +1084,15 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
-msgstr ""
+msgstr "امکانات کارگزار"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
-msgstr ""
+msgstr "استفاده از واحد پردازش مرکزی"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr ""
+msgstr "استفاده از حافظه"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
@@ -1104,7 +1100,7 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
-msgstr ""
+msgstr "زمان کار سیستم"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
@@ -1172,11 +1168,11 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
-msgstr ""
+msgstr "بار شبکه"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
-msgstr ""
+msgstr "آمار PPP"
 
 #: sysdeps/names/sysdeps.c:93
 msgid "Command line arguments of the process"
@@ -1188,7 +1184,7 @@ msgstr ""
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr ""
+msgstr "زمان کار"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
@@ -1208,15 +1204,15 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
-msgstr ""
+msgstr "وقفه"
 
 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr ""
+msgstr "خروج"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr ""
+msgstr "دستورالعمل غیرمجاز"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
@@ -1236,11 +1232,11 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr ""
+msgstr "خاموش کردن"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr ""
+msgstr "خطای گذرگاه"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
@@ -1268,7 +1264,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr ""
+msgstr "پایان"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
@@ -1276,7 +1272,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr ""
+msgstr "ادامه"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
@@ -1312,11 +1308,11 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr ""
+msgstr "تغییر اندازه‌ی پنجره"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr ""
+msgstr "درخواست اطلاعات"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
@@ -1325,3 +1321,4 @@ msgstr ""
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr ""
+

po/ga.po

@@ -1,29 +1,239 @@
 # Irish (gaeilge) translations for libgtop.pot (Gnome)
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 1998,2003 Free Software Foundation, Inc.
 # Alastair McKinstry <mckinstry@computer.org>, 1998
-#
+# Paul Duffy <dubhthach@frink.nuigalway.ie>, 2003
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop CVS\n"
-"POT-Creation-Date: 2000-05-14 17:02+0200\n"
-"PO-Revision-Date: 2000-03-09 12:39+000\n"
-"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
-"Language-Team: Irish <ga@li.org>\n"
+"Project-Id-Version: libgtop-GNOME-2-0-port \n"
+"POT-Creation-Date: 2003-06-04 14:31+0100\n"
+"PO-Revision-Date: 2003-06-04 14:39+000\n"
+"Last-Translator: Paul Duffy <dubhthach@frink.nuigalway.ie>\n"
+"Language-Team: Irish\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:71
+#, c-format
+msgid "Ticks (%ld per second):"
+msgstr ""
+
+#: examples/smp.c:74
+msgid "Total"
+msgstr "Iomlán"
+
+#: examples/smp.c:74 sysdeps/names/mem.c:47
+msgid "User"
+msgstr "Úsáidoeir"
+
+#: examples/smp.c:74 sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr "Deas"
+
+#: examples/smp.c:74
+msgid "Sys"
+msgstr "Sys"
+
+#: examples/smp.c:74
+msgid "Idle"
+msgstr "Diomhaoin"
+
+#: examples/smp.c:76
+#, c-format
+msgid ""
+"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
+msgstr ""
+"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
+
+#: examples/smp.c:80
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+
+#: examples/smp.c:97
+msgid "Percent:"
+msgstr "Céatadán:"
+
+#: examples/smp.c:98
+msgid "Total (%)"
+msgstr "Iomlán (%)"
+
+#: examples/smp.c:98
+msgid "User (%)"
+msgstr "Úsáidoeir (%)"
+
+#: examples/smp.c:98
+msgid "Nice (%)"
+msgstr "Deas (%)"
+
+#: examples/smp.c:98
+msgid "Sys (%)"
+msgstr "Sys (%)"
+
+#: examples/smp.c:99
+msgid "Idle (%)"
+msgstr "Diomhaoin (%)"
+
+#: examples/smp.c:101
+#, c-format
+msgid ""
+"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
+msgstr ""
+"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
+
+#: examples/smp.c:117
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+
+#: examples/smp.c:123
+msgid "Spin:"
+msgstr "Sníomh:"
+
+#: lib/read.c:75
+#, c-format
+msgid "read %d bytes"
+msgstr ""
+
+#: lib/read_data.c:49
+msgid "read data size"
+msgstr ""
+
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
+msgstr ""
+
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
+msgstr ""
+
+#: src/daemon/gnuserv.c:453
+msgid "Enable debugging"
+msgstr ""
+
+#: src/daemon/gnuserv.c:453
+msgid "DEBUG"
+msgstr ""
+
+#: src/daemon/gnuserv.c:455
+msgid "Enable verbose output"
+msgstr ""
+
+#: src/daemon/gnuserv.c:455
+msgid "VERBOSE"
+msgstr ""
+
+#: src/daemon/gnuserv.c:457
+msgid "Don't fork into background"
+msgstr ""
+
+#: src/daemon/gnuserv.c:457
+msgid "NO-DAEMON"
+msgstr ""
+
+#: src/daemon/gnuserv.c:459
+msgid "Invoked from inetd"
+msgstr ""
+
+#: src/daemon/gnuserv.c:459
+msgid "INETD"
+msgstr ""
+
+#: src/daemon/gnuserv.c:493
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: support/error.c:109
+msgid "Unknown system error"
+msgstr "éarraid coráis anathnid"
+
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: droch rogha -- %c\n"
+
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: droch rogha -- %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 ""
+
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: support/getopt.c:872
+#, c-format
+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 "Am CPU Ioml<EFBFBD>n"
+msgstr "Am CPU Iomlán"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr "Am CPU san M<EFBFBD>d <EFBFBD>s<EFBFBD>ideoir"
+msgstr "Am CPU san Mód Úsáideoir"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "Am CPU san M<EFBFBD>d <EFBFBD>s<EFBFBD>ideoir (deas)"
+msgstr "Am CPU san Mód Úsáideoir (deas)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
@@ -35,7 +245,7 @@ msgstr ""
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
-msgstr "Minic<EFBFBD>ocht Tic"
+msgstr "Minicíocht Tic"
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
@@ -79,11 +289,11 @@ msgstr ""
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
-msgstr "Minic<EFBFBD>ocht Tic (gn<EFBFBD>th = 100)"
+msgstr "Minicíocht Tic (gnáth = 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
-msgstr "Blocanna Ioml<EFBFBD>n"
+msgstr "Blocanna Iomlán"
 
 #: sysdeps/names/fsusage.c:40
 msgid "Free blocks"
@@ -91,15 +301,15 @@ msgstr "Blocanna Saor"
 
 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr "Blocanna ar f<EFBFBD>il"
+msgstr "Blocanna ar fáil"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
-msgstr "N<EFBFBD>danna comhad ioml<EFBFBD>n"
+msgstr "Nódanna comhad iomlán"
 
 #: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
 msgid "Free file nodes"
-msgstr "N<EFBFBD>danna comhad saor"
+msgstr "Nódanna comhad saor"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
@@ -111,15 +321,15 @@ msgstr ""
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
-msgstr "M<EFBFBD>an L<EFBFBD>d"
+msgstr "Méan Lód"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr "Tasca<EFBFBD> ag Rith"
+msgstr "Tascaí ag Rith"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "Uimhir na Tasca<EFBFBD>"
+msgstr "Uimhir na Tascaí"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
@@ -139,11 +349,11 @@ msgstr ""
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr "Cuimhne Ioml<EFBFBD>n"
+msgstr "Cuimhne Iomlán"
 
 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr "Cuimhne <EFBFBD>s<EFBFBD>id"
+msgstr "Cuimhne Úsáid"
 
 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
@@ -155,15 +365,11 @@ msgstr "Cuimhne comhrionnadh"
 
 #: sysdeps/names/mem.c:45
 msgid "Buffers"
-msgstr "Maol<EFBFBD>na<EFBFBD>"
+msgstr "Maolánaí"
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr "Taisce<EFBFBD>idthe"
-
-#: sysdeps/names/mem.c:47
-msgid "User"
-msgstr "<22>s<EFBFBD>idoeir"
+msgstr "Taisceáidthe"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
@@ -206,14 +412,14 @@ msgstr ""
 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45
 #, fuzzy
 msgid "Number of list elements"
-msgstr "Uimhir na Tasca<EFBFBD>"
+msgstr "Uimhir na Tascaí"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
 #: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46
 #, fuzzy
 msgid "Total size of list"
-msgstr "N<EFBFBD>danna comhad ioml<EFBFBD>n"
+msgstr "Nódanna comhad iomlán"
 
 #: sysdeps/names/mountlist.c:40 sysdeps/names/mountlist.c:47
 #: sysdeps/names/proclist.c:40 sysdeps/names/proclist.c:47
@@ -249,6 +455,99 @@ msgstr ""
 msgid "Number of system message headers"
 msgstr ""
 
+#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
+msgid "Interface Flags"
+msgstr ""
+
+#: sysdeps/names/netload.c:46
+msgid "MTU"
+msgstr ""
+
+#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
+msgid "Subnet"
+msgstr ""
+
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
+msgid "Address"
+msgstr ""
+
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
+#, fuzzy
+msgid "Packets In"
+msgstr "Leathanach Istigh"
+
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+#, fuzzy
+msgid "Packets Out"
+msgstr "Leathanach Amach"
+
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+msgid "Packets Total"
+msgstr ""
+
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+msgid "Bytes In"
+msgstr ""
+
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+msgid "Bytes Out"
+msgstr ""
+
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+msgid "Bytes Total"
+msgstr ""
+
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+msgid "Errors In"
+msgstr ""
+
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+msgid "Errors Out"
+msgstr ""
+
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+msgid "Errors Total"
+msgstr ""
+
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+msgid "Collisions"
+msgstr ""
+
+#: sysdeps/names/netload.c:64
+msgid "Maximum Transfer Unit"
+msgstr ""
+
+#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
+#, fuzzy
+msgid "PPP State"
+msgstr "Sonraí PPP"
+
+#: sysdeps/names/ppp.c:39
+msgid "Input bytes"
+msgstr ""
+
+#: sysdeps/names/ppp.c:40
+msgid "Output bytes"
+msgstr ""
+
+#: sysdeps/names/ppp.c:46
+#, fuzzy
+msgid "Number of input bytes"
+msgstr "Uimhir na Tascaí"
+
+#: sysdeps/names/ppp.c:47
+#, fuzzy
+msgid "Number of output bytes"
+msgstr "Uimhir na Tascaí"
+
+#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr "Toirt"
+
+#: sysdeps/names/procargs.c:43
+msgid "Length in bytes of the returned string."
+msgstr ""
+
 # NOTE:
 # Don't try translating the following; instead translate their
 # popup hints that explain them.
@@ -351,13 +650,9 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr ""
 
-#: sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "Toirt"
-
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
-msgstr "F<EFBFBD>o<EFBFBD>il"
+msgstr "Fíoúil"
 
 #: sysdeps/names/procmem.c:47
 msgid "Resident"
@@ -502,7 +797,7 @@ msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
-msgstr "Ord<EFBFBD>"
+msgstr "Ordú"
 
 #: sysdeps/names/procstate.c:40
 msgid "State"
@@ -527,12 +822,12 @@ msgstr ""
 #: sysdeps/names/procstate.c:47
 #, fuzzy
 msgid "UID of process"
-msgstr "ID Pr<EFBFBD>iseas"
+msgstr "ID Próiseas"
 
 #: sysdeps/names/procstate.c:48
 #, fuzzy
 msgid "GID of process"
-msgstr "ID Pr<EFBFBD>iseas"
+msgstr "ID Próiseas"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
@@ -568,7 +863,7 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
-msgstr "Minic<EFBFBD>ocht"
+msgstr "Minicíocht"
 
 #: sysdeps/names/proctime.c:46
 msgid "XCPU_UTime"
@@ -614,7 +909,7 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:60
 msgid "Tick frequency"
-msgstr "Minic<EFBFBD>ocht Tic"
+msgstr "Minicíocht Tic"
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
@@ -654,7 +949,7 @@ msgstr "PGrp"
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr "Seisi<EFBFBD>n"
+msgstr "Seisiún"
 
 #: sysdeps/names/procuid.c:57
 msgid "Tty"
@@ -666,19 +961,15 @@ msgstr "TPGid"
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "Tosa<EFBFBD>ocht"
-
-#: sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "Deas"
+msgstr "Tosaíocht"
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
-msgstr "ID <EFBFBD>s<EFBFBD>ideoir"
+msgstr "ID Úsáideoir"
 
 #: sysdeps/names/procuid.c:64
 msgid "Effective User ID"
-msgstr "ID <EFBFBD>s<EFBFBD>ideoir <EFBFBD>ifeachteacht"
+msgstr "ID Úsáideoir Éifeachteacht"
 
 #: sysdeps/names/procuid.c:65
 msgid "Group ID"
@@ -686,11 +977,11 @@ msgstr "ID Grupa"
 
 #: sysdeps/names/procuid.c:66
 msgid "Effective Group ID"
-msgstr "ID Grupa <EFBFBD>ifeacteacht"
+msgstr "ID Grupa Éifeacteacht"
 
 #: sysdeps/names/procuid.c:67
 msgid "Process ID"
-msgstr "ID Pr<EFBFBD>iseas"
+msgstr "ID Próiseas"
 
 #: sysdeps/names/procuid.c:68
 msgid "PID of parent process"
@@ -702,7 +993,7 @@ msgstr ""
 
 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
-msgstr "ID Seisi<EFBFBD>n"
+msgstr "ID Seisiún"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
@@ -830,7 +1121,7 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
-msgstr "M<EFBFBD>an L<EFBFBD>d"
+msgstr "Méan Lód"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
@@ -894,11 +1185,11 @@ msgstr ""
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
-msgstr "L<EFBFBD>d L<EFBFBD>onra"
+msgstr "Lód Líonra"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
-msgstr "Sonra<EFBFBD> PPP"
+msgstr "Sonraí PPP"
 
 #: sysdeps/names/sysdeps.c:93
 msgid "Command line arguments of the process"
@@ -924,192 +1215,128 @@ msgstr ""
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
 
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr "<22>arraid cor<6F>is anathnid"
-
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+msgid "Hangup"
 msgstr ""
 
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
 msgstr ""
 
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+msgid "Quit"
 msgstr ""
 
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
 msgstr ""
 
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
 msgstr ""
 
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: droch rogha -- %c\n"
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: droch rogha -- %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 ""
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr ""
-
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr ""
-
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr ""
-
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
-
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr ""
-
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr ""
-
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr ""
-
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr ""
-
-#: src/daemon/gnuserv.c:488
-#, c-format
-msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+msgid "Abort"
 msgstr ""
 
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 #, fuzzy
-#~ msgid "RUID"
-#~ msgstr "UID"
+msgid "EMT error"
+msgstr "Gan earráid"
 
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 #, fuzzy
-#~ msgid "RGID"
-#~ msgstr "GID"
+msgid "Bus error"
+msgstr "Gan earráid"
 
-#, fuzzy
-#~ msgid "Processor"
-#~ msgstr "ID Pr<50>iseas"
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr ""
 
-# NOTE:
-# Don't try translating the following; instead translate their
-# popup hints that explain them.
-#, fuzzy
-#~ msgid "XCPU_Flags"
-#~ msgstr "K_Flags"
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr ""
 
-#, fuzzy
-#~ msgid "SUid"
-#~ msgstr "Uid"
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr ""
 
-#, fuzzy
-#~ msgid "SGid"
-#~ msgstr "Gid"
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr ""
 
-#, fuzzy
-#~ msgid "FsUid"
-#~ msgstr "FsUid"
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr ""
 
-#, fuzzy
-#~ msgid "FsGid"
-#~ msgstr "FsGid"
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
+msgstr ""
 
-#, fuzzy
-#~ msgid "NGroups"
-#~ msgstr "ID Grupa"
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Groups"
-#~ msgstr "ID Grupa"
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Saved User ID"
-#~ msgstr "ID <20>s<EFBFBD>ideoir S<>bh<62>id"
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Saved Group ID"
-#~ msgstr "ID Grupa S<>bh<62>id"
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Filesystem User ID"
-#~ msgstr "ID <20>s<EFBFBD>ideoir Cor<6F>schomad"
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Filesystem Group ID"
-#~ msgstr "ID Grupa Cor<6F>schomad"
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr ""
 
-#~ msgid "No error"
-#~ msgstr "Gan earr<72>id"
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "<EFBFBD>arraid cor<6F>is anathnid"
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr ""
 
-#~ msgid "Invalid argument"
-#~ msgstr "Droch Argoint"
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+msgid "File size limit exceeded"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr ""

po/gl.po

@@ -2,23 +2,23 @@
 # Copyright (C) 1999, 2000 Jesus Bravo Alvarez
 # Jesus Bravo Alvarez <jba@pobox.com>, 1999, 2000.
 #
-# Se desexas colaborar connosco na traducci<EFBFBD>n de programas libres <EFBFBD> galego,
-# vai mira-la p<EFBFBD>xina do noso grupo:  http://www.ctv.es/USERS/jtarrio/trans
+# Se desexas colaborar connosco na traducción de programas libres ó galego,
+# vai mira-la páxina do noso grupo:  http://www.ctv.es/USERS/jtarrio/trans
 #
 # Conclusion Date: 1999-10-09 23:46+0200
 #
-# Se algu<EFBFBD>n me axuda coa revisi<EFBFBD>n dalgunhas traducci<EFBFBD>ns "pouco ortodoxas",
-# agradecer<EFBFBD>allo. ;-)
+# Se alguén me axuda coa revisión dalgunhas traduccións "pouco ortodoxas",
+# agradeceríallo. ;-)
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.8\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 2000-05-18 00:14+0200\n"
 "Last-Translator: Jesus Bravo Alvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\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
@@ -109,7 +109,7 @@ msgstr "lidos %d bytes"
 
 #: lib/read_data.c:49
 msgid "read data size"
-msgstr "tama<EFBFBD>o dos datos lidos"
+msgstr "tamaño dos datos lidos"
 
 #: lib/read_data.c:66
 #, c-format
@@ -123,15 +123,15 @@ msgstr "escritos %d bytes"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "Activar depuraci<EFBFBD>n"
+msgstr "Activar depuración"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
-msgstr "DEPURACI<EFBFBD>N"
+msgstr "DEPURACIÓN"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr "Activar sa<EFBFBD>da extensa"
+msgstr "Activar saída extensa"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
@@ -159,72 +159,72 @@ msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Erro na opci<EFBFBD>n %s: %s.\n"
-"Execute '%s --help' para ver unha lista completa das opci<EFBFBD>ns de li<EFBFBD>a\n"
+"Erro na opción %s: %s.\n"
+"Execute '%s --help' para ver unha lista completa das opcións de liña\n"
 "de comandos disponibles.\n"
 
 #: support/error.c:109
 msgid "Unknown system error"
-msgstr "Erro de sistema desco<EFBFBD>ecido"
+msgstr "Erro de sistema descoñecido"
 
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: a opci<EFBFBD>n `%s' <EFBFBD> ambigua\n"
+msgstr "%s: a opción `%s' é ambigua\n"
 
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: a opci<EFBFBD>n `--%s' non permite ning<EFBFBD>n argumento\n"
+msgstr "%s: a opción `--%s' non permite ningún argumento\n"
 
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: a opci<EFBFBD>n `%c%s' non permite ning<EFBFBD>n argumento\n"
+msgstr "%s: a opción `%c%s' non permite ningún argumento\n"
 
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: a opci<EFBFBD>n `%s' requere un argumento\n"
+msgstr "%s: a opción `%s' requere un argumento\n"
 
 #. --option
 #: support/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opci<EFBFBD>n `--%s' desco<EFBFBD>ecida\n"
+msgstr "%s: opción `--%s' descoñecida\n"
 
 #. +option or -option
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opci<EFBFBD>n `%c%s' desco<EFBFBD>ecida\n"
+msgstr "%s: opción `%c%s' descoñecida\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: opci<EFBFBD>n ilegal -- %c\n"
+msgstr "%s: opción ilegal -- %c\n"
 
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: opci<EFBFBD>n non v<EFBFBD>lida -- %c\n"
+msgstr "%s: opción non vá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: a opci<EFBFBD>n requere un argumento -- %c\n"
+msgstr "%s: a opción requere un argumento -- %c\n"
 
 #: support/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: a opci<EFBFBD>n `-W %s' <EFBFBD> ambigua\n"
+msgstr "%s: a opción `-W %s' é ambigua\n"
 
 #: support/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: a opci<EFBFBD>n `-W %s' non permite ning<EFBFBD>n argumento\n"
+msgstr "%s: a opción `-W %s' non permite ningún argumento\n"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -272,27 +272,27 @@ msgstr "Tempo de CPU Total Multi-procesador (SMP) en Tarefas Inactivas"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
-msgstr "N<EFBFBD>mero de ticks de reloxio dende o inicio do sistema"
+msgstr "Número de ticks de reloxio dende o inicio 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 ticks de reloxio empregados en modo usuario"
+msgstr "Número de ticks de reloxio empregados en modo usuario"
 
 #: 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 ticks de reloxio empregados en modo usuario (nice)"
+msgstr "Número de ticks de reloxio empregados en modo usuario (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 ticks de reloxio empregados en modo sistema"
+msgstr "Número de ticks de reloxio empregados en 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 ticks de reloxio empregados en tarefas inactivas"
+msgstr "Número de ticks de reloxio empregados en tarefas inactivas"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
-msgstr "Frecuencia do tick (por omisi<EFBFBD>n <EFBFBD> 100)"
+msgstr "Frecuencia do tick (por omisión é 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
@@ -304,7 +304,7 @@ msgstr "Bloques libres"
 
 #: sysdeps/names/fsusage.c:41
 msgid "Available blocks"
-msgstr "Bloques dispo<EFBFBD>ibles"
+msgstr "Bloques dispoñibles"
 
 #: sysdeps/names/fsusage.c:42 sysdeps/names/fsusage.c:51
 msgid "Total file nodes"
@@ -316,11 +316,11 @@ msgstr "Nodos de ficheiros libres"
 
 #: sysdeps/names/fsusage.c:49
 msgid "Free blocks available to the superuser"
-msgstr "Bloques libres dispo<EFBFBD>ibles para o superusuario"
+msgstr "Bloques libres dispoñibles para o superusuario"
 
 #: sysdeps/names/fsusage.c:50
 msgid "Free blocks available to non-superusers"
-msgstr "Bloques libres dispo<EFBFBD>ibles para os non superusuarios"
+msgstr "Bloques libres dispoñibles para os non superusuarios"
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
@@ -332,7 +332,7 @@ msgstr "Tarefas Activas"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "N<EFBFBD>mero de Tarefas"
+msgstr "Número de Tarefas"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
@@ -341,16 +341,16 @@ msgstr "Derradeiro PID"
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
 msgstr ""
-"N<EFBFBD>mero de procesos activos <EFBFBD> mesmo tempo, media dos derradeiros 1, 5 e 15 "
+"Número de procesos activos ó mesmo tempo, media dos derradeiros 1, 5 e 15 "
 "minutos"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "N<EFBFBD>mero de tarefas activas neste intre"
+msgstr "Número de tarefas activas neste intre"
 
 #: 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"
@@ -374,7 +374,7 @@ msgstr "Buffers"
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr "Na Cach<EFBFBD>"
+msgstr "Na Caché"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
@@ -382,7 +382,7 @@ msgstr "Bloqueada"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr "Total de memoria f<EFBFBD>sica en kB"
+msgstr "Total de memoria física en kB"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
@@ -398,11 +398,11 @@ msgstr "Memoria compartida en kB"
 
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr "Tama<EFBFBD>o dos b<EFBFBD>ffers en kB"
+msgstr "Tamaño dos búffers en kB"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "Tama<EFBFBD>o da memoria na cach<EFBFBD> en kB"
+msgstr "Tamaño da memoria na caché en kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
@@ -410,53 +410,53 @@ msgstr "Memoria usada por procesos de usuario en kB"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Memoria en p<EFBFBD>xinas bloqueadas en kB"
+msgstr "Memoria en páxinas bloqueadas en 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 da lista"
+msgstr "Número de elementos da lista"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: 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 "Tama<EFBFBD>o total da lista"
+msgstr "Tamaño total da lista"
 
 #: 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 "Tama<EFBFBD>o dun s<EFBFBD> elemento da lista"
+msgstr "Tamaño dun só elemento da lista"
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr "Tama<EFBFBD>o en kilobytes do pool de mensaxes"
+msgstr "Tamaño en kilobytes do pool de mensaxes"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
-msgstr "N<EFBFBD>mero de entradas no mapa de mensaxes"
+msgstr "Número de entradas no mapa de mensaxes"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Max size of message"
-msgstr "Tama<EFBFBD>o m<EFBFBD>ximo de mensaxe"
+msgstr "Tamaño máximo de mensaxe"
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Tama<EFBFBD>o m<EFBFBD>ximo por defecto da cola"
+msgstr "Tamaño máximo por defecto da cola"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr "N<EFBFBD>mero m<EFBFBD>ximo de colas en todo o sistema"
+msgstr "Número máximo de colas en todo o sistema"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
-msgstr "Tama<EFBFBD>o dunha mensaxe de segmento"
+msgstr "Tamaño dunha mensaxe de segmento"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Number of system message headers"
-msgstr "N<EFBFBD>mero de testeiras de mensaxes de sistema"
+msgstr "Número de testeiras de mensaxes de sistema"
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
@@ -480,7 +480,7 @@ msgstr "Paquetes Entrantes"
 
 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
 msgid "Packets Out"
-msgstr "Paquetes Sa<EFBFBD>ntes"
+msgstr "Paquetes Saíntes"
 
 #: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
 msgid "Packets Total"
@@ -492,7 +492,7 @@ msgstr "Bytes Entrantes"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes Out"
-msgstr "Bytes Sa<EFBFBD>ntes"
+msgstr "Bytes Saíntes"
 
 #: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
 msgid "Bytes Total"
@@ -504,7 +504,7 @@ msgstr "Erros Entrantes"
 
 #: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
 msgid "Errors Out"
-msgstr "Erros Sa<EFBFBD>ntes"
+msgstr "Erros Saíntes"
 
 #: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
 msgid "Errors Total"
@@ -512,11 +512,11 @@ msgstr "Erros Totais"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr "Colisi<EFBFBD>ns"
+msgstr "Colisións"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr "M<EFBFBD>xima Unidade de Transferencia"
+msgstr "Máxima Unidade de Transferencia"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
@@ -528,19 +528,19 @@ msgstr "Bytes entrantes"
 
 #: sysdeps/names/ppp.c:40
 msgid "Output bytes"
-msgstr "Bytes sa<EFBFBD>ntes"
+msgstr "Bytes saíntes"
 
 #: sysdeps/names/ppp.c:46
 msgid "Number of input bytes"
-msgstr "N<EFBFBD>mero de bytes entrantes"
+msgstr "Número de bytes entrantes"
 
 #: sysdeps/names/ppp.c:47
 msgid "Number of output bytes"
-msgstr "N<EFBFBD>mero de bytes sa<EFBFBD>ntes"
+msgstr "Número de bytes saíntes"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr "Tama<EFBFBD>o"
+msgstr "Tamaño"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
@@ -548,7 +548,7 @@ msgstr "Lonxitude en bytes da cadea devolta."
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
-msgstr "Band_N<EFBFBD>c"
+msgstr "Band_Núc"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Min_Flt"
@@ -594,15 +594,15 @@ msgid ""
 "\n"
 "The math bit should be a decimal 4, and the traced bit is decimal 10."
 msgstr ""
-"Bandeiras do n<EFBFBD>cleo para o proceso.\n"
+"Bandeiras do núcleo para o proceso.\n"
 "\n"
-"En Linux, actualmente t<EFBFBD>dalas bandeiras te<EFBFBD>en o bit 'math' activado, xa que "
-"crt0.s busca emulaci<EFBFBD>n matem<EFBFBD>tica, polo que este bit non aparece na sa<EFBFBD>da.\n"
+"En Linux, actualmente tódalas bandeiras teñen o bit 'math' activado, xa que "
+"crt0.s busca emulación matemática, polo que este bit non aparece na saída.\n"
 "\n"
-"Isto <EFBFBD> probablemente un erro, xa que non t<EFBFBD>dolos procesos son programas en C "
+"Isto é probablemente un erro, xa que non tódolos procesos son programas en C "
 "compilados.\n"
 "\n"
-"O bit 'math' deber<EFBFBD>a ser un 4 decimal, e o bit rastrexado <EFBFBD> un 10 decimal."
+"O bit 'math' debería ser un 4 decimal, e o bit rastrexado é un 10 decimal."
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:59
@@ -610,8 +610,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 faltas menores feitas polo proceso, aquelas que non precisaron "
-"cargar unha p<EFBFBD>xina de memoria do disco."
+"O número de faltas menores feitas polo proceso, aquelas que non precisaron "
+"cargar unha páxina de memoria do disco."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:62
@@ -619,18 +619,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 faltas maiores feitas polo proceso, aquelas que precisaron "
-"cargar unha p<EFBFBD>xina de memoria do disco."
+"O número de faltas maiores feitas polo proceso, aquelas que precisaron "
+"cargar unha páxina de memoria 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 faltas menores feitas polo proceso e polos seus fillos."
+msgstr "O número de faltas menores feitas polo proceso e polos seus fillos."
 
 #. 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 faltas maiores feitas polo proceso e polos seus fillos."
+msgstr "O número de faltas maiores feitas polo proceso e polos seus fillos."
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:71
@@ -639,12 +639,12 @@ msgid ""
 "stack page for the process."
 msgstr ""
 "O valor actual do esp (punteiro de pila de 32 bits), tal como se atopou na "
-"p<EFBFBD>xina de pila do n<EFBFBD>cleo para o proceso."
+"páxina de pila do núcleo para o proceso."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "O EIP (punteiro de instrucci<EFBFBD>n de 32 bits) actual)."
+msgstr "O EIP (punteiro de instrucción de 32 bits) actual)."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -654,15 +654,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 ""
-"Isto <EFBFBD> o \"canal\" no que o proceso est<EFBFBD> a esperar.  Esta <EFBFBD> a direcci<EFBFBD>n "
-"cunha chamada <EFBFBD> sistema, e pode ser consultada nunha lista de nomes se "
-"necesita un nome textual.  (Se ten un /etc/psdatabase actualizado, probe ps "
-"-l para mira-lo campo WCHAN en acci<EFBFBD>n)"
+"Isto é o \"canal\" no que o proceso está a esperar.  Esta é a dirección "
+"cunha chamada ó sistema, e pode ser consultada nunha lista de nomes se "
+"necesita un nome textual.  (Se ten un /etc/psdatabase actualizado, probe ps -"
+"l para mira-lo campo WCHAN en acción)"
 
 #. 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"
@@ -678,27 +678,27 @@ msgstr "Compartido"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
-msgstr "Tama<EFBFBD>o do Conxunto Residente"
+msgstr "Tamaño do Conxunto Residente"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr "Tama<EFBFBD>o L<EFBFBD>mite do Conxunto Residente"
+msgstr "Tamaño Límite do Conxunto Residente"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
-msgstr "N<EFBFBD>mero total de p<EFBFBD>xinas de memoria"
+msgstr "Número total de páxinas de memoria"
 
 #: sysdeps/names/procmem.c:54
 msgid "Number of pages of virtual memory"
-msgstr "N<EFBFBD>mero total de p<EFBFBD>xinas de memoria"
+msgstr "Número total de páxinas de memoria"
 
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr "N<EFBFBD>mero de p<EFBFBD>xinas de conxuntos compartidos (que non est<EFBFBD>n en swap)"
+msgstr "Número de páxinas de conxuntos compartidos (que non están en swap)"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
-msgstr "N<EFBFBD>mero de p<EFBFBD>xinas de memoria compartida (mmap'd)"
+msgstr "Número de páxinas de memoria compartida (mmap'd)"
 
 #: sysdeps/names/procmem.c:57
 msgid ""
@@ -707,16 +707,16 @@ 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>xinas que o proceso ten en memoria real, menos 3 para obxectivos "
-"administrativos. Isto <EFBFBD> as p<EFBFBD>xinas que se contan entre texto, datos, ou "
-"espacio de pila. Isto non incl<EFBFBD>e p<EFBFBD>xinas que non foron cargadas baixo "
-"demanda, ou que est<EFBFBD>n no dispositivo swap."
+"Número de páxinas que o proceso ten en memoria real, menos 3 para obxectivos "
+"administrativos. Isto é as páxinas que se contan entre texto, datos, ou "
+"espacio de pila. Isto non inclúe páxinas que non foron cargadas baixo "
+"demanda, ou que están no dispositivo swap."
 
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
-"L<EFBFBD>mite actual en bytes do conxunto residente (RSS) do proceso (normalmente "
+"Límite actual en bytes do conxunto residente (RSS) do proceso (normalmente "
 "2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:42
@@ -737,15 +737,15 @@ msgstr "Pila_RSS"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
-msgstr "Tama<EFBFBD>o de P<EFBFBD>xinas Modificadas"
+msgstr "Tamaño de Páxinas Modificadas"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr "C<EFBFBD>d_Inic"
+msgstr "Cód_Inic"
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr "C<EFBFBD>d_Fin"
+msgstr "Cód_Fin"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
@@ -753,35 +753,35 @@ msgstr "Pila_Inic"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr "Tama<EFBFBD>o do conxunto residente de texto"
+msgstr "Tamaño do conxunto residente de texto"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
-msgstr "Tama<EFBFBD>o do conxunto residente de librer<EFBFBD>as compartidas"
+msgstr "Tamaño do conxunto residente de librerías compartidas"
 
 #: sysdeps/names/procsegment.c:50
 msgid "Data resident set size"
-msgstr "Tama<EFBFBD>o do conxunto residente de datos"
+msgstr "Tamaño do conxunto residente de datos"
 
 #: sysdeps/names/procsegment.c:51
 msgid "Stack resident set size"
-msgstr "Tama<EFBFBD>o do conxunto residente de pila"
+msgstr "Tamaño do conxunto residente de pila"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr "Tama<EFBFBD>o total das p<EFBFBD>xinas modificadas hai pouco"
+msgstr "Tamaño total das páxinas modificadas hai pouco"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
-msgstr "Direcci<EFBFBD>n do comezo do segmento de c<EFBFBD>digo"
+msgstr "Dirección do comezo do segmento de código"
 
 #: sysdeps/names/procsegment.c:54
 msgid "Address of end of code segment"
-msgstr "Direcci<EFBFBD>n da fin do segmento de c<EFBFBD>digo"
+msgstr "Dirección da fin do segmento de código"
 
 #: sysdeps/names/procsegment.c:55
 msgid "Address of the bottom of stack segment"
-msgstr "Direcci<EFBFBD>n da base do segmento de pila"
+msgstr "Dirección da base do segmento de pila"
 
 #: sysdeps/names/procsignal.c:40
 msgid "Signal"
@@ -801,19 +801,19 @@ msgstr "SinAtrap"
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
-msgstr "M<EFBFBD>scara dos sinais pendentes"
+msgstr "Máscara dos sinais pendentes"
 
 #: sysdeps/names/procsignal.c:46
 msgid "Mask of blocked signals"
-msgstr "M<EFBFBD>scara dos sinais bloqueados"
+msgstr "Máscara dos sinais bloqueados"
 
 #: sysdeps/names/procsignal.c:47
 msgid "Mask of ignored signals"
-msgstr "M<EFBFBD>scara dos sinais ignorados"
+msgstr "Máscara dos sinais ignorados"
 
 #: sysdeps/names/procsignal.c:48
 msgid "Mask of caught signals"
-msgstr "M<EFBFBD>scara de sinais atrapados"
+msgstr "Máscara de sinais atrapados"
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
@@ -837,7 +837,7 @@ msgstr "Nome (sen rota) do ficheiro executable no chamada a exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "C<EFBFBD>digo dunha letra para o estado do proceso (S=durmindo)"
+msgstr "Código dunha letra para o estado do proceso (S=durmindo)"
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
@@ -897,7 +897,7 @@ msgstr "Data de comezo do proceso en segundos dende o 01/01/1970"
 
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Tempo real acumulado polo proceso (deber<EFBFBD>a ser tempoU + tempoS)"
+msgstr "Tempo real acumulado polo proceso (debería ser tempoU + tempoS)"
 
 #: sysdeps/names/proctime.c:53
 msgid "user-mode CPU time accumulated by process"
@@ -905,7 +905,7 @@ msgstr "tempo de CPU en modo usuario acumulado polo proceso"
 
 #: sysdeps/names/proctime.c:54
 msgid "kernel-mode CPU time accumulated by process"
-msgstr "tempo de CPU en modo n<EFBFBD>cleo acumulado polo proceso"
+msgstr "tempo de CPU en modo núcleo acumulado polo proceso"
 
 #: sysdeps/names/proctime.c:55
 msgid "cumulative utime of process and reaped children"
@@ -917,15 +917,15 @@ msgstr "tempoS acumulado polo proceso e polos seus fillos"
 
 #: sysdeps/names/proctime.c:57
 msgid "The time (in jiffies) of the process's next timeout"
-msgstr "Tempo (en \"jiffies\") da pr<EFBFBD>xima expiraci<EFBFBD>n do proceso"
+msgstr "Tempo (en \"jiffies\") da próxima expiración do proceso"
 
 #: 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 (en \"jiffies\") antes de que o pr<EFBFBD>ximo SIGALRM sexa enviado <EFBFBD> "
-"proceso <EFBFBD> rematar o intervalo dun contador."
+"O tempo (en \"jiffies\") antes de que o próximo SIGALRM sexa enviado ó "
+"proceso ó rematar o intervalo dun contador."
 
 #: sysdeps/names/proctime.c:60
 msgid "Tick frequency"
@@ -939,7 +939,7 @@ msgstr ""
 #: sysdeps/names/proctime.c:62
 msgid "SMP kernel-mode CPU time accumulated by process"
 msgstr ""
-"Tempo de CPU Multi-procesador (SMP) en modo n<EFBFBD>cleo acumulado polo proceso"
+"Tempo de CPU Multi-procesador (SMP) en modo núcleo acumulado polo proceso"
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
@@ -971,7 +971,7 @@ msgstr "PGrp"
 
 #: sysdeps/names/procuid.c:57
 msgid "Session"
-msgstr "Sesi<EFBFBD>n"
+msgstr "Sesión"
 
 #: sysdeps/names/procuid.c:57
 msgid "Tty"
@@ -1015,11 +1015,11 @@ msgstr "ID do grupo do proceso"
 
 #: sysdeps/names/procuid.c:70
 msgid "Session ID"
-msgstr "ID da sesi<EFBFBD>n"
+msgstr "ID da sesión"
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr "N<EFBFBD>mero total de dispositivos de terminal de control"
+msgstr "Número total de dispositivos de terminal de control"
 
 #: sysdeps/names/procuid.c:72
 msgid "Terminal process group ID"
@@ -1027,39 +1027,39 @@ msgstr "ID do grupo do proceso de terminal"
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr "Prioridade na asignaci<EFBFBD>n de tarefas do n<EFBFBD>cleo"
+msgstr "Prioridade na asignación de tarefas do núcleo"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Nivel 'nice' est<EFBFBD>ndar de Unix do proceso"
+msgstr "Nivel 'nice' estándar de Unix do proceso"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "N<EFBFBD>mero de entradas no mapa de sem<EFBFBD>foros"
+msgstr "Número de entradas no mapa de semáforos"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de vectores"
+msgstr "Máximo número de vectores"
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de sem<EFBFBD>foros <EFBFBD> longo do sistema"
+msgstr "Máximo número de semáforos ó longo do sistema"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr "N<EFBFBD>mero de estructuras de desfacer (undo) <EFBFBD> longo do sistema"
+msgstr "Número de estructuras de desfacer (undo) ó longo do sistema"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de sem<EFBFBD>foros por vector"
+msgstr "Máximo número de semáforos por vector"
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de 'ops' por cada chamada 'semop'"
+msgstr "Máximo número de 'ops' por cada chamada 'semop'"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de entradas de desfacer (undo) por cada proceso"
+msgstr "Máximo número de entradas de desfacer (undo) por cada proceso"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1067,31 +1067,31 @@ msgstr "sizeof struct sem_undo"
 
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
-msgstr "M<EFBFBD>ximo valor dun sem<EFBFBD>foro"
+msgstr "Máximo valor dun semáforo"
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr "Valor m<EFBFBD>ximo de \"Adjust on exit\""
+msgstr "Valor máximo de \"Adjust on exit\""
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
-msgstr "M<EFBFBD>ximo tama<EFBFBD>o de segmento"
+msgstr "Máximo tamaño de segmento"
 
 #: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Min segment size"
-msgstr "M<EFBFBD>nimo tama<EFBFBD>o de segmento"
+msgstr "Mínimo tamaño de segmento"
 
 #: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Max number of segments"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de segmentos"
+msgstr "Máximo número de segmentos"
 
 #: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max shared segments per process"
-msgstr "M<EFBFBD>ximo n<EFBFBD>mero de segmentos compartidos por proceso"
+msgstr "Máximo número de segmentos compartidos por proceso"
 
 #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max total shared memory"
-msgstr "M<EFBFBD>ximo total de memoria compartida"
+msgstr "Máximo total de memoria compartida"
 
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
 msgid "Total Swap Space"
@@ -1107,39 +1107,39 @@ msgstr "Espacio de Swap Libre"
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr "P<EFBFBD>xinas Entrantes"
+msgstr "Páxinas Entrantes"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr "P<EFBFBD>xinas Sa<EFBFBD>ntes"
+msgstr "Páxinas Saíntes"
 
 #: 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<EFBFBD>xinas de swap que foron cargadas na memoria dende o inicio "
+"Número total de páxinas de swap que foron cargadas na memoria dende o inicio "
 "do sistema"
 
 #: 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>xinas de swap que foron gardadas no disco dende o inicio "
+"Número total de páxinas de swap que foron gardadas no disco dende o inicio "
 "do sistema"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
-msgstr "Caracter<EFBFBD>sticas do Servidor"
+msgstr "Características do Servidor"
 
 #: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "CPU Usage"
-msgstr "Utilizaci<EFBFBD>n da CPU"
+msgstr "Utilización da CPU"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr "Utilizaci<EFBFBD>n da Memoria"
+msgstr "Utilización da Memoria"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr "Utilizaci<EFBFBD>n da Swap"
+msgstr "Utilización da Swap"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
@@ -1151,15 +1151,15 @@ msgstr "Carga media"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
-msgstr "L<EFBFBD>mites da Memoria Compartida"
+msgstr "Límites da Memoria Compartida"
 
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
-msgstr "L<EFBFBD>mites da Cola de Mensaxes"
+msgstr "Límites da Cola de Mensaxes"
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
-msgstr "L<EFBFBD>mites dos conxuntos de sem<EFBFBD>foros"
+msgstr "Límites dos conxuntos de semáforos"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
@@ -1167,31 +1167,31 @@ msgstr "Lista dos procesos a se executar neste intre"
 
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "Process Status information"
-msgstr "Informaci<EFBFBD>n do Estado do Proceso"
+msgstr "Información do Estado do Proceso"
 
 #: sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:87
 msgid "Process UID and TTY information"
-msgstr "Informaci<EFBFBD>n do UID e do TTY do proceso"
+msgstr "Información do UID e do TTY do proceso"
 
 #: sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:88
 msgid "Process Memory information"
-msgstr "Informaci<EFBFBD>n da Memoria do proceso"
+msgstr "Información da Memoria do proceso"
 
 #: sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:89
 msgid "Process Time information"
-msgstr "Informaci<EFBFBD>n do Tempo empregado polo proceso"
+msgstr "Información do Tempo empregado polo proceso"
 
 #: sysdeps/names/sysdeps.c:63 sysdeps/names/sysdeps.c:90
 msgid "Process Signal information"
-msgstr "Informaci<EFBFBD>n das sinais do proceso"
+msgstr "Información das sinais do proceso"
 
 #: sysdeps/names/sysdeps.c:64 sysdeps/names/sysdeps.c:91
 msgid "Process Kernel Data information"
-msgstr "Informaci<EFBFBD>n dos datos do Kernel do proceso"
+msgstr "Información dos datos do Kernel do proceso"
 
 #: sysdeps/names/sysdeps.c:65 sysdeps/names/sysdeps.c:92
 msgid "Process Segment information"
-msgstr "Informaci<EFBFBD>n da segmentaci<EFBFBD>n do proceso"
+msgstr "Información da segmentación do proceso"
 
 #: sysdeps/names/sysdeps.c:66
 msgid "Process Arguments"
@@ -1207,7 +1207,7 @@ msgstr "Lista de Unidades Montadas"
 
 #: sysdeps/names/sysdeps.c:69 sysdeps/names/sysdeps.c:96
 msgid "File System Usage"
-msgstr "Utilizaci<EFBFBD>n dos Sistemas de Ficheiros"
+msgstr "Utilización dos Sistemas de Ficheiros"
 
 #: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "Network Load"
@@ -1215,11 +1215,11 @@ msgstr "Carga da Rede"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "PPP Statistics"
-msgstr "Estat<EFBFBD>sticas PPP"
+msgstr "Estatísticas PPP"
 
 #: sysdeps/names/sysdeps.c:93
 msgid "Command line arguments of the process"
-msgstr "Argumentos de li<EFBFBD>a de comandos do proceso"
+msgstr "Argumentos de liña de comandos do proceso"
 
 #: sysdeps/names/sysdeps.c:95
 msgid "List of currently mounted filesystems"
@@ -1253,11 +1253,11 @@ msgstr "Interromper"
 
 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr "Sa<EFBFBD>r"
+msgstr "Saír"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "Instrucci<EFBFBD>n ilegal"
+msgstr "Instrucción ilegal"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
@@ -1273,7 +1273,7 @@ msgstr "Erro EMT"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "Excepci<EFBFBD>n de coma flotante"
+msgstr "Excepción de coma flotante"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
@@ -1289,11 +1289,11 @@ msgstr "Fallo de segmento"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Argumento err<EFBFBD>neo <EFBFBD> chamada de sistema"
+msgstr "Argumento erróneo á chamada de sistema"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Canalizaci<EFBFBD>n rota"
+msgstr "Canalización rota"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
@@ -1305,7 +1305,7 @@ msgstr "Remate"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Condici<EFBFBD>n urxente no socket"
+msgstr "Condición urxente no socket"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1329,7 +1329,7 @@ msgstr "Lectura en segundo plano do tty"
 
 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr "Escritura en segundo plano <EFBFBD> tty"
+msgstr "Escritura en segundo plano ó tty"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
@@ -1337,11 +1337,11 @@ msgstr "E/S posible agora"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "L<EFBFBD>mite de CPU excedido"
+msgstr "Límite de CPU excedido"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "L<EFBFBD>mite de tama<EFBFBD>o de ficheiro excedido"
+msgstr "Límite de tamaño de ficheiro excedido"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
@@ -1353,11 +1353,11 @@ msgstr "Reloxo de alarma con perfil"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "Cambio do tama<EFBFBD>o da fiestra"
+msgstr "Cambio do tamaño da fiestra"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Petici<EFBFBD>n de Informaci<EFBFBD>n"
+msgstr "Petición de Información"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"

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: 2000-11-12 02:15+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/stamp-cat-id

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

po/ta.po

@@ -1,92 +1,93 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# Tamil translation of Tamil Libgtop 2.4.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Dinesh Nadarajah <n_dinesh@yahoo.com>, 2003.
+# 
+# 
 msgid ""
-msgstr ""
-"Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+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"
+msgstr "Project-Id-Version: Tamil Libgtop 2.4"
+"POT-Creation-Date: 2003-09-16 17:19-0500\n"
+"PO-Revision-Date: 2003-09-16 17:19-0500\n"
+"Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
+"Language-Team: Tamil <tamilinix@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
+#: examples/smp.c:71
 #, c-format
 msgid "Ticks (%ld per second):"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Total"
 msgstr ""
 
-#: examples/smp.c:71 sysdeps/names/mem.c:47
+#: examples/smp.c:74 sysdeps/names/mem.c:47
 msgid "User"
-msgstr ""
+msgstr "பயனர்"
 
-#: examples/smp.c:71 sysdeps/names/procuid.c:58
+#: examples/smp.c:74 sysdeps/names/procuid.c:58
 msgid "Nice"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Sys"
 msgstr ""
 
-#: examples/smp.c:71
+#: examples/smp.c:74
 msgid "Idle"
 msgstr ""
 
-#: examples/smp.c:73
+#: examples/smp.c:76
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
 "\n"
 msgstr ""
 
-#: examples/smp.c:77
+#: examples/smp.c:80
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 msgstr ""
 
-#: examples/smp.c:94
+#: examples/smp.c:97
 msgid "Percent:"
 msgstr ""
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Total (%)"
 msgstr ""
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "User (%)"
 msgstr ""
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Nice (%)"
 msgstr ""
 
-#: examples/smp.c:95
+#: examples/smp.c:98
 msgid "Sys (%)"
 msgstr ""
 
-#: examples/smp.c:96
+#: examples/smp.c:99
 msgid "Idle (%)"
 msgstr ""
 
-#: examples/smp.c:98
+#: examples/smp.c:101
 #, c-format
 msgid ""
 "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 "\n"
 msgstr ""
 
-#: examples/smp.c:114
+#: examples/smp.c:117
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgstr ""
 
-#: examples/smp.c:120
+#: examples/smp.c:123
 msgid "Spin:"
 msgstr ""
 
@@ -109,39 +110,39 @@ msgstr ""
 msgid "write %d bytes"
 msgstr ""
 
-#: src/daemon/gnuserv.c:448
+#: src/daemon/gnuserv.c:453
 msgid "Enable debugging"
 msgstr ""
 
-#: src/daemon/gnuserv.c:448
+#: src/daemon/gnuserv.c:453
 msgid "DEBUG"
 msgstr ""
 
-#: src/daemon/gnuserv.c:450
+#: src/daemon/gnuserv.c:455
 msgid "Enable verbose output"
 msgstr ""
 
-#: src/daemon/gnuserv.c:450
+#: src/daemon/gnuserv.c:455
 msgid "VERBOSE"
 msgstr ""
 
-#: src/daemon/gnuserv.c:452
+#: src/daemon/gnuserv.c:457
 msgid "Don't fork into background"
 msgstr ""
 
-#: src/daemon/gnuserv.c:452
+#: src/daemon/gnuserv.c:457
 msgid "NO-DAEMON"
 msgstr ""
 
-#: src/daemon/gnuserv.c:454
+#: src/daemon/gnuserv.c:459
 msgid "Invoked from inetd"
 msgstr ""
 
-#: src/daemon/gnuserv.c:454
+#: src/daemon/gnuserv.c:459
 msgid "INETD"
 msgstr ""
 
-#: src/daemon/gnuserv.c:488
+#: src/daemon/gnuserv.c:493
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -211,6 +212,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 ""
@@ -309,7 +318,7 @@ msgstr ""
 
 #: sysdeps/names/loadavg.c:39
 msgid "Load Average"
-msgstr ""
+msgstr "சுமாராக ஏற்று"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
@@ -455,7 +464,7 @@ msgstr ""
 
 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Address"
-msgstr ""
+msgstr "_முகவரி"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Packets In"
@@ -523,7 +532,7 @@ msgstr ""
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
-msgstr ""
+msgstr "அளவு"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
@@ -672,21 +681,10 @@ msgid ""
 "which are swapped out."
 msgstr ""
 
-#
-# 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.
-# On the other hand, strings that are the same here and in es.po can
-# be left out.
-#
 #: sysdeps/names/procmem.c:62
 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)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -790,7 +788,7 @@ msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "State"
-msgstr ""
+msgstr "நிலமை"
 
 #: sysdeps/names/procstate.c:40
 msgid "UID"
@@ -1212,7 +1210,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr ""
+msgstr "வெளிச்செல்"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
@@ -1268,7 +1266,7 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr ""
+msgstr "நிறுத்து"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
@@ -1325,3 +1323,4 @@ msgstr ""
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr ""
+

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,3 +1,11 @@
+2003-05-11  Andrew Sobala  <aes@gnome.org>
+
+	* gnuserv.c: (permitted): fix buffer overflow vulnerability
+
+2001-02-14  Martin Baulig  <baulig@suse.de>
+
+	* Makefile.am (libgtop_server_LDADD): Removed @LIBSUPPORT@.
+
 1999-11-28  Martin Baulig  <martin@home-of-linux.org>
 
 	* gnuserv.c (setup_table): Don't dump core when the table of

src/daemon/Makefile.am

@@ -14,45 +14,37 @@
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @INCLUDES@ -D_BSD \
-				  -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \
-				  -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \
-				  -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\"
+INCLUDES			= $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \
+				  -DLIBGTOP_COMPILE_SYSTEM="\"`uname -s`\"" \
+				  -DLIBGTOP_COMPILE_RELEASE="\"`uname -r`\"" \
+				  -DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \
+				  -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
-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 \
-				  @LIBSUPPORT@
-
-if ENABLE_STATIC
-libgtop_server_LDFLAGS		= -static
-endif
+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
 
 EXTRA_DIST			= server_config.h.in server_config.pl
 

src/daemon/gnuserv.c

@@ -93,7 +93,7 @@ syslog_message (int priority, char *format, ...)
     vsnprintf (buffer, BUFSIZ-1, format, ap);
     va_end (ap);
 
-    syslog (priority, buffer);
+    syslog (priority, "%s", buffer);
 }
 
 void
@@ -108,7 +108,7 @@ syslog_io_message (int priority, char *format, ...)
     va_end (ap);
 
     snprintf (buffer2, BUFSIZ-1, "%s: %s", buffer, strerror (errno));
-    syslog (priority, buffer2);
+    syslog (priority, "%s", buffer2);
 }
 
 /*
@@ -199,6 +199,11 @@ permitted (u_long host_addr, int fd)
 	    return FALSE;
 
 	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/daemon/server.c

@@ -70,6 +70,21 @@ main(int argc, char *argv[])
 
 	if (uname (&uts) < 0) _exit (1);
 
+#ifdef _AIX
+	/*
+	 * [FIXME]: should be in sysdeps part ?
+	 */
+
+	if ((strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) != 0) ||
+	    ((atol(uts.version) < atol(LIBGTOP_COMPILE_VERSION)) &&
+	     (atol(uts.release) < atol(LIBGTOP_COMPILE_RELEASE))) ) {
+		fprintf (stderr, "Can only run on %s %s.%s and upper\n",
+			 LIBGTOP_COMPILE_SYSTEM,
+			 LIBGTOP_COMPILE_VERSION,
+			 LIBGTOP_COMPILE_RELEASE);
+		_exit (1);
+	}
+#else
 	if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
 	    strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
 	    strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
@@ -79,6 +94,7 @@ main(int argc, char *argv[])
 			 LIBGTOP_COMPILE_MACHINE);
 		_exit (1);
 	}
+#endif
 	
 	glibtop_init_p (glibtop_global_server, 0, 0);