Fix buffer overflow vulnerability. Release 1.0.14.

2002-12-11  Stanislav Brabec  <sbrabec@suse.cz>

	* sysdeps/guile/Makefile.am, sysdeps/guile/names/Makefile.am:
	Changed order of arguments for guile-snarf - .c file must be first
	(fixes bug #82684).

ChangeLog

@@ -1,3 +1,97 @@
+2003-05-11  Andrew Sobala  <aes@gnome.org>
+
+	* up version to 1.0.14
+
+2002-12-11  Stanislav Brabec  <sbrabec@suse.cz>
+
+	* sysdeps/guile/Makefile.am, sysdeps/guile/names/Makefile.am:
+	Changed order of arguments for guile-snarf - .c file must be first
+	(fixes bug #82684).
+
+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.
+
+2001-10-26  Kevin Vandersloot <kfv101@psu.edu>
+
+	* up version to 1.0.13
+
+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

@@ -8,10 +8,13 @@
 #
 LIBGTOP_MAJOR_VERSION=1
 LIBGTOP_MINOR_VERSION=0
-LIBGTOP_MICRO_VERSION=10
+LIBGTOP_MICRO_VERSION=14
 
-LIBGTOP_INTERFACE_AGE=9
-LIBGTOP_BINARY_AGE=9
+LIBGTOP_INTERFACE_AGE=12
+LIBGTOP_BINARY_AGE=12
+# 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

@@ -13,7 +13,8 @@ endif
 SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
 	  $(examples_SUBDIRS) doc
 
-include_HEADERS = glibtop.h
+libgtopinclude_HEADERS = glibtop.h
+libgtopincludedir = $(includedir)/libgtop-1.0
 
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
@@ -42,7 +43,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config
 @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 +52,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-1.0#g' \
 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \

NEWS

@@ -1,3 +1,44 @@
+November 26, 2001:
+================
+
+* Released LIbGTop 1.0.13
+
+  - security fix
+
+  - update for parallel install with libgtop-2.0
+
+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

@@ -156,6 +156,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

configure.in

@@ -33,6 +33,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
@@ -199,7 +200,45 @@ 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 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)
@@ -238,7 +277,7 @@ 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"
+ALL_LINGUAS="az ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko ms nl no pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
 AM_GNOME_GETTEXT
 
 AC_PATH_XTRA
@@ -299,7 +338,7 @@ AC_SUBST(SUPPORTINCS)
 
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
-LIBGTOP_INCS='-I$(includedir)'
+LIBGTOP_INCS='-I$(includedir)/libgtop-1.0'
 
 if test x$libgtop_use_machine_h = xyes ; then
   LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H"
@@ -419,6 +458,7 @@ sysdeps/osf1/Makefile
 sysdeps/linux/Makefile
 sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
+sysdeps/solaris/Makefile
 src/Makefile
 src/daemon/Makefile
 src/inodedb/Makefile

include/glibtop/Makefile.am

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

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)
 
@@ -124,12 +124,20 @@ 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'
+	  ;;
 	*)
 	  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 +185,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 +257,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,7 @@ Makefile.in
 POTFILES
 cat-id-tbl.c
 *.gmo
+*.mo
 libgtop.pot
 Makefile.in.in
 messages

po/ChangeLog

@@ -1,3 +1,122 @@
+2002-12-14  Christophe Merlet  <redfox@redfoxcenter.org>
+
+	* fr.po: Updated French 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
+
+2001-01-14  Hasbullah bin Pit <sebol@ikhlas.com>
+
+	* ms.po: Added Malay Translation.
+
+2001-12-07  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+	* az.po: Updated Azeri file
+
+2001-11-27  Roy-Magne Mo  <rmo@sunnmore.net>
+
+	* nn.po: Updated Norwegian (nynorsk) translation.
+
+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.

po/da.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 0.99.3\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 14:13+02:00\n"
 "Last-Translator: Kenneth Christiansen <kenneth@ripen.dk>\n"
 "Language-Team: Dansk/Danish <da@li.org>\n"

po/de.po

@@ -1,15 +1,16 @@
 # German translation of libgtop
 # Martin Baulig <martin@home-of-linux.org>, 1998, 1999, 2000
-# Christian Meyer <linux@chrisime.de>, 2000.
+# Christian Meyer <cm@ggtt.de>, 2000, 2001.
+#
 # hmm... ein paar englische Strings sollte man lieber in Ruhe lassen...! -cm-
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
-"PO-Revision-Date: 2000-09-20 12:48+0200\n"
-"Last-Translator: Christian Meyer <linux@chrisime.de>\n"
-"Language-Team: deutsch <gnome-de@gnome.org>\n"
+"Project-Id-Version: libgtop 1.0.x\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"PO-Revision-Date: 2001-02-15 17:03+0100\n"
+"Last-Translator: Christian Meyer <cm@ggtt.de>\n"
+"Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -132,7 +133,7 @@ msgstr "AUSF
 
 #: src/daemon/gnuserv.c:452
 msgid "Don't fork into background"
-msgstr "Nicht in den Hintergrund aufteilen"
+msgstr "Nicht in den Hintergrund abspalten"
 
 #: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
@@ -225,15 +226,15 @@ msgstr "CPU-Zeit insgesamt"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr "CPU-Zeit in Benutzer-Modus"
+msgstr "CPU-Zeit in Benutzermodus"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "CPU-Zeit in Benutzer-Modus (Priorität)"
+msgstr "CPU-Zeit in Benutzermodus (Priorität)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
-msgstr "CPU-Zeit in System-Modus"
+msgstr "CPU-Zeit in Systemmodus"
 
 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
@@ -249,15 +250,15 @@ msgstr "CPU-Zeit aller Prozessoren insgesamt"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "CPU-Zeit aller Prozessoren im Benutzer-Modus"
+msgstr "CPU-Zeit aller Prozessoren im Benutzermodus"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "CPU-Zeit aller Prozessoren im Benutzer-Modus (Priorität)"
+msgstr "CPU-Zeit aller Prozessoren im Benutzermodus (Priorität)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "CPU-Zeit aller Prozessoren im System-Modus"
+msgstr "CPU-Zeit aller Prozessoren im Systemmodus"
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
@@ -289,7 +290,7 @@ msgstr "Anzahl der `Clock'-Impulse, die das System im Leerlauf war"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
-msgstr "Impulsfrequenz (Default ist 100)"
+msgstr "Impulsfrequenz (Vorgabe ist 100)"
 
 #: sysdeps/names/fsusage.c:39 sysdeps/names/fsusage.c:48
 msgid "Total blocks"
@@ -325,11 +326,11 @@ msgstr "Systemlast"
 
 #: sysdeps/names/loadavg.c:40
 msgid "Running Tasks"
-msgstr "Laufende Jobs"
+msgstr "Laufende Tasks"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Number of Tasks"
-msgstr "Anzahl Jobs"
+msgstr "Anzahl Tasks"
 
 #: sysdeps/names/loadavg.c:42 sysdeps/names/loadavg.c:50
 msgid "Last PID"
@@ -341,11 +342,11 @@ msgstr "Anzahl gleichzeitig laufender Jobs im Mittel
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
-msgstr "Anzahl der momentan laufenden Jobs"
+msgstr "Anzahl der momentan laufenden Tasks"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Total number of tasks"
-msgstr "Anzahl Jobs insgesamt"
+msgstr "Anzahl Tasks insgesamt"
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
@@ -411,7 +412,7 @@ msgstr "Speicher in gesperrten Seiten in kB"
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
 #: sysdeps/names/procmap.c:38 sysdeps/names/procmap.c:45
 msgid "Number of list elements"
-msgstr "Zahl der Listen-Elemente"
+msgstr "Zahl der Listenelemente"
 
 #: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
 #: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
@@ -439,7 +440,7 @@ msgstr "Maximale Gr
 
 #: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Default max size of queue"
-msgstr "Standardmäßige Größe der Warteschlange"
+msgstr "Maximale Größe der Warteschlange (Vorgabe)"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
@@ -835,7 +836,7 @@ msgstr "Dateiname des Programms im Aufruf von exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "Prozessstatus (S=schläft)"
+msgstr "Single-Char Code für Prozessstatus (S=schläft)"
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
@@ -1037,7 +1038,7 @@ msgstr "Standard UNIX `nice' Wert des Prozesses"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr "Anzahl Einträge in der Zeichenträger-Tabelle"
+msgstr "Anzahl Einträge in der Zeichenträgertabelle"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
@@ -1161,7 +1162,7 @@ msgstr "Limits f
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
-msgstr "Festgelegtes Zeichenträger-Limit"
+msgstr "Festgelegtes Zeichenträgerlimit"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
@@ -1169,7 +1170,7 @@ msgstr "Liste derzeitiger Prozesse"
 
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "Process Status information"
-msgstr "Prozess Statusinformation"
+msgstr "Prozess-Statusinformation"
 
 #: sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:87
 msgid "Process UID and TTY information"
@@ -1197,7 +1198,7 @@ msgstr "Prozess-Segmentinformation"
 
 #: sysdeps/names/sysdeps.c:66
 msgid "Process Arguments"
-msgstr "Prozessargumente"
+msgstr "Prozess-Argumente"
 
 #: sysdeps/names/sysdeps.c:67 sysdeps/names/sysdeps.c:94
 msgid "Process Memory Map"
@@ -1290,7 +1291,7 @@ msgstr "Segmentverletzung"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Falsches Argument für Systemaufruf"
+msgstr "Ungültiges Argument für Systemaufruf"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
@@ -1314,7 +1315,7 @@ msgstr "Stoppen"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Keyboard stopp"
+msgstr "Keyboard-Stopp"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
@@ -1326,15 +1327,15 @@ msgstr "Kind-Status hat sich ge
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "Background read von tty"
+msgstr "Hintergrundlesen von tty"
 
 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr "Background write auf tty"
+msgstr "Hintergrundschreiben auf tty"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "I/O nun möglich"
+msgstr "E/A nun möglich"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
@@ -1350,7 +1351,7 @@ msgstr "Virtuelle Alarmuhr"
 
 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr "Profiling alarm clock"
+msgstr "Genaue Alarmuhr"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"

po/es.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop 1.1.1\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-20 04:38+0100\n"
 "Last-Translator: Manuel de Vega Barreiro <barreiro@arrakis.es>\n"
 "Language-Team: Spanish <es@li.org>\n"

po/es_DO.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/es_GT.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/es_HN.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/es_MX.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/es_PA.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/es_PE.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/es_SV.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glibtop cvs\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1998-12-13 04:38+0100\n"
 "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"

po/fr.po

@@ -1,27 +1,28 @@
-# libgtop fr.po
-# Copyright (C) 1998,1999 Free Software Foundation, Inc.
-# Vincent Renardias <vincent@ldsol.com>, 1998,1999.
+# French translation of libgtop.
+# Copyright (C) 1998-2002 Free Software Foundation, Inc.
+# Vincent Renardias <vincent@ldsol.com>, 1998-1999.
 # Fabrice Bellet <Fabrice.Bellet@imag.fr>, 1999.
+# Christophe Merlet (RedFox) <redfox@redfoxcenter.org>, 2000-2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop VERSION\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
-"PO-Revision-Date: 1999-07-27 18:24+0200\n"
-"Last-Translator: Vincent Renardias <vincent@ldsol.com>\n"
-"Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
+"Project-Id-Version: libgtop 1.0.13\n"
+"POT-Creation-Date: 2002-12-14 12:44+0100\n"
+"PO-Revision-Date: 2002-12-14 12:44+0100\n"
+"Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr ""
+msgstr "Ticks (%ld par seconde) :"
 
 #: examples/smp.c:71
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: examples/smp.c:71 sysdeps/names/mem.c:47
 msgid "User"
@@ -33,12 +34,11 @@ msgstr "Nice"
 
 #: examples/smp.c:71
 msgid "Sys"
-msgstr ""
+msgstr "Sys"
 
 #: examples/smp.c:71
-#, fuzzy
 msgid "Idle"
-msgstr "Durée d'inactivité"
+msgstr "Idle"
 
 #: examples/smp.c:73
 #, c-format
@@ -46,37 +46,37 @@ 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:77
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
+msgstr "CPU %3d      (0x%08lx) : %12lu %12lu %12lu %12lu %12lu\n"
 
 #: examples/smp.c:94
 msgid "Percent:"
-msgstr ""
+msgstr "Pourcentage :"
 
 #: examples/smp.c:95
 msgid "Total (%)"
-msgstr ""
+msgstr "Total (%)"
 
 #: examples/smp.c:95
-#, fuzzy
 msgid "User (%)"
-msgstr "Utilisateur"
+msgstr "Utilisateur (%)"
 
 #: examples/smp.c:95
-#, fuzzy
 msgid "Nice (%)"
-msgstr "Nice"
+msgstr "Nice (%)"
 
 #: examples/smp.c:95
 msgid "Sys (%)"
-msgstr ""
+msgstr "Sys (%)"
 
 #: examples/smp.c:96
 msgid "Idle (%)"
-msgstr ""
+msgstr "Idle (%)"
 
 #: examples/smp.c:98
 #, c-format
@@ -84,15 +84,17 @@ 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:114
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
+msgstr "CPU %3d      (0x%08lx) : %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:120
 msgid "Spin:"
-msgstr ""
+msgstr "Spin :"
 
 #: lib/read.c:75
 #, c-format
@@ -115,7 +117,7 @@ msgstr "
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr "Active le debuggage"
+msgstr "Active le débogage"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
@@ -152,7 +154,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Erreur sur l'option %s: %s.\n"
-"Executer '%s --help' pour avoir la liste des options de la ligne de "
+"Executer « %s --help » pour avoir la liste des options de la ligne de "
 "commande.\n"
 
 #: support/error.c:109
@@ -162,61 +164,61 @@ msgstr "Erreur syst
 #: support/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option `%s' est ambigüe\n"
+msgstr "%s : l'option « %s » est ambigüe\n"
 
 #: support/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option `--%s' ne supporte pas d'arguments\n"
+msgstr "%s : l'option « --%s » ne supporte pas d'arguments\n"
 
 #: support/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option `%c%s' ne supporte pas d'arguments\n"
+msgstr "%s : l'option « %c%s » ne supporte pas d'arguments\n"
 
 #: support/getopt.c:715 support/getopt.c:888
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option `%s' nécessite un argument\n"
+msgstr "%s : l'option « %s » nécessite un argument\n"
 
 #. --option
 #: support/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: option inconnue `--%s'\n"
+msgstr "%s : option inconnue « --%s »\n"
 
 #. +option or -option
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: option inconnue `%c%s'\n"
+msgstr "%s : option inconnue « %c%s »\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774
 #, c-format
 msgid "%s: illegal option -- %c\n"
-msgstr "%s: option illégale -- %c\n"
+msgstr "%s : option illégale -- %c\n"
 
 #: support/getopt.c:777
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s: option non valide -- %c\n"
+msgstr "%s : option non valide -- %c\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:807 support/getopt.c:937
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'option nécessite un argument -- %c\n"
+msgstr "%s : l'option nécessite un argument -- %c\n"
 
 #: support/getopt.c:854
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option `-W %s' is ambigüe\n"
+msgstr "%s : l'option « -W %s » is ambigüe\n"
 
 #: support/getopt.c:872
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option `-W %s' ne supporte pas d'arguments\n"
+msgstr "%s : l'option « -W %s » ne supporte pas d'arguments\n"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
@@ -345,19 +347,19 @@ msgstr "Nombre total de t
 
 #: sysdeps/names/mem.c:41
 msgid "Total Memory"
-msgstr "Mémoire Totale"
+msgstr "Mémoire totale"
 
 #: sysdeps/names/mem.c:42
 msgid "Used Memory"
-msgstr "Mémoire Utilisée"
+msgstr "Mémoire utilisée"
 
 #: sysdeps/names/mem.c:43
 msgid "Free Memory"
-msgstr "Mémoire Libre"
+msgstr "Mémoire libre"
 
 #: sysdeps/names/mem.c:44
 msgid "Shared Memory"
-msgstr "Mémoire Partagée"
+msgstr "Mémoire partagée"
 
 #: sysdeps/names/mem.c:45
 msgid "Buffers"
@@ -451,88 +453,83 @@ msgstr "Nombre d'ent
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
-msgstr ""
+msgstr "Drapeaux d'interfaces"
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
-msgstr ""
+msgstr "MTU"
 
 #: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
 msgid "Subnet"
-msgstr ""
+msgstr "Sous-réseau"
 
 #: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
-#, fuzzy
 msgid "Packets In"
-msgstr "Pages Entrantes (disque vers mémoire)"
+msgstr "Paquets entrants"
 
 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
-#, fuzzy
 msgid "Packets Out"
-msgstr "Pages Sortantes (mémoire vers disque)"
+msgstr "Paquets sortants"
 
 #: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
 msgid "Packets Total"
-msgstr ""
+msgstr "Paquets total"
 
 #: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
 msgid "Bytes In"
-msgstr ""
+msgstr "Octets entrants"
 
 #: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes Out"
-msgstr ""
+msgstr "Octets sortants"
 
 #: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
 msgid "Bytes Total"
-msgstr ""
+msgstr "Octets total"
 
 #: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
 msgid "Errors In"
-msgstr ""
+msgstr "Erreurs entrantes"
 
 #: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
 msgid "Errors Out"
-msgstr ""
+msgstr "Erreurs sortantes"
 
 #: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
 msgid "Errors Total"
-msgstr ""
+msgstr "Erreurs total"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr ""
+msgstr "Collisions"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr ""
+msgstr "Unité de transfert maximale (MTU)"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
-#, fuzzy
 msgid "PPP State"
-msgstr "État"
+msgstr "État PPP"
 
 #: sysdeps/names/ppp.c:39
 msgid "Input bytes"
-msgstr ""
+msgstr "Octets d'entrée"
 
 #: sysdeps/names/ppp.c:40
 msgid "Output bytes"
-msgstr ""
+msgstr "Octets de sortie"
 
 #: sysdeps/names/ppp.c:46
-#, fuzzy
 msgid "Number of input bytes"
-msgstr "Nombre d'éléments de liste"
+msgstr "Nombre d'octets d'entrée"
 
 #: sysdeps/names/ppp.c:47
-#, fuzzy
 msgid "Number of output bytes"
-msgstr "Nombre d'éléments de liste"
+msgstr "Nombre d'octets de sortie"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
@@ -540,7 +537,7 @@ msgstr "Taille"
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
-msgstr ""
+msgstr "Longueur en octets de la chaine retournée"
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
@@ -656,7 +653,7 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"Il s'agit du \"canal\" dans lequel le processus est en attente, constitué "
+"Il s'agit du « canal » dans lequel le processus est en attente, constitué "
 "par l'adresse d'un appel système dans lequel le processus est bloqué. La "
 "correspondance entre l'adresse et le nom de l'appel système est disponible "
 "si le fichier /etc/psdatabase est à jour par rapport à la version du noyau "
@@ -845,11 +842,11 @@ msgstr "Code de l'
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
-msgstr "ID réel de l'utilisateur du processus"
+msgstr "UID du processus"
 
 #: sysdeps/names/procstate.c:48
 msgid "GID of process"
-msgstr "ID réel du groupe du processus"
+msgstr "GID du processus"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
@@ -1035,7 +1032,7 @@ msgstr "Priorit
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
-msgstr "Niveau de \"nice\" (standard unix) du processus"
+msgstr "Niveau de « nice » (standard unix) du processus"
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
@@ -1111,11 +1108,11 @@ msgstr "Quantit
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr "Pages Entrantes (disque vers mémoire)"
+msgstr "Pages entrantes (disque vers mémoire)"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr "Pages Sortantes (mémoire vers disque)"
+msgstr "Pages sortantes (mémoire vers disque)"
 
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
@@ -1123,7 +1120,8 @@ msgstr "Nombre total de pages de swap charg
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
-msgstr "Nombre total de pages de swap sauvées sur disque depuis le démarrage"
+msgstr ""
+"Nombre total de pages de swap sauvegardées sur disque depuis le démarrage"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
@@ -1135,11 +1133,11 @@ msgstr "Utilisation CPU"
 
 #: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "Memory Usage"
-msgstr "Utilisation Mémoire"
+msgstr "Utilisation mémoire"
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr "Utilisation du Swap"
+msgstr "Utilisation du swap"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
@@ -1163,7 +1161,7 @@ msgstr "Limites de l'ensemble de s
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
-msgstr "Liste des taches en cours d'exécution"
+msgstr "Liste des tâches en cours d'exécution"
 
 #: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "Process Status information"
@@ -1175,11 +1173,11 @@ msgstr "Information sur l'UID et le TTY des processus"
 
 #: sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:88
 msgid "Process Memory information"
-msgstr "Information sur la Mémoire du Processus"
+msgstr "Information sur la mémoire du processus"
 
 #: sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:89
 msgid "Process Time information"
-msgstr "Information Temporelle sur le processus"
+msgstr "Information temporelle sur le processus"
 
 #: sysdeps/names/sysdeps.c:63 sysdeps/names/sysdeps.c:90
 msgid "Process Signal information"
@@ -1245,127 +1243,313 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr ""
+msgstr "Hangup"
 
 #: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
-msgstr ""
+msgstr "Interruption"
 
 #: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr ""
+msgstr "Quitter"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr ""
+msgstr "Instruction illégale"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr ""
+msgstr "Point d'arrêt rencontré"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
-msgstr ""
+msgstr "Annulation"
 
 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr ""
+msgstr "Erreur EMT"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr ""
+msgstr "Exception virgule flottante"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr ""
+msgstr "Tuer"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr ""
+msgstr "Erreur bus"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
-#, fuzzy
 msgid "Segmentation violation"
-msgstr "Information sur la segmentation du processus"
+msgstr "Violation de segmentation"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr ""
+msgstr "Mauvais argument d'appel système"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr ""
+msgstr "Tube cassé"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr ""
+msgstr "Alarme d'horloge"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
-msgstr ""
+msgstr "Signal de fin"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr ""
+msgstr "Condition urgente sur socket"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr ""
+msgstr "Arrêt"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr ""
+msgstr "Arrêt depuis le clavier"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr ""
+msgstr "Continuer"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
-msgstr ""
+msgstr "L'état du fils a changé"
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr ""
+msgstr "Lecture sur tty en arrière-plan"
 
 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr ""
+msgstr "Écriture sur tty en arrière-plan"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr ""
+msgstr "E/S maintenant possible"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr ""
+msgstr "Limite de temps CPU dépassée"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr ""
+msgstr "Taille de fichier excessive"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
-msgstr ""
+msgstr "Alarme virtuelle"
 
 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr ""
+msgstr "Profile de l'alarme"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr ""
+msgstr "Redimensionnement de la fenêtre"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr ""
+msgstr "Demande d'information"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
-#, fuzzy
 msgid "User defined signal 1"
-msgstr "Masque des signaux ignorés"
+msgstr "Signal utilisateur 1"
 
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
-#, fuzzy
 msgid "User defined signal 2"
-msgstr "Masque des signaux ignorés"
+msgstr "Signal utilisateur 2"
+
+#~ msgid "Hangup (POSIX)"
+#~ msgstr "Raccrochement (POSIX)"
+
+#~ msgid "Quit (POSIX)"
+#~ msgstr "Quitter (POSIX)"
+
+#~ msgid "Abort (ANSI)"
+#~ msgstr "Arrêt depuis abort() (ANSI)"
+
+#~ msgid "EMT instruction"
+#~ msgstr "Instruction EMT"
+
+#~ msgid "Kill, unblockable (POSIX)"
+#~ msgstr "Signal « Kill », non blocable (POSIX)"
+
+#~ msgid "BUS error (4.2 BSD)"
+#~ msgstr "Erreur de Bus (BSD 4.2)"
+
+#~ msgid "Stop, unblockable (POSIX)"
+#~ msgstr "Arrêt du processus, non blocable (POSIX)"
+
+#~ msgid "Power failure restart (System V)"
+#~ msgstr "Chute d'alimentation (System V)"
+
+#~ msgid "Show this help message"
+#~ msgstr "Afficher ce message d'aide"
+
+#~ msgid "Display brief usage message"
+#~ msgstr "Affiche un bref message d'utilisation"
+
+#~ msgid "SMP CPU Flags"
+#~ msgstr "Drapeaux CPU SMP"
+
+#~ msgid "Start_Data"
+#~ msgstr "Début_données"
+
+#~ msgid "End_Data"
+#~ msgstr "Fin_données"
+
+#~ msgid "Start_Brk"
+#~ msgstr "Début_Brk"
+
+#~ msgid "Brk"
+#~ msgstr "Brk"
+
+#~ msgid "Start_MMap"
+#~ msgstr "Début_MMap"
+
+#~ msgid "Arg_Start"
+#~ msgstr "Début_Arg"
+
+#~ msgid "Arg_End"
+#~ msgstr "Fin_Arg"
+
+#~ msgid "Env_Start"
+#~ msgstr "Début_Env"
+
+#~ msgid "Env_End"
+#~ msgstr "Fin_Env"
+
+#~ msgid "Address of beginning of data segment"
+#~ msgstr "Adresse du début du segment de données"
+
+#~ msgid "Address of end of data segment"
+#~ msgstr "Adresse de fin du segment de données"
+
+#~ msgid "Brk_Start"
+#~ msgstr "Début_Brk"
+
+#~ msgid "Brk_End"
+#~ msgstr "Fin_Brk"
+
+#~ msgid "Start of mmap()ed areas"
+#~ msgstr "Début des zones allouées par mmap()"
+
+#~ msgid "RUID"
+#~ msgstr "RUID"
+
+#~ msgid "RGID"
+#~ msgstr "RGID"
+
+#~ msgid "Has CPU"
+#~ msgstr "Utilise la CPU"
+
+#~ msgid "Processor"
+#~ msgstr "Processeur"
+
+#~ msgid "Last Processor"
+#~ msgstr "Processeur préc"
+
+#~ msgid "effective UID of process"
+#~ msgstr "ID Effectif de l'utilisateur du processus"
+
+#~ msgid "effective GID of process"
+#~ msgstr "ID effectif du groupe du processus"
+
+#~ msgid "has_cpu"
+#~ msgstr "Utilise la CPU"
+
+#~ msgid "processor"
+#~ msgstr "processeur"
+
+#~ msgid "last_processor"
+#~ msgstr "processeur précédent"
+
+#~ msgid "XCPU_Flags"
+#~ msgstr "Drap_XCPU"
+
+#~ msgid "SUid"
+#~ msgstr "SUid"
+
+#~ msgid "SGid"
+#~ msgstr "SGid"
+
+#~ msgid "FsUid"
+#~ msgstr "FsUid"
+
+#~ msgid "FsGid"
+#~ msgstr "FsGid"
+
+#~ msgid "NGroups"
+#~ msgstr "NGroupes"
+
+#~ msgid "Groups"
+#~ msgstr "Groupes"
+
+#~ msgid "Saved User ID"
+#~ msgstr "ID d'utilisateur sauvegardé"
+
+#~ msgid "Saved Group ID"
+#~ msgstr "ID de groupe sauvegardé"
+
+#~ msgid "Filesystem User ID"
+#~ msgstr "ID d'utilisateur du système de fichiers"
+
+#~ msgid "Filesystem Group ID"
+#~ msgstr "ID de groupe du système de fichiers"
+
+#~ msgid "Number of additional process groups"
+#~ msgstr "Nombre de groupes supplémentaires"
+
+#~ msgid "Additional process groups"
+#~ msgstr "Groupes supplémentaires"
+
+#~ msgid "Pointer Size"
+#~ msgstr "Taille du pointeur"
+
+#~ msgid "Process CWD"
+#~ msgstr "Processus CWD"
+
+#~ msgid "Pointer Size on the Server (in bits)"
+#~ msgstr "Taille du pointeur sur le serveur (en bits)"
+
+#~ msgid "Current working directory of the process"
+#~ msgstr "Répertoire de travail courant du processus"
+
+#~ msgid "Boot time"
+#~ msgstr "Date de démarrage"
+
+#~ msgid "Boot time (seconds sice epoch)"
+#~ msgstr "Date de démarrage (en secondes depuis le 01/01/1970)"
+
+#~ msgid "Unknown error"
+#~ msgstr "Erreur inconnue"
+
+#~ msgid "Invalid argument"
+#~ msgstr "Argument invalide"
+
+#~ msgid "No such parameter"
+#~ msgstr "N'est pas un paramètre"
+
+#~ msgid "Attempted to modify a read-only value"
+#~ msgstr "Tentative de modification d'une valeur en lecture seule"
+
+#~ msgid "Parameter size mismatch"
+#~ msgstr "Taille de paramèter incohérent"
+
+#~ msgid "Communication with LibGTop server failed"
+#~ msgstr "La communication avec le serveur LibGTop a échoué"
+
+#~ msgid "No such process"
+#~ msgstr "Plus de processus"
+
+#~ msgid "No kernel support"
+#~ msgstr "Aucun support noyau"
+
+#~ msgid "Incompatible kernel version"
+#~ msgstr "Version du noyau incompatible"

po/ga.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop CVS\n"
-"POT-Creation-Date: 2000-05-14 17:02+0200\n"
+"POT-Creation-Date: 2001-03-09 17:27+0100\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"
@@ -13,6 +13,206 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: examples/smp.c:68
+#, c-format
+msgid "Ticks (%ld per second):"
+msgstr ""
+
+#: examples/smp.c:71
+msgid "Total"
+msgstr ""
+
+#: examples/smp.c:71 sysdeps/names/mem.c:47
+msgid "User"
+msgstr "Úsáidoeir"
+
+#: examples/smp.c:71 sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr "Deas"
+
+#: examples/smp.c:71
+msgid "Sys"
+msgstr ""
+
+#: examples/smp.c:71
+msgid "Idle"
+msgstr ""
+
+#: examples/smp.c:73
+#, c-format
+msgid ""
+"CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
+"\n"
+msgstr ""
+
+#: examples/smp.c:77
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+msgstr ""
+
+#: examples/smp.c:94
+msgid "Percent:"
+msgstr ""
+
+#: examples/smp.c:95
+msgid "Total (%)"
+msgstr ""
+
+#: examples/smp.c:95
+#, fuzzy
+msgid "User (%)"
+msgstr "Úsáidoeir"
+
+#: examples/smp.c:95
+#, fuzzy
+msgid "Nice (%)"
+msgstr "Deas"
+
+#: examples/smp.c:95
+msgid "Sys (%)"
+msgstr ""
+
+#: examples/smp.c:96
+msgid "Idle (%)"
+msgstr ""
+
+#: examples/smp.c:98
+#, c-format
+msgid ""
+"CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+"\n"
+msgstr ""
+
+#: examples/smp.c:114
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr ""
+
+#: examples/smp.c:120
+msgid "Spin:"
+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"
+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 ""
+
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
 msgstr "Am CPU Iomlán"
@@ -161,10 +361,6 @@ msgstr "Maol
 msgid "Cached"
 msgstr "Taisceáidthe"
 
-#: sysdeps/names/mem.c:47
-msgid "User"
-msgstr "Úsáidoeir"
-
 #: sysdeps/names/mem.c:48
 msgid "Locked"
 msgstr ""
@@ -249,6 +445,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,10 +640,6 @@ 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íoúil"
@@ -668,10 +953,6 @@ msgstr "TPGid"
 msgid "Priority"
 msgstr "Tosaíocht"
 
-#: sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "Deas"
-
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr "ID Úsáideoir"
@@ -924,125 +1205,130 @@ 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 "éarraid corá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"
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+msgid "Abort"
 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"
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+#, fuzzy
+msgid "EMT error"
+msgstr "Gan earráid"
 
-#: 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"
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
 msgstr ""
 
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+msgid "Kill"
 msgstr ""
 
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+#, fuzzy
+msgid "Bus error"
+msgstr "Gan earráid"
+
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
 msgstr ""
 
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
 msgstr ""
 
-#: lib/read_data.c:49
-msgid "read data size"
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
 msgstr ""
 
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
 msgstr ""
 
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+msgid "Termination"
 msgstr ""
 
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
 msgstr ""
 
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+msgid "Stop"
 msgstr ""
 
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
 msgstr ""
 
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+msgid "Continue"
 msgstr ""
 
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
 msgstr ""
 
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
 msgstr ""
 
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
 msgstr ""
 
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
 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:51 sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr ""
+
+#: 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 ""
 
 #, fuzzy
@@ -1104,9 +1390,6 @@ msgstr ""
 #~ msgid "Filesystem Group ID"
 #~ msgstr "ID Grupa Coráschomad"
 
-#~ msgid "No error"
-#~ msgstr "Gan earráid"
-
 #, fuzzy
 #~ msgid "Unknown error"
 #~ msgstr "éarraid coráis anathnid"

po/gl.po

@@ -13,7 +13,7 @@
 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"

po/ja.po

@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"Project-Id-Version: libgtop 1.0.10\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 2000-10-15 03:24+0900\n"
 "Last-Translator: Yukihiro Nakai <nakai@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -191,7 +191,7 @@ msgstr "%s: ǧ
 #: support/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: 認識できないオプションです `--%s'\n"
+msgstr "%s: 認識できないオプションです `%c%s'\n"
 
 #. 1003.2 specifies the format of this message.
 #: support/getopt.c:774

po/ko.po

@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 1.0.2\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
-"PO-Revision-Date: 1999-03-30 10:40:01+0900\n"
-"Last-Translator: Sung-Hyun Nam <namsh@lgic.co.kr>\n"
+"Project-Id-Version: libgtop 1.0.10\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"PO-Revision-Date: 2001-02-09 18:56+0900\n"
+"Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-kr\n"
@@ -16,11 +16,11 @@ msgstr ""
 #: examples/smp.c:68
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr ""
+msgstr "틱 (초당 %ld):"
 
 #: examples/smp.c:71
 msgid "Total"
-msgstr ""
+msgstr "총"
 
 #: examples/smp.c:71 sysdeps/names/mem.c:47
 msgid "User"
@@ -35,9 +35,8 @@ msgid "Sys"
 msgstr ""
 
 #: examples/smp.c:71
-#, fuzzy
 msgid "Idle"
-msgstr "유휴시간"
+msgstr "유휴"
 
 #: examples/smp.c:73
 #, c-format
@@ -45,24 +44,25 @@ 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:77
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-msgstr ""
+msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 
 #: examples/smp.c:94
 msgid "Percent:"
-msgstr ""
+msgstr "백분율:"
 
 #: examples/smp.c:95
 msgid "Total (%)"
-msgstr ""
+msgstr "총 (%)"
 
 #: examples/smp.c:95
-#, fuzzy
 msgid "User (%)"
-msgstr "사용자"
+msgstr "사용자 (%)"
 
 #: examples/smp.c:95
 msgid "Nice (%)"
@@ -74,7 +74,7 @@ msgstr ""
 
 #: examples/smp.c:96
 msgid "Idle (%)"
-msgstr ""
+msgstr "유휴 (%)"
 
 #: examples/smp.c:98
 #, c-format
@@ -82,66 +82,68 @@ 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:114
 #, c-format
 msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-msgstr ""
+msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:120
 msgid "Spin:"
-msgstr ""
+msgstr "Spin:"
 
 #: lib/read.c:75
 #, c-format
 msgid "read %d bytes"
-msgstr ""
+msgstr "%d 바이트 읽음"
 
 #: lib/read_data.c:49
 msgid "read data size"
-msgstr ""
+msgstr "데이타 크기 읽음"
 
 #: lib/read_data.c:66
 #, c-format
 msgid "read data %d bytes"
-msgstr ""
+msgstr "데이타 %d 바이트 읽음"
 
 #: lib/write.c:48
 #, c-format
 msgid "write %d bytes"
-msgstr ""
+msgstr "%d 바이트 씀"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
-msgstr ""
+msgstr "디버깅 사용"
 
 #: src/daemon/gnuserv.c:448
 msgid "DEBUG"
-msgstr ""
+msgstr "디버그"
 
 #: src/daemon/gnuserv.c:450
 msgid "Enable verbose output"
-msgstr ""
+msgstr "많은 출력 사용"
 
 #: src/daemon/gnuserv.c:450
 msgid "VERBOSE"
-msgstr ""
+msgstr "VERBOSE"
 
 #: src/daemon/gnuserv.c:452
 msgid "Don't fork into background"
-msgstr ""
+msgstr "백그라운드로 실행 않함"
 
 #: src/daemon/gnuserv.c:452
 msgid "NO-DAEMON"
-msgstr ""
+msgstr "NO-DAEMON"
 
 #: src/daemon/gnuserv.c:454
 msgid "Invoked from inetd"
-msgstr ""
+msgstr "inetd에 의해 불림"
 
 #: src/daemon/gnuserv.c:454
 msgid "INETD"
-msgstr ""
+msgstr "INETD"
 
 #: src/daemon/gnuserv.c:488
 #, c-format
@@ -149,6 +151,8 @@ msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
+"옵션 %s에 에러: %s.\n"
+"'%s --help'를 실행하시면 명령행 옵션에서 사용할 수 있는 목록이 보입니다.\n"
 
 #: support/error.c:109
 msgid "Unknown system error"
@@ -445,86 +449,83 @@ msgstr "
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
-msgstr ""
+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
-#, fuzzy
 msgid "Packets In"
-msgstr "프로세스 ID"
+msgstr "들어온 패킷"
 
 #: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
 msgid "Packets Out"
-msgstr ""
+msgstr "나간 패킷"
 
 #: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
 msgid "Packets Total"
-msgstr ""
+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"
-msgstr ""
+msgstr "들어온 에러"
 
 #: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
 msgid "Errors Out"
-msgstr ""
+msgstr "나간 에러"
 
 #: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
 msgid "Errors Total"
-msgstr ""
+msgstr "총 에러"
 
 #: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Collisions"
-msgstr ""
+msgstr "충돌"
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr ""
+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
-#, fuzzy
 msgid "Number of input bytes"
-msgstr "목록 요소의 갯수"
+msgstr "들어온 바이트 수"
 
 #: sysdeps/names/ppp.c:47
-#, fuzzy
 msgid "Number of output bytes"
-msgstr "목록 요소의 갯수"
+msgstr "나간 바이트 수"
 
 #: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
 msgid "Size"
@@ -532,43 +533,43 @@ msgstr "ũ
 
 #: sysdeps/names/procargs.c:43
 msgid "Length in bytes of the returned string."
-msgstr ""
+msgstr "되돌려진 문자열의 바이트 길이."
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
-msgstr ""
+msgstr "K_Flags"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Min_Flt"
-msgstr ""
+msgstr "Min_Flt"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Maj_Flt"
-msgstr ""
+msgstr "Maj_Flt"
 
 #: sysdeps/names/prockernel.c:42
 msgid "CMin_Flt"
-msgstr ""
+msgstr "CMin_Flt"
 
 #: sysdeps/names/prockernel.c:43
 msgid "CMaj_Flt"
-msgstr ""
+msgstr "CMaj_Flt"
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_ESP"
-msgstr ""
+msgstr "KStk_ESP"
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_EIP"
-msgstr ""
+msgstr "KStk_EIP"
 
 #: sysdeps/names/prockernel.c:43
 msgid "NWChan"
-msgstr ""
+msgstr "NWChan"
 
 #: sysdeps/names/prockernel.c:44
 msgid "WChan"
-msgstr ""
+msgstr "WChan"
 
 #. K_Flags
 #: sysdeps/names/prockernel.c:50
@@ -680,7 +681,6 @@ msgid "Number of pages of virtual memory"
 msgstr "가상 메모리에서의 페이지 수"
 
 #: sysdeps/names/procmem.c:55
-#, fuzzy
 msgid "Number of resident set (non-swapped) pages"
 msgstr "상주 세트 (스왑않된) 페이지 수"
 
@@ -707,35 +707,35 @@ msgstr ""
 
 #: 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"
-msgstr ""
+msgstr "Dirty Size"
 
 #: 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"
@@ -775,15 +775,15 @@ msgstr "
 
 #: sysdeps/names/procsignal.c:40
 msgid "Blocked"
-msgstr ""
+msgstr "Blocked"
 
 #: 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"
@@ -803,19 +803,19 @@ msgstr ""
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
-msgstr ""
+msgstr "명령"
 
 #: 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()"
@@ -826,58 +826,56 @@ msgid "Single-Char code for process state (S=sleeping)"
 msgstr "프로세스 상태의 단일문자 코드 (S=sleeping)"
 
 #: sysdeps/names/procstate.c:47
-#, fuzzy
 msgid "UID of process"
 msgstr "프로세스의 UID"
 
 #: sysdeps/names/procstate.c:48
-#, fuzzy
 msgid "GID of process"
 msgstr "프로세스의 GID"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr ""
+msgstr "시작시간"
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr ""
+msgstr "RTime"
 
 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr ""
+msgstr "UTime"
 
 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr ""
+msgstr "STime"
 
 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
-msgstr ""
+msgstr "CUTime"
 
 #: sysdeps/names/proctime.c:45
 msgid "CSTime"
-msgstr ""
+msgstr "CSTime"
 
 #: sysdeps/names/proctime.c:45
 msgid "TimeOut"
-msgstr ""
+msgstr "시간초과"
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr ""
+msgstr "It_Real_Value"
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
-msgstr ""
+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"
@@ -919,39 +917,39 @@ msgstr "ƽ
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
-msgstr ""
+msgstr "프로세스에 의해 모여진 SMP 사용자 모드 CPU 시간"
 
 #: sysdeps/names/proctime.c:62
 msgid "SMP kernel-mode CPU time accumulated by process"
-msgstr ""
+msgstr "프로세스에 의해 모여진 SMP 커널 모드 CPU 시간"
 
 #: 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"
@@ -959,15 +957,15 @@ 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"
@@ -1019,7 +1017,7 @@ msgstr "
 
 #: sysdeps/names/sem_limits.c:42 sysdeps/names/sem_limits.c:56
 msgid "Number of entries in semaphore map"
-msgstr ""
+msgstr "세마포어 맵의 엔트리 수"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Max number of arrays"
@@ -1047,15 +1045,15 @@ msgstr ""
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
-msgstr ""
+msgstr "sem_undo 구조체 크기"
 
 #: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "Semaphore max value"
-msgstr ""
+msgstr "세마포어 최대 값"
 
 #: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Adjust on exit max value"
-msgstr ""
+msgstr "종료시 최대값 조정"
 
 #: sysdeps/names/shm_limits.c:39 sysdeps/names/shm_limits.c:48
 msgid "Max segment size"
@@ -1091,11 +1089,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"
@@ -1107,7 +1105,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"
@@ -1123,11 +1121,11 @@ msgstr "
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
-msgstr ""
+msgstr "시스템 Uptime"
 
 #: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "Load Averange"
-msgstr ""
+msgstr "로드 평균"
 
 #: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Shared Memory Limits"
@@ -1175,7 +1173,7 @@ msgstr "
 
 #: sysdeps/names/sysdeps.c:66
 msgid "Process Arguments"
-msgstr ""
+msgstr "프로세스 인자"
 
 #: sysdeps/names/sysdeps.c:67 sysdeps/names/sysdeps.c:94
 msgid "Process Memory Map"
@@ -1191,15 +1189,15 @@ 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"
-msgstr ""
+msgstr "프로세스의 명령행 인자"
 
 #: sysdeps/names/sysdeps.c:95
 msgid "List of currently mounted filesystems"
@@ -1207,7 +1205,7 @@ msgstr "
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr ""
+msgstr "Uptime"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
@@ -1223,19 +1221,19 @@ msgstr "
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr ""
+msgstr "Hangup"
 
 #: 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 "Quit"
 
 #: 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"
@@ -1243,60 +1241,59 @@ 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"
-msgstr ""
+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
-#, fuzzy
 msgid "Segmentation violation"
-msgstr "프로세스 세그먼트 정보"
+msgstr "세그먼테이션 위반"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr ""
+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"
-msgstr ""
+msgstr "알람 클럭"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
-msgstr ""
+msgstr "Termination"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr ""
+msgstr "소켓에 위급한 조건"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr ""
+msgstr "멈춤"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr ""
+msgstr "키보드 멈춤"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr ""
+msgstr "계속"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
@@ -1304,108 +1301,44 @@ msgstr ""
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr ""
+msgstr "tty에서 백그라운드 읽기"
 
 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr ""
+msgstr "tty로 백그라운드 쓰기"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr ""
+msgstr "I/O 이제 가능"
 
 #: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr ""
+msgstr "CPU 한계 초과"
 
 #: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr ""
+msgstr "파일 크기 한계 초과"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
-msgstr ""
+msgstr "가상 알람 클럭"
 
 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr ""
+msgstr "Profiling 알람 클럭"
 
 #: 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"
-msgstr ""
+msgstr "사용자 정의 신호 1"
 
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
-msgstr ""
-
-#, fuzzy
-#~ msgid "Address of beginning of data segment"
-#~ msgstr "코드 세그먼트의 시작 주소"
-
-#, fuzzy
-#~ msgid "Address of end of data segment"
-#~ msgstr "코드 세그먼트의 끝 주소"
-
-#, fuzzy
-#~ msgid "Processor"
-#~ msgstr "프로세스 ID"
-
-#, fuzzy
-#~ msgid "effective UID of process"
-#~ msgstr "프로세스의 UID"
-
-#, fuzzy
-#~ msgid "effective GID of process"
-#~ msgstr "프로세스의 GID"
-
-#, fuzzy
-#~ msgid "processor"
-#~ msgstr "프로세스 ID"
-
-#, fuzzy
-#~ msgid "NGroups"
-#~ msgstr "그룹 ID"
-
-#, fuzzy
-#~ msgid "Groups"
-#~ msgstr "그룹 ID"
-
-#, fuzzy
-#~ msgid "Saved User ID"
-#~ msgstr "사용자 ID"
-
-#, fuzzy
-#~ msgid "Saved Group ID"
-#~ msgstr "그룹 ID"
-
-#, fuzzy
-#~ msgid "Filesystem User ID"
-#~ msgstr "파일 시스템 사용"
-
-#, fuzzy
-#~ msgid "Filesystem Group ID"
-#~ msgstr "유효한 그룹 ID"
-
-#, fuzzy
-#~ msgid "Number of additional process groups"
-#~ msgstr "터미널 프로세스 그룹 ID"
-
-#, fuzzy
-#~ msgid "Additional process groups"
-#~ msgstr "터미널 프로세스 그룹 ID"
-
-#, fuzzy
-#~ msgid "Pointer Size"
-#~ msgstr "상주 세트 크기"
-
-#, fuzzy
-#~ msgid "Boot time (seconds sice epoch)"
-#~ msgstr "시스템이 시작된 이후 초로 나타낸 프로세스의 시작 시간"
+msgstr "사용자 정의 신호 2"

po/nl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop VERSION\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1999-09-18 00:24+0200\n"
 "Last-Translator: Gert Dewit <Gert.Dewit@sos.be>\n"
 "Language-Team: nl <nl@li.org>\n"

po/no.po

@@ -5,7 +5,7 @@
 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-08-16 14:00+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"

po/pt_BR.po

@@ -1,59 +1,266 @@
-# Initial Translation: Elvis Pfützenreuter <epx@netville.com.br>
-# Revision: Ricardo Soares Guimarães <ricardo@conectiva.com.br>
+#
+# E. A. Tacão <tacao@conectiva.com.br>, 2001
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: LibGTOP\n"
-"POT-Creation-Date: 2000-05-14 17:02+0200\n"
-"PO-Revision-Date: 1999-04-28 16:40-0300\n"
-"Last-Translator: Ricardo Soares Guimarães <ricardo@conectiva.com.br>\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
+"PO-Revision-Date: 2001-02-08 14:59GMT-0300\n"
+"Last-Translator: E. A. Tacão <tacao@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.6\n"
+
+#: examples/smp.c:68
+#, c-format
+msgid "Ticks (%ld per second):"
+msgstr "Pulsos (%ld por segundo):"
+
+#: examples/smp.c:71
+msgid "Total"
+msgstr "Total"
+
+#: examples/smp.c:71 sysdeps/names/mem.c:47
+msgid "User"
+msgstr "Usuário"
+
+#: examples/smp.c:71 sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr "Prioridade"
+
+#: examples/smp.c:71
+msgid "Sys"
+msgstr "Sys"
+
+#: examples/smp.c:71
+msgid "Idle"
+msgstr "Tempo ocioso"
+
+#: examples/smp.c:73
+#, 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:77
+#, 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:94
+msgid "Percent:"
+msgstr "Percentual:"
+
+#: examples/smp.c:95
+msgid "Total (%)"
+msgstr "Total (%)"
+
+#: examples/smp.c:95
+msgid "User (%)"
+msgstr "Usuário (%)"
+
+#: examples/smp.c:95
+msgid "Nice (%)"
+msgstr "Prioridade (%)"
+
+#: examples/smp.c:95
+msgid "Sys (%)"
+msgstr "Sys (%)"
+
+#: examples/smp.c:96
+msgid "Idle (%)"
+msgstr "Tempo ocioso (%)"
+
+#: examples/smp.c:98
+#, 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:114
+#, 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:120
+msgid "Spin:"
+msgstr "Spin:"
+
+#: lib/read.c:75
+#, c-format
+msgid "read %d bytes"
+msgstr "ler %d bytes"
+
+#: lib/read_data.c:49
+msgid "read data size"
+msgstr "ler tamanho dos dados"
+
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
+msgstr "ler %d bytes de dados"
+
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
+msgstr "escrever %d bytes"
+
+#: src/daemon/gnuserv.c:448
+msgid "Enable debugging"
+msgstr "Habilitar depuração"
+
+#: src/daemon/gnuserv.c:448
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/daemon/gnuserv.c:450
+msgid "Enable verbose output"
+msgstr "Habilitar saída com mensagens detalhadas "
+
+#: src/daemon/gnuserv.c:450
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: src/daemon/gnuserv.c:452
+msgid "Don't fork into background"
+msgstr "Não passar para segundo plano"
+
+#: src/daemon/gnuserv.c:452
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: src/daemon/gnuserv.c:454
+msgid "Invoked from inetd"
+msgstr "Acionado pelo inetd"
+
+#: src/daemon/gnuserv.c:454
+msgid "INETD"
+msgstr "INETD"
+
+#: 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"
+msgstr ""
+"Erro na opção %s: %s.\n"
+"Execute '%s --help' para uma lista completa das opções\n"
+"de linha de comando.\n"
+
+#: support/error.c:109
+msgid "Unknown system error"
+msgstr "Erro desconhecido de sistema"
+
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opção `%s' é ambígua\n"
+
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opção `--%s' não aceita argumentos.\n"
+
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opção `%c%s' não aceita argumentos.\n"
+
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opção `%s' requer um argumento.\n"
+
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opção não reconhecida `--%s'\n"
+
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opção não reconhecida `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opção ilegal -- %c\n"
+
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opção inválida -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:807 support/getopt.c:937
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opção requer um argumento -- %c\n"
+
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opção '-W %s' é ambígua.\n"
+
+#: support/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opção `-W %s' não aceita argumentos.\n"
 
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
-msgstr "Tempo total de CPU"
+msgstr "Tempo Total de CPU"
 
 #: sysdeps/names/cpu.c:44
 msgid "CPU Time in User Mode"
-msgstr "Tempo de CPU em modo usuário"
+msgstr "Tempo de CPU em Modo Usuário"
 
 #: sysdeps/names/cpu.c:45
 msgid "CPU Time in User Mode (nice)"
-msgstr "Tempo de CPU em modo usuário (baixa pri.)"
+msgstr "Tempo de CPU em Modo Usuário (baixa pri.)"
 
 #: sysdeps/names/cpu.c:46
 msgid "CPU Time in System Mode"
-msgstr "Tempo de CPU em modo sistema"
+msgstr "Tempo de CPU em Modo Sistema"
 
 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
-msgstr "Tempo de CPU em inatividade"
+msgstr "Tempo de CPU em Inatividade"
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
-msgstr "Freqüência de relógio"
+msgstr "Freqüência de Relógio"
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr "Tempo total de CPU SMP"
+msgstr "Tempo Total de CPU SMP"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "Tempo de CPU SMP em modo usuário"
+msgstr "Tempo de CPU SMP em Modo Usuário"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "Tempo de CPU SMP em modo usuário (baixa pri.)"
+msgstr "Tempo de CPU SMP em Modo Usuário (baixa pri.)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "Tempo de CPU SMP em modo sistema"
+msgstr "Tempo de CPU SMP em Modo Sistema"
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr "Tempo de CPU SMP em inatividade"
+msgstr "Tempo de CPU SMP em Inatividade"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
@@ -159,11 +366,7 @@ msgstr "Buffers"
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr "Cached"
-
-#: sysdeps/names/mem.c:47
-msgid "User"
-msgstr "Usuário"
+msgstr "No Cache"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
@@ -171,35 +374,35 @@ msgstr "Reservados"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
-msgstr "Total de memória física em Kb"
+msgstr "Total de memória física em kB"
 
 #: sysdeps/names/mem.c:54
 msgid "Used memory size in kB"
-msgstr "Memória utilizada em Kb"
+msgstr "Memória utilizada em kB"
 
 #: sysdeps/names/mem.c:55
 msgid "Free memory size in kB"
-msgstr "Memória livre em Kb"
+msgstr "Memória livre em kB"
 
 #: sysdeps/names/mem.c:56
 msgid "Shared memory size in kB"
-msgstr "Memória compartilhada em Kb"
+msgstr "Memória compartilhada em kB"
 
 #: sysdeps/names/mem.c:57
 msgid "Size of buffers kB"
-msgstr "Tamanho dos buffers em Kb"
+msgstr "Tamanho dos buffers em kB"
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr "Tamanho da memória em cache em Kb"
+msgstr "Tamanho da memória em cache em kB"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
-msgstr "Memória utilizada em processos de usuários em Kb"
+msgstr "Memória utilizada em processos de usuários em kB"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr "Memória em páginas reservadas em Kb"
+msgstr "Memória em páginas reservadas em kB"
 
 #: sysdeps/names/mountlist.c:38 sysdeps/names/mountlist.c:45
 #: sysdeps/names/proclist.c:38 sysdeps/names/proclist.c:45
@@ -221,7 +424,7 @@ msgstr "Tamanho de um elemento da lista"
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr "Tamanho em Kb da área de mensagens"
+msgstr "Tamanho em kB da área de mensagens"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
@@ -247,6 +450,94 @@ msgstr "Tamanho do segmento das mensagens"
 msgid "Number of system message headers"
 msgstr "Número de cabeçalhos de mensagens de sistema"
 
+#: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
+msgid "Interface Flags"
+msgstr "Sinalizadores da interface"
+
+#: sysdeps/names/netload.c:46
+msgid "MTU"
+msgstr "MTU"
+
+#: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
+msgid "Subnet"
+msgstr "Sub-rede"
+
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
+msgid "Address"
+msgstr "Endereço"
+
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
+msgid "Packets In"
+msgstr "Páginas em Processamento"
+
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+msgid "Packets Out"
+msgstr "Página em Espera"
+
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
+msgid "Packets Total"
+msgstr "Total de Páginas"
+
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
+msgid "Bytes In"
+msgstr "Bytes recebidos"
+
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
+msgid "Bytes Out"
+msgstr "Bytes enviados"
+
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
+msgid "Bytes Total"
+msgstr "Total de bytes"
+
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
+msgid "Errors In"
+msgstr "Erros recebidos"
+
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
+msgid "Errors Out"
+msgstr "Erros enviados"
+
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
+msgid "Errors Total"
+msgstr "Total de erros"
+
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
+msgid "Collisions"
+msgstr "Colisões"
+
+#: sysdeps/names/netload.c:64
+msgid "Maximum Transfer Unit"
+msgstr "Unidade Máxima de Transferência"
+
+#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
+msgid "PPP State"
+msgstr "Estado PPP"
+
+#: sysdeps/names/ppp.c:39
+msgid "Input bytes"
+msgstr "Bytes de entrada"
+
+#: sysdeps/names/ppp.c:40
+msgid "Output bytes"
+msgstr "Bytes de saída"
+
+#: sysdeps/names/ppp.c:46
+msgid "Number of input bytes"
+msgstr "Número de bytes de entrada"
+
+#: sysdeps/names/ppp.c:47
+msgid "Number of output bytes"
+msgstr "Número de bytes de saída"
+
+#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr "Tamanho"
+
+#: sysdeps/names/procargs.c:43
+msgid "Length in bytes of the returned string."
+msgstr "Comprimento em bytes da seqüência retornada."
+
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
 msgstr "K_Flags"
@@ -297,7 +588,7 @@ msgid ""
 msgstr ""
 "Parâmetros do kernel para o processo.\n"
 "\n"
-"No Linux, cada parâmetro tem o bit matemático habilitado,pois crt0.s "
+"No Linux, cada parâmetro tem o bit matemático habilitado, pois crt0.s "
 "verifica se há emulação matemática, de modo que não seja incluída na saída.\n"
 "\n"
 "Isto é provavelmente um problema, já que nem todo processo é um programa C.\n"
@@ -319,7 +610,7 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"O número de falhas maiores do processo, são aquelas que provocaram  a busca "
+"O número de falhas maiores do processo, são aquelas que provocaram a busca "
 "de uma página de memória do disco."
 
 #. CMin_Flt
@@ -338,7 +629,7 @@ msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
 msgstr ""
-"O valor corrente de esp (ponteiro de pilha 32-bits), tal como  consta na "
+"O valor corrente de esp (ponteiro de pilha 32-bits), tal como consta na "
 "página da pilha do kernel para o processo."
 
 #. KStk_EIP
@@ -364,10 +655,6 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr "Este é o nome textual do campo `nwchan'."
 
-#: sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "Tamanho"
-
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr "Virtual"
@@ -419,7 +706,7 @@ msgstr ""
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "Limite atual em bytes do RSS de um processo (usualmente 2.1 Gb)."
+msgstr "Limite atual em bytes do RSS de um processo (normalmente 2.1 GB)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -542,14 +829,12 @@ msgid "Single-Char code for process state (S=sleeping)"
 msgstr "Código de um caractere para o estado do processo (S=suspenso)"
 
 #: sysdeps/names/procstate.c:47
-#, fuzzy
 msgid "UID of process"
-msgstr "UID real do processo"
+msgstr "UID do processo"
 
 #: sysdeps/names/procstate.c:48
-#, fuzzy
 msgid "GID of process"
-msgstr "GID real do processo"
+msgstr "GID do processo"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
@@ -687,10 +972,6 @@ msgstr "TPGid"
 msgid "Priority"
 msgstr "Prioridade"
 
-#: sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "Prioridade"
-
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr "ID Usuário"
@@ -822,13 +1103,13 @@ msgstr "P
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
 msgstr ""
-"Número total de páginas de troca que foram trazidas à RAM  deste a "
+"Número total de páginas de troca que foram trazidas à RAM desde a "
 "inicialização do sistema"
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
 msgstr ""
-"Número total de páginas de troca que foram colocadas em espera deste  a "
+"Número total de páginas de troca que foram colocadas em espera desde a "
 "inicialização do sistema"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
@@ -946,262 +1227,129 @@ msgstr "Tempo em segundos deste a inicializa
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
 msgstr ""
-"Tempo em segundos que o sistema despendeu ociosodesde a inicialização do "
+"Tempo em segundos que o sistema despendeu ocioso desde a inicialização do "
 "sistema"
 
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr "Erro desconhecido de sistema"
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "Desligar"
 
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opção `%s' é ambígua\n"
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "Interromper"
 
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opção `--%s' não aceita argumentos.\n"
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "Encerrar"
 
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opção `%c%s' não aceita argumentos.\n"
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr "Instrução ilegal"
 
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opção `%s' requer um argumento.\n"
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr "Rastrear interceptações"
 
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opção não reconhecida `--%s'\n"
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "Interromper"
 
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opção não reconhecida `%c%s'\n"
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+msgid "EMT error"
+msgstr "Erro EMT"
 
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opção ilegal -- %c\n"
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
+msgid "Floating-point exception"
+msgstr "Exceção de ponto flutuante"
 
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opção inválida -- %c\n"
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
+msgid "Kill"
+msgstr "Matar"
 
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:807 support/getopt.c:937
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opção requer um argumento -- %c\n"
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
+msgid "Bus error"
+msgstr "Erro do barramento"
 
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opção '-W %s' é ambígua.\n"
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr "Violação de segmentação"
 
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opção `-W %s' não aceita argumentos.\n"
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr "Argumento inválido na chamada de sistema"
 
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
-msgstr "ler %d bytes"
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr "Conexão interrompida"
 
-#: lib/read_data.c:49
-msgid "read data size"
-msgstr "ler tamanho dos dados"
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
+msgstr "Despertador"
 
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
-msgstr "ler %d bytes de dados"
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr "Terminação"
 
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr "escrever %d bytes"
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
+msgstr "Condição urgente no soquete"
 
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr "Habilitar depuração"
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "Parar"
 
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr "DEBUG"
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr "Teclado parado"
 
-#: src/daemon/gnuserv.c:450
-msgid "Enable verbose output"
-msgstr "Habilitar saída com mensagens detalhadas "
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "Continuar"
 
-#: src/daemon/gnuserv.c:450
-msgid "VERBOSE"
-msgstr "VERBOSE"
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr "Status do filho alterado"
 
-#: src/daemon/gnuserv.c:452
-msgid "Don't fork into background"
-msgstr "Não passar para segundo plano"
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr "Leitura de TTY em segundo plano"
 
-#: src/daemon/gnuserv.c:452
-msgid "NO-DAEMON"
-msgstr "NO-DAEMON"
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr "Escrita para TTY em segundo plano"
 
-#: src/daemon/gnuserv.c:454
-msgid "Invoked from inetd"
-msgstr "Acionado pelo inetd"
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr "E/S possível agora"
 
-#: src/daemon/gnuserv.c:454
-msgid "INETD"
-msgstr "INETD"
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr "Limite de CPU excedido"
 
-#: 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"
-msgstr ""
-"Erro na opção %s: %s.\n"
-"Execute '%s --help' para uma lista completa das opções\n"
-"de linha de comando.\n"
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
+msgid "File size limit exceeded"
+msgstr "Limite de tamenho de arquivo excedido"
 
-#~ msgid "SMP CPU Flags"
-#~ msgstr "Bandeiras de SMP - CPU"
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+msgid "Virtual alarm clock"
+msgstr "Despertador virtual"
 
-#~ msgid "Start_Data"
-#~ msgstr "Start_Data"
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
+msgstr "Personalizando despertador"
 
-#~ msgid "End_Data"
-#~ msgstr "End_Data"
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr "Alteração do tamanho da janela"
 
-#~ msgid "Start_Brk"
-#~ msgstr "Start_Brk"
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr "Requisição de informação"
 
-#~ msgid "Brk"
-#~ msgstr "Brk"
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr "Sinal 1 definido pelo usuário"
 
-#~ msgid "Start_MMap"
-#~ msgstr "Start_MMap"
-
-#~ msgid "Arg_Start"
-#~ msgstr "Arg_Start"
-
-#~ msgid "Arg_End"
-#~ msgstr "Arg_End"
-
-#~ msgid "Env_Start"
-#~ msgstr "Env_Start"
-
-#~ msgid "Env_End"
-#~ msgstr "Env_End"
-
-#~ msgid "Address of beginning of data segment"
-#~ msgstr "Endereço inicial do segmento de código"
-
-#~ msgid "Address of end of data segment"
-#~ msgstr "Endereço final do segmento de código"
-
-#~ msgid "Brk_Start"
-#~ msgstr "Brk_Start"
-
-#~ msgid "Brk_End"
-#~ msgstr "Brk_End"
-
-#~ msgid "Start of mmap()ed areas"
-#~ msgstr "Inicio das áreas mmap()ed"
-
-#~ msgid "RUID"
-#~ msgstr "RUID"
-
-#~ msgid "RGID"
-#~ msgstr "RGID"
-
-#~ msgid "Has CPU"
-#~ msgstr "Foi CPU"
-
-#~ msgid "Processor"
-#~ msgstr "Processador"
-
-#~ msgid "Last Processor"
-#~ msgstr "Último processador"
-
-#~ msgid "effective UID of process"
-#~ msgstr "UID efetivo do processo"
-
-#~ msgid "effective GID of process"
-#~ msgstr "GID efetivo do processo"
-
-#~ msgid "has_cpu"
-#~ msgstr "has_cpu"
-
-#~ msgid "processor"
-#~ msgstr "processador"
-
-#~ msgid "last_processor"
-#~ msgstr "last_processor"
-
-#~ msgid "XCPU_Flags"
-#~ msgstr "XCPU_Flags"
-
-#~ msgid "SUid"
-#~ msgstr "SUid"
-
-#~ msgid "SGid"
-#~ msgstr "SGid"
-
-#~ msgid "FsUid"
-#~ msgstr "FsUid"
-
-#~ msgid "FsGid"
-#~ msgstr "FsGid"
-
-#~ msgid "NGroups"
-#~ msgstr "NGroups"
-
-#~ msgid "Groups"
-#~ msgstr "Grupos"
-
-#~ msgid "Saved User ID"
-#~ msgstr "ID do Usuário Salvo"
-
-#~ msgid "Saved Group ID"
-#~ msgstr "ID do Grupo Salvo"
-
-#~ msgid "Filesystem User ID"
-#~ msgstr "ID do Sistema de Arquivos"
-
-#~ msgid "Filesystem Group ID"
-#~ msgstr "ID do Grupo do Sistema de Arquivos"
-
-#~ msgid "Number of additional process groups"
-#~ msgstr "Número de grupos adicionais ao processo"
-
-#~ msgid "Additional process groups"
-#~ msgstr "Grupos de processos adicionais"
-
-#~ msgid "Pointer Size"
-#~ msgstr "Tamanho Ponteiro"
-
-#~ msgid "Interface Names"
-#~ msgstr "Nomes da interface"
-
-#~ msgid "Pointer Size on the Server (in bits)"
-#~ msgstr "Tamanho do ponteiro no servidor em bits"
-
-#~ msgid "Boot time"
-#~ msgstr "Hora inicial"
-
-#~ msgid "Boot time (seconds sice epoch)"
-#~ msgstr "Hora inicial (segundos desde 1/1/1970)"
-
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Erro desconhecido de sistema"
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr "Sinal 2 definido pelo usuário"

po/ru.po

@@ -5,14 +5,219 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop-1.0.1\n"
-"POT-Creation-Date: 2000-05-14 17:02+0200\n"
-"PO-Revision-Date: 2000-05-05 19:23+00:00\n"
+"POT-Creation-Date: 2001-03-15 21:42+0300\n"
+"PO-Revision-Date: 2001-03-15 21:46+03:00\n"
 "Last-Translator: Valek Filippov <flpd@mfil.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: examples/smp.c:68
+#, c-format
+msgid "Ticks (%ld per second):"
+msgstr "ôÉËÉ (%ld × ÓÅËÕÎÄÕ):"
+
+#: examples/smp.c:71
+msgid "Total"
+msgstr "÷ÓÅÇÏ"
+
+#: examples/smp.c:71 sysdeps/names/mem.c:47
+msgid "User"
+msgstr "ðÏÌØÚÏ×ÁÔÅÌØ"
+
+#: examples/smp.c:71 sysdeps/names/procuid.c:58
+msgid "Nice"
+msgstr "Nice"
+
+#: examples/smp.c:71
+msgid "Sys"
+msgstr "óÉÓÔ."
+
+#: examples/smp.c:71
+msgid "Idle"
+msgstr "ïÖÉÄÁÎÉÅ"
+
+#: examples/smp.c:73
+#, 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
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "ãðõ %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+
+#: examples/smp.c:94
+msgid "Percent:"
+msgstr "ðÒÏÃÅÎÔ:"
+
+#: examples/smp.c:95
+msgid "Total (%)"
+msgstr "÷ÓÅÇÏ (%)"
+
+#: examples/smp.c:95
+msgid "User (%)"
+msgstr "ðÏÌØÚÏ×ÁÔÅÌØ (%)"
+
+#: examples/smp.c:95
+msgid "Nice (%)"
+msgstr "Nice (%)"
+
+#: examples/smp.c:95
+msgid "Sys (%)"
+msgstr "óÉÓÔ. (%)"
+
+#: examples/smp.c:96
+msgid "Idle (%)"
+msgstr "ðÒÏÓÔ. (%)"
+
+#: examples/smp.c:98
+#, 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
+#, c-format
+msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "ãðõ %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+
+#: examples/smp.c:120
+msgid "Spin:"
+msgstr ""
+
+#: lib/read.c:75
+#, c-format
+msgid "read %d bytes"
+msgstr "ÐÒÏÞÉÔÁÔØ %d ÂÁÊÔ"
+
+#: lib/read_data.c:49
+msgid "read data size"
+msgstr "ÒÁÚÍÅÒ ÐÒÏÞÉÔÁÎÎÙÈ ÄÁÎÎÙÈ"
+
+#: lib/read_data.c:66
+#, c-format
+msgid "read data %d bytes"
+msgstr "ÐÒÏÞÉÔÁÔØ %d ÂÁÊÔ ÄÁÎÎÙÈ"
+
+#: lib/write.c:48
+#, c-format
+msgid "write %d bytes"
+msgstr "ÚÁÐÉÓÁÔØ %d ÂÁÊÔ"
+
+#: 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 "ðÏÌÕÞÅÎÏ ÏÔ inetd"
+
+#: src/daemon/gnuserv.c:454
+msgid "INETD"
+msgstr "INETD"
+
+#: 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"
+msgstr ""
+"ïÛÉÂËÁ × ÐÁÒÁÍÅÔÒÅ %s: %s\n"
+"éÓÐÏÌØÚÕÊÔÅ \"%s --help\", ÞÔÏÂÙ Õ×ÉÄÅÔØ ÐÏÌÎÙÊ ÓÐÉÓÏË ÄÏÐÕÓÔÉÍÙÈ ÐÁÒÁÍÅÔÒÏ× "
+"ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ.\n"
+
+#: support/error.c:109
+msgid "Unknown system error"
+msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
+
+#: support/getopt.c:669
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ÐÁÒÁÍÅÔÒ `%s' ÓÏÍÎÉÔÅÌÅÎ\n"
+
+#: support/getopt.c:693
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ÐÁÒÁÍÅÔÒ `--%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÁÒÇÕÍÅÎÔÏ×\n"
+
+#: support/getopt.c:698
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ÐÁÒÁÍÅÔÒ `%c%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÁÒÇÕÍÅÎÔÏ×\n"
+
+#: support/getopt.c:715 support/getopt.c:888
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ÐÁÒÁÍÅÔÒ `%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ\n"
+
+#. --option
+#: support/getopt.c:744
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ `--%s'\n"
+
+#. +option or -option
+#: support/getopt.c:748
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: support/getopt.c:774
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ÐÁÒÁÍÅÔÒ -- %c\n"
+
+#: support/getopt.c:777
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ -- %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: ÐÁÒÁÍÅÔÒ ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ -- %c\n"
+
+#: support/getopt.c:854
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ÐÁÒÁÍÅÔÒ `-W %s' - ÓÏÍÎÉÔÅÌØÎÙÊ\n"
+
+#: support/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: ÐÁÒÁÍÅÔÒ `-W %s' ÎÅ ÄÏÐÕÓËÁÅÔ ÁÒÇÕÍÅÎÔÏ×\n"
+
 #: sysdeps/names/cpu.c:43
 msgid "Total CPU Time"
 msgstr "ïÂÝÅÅ ×ÒÅÍÑ ãðõ"
@@ -31,7 +236,7 @@ msgstr "
 
 #: sysdeps/names/cpu.c:47
 msgid "CPU Time in the Idle Task"
-msgstr ""
+msgstr "÷ÒÅÍÑ ãðõ × ÒÅÖÉÍÅ ÏÖÉÄÁÎÉÑ"
 
 #: sysdeps/names/cpu.c:48
 msgid "Tick Frequency"
@@ -55,7 +260,7 @@ msgstr "SMP
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr ""
+msgstr "÷ÒÅÍÑ SMP ãðõ × ÒÅÖÉÍÅ ÏÖÉÄÁÎÉÑ"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
@@ -63,19 +268,19 @@ msgstr "
 
 #: sysdeps/names/cpu.c:59 sysdeps/names/cpu.c:65
 msgid "Number of clock ticks the system spent in user mode"
-msgstr "þÉÓÌÏ ÔÉËÏ× ÞÁÓÏ× ÐÒÏ×ÅÄÅÎÎÙÅ ÓÉÓÔÅÍÏÊ × ÐÏÌØÚÏ×ÁÔÅÌØÓËÏÍ ÒÅÖÉÍÅ"
+msgstr "þÉÓÌÏ ÔÉËÏ× ÞÁÓÏ× ÐÒÏ×ÅÄÅÎÎÏÅ ÓÉÓÔÅÍÏÊ × ÒÅÖÉÍÅ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
-msgstr ""
+msgstr "þÉÓÌÏ ÔÉËÏ× ÞÁÓÏ× ÐÒÏ×ÅÄÅÎÎÏÅ ÓÉÓÔÅÍÏÊ × ÒÅÖÉÍÅ ÐÏÌØÚÏ×ÁÔÅÌÑ (nice)"
 
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in system mode"
-msgstr "þÉÓÌÏ ÔÉËÏ× ÞÁÓÏ× ÐÒÏ×ÅÄÅÎÎÙÅ ÓÉÓÔÅÍÏÊ × ÓÉÓÔÅÍÎÏÍ ÒÅÖÉÍÅ"
+msgstr "þÉÓÌÏ ÔÉËÏ× ÞÁÓÏ× ÐÒÏ×ÅÄÅÎÎÏÅ ÓÉÓÔÅÍÏÊ × ÓÉÓÔÅÍÎÏÍ ÒÅÖÉÍÅ"
 
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr ""
+msgstr "þÉÓÌÏ ÔÉËÏ× ÞÁÓÏ× ÐÒÏ×ÅÄÅÎÎÏÅ ÓÉÓÔÅÍÏÊ × ÒÅÖÉÍÅ ÏÖÉÄÁÎÉÑ"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
@@ -161,13 +366,9 @@ msgstr "
 msgid "Cached"
 msgstr "ëÜÛÉÒÏ×ÁÎÏ"
 
-#: sysdeps/names/mem.c:47
-msgid "User"
-msgstr "ðÏÌØÚÏ×ÁÔÅÌØ"
-
 #: sysdeps/names/mem.c:48
 msgid "Locked"
-msgstr ""
+msgstr "úÁÂÌÏËÉÒÏ×ÁÎÏ"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
@@ -199,27 +400,25 @@ msgstr "
 
 #: sysdeps/names/mem.c:60
 msgid "Memory in locked pages in kB"
-msgstr ""
+msgstr "ðÁÍÑÔØ × ÚÁÂÌÏËÉÒÏ×ÁÎÎÙÈ ÓÔÒÁÎÉÃÁÈ × Ëâ"
 
 #: 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
-#, fuzzy
 msgid "Number of list elements"
-msgstr "íÁËÓ. ÞÉÓÌÏ ÓÅÇÍÅÎÔÏ×"
+msgstr "þÉÓÌÏ ÜÌÅÍÅÎÔÏ× ÓÐÉÓËÁ"
 
 #: 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 "ïÂÝÉÊ ÒÁÚÍÅÒ ÇÒÑÚÎÙÈ ÓÔÒÁÎÉÃ"
+msgstr "ïÂÝÉÊ ÒÁÚÍÅÒ ÓÐÉÓËÁ"
 
 #: 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 ""
+msgstr "òÁÚÍÅÒ ÏÄÎÏÇÏ ÜÌÅÍÅÎÔÁ ÓÐÉÓËÁ"
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
@@ -249,41 +448,129 @@ 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 "MTU"
+
+#: 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
+msgid "Packets In"
+msgstr "ðÁËÅÔÏ× ÐÏÌÕÞÅÎÏ"
+
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
+msgid "Packets Out"
+msgstr "ðÁËÅÔÏ× ÏÔÐÒÁ×ÌÅÎÏ"
+
+#: 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 "íÁËÓÉÍÁÌØÎÁÑ ÅÄÉÎÉÃÁ ÐÅÒÅÄÁÞÉ (MTU)"
+
+#: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
+msgid "PPP State"
+msgstr "óÏÓÔÏÑÎÉÅ PPP"
+
+#: sysdeps/names/ppp.c:39
+msgid "Input bytes"
+msgstr "ðÏÌÕÞÅÎÏ ÂÁÊÔ"
+
+#: sysdeps/names/ppp.c:40
+msgid "Output bytes"
+msgstr "ïÔÐÒÁ×ÌÅÎÏ ÂÁÊÔ"
+
+#: sysdeps/names/ppp.c:46
+msgid "Number of input bytes"
+msgstr "þÉÓÌÏ ÐÏÌÕÞÅÎÎÙÈ ÂÁÊÔ"
+
+#: sysdeps/names/ppp.c:47
+msgid "Number of output bytes"
+msgstr "þÉÓÌÏ ÏÔÐÒÁ×ÌÅÎÎÙÈ ÂÁÊÔ"
+
+#: sysdeps/names/procargs.c:38 sysdeps/names/procmem.c:47
+msgid "Size"
+msgstr "òÁÚÍÅÒ"
+
+#: sysdeps/names/procargs.c:43
+msgid "Length in bytes of the returned string."
+msgstr "äÌÉÎÁ ×ÏÚ×ÒÁÝÅÎÎÏÊ ÓÔÒÏËÉ × ÂÁÊÔÁÈ."
+
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
-msgstr ""
+msgstr "K_Flags"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Min_Flt"
-msgstr ""
+msgstr "Min_Flt"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Maj_Flt"
-msgstr ""
+msgstr "Maj_Flt"
 
 #: sysdeps/names/prockernel.c:42
 msgid "CMin_Flt"
-msgstr ""
+msgstr "CMin_Flt"
 
 #: sysdeps/names/prockernel.c:43
 msgid "CMaj_Flt"
-msgstr ""
+msgstr "CMaj_Flt"
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_ESP"
-msgstr ""
+msgstr "KStk_ESP"
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_EIP"
-msgstr ""
+msgstr "KStk_EIP"
 
 #: sysdeps/names/prockernel.c:43
 msgid "NWChan"
-msgstr ""
+msgstr "NWChan"
 
 #: sysdeps/names/prockernel.c:44
 msgid "WChan"
-msgstr ""
+msgstr "WChan"
 
 #. K_Flags
 #: sysdeps/names/prockernel.c:50
@@ -332,7 +619,7 @@ msgstr ""
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr ""
+msgstr "ôÅËÕÝÉÊ EIP (32-ÂÉÔÎÙÊ ÕËÁÚÁÔÅÌØ ÉÎÓÔÒÕËÃÉÉ)."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -348,10 +635,6 @@ msgstr ""
 msgid "This is the textual name of the `nwchan' field."
 msgstr "üÔÏ ÔÅËÓÔÏ×ÏÅ ÎÁÚ×ÁÎÉÅ ÐÏÌÑ `nwchan'."
 
-#: sysdeps/names/procmem.c:47
-msgid "Size"
-msgstr "òÁÚÍÅÒ"
-
 #: sysdeps/names/procmem.c:47
 msgid "Virtual"
 msgstr "÷ÉÒÔÕÁÌØÎÏÊ"
@@ -366,11 +649,11 @@ msgstr "
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size"
-msgstr ""
+msgstr "òÁÚÍÅÒ ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÁ"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr ""
+msgstr "ðÒÅÄÅÌ ÒÁÚÍÅÒÁ ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÁ"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
@@ -382,11 +665,11 @@ msgstr "
 
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr ""
+msgstr "þÉÓÌÏ ÒÅÚÉÄÅÎÔÎÙÈ (ÎÅ ÐÏÄËÁÞÉ×ÁÅÍÙÈ) ÎÁÂÏÒÏ× ÓÔÒÁÎÉÃ"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
-msgstr ""
+msgstr "þÉÓÌÏ ÓÔÒÁÎÉÃ ÒÁÚÄÅÌÑÅÍÏÊ (mmap'd) ÐÁÍÑÔÉ"
 
 #: sysdeps/names/procmem.c:57
 msgid ""
@@ -399,7 +682,7 @@ msgstr ""
 #: sysdeps/names/procmem.c:62
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr ""
+msgstr "ôÅËÕÝÉÊ ÐÒÅÄÅÌ × ÂÁÊÔÁÈ ÄÌÑ rss ÐÒÏÃÅÓÓÁ (ÏÂÙÞÎÏ 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
@@ -471,7 +754,7 @@ msgstr "
 
 #: sysdeps/names/procsignal.c:40
 msgid "Blocked"
-msgstr ""
+msgstr "úÁÂÌÏËÉÒÏ×ÁÎÏ"
 
 #: sysdeps/names/procsignal.c:40
 msgid "SigIgnore"
@@ -483,7 +766,7 @@ msgstr "SigCatch"
 
 #: sysdeps/names/procsignal.c:45
 msgid "Mask of pending signals"
-msgstr ""
+msgstr "íÁÓËÁ ÏÖÉÄÁÅÍÙÈ ÓÉÇÎÁÌÏ×"
 
 #: sysdeps/names/procsignal.c:46
 msgid "Mask of blocked signals"
@@ -515,21 +798,19 @@ msgstr "GID"
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
-msgstr ""
+msgstr "ïÓÎÏ×ÎÏÅ ÉÍÑ ÉÓÐÏÌÎÑÅÍÏÇÏ ÆÁÊÌÁ × ×ÙÚÏ×Å exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
 msgstr "ïÄÎÏÓÉÍ×ÏÌØÎÙÊ ËÏÄ ÓÏÓÔÏÑÎÉÑ ÐÒÏÃÅÓÓÁ (S=sleeping)"
 
 #: sysdeps/names/procstate.c:47
-#, fuzzy
 msgid "UID of process"
-msgstr "ÒÅÁÌØÎÙÊ UID ÐÒÏÃÅÓÓÁ"
+msgstr "UID ÐÒÏÃÅÓÓÁ"
 
 #: sysdeps/names/procstate.c:48
-#, fuzzy
 msgid "GID of process"
-msgstr "ÒÅÁÌØÎÙÊ GID ÐÒÏÃÅÓÓÁ"
+msgstr "GID ÐÒÏÃÅÓÓÁ"
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
@@ -561,7 +842,7 @@ msgstr "TimeOut"
 
 #: sysdeps/names/proctime.c:45
 msgid "It_Real_Value"
-msgstr ""
+msgstr "üÔÏ_ÄÅÊÓÔ×ÉÔÅÌØÎÏÅ_ÚÎÁÞÅÎÉÅ"
 
 #: sysdeps/names/proctime.c:46
 msgid "Frequency"
@@ -665,10 +946,6 @@ msgstr "TPGid"
 msgid "Priority"
 msgstr "ðÒÉÏÒÉÔÅÔ"
 
-#: sysdeps/names/procuid.c:58
-msgid "Nice"
-msgstr "Nice"
-
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
 msgstr "ID ÐÏÌØÚÏ×ÁÔÅÌÑ"
@@ -711,7 +988,7 @@ msgstr "ID
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr ""
+msgstr "ðÒÉÏÒÉÔÅÔ ÐÌÁÎÉÒÏ×ÁÎÉÑ ÑÄÒÁ"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
@@ -791,19 +1068,19 @@ msgstr "
 
 #: sysdeps/names/swap.c:42
 msgid "Page In"
-msgstr ""
+msgstr "÷ÈÏÄÎÙÅ ÓÔÒÁÎÉÃÙ"
 
 #: sysdeps/names/swap.c:43
 msgid "Page Out"
-msgstr ""
+msgstr "÷ÙÈÏÄÎÙÅ cÔÒÁÎÉÃÙ"
 
 #: sysdeps/names/swap.c:51
 msgid "Total number of swap pages that have been brought in since system boot"
-msgstr ""
+msgstr "ïÂÝÅÅ ÞÉÓÌÏ ×ÈÏÄÎÙÈ ÓÔÒÁÎÉà ÐÏÄËÁÞËÉ ÉÓÐÏÌØÚÏ×ÁÎÎÙÈ Ó ÍÏÍÅÎÔÁ ÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ"
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
-msgstr ""
+msgstr "ïÂÝÅÅ ÞÉÓÌÏ ×ÙÈÏÄÎÙÈ ÓÔÒÁÎÉà ÐÏÄËÁÞËÉ ÉÓÐÏÌØÚÏ×ÁÎÎÙÈ Ó ÍÏÍÅÎÔÁ ÚÁÇÒÕÚËÉ ÓÉÓÔÅÍÙ"
 
 #: sysdeps/names/sysdeps.c:49 sysdeps/names/sysdeps.c:76
 msgid "Server Features"
@@ -823,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"
@@ -835,11 +1112,11 @@ msgstr "
 
 #: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Message Queue Limits"
-msgstr ""
+msgstr "ðÒÅÄÅÌÙ ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ"
 
 #: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Semaphore Set Limits"
-msgstr ""
+msgstr "ðÒÅÄÅÌÙ ÎÁÂÏÒÁ ÓÅÍÁÆÏÒÏ×"
 
 #: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "List of running Processes"
@@ -867,7 +1144,7 @@ msgstr "
 
 #: sysdeps/names/sysdeps.c:64 sysdeps/names/sysdeps.c:91
 msgid "Process Kernel Data information"
-msgstr ""
+msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÄÁÎÎÙÈ ÑÄÒÁ ÐÒÏÃÅÓÓÁ"
 
 #: sysdeps/names/sysdeps.c:65 sysdeps/names/sysdeps.c:92
 msgid "Process Segment information"
@@ -907,11 +1184,11 @@ msgstr "
 
 #: sysdeps/names/uptime.c:38
 msgid "Uptime"
-msgstr ""
+msgstr "÷ÒÅÍÑ ÒÁÂÏÔÙ"
 
 #: sysdeps/names/uptime.c:39
 msgid "Idletime"
-msgstr ""
+msgstr "÷ÒÅÍÑ ÏÖÉÄÁÎÉÑ"
 
 #: sysdeps/names/uptime.c:44
 msgid "Time in seconds since system boot"
@@ -919,254 +1196,128 @@ msgstr "
 
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
+msgstr "÷ÒÅÍÑ × ÓÅËÕÎÄÁÈ ÐÏÔÒÁÞÅÎÎÏÅ ÓÉÓÔÅÍÏÊ ÎÁ ÏÖÉÄÁÎÉÅ Ó ÍÏÍÅÎÔÁ ÚÁÇÒÕÚËÉ"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
+msgid "Hangup"
+msgstr "÷ÙËÌÀÞÉÔØ"
+
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
+msgid "Interrupt"
+msgstr "ðÒÅÒÙ×ÁÔØ"
+
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
+msgid "Quit"
+msgstr "÷ÙÈÏÄ"
+
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
+msgid "Illegal instruction"
+msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ÉÎÓÔÒÕËÃÉÑ"
+
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
+msgid "Trace trap"
+msgstr "úÁÈ×ÁÔ ÔÒÁÓÓÉÒÏ×ËÉ"
+
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
+msgid "Abort"
+msgstr "ðÒÅËÒÁÔÉÔØ"
+
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
+msgid "EMT error"
+msgstr "ïÛÉÂËÁ EMT"
+
+#: 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
+msgid "Bus error"
+msgstr "ïÛÉÂËÁ ÛÉÎÙ"
+
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
+msgid "Segmentation violation"
+msgstr "îÁÒÕÛÅÎÉÅ ÓÅÇÍÅÎÔÁÃÉÉ"
+
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
+msgid "Bad argument to system call"
+msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ × ÓÉÓÔÅÍÎÏÍ ×ÙÚÏ×Å"
+
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
+msgid "Broken pipe"
+msgstr "îÅÉÓÐÒÁ×ÎÙÊ ËÁÎÁÌ"
+
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
+msgid "Alarm clock"
 msgstr ""
 
-#: support/error.c:109
-msgid "Unknown system error"
-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
+msgid "Termination"
+msgstr "ïÂÒÙ×"
 
-#: support/getopt.c:669
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ÐÁÒÁÍÅÔÒ `%s' ÓÏÍÎÉÔÅÌÅÎ\n"
-
-#: support/getopt.c:693
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ÐÁÒÁÍÅÔÒ `--%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÁÒÇÕÍÅÎÔÏ×\n"
-
-#: support/getopt.c:698
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ÐÁÒÁÍÅÔÒ `%c%s' ÎÅ ÄÏÐÕÓËÁÅÔ ÁÒÇÕÍÅÎÔÏ×\n"
-
-#: support/getopt.c:715 support/getopt.c:888
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ÐÁÒÁÍÅÔÒ `%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ\n"
-
-#. --option
-#: support/getopt.c:744
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ `--%s'\n"
-
-#. +option or -option
-#: support/getopt.c:748
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ `%c%s'\n"
-
-#. 1003.2 specifies the format of this message.
-#: support/getopt.c:774
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ÐÁÒÁÍÅÔÒ -- %c\n"
-
-#: support/getopt.c:777
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ -- %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: ÐÁÒÁÍÅÔÒ ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ -- %c\n"
-
-#: support/getopt.c:854
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ÐÁÒÁÍÅÔÒ `-W %s' - ÓÏÍÎÉÔÅÌØÎÙÊ\n"
-
-#: support/getopt.c:872
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ÐÁÒÁÍÅÔÒ `-W %s' ÎÅ ÄÏÐÕÓËÁÅÔ ÁÒÇÕÍÅÎÔÏ×\n"
-
-#: lib/read.c:75
-#, c-format
-msgid "read %d bytes"
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
+msgid "Urgent condition on socket"
 msgstr ""
 
-#: lib/read_data.c:49
-msgid "read data size"
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
+msgid "Stop"
+msgstr "ïÓÔÁÎÏ×ÉÔØ"
+
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
+msgid "Keyboard stop"
+msgstr "ïÓÔÁÎÏ× ËÌÁ×ÉÁÔÕÒÙ"
+
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
+msgid "Continue"
+msgstr "ðÒÏÄÏÌÖÅÎÉÅ"
+
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
+msgid "Child status has changed"
+msgstr "óÏÓÔÏÑÎÉÅ ÐÏÔÏÍËÁ ÂÙÌÏ ÉÚÍÅÎÅÎÏ"
+
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
+msgid "Background read from tty"
+msgstr "æÏÎÏ×ÏÅ ÞÔÅÎÉÅ ÉÚ tty"
+
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
+msgid "Background write to tty"
+msgstr "æÏÎÏ×ÁÑ ÚÁÐÉÓØ × tty"
+
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
+msgid "I/O now possible"
+msgstr "óÅÊÞÁÓ ×ÏÚÍÏÖÅÎ ××ÏÄ/×Ù×ÏÄ"
+
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
+msgid "CPU limit exceeded"
+msgstr "ðÒÅ×ÙÛÅÎ ÐÒÅÄÅÌ ãðõ"
+
+#: 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 ""
 
-#: lib/read_data.c:66
-#, c-format
-msgid "read data %d bytes"
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
+msgid "Profiling alarm clock"
 msgstr ""
 
-#: lib/write.c:48
-#, c-format
-msgid "write %d bytes"
-msgstr ""
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
+msgid "Window size change"
+msgstr "éÚÍÅÎÅÎÉÅ ÒÁÚÍÅÒÁ ÏËÎÁ"
 
-#: src/daemon/gnuserv.c:448
-msgid "Enable debugging"
-msgstr ""
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
+msgid "Information request"
+msgstr "úÁÐÒÏÓ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: src/daemon/gnuserv.c:448
-msgid "DEBUG"
-msgstr ""
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
+msgid "User defined signal 1"
+msgstr "óÉÇÎÁÌ ÐÏÌØÚÏ×ÁÔÅÌÑ 1"
 
-#: 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"
-msgstr ""
-
-#~ msgid "SMP CPU Flags"
-#~ msgstr "SMP ÆÌÁÇÉ ãðõ"
-
-#~ msgid "Start_Data"
-#~ msgstr "îÁÞÁÌÏ_ÄÁÎÎÙÈ"
-
-#~ msgid "End_Data"
-#~ msgstr "ëÏÎÅÃ_ÄÁÎÎÙÈ"
-
-#~ msgid "Start_MMap"
-#~ msgstr "îÁÞÁÌÏ_MMAP"
-
-#~ msgid "Arg_Start"
-#~ msgstr "îÁÞÁÌÏ_ÁÒÇÕÍÅÎÔÏ×"
-
-#~ msgid "Arg_End"
-#~ msgstr "ëÏÎÅÃ_ÁÒÇÕÍÅÎÔÏ×"
-
-#~ msgid "Env_Start"
-#~ msgstr "îÁÞÁÌÏ_ÏËÒÕÖÅÎÉÑ"
-
-#~ msgid "Env_End"
-#~ msgstr "ëÏÎÅÃ_ÏËÒÕÖÅÎÉÑ"
-
-#~ msgid "Address of beginning of data segment"
-#~ msgstr "áÄÒÅÓ ÎÁÞÁÌÁ ÓÅÇÍÅÎÔÁ ÄÁÎÎÙÈ"
-
-#~ msgid "Address of end of data segment"
-#~ msgstr "áÄÒÅÓ ËÏÎÃÁ ÓÅÇÍÅÎÔÁ ÄÁÎÎÙÈ"
-
-#~ msgid "RUID"
-#~ msgstr "RUID"
-
-#~ msgid "RGID"
-#~ msgstr "RGID"
-
-#~ msgid "Processor"
-#~ msgstr "ðÒÏÃÅÓÓÏÒ"
-
-#~ msgid "Last Processor"
-#~ msgstr "ðÏÓÌÅÄÎÉÊ ÐÒÏÃÅÓÓÏÒ"
-
-#~ msgid "effective UID of process"
-#~ msgstr "ÜÆÆÅËÔÉ×ÎÙÊ UID ÐÒÏÃÅÓÓÁ"
-
-#~ msgid "effective GID of process"
-#~ msgstr "ÜÆÆÅËÔÉ×ÎÙÊ GID ÐÒÏÃÅÓÓÁ"
-
-#~ msgid "processor"
-#~ msgstr "ÐÒÏÃÅÓÓÏÒ"
-
-#~ msgid "last_processor"
-#~ msgstr "ÐÏÓÌÅÄÎÉÊ_ÐÒÏÃÅÓÓÏÒ"
-
-#~ msgid "XCPU_Flags"
-#~ msgstr "XCPU_Flags"
-
-#~ msgid "SUid"
-#~ msgstr "SUid"
-
-#~ msgid "SGid"
-#~ msgstr "SGid"
-
-#~ msgid "FsUid"
-#~ msgstr "FsUid"
-
-#~ msgid "NGroups"
-#~ msgstr "NçÒÕÐÐÙ"
-
-#~ msgid "Groups"
-#~ msgstr "çÒÕÐÐÙ"
-
-#~ msgid "Saved User ID"
-#~ msgstr "óÏÈÒÁÎÅÎÎÙÊ ID ÐÏÌØÚÏ×ÁÔÅÌÑ"
-
-#~ msgid "Saved Group ID"
-#~ msgstr "óÏÈÒÁÎÅÎÎÙÊ ID ÇÒÕÐÐÙ"
-
-#~ msgid "Filesystem User ID"
-#~ msgstr "ID ÐÏÌØÚÏ×ÁÔÅÌÑ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
-
-#~ msgid "Filesystem Group ID"
-#~ msgstr "ID ÇÒÕÐÐÙ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ"
-
-#~ msgid "Number of additional process groups"
-#~ msgstr "þÉÓÌÏ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÇÒÕÐÐ ÐÒÏÃÅÓÓÁ"
-
-#~ msgid "Additional process groups"
-#~ msgstr "äÏÐÏÌÎÉÔÅÌØÎÙÅ ÇÒÕÐÐÙ ÐÒÏÃÅÓÓÁ"
-
-#~ msgid "Pointer Size"
-#~ msgstr "òÁÚÍÅÒ ÕËÁÚÁÔÅÌÑ"
-
-#~ msgid "Interface Names"
-#~ msgstr "îÁÚ×ÁÎÉÑ ÉÎÔÅÒÆÅÊÓÏ×"
-
-#~ msgid "Boot time (seconds sice epoch)"
-#~ msgstr "÷ÒÅÍÑ ÚÁÇÒÕÚËÉ (× ÓÅËÕÎÄÁÈ ÓÞÉÔÁÑ ÏÔ üÐÏÈÉ)"
-
-#~ msgid "No error"
-#~ msgstr "îÅÔ ÏÛÉÂÏË"
-
-#~ msgid "Unknown error"
-#~ msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
-
-#~ msgid "Invalid argument"
-#~ msgstr "îÅ×ÅÒÎÙÊ ÁÒÇÕÍÅÎÔ"
-
-#~ msgid "No such parameter"
-#~ msgstr "îÅÔ ÔÁËÏÇÏ ÐÁÒÁÍÅÔÒÁ"
-
-#~ msgid "Attempted to modify a read-only value"
-#~ msgstr "ðÏÐÙÔËÁ ÉÚÍÅÎÉÔØ ÚÎÁÞÅÎÉÅ ÐÒÅÄÎÁÚÎÁÞÅÎÎÏÅ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ"
-
-#~ msgid "Parameter size mismatch"
-#~ msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ ÒÁÚÍÅÒÁ ÐÁÒÁÍÅÔÒÁ"
-
-#~ msgid "Communication with LibGTop server failed"
-#~ msgstr "îÅ ÕÄÁÌÏÓØ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ LibGTop"
-
-#~ msgid "No such process"
-#~ msgstr "îÅÔ ÔÁËÏÇÏ ÐÒÏÃÅÓÓÁ"
-
-#~ msgid "No kernel support"
-#~ msgstr "îÅÔ ÐÏÄÄÅÒÖËÉ ÑÄÒÁ"
-
-#~ msgid "Incompatible kernel version"
-#~ msgstr "îÅÓÏ×ÍÅÓÔÉÍÁÑ ×ÅÒÓÉÑ ÑÄÒÁ"
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
+msgid "User defined signal 2"
+msgstr "óÉÇÎÁÌ ÐÏÌØÚÏ×ÁÔÅÌÑ 2"

po/sv.po

@@ -8,13 +8,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.3\n"
-"POT-Creation-Date: 2000-11-12 02:15+0100\n"
+"POT-Creation-Date: 2001-02-13 13:30+0100\n"
 "PO-Revision-Date: 1999-09-16 23:36+0200\n"
 "Last-Translator: Tomas Ögren <stric@ing.umu.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: examples/smp.c:68
 #, c-format

po/uk.po

@@ -1,11 +1,10 @@
-# Ukrainian translation for Libgtop.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Yuri Syrota <rasta@renome.rovno.ua>, 2000.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.1.3\n"
-"POT-Creation-Date: 2000-11-20 13:18+0200\n"
+"POT-Creation-Date: 2001-03-28 15:25+0300\n"
 "PO-Revision-Date: 2000-01-13 17:57+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -92,26 +91,26 @@ msgstr "
 
 #: examples/smp.c:120
 msgid "Spin:"
-msgstr ""
+msgstr "óЦÎ:"
 
 #: lib/read.c:75
 #, c-format
 msgid "read %d bytes"
-msgstr ""
+msgstr "ÚÞÉÔÕ×ÁÎÎÑ %d ÂÁÊÔ¦×"
 
 #: lib/read_data.c:49
 msgid "read data size"
-msgstr ""
+msgstr "ÚÞÉÔÕ×ÁÎÎÑ ÂÌÏËÕ ÄÁÎÉÈ"
 
 #: lib/read_data.c:66
 #, c-format
 msgid "read data %d bytes"
-msgstr ""
+msgstr "ÚÞÉÔÕ×ÁÎÎÑ %d ÂÁÊÔ¦× ÄÁÎÉÈ"
 
 #: lib/write.c:48
 #, c-format
 msgid "write %d bytes"
-msgstr ""
+msgstr "ÚÁÐÉÓ %d ÂÁÊÔ¦×"
 
 #: src/daemon/gnuserv.c:448
 msgid "Enable debugging"
@@ -243,23 +242,23 @@ msgstr "
 
 #: sysdeps/names/cpu.c:49
 msgid "SMP Total CPU Time"
-msgstr "úÁÇÁÌØÎÉÊ ÞÁÓ ×Ó¦È ãð"
+msgstr "úÁÇÁÌØÎÉÊ SMP-ÞÁÓ ãð"
 
 #: sysdeps/names/cpu.c:50
 msgid "SMP CPU Time in User Mode"
-msgstr "þÁÓ ×Ó¦È ãð × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ"
+msgstr "SMP-ÞÁÓ ãð × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ"
 
 #: sysdeps/names/cpu.c:51
 msgid "SMP CPU Time in User Mode (nice)"
-msgstr "þÁÓ ×Ó¦È ãð × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ (ÚÁÍÏ×ÌÅÎÏ)"
+msgstr "SMP-ÞÁÓ ãð × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ (ÚÁÍÏ×ÌÅÎÏ)"
 
 #: sysdeps/names/cpu.c:52
 msgid "SMP CPU Time in System Mode"
-msgstr "þÁÓ ×Ó¦È ãð × ÓÉÓÔÅÍÎÏÍÕ ÒÅÖÉͦ"
+msgstr "SMP-ÞÁÓ ãð × ÓÉÓÔÅÍÎÏÍÕ ÒÅÖÉͦ"
 
 #: sysdeps/names/cpu.c:53
 msgid "SMP CPU Time in the Idle Task"
-msgstr "þÁÓ ÐÒÏÓÔÏÀ ×Ó¦È ãð"
+msgstr "SMP-ÞÁÓ ÐÒÏÓÔÏÀ ãð"
 
 #: sysdeps/names/cpu.c:58 sysdeps/names/cpu.c:64
 msgid "Number of clock ticks since system boot"
@@ -268,18 +267,21 @@ msgstr "
 #: sysdeps/names/cpu.c:59 sysdeps/names/cpu.c:65
 msgid "Number of clock ticks the system spent in user mode"
 msgstr ""
+"ë¦ÌØ˦ÓÔØ ÔÁËÔ¦× ÇÏÄÉÎÎÉËÁ ÐÒÏ×ÅÄÅÎÉÈ ÓÉÓÔÅÍÏÀ × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ"
 
 #: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks the system spent in user mode (nice)"
 msgstr ""
+"ë¦ÌØ˦ÓÔØ ÔÁËÔ¦× ÇÏÄÉÎÎÉËÁ ÐÒÏ×ÅÄÅÎÉÈ ÓÉÓÔÅÍÏÀ × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ "
+"(nice)"
 
 #: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in system mode"
-msgstr ""
+msgstr "ë¦ÌØ˦ÓÔØ ÔÁËÔ¦× ÇÏÄÉÎÎÉËÁ ÐÒÏ×ÅÄÅÎÉÈ ÓÉÓÔÅÍÏÀ × ÓÉÓÔÅÍÎÏÍÕ ÒÅÖÉͦ"
 
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr ""
+msgstr "ë¦ÌØ˦ÓÔØ ÔÁËÔ¦× ÇÏÄÉÎÎÉËÁ ÐÒÏ×ÅÄÅÎÉÈ ÓÉÓÔÅÍÏÀ × ÏÞ¦ËÕ×ÁÎΦ"
 
 #: sysdeps/names/cpu.c:63
 msgid "Tick frequency (default is 100)"
@@ -331,7 +333,7 @@ msgstr "
 
 #: sysdeps/names/loadavg.c:47
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr ""
+msgstr "ë¦ÌØ˦ÓÔØ ÚÁ×ÄÁÎØ ÚÁÐÕÝÅÎÉÈ ÏÄÎÏÞÁÓÎÏ × ÓÒÅÄÎØÏÍÕ ÚÁ 1, 5 ¦ 15 È×ÉÌÉÎ"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of tasks currently running"
@@ -363,11 +365,11 @@ msgstr "
 
 #: sysdeps/names/mem.c:46
 msgid "Cached"
-msgstr ""
+msgstr "ëÅÛÏ×ÁÎÏ"
 
 #: sysdeps/names/mem.c:48
 msgid "Locked"
-msgstr ""
+msgstr "âÌÏËÏ×ÁÎÏ"
 
 #: sysdeps/names/mem.c:53
 msgid "Total physical memory in kB"
@@ -391,7 +393,7 @@ msgstr "
 
 #: sysdeps/names/mem.c:58
 msgid "Size of cached memory in kB"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ËÅÛÏ×ÁÎϧ ÐÁÍ'ÑÔ¦ × ëÂ"
 
 #: sysdeps/names/mem.c:59
 msgid "Memory used from user processes in kB"
@@ -421,7 +423,7 @@ msgstr "
 
 #: sysdeps/names/msg_limits.c:40 sysdeps/names/msg_limits.c:51
 msgid "Size in kilobytes of message pool"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ÎÁËÏÐÉÞÕ×ÁÞÁ ÐÏצÄÏÍÌÅÎØ × ëÂ"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Number of entries in message map"
@@ -437,7 +439,7 @@ msgstr "
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Max queues system wide"
-msgstr ""
+msgstr "íÁËÓÉÍÁÌØÎÁ ˦ÌØ˦ÓÔØ ÞÅÒÇ × ÓÉÓÔÅͦ"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Message segment size"
@@ -449,11 +451,11 @@ msgstr "
 
 #: sysdeps/names/netload.c:45 sysdeps/names/netload.c:63
 msgid "Interface Flags"
-msgstr ""
+msgstr "ïÚÎÁËÉ ¦ÎÔÅÒÆÅÊÓÁ"
 
 #: sysdeps/names/netload.c:46
 msgid "MTU"
-msgstr ""
+msgstr "MTU"
 
 #: sysdeps/names/netload.c:47 sysdeps/names/netload.c:65
 msgid "Subnet"
@@ -505,7 +507,7 @@ msgstr "
 
 #: sysdeps/names/netload.c:64
 msgid "Maximum Transfer Unit"
-msgstr ""
+msgstr "íÁËÓÉÍÁÌØÎÁ ÏÄÉÎÉÃÑ ÐÅÒÅÄÁÞ¦"
 
 #: sysdeps/names/ppp.c:38 sysdeps/names/ppp.c:45
 msgid "PPP State"
@@ -537,39 +539,39 @@ msgstr "
 
 #: sysdeps/names/prockernel.c:42
 msgid "K_Flags"
-msgstr ""
+msgstr "K_Flags"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Min_Flt"
-msgstr ""
+msgstr "Min_Flt"
 
 #: sysdeps/names/prockernel.c:42
 msgid "Maj_Flt"
-msgstr ""
+msgstr "Maj_Flt"
 
 #: sysdeps/names/prockernel.c:42
 msgid "CMin_Flt"
-msgstr ""
+msgstr "CMin_Flt"
 
 #: sysdeps/names/prockernel.c:43
 msgid "CMaj_Flt"
-msgstr ""
+msgstr "CMaj_Flt"
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_ESP"
-msgstr ""
+msgstr "KStk_ESP"
 
 #: sysdeps/names/prockernel.c:43
 msgid "KStk_EIP"
-msgstr ""
+msgstr "KStk_EIP"
 
 #: sysdeps/names/prockernel.c:43
 msgid "NWChan"
-msgstr ""
+msgstr "NWChan"
 
 #: sysdeps/names/prockernel.c:44
 msgid "WChan"
-msgstr ""
+msgstr "WChan"
 
 #. K_Flags
 #: sysdeps/names/prockernel.c:50
@@ -618,7 +620,7 @@ msgstr ""
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:74
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr ""
+msgstr "ðÏÔÏÞÎÉÊ EIP (32-¦ÔÎÉÊ ×ËÁÚ¦×ÎÉË ÎÁ ¦ÎÓÔÒÕËæ§)."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:76
@@ -636,23 +638,23 @@ 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"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÕ"
 
 #: sysdeps/names/procmem.c:48
 msgid "Resident Set Size Limit"
-msgstr ""
+msgstr "ïÂÍÅÖÅÎÎÑ ÒÏÚͦÒÕ ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÕ"
 
 #: sysdeps/names/procmem.c:53
 msgid "Total # of pages of memory"
@@ -664,11 +666,11 @@ msgstr "
 
 #: sysdeps/names/procmem.c:55
 msgid "Number of resident set (non-swapped) pages"
-msgstr ""
+msgstr "ë¦ÌØ˦ÓÔØ ÓÔÏÒ¦ÎÏË ÒÅÚÉÄÅÎÔÎÉÈ ÎÁÂÏÒ¦× (ÎÅ Ó×ÏÐÕÀÔØÓÑ)"
 
 #: sysdeps/names/procmem.c:56
 msgid "Number of pages of shared (mmap'd) memory"
-msgstr ""
+msgstr "ë¦ÌØ˦ÓÔØ ÓÔÏÒ¦ÎÏË ËÏÌÅËÔÉ×Îϧ ÐÁÍ'ÑÔ¦ (mmap)"
 
 #: sysdeps/names/procmem.c:57
 msgid ""
@@ -685,55 +687,55 @@ msgstr ""
 
 #: sysdeps/names/procsegment.c:42
 msgid "Text_RSS"
-msgstr ""
+msgstr "òòî_ÔÅËÓÔÕ"
 
 #: sysdeps/names/procsegment.c:42
 msgid "ShLib_RSS"
-msgstr ""
+msgstr "òòî_ëÏÌâ¦Â"
 
 #: sysdeps/names/procsegment.c:42
 msgid "Data_RSS"
-msgstr ""
+msgstr "òòî_ÄÁÎÉÈ"
 
 #: sysdeps/names/procsegment.c:42
 msgid "Stack_RSS"
-msgstr ""
+msgstr "òòî_ÓÔÅËÕ"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Dirty Size"
-msgstr ""
+msgstr "âÒÕÄÎÉÊ ÒÏÚͦÒ"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Code"
-msgstr ""
+msgstr "ðÏÞÁÔÏË_ËÏÄÕ"
 
 #: sysdeps/names/procsegment.c:43
 msgid "End_Code"
-msgstr ""
+msgstr "ë¦ÎÅÃØ_ËÏÄÕ"
 
 #: sysdeps/names/procsegment.c:43
 msgid "Start_Stack"
-msgstr ""
+msgstr "ðÏÞÁÔÏË_ÓÔÅËÕ"
 
 #: sysdeps/names/procsegment.c:48
 msgid "Text resident set size"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ÎÁÂÏÒÕ ÒÅÚÉÄÅÎÔÎÏÇÏ ÔÅËÓÔÕ"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Shared-Lib resident set size"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÕ ËÏÌÅËÔÉ×ÎÉÈ Â¦Â̦ÏÔÅË"
 
 #: sysdeps/names/procsegment.c:50
 msgid "Data resident set size"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÕ ÄÁÎÉÈ"
 
 #: sysdeps/names/procsegment.c:51
 msgid "Stack resident set size"
-msgstr ""
+msgstr "òÏÚÍ¦Ò ÒÅÚÉÄÅÎÔÎÏÇÏ ÎÁÂÏÒÕ ÓÔÅËÕ"
 
 #: sysdeps/names/procsegment.c:52
 msgid "Total size of dirty pages"
-msgstr ""
+msgstr "úÁÇÁÌØÎÉÊ ÒÏÚÍ¦Ò ÂÒÕÄÎÉÈ ÓÔÏÒ¦ÎÏË"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Address of beginning of code segment"
@@ -745,7 +747,7 @@ msgstr "
 
 #: sysdeps/names/procsegment.c:55
 msgid "Address of the bottom of stack segment"
-msgstr ""
+msgstr "áÄÒÅÓÁ ÎÉÖÎØϧ ÍÅÖ¦ ÓÅ­ÍÅÎÔÁ ÓÔÅËÕ"
 
 #: sysdeps/names/procsignal.c:40
 msgid "Signal"
@@ -757,27 +759,27 @@ 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"
-msgstr ""
+msgstr "íÁÓËÁ ÓÉ­ÎÁ̦×, ÝÏ ÏÞ¦ËÕÀÔØÓÑ"
 
 #: sysdeps/names/procsignal.c:46
 msgid "Mask of blocked signals"
-msgstr ""
+msgstr "íÁÓËÁ ÓÉ­ÎÁ̦×, ÝÏ ÂÌÏËÕÀÔØÓÑ"
 
 #: sysdeps/names/procsignal.c:47
 msgid "Mask of ignored signals"
-msgstr ""
+msgstr "íÁÓËÁ ÓÉ­ÎÁ̦×, ÝÏ ¦­ÎÏÒÕÀÔØÓÑ"
 
 #: sysdeps/names/procsignal.c:48
 msgid "Mask of caught signals"
-msgstr ""
+msgstr "íÁÓËÁ ÓÉ­ÎÁ̦×, ÝÏ ÐÅÒÅÈÏÐÌÀÀÔØÓÑ"
 
 #: sysdeps/names/procstate.c:40
 msgid "Cmd"
@@ -797,11 +799,11 @@ msgstr "GID"
 
 #: sysdeps/names/procstate.c:45
 msgid "Basename of executable file in call to exec()"
-msgstr ""
+msgstr "ÎÁÚ×Á ×ÉËÏÎÕ×ÁÎÏÇÏ ÆÁÊÌÕ × ÆÕÎËʦ§ exec()"
 
 #: sysdeps/names/procstate.c:46
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr ""
+msgstr "ïÄÎÏÓÉÍ×ÏÌØÎÉÊ ËÏÄ ÓÔÁÎÕ ÐÒÏÃÅÓÕ (S=ÐÒÉÓÐÁÎÉÊ)"
 
 #: sysdeps/names/procstate.c:47
 msgid "UID of process"
@@ -813,19 +815,19 @@ msgstr "GID
 
 #: sysdeps/names/proctime.c:44
 msgid "Start_Time"
-msgstr ""
+msgstr "þÁÓ_ÚÁÐÕÓËÕ"
 
 #: sysdeps/names/proctime.c:44
 msgid "RTime"
-msgstr ""
+msgstr "äþÁÓ"
 
 #: sysdeps/names/proctime.c:44
 msgid "UTime"
-msgstr ""
+msgstr "ëþÁÓ"
 
 #: sysdeps/names/proctime.c:44
 msgid "STime"
-msgstr ""
+msgstr "úÁÐÕÓË"
 
 #: sysdeps/names/proctime.c:45
 msgid "CUTime"
@@ -857,19 +859,19 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:51
 msgid "Start time of process in seconds since the epoch"
-msgstr ""
+msgstr "þÁÓ ÚÁÐÕÓËÕ ÐÒÏÃÅÓÕ × ÓÅËÕÎÄÁÈ ×¦Ä ÐÏÞÁÔËÕ åÐÏÈÉ"
 
 #: sysdeps/names/proctime.c:52
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr ""
+msgstr "ä¦ÊÓÎÉÊ ÞÁÓ ÎÁËÏÐÉÞÅÎÉÊ ÐÒÏÃÅÓÏÍ (ÍÁ¤ ÂÕÔÉ utime +stime)"
 
 #: sysdeps/names/proctime.c:53
 msgid "user-mode CPU time accumulated by process"
-msgstr ""
+msgstr "ÞÁÓ ãð ÎÁËÏÐÉÞÅÎÉÊ ÐÒÏÃÅÓÏÍ × ËÏÒÉÓÔÕ×ÁÃØËÏÍÕ ÒÅÖÉͦ"
 
 #: sysdeps/names/proctime.c:54
 msgid "kernel-mode CPU time accumulated by process"
-msgstr ""
+msgstr "ÞÁÓ ãð ÎÁËÏÐÉÞÅÎÉÊ ÐÒÏÃÅÓÏÍ × ÒÅÖÉͦ ÑÄÒÁ"
 
 #: sysdeps/names/proctime.c:55
 msgid "cumulative utime of process and reaped children"
@@ -895,11 +897,11 @@ msgstr "
 
 #: sysdeps/names/proctime.c:61
 msgid "SMP user-mode CPU time accumulated by process"
-msgstr ""
+msgstr "SMP-ÞÁÓ ãð ÎÁËÏÐÉÞÅÎÉÊ ÐÒÏÃÅÓÏÍ Õ ÒÅÖÉͦ ËÏÒÉÓÔÕ×ÁÞÁ"
 
 #: sysdeps/names/proctime.c:62
 msgid "SMP kernel-mode CPU time accumulated by process"
-msgstr ""
+msgstr "SMP-ÞÁÓ ãð ÎÁËÏÐÉÞÅÎÉÊ ÐÒÏÃÅÓÏÍ Õ ÒÅÖÉͦ ÑÄÒÁ"
 
 #: sysdeps/names/procuid.c:56
 msgid "Uid"
@@ -943,7 +945,7 @@ msgstr "TPGID"
 
 #: sysdeps/names/procuid.c:58
 msgid "Priority"
-msgstr "ðÒÉÏÒ¦ÔÅÔ"
+msgstr "ðÒ¦ÏÒÉÔÅÔ"
 
 #: sysdeps/names/procuid.c:63
 msgid "User ID"
@@ -951,7 +953,7 @@ msgstr "
 
 #: sysdeps/names/procuid.c:64
 msgid "Effective User ID"
-msgstr "åÆÅËÔÉ×ÎÉÊ ¦ÄÅÎÔÉƦËÁÔÏÒ ËÏÒÉÓÔÕ×ÁÞÁ"
+msgstr "þÉÎÎÉÊ ¦ÄÅÎÔÉƦËÁÔÏÒ ËÏÒÉÓÔÕ×ÁÞÁ"
 
 #: sysdeps/names/procuid.c:65
 msgid "Group ID"
@@ -959,7 +961,7 @@ msgstr "
 
 #: sysdeps/names/procuid.c:66
 msgid "Effective Group ID"
-msgstr "åÆÅËÔÉ×ÎÉÊ ¦ÄÅÎÔÉƦËÁÔÏÒ ÇÒÕÐÉ"
+msgstr "þÉÎÎÉÊ ¦ÄÅÎÔÉƦËÁÔÏÒ ÇÒÕÐÉ"
 
 #: sysdeps/names/procuid.c:67
 msgid "Process ID"
@@ -979,15 +981,15 @@ msgstr "
 
 #: sysdeps/names/procuid.c:71
 msgid "Full device number of controlling terminal"
-msgstr ""
+msgstr "ðÏ×ÎÉÊ ÎÏÍÅÒ ÐÒÉÓÔÒÏÀ ËÏÎÔÒÏÌÀ ÔÅÒͦÎÁÌÕ"
 
 #: sysdeps/names/procuid.c:72
 msgid "Terminal process group ID"
-msgstr ""
+msgstr "¶ÄÅÎÔÉƦËÁÔÏÒ ÇÒÕÐÉ ÔÅÒͦÎÁÌØÎÏ ÐÒÏÃÅÓÕ"
 
 #: sysdeps/names/procuid.c:73
 msgid "Kernel scheduling priority"
-msgstr ""
+msgstr "ðÒ¦ÏÒÉÔÅÔ ÐÌÁÎÕ×ÁÎÎÑ ÑÄÒÁ"
 
 #: sysdeps/names/procuid.c:74
 msgid "Standard unix nice level of process"
@@ -1003,11 +1005,11 @@ msgstr "
 
 #: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max semaphores system wide"
-msgstr ""
+msgstr "íÁËÓÉÍÁÌØÎÁ ˦ÌØ˦ÓÔØ ÓÅÍÁÆÏÒ¦× Õ ÓÉÓÔÅͦ"
 
 #: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Number of undo structures system wide"
-msgstr ""
+msgstr "ë¦ÌØ˦ÓÔØ ÓÔÒÕËÔÕÒ ×¦ÄËÁÔÕ Õ ÓÉÓÔÅͦ"
 
 #: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Max semaphores per array"
@@ -1015,11 +1017,11 @@ msgstr "
 
 #: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max ops per semop call"
-msgstr ""
+msgstr "íÁËÓÉÍÁÌØÎÁ ˦ÌØ˦ÓÔØ ÏÐÅÒÁÃ¦Ê ÎÁ ×ÉËÌÉË ÓÅÍÁÆÏÒÁ"
 
 #: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max number of undo entries per process"
-msgstr ""
+msgstr "íÁËÓÉÍÁÌØÎÁ ˦ÌØ˦ÓÔØ ÚÁÐÉÓ¦× ×¦ÄËÁÔÕ ÎÁ ÐÒÏÃÅÓ"
 
 #: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "sizeof struct sem_undo"
@@ -1047,43 +1049,43 @@ msgstr "
 
 #: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max shared segments per process"
-msgstr ""
+msgstr "íÁËÓÉÍÕÍ ËÏÌÅËÔÉ×ÎÉÈ ÓÅ­ÍÅÎÔ¦× ÎÁ ÐÒÏÃÅÓ"
 
 #: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max total shared memory"
-msgstr "íÁËÓÉÍÕÍ ÚÁÇÁÌØÎϧ ˦ÌØËÏÓÔ¦ ÐÁÍ'ÑÔ¦"
+msgstr "úÁÇÁÌØÎÉÊ ÍÁËÓÉÍÕÍ ËÏÌÅËÔÉ×Îϧ ÐÁÍ'ÑÔ¦"
 
 #: sysdeps/names/swap.c:39 sysdeps/names/swap.c:48
 msgid "Total Swap Space"
-msgstr "úÁÇÁÌØÎÉÊ ÏÂ'¤Í Ó×ÏЦÎÇÕ"
+msgstr "úÁÇÁÌØÎÉÊ ÏÂ'¤Í Ó×ÏЦέÕ"
 
 #: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49
 msgid "Used Swap Space"
-msgstr "÷ÉËÏÒÉÓÔÉÎÉÊ ÏÂ'¤Í Ó×ÏЦÎÇÕ"
+msgstr "÷ÉËÏÒÉÓÔÉÎÉÊ ÏÂ'¤Í Ó×ÏЦέÕ"
 
 #: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
 msgid "Free Swap Space"
-msgstr "÷¦ÌØÎÉÊ ÏÂ'¤Í Ó×ÏЦÎÇÕ"
+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"
-msgstr ""
+msgstr "úÁÇÁÌØÎÁ ˦ÌØ˦ÓÔØ ×ÎÅÓÅÎÉÈ ÓÔÏÒ¦ÎÏË Ó×ÏÐ¦Î­Õ Ú ÓÔÁÒÔÕ ÓÉÓÔÅÍÉ"
 
 #: sysdeps/names/swap.c:53
 msgid "Total number of swap pages that have been brought out since system boot"
-msgstr ""
+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"
@@ -1095,7 +1097,7 @@ msgstr "
 
 #: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Swap Usage"
-msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ Ó×ÏЦÎÇÕ"
+msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ Ó×ÏЦέÕ"
 
 #: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "System Uptime"
@@ -1143,11 +1145,11 @@ msgstr "
 
 #: sysdeps/names/sysdeps.c:64 sysdeps/names/sysdeps.c:91
 msgid "Process Kernel Data information"
-msgstr ""
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÄÁΦ ÐÒÏÃÅÓÕ ÑÄÒÁ"
 
 #: sysdeps/names/sysdeps.c:65 sysdeps/names/sysdeps.c:92
 msgid "Process Segment information"
-msgstr ""
+msgstr "¶ÎÆÏÒÍÁÃ¦Ñ ÐÒÏ ÓÅ­ÍÅÎÔÉ ÐÒÏÃÅÓÕ"
 
 #: sysdeps/names/sysdeps.c:66
 msgid "Process Arguments"
@@ -1195,7 +1197,7 @@ msgstr "
 
 #: sysdeps/names/uptime.c:45
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr ""
+msgstr "þÁÓ × ÓÅËÕÎÄÁÈ ÐÒÏ×ÅÄÅÎÉÊ ÓÉÓÔÅÍÏÀ × ÏÞ¦ËÕ×ÁÎΦ Ú ÞÁÓÕ ÚÁ×ÁÎÔÁÖÅÎÎÑ"
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -1219,7 +1221,7 @@ 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"

src/daemon/ChangeLog

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

@@ -47,8 +47,7 @@ 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@
+				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la
 
 if ENABLE_STATIC
 libgtop_server_LDFLAGS		= -static

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

sysdeps/Makefile.am

@@ -7,4 +7,4 @@ endif
 SUBDIRS			= @sysdeps_dir@ common names $(guile_SUBDIRS)
 
 DIST_SUBDIRS		= common guile linux kernel names osf1 \
-			  stub stub_suid sun4 freebsd
+			  stub stub_suid sun4 freebsd solaris

sysdeps/freebsd/ChangeLog

@@ -1,3 +1,21 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
+2001-02-27  Martin Baulig  <baulig@suse.de>
+
+	* netload.c: Comment out the `subnet' field on BSDI; this should
+	make it compile. Bug #13345.
+
+	* shm_limits.c, msg_limits.c, sem_limits.c: Applied a patch
+	from Rolf Grossmann (grossman@securitas.net) for FreeBSD 4.2.
+	Fixes #51334.
+
+2001-02-14  Martin Baulig  <baulig@suse.de>
+
+	* proctime.c (glibtop_get_proc_time_p): Make things work on
+	OpenBSD 2.6; this is basically the same than on NetBSD.
+
 2000-02-13  Martin Baulig  <martin@home-of-linux.org>
 
 	* *.c: kvm_nlist () returns -1 on error, but a positive return value

sysdeps/freebsd/Makefile.am

@@ -17,6 +17,7 @@ libgtop_sysdeps_suid_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
 
 libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-include_HEADERS			= glibtop_server.h glibtop_machine.h \
+libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h \
 				  glibtop_suid.h
 
+libgtopincludedir		= $(includedir)/libgtop-1.0

sysdeps/freebsd/msg_limits.c

@@ -46,7 +46,7 @@ glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
 
 /* #define KERNEL to get declaration of `struct msginfo'. */
 
-#if (defined __FreeBSD__) || (defined __bsdi__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__)
 #define KERNEL 1
 #else
 #define _KERNEL 1

sysdeps/freebsd/netload.c

@@ -41,7 +41,9 @@
 static const unsigned long _glibtop_sysdeps_netload =
 (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
 (1L << GLIBTOP_NETLOAD_MTU) +
+#if !defined(__bsdi__)
 (1L << GLIBTOP_NETLOAD_SUBNET) +
+#endif
 (1L << GLIBTOP_NETLOAD_ADDRESS) +
 (1L << GLIBTOP_NETLOAD_PACKETS_IN) +
 (1L << GLIBTOP_NETLOAD_PACKETS_OUT) +
@@ -172,7 +174,10 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 		if (ifnet.if_flags & IFF_MULTICAST)
 			buf->if_flags |= GLIBTOP_IF_FLAGS_MULTICAST;
 
+#if !defined(__bsdi__)
+		/* Commenting out to "fix" #13345. */
 		buf->subnet = htonl (ifaddr.in.ia_subnet);
+#endif
 		buf->address = sin->sin_addr.s_addr;
 
 		buf->mtu = ifnet.if_mtu;

sysdeps/freebsd/proctime.c

@@ -124,7 +124,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 			 pid_t pid)
 {
 	struct kinfo_proc *pinfo;
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912))
 	register struct rusage *rup;
 #else
 	struct user *u_addr = (struct user *)USRSTACK;
@@ -166,7 +166,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 	buf->frequency = 1000000;
 	buf->flags = _glibtop_sysdeps_proc_time;
 
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912))
 	glibtop_suid_enter (server);
 
 	if (kvm_read (server->machine.kd,

sysdeps/freebsd/sem_limits.c

@@ -46,7 +46,7 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
 
 /* #define KERNEL to get declaration of `struct seminfo'. */
 
-#if defined(__FreeBSD__) || defined(__bsdi__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
 #define KERNEL 1
 #else
 #define _KERNEL 1

sysdeps/freebsd/shm_limits.c

@@ -46,7 +46,7 @@ glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
 
 /* #define KERNEL to get declaration of `struct shminfo'. */
 
-#if defined(__FreeBSD__)  || defined(__bsdi__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || defined(__bsdi__)
 #define KERNEL 1
 #else
 #define _KERNEL 1

sysdeps/guile/Makefile.am

@@ -19,7 +19,7 @@ guile.c: guile.pl $(top_builddir)/config.h $(top_srcdir)/features.def
 	mv gnc-t guile.c
 
 guile.x: guile.c
-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
+	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
 
 EXTRA_DIST			= guile.pl
 

sysdeps/guile/names/Makefile.am

@@ -17,7 +17,7 @@ guile-names.c: guile-names.pl $(top_builddir)/config.h $(top_srcdir)/features.de
 	mv gnc-t guile-names.c
 
 guile-names.x: guile-names.c
-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
+	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
 
 EXTRA_DIST			= guile-names.pl
 

sysdeps/kernel/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
 1998-10-26  Martin Baulig  <martin@home-of-linux.org>
 
 	* netload.c: New file. Currently empty.

sysdeps/kernel/Makefile.am

@@ -13,7 +13,8 @@ libgtop_sysdeps_la_SOURCES	= open.c close.c kernel.s cpu.c mem.c swap.c \
 
 libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-include_HEADERS			= glibtop_server.h
+libgtopinclude_HEADERS		= glibtop_server.h
+libgtopincludedir		= $(includedir)/libgtop-1.0
 
 noinst_HEADERS			= kernel.h
 

sysdeps/linux/ChangeLog

@@ -1,3 +1,15 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
+2001-02-13  Martin Baulig  <baulig@suse.de>
+
+	Fix bug #14076.
+
+	* open.c (glibtop_open_s): Check whether /proc/1/cpu exists to
+	detect SMP support rather than reading /proc/stat; on Linux 2.4.x,
+	/proc/stat has "cpu" and "cpu0" entries even for non-SMP systems.
+
 2000-01-22  Martin Baulig  <martin@home-of-linux.org>
 
 	* procargs.c (glibtop_get_proc_args_s): Set correct `buf->size' and

sysdeps/linux/Makefile.am

@@ -14,4 +14,5 @@ libgtop_sysdeps_la_LIBADD	= @GLIB_LIBS@
 
 libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-include_HEADERS			= glibtop_server.h glibtop_machine.h
+libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
+libgtopincludedir		= $(includedir)/libgtop-1.0

sysdeps/linux/open.c

@@ -62,6 +62,7 @@ glibtop_open_s (glibtop *server, const char *program_name,
 		const unsigned flags)
 {
 	char buffer [BUFSIZ], *p;
+	struct stat statb;
 	int fd, len, i;
 
 	server->name = program_name;
@@ -71,6 +72,13 @@ glibtop_open_s (glibtop *server, const char *program_name,
 
 	server->ncpu = 0;
 
+	/* On Linux 2.4.x, /proc/stat has "cpu" and "cpu0" entries even
+	 * for non-SMP systems. Checking whether /proc/<pid>/cpu exists
+	 * is a much better way to detect SMP. */
+
+	if (stat ("/proc/1/cpu", &statb))
+	    return;
+
 	fd = open (FILENAME, O_RDONLY);
 	if (fd < 0)
 		glibtop_error_io_r (server, "open (%s)", FILENAME);

sysdeps/osf1/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
 1999-05-11  Martin Baulig  <martin@home-of-linux.org>
 
 	* procstate.c: Fixed implementation of the `state' field; added

sysdeps/osf1/Makefile.am

@@ -17,6 +17,7 @@ libgtop_sysdeps_suid_la_SOURCES	= open_suid.c close_suid.c proclist.c \
 libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
 libgtop_sysdeps_suid_la_LIBADD	= -lmach
 
-include_HEADERS			= glibtop_server.h glibtop_machine.h
+libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
+libgtopincludedir		= $(includedir)/libgtop-1.0
 
 noinst_HEADERS			= glibtop_suid.h

sysdeps/solaris/.cvsignore

@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 libgtop_sysdeps.la
 *.lo
+libgtop_sysdeps_suid.la

sysdeps/solaris/AUTHORS

@@ -0,0 +1,2 @@
+Drazen Kacar (dave@srce.hr)
+Martin Baulig (martin@home-of-linux.org)

sysdeps/solaris/ChangeLog

@@ -1,3 +1,143 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
+2001-02-18  Martin Baulig  <baulig@suse.de>
+
+	Applied a patch from Laszlo PETER <Laszlo.Peter@ireland.sun.com>
+	for Solaris 8.
+
+	* msg_limits.c: `struct msginfo' no longer has msgmap and msgssz.
+	* sem_limits.c: `struct seminfo' no longer has a semmap field.
+
+1999-10-17  Martin Baulig  <martin@home-of-linux.org>
+
+	* Makefile.am (libgtop_sysdeps_la_LIBADD): Added `@DL_LIB@'.
+
+1999-09-28  Drazen Kacar  <dave@srce.hr>
+
+	* proclist.c (glibtop_get_proclist_s): Bugfix. It wasn't
+	excluding system, non-tty or idle processes if that was
+	requested.
+
+1999-07-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* proctime.c (glibtop_get_proc_time_p): Fix bug reported by
+	Takis Psarogiannakopoulos: `start_time' are seconds since the
+ 	epoch as it is stated in the manual.
+
+1999-07-16  Drazen Kacar  <dave@srce.hr>
+
+	* proclist.c: Bug fix. All Solaris versions have RUID and
+	RGID in /proc.
+
+1999-06-07  Drazen Kacar  <dave@srce.hr>
+
+	* glibtop_machine.h, open.c, procargs.c, proclist.c, procmap.c:
+	  Solaris 2.5 & 2.5.1 portability fixes, based on patches
+	  from Steve Murphy <murf@e-tools.com>.
+
+1999-05-30  Drazen Kacar  <dave@srce.hr>
+
+	* procargs.c: Fixed bug in calculation of process argument list.
+
+1999-05-27  Drazen Kacar  <dave@srce.hr>
+
+	* glibtop_machine.h, open.c, procmap.c: Get the file name
+	from inode number.
+
+1999-05-17  Drazen Kacar  <dave@srce.hr>
+
+	* procargs.c: Implemented what Solaris has to offer cheaply.
+	It sucks, but digging in process address space would be
+	too slow.
+
+1999-05-11  Drazen Kacar  <dave@srce.hr>
+
+	* proctime.c: Return 0 usage times for scheaduler (PID 0).
+
+1999-05-10  Drazen Kacar  <dave@srce.hr>
+
+	* proclist.c: Added process selection mechanism. It's not
+	included in Solaris 2.5 build, since we first have to decide
+	what will be dispatched to daemon.
+
+1999-05-10  Drazen Kacar  <dave@srce.hr>
+
+	There be some useful documentation now. Syncing...
+
+	* mem.c: Output values in bytes, as the documentation requires.
+	It was a bit odd when gtop reported 256K of total memory.
+
+1999-05-09  Drazen Kacar  <dave@srce.hr>
+
+	* glibtop_machine.h, procdata.c, proclist.c, procmap.c, procmem.c,
+	procsignal.c, procstate.c, procuid.c, open.c, mem.c: Initial
+	Solaris 2.5 port. It's far from being complete and hasn't been
+	tested properly. We'll need setuid root daemon, which is
+	currently not implemented. #ifdef symbols to check are
+	HAVE_PROCFS_H and KSTAT_DATA_UINT32. These will be defined on
+	Solaris 2.6 and later, but not on earlier releases.
+
+1999-05-08  Drazen Kacar  <dave@srce.hr>
+
+	* safeio.c, safeio.h: Added s_open(), s_close() etc. with EINTR
+	wrappers.
+
+	* procdata.c, procmap.c, proclist.c: Use them.
+
+1999-05-08  Drazen Kacar  <dave@srce.hr>
+
+	* procmem.c: Use bytes as units for memory consumption.
+
+1999-05-08  Drazen Kacar  <dave@srce.hr>
+
+	* procuid.c: Fixed nice value.
+
+1999-05-08  Martin Baulig  <martin@home-of-linux.org>
+
+	Use the setgid server for IPC Limits.
+
+	* shm_limits.c, msg_limits.c, sem_limits.c: Moved them into the
+	setgid server since they need to access kvm data.
+
+	* open_suid.c, close_suid.c: New file. We do the initialization and cleanup
+	for the setgid server here.
+
+	* glibtop_suid.h: New file. We include this in the setgid files.
+
+	* open.c: Moved kvm opening code into open_suid.c.
+
+1999-05-07  Drazen Kacar <dave@srce.hr>
+
+	* glibtop_machine.h, open.c, mem.c, procmem.c: machine.pagesize
+	is now number of bits we need for shifting, ie. 2^pagesize
+	will give pagesize in Kb.
+
+1999-05-07  Drazen Kacar <dave@srce.hr>
+
+	* procmem.c: Implemented size, vsize, resident and rss.
+
+1999-05-06  Drazen Kacar <dave@srce.hr>
+
+	* siglist.c: Fixed, valid for Solaris 2.6 & 7.
+
+1999-05-06  Drazen Kacar  <dave@srce.hr>
+
+	* glibtop_private.h, procuid.c, procdata.c: List of supplementary
+	groups was not correct. Fixed.
+
+1999-05-04  Drazen Kacar  <dave@srce.hr>
+
+	* glibtop_machine.h: Changed boot time to unsigned long long.
+	
+	* open.c: Added proper type checking for boot value. There's
+	no point in saving a few nanoseconds in init function. And
+	one day it will become 64-bit value.
+
+	In glibtop_get_kstats(): Don't reread vminfo_snaptime when
+	reinitializing kstats.
+
 1999-05-03  Drazen Kacar  <dave@srce.hr>
 
 	* glibtop_private.h: Fixed typoo.

sysdeps/solaris/Makefile.am

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

sysdeps/solaris/close_suid.c

@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */
 
 /* Copyright (C) 1998-99 Martin Baulig
@@ -23,16 +21,10 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __GLIBTOP_LIMITS_H__
-#define __GLIBTOP_LIMITS_H__
+#include <glibtop/close.h>
 
-#include <glibtop/global.h>
+/* Closes pipe to gtop server. */
 
-BEGIN_LIBGTOP_DECLS
-
-/* Nobody should really be using more than 64 processors. */
-#define GLIBTOP_NCPU		64
-
-END_LIBGTOP_DECLS
-
-#endif
+void
+glibtop_close_p (glibtop *server)
+{ }

sysdeps/solaris/cpu.c

@@ -35,7 +35,10 @@ static const unsigned long _glibtop_sysdeps_cpu =
 (1L << GLIBTOP_CPU_SYS) + (1L << GLIBTOP_CPU_IDLE) +
 (1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) +
 (1L << GLIBTOP_XCPU_SYS) + (1L << GLIBTOP_XCPU_IDLE) +
-(1L << GLIBTOP_CPU_FREQUENCY) + (1L << GLIBTOP_XCPU_FLAGS);
+#if LIBGTOP_VERSION_CODE >= 1001002
+(1L << GLIBTOP_XCPU_FLAGS) +
+#endif
+(1L << GLIBTOP_CPU_FREQUENCY);
 
 /* Init function. */
 
@@ -77,7 +80,11 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 
 	++found;
 	if(p_online(cpu, P_STATUS) == P_ONLINE)
+#if LIBGTOP_VERSION_CODE >= 1001002
 	    buf->xcpu_flags |= (1L << cpu);
+#else
+	    ;
+#endif
 	else
 	    continue;
 	ret = kstat_read (kc, ksp, &cpu_stat);

sysdeps/solaris/glibtop_machine.h

@@ -25,7 +25,11 @@
 #define __GLIBTOP_MACHINE_H__
 
 #include <sys/param.h>
+#ifdef HAVE_PROCFS_H
 #include <procfs.h>
+#else
+#include <sys/procfs.h>
+#endif
 #include <fcntl.h>
 
 #include <kstat.h>
@@ -40,6 +44,7 @@ struct _glibtop_machine
 {
     uid_t uid, euid;
     gid_t gid, egid;
+    pid_t me;			/* Don't ask why we need this */
 
     kvm_t *kd;
 
@@ -51,13 +56,21 @@ struct _glibtop_machine
 
     kstat_t *cpu_stat_kstat [64];
 
-    kstat_t *system;	/* boot_time & avenrun* where needed */
-    kstat_t *syspages;	/* memory usage */
-    kstat_t *bunyip;	/* more memory usage */
+    kstat_t *system;		/* boot_time & avenrun* where needed */
+    kstat_t *syspages;		/* memory usage */
+    kstat_t *bunyip;		/* more memory usage */
 
-    int pagesize;	/* in kilobytes */
-    int ticks;		/* clock ticks, as returned by sysconf(_SC_CLK_TCK) */
-    unsigned boot;	/* boot time, it's ui32 in kstat */
+    int pagesize;		/* in bits to shift, ie. 2^pagesize gives Kb */
+    int ticks;			/* clock ticks, as returned by sysconf() */
+    unsigned long long boot;	/* boot time, although it's ui32 in kstat */
+    void *libproc;		/* libproc handle */
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+    void (*objname)(void *, uintptr_t, const char *, size_t);
+    struct ps_prochandle *(*pgrab)(pid_t, int, int *);
+    void (*pfree)(void *);
+#else
+    void *filler[3];
+#endif
 };
 
 END_LIBGTOP_DECLS

sysdeps/solaris/glibtop_private.h

@@ -28,23 +28,37 @@
 #include <glibtop/error.h>
 
 #include <sys/param.h>
-#include <procfs.h>
 #include <kstat.h>
 #include <fcntl.h>
+#if defined(HAVE_PROCFS_H)
+# include <procfs.h>
+#elif defined(HAVE_SYS_PROCFS_H)
+# include <sys/procfs.h>
+#else
+# error Cannot compile without <procfs.h> or <sys/procfs.h>
+#endif
 
 BEGIN_LIBGTOP_DECLS
 
+#ifdef HAVE_PROCFS_H
+
 /* Read /proc/<pid>/psinfo */
-int glibtop_get_proc_data_psinfo_s (glibtop *server, struct psinfo *psinfo, pid_t pid);
-
-/* Read /proc/<pid>/usage */
-int glibtop_get_proc_data_usage_s (glibtop *server, struct prusage *prusage, pid_t pid);
-
-/* Read /proc/<pid>/cred */
-int glibtop_get_proc_credentials_s(glibtop *, struct prcred *, pid_t);
+int glibtop_get_proc_data_psinfo_s(glibtop *, struct psinfo *, pid_t pid);
 
 /* Read /proc/<pid>/status */
 int glibtop_get_proc_status_s(glibtop *, struct pstatus *, pid_t);
+#else
+int glibtop_get_proc_data_psinfo_s(glibtop *, struct prpsinfo *, pid_t);
+int glibtop_get_proc_status_s(glibtop *, struct prstatus *, pid_t);
+#endif
+
+/* Read /proc/<pid>/usage */
+int glibtop_get_proc_data_usage_s(glibtop *, struct prusage *, pid_t);
+
+#if LIBGTOP_VERSION_CODE >= 1001002
+/* Read /proc/<pid>/cred */
+int glibtop_get_proc_credentials_s(glibtop *, struct prcred *, gid_t *, pid_t);
+#endif
 
 /* Reread kstat chains */
 void glibtop_get_kstats(glibtop *);

sysdeps/solaris/glibtop_server.h

@@ -31,9 +31,9 @@ BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SUID_SWAP		0
 #define GLIBTOP_SUID_UPTIME		0
 #define GLIBTOP_SUID_LOADAVG		0
-#define GLIBTOP_SUID_SHM_LIMITS		0
-#define GLIBTOP_SUID_MSG_LIMITS		0
-#define GLIBTOP_SUID_SEM_LIMITS		0
+#define GLIBTOP_SUID_SHM_LIMITS		(1L << GLIBTOP_SYSDEPS_SHM_LIMITS)
+#define GLIBTOP_SUID_MSG_LIMITS		(1L << GLIBTOP_SYSDEPS_MSG_LIMITS)
+#define GLIBTOP_SUID_SEM_LIMITS		(1L << GLIBTOP_SYSDEPS_SEM_LIMITS)
 #define GLIBTOP_SUID_PROCLIST		0
 #define GLIBTOP_SUID_PROC_STATE		0
 #define GLIBTOP_SUID_PROC_UID		0

sysdeps/solaris/glibtop_suid.h

@@ -0,0 +1,48 @@
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __GLIBTOP_SUID_H__
+#define __GLIBTOP_SUID_H__
+
+BEGIN_LIBGTOP_DECLS
+
+static inline void glibtop_suid_enter (glibtop *server) {
+	setreuid (server->machine.uid, server->machine.euid);
+};
+
+static inline void glibtop_suid_leave (glibtop *server) {
+	if (setreuid (server->machine.euid, server->machine.uid))
+		_exit (1);
+};
+
+void
+glibtop_init_p (glibtop *server, const unsigned long features,
+		const unsigned flags);
+void
+glibtop_open_p (glibtop *server, const char *program_name,
+		const unsigned long features,
+		const unsigned flags);
+
+END_LIBGTOP_DECLS
+
+#endif

sysdeps/solaris/mem.c

@@ -57,9 +57,13 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
     kstat_named_t *kn;
     int pagesize = server->machine.pagesize;
 
+#ifndef KSTAT_DATA_UINT32
+#define ui32 ul
+#endif
+
     memset (buf, 0, sizeof (glibtop_mem));
 
-    buf->total = (u_int64_t)sysconf(_SC_PHYS_PAGES) * pagesize;
+    buf->total = (u_int64_t)sysconf(_SC_PHYS_PAGES) << pagesize << 10;
     buf->flags = _glibtop_sysdeps_mem_os_sysconf;
 
     if(!kc)
@@ -77,18 +81,18 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 	if(kn)
 	{
 #ifdef _LP64
-	    buf->free = kn->value.ui64 * pagesize;
+	    buf->free = kn->value.ui64 << pagesize << 10;
 #else
-	    buf->free = kn->value.ui32 * pagesize;
+	    buf->free = kn->value.ui32 << pagesize << 10;
 #endif
 	    buf->used = buf->total - buf->free;
 	}
 	kn = (kstat_named_t *)kstat_data_lookup(ksp, "pageslocked");
 	if(kn)
 #ifdef _LP64
-	    buf->locked = kn->value.ui64 * pagesize;
+	    buf->locked = kn->value.ui64 << pagesize;
 #else
-	    buf->locked = kn->value.ui32 * pagesize;
+	    buf->locked = kn->value.ui32 << pagesize;
 #endif
 	buf->flags += _glibtop_sysdeps_mem_os_kstat;
     }
@@ -100,23 +104,23 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
         kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_anon");
 	if(kn)
 #ifdef _LP64
-	    buf->user = kn->value.ui64 * pagesize;
+	    buf->user = kn->value.ui64 << pagesize << 10;
 #else
-	    buf->user = kn->value.ui32 * pagesize;
+	    buf->user = kn->value.ui32 << pagesize << 10;
 #endif
 	kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_exec");
 	if(kn)
 #ifdef _LP64
-	    buf->shared = kn->value.ui64 * pagesize;
+	    buf->shared = kn->value.ui64 << pagesize << 10;
 #else
-	    buf->shared = kn->value.ui32 * pagesize;
+	    buf->shared = kn->value.ui32 << pagesize << 10;
 #endif
 	kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_vnode");
 	if(kn)
 #ifdef _LP64
-	    buf->buffer = kn->value.ui64 * pagesize;
+	    buf->buffer = kn->value.ui64 << pagesize << 10;
 #else
-	    buf->buffer = kn->value.ui32 * pagesize;
+	    buf->buffer = kn->value.ui32 << pagesize << 10;
 #endif
 	buf->flags += _glibtop_sysdeps_mem_bunyip;
     }

sysdeps/solaris/msg_limits.c

@@ -29,15 +29,17 @@
 
 static struct nlist nlst[] = { {"msginfo"}, {NULL} };
 static const unsigned long _glibtop_sysdeps_msg_limits =
-(1L << GLIBTOP_IPC_MSGPOOL) + (1L << GLIBTOP_IPC_MSGMAP) +
-(1L << GLIBTOP_IPC_MSGMAX) + (1L << GLIBTOP_IPC_MSGMNB) +
-(1L << GLIBTOP_IPC_MSGMNI) + (1L << GLIBTOP_IPC_MSGSSZ) +
+#if GLIBTOP_SOLARIS_RELEASE <= 570
+(1L << GLIBTOP_IPC_MSGMAP) +  (1L << GLIBTOP_IPC_MSGSSZ) +
+#endif
+(1L << GLIBTOP_IPC_MSGPOOL) + (1L << GLIBTOP_IPC_MSGMAX) +
+(1L << GLIBTOP_IPC_MSGMNB) + (1L << GLIBTOP_IPC_MSGMNI) +
 (1L << GLIBTOP_IPC_MSGTQL);
 
 /* Init function. */
 
 void
-glibtop_init_msg_limits_s (glibtop *server)
+glibtop_init_msg_limits_p (glibtop *server)
 {
    	kvm_t *kd = server->machine.kd;
 
@@ -50,7 +52,7 @@ glibtop_init_msg_limits_s (glibtop *server)
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
+glibtop_get_msg_limits_p (glibtop *server, glibtop_msg_limits *buf)
 {
    	kvm_t *kd = server->machine.kd;
 	struct msginfo minfo;
@@ -63,11 +65,15 @@ glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
 		    sizeof(struct msginfo)) != sizeof(struct msginfo))
 	   	return;
 
+#if GLIBTOP_SOLARIS_RELEASE <= 570
+	/* These fields don't exist anymore in Solaris 8.
+	 * Thanks to Laszlo PETER <Laszlo.Peter@ireland.sun.com>. */
 	buf->msgmap = minfo.msgmap;
+	buf->msgssz = minfo.msgssz;
+#endif
 	buf->msgmax = minfo.msgmax;
 	buf->msgmnb = minfo.msgmnb;
 	buf->msgmni = minfo.msgmni;
-	buf->msgssz = minfo.msgssz;
 	buf->msgtql = minfo.msgtql;
 	buf->msgpool = minfo.msgmni * minfo.msgmnb >> 10;
 	buf->flags = _glibtop_sysdeps_msg_limits;

sysdeps/solaris/open.c

@@ -22,8 +22,10 @@
 */
 
 #include <glibtop/open.h>
+#include <glibtop/cpu.h>
 
 #include <unistd.h>
+#include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/processor.h>
 
@@ -60,7 +62,9 @@ glibtop_get_kstats(glibtop *server)
 	if(ksp)
 	{
 	    kstat_read(kc, ksp, &server->machine.vminfo);
-	    server->machine.vminfo_snaptime = ksp->ks_snaptime;
+	    /* Don't change snaptime if we only need to reinitialize kstats */
+	    if(!(server->machine.vminfo_snaptime))
+	        server->machine.vminfo_snaptime = ksp->ks_snaptime;
 	}
 
 	/* We don't know why was kstat chain invalidated. It could have
@@ -69,7 +73,7 @@ glibtop_get_kstats(glibtop *server)
 	   life time of a process, but let's hope that's just an error in
 	   the documentation. */
 
-	if(nproc_same = new_ncpu == server->ncpu)
+	if((nproc_same = new_ncpu) == server->ncpu)
 	{
 	    int checked, i;
 	    char cpu[20];
@@ -128,10 +132,14 @@ glibtop_open_s (glibtop *server, const char *program_name,
     kstat_ctl_t *kc;
     kstat_t *ksp;
     kstat_named_t *kn;
+    int i, page;
+    void *dl;
 
     server->name = program_name;
 
-    server->machine.pagesize = sysconf(_SC_PAGESIZE) >> 10;
+    page = sysconf(_SC_PAGESIZE) >> 10;
+    for(i = 0; page; ++i, page >>= 1);
+    server->machine.pagesize = i - 1;
     server->machine.ticks = sysconf(_SC_CLK_TCK);
     server->machine.kc = kc = kstat_open ();
 
@@ -164,6 +172,7 @@ glibtop_open_s (glibtop *server, const char *program_name,
 	glibtop_warn_io_r (server, "kstat_open ()");
 
     server->ncpu = -1;  /* Force processor detection */
+    server->machine.vminfo_snaptime = 0;  /* Force snaptime read */
     glibtop_get_kstats(server);
 
     server->machine.boot = 0;
@@ -171,13 +180,55 @@ glibtop_open_s (glibtop *server, const char *program_name,
     {
 	kn = (kstat_named_t *)kstat_data_lookup(ksp, "boot_time");
 	if(kn)
-	    server->machine.boot = kn->value.ui32;
+	    switch(kn->data_type)
+	    {
+#ifdef KSTAT_DATA_INT32
+	        case KSTAT_DATA_INT32:  server->machine.boot = kn->value.i32;
+				        break;
+	        case KSTAT_DATA_UINT32: server->machine.boot = kn->value.ui32;
+				        break;
+	        case KSTAT_DATA_INT64:  server->machine.boot = kn->value.i64;
+				        break;
+	        case KSTAT_DATA_UINT64: server->machine.boot = kn->value.ui64;
+				        break;
+#else
+		case KSTAT_DATA_LONG:      server->machine.boot = kn->value.l;
+					   break;
+		case KSTAT_DATA_ULONG:     server->machine.boot = kn->value.ul;
+					   break;
+		case KSTAT_DATA_LONGLONG:  server->machine.boot = kn->value.ll;
+					   break;
+		case KSTAT_DATA_ULONGLONG: server->machine.boot = kn->value.ull;
+					   break;
+#endif
+	    }
     }
 
-    server->machine.kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
-    if(!server->machine.kd)
-        glibtop_warn_io_r(server, "kvm_open()");
+    /* Now let's have a bit of magic dust... */
 
-    fprintf (stderr, "Sleeping 2 seconds, please wait ...\n");
-    sleep (2);
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+
+    dl = dlopen("/usr/lib/libproc.so", RTLD_LAZY);
+    server->machine.libproc = dl;
+    if(dl)
+    {
+       void *func;
+
+       func = dlsym(dl, "Pobjname");		/* Solaris 8 */
+       if(!func)
+	  func = dlsym(dl, "proc_objname");	/* Solaris 7 */
+       server->machine.objname = (void (*)
+	     			 (void *, uintptr_t, const char *, size_t))func;
+       server->machine.pgrab = (struct ps_prochandle *(*)(pid_t, int, int *))
+	  		       dlsym(dl, "Pgrab");
+       server->machine.pfree = (void (*)(void *))dlsym(dl, "Pfree");
+    }
+    else
+    {
+       server->machine.objname = NULL;
+       server->machine.pgrab = NULL;
+       server->machine.pfree = NULL;
+    }
+#endif
+    server->machine.me = getpid();
 }

sysdeps/solaris/open_suid.c

@@ -0,0 +1,92 @@
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <glibtop.h>
+#include <glibtop/open.h>
+
+#include <glibtop_suid.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+
+/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
+
+void
+glibtop_init_p (glibtop *server, const unsigned long features,
+		const unsigned flags)
+{
+	glibtop_init_func_t *init_fkt;
+
+	if (server == NULL)
+		glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
+
+	/* Do the initialization, but only if not already initialized. */
+
+	if ((server->flags & _GLIBTOP_INIT_STATE_INIT) == 0) {
+		glibtop_open_p (server, "glibtop", features, flags);
+
+		for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
+			(*init_fkt) (server);
+		
+		server->flags |= _GLIBTOP_INIT_STATE_INIT;
+	}
+}
+
+/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
+
+void
+glibtop_open_p (glibtop *server, const char *program_name,
+		const unsigned long features, const unsigned flags)
+{
+	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
+
+	server->name = program_name;
+	
+	server->machine.uid = getuid ();
+	server->machine.euid = geteuid ();
+	server->machine.gid = getgid ();
+	server->machine.egid = getegid ();
+
+	server->machine.kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
+	if(!server->machine.kd)
+		glibtop_warn_io_r(server, "kvm_open()");
+
+	/* Drop priviledges; we only become root when necessary.
+	
+	   setreuid (ruid, euid) - set real and effective user id;
+	   setregid (rgid, egid) - set real and effective group id;
+	   
+	*/
+	
+	if (setreuid (server->machine.euid, server->machine.uid))
+		_exit (1);
+		
+	if (setregid (server->machine.egid, server->machine.gid))
+		_exit (1);
+
+	/* !!! END OF SUID ROOT PART !!! */
+    
+	/* Our effective uid is now those of the user invoking the server,
+	   so we do no longer have any priviledges.
+	*/
+}

sysdeps/solaris/procargs.c

@@ -26,7 +26,8 @@
 #include <glibtop/xmalloc.h>
 #include <glibtop/procargs.h>
 
-static const unsigned long _glibtop_sysdeps_proc_args = 0;
+static const unsigned long _glibtop_sysdeps_proc_args =
+(1L << GLIBTOP_PROC_ARGS_SIZE);
 
 /* Init function. */
 
@@ -42,6 +43,41 @@ char *
 glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 			 pid_t pid, unsigned max_len)
 {
+#ifdef HAVE_PROCFS_H
+   	struct psinfo pinfo;
+#else
+	struct prpsinfo pinfo;
+#endif
+	int len, i;
+	char *ret, *p;
+
 	memset (buf, 0, sizeof (glibtop_proc_args));
-	return NULL;
+
+	if(glibtop_get_proc_data_psinfo_s(server, &pinfo, pid))
+	   	return NULL;
+
+	for(len = 0; len < PRARGSZ; ++len)
+	   if(!(pinfo.pr_psargs[len]))
+	      break;
+	if(max_len)
+	{
+	   	ret = glibtop_malloc_r(server, max_len + 1);
+		if(max_len < len)
+		   	len = max_len;
+		memcpy(ret, pinfo.pr_psargs, len);
+		ret[len] = 0;
+	}
+	else
+	{
+	   ret = glibtop_malloc_r(server, len + 1);
+	   memcpy(ret, pinfo.pr_psargs, len);
+	   ret[len] = 0;
+
+	   buf->size = len;
+	   buf->flags = _glibtop_sysdeps_proc_args;
+	}
+	for(p = ret; *p; ++p)
+	   if(*p == ' ')
+	      *p = 0;
+	return ret;
 }

sysdeps/solaris/procdata.c

@@ -23,9 +23,27 @@
 
 #include <glibtop.h>
 #include <glibtop_private.h>
+#include <glibtop/procuid.h>
 
 #include <errno.h>
 
+#include "safeio.h"
+
+/*
+ * The differences between old and new procfs API are:
+ * - old has /proc/<pid> file and ioctl() is used to obtain the data.
+ * - new has /proc/<pid>/* files and read() & friends are used to
+ *   obtain the data.
+ * - names of structures and members are different. It's mostly the
+ *   prefix. Old uses `pr' and new uses `ps'.
+ *
+ * Since almost every line would be in #ifdef, I think it would
+ * be more readable to just copy everything twice. This is not a big
+ * file, after all.
+ */
+
+#ifdef HAVE_PROCFS_H
+
 /* Read /proc/<pid>/psinfo. */
 
 int
@@ -35,19 +53,21 @@ glibtop_get_proc_data_psinfo_s (glibtop *server, struct psinfo *psinfo, pid_t pi
 	char buffer [BUFSIZ];
 
 	sprintf (buffer, "/proc/%d/psinfo", (int) pid);
-	fd = open (buffer, O_RDONLY);
+	fd = s_open (buffer, O_RDONLY);
 	if (fd < 0) {
 		glibtop_warn_io_r (server, "open (%s)", buffer);
 		return -1;
 	}
 
-	if (pread (fd, psinfo, sizeof (struct psinfo), 0) != sizeof (struct psinfo)) {
-		close (fd);
+	if (s_pread (fd, psinfo, sizeof (struct psinfo), 0) !=
+	             sizeof (struct psinfo))
+	{
+		s_close (fd);
 		glibtop_warn_io_r (server, "pread (%s)", buffer);
 		return -1;
 	}
 
-	close (fd);
+	s_close (fd);
 	return 0;
 }
 
@@ -58,44 +78,63 @@ glibtop_get_proc_data_usage_s (glibtop *server, struct prusage *prusage, pid_t p
 	char buffer [BUFSIZ];
 
 	sprintf (buffer, "/proc/%d/usage", (int) pid);
-	fd = open (buffer, O_RDONLY);
+	fd = s_open (buffer, O_RDONLY);
 	if (fd < 0) {
 		glibtop_warn_io_r (server, "open (%s)", buffer);
 		return -1;
 	}
 
-	if (pread (fd, prusage, sizeof (struct prusage), 0) != sizeof (struct prusage)) {
-		close (fd);
+	if (s_pread (fd, prusage, sizeof (struct prusage), 0) !=
+	             sizeof (struct prusage))
+	{
+		s_close (fd);
 		glibtop_warn_io_r (server, "pread (%s)", buffer);
 		return -1;
 	}
 
-	close (fd);
+	s_close (fd);
 	return 0;
 }
 
+#if LIBGTOP_VERSION_CODE >= 1001002
 int
-glibtop_get_proc_credentials_s(glibtop *server, struct prcred *prcred, pid_t pid)
+glibtop_get_proc_credentials_s(glibtop *server,
+      			       struct prcred *prcred,
+			       gid_t *groups,
+			       pid_t pid)
 {
 	int fd;
+	size_t toread;
 	char buffer[BUFSIZ];
 
 	sprintf(buffer, "/proc/%d/cred", (int)pid);
-	if((fd = open(buffer, O_RDONLY)) < 0)
+	if((fd = s_open(buffer, O_RDONLY)) < 0)
 	{
 	   	if(errno != EPERM && errno != EACCES)
 		   	glibtop_warn_io_r(server, "open (%s)", buffer);
 		return -1;
 	}
-	if(pread(fd, prcred, sizeof(struct prcred), 0) != sizeof(struct prcred))
+	if(s_pread(fd, prcred, sizeof(struct prcred), 0) !=
+	           sizeof(struct prcred))
 	{
-	   	close(fd);
+	   	s_close(fd);
 		glibtop_warn_io_r(server, "pread (%s)", buffer);
 		return -1;
 	}
-	close(fd);
+	if(prcred->pr_ngroups >= 0)
+	{
+	    if(prcred->pr_ngroups <= GLIBTOP_MAX_GROUPS)
+	        toread = prcred->pr_ngroups * sizeof(gid_t);
+	    else
+	        toread = GLIBTOP_MAX_GROUPS * sizeof(gid_t);
+	    if(s_pread(fd, groups, toread,
+	               &(((struct prcred *)0)->pr_groups[0])) != toread)
+	               prcred->pr_ngroups = 0;
+	}
+	s_close(fd);
 	return 0;
 }
+#endif
 
 int
 glibtop_get_proc_status_s(glibtop *server, struct pstatus *pstatus, pid_t pid)
@@ -104,18 +143,126 @@ glibtop_get_proc_status_s(glibtop *server, struct pstatus *pstatus, pid_t pid)
 	char buffer[BUFSIZ];
 
 	sprintf(buffer, "/proc/%d/status", (int)pid);
-	if((fd = open(buffer, O_RDONLY)) < 0)
+	if((fd = s_open(buffer, O_RDONLY)) < 0)
 	{
 	   	if(errno != EPERM && errno != EACCES)
 		   	glibtop_warn_io_r(server, "open (%s)", buffer);
 		return -1;
 	}
-	if(pread(fd, pstatus, sizeof(struct pstatus), 0) != sizeof(struct pstatus))
+	if(s_pread(fd, pstatus, sizeof(struct pstatus), 0) !=
+	           sizeof(struct pstatus))
 	{
-	   	close(fd);
+	   	s_close(fd);
 		glibtop_warn_io_r(server, "pread (%s)", buffer);
 		return -1;
 	}
-	close(fd);
+	s_close(fd);
 	return 0;
 }
+
+#else /* old API */
+
+int
+glibtop_get_proc_data_psinfo_s (glibtop *server,
+      				struct prpsinfo *psinfo,
+				pid_t pid)
+{
+	int fd;
+	char buffer [BUFSIZ];
+
+	sprintf (buffer, "/proc/%d", (int) pid);
+	fd = s_open (buffer, O_RDONLY);
+	if (fd < 0) {
+	   	if(errno != EPERM && errno != EACCES)
+			glibtop_warn_io_r (server, "open (%s)", buffer);
+		return -1;
+	}
+
+	if(ioctl(fd, PIOCPSINFO, psinfo) < 0)
+	{
+		s_close (fd);
+		glibtop_warn_io_r (server, "ioctl(%s, PIOCPSINFO)", buffer);
+		return -1;
+	}
+
+	s_close (fd);
+	return 0;
+}
+
+int
+glibtop_get_proc_data_usage_s (glibtop *server,
+      			       struct prusage *prusage,
+			       pid_t pid)
+{
+	int fd;
+	char buffer [BUFSIZ];
+
+	sprintf (buffer, "/proc/%d", (int) pid);
+	fd = s_open (buffer, O_RDONLY);
+	if (fd < 0) {
+	   	if(errno != EPERM && errno != EACCES)
+			glibtop_warn_io_r (server, "open (%s)", buffer);
+		return -1;
+	}
+
+	if(ioctl(fd, PIOCUSAGE, prusage) < 0)
+	{
+		s_close (fd);
+		glibtop_warn_io_r (server, "ioctl(%s, PIOCUSAGE)", buffer);
+		return -1;
+	}
+
+	s_close (fd);
+	return 0;
+}
+
+int
+glibtop_get_proc_credentials_s(glibtop *server,
+      			       struct prcred *prcred,
+			       gid_t *groups,
+			       pid_t pid)
+{
+	int fd;
+	size_t toread;
+	char buffer[BUFSIZ];
+
+	sprintf(buffer, "/proc/%d", (int)pid);
+	if((fd = s_open(buffer, O_RDONLY)) < 0)
+	{
+	   	if(errno != EPERM && errno != EACCES)
+		   	glibtop_warn_io_r(server, "open (%s)", buffer);
+		return -1;
+	}
+	if(ioctl(fd, PIOCCRED, prcred) < 0)
+	{
+	   	s_close(fd);
+		glibtop_warn_io_r(server, "ioctl(%s, PIOCCRED)", buffer);
+		return -1;
+	}
+	s_close(fd);
+	return 0;
+}
+
+int
+glibtop_get_proc_status_s(glibtop *server, struct prstatus *pstatus, pid_t pid)
+{
+	int fd;
+	char buffer[BUFSIZ];
+
+	sprintf(buffer, "/proc/%d", (int)pid);
+	if((fd = s_open(buffer, O_RDONLY)) < 0)
+	{
+	   	if(errno != EPERM && errno != EACCES)
+		   	glibtop_warn_io_r(server, "open (%s)", buffer);
+		return -1;
+	}
+	if(ioctl(fd, PIOCSTATUS, pstatus) < 0)
+	{
+	   	s_close(fd);
+		glibtop_warn_io_r(server, "ioctl(%s, PIOCSTATUS)", buffer);
+		return -1;
+	}
+	s_close(fd);
+	return 0;
+}
+#endif

sysdeps/solaris/proclist.c

@@ -33,8 +33,8 @@
 #define GLIBTOP_PROCLIST_FLAGS	3
 
 static const unsigned long _glibtop_sysdeps_proclist =
-(1 << GLIBTOP_PROCLIST_TOTAL) + (1 << GLIBTOP_PROCLIST_NUMBER) +
-(1 << GLIBTOP_PROCLIST_SIZE);
+(1L << GLIBTOP_PROCLIST_TOTAL) + (1L << GLIBTOP_PROCLIST_NUMBER) +
+(1L << GLIBTOP_PROCLIST_SIZE);
 
 /* Init function. */
 
@@ -61,13 +61,47 @@ glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 	DIR *proc;
 	struct dirent *entry;
 	char buffer [BUFSIZ];
-	unsigned count, total, pid;
+	unsigned count, total, pid, mask;
 	unsigned pids [BLOCK_COUNT], *pids_chain = NULL;
 	unsigned pids_size = 0, pids_offset = 0, new_size;
 	struct stat statb;
 	int len, i, ok;
 
 	memset (buf, 0, sizeof (glibtop_proclist));
+	mask = which & ~GLIBTOP_KERN_PROC_MASK;
+	which &= GLIBTOP_KERN_PROC_MASK;
+
+	/* Check if the user wanted only one process */
+
+	if(which == GLIBTOP_KERN_PROC_PID)
+	{
+	   if(mask)
+	   {
+#ifdef HAVE_PROCFS_H
+	      struct psinfo psinfo;
+#else
+	      struct prpsinfo psinfo;
+#endif
+	      if(glibtop_get_proc_data_psinfo_s(server, &psinfo, pid))
+		 return NULL;
+	      if(mask & GLIBTOP_EXCLUDE_IDLE && !psinfo.pr_pctcpu)
+		 return NULL;
+	      if(mask & GLIBTOP_EXCLUDE_SYSTEM && psinfo.pr_flag & SSYS)
+		 return NULL;
+	      if(mask & GLIBTOP_EXCLUDE_NOTTY && psinfo.pr_ttydev == PRNODEV)
+		 return NULL;
+	   }
+	   else
+	   {
+	      sprintf(buffer, "/proc/%d", arg);
+	      if(s_stat(buffer, &statb) < 0)
+		 return NULL;
+	   }
+	   if(!(pids_chain = glibtop_malloc(sizeof(unsigned))))
+	      return NULL;
+	   *pids_chain = pid;
+	   return pids_chain;
+	}
 
 	proc = opendir ("/proc");
 	if (!proc) return NULL;
@@ -79,23 +113,78 @@ glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 		ok = 1; len = strlen (entry->d_name);
 
 		/* does it consist entirely of digits? */
-		
+#if 0
+		/* It does, except for "." and "..". Let's speed up */
+
 		for (i = 0; i < len; i++)
 			if (!isdigit (entry->d_name [i])) ok = 0;
 		if (!ok) continue;
+#else
+		if(entry->d_name[0] == '.')
+		   continue;
+#endif
 
 		/* convert it in a number */
-
+#if 0
 		if (sscanf (entry->d_name, "%u", &pid) != 1) continue;
+#else
+		pid = (unsigned)atol(entry->d_name);
+#endif
 
-		/* is it really a directory? */
+#ifdef HAVE_PROCFS_H
 
-		sprintf (buffer, "/proc/%d", pid);
-		
-		if (stat (buffer, &statb)) continue;
+		/* Can we skip it based on the request? We have
+		   RUID and RGID in struct stat. But we can't do it
+		   like this for LP64 process, because stat() will fail.
+		   XXX Unimplemented for now */
 
-		if (!S_ISDIR (statb.st_mode)) continue;
+		if(!mask && which == GLIBTOP_KERN_PROC_RUID)
+		{
+		   sprintf (buffer, "/proc/%d", pid);
+		   if (s_stat (buffer, &statb)) continue;
 
+		   if (!S_ISDIR (statb.st_mode)) continue;
+
+		   if(statb.st_uid != arg) continue;
+		}
+
+		if(mask || which != GLIBTOP_KERN_PROC_ALL)
+		{
+		   struct psinfo psinfo;
+
+		   if(glibtop_get_proc_data_psinfo_s(server, &psinfo, pid))
+		      continue;
+		   if(mask)
+		   {
+		      if(mask & GLIBTOP_EXCLUDE_IDLE && !psinfo.pr_pctcpu)
+			 continue;
+		      if(mask & GLIBTOP_EXCLUDE_SYSTEM && psinfo.pr_flag & SSYS)
+			 continue;
+		      if(mask & GLIBTOP_EXCLUDE_NOTTY
+			 && psinfo.pr_ttydev == PRNODEV)
+			 continue;
+		   }
+		   switch(which)
+		   {
+		      case GLIBTOP_KERN_PROC_PGRP:    if(psinfo.pr_pgid != arg)
+						         continue;
+						      break;
+		      case GLIBTOP_KERN_PROC_SESSION: if(psinfo.pr_sid != arg)
+							 continue;
+						      break;
+		      case GLIBTOP_KERN_PROC_TTY:    if(psinfo.pr_ttydev != arg)
+						         continue;
+						      break;
+		      case GLIBTOP_KERN_PROC_UID:     if(psinfo.pr_euid != arg)
+							 continue;
+						      break;
+		      case GLIBTOP_KERN_PROC_RUID:    if(psinfo.pr_uid != arg)
+						         continue;
+						      break;
+		      default:			      break;
+		   }
+		}
+#endif
 		/* Fine. Now we first try to store it in pids. If this buffer is
 		 * full, we copy it to the pids_chain. */
 
@@ -126,7 +215,7 @@ glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 		total++;
 	}
 	
-	closedir (proc);
+	s_closedir (proc);
 
 	/* count is only zero if an error occured (one a running Linux system,
 	 * we have at least one single process). */

sysdeps/solaris/procmap.c

@@ -30,12 +30,17 @@
 #include <errno.h>
 #include <alloca.h>
 
+#include "safeio.h"
+
+
 static const unsigned long _glibtop_sysdeps_proc_map =
 (1L << GLIBTOP_PROC_MAP_NUMBER) + (1L << GLIBTOP_PROC_MAP_TOTAL) +
 (1L << GLIBTOP_PROC_MAP_SIZE);
 static const unsigned long _glibtop_sysdeps_map_entry =
 (1L << GLIBTOP_MAP_ENTRY_START) + (1L << GLIBTOP_MAP_ENTRY_END) +
 (1L << GLIBTOP_MAP_ENTRY_OFFSET) + (1L << GLIBTOP_MAP_ENTRY_PERM);
+static const unsigned long _glibtop_sysdeps_map_device =
+(1L << GLIBTOP_MAP_ENTRY_DEVICE) + (1L << GLIBTOP_MAP_ENTRY_INODE);
 
 
 /* Init function. */
@@ -51,51 +56,103 @@ glibtop_init_proc_map_s (glibtop *server)
 glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 {
-   	int fd, i, nmaps;
+   	int fd, i, nmaps, pr_err, heap;
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+	prxmap_t *maps;
+	struct ps_prochandle *Pr;
+#else
 	prmap_t *maps;
+#endif
+
+	/* A few defines, to make it shorter down there */
+
+#ifdef HAVE_PROCFS_H
+# define OFFSET  pr_offset
+#else
+# define OFFSET  pr_off
+#endif
+
 	glibtop_map_entry *entry;
 	struct stat inode;
 	char buffer[BUFSIZ];
 	
 	memset (buf, 0, sizeof (glibtop_proc_map));
 
-	sprintf(buffer, "/proc/%d/map", (int)pid);
-	if((fd = open(buffer, O_RDONLY)) < 0)
+#ifdef HAVE_PROCFS_H
+	sprintf(buffer, "/proc/%d/xmap", (int)pid);
+#else
+	sprintf(buffer, "/proc/%d", (int)pid);
+#endif
+	if((fd = s_open(buffer, O_RDONLY)) < 0)
 	{
 	   	if(errno != EPERM && errno != EACCES)
 		   	glibtop_warn_io_r(server, "open (%s)", buffer);
 		return NULL;
 	}
+#ifdef HAVE_PROCFS_H
 	if(fstat(fd, &inode) < 0)
 	{
 	   	if(errno != EOVERFLOW)
 		   	glibtop_warn_io_r(server, "fstat (%s)", buffer);
 		/* else call daemon for 64-bit support */
-		close(fd);
+		s_close(fd);
 		return NULL;
 	}
 	maps = alloca(inode.st_size);
-	nmaps = inode.st_size / sizeof(prmap_t);
-	if(pread(fd, maps, inode.st_size, 0) != inode.st_size)
+	nmaps = inode.st_size / sizeof(prxmap_t);
+	if(s_pread(fd, maps, inode.st_size, 0) != inode.st_size)
 	{
 	   	glibtop_warn_io_r(server, "pread (%s)", buffer);
-		close(fd);
+		s_close(fd);
 		return NULL;
 	}
-	close(fd);
-	if(!(entry = glibtop_malloc_r(server, nmaps * sizeof(glibtop_map_entry))))
+#else
+	if(ioctl(fd, PIOCNMAP, &nmaps) < 0)
+	{
+	   	glibtop_warn_io_r(server, "ioctl(%s, PIOCNMAP)", buffer);
+		s_close(fd);
+		return NULL;
+	}
+	maps = alloca((nmaps + 1) * sizeof(prmap_t));
+	if(ioctl(fd, PIOCMAP, maps) < 0)
+	{
+	   	glibtop_warn_io_r(server, "ioctl(%s, PIOCMAP)", buffer);
+		s_close(fd);
+		return NULL;
+	}
+#endif
+	if(!(entry = glibtop_malloc_r(server,
+		    		      nmaps * sizeof(glibtop_map_entry))))
 	   	return NULL;
-
 	buf->number = nmaps;
 	buf->size = sizeof(glibtop_map_entry);
 	buf->total = nmaps * sizeof(glibtop_map_entry);
 
 	memset(entry, 0, nmaps * sizeof(glibtop_map_entry));
-	for(i = 0; i < nmaps; ++i)
+
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+
+	if(server->machine.objname && server->machine.pgrab &&
+	   server->machine.pfree)
+	   Pr = (server->machine.pgrab)(pid, 1, &pr_err);
+#endif
+	for(heap = 0,i = 0; i < nmaps; ++i)
 	{
+	   	int len;
+
 	   	entry[i].start = maps[i].pr_vaddr;
 		entry[i].end = maps[i].pr_vaddr + maps[i].pr_size;
-		entry[i].offset = maps[i].pr_offset;
+
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+
+		if(maps[i].pr_dev != PRNODEV)
+		{
+		   entry[i].device = maps[i].pr_dev;
+		   entry[i].inode = maps[i].pr_ino;
+		   entry[i].flags |= _glibtop_sysdeps_map_device;
+		}
+#endif
+		entry[i].offset = maps[i].OFFSET;
 		if(maps[i].pr_mflags & MA_READ)
 		   	entry[i].perm |= GLIBTOP_MAP_PERM_READ;
 		if(maps[i].pr_mflags & MA_WRITE)
@@ -107,8 +164,44 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 		else
 		   	entry[i].perm |= GLIBTOP_MAP_PERM_PRIVATE;
 		entry[i].flags = _glibtop_sysdeps_map_entry;
+
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+
+		if(maps[i].pr_mflags & MA_ANON)
+		{
+		   if(!heap)
+		   {
+		      ++heap;
+		      strcpy(entry[i].filename, "[ heap ]");
+		   }
+		   else
+		      if(i == nmaps - 1)
+			 strcpy(entry[i].filename, "[ stack ]");
+		      else
+			 strcpy(entry[i].filename, "[ anon ]");
+		   entry[i].flags |= (1L << GLIBTOP_MAP_ENTRY_FILENAME);
+		}
+		else
+		   if(Pr)
+		   {
+		      server->machine.objname(Pr, maps[i].pr_vaddr, buffer,
+					      BUFSIZ);
+		      if((len = resolvepath(buffer, entry[i].filename,
+					    GLIBTOP_MAP_FILENAME_LEN)) > 0)
+		      {
+			 entry[i].filename[len] = 0;
+			 entry[i].flags |= (1L << GLIBTOP_MAP_ENTRY_FILENAME);
+		      }
+		   }
+#endif
 	}
-	
+
+#if GLIBTOP_SOLARIS_RELEASE >= 560
+
+	if(Pr)
+	   	server->machine.pfree(Pr);
+#endif
 	buf->flags = _glibtop_sysdeps_proc_map;
+	s_close(fd);
 	return entry;
 }

sysdeps/solaris/procmem.c

@@ -24,7 +24,9 @@
 #include <glibtop.h>
 #include <glibtop/procmem.h>
 
-static const unsigned long _glibtop_sysdeps_proc_mem = 0;
+static const unsigned long _glibtop_sysdeps_proc_mem =
+(1L << GLIBTOP_PROC_MEM_SIZE) + (1L << GLIBTOP_PROC_MEM_VSIZE) +
+(1L << GLIBTOP_PROC_MEM_RESIDENT) + (1L << GLIBTOP_PROC_MEM_RSS);
 
 /* Init function. */
 
@@ -37,8 +39,26 @@ glibtop_init_proc_mem_s (glibtop *server)
 /* Provides detailed information about a process. */
 
 void
-glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf,
-			pid_t pid)
+glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
 {
+#ifdef HAVE_PROCFS_H
+   	struct psinfo psinfo;
+#else
+	struct prpsinfo psinfo;
+	int pagesize = server->machine.pagesize;
+#endif
+
 	memset (buf, 0, sizeof (glibtop_proc_mem));
+
+	if(glibtop_get_proc_data_psinfo_s(server, &psinfo, pid))
+	   	return;
+
+#ifdef HAVE_PROCFS_H
+	buf->size = buf->vsize = psinfo.pr_size << 10;
+	buf->resident = buf->rss = psinfo.pr_rssize << 10;
+#else
+	buf->size = buf->vsize = psinfo.pr_size << pagesize << 10;
+	buf->resident = buf->rss = psinfo.pr_rssize << pagesize << 10;
+#endif
+	buf->flags = _glibtop_sysdeps_proc_mem;
 }

sysdeps/solaris/procsignal.c

@@ -43,7 +43,11 @@ void
 glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf,
 			   pid_t pid)
 {
+#ifdef HAVE_PROCFS_H
    	struct pstatus pstatus;
+#else
+	struct prstatus pstatus;
+#endif
 	int size;
 
 	memset (buf, 0, sizeof (glibtop_proc_signal));
@@ -57,7 +61,11 @@ glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf,
 	   	size = sizeof(sigset_t);
 
 	memcpy(buf->signal, &pstatus.pr_sigpend, size);
+#ifdef HAVE_PROCFS_H
 	memcpy(buf->blocked, &pstatus.pr_lwp.pr_lwphold, size);
+#else
+	memcpy(buf->blocked, &pstatus.pr_lwppend, size);
+#endif
 
 	/* Technically, most of this is meaningless on a process level,
 	   but this should be a good enough approximation. */

sysdeps/solaris/procstate.c

@@ -27,11 +27,15 @@
 #include <glibtop_private.h>
 
 static const unsigned long _glibtop_sysdeps_proc_state =
-(1L << GLIBTOP_PROC_STATE_CMD) + (1L << GLIBTOP_PROC_STATE_STATE) +
-(1L << GLIBTOP_PROC_STATE_UID) + (1L << GLIBTOP_PROC_STATE_GID) +
-(1L << GLIBTOP_PROC_STATE_RUID) + (1L << GLIBTOP_PROC_STATE_RGID) +
+#if (LIBGTOP_VERSION_CODE >= 1001002) && defined(HAVE_PROCFS_H)
 (1L << GLIBTOP_PROC_STATE_HAS_CPU) + (1L << GLIBTOP_PROC_STATE_PROCESSOR) +
-(1L << GLIBTOP_PROC_STATE_LAST_PROCESSOR);
+(1L << GLIBTOP_PROC_STATE_LAST_PROCESSOR) +
+#endif
+#if LIBGTOP_VERSION_CODE >= 1001002
+(1L << GLIBTOP_PROC_STATE_RUID) + (1L << GLIBTOP_PROC_STATE_RGID) +
+#endif
+(1L << GLIBTOP_PROC_STATE_CMD) + (1L << GLIBTOP_PROC_STATE_STATE) +
+(1L << GLIBTOP_PROC_STATE_UID) + (1L << GLIBTOP_PROC_STATE_GID);
 
 /* Init function. */
 
@@ -46,7 +50,11 @@ glibtop_init_proc_state_s (glibtop *server)
 void
 glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
 {
+#ifdef HAVE_PROCFS_H
 	struct psinfo psinfo;
+#else
+	struct prpsinfo psinfo;
+#endif
 
 	memset (buf, 0, sizeof (glibtop_proc_state));
 
@@ -55,24 +63,59 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
 
 	buf->uid = psinfo.pr_euid;
 	buf->gid = psinfo.pr_egid;
+#if LIBGTOP_VERSION_CODE >= 1001002
 	buf->ruid = psinfo.pr_uid;
 	buf->rgid = psinfo.pr_gid;
+#endif
+#ifdef HAVE_PROCFS_H
 	switch(psinfo.pr_lwp.pr_state)
+#else
+        switch(psinfo.pr_state)
+#endif
 	{
-	    case SONPROC: buf->has_cpu = 1;
-			  buf->processor = psinfo.pr_lwp.pr_onpro;
-	    case SRUN:    buf->state = GLIBTOP_PROCESS_RUNNING;
-			  break;
-	    case SZOMB:   buf->state = GLIBTOP_PROCESS_ZOMBIE;
-			  break;
-	    case SSLEEP:
-	    case SSTOP:   buf->state = GLIBTOP_PROCESS_STOPPED;
-			  break;
-	    case SIDL:    buf->state = GLIBTOP_PROCESS_UNINTERRUPTIBLE;
+		case SONPROC: 
+#if (LIBGTOP_VERSION_CODE >= 1001002) && defined(HAVE_PROCFS_H)
+			buf->has_cpu = 1;
+			buf->processor = psinfo.pr_lwp.pr_onpro;
+#endif
+		case SRUN:
+#if LIBGTOP_VERSION_CODE >= 1001002
+			buf->state = GLIBTOP_PROCESS_RUNNING;
+#else
+			buf->state = 'R';
+#endif
+			break;
+		case SZOMB:
+#if LIBGTOP_VERSION_CODE >= 1001002
+			buf->state = GLIBTOP_PROCESS_ZOMBIE;
+#else
+			buf->state = 'Z';
+#endif
+			break;
+		case SSLEEP:
+#if LIBGTOP_VERSION_CODE >= 1001002
+			buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
+#else
+			buf->state = 'S';
+#endif
+			break;
+		case SSTOP:
+#if LIBGTOP_VERSION_CODE >= 1001002
+			buf->state = GLIBTOP_PROCESS_STOPPED;
+#else
+			buf->state = 'T';
+#endif
+			break;
+		case SIDL:
+#if LIBGTOP_VERSION_CODE >= 1001002
+			buf->state = GLIBTOP_PROCESS_UNINTERRUPTIBLE;
+#else
+			buf->state = 'D';
+#endif
 	}
+#if (LIBGTOP_VERSION_CODE >= 1001002) && defined(HAVE_PROCFS_H)
 	buf->last_processor = psinfo.pr_lwp.pr_onpro;
-
-
+#endif
 	strncpy (buf->cmd, psinfo.pr_fname, 39);
 
 	buf->flags = _glibtop_sysdeps_proc_state;

sysdeps/solaris/proctime.c

@@ -27,8 +27,8 @@
 #include <glibtop_private.h>
 
 static const unsigned long _glibtop_sysdeps_proc_time =
-(1 << GLIBTOP_PROC_TIME_START_TIME) + (1 << GLIBTOP_PROC_TIME_RTIME) +
-(1 << GLIBTOP_PROC_TIME_UTIME) + (1 << GLIBTOP_PROC_TIME_STIME);
+(1L << GLIBTOP_PROC_TIME_START_TIME) + (1L << GLIBTOP_PROC_TIME_RTIME) +
+(1L << GLIBTOP_PROC_TIME_UTIME) + (1L << GLIBTOP_PROC_TIME_STIME);
 
 /* Init function. */
 
@@ -48,18 +48,22 @@ glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf,
 
 	memset (buf, 0, sizeof (glibtop_proc_time));
 
-	if (glibtop_get_proc_data_usage_s (server, &prusage, pid))
-		return;
+	/* Don't do it for scheduler, we don't want to frighten our users */
 
-	buf->start_time = prusage.pr_create.tv_sec * 1E+6 +
-		prusage.pr_create.tv_nsec / 1E+3;
+	if(pid)
+	{
+		if (glibtop_get_proc_data_usage_s (server, &prusage, pid))
+			return;
 
-	buf->rtime = prusage.pr_rtime.tv_sec * 1E+6 +
-		prusage.pr_rtime.tv_nsec / 1E+3;
-	buf->utime = prusage.pr_utime.tv_sec * 1E+6 +
-		prusage.pr_utime.tv_nsec / 1E+3;
-	buf->stime = prusage.pr_stime.tv_sec * 1E+6 +
-		prusage.pr_stime.tv_nsec / 1E+3;
+		buf->start_time = prusage.pr_create.tv_sec;
+
+		buf->rtime = prusage.pr_rtime.tv_sec * 1E+6 +
+			prusage.pr_rtime.tv_nsec / 1E+3;
+		buf->utime = prusage.pr_utime.tv_sec * 1E+6 +
+			prusage.pr_utime.tv_nsec / 1E+3;
+		buf->stime = prusage.pr_stime.tv_sec * 1E+6 +
+			prusage.pr_stime.tv_nsec / 1E+3;
+	}
 
 	buf->flags = _glibtop_sysdeps_proc_time;
 }

sysdeps/solaris/procuid.c

@@ -34,9 +34,15 @@ static const unsigned long _glibtop_sysdeps_proc_uid_psinfo =
 (1L << GLIBTOP_PROC_UID_TTY) + (1L << GLIBTOP_PROC_UID_PRIORITY) +
 (1L << GLIBTOP_PROC_UID_NICE);
 static const unsigned long _glibtop_sysdeps_proc_uid_prcred =
+#if LIBGTOP_VERSION_CODE >= 1001002
+#ifdef HAVE_PROCFS_H
+(1L << GLIBTOP_PROC_UID_GROUPS) +
+#endif
 (1L << GLIBTOP_PROC_UID_SUID) + (1L << GLIBTOP_PROC_UID_SGID) +
-(1L << GLIBTOP_PROC_UID_NGROUPS) + (1L << GLIBTOP_PROC_UID_GROUPS);
-
+(1L << GLIBTOP_PROC_UID_NGROUPS);
+#else
+0;
+#endif
 /* Init function. */
 
 void
@@ -51,8 +57,18 @@ glibtop_init_proc_uid_s (glibtop *server)
 void
 glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
 {
-	struct psinfo psinfo;
+#if LIBGTOP_VERSION_CODE >= 1001002
 	struct prcred prcred;
+#endif
+#ifdef HAVE_PROCFS_H
+	struct psinfo psinfo;
+#if LIBGTOP_VERSION_CODE >= 1001002
+	gid_t groups[GLIBTOP_MAX_GROUPS];
+#endif
+#else
+	struct prpsinfo psinfo;
+	gid_t groups[1];	/* dummy for consistent function prototype */
+#endif
 
 	memset (buf, 0, sizeof (glibtop_proc_uid));
 
@@ -66,17 +82,27 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
 
 	buf->pid = psinfo.pr_pid;
 	buf->ppid = psinfo.pr_ppid;
+#ifdef HAVE_PROCFS_H
 	buf->pgrp = psinfo.pr_pgid;
+#else
+	buf->pgrp = psinfo.pr_pgrp;
+#endif
 
 	buf->session = psinfo.pr_sid;
 	buf->tty = psinfo.pr_ttydev;
 
+#ifdef HAVE_PROCFS_H
 	buf->priority = psinfo.pr_lwp.pr_pri;
-	buf->nice = psinfo.pr_lwp.pr_nice;
+	buf->nice = psinfo.pr_lwp.pr_nice - NZERO;
+#else
+	buf->priority = psinfo.pr_pri;
+	buf->nice = psinfo.pr_nice - NZERO;
+#endif
 
 	buf->flags = _glibtop_sysdeps_proc_uid_psinfo;
 
-	if(glibtop_get_proc_credentials_s(server, &prcred, pid))
+#if LIBGTOP_VERSION_CODE >= 1001002
+	if(glibtop_get_proc_credentials_s(server, &prcred, groups, pid))
 		return;
 
 	buf->suid = prcred.pr_suid;
@@ -84,15 +110,18 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
 	buf->ngroups = (prcred.pr_ngroups <= GLIBTOP_MAX_GROUPS) ?
 	   		prcred.pr_ngroups : GLIBTOP_MAX_GROUPS;
 
+#ifdef HAVE_PROCFS_H
 	if(sizeof(int) == sizeof(gid_t))
-	   	memcpy(buf->groups, prcred.pr_groups,
-		       buf->ngroups * sizeof(gid_t));
+	   	memcpy(buf->groups, &groups, buf->ngroups * sizeof(gid_t));
 	else
 	{
 	   	int i;
 
 		for(i = 0; i < buf->ngroups; ++i)
-		   	buf->groups[i] = prcred.pr_groups[i];
+		   	buf->groups[i] = groups[i];
 	}
+#endif
+#endif
+
 	buf->flags += _glibtop_sysdeps_proc_uid_prcred;
 }

sysdeps/solaris/safeio.c

@@ -0,0 +1,84 @@
+/* Copyright (C) 1999 Drazen Kacar
+   This file is part of LibGTop 1.0.
+
+   Contributed by Drazen Kacar <dave@srce.hr>, May 1999.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <errno.h>
+
+int
+s_open(const char *file, int mode)
+{
+   int fd;
+
+   do {
+      fd = open(file, mode);
+   } while(fd < 0 && errno == EINTR);
+   return fd;
+}
+
+int
+s_stat(const char *path, struct stat *buf)
+{
+   int status;
+
+   do {
+      status = stat(path, buf);
+   } while(status < 0 && errno == EINTR);
+   return status;
+}
+
+int
+s_close(int fd)
+{
+   int status;
+
+   do {
+      status = close(fd);
+   } while(status < 0 && errno == EINTR);
+   return status;
+}
+
+ssize_t
+s_pread(int fd, void *buf, size_t nbytes, off_t offset)
+{
+   ssize_t len;
+
+   /* Now, why doesn't the pread(2) man page say anything about pread()
+      return values? Can it read less bytes than requested? */
+
+   do {
+      len = pread(fd, buf, nbytes, offset);
+   } while(len < 0 && errno == EINTR);
+   return len;
+}
+
+int s_closedir(DIR *dirp)
+{
+   int status;
+
+   do {
+      status = closedir(dirp);
+   } while(status < 0 && errno == EINTR);
+   return status;
+}

sysdeps/solaris/safeio.h

@@ -0,0 +1,48 @@
+/* Copyright (C) 1999 Drazen Kacar
+   This file is part of LibGTop 1.0.
+
+   Contributed by Drazen Kacar <dave@srce.hr>, May 1999.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __GLIBTOP_SAFEIO_H__
+#define __GLIBTOP_SAFEIO_H__
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+
+BEGIN_LIBGTOP_DECLS
+
+int
+s_open(const char *, int);
+
+int
+s_stat(const char *, struct stat *);
+
+int
+s_close(int);
+
+ssize_t
+s_pread(int, void *, size_t, off_t);
+
+int
+s_closedir(DIR *);
+
+END_LIBGTOP_DECLS
+
+#endif

sysdeps/solaris/sem_limits.c

@@ -29,16 +29,19 @@
 
 static struct nlist nlst[] = { {"seminfo"}, {NULL} };
 static const unsigned long _glibtop_sysdeps_sem_limits =
-(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) +
-(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) +
-(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) +
-(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) +
-(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM);
+#if GLIBTOP_SOLARIS_RELEASE <= 570
+(1L << GLIBTOP_IPC_SEMMAP) +
+#endif
+(1L << GLIBTOP_IPC_SEMMNI) + (1L << GLIBTOP_IPC_SEMMNS) +
+(1L << GLIBTOP_IPC_SEMMNU) + (1L << GLIBTOP_IPC_SEMMSL) +
+(1L << GLIBTOP_IPC_SEMOPM) + (1L << GLIBTOP_IPC_SEMUME) +
+(1L << GLIBTOP_IPC_SEMUSZ) + (1L << GLIBTOP_IPC_SEMVMX) +
+(1L << GLIBTOP_IPC_SEMAEM);
 
 /* Init function. */
 
 void
-glibtop_init_sem_limits_s (glibtop *server)
+glibtop_init_sem_limits_p (glibtop *server)
 {
    	kvm_t *kd = server->machine.kd;
 
@@ -51,7 +54,7 @@ glibtop_init_sem_limits_s (glibtop *server)
 /* Provides information about sysv sem limits. */
 
 void
-glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
+glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
 {
    	kvm_t *kd = server->machine.kd;
 	struct seminfo sinfo;
@@ -63,7 +66,12 @@ glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
 	if(kvm_read(kd, nlst[0].n_value, (void *)&sinfo,
 		    sizeof(struct seminfo)) != sizeof(struct seminfo))
 	   	return;
+
+#if GLIBTOP_SOLARIS_RELEASE <= 570
+	/* This field don't exist anymore in Solaris 8.
+	 * Thanks to Laszlo PETER <Laszlo.Peter@ireland.sun.com>. */
 	buf->semmap = sinfo.semmap;
+#endif
 	buf->semmni = sinfo.semmni;
 	buf->semmns = sinfo.semmns;
 	buf->semmnu = sinfo.semmnu;

sysdeps/solaris/shm_limits.c

@@ -35,7 +35,7 @@ static const unsigned long _glibtop_sysdeps_shm_limits =
 /* Init function. */
 
 void
-glibtop_init_shm_limits_s (glibtop *server)
+glibtop_init_shm_limits_p (glibtop *server)
 {
    	kvm_t *kd = server->machine.kd;
 
@@ -48,7 +48,7 @@ glibtop_init_shm_limits_s (glibtop *server)
 /* Provides information about sysv ipc limits. */
 
 void
-glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
+glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
 {
    	kvm_t *kd = server->machine.kd;
 	struct shminfo sinfo;

sysdeps/solaris/siglist.c

@@ -24,104 +24,51 @@
 #include <glibtop.h>
 #include <glibtop/signal.h>
 
-static const glibtop_signame glibtop_sys_siglist [] =
+const glibtop_signame glibtop_sys_siglist [] =
 {  {  1, "SIGHUP",  "Hangup" },
    {  2, "SIGINT",  "Interrupt" },
    {  3, "SIGQUIT", "Quit" },
-   {  4, "SIGILL",  "Illegal instruction" },
-   {  5, "SIGTRAP", "Trace or breakpoint trap" },
+   {  4, "SIGILL",  "Illegal Instruction" },
+   {  5, "SIGTRAP", "Trace/Breakpoint Trap" },
    {  6, "SIGABRT", "Abort" },
-   {  7, "SIGEMT",  "Emulation trap" },
-   {  8, "SIGFPE",  "Arithmetic exception" },
-   {  9, "SIGKILL", "Kill" },
-   { 10, "SIGBUS",  "Bus error" },
-   { 11, "SIGSEGV", "Segmentation fault" },
-   { 12, "SIGSYS",  "Bad system call" },
-   { 13, "SIGPIPE", "Broken pipe" },
-   { 14, "SIGALRM", "Alarm clock" },
-   { 15, "SIGTERM", "Terminate" },
-   { 16, "SIGUSR1", "User signal 1" },
-   { 17, "SIGUSR2", "User signal 2" },
-   { 18, "SIGCHLD", "Child status changed" },
-   { 19, "SIGPWR",  "Power fail or restart" },
-   { 20, "SIGWINCH","Window size change" },
-   { 21, "SIGURG",  "Urgent socket condition" },
-   { 22, "SIGPOLL", "Pollable event" },
-   { 23, "SIGSTOP", "Stop (cannot be ignored)" },
-   { 24, "SIGTSTP", "User stop requested from tty" },
-   { 25, "SIGCONT", "Continue" },
-   { 26, "SIGTTIN", "Background tty read attempted" },
-   { 27, "SIGTTOU", "Background tty write attempted" },
-   { 28, "SIGVTALRM","Virtual timer expired" },
-   { 29, "SIGPROF", "Profiling timer expired" },
-   { 30, "SIGXCPU", "CPU time limit exceeded" },
-   { 31, "SIGXFSZ", "File size limit exceeded" },
-   { 32, "SIGWAITING","process' lwps are blocked" },
-   { 33, "SIGLWP",  "Inter-LWP signal reserved by threads library" },
-   { 34, "SIGFREEZE","Check point freeze" },
-   { 35, "SIGTHAW", "Check point thaw" },
-   { 36, "SIGCANCEL","Cancelation signal reserved by threads library" },
-   { 37, "SIGLOST", "Resource lost" },
+   {  7, "SIGEMT",  "Emulation Trap" },
+   {  8, "SIGFPE",  "Arithmetic Exception" },
+   {  9, "SIGKILL", "Killed" },
+   { 10, "SIGBUS",  "Bus Error" },
+   { 11, "SIGSEGV", "Segmentation Fault" },
+   { 12, "SIGSYS",  "Bad System Call" },
+   { 13, "SIGPIPE", "Broken Pipe" },
+   { 14, "SIGALRM", "Alarm Clock" },
+   { 15, "SIGTERM", "Terminated" },
+   { 16, "SIGUSR1", "User Signal 1" },
+   { 17, "SIGUSR2", "User Signal 2" },
+   { 18, "SIGCHLD", "Child Status Changed" },
+   { 19, "SIGPWR",  "Power-Fail/Restart" },
+   { 20, "SIGWINCH","Window Size Change" },
+   { 21, "SIGURG",  "Urgent Socket Condition" },
+   { 22, "SIGPOLL", "Pollable Event" },
+   { 23, "SIGSTOP", "Stoped (signal)" },
+   { 24, "SIGTSTP", "Stopped (user)" },
+   { 25, "SIGCONT", "Continued" },
+   { 26, "SIGTTIN", "Stopped (tty input)" },
+   { 27, "SIGTTOU", "Stopped (tty output)" },
+   { 28, "SIGVTALRM","Virtual Timer Expired" },
+   { 29, "SIGPROF", "Profiling Timer Expired" },
+   { 30, "SIGXCPU", "Cpu Limit Exceeded" },
+   { 31, "SIGXFSZ", "File Size Limit Exceeded" },
+   { 32, "SIGWAITING","No runnable lwp" },
+   { 33, "SIGLWP",  "Inter-lwp signal" },
+   { 34, "SIGFREEZE","Checkpoint Freeze" },
+   { 35, "SIGTHAW", "Checkpoint Thaw" },
+   { 36, "SIGCANCEL","Thread Cancelation" },
+   { 37, "SIGLOST", "Resource Lost" },
+   { 38, "SIGRTMIN","First Realtime Signal" },
+   { 39, "SIGRTMIN+1", "Second Realtime Signal" },
+   { 40, "SIGRTMIN+2", "Third Realtime Signal" },
+   { 41, "SIGRTMIN+3", "Fourth Realtime Signal" },
+   { 42, "SIGRTMAX-3", "Fourth Last Realtime Signal" },
+   { 43, "SIGRTMAX-2", "Third Last Realtime Signal" },
+   { 44, "SIGRTMAX-1", "Second Last Realtime Signal" },
+   { 45, "SIGRTMAX", "Last Realtime Signal" },
    {  0, NULL, NULL }
 };
-
-/* 
- * Now, just for the fun of it, let's try to be forward and backward
- * compatible. The above list is from Solaris 7. If later releases
- * include new signals, binary from the earlier release won't be
- * able to get the signal names, but it can get the correct numbers.
- * So...
- */
-
-/*
-#define MY_PRIVATE_COUNTOF(x) (sizeof(x)/sizeof(x[0]))
-
-glibtop_signame *glibtop_sys_siglist;
-
-static char *unknown = "Unknown";
-static glibtop_signame rt_min =
-    { 0, "SIGRTMIN", "First (highest-priority) realtime signal" };
-static glibtop_signame rt_max =
-    { 0, "SIGRTMIN", "Last (lowest-priority) realtime signal" };
-static char *rt_desc = "Real time signal %d";
-
-void
-glibtop_init_signals(void)
-{
-    int rtmin, rtmax, sigs, to, i;
-    char *bureq, p;
-
-    rtmin = sysconf(_SC_SIGRT_MIN);
-    rtmax = sysconf(_SC_SIGRT_MAX);
-    sigs = MY_PRIVATE_COUNTOF(siglist);
-
-    glibtop_sys_siglist = (glibtop_signame *)
-       			  malloc(rtmax * sizeof(glibtop_signame));
-    bureq = malloc((rtmax - rtmin - 1) * (strlen(rt_desc) + 4));
-    to = (sigs <= rtmin) ? sigs : rtmin;
-    memcpy(glibtop_sys_siglist, siglist, to * sizeof(glibtop_signame));
-    for(i = sigs; i < rtmin; ++i)
-    {
-        glibtop_sys_siglist[i].number = i + 1;
-	glibtop_sys_siglist[i].name = glibtop_sys_siglist[i].label = unknown;
-    }
-    glibtop_sys_siglist[rtmin - 1].number = rtmin;
-    glibtop_sys_siglist[rtmin - 1].name = rt_min.name;
-    glibtop_sys_siglist[rtmin - 1].label = rt_min.label;
-    for(p = bureq, i = rtmin; i < rtmax; ++i)
-    {
-        glibtop_sys_siglist[i].number = i + 1;
-	to = sprintf(p, "%d", i + 1) + 1;
-	glibtop_sys_siglist[i].name = p;
-	p += to;
-	to = sprintf(p, rt_desc, i - rtmin + 2) + 1;
-	glibtop_sys_siglist[i].label = p;
-	p += to;
-    }
-    glibtop_sys_siglist[rtmax - 1].number = rtmax;
-    glibtop_sys_siglist[rtmax - 1].name = rt_max.name;
-    glibtop_sys_siglist[rtmax - 1].label = rt_max.label;
-    glibtop_sys_siglist[rtmax].number = 0;
-    glibtop_sys_siglist[rtmax].name = glibtop_sys_siglist[rtmax].label = NULL;
-}
-*/

sysdeps/solaris/uptime.c

@@ -27,7 +27,10 @@
 #include <time.h>
 
 static const unsigned long _glibtop_sysdeps_uptime =
-(1L << GLIBTOP_UPTIME_UPTIME) + (1L <<GLIBTOP_UPTIME_BOOT_TIME);
+#if LIBGTOP_VERSION_CODE >= 1001002
+(1L <<GLIBTOP_UPTIME_BOOT_TIME) +
+#endif
+(1L << GLIBTOP_UPTIME_UPTIME);
 
 /* Init function. */
 
@@ -46,7 +49,9 @@ glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
 
 	if(!(server->machine.boot))
 	    return;
+#if LIBGTOP_VERSION_CODE >= 1001002
 	buf->boot_time = server->machine.boot;
+#endif
 	buf->uptime = time(NULL) - server->machine.boot;
 
 	buf->flags = _glibtop_sysdeps_uptime;

sysdeps/stub/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
 1998-10-26  Martin Baulig  <martin@home-of-linux.org>
 
 	* netload.c: New file.

sysdeps/stub/Makefile.am

@@ -13,5 +13,5 @@ libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
 
 libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-include_HEADERS			= glibtop_server.h
-
+libgtopinclude_HEADERS		= glibtop_server.h
+libgtopincludedir		= $(includedir)/libgtop-1.0

sysdeps/stub_suid/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
 1998-10-26  Martin Baulig  <martin@home-of-linux.org>
 
 	* netload.c: New file.

sysdeps/stub_suid/Makefile.am

@@ -17,6 +17,7 @@ libgtop_sysdeps_suid_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
 
 libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-include_HEADERS			= glibtop_server.h glibtop_machine.h
+libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
+libgtopincludedir		= $(includedir)/libgtop-1.0
 
 noinst_HEADERS			= glibtop_suid.h

sysdeps/sun4/ChangeLog

@@ -1,3 +1,7 @@
+2001-10-17  Abel Cheung <maddog@linux.org.hk>
+
+	* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
+
 1998-10-25  Martin Baulig  <martin@home-of-linux.org>
 
 	* ppp.c: New file.

sysdeps/sun4/Makefile.am

@@ -16,6 +16,7 @@ libgtop_sysdeps_suid_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 libgtop_sysdeps_suid_la_LDFLAGS	= $(LT_VERSION_INFO)
 libgtop_sysdeps_suid_la_LIBADD	= -lkvm
 
-include_HEADERS			= glibtop_server.h glibtop_machine.h
+libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
+libgtopincludedir		= $(includedir)/libgtop-1.0
 
 noinst_HEADERS			= glibtop_suid.h