version 2.6.0

2004-04-07  Bastien Nocera  <hadess@hadess.net>

	* configure.in: version 2.6.0

ChangeLog

@@ -1,3 +1,137 @@
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in: version 2.6.0
+
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: fix typo in the #defines for
+	FSUSAGE_BLOCK_SIZE (patch by Beno<6E>t Dejean <TazForEver@free.fr>)
+
+2004-03-30  Adam Weinberger  <adamw@gnome.org>
+
+	* configure.in: Added en_CA (Canadian English) to ALL_LINGUAS.
+
+2004-03-22  Gareth Owen  <gowen72@yahoo.com>
+
+	* configure.in: Added en_GB to ALL_LINGUAS
+
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * configure.in: Added "pa" (Punjabi) to ALL_LINGUAS.
+
+2004-03-15  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/fsusage.h: set GLIBTOP_MAX_FSUSAGE properly,
+	use gint in the headers instead of int (Closes: #125049)
+
+2004-03-11  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Up versions etc.
+	* po/am.po: Update foo.
+	* po/ar.po:
+	* po/az.po:
+	* po/be.po:
+	* po/bg.po:
+	* po/bn.po:
+	* po/ca.po:
+	* po/cs.po:
+	* po/cy.po:
+	* po/da.po:
+	* po/de.po:
+	* po/el.po:
+	* po/es.po:
+	* po/et.po:
+	* po/fa.po:
+	* po/fi.po:
+	* po/fr.po:
+	* po/ga.po:
+	* po/gl.po:
+	* po/he.po:
+	* po/hi.po:
+	* po/hr.po:
+	* po/hu.po:
+	* po/id.po:
+	* po/it.po:
+	* po/ja.po:
+	* po/ko.po:
+	* po/lt.po:
+	* po/lv.po:
+	* po/mk.po:
+	* po/ml.po:
+	* po/mn.po:
+	* po/ms.po:
+	* po/nl.po:
+	* po/nn.po:
+	* po/no.po:
+	* po/pl.po:
+	* po/pt.po:
+	* po/pt_BR.po:
+	* po/ro.po:
+	* po/ru.po:
+	* po/sk.po:
+	* po/sl.po:
+	* po/sq.po:
+	* po/sr.po:
+	* po/sr@Latn.po:
+	* po/sv.po:
+	* po/ta.po:
+	* po/tr.po:
+	* po/uk.po:
+	* po/vi.po:
+	* po/zh_CN.po:
+	* po/zh_TW.po:
+
+2004-03-11  Bastien Nocera  <hadess@hadess.net>
+
+	* NEWS: update the NEWS file for the release
+
+2004-03-11  Bastien Nocera  <hadess@hadess.net>
+
+	* include/Makefile.am: fix distchecking
+
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* include/glibtop/fsusage.h: Added block_size field. (Closes: #125049)
+
+2004-03-05  Bastien Nocera  <hadess@hadess.net>
+
+	* include/glibtop/procmap.h: patch by Benoit Dejean <bnet@ifrance.com>
+	to break the API, I mean, to make it easier to generate Python bindings
+	(Closes: #129701)
+
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* configure.in:
+	* include/libgtop-i18n.h:
+	* lib/lib.pl:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* sysdeps/names/cpu.c:
+	* sysdeps/names/fsusage.c:
+	* sysdeps/names/loadavg.c:
+	* sysdeps/names/mem.c:
+	* sysdeps/names/mountlist.c:
+	* sysdeps/names/msg_limits.c:
+	* sysdeps/names/netload.c:
+	* sysdeps/names/ppp.c:
+	* sysdeps/names/procargs.c:
+	* sysdeps/names/prockernel.c:
+	* sysdeps/names/proclist.c:
+	* sysdeps/names/procmap.c:
+	* sysdeps/names/procmem.c:
+	* sysdeps/names/procsegment.c:
+	* sysdeps/names/procsignal.c:
+	* sysdeps/names/procstate.c:
+	* sysdeps/names/proctime.c:
+	* sysdeps/names/procuid.c:
+	* sysdeps/names/sem_limits.c:
+	* sysdeps/names/shm_limits.c:
+	* sysdeps/names/swap.c:
+	* sysdeps/names/sysdeps.c:
+	* sysdeps/names/uptime.c: remove dependency on libgnome,
+	check for linux/isdn.h for distros using the 2.6 kernel headers
+
 2004-02-07  Kevin Vandersloot
 
 	* configure.in: release 2.5.1

NEWS

@@ -1,3 +1,17 @@
+March 11, 2004:
+===============
+
+* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
+  in the loos.
+
+  - plenty of code cleanups
+
+  - removed the dependency on libgnome, only glib required now
+
+  - Linux 2.6 support, NetBSD support and better FreeBSD support
+
+  - Make the block size available for filesystem statistics
+
 February 27, 2001:
 =================
 

backends/server/ChangeLog

@@ -1,3 +1,12 @@
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* command.c: (glibtop_call_i):
+	* demarshal.pl:
+	* marshal.pl:
+	* read_data.c: (glibtop_read_data_i):
+	* server.c: (handle_slave_connection): fix g_malloc usage on non-Linux
+	platforms (patch by Benoit Dejean <bnet@ifrance.com>)
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* backend-server.c: (_open_server):

backends/server/command.c

@@ -89,7 +89,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	glibtop_read_i (priv, recv_size, recv_ptr);
 
     if (resp.data_size) {
-	void *ptr = g_malloc (server, resp.data_size);
+	void *ptr = g_malloc (resp.data_size);
 
 	glibtop_read_i (priv, resp.data_size, ptr);
 

backends/server/demarshal.pl

@@ -246,7 +246,7 @@ sub output {
   if ($line_fields[3] eq '') {
     $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
   } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (server, _LIBGTOP_RECV_len);\n";
+    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (_LIBGTOP_RECV_len);\n";
   }
   $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";
 
@@ -298,7 +298,7 @@ sub output {
     $recv_buf_code .= "\n";
     $recv_buf_code .= "\t_LIBGTOP_TEMP_len += sizeof (off_t) + 1;\n";
     $recv_buf_code .= "\t_LIBGTOP_TEMP_len += array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (server, _LIBGTOP_TEMP_len);";
+    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (_LIBGTOP_TEMP_len);";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = _LIBGTOP_ARRAY_base;\n";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset = array.number * sizeof (off_t);\n";
     $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset += sizeof (off_t);\n";

backends/server/marshal.pl

@@ -181,7 +181,7 @@ sub output {
     $send_buf_code = "\t/* send buffer */\n";
     $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
     if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (server, _LIBGTOP_SEND_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_SEND_len+1)";
     } else {
       $send_buf_code .= '(void *) &'.$first_param_name;
     }
@@ -190,7 +190,7 @@ sub output {
     $send_buf_code .= "\t/* data buffer */\n";
     $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
     if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (server, _LIBGTOP_DATA_len+1)";
+      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
     } else {
       $send_buf_code .= 'NULL';
     }
@@ -231,7 +231,7 @@ sub output {
       $local_var_code .= "\tchar *_LIBGTOP_ARRAY_ptr, **ptrlist;\n";
       $local_var_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
       $local_var_code .= "\tint i;\n";
-      $call_code .= "\tptrlist = g_malloc (server, array->number+1 * sizeof (char *));\n";
+      $call_code .= "\tptrlist = g_malloc (array->number+1 * sizeof (char *));\n";
       $call_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) retval;\n";
       $call_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) retval;\n";
       $call_code .= "\t_LIBGTOP_ARRAY_off_ptr++;\n\n";

backends/server/read_data.c

@@ -47,7 +47,7 @@ glibtop_read_data_i (backend_server_private *priv)
 
     if (!size) return NULL;	
 
-    ptr = g_malloc (priv->server, size);
+    ptr = g_malloc (size);
 	
     ret = read (priv->input [0], ptr, size);
 

backends/server/server.c

@@ -155,7 +155,7 @@ handle_slave_connection (int input, int output)
 		     cmnd->data_size);
 #endif
 
-	    data_ptr = g_malloc (server, cmnd->data_size);
+	    data_ptr = g_malloc (cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
 	}
 

configure.in

@@ -7,13 +7,13 @@ AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=5
-LIBGTOP_MICRO_VERSION=1
+LIBGTOP_MINOR_VERSION=6
+LIBGTOP_MICRO_VERSION=0
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
 dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=2
+LIBGTOP_CURRENT=3
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -22,7 +22,7 @@ LIBGTOP_REVISION=0
 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-LIBGTOP_AGE=0
+LIBGTOP_AGE=1
 
 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
@@ -91,11 +91,6 @@ export cross_compiling
 
 AM_PROG_LIBTOOL
 
-dnl Let the user enable compiler warnings
-dnl GNOME_COMPILE_WARNINGS
-
-dnl GNOME_INIT_HOOK(gnome_found=yes)
-
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)
 
 GNOME_LIBGTOP_SYSDEPS
@@ -141,11 +136,17 @@ AC_SUBST(smp_examples)
 
 GLIB_REQUIRED=2.0.0
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED libgnome-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
+AC_MSG_CHECKING(for popt.h)
+if test x$POPT = xyes ; then
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_ERROR([libgtop requires the popt development libraries])
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -179,6 +180,12 @@ AC_CHECK_FUNCS(dlerror,,)
 LIBS="$oLIBS"
 AC_SUBST(DL_LIB)
 
+dnl Linux
+AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
+if test x$HAVE_ISDN_H = xyes ; then
+	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
+fi
+
 dnl AIX
 AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
 AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
@@ -243,7 +250,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es et fa fi fr ga gl he hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -337,6 +344,16 @@ machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"
 
 AC_SUBST(machine_incs)
 
+if test "$GCC" = "yes" ; then
+        CFLAGS="\
+	-Wall \
+	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+	-Wnested-externs -Wpointer-arith \
+	-Wcast-align -Wsign-compare \
+	-fno-strict-aliasing \
+	$CFLAGS"
+fi
+
 INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
 
 AC_SUBST(INCLUDES)

doc/ChangeLog

@@ -1,3 +1,7 @@
+2004-03-05  Bastien Nocera  <hadess@hadess.net>
+
+	* reference.texi: update for new API
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* reference.texi: s/u_int64_t/guint64/

doc/reference.texi

@@ -1175,13 +1175,13 @@ fields are valid:
 
 @example
 @cartouche
-#define GLIBTOP_MAP_ENTRY_START         1
-#define GLIBTOP_MAP_ENTRY_END           2
-#define GLIBTOP_MAP_ENTRY_OFFSET        3
-#define GLIBTOP_MAP_ENTRY_PERM          4
-#define GLIBTOP_MAP_ENTRY_INODE         5
-#define GLIBTOP_MAP_ENTRY_DEVICE        6
-#define GLIBTOP_MAP_ENTRY_FILENAME      7
+#define GLIBTOP_MAP_ENTRY_START         0
+#define GLIBTOP_MAP_ENTRY_END           1
+#define GLIBTOP_MAP_ENTRY_OFFSET        2
+#define GLIBTOP_MAP_ENTRY_PERM          3
+#define GLIBTOP_MAP_ENTRY_INODE         4
+#define GLIBTOP_MAP_ENTRY_DEVICE        5
+#define GLIBTOP_MAP_ENTRY_FILENAME      6
 @end cartouche
 @end example
 

examples/ChangeLog

@@ -1,3 +1,11 @@
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* mountlist.c: Updated to display block size too.
+
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* smp.c: use libgtop-i18n.h
+
 2003-10-21  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am:

examples/mountlist.c

@@ -88,18 +88,18 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);
 
-	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
-		"", "Blocks", "Free", "Avail", "Files", "Free");
+	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
+		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");
 
 	for (index = 0; index < mount_list.number; index++) {
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);
 
-		printf ("Usage: %-16s %9Lu %9Lu %9Lu %9Lu %9Lu\n",
+		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
-			fsusage.ffree);
+			fsusage.ffree, fsusage.block_size);
 	}
 
 	g_free (mount_entries);

examples/smp.c

@@ -29,7 +29,7 @@
 #include <glibtop.h>
 #include <glibtop/cpu.h>
 
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 int
 main (int argc, char *argv [])

include/Makefile.am

@@ -1,2 +1,4 @@
 SUBDIRS		= glibtop
 
+EXTRA_DIST	= libgtop-i18n.h
+

include/glibtop/fsusage.h

@@ -1,7 +1,6 @@
 /* $Id$ */
 
 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
@@ -34,19 +33,22 @@ G_BEGIN_DECLS
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
+#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
+
+#define GLIBTOP_MAX_FSUSAGE		6
 
-#define GLIBTOP_MAX_FSUSAGE		5
 
 typedef struct _glibtop_fsusage		glibtop_fsusage;
 
 struct _glibtop_fsusage
 {
 	guint64	flags,
-		blocks,		/* Total blocks. */
+		blocks,		/* Total number of blocks. */
 		bfree,		/* Free blocks available to superuser. */
 		bavail,		/* Free blocks available to non-superuser. */
 		files,		/* Total file nodes. */
 		ffree;		/* Free file nodes. */
+	gint	block_size;	/* Size of a block in bytes. */
 };
 
 #define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)

include/glibtop/procmap.h

@@ -35,15 +35,15 @@ G_BEGIN_DECLS
 
 #define GLIBTOP_MAX_PROC_MAP		3
 
-#define GLIBTOP_MAP_ENTRY_START		1
-#define GLIBTOP_MAP_ENTRY_END		2
-#define GLIBTOP_MAP_ENTRY_OFFSET	3
-#define GLIBTOP_MAP_ENTRY_PERM		4
-#define GLIBTOP_MAP_ENTRY_INODE		5
-#define GLIBTOP_MAP_ENTRY_DEVICE	6
-#define GLIBTOP_MAP_ENTRY_FILENAME	7
+#define GLIBTOP_MAP_ENTRY_START		0
+#define GLIBTOP_MAP_ENTRY_END		1
+#define GLIBTOP_MAP_ENTRY_OFFSET	2
+#define GLIBTOP_MAP_ENTRY_PERM		3
+#define GLIBTOP_MAP_ENTRY_INODE		4
+#define GLIBTOP_MAP_ENTRY_DEVICE	5
+#define GLIBTOP_MAP_ENTRY_FILENAME	6
 
-#define GLIBTOP_MAX_MAP_ENTRY		8
+#define GLIBTOP_MAX_MAP_ENTRY		7
 
 #define GLIBTOP_MAP_FILENAME_LEN	215
 

include/libgtop-i18n.h

@@ -0,0 +1,11 @@
+
+#include <config.h>
+
+#include <libintl.h>
+#define _(String) gettext (String)
+#ifdef gettext_noop
+#   define N_(String) gettext_noop (String)
+#else
+#   define N_(String) (String)
+#endif
+

lib/lib.pl

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

lib/read.c

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <glibtop/read.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 
 /* Reads some data from server. */

lib/read_data.c

@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <glibtop/read_data.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 /* Reads some data from server. */
 

lib/write.c

@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include <glibtop/write.h>
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 
 /* Writes some data to server. */
 

po/ChangeLog

@@ -1,3 +1,84 @@
+2004-03-30  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Added Canadian English translation.
+
+2004-03-23  Åsmund Skjæveland  <aasmunds@fys.uio.no>
+
+	* nn.po: Updated Norwegian Nynorsk translation.
+
+2004-03-22  Gareth Owen  <gowen72@yahoo.com>
+
+	* en_GB.po: Added British translation
+
+2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+        * pa.po: Punjabi translation by 
+        Amanpreet Singh Alam <amanlinux@netscape.net>.
+
+2004-03-21  Andras Timar  <timar@gnome.hu>
+
+	* hu.po: Added Hungarian translation.
+
+2004-03-18  Mugurel Tudor  <mugurelu@go.ro>
+
+	* ro.po: Updated Romanian translation by
+	Mişu Moldovan  <dumol@go.ro>
+
+2004-03-16  Dafydd Harries  <daf@muse.19inch.net>
+
+	* cy.po: Updated Welsh translation.
+
+2004-03-15  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-03-15  Yuriy Syrota  <rasta@cvs.gnome.org>
+
+	* uk.po: Updated Ukrainian translation.
+
+2004-03-13  Ales Nyakhaychyk  <nab@mail.by>
+
+	* be.po: Updated Belarusian translation.
+
+2004-03-12  Tomasz Kłoczko <kloczek@pld.org.pl>
+
+	* hr.po: added Plural-Forms field in header and missing empty
+	entries.
+
+2004-03-11  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
+
+	* pt_BR.po: Updated Brazilian Portuguese translation done by
+	Medina <afmedina@uol.com.br>.
+
+2004-03-11  Dmitry G. Mastrukov  <dmitry@taurussoft.org>
+
+	* ru.po: Updated Russian translation
+	from Russian team <gnome-cyr@gnome.org>.
+
+2004-03-10  Alessio Frusciante  <algol@firenze.linux.it>
+
+	* it.po: Updated Italian translation.
+
+2004-03-07  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
+2004-03-06  Mətin Əmirov  <metin@karegen.com>
+
+	* az.po: Translation updated.
+
+2004-02-26  Guntupalli Karunakar  <karunakar@freedomink.org>
+
+	* hi.po: Updated Hindi translation.
+
+2004-02-23  Laurent Dhima  <laurenti@alblinux.net>
+
+	* sq.po: Fixed Albanian translation.
+
+2004-02-21  Nikos Charonitakis  <frolix68@yahoo.gr>
+
+	* el.po: Updated Greek translation.
+
 2004-02-08  Changwoo Ryu  <cwryu@debian.org>
 
 	* ko.po: Updated Korean translation.

po/az.po

@@ -1,5 +1,4 @@
 # translation of libgtop.HEAD.az.po to Azerbaijani Turkish
-# libgtop faylının Azərbaycan dilinə tərcüməsi.
 # Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 # Vasif Ismailoglu MD <azerb_linux@hotmail.com>, 2001.
 # Mətin Əmirov <metin@karegen.com>, 2004.
@@ -8,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD.az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-27 20:42+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-12 19:43+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
-"Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
+"Language-Team: Azerbaijani Turkish <translation-team-az@lists.sourceforge."
+"net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -163,7 +163,7 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "%s şərhində xəta oldü %s.\n"
-"'%s --help' əmrindən bütün əmr sətiri seçənəkləri üçün işə salın.\n"
+"'%s --help' əmrindən bütün əmr sətiri seçimləri üçün işə salın.\n"
 
 #: sysdeps/names/cpu.c:44
 msgid "Total CPU Time"
@@ -235,7 +235,7 @@ msgstr "Sistemin idle oturumunda keçirdiyi saat tikləri"
 
 #: sysdeps/names/cpu.c:65
 msgid "Tick frequency (default is 100)"
-msgstr "Tick sıxlığı (əsas 100 dür)"
+msgstr "Tick sıxlığı (ön qurğulusu 100-dür)"
 
 #: sysdeps/names/cpu.c:71
 msgid "Bit field indicating which CPU is currently running"
@@ -389,7 +389,7 @@ msgstr "Maksimal xəbər böyüklüyü"
 
 #: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Default max size of queue"
-msgstr "Maksimal əsas istək böyüklüyü"
+msgstr "Maksimal ön qurğulu istək böyüklüyü"
 
 #: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Max queues system wide"
@@ -659,7 +659,8 @@ msgstr ""
 "deyildir."
 
 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr ""
 "Gedişatın rss'sinin baytlarla göstərilan hazırkı sərhədləri (çox vaxt "
 "2.147.483.647)."
@@ -802,15 +803,15 @@ msgstr "exec() cağırışındakı işə salınabilən dosyenin  əsas adı"
 
 #: sysdeps/names/procstate.c:50
 msgid "Single-Char code for process state (S=sleeping)"
-msgstr "əmaliyyət gedişatının Single-Char kodu (S=yuxudakı)"
+msgstr "Əmaliyyət gedişatının Single-Char kodu (S=yuxudakı)"
 
 #: sysdeps/names/procstate.c:51
 msgid "UID of process"
-msgstr "Gedişatın UIDi"
+msgstr "Gedişatın UID-si"
 
 #: sysdeps/names/procstate.c:52
 msgid "GID of process"
-msgstr "Gedişatın GIDi"
+msgstr "Gedişatın GID-si"
 
 #: sysdeps/names/procstate.c:53
 msgid "Real UID of process"
@@ -878,7 +879,8 @@ msgstr "XUCP_STime"
 
 #: sysdeps/names/proctime.c:52
 msgid "Start time of process in seconds since the epoch"
-msgstr "Gedişatın başlanğıc vaxtının epoch'dan e'tibarən keçən saniyəlarlə müddəti"
+msgstr ""
+"Gedişatın başlanğıc vaxtının epoch'dan e'tibarən keçən saniyəlarlə müddəti"
 
 #: sysdeps/names/proctime.c:53
 msgid "Real time accumulated by process (should be utime + stime)"
@@ -1294,7 +1296,7 @@ msgstr "Hökmsüz tə'limat"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "İzləmə trapı"
+msgstr "İzləmə yolu"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
@@ -1302,7 +1304,7 @@ msgstr "Ləğv Et"
 
 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr "EMT Xətası"
+msgstr "EMT xətası"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
@@ -1314,7 +1316,7 @@ msgstr "Öldür"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr "Bus Xətası"
+msgstr "Yol Xətası"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
@@ -1326,11 +1328,11 @@ msgstr "Sistem çağırışı üçün xətalı arqument"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Qırıq Boru"
+msgstr "Qırıq boru"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr "Zəngli Saat"
+msgstr "Zəngli saat"
 
 #: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
@@ -1358,11 +1360,11 @@ msgstr "Törəmə halı dəyişdi"
 
 #: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "tty'dən arxa plan gedişatı mə'lumatı"
+msgstr "tty-dən arxa plan gedişatı mə'lumatı"
 
 #: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr "tty'yə yazma əməliyyatı"
+msgstr "tty-yə yazma əməliyyatı"
 
 #: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
@@ -1399,4 +1401,3 @@ msgstr "İstifadəçi siqnal 1 təsvir etdi"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "İstifadəçi siqnal 2 təsvir etdi"
-

po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-03 15:06+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-03 15:17+0100\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -544,9 +544,12 @@ msgid ""
 msgstr ""
 "Senyaladors del nucli del procés.\n"
 "\n"
-"A Linux, actualment cada senyalador té fixat el bit matemàtic, pel fet de comprovar crt0.sper a emulació matemàtica, per això no s'inclou a la sortida. \n"
+"A Linux, actualment cada senyalador té fixat el bit matemàtic, pel fet de "
+"comprovar crt0.sper a emulació matemàtica, per això no s'inclou a la "
+"sortida. \n"
 "\n"
-"Això és probablement un error fortuït, ja que no tots els processos són programes compilats en C. \n"
+"Això és probablement un error fortuït, ja que no tots els processos són "
+"programes compilats en C. \n"
 "\n"
 "El bit matemàtic hauria de ser un decimal 4, i el bit traçat és un decimal 10"
 

po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 04:54+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-27 16:36+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"

po/da.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-20 21:11+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-20 21:23+0100\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"

po/de.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-04 18:30+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-04 18:32+0100\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"

po/el.po

@@ -7,22 +7,24 @@
 # simos: 308 messages, 25Feb2001, completed.
 # simos: 310 messages, 07Nov2002, completed.
 # kostas: 322 messages,30Oct2003, update for Gnome 2.6
+# Nikos: add plurals, minor fixes, 21Feb2004.
 # Sarantis Paskalis <paskalis@di.uoa.gr>, 2000.
 # Simos Xenitellis <simos@hellug.gr>, 2001.
-# Kostas Papadimas <pkst@gnome.org>, 2003
+# Kostas Papadimas <pkst@gnome.org>, 2003.
+# Nikos Charonitakis <frolix68@yahoo.gr>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-30 22:45+0200\n"
-"PO-Revision-Date: 2003-10-30 22:52+0200\n"
-"Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
+"PO-Revision-Date: 2004-02-21 12:47+0200\n"
+"Last-Translator: Nikos Charonitakis <frolix68@yahoo.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: examples/smp.c:74
 #, c-format
@@ -113,7 +115,7 @@ msgstr "Σπινάρισμα:"
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "ανάγνωση %d byte"
-msgstr[1] "ανάγνωση %d byte"
+msgstr[1] "ανάγνωση %d bytes"
 
 #: lib/read_data.c:51
 msgid "read data size"
@@ -124,14 +126,14 @@ msgstr "ανάγνωση μεγέθους δεδομένων"
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
 msgstr[0] "ανάγνωση δεδομένων %d byte"
-msgstr[1] "ανάγνωση δεδομένων %d byte"
+msgstr[1] "ανάγνωση δεδομένων %d bytes"
 
 #: lib/write.c:51
 #, c-format
 msgid "write %d byte"
 msgid_plural "write %d bytes"
 msgstr[0] "εγγραφή %d byte"
-msgstr[1] "γράψιμο %d byte"
+msgstr[1] "εγγραφή %d bytes"
 
 #: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
@@ -139,7 +141,7 @@ msgstr "Ενεργοποίηση εκσφαλμάτωσης"
 
 #: src/daemon/gnuserv.c:456
 msgid "DEBUG"
-msgstr "ΕΚΣΦΑΛΜΆΤΩΣΗ"
+msgstr "ΕΚΣΦΑΛΜΑΤΩΣΗ"
 
 #: src/daemon/gnuserv.c:458
 msgid "Enable verbose output"
@@ -248,7 +250,8 @@ msgstr "Αριθμός χτύπων ρολογιού που το σύστημα
 # sysdeps/names/cpu.c:63 sysdeps/names/cpu.c:69
 #: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in user mode (nice)"
-msgstr "Αριθμός χτύπων ρολογιού που το σύστημα κατανάλωσε σε τρόπο χρήστη (ευγενή)"
+msgstr ""
+"Αριθμός χτύπων ρολογιού που το σύστημα κατανάλωσε σε τρόπο χρήστη (ευγενή)"
 
 # sysdeps/names/cpu.c:64 sysdeps/names/cpu.c:70
 #: sysdeps/names/cpu.c:63 sysdeps/names/cpu.c:69
@@ -473,7 +476,7 @@ msgstr "Αριθμός επικεφαλίδων μηνυμάτων συστήμ
 
 #: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
 msgid "Interface Flags"
-msgstr "Σημαίες Διασύνδεσεις"
+msgstr "Σημαίες Διασύνδεσης"
 
 #: sysdeps/names/netload.c:47
 msgid "MTU"
@@ -663,7 +666,8 @@ msgstr "Ο αριθμός ήσσονων λαθών που έχει κάνει
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
-msgstr "Ο αριθμός των μείζονων λαθών που έχει κάνει η διεργασία και τα παιδιά της."
+msgstr ""
+"Ο αριθμός των μείζονων λαθών που έχει κάνει η διεργασία και τα παιδιά της."
 
 # sysdeps/names/prockernel.c:73
 #. KStk_ESP
@@ -679,7 +683,7 @@ msgstr ""
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:75
 msgid "The current EIP (32-bit instruction pointer)."
-msgstr "Ο τρέχων EIP (32-bit δείκτης εντολών)"
+msgstr "Ο τρέχων EIP (32-bit δείκτης εντολών)."
 
 # sysdeps/names/prockernel.c:78
 #. NWChan
@@ -709,7 +713,7 @@ msgstr "Εικονικό"
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:48
 msgid "Resident"
-msgstr "Παραμένον"
+msgstr "Παραμένουσα"
 
 # sysdeps/names/procmem.c:49
 #: sysdeps/names/procmem.c:48
@@ -761,8 +765,9 @@ msgstr ""
 
 # sysdeps/names/procmem.c:64
 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "Τρέχον όριο σε bytes στο rss της διεργασίας (συνήθως 2.147.483.547)"
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgstr "Τρέχον όριο σε bytes στο rss της διεργασίας (συνήθως 2.147.483.547)."
 
 # sysdeps/names/procsegment.c:50
 #: sysdeps/names/procsegment.c:43
@@ -792,17 +797,17 @@ msgstr "Μέγεθος ακάθαρτου"
 # sysdeps/names/procsegment.c:51
 #: sysdeps/names/procsegment.c:44
 msgid "Start_Code"
-msgstr "Αρχή_Κώδικα"
+msgstr "Αρχή _Κώδικα"
 
 # sysdeps/names/procsegment.c:51
 #: sysdeps/names/procsegment.c:44
 msgid "End_Code"
-msgstr "Τέλος_Κώδικα"
+msgstr "Τέλος _Κώδικα"
 
 # sysdeps/names/procsegment.c:53
 #: sysdeps/names/procsegment.c:44
 msgid "Start_Stack"
-msgstr "Αρχή_Στοίβας"
+msgstr "Αρχή _Στοίβας"
 
 # sysdeps/names/procsegment.c:59
 #: sysdeps/names/procsegment.c:49
@@ -1533,7 +1538,8 @@ msgstr ""
 # sysdeps/names/proctime.c:54
 #: sysdeps/names/uptime.c:48
 msgid "Time of last system boot in seconds since the epoch"
-msgstr "Χρόνος της τελευταίας εκκίνησης συστήματος σε δευτερόλεπτα από την εποχή"
+msgstr ""
+"Χρόνος της τελευταίας εκκίνησης συστήματος σε δευτερόλεπτα από την εποχή"
 
 #: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
@@ -1807,4 +1813,3 @@ msgstr "Σήμα 2 οριζόμενο από το χρήστη"
 # sysdeps/names/procstate.c:60
 #~ msgid "last_processor"
 #~ msgstr "τελευταίος_επεξεργαστής"
-

po/es.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.libgtop-GNOME-2-0-port\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-14 11:49+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-12-14 11:56+0100\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@arrakis.es>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "First-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "X-Generator: KBabel 1.0.2\n"
-"Plural-Forms: nplurals=2; plural=(n == 1)"
+"Plural-Forms: nplurals=2; plural=(n == 1)\n"
 
 #: examples/smp.c:74
 #, c-format

po/fi.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.90.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-05 22:14+0200\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-02-04 23:01+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"

po/fr.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-04 13:08+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-04 13:01+0100\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -532,6 +532,7 @@ msgstr "Chan_NA"
 msgid "WChan"
 msgstr "Chan_N"
 
+#. K_Flags
 #: sysdeps/names/prockernel.c:51
 msgid ""
 "Kernel flags of the process.\n"
@@ -555,6 +556,7 @@ msgstr ""
 "Le bit mathématique devrait donner 4 en décimal, et le bit tracé vaut 10 en "
 "décimal."
 
+#. Min_Flt
 #: sysdeps/names/prockernel.c:60
 msgid ""
 "The number of minor faults the process has made, those which have not "
@@ -563,6 +565,7 @@ msgstr ""
 "Le nombre de défauts de page mineurs d'un processus, c'est-à-dire ceux qui "
 "n'ont pas nécessité de charger une page mémoire depuis le disque."
 
+#. Maj_Flt
 #: sysdeps/names/prockernel.c:63
 msgid ""
 "The number of major faults the process has made, those which have required "
@@ -571,18 +574,21 @@ msgstr ""
 "Le nombre de défauts de page majeurs d'un processus, c'est-à-dire ceux qui "
 "ont nécessité de charger une page mémoire depuis le disque."
 
+#. CMin_Flt
 #: sysdeps/names/prockernel.c:66
 msgid "The number of minor faults that the process and its children have made."
 msgstr ""
 "Le nombre de défauts de page mineurs qu'un processus et ses fils ont "
 "réalisés."
 
+#. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
 msgstr ""
 "Le nombre de défauts de page majeurs qu'un processus et ses fils ont "
 "réalisés."
 
+#. KStk_ESP
 #: sysdeps/names/prockernel.c:72
 msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
@@ -596,6 +602,7 @@ msgstr ""
 msgid "The current EIP (32-bit instruction pointer)."
 msgstr "La valeur courante du registre EIP (pointeur d'instruction 32 bits)"
 
+#. NWChan
 #: sysdeps/names/prockernel.c:77
 msgid ""
 "This is the \"channel\" in which the process is waiting.  This is the "

po/ga.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop-GNOME-2-0-port \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-17 04:23+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-23 18:10+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"

po/hr.po

@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 0\n"
-"POT-Creation-Date: 2004-02-01 17:11+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-02-05 23:51+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,6 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: TransDict server\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: examples/smp.c:74
 #, c-format
@@ -94,33 +96,33 @@ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 msgid "Spin:"
 msgstr "Spin:"
 
-#. plural form
 #: lib/read.c:78
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "čitaj %d bajt"
 msgstr[1] "čitaj %d bajtova"
+msgstr[2] ""
 
 #: lib/read_data.c:51
 msgid "read data size"
 msgstr "veličina pročitanih podataka"
 
-#. plural form
 #: lib/read_data.c:68
 #, c-format
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
 msgstr[0] "čitaj podatak %d bajt"
 msgstr[1] "čitaj podatak %d bajtova"
+msgstr[2] ""
 
-#. plural form
 #: lib/write.c:51
 #, c-format
 msgid "write %d byte"
 msgid_plural "write %d bytes"
 msgstr[0] "piši %d bajt"
 msgstr[1] "piši %d bajtova"
+msgstr[2] ""
 
 #: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
@@ -161,7 +163,8 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Greška na opciji %s: %s.\n"
-"Pokrenite '%s --help' za potpuni popis svih opcija mogućih u naredbenoj liniji.\n"
+"Pokrenite '%s --help' za potpuni popis svih opcija mogućih u naredbenoj "
+"liniji.\n"
 
 #: sysdeps/names/cpu.c:44
 msgid "Total CPU Time"
@@ -285,7 +288,8 @@ msgstr "Posljedni PID"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "Broj poslova koji su istovremeni pokrenuti u proteklih 1, 5 i 15 minuta"
+msgstr ""
+"Broj poslova koji su istovremeni pokrenuti u proteklih 1, 5 i 15 minuta"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Number of tasks currently running"
@@ -539,12 +543,13 @@ msgid ""
 msgstr ""
 "Kernel zastavice procesa.\n"
 "\n"
-"Na linuxu, trenutno svaka zastavica ima postavljenu math zastavicum jer crt0.s provjerava "
-"matematički emulaciju, tako da to nije uključeno u izlaz.\n"
+"Na linuxu, trenutno svaka zastavica ima postavljenu math zastavicum jer crt0."
+"s provjerava matematički emulaciju, tako da to nije uključeno u izlaz.\n"
 "\n"
 "Ovo je vjerojatno greška, jer svaki proces nije kompajlirani C program.\n"
 "\n"
-"Math zastavica bi trebala biti decimalni broj 4, a pronađeni bit je decimalni broj 10."
+"Math zastavica bi trebala biti decimalni broj 4, a pronađeni bit je "
+"decimalni broj 10."
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:60
@@ -596,10 +601,10 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"Ovo je \"kanal\" u kojem proces čeka. To je adresa sistemskog poziva "
-"i može se pronaći u listi imena ako trebate tekstualno ime."
-"(Ako imate ažuriran /etc/psdatabase, tada pokušajte ps -l kako "
-"biste pogledali što sve može WCHAN polje)"
+"Ovo je \"kanal\" u kojem proces čeka. To je adresa sistemskog poziva i može "
+"se pronaći u listi imena ako trebate tekstualno ime.(Ako imate ažuriran /etc/"
+"psdatabase, tada pokušajte ps -l kako biste pogledali što sve može WCHAN "
+"polje)"
 
 #. WChan
 #: sysdeps/names/prockernel.c:82
@@ -649,13 +654,14 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"Broj stranica koje proces ima u stvarnoj memoriji, minus 3 za administrativne svrhe. "
-"To su samo stranice koje se broje prema području teksta, podataka ili stoga. "
-"To ne uključuje stranice koje nisu učitane na zahtijev, ili koje se "
-"nalaze na swapu."
+"Broj stranica koje proces ima u stvarnoj memoriji, minus 3 za "
+"administrativne svrhe. To su samo stranice koje se broje prema području "
+"teksta, podataka ili stoga. To ne uključuje stranice koje nisu učitane na "
+"zahtijev, ili koje se nalaze na swapu."
 
 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr "Trenutna grćnica u bajtovima za rss procesa (obično 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:43
@@ -876,7 +882,8 @@ msgstr "Početno vrije procesa u sekundama od početka epohe"
 
 #: sysdeps/names/proctime.c:53
 msgid "Real time accumulated by process (should be utime + stime)"
-msgstr "Stvarno vrijeme akumulirano od strane procesa (trebalo bi biti utime + stime)"
+msgstr ""
+"Stvarno vrijeme akumulirano od strane procesa (trebalo bi biti utime + stime)"
 
 #: sysdeps/names/proctime.c:54
 msgid "user-mode CPU time accumulated by process"
@@ -912,7 +919,8 @@ msgstr "Frekvencija otkucavanja"
 
 #: sysdeps/names/proctime.c:62
 msgid "SMP user-mode CPU time accumulated by process"
-msgstr "SMP CPU vrijeme u korisničkom načinu rada akumulirano od strane procesa"
+msgstr ""
+"SMP CPU vrijeme u korisničkom načinu rada akumulirano od strane procesa"
 
 #: sysdeps/names/proctime.c:63
 msgid "SMP kernel-mode CPU time accumulated by process"
@@ -1264,7 +1272,8 @@ msgstr "Vrijeme u sekundama od podizanja sustava"
 
 #: sysdeps/names/uptime.c:47
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr "Vrijeme u sekundama koje je sustav proveo besposlen od podizanja sustava"
+msgstr ""
+"Vrijeme u sekundama koje je sustav proveo besposlen od podizanja sustava"
 
 #: sysdeps/names/uptime.c:48
 msgid "Time of last system boot in seconds since the epoch"
@@ -1393,4 +1402,3 @@ msgstr "Korisnički definiran signal 1"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Korisnički definiran signal 2"
-

po/it.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-24 16:28+0100\n"
-"PO-Revision-Date: 2004-01-24 19:24+0100\n"
+"POT-Creation-Date: 2004-03-15 20:49+0100\n"
+"PO-Revision-Date: 2004-03-15 21:15+0100\n"
 "Last-Translator: Alessio Frusciante <algol@firenze.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -237,7 +237,7 @@ msgstr "Frequenza dei tick (il valore predefinito è 100)"
 
 #: sysdeps/names/cpu.c:71
 msgid "Bit field indicating which CPU is currently running"
-msgstr ""
+msgstr "Campo in bit che indica quale CPU sta attualmente eseguendo"
 
 #: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
 msgid "Total blocks"
@@ -375,7 +375,7 @@ msgstr "Dimensioni di un elemento della lista"
 
 #: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Size in kilobytes of message pool"
-msgstr ""
+msgstr "Dimensioni in kylobyte del message pool"
 
 #: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Number of entries in message map"
@@ -395,7 +395,7 @@ msgstr "Numero massimo di code nel sistema"
 
 #: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Message segment size"
-msgstr ""
+msgstr "Message segment size"
 
 #: sysdeps/names/msg_limits.c:47 sysdeps/names/msg_limits.c:58
 msgid "Number of system message headers"
@@ -537,30 +537,37 @@ msgid ""
 "\n"
 "The math bit should be a decimal 4, and the traced bit is decimal 10."
 msgstr ""
+"Flag del kernel del processo.\n"
+"\n"
+"In Linux attualmente ogni flag ha il bit matematico impostato, poiché crt0.s controlla l'emulazione matematica, quindi non verrà inserito nell'output.\n"
+"\n"
+"Questo è probabilmente un bug, in quanto non tutti i processi sono programmi C compilati.\n"
+"\n"
+"Il bit matematico dovrebbe essere un 4 decimale e il bit tracicato è 10 decimale."
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:60
 msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
-msgstr ""
+msgstr "Il numero di fault minori che il processo ha fatto, quelli che non hanno richiesto di caricare una pagina di memoria dal disco."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:63
 msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
-msgstr ""
+msgstr "Il numero di fault maggiori che il processo ha fatto, quelli che hanno richiesto di caricare una pagina di memoria dal disco."
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:66
 msgid "The number of minor faults that the process and its children have made."
-msgstr ""
+msgstr "Il numero di fault minori che il processo e i suoi figli hanno fatto."
 
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
-msgstr ""
+msgstr "Il numero di fault maggiori che il processo e i suoi figli hanno fatto."
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:72
@@ -583,7 +590,7 @@ msgid ""
 "address of a system call, and can be looked up in a namelist if you need a "
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
-msgstr ""
+msgstr "effettivo gruppo<"
 
 #. WChan
 #: sysdeps/names/prockernel.c:82
@@ -632,7 +639,7 @@ msgid ""
 "purposes. This is just the pages which count towards text, data, or stack "
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
-msgstr ""
+msgstr "Numero di pagine che il processo ha nella memoria reale, meno 3 per scopi amministrativi. Queste sono le pagine che puntano a spazio text, data o stack. Non sono incluse pagine che non sono state caricate su richiesta o che sono \"swapped out\"."
 
 #: sysdeps/names/procmem.c:63
 msgid ""
@@ -658,23 +665,23 @@ msgstr "Stack_RSS"
 
 #: sysdeps/names/procsegment.c:44
 msgid "Dirty Size"
-msgstr ""
+msgstr "Dirty size"
 
 #: sysdeps/names/procsegment.c:44
 msgid "Start_Code"
-msgstr ""
+msgstr "Start_Code"
 
 #: sysdeps/names/procsegment.c:44
 msgid "End_Code"
-msgstr ""
+msgstr "End_Code"
 
 #: sysdeps/names/procsegment.c:44
 msgid "Start_Stack"
-msgstr ""
+msgstr "Start_Stack"
 
 #: sysdeps/names/procsegment.c:49
 msgid "Text resident set size"
-msgstr ""
+msgstr "Dimensioni insieme residente della sezione text"
 
 #: sysdeps/names/procsegment.c:50
 msgid "Shared-Lib resident set size"
@@ -690,7 +697,7 @@ msgstr "Dimensioni insieme residente stack"
 
 #: sysdeps/names/procsegment.c:53
 msgid "Total size of dirty pages"
-msgstr ""
+msgstr "Dimensioni totali delle pagine dirty"
 
 #: sysdeps/names/procsegment.c:54
 msgid "Address of beginning of code segment"
@@ -762,7 +769,7 @@ msgstr "RUid"
 
 #: sysdeps/names/procstate.c:44
 msgid "HasCPU"
-msgstr ""
+msgstr "HasCPU"
 
 #: sysdeps/names/procstate.c:44
 msgid "Proc"
@@ -770,7 +777,7 @@ msgstr "Proc"
 
 #: sysdeps/names/procstate.c:44
 msgid "LProc"
-msgstr ""
+msgstr "LProc"
 
 #: sysdeps/names/procstate.c:49
 msgid "Basename of executable file in call to exec()"
@@ -798,7 +805,7 @@ msgstr "GID reale del processo"
 
 #: sysdeps/names/procstate.c:55
 msgid "Has CPU"
-msgstr ""
+msgstr "Ha CPU"
 
 #: sysdeps/names/procstate.c:56
 msgid "Processor"
@@ -810,7 +817,7 @@ msgstr "Ultimo processore"
 
 #: sysdeps/names/proctime.c:45
 msgid "Start_Time"
-msgstr ""
+msgstr "Start_Time"
 
 #: sysdeps/names/proctime.c:45
 msgid "RTime"
@@ -838,7 +845,7 @@ msgstr "TimeOut"
 
 #: sysdeps/names/proctime.c:46
 msgid "It_Real_Value"
-msgstr ""
+msgstr "It_Real_Value"
 
 #: sysdeps/names/proctime.c:47
 msgid "Frequency"
@@ -870,11 +877,11 @@ msgstr "Tempo di CPU in modalità kernel accumulato dal processo"
 
 #: sysdeps/names/proctime.c:56
 msgid "cumulative utime of process and reaped children"
-msgstr ""
+msgstr "utime cumulativo del processo dei suoi figli"
 
 #: sysdeps/names/proctime.c:57
 msgid "cumulative stime of process and reaped children"
-msgstr ""
+msgstr "stime cumulativo del processo e dei suoi figli"
 
 #: sysdeps/names/proctime.c:58
 msgid "The time (in jiffies) of the process's next timeout"
@@ -884,7 +891,7 @@ msgstr "Il tempo (in jiffy) del prossimo timeout del processo"
 msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
-msgstr ""
+msgstr "Il tempo (in jiffy) prima che il prossimo SIGALRM venga mandato al processo a causa di un timer ad intervalli."
 
 #: sysdeps/names/proctime.c:61
 msgid "Tick frequency"
@@ -959,9 +966,8 @@ msgid "Priority"
 msgstr "Priorità"
 
 #: sysdeps/names/procuid.c:51
-#, fuzzy
 msgid "NGroups"
-msgstr "ID gruppo"
+msgstr "NGroups"
 
 #: sysdeps/names/procuid.c:51
 msgid "Groups"
@@ -984,22 +990,20 @@ msgid "Effective Group ID"
 msgstr "ID effettivo gruppo"
 
 #: sysdeps/names/procuid.c:60
-#, fuzzy
 msgid "Set User ID"
-msgstr "ID utente"
+msgstr "Set User ID"
 
 #: sysdeps/names/procuid.c:61
-#, fuzzy
 msgid "Set Group ID"
-msgstr "ID gruppo"
+msgstr "Set Group ID"
 
 #: sysdeps/names/procuid.c:62
 msgid "Filesystem User ID"
-msgstr "ID filesystem utente"
+msgstr "ID utente filesystem"
 
 #: sysdeps/names/procuid.c:63
 msgid "Filesystem Group ID"
-msgstr "ID filesystem gruppo"
+msgstr "ID gruppo filesystem"
 
 #: sysdeps/names/procuid.c:64
 msgid "Process ID"
@@ -1023,7 +1027,7 @@ msgstr "Numero di device del terminale di controllo"
 
 #: sysdeps/names/procuid.c:69
 msgid "Terminal process group ID"
-msgstr "ID gruppo del processo del terminale"
+msgstr "ID del process group del terminale"
 
 #: sysdeps/names/procuid.c:70
 msgid "Kernel scheduling priority"
@@ -1035,11 +1039,11 @@ msgstr "Livello di nice standard del processo"
 
 #: sysdeps/names/procuid.c:72
 msgid "Number of additional process groups"
-msgstr "Numero di gruppi di processi addizionali"
+msgstr "Numero di process group addizionali"
 
 #: sysdeps/names/procuid.c:73
 msgid "Array of additional process groups"
-msgstr ""
+msgstr "Array di process group addizionali"
 
 #: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Number of entries in semaphore map"
@@ -1238,9 +1242,8 @@ msgid "Idletime"
 msgstr "Idletime"
 
 #: sysdeps/names/uptime.c:41
-#, fuzzy
 msgid "BootTime"
-msgstr "RTime"
+msgstr "BootTime"
 
 #: sysdeps/names/uptime.c:46
 msgid "Time in seconds since system boot"
@@ -1253,83 +1256,83 @@ msgstr ""
 
 #: sysdeps/names/uptime.c:48
 msgid "Time of last system boot in seconds since the epoch"
-msgstr "Tempo dall'ultimo avvio in secondi a partire dall'epoch"
+msgstr "Istante dell'ultimo avvio del sistema in secondi a partire dall'epoch"
 
 #: 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 "Interrupt"
 
 #: 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 "Istruzione illegale"
+msgstr "Illegal instruction"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr ""
+msgstr "Trace trap"
 
 #: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
-msgstr ""
+msgstr "Abort"
 
 #: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr ""
+msgstr "EMT error"
 
 #: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr ""
+msgstr "Floating-point exception"
 
 #: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr ""
+msgstr "Kill"
 
 #: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr ""
+msgstr "Bus error"
 
 #: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr ""
+msgstr "Segmentation violation"
 
 #: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr ""
+msgstr "Bad argument to system call"
 
 #: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr ""
+msgstr "Broken pipe"
 
 #: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr ""
+msgstr "Alarm clock"
 
 #: 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 "Urgent condition on socket"
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr ""
+msgstr "Keyboard stop"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr ""
+msgstr "Continue"
 
 #: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
@@ -1357,19 +1360,19 @@ msgstr "Superato il limite nella dimensione dei file"
 
 #: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
-msgstr ""
+msgstr "Virtual alarm clock"
 
 #: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr ""
+msgstr "Profiling alarm clock"
 
 #: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr ""
+msgstr "Window size change"
 
 #: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr ""
+msgstr "Information request"
 
 #: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
@@ -1378,45 +1381,3 @@ msgstr "Segnale definito dall'utente 1"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Segnale definito dall'utente 2"
-
-#~ msgid "Unknown system error"
-#~ msgstr "Errore sconosciuto di sistema"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: l'opzione `%s' è ambigua\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opzione `--%s' non permette un argomento\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opzione `%c%s' non permette un argomento\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: l'opzione `%s' richiede un argomento\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: opzione non riconosciuta `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: opzione non riconosciuta `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opzione illegale -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opzione non valida -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: l'opzione richiede un argomento -- %c\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: l'opzione `-W %s' è ambigua\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: l'opzione `-W %s' non permette un argomento\n"
-
-#~ msgid "Show this help message"
-#~ msgstr "Mostra questo messaggio di aiuto"
-
-#~ msgid "Display brief usage message"
-#~ msgstr "Mostra un breve messaggio di uso"

po/ja.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-02 11:44+0900\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-02 10:56+0900\n"
 "Last-Translator: KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"

po/ko.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-17 02:31+0900\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-02-08 01:03+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -521,6 +521,7 @@ msgstr "NWChan"
 msgid "WChan"
 msgstr "WChan"
 
+#. K_Flags
 #: sysdeps/names/prockernel.c:51
 msgid ""
 "Kernel flags of the process.\n"
@@ -542,37 +543,48 @@ msgstr ""
 "\n"
 "수학 비트는 십진수 4이어야 하며, 추적(trace) 비트는 십진수 10이어야 합니다."
 
+#. Min_Flt
 #: sysdeps/names/prockernel.c:60
 msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
-msgstr "디스크로부터 메모리 페이지 적재를 필요로 하지 않는 프로세스로부터 발생된 사소한 폴트 갯수."
+msgstr ""
+"디스크로부터 메모리 페이지 적재를 필요로 하지 않는 프로세스로부터 발생된 사소"
+"한 폴트 갯수."
 
+#. Maj_Flt
 #: sysdeps/names/prockernel.c:63
 msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
-msgstr "디스크로부터 메모리 페이지 적재를 필요로 하는 프로세스로부터 발생된 중대한 폴트 갯수."
+msgstr ""
+"디스크로부터 메모리 페이지 적재를 필요로 하는 프로세스로부터 발생된 중대한 폴"
+"트 갯수."
 
+#. CMin_Flt
 #: sysdeps/names/prockernel.c:66
 msgid "The number of minor faults that the process and its children have made."
 msgstr "프로세스와 그 하위 프로세스로부터 발생된 사소한 폴트 갯수."
 
+#. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
 msgstr "프로세스와 그 하위 프로세스로부터 발생된 중대한 폴트 갯수."
 
+#. KStk_ESP
 #: sysdeps/names/prockernel.c:72
 msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
-msgstr "프로세스의 커널 스택 페이지에서 찾아진 esp (32비트 스택 포인터)의 현재 값."
+msgstr ""
+"프로세스의 커널 스택 페이지에서 찾아진 esp (32비트 스택 포인터)의 현재 값."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:75
 msgid "The current EIP (32-bit instruction pointer)."
 msgstr "현재의 EIP (32비트 전산명령 포인터)."
 
+#. NWChan
 #: sysdeps/names/prockernel.c:77
 msgid ""
 "This is the \"channel\" in which the process is waiting.  This is the "

po/lt.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-02 13:23+0200\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-02 13:21+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@tuxfamily.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"

po/mn.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-05 21:45+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-05 21:47+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -102,6 +102,7 @@ msgid "Spin:"
 msgstr "Spin:"
 
 #: lib/read.c:78
+#, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d байт унших"
@@ -112,6 +113,7 @@ msgid "read data size"
 msgstr "өгөгдлийн хэмжээг унших"
 
 #: lib/read_data.c:68
+#, c-format
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
 msgstr[0] "%d байт өгөгдөл унших"
@@ -659,8 +661,10 @@ msgstr ""
 "мужийн зай юм. Энэ нь зөөгддгүй хуудсууд байдаг."
 
 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "Процессын RSS -н одоогийн хязгаар байтаар (ер нь 2.147.483.647 байдаг)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgstr ""
+"Процессын RSS -н одоогийн хязгаар байтаар (ер нь 2.147.483.647 байдаг)."
 
 #: sysdeps/names/procsegment.c:43
 msgid "Text_RSS"
@@ -892,11 +896,13 @@ msgstr "Kernel горимд процессын хэрэглэх хугацаа"
 
 #: sysdeps/names/proctime.c:56
 msgid "cumulative utime of process and reaped children"
-msgstr "Процессын эсвэл хэдийнэ үхсэн хүүгийн хэрэглэгчийн горимд хэрэглэсэн хугацаа"
+msgstr ""
+"Процессын эсвэл хэдийнэ үхсэн хүүгийн хэрэглэгчийн горимд хэрэглэсэн хугацаа"
 
 #: sysdeps/names/proctime.c:57
 msgid "cumulative stime of process and reaped children"
-msgstr "Процессын эсвэл хэдийнэ үхсэн хүүгийн kernel-ийн горимд хэрэглэсэн хугацаа"
+msgstr ""
+"Процессын эсвэл хэдийнэ үхсэн хүүгийн kernel-ийн горимд хэрэглэсэн хугацаа"
 
 #: sysdeps/names/proctime.c:58
 msgid "The time (in jiffies) of the process's next timeout"
@@ -922,7 +928,8 @@ msgstr ""
 
 #: sysdeps/names/proctime.c:63
 msgid "SMP kernel-mode CPU time accumulated by process"
-msgstr "kernel горимд процессын хэрэглэх хугацаа, бүх процессорууд хамттооцогдсон"
+msgstr ""
+"kernel горимд процессын хэрэглэх хугацаа, бүх процессорууд хамттооцогдсон"
 
 #: sysdeps/names/procuid.c:48
 msgid "Uid"
@@ -1399,4 +1406,3 @@ msgstr "Хэрэглэгчийн тодорхойлсон сигнал 1"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Хэрэглэгчийн тодорхойлсон сигнал 2"
-

po/ms.po

@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop (libgtop-GNOME-2-0-port)\n"
-"POT-Creation-Date: 2003-11-11 03:33+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-11 03:36+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@list.sourceforge.net>\n"
@@ -21,13 +22,11 @@ msgstr "Denyutan (%ld per saat):"
 msgid "Total"
 msgstr "Jumlah"
 
-#: examples/smp.c:77
-#: sysdeps/names/mem.c:48
+#: examples/smp.c:77 sysdeps/names/mem.c:48
 msgid "User"
 msgstr "Pengguna"
 
-#: examples/smp.c:77
-#: sysdeps/names/procuid.c:51
+#: examples/smp.c:77 sysdeps/names/procuid.c:51
 msgid "Nice"
 msgstr "Elok"
 
@@ -44,20 +43,14 @@ msgstr "Leka"
 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:83
 #, c-format
-msgid ""
-"CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-""
-msgstr ""
-"CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-""
+msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
+msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
 
 #: examples/smp.c:100
 msgid "Percent:"
@@ -88,35 +81,45 @@ msgstr "Leka (%s)"
 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:120
 #, 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"
-""
+msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
+msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:126
 msgid "Spin:"
 msgstr "Putar:"
 
 #: lib/read.c:78
+#, fuzzy, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "baca saiz data"
+msgstr[1] "baca saiz data"
+
 #: lib/read_data.c:51
-#, c-format
 msgid "read data size"
 msgstr "baca saiz data"
 
 #: lib/read_data.c:68
+#, fuzzy, c-format
+msgid "read data %d byte"
+msgid_plural "read data %d bytes"
+msgstr[0] "baca saiz data"
+msgstr[1] "baca saiz data"
+
 #: lib/write.c:51
-#: src/daemon/gnuserv.c:456
 #, c-format
+msgid "write %d byte"
+msgid_plural "write %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
 msgstr "Hidupkan pengnyahpepijatan"
 
@@ -153,11 +156,10 @@ msgstr "INETD"
 msgid ""
 "Error on option %s: %s.\n"
 "Run '%s --help' to see a full list of available command line options.\n"
-""
 msgstr ""
 "Ralat pada opsyen %s: %s.\n"
-"Laksanakan '%s --help' untuk melihat senarai penuh opsyen arahan baris yang ada.\n"
-""
+"Laksanakan '%s --help' untuk melihat senarai penuh opsyen arahan baris yang "
+"ada.\n"
 
 #: sysdeps/names/cpu.c:44
 msgid "Total CPU Time"
@@ -207,28 +209,23 @@ msgstr "Masa CPU SMP dalam Task Leka"
 msgid "SMP CPU Flags"
 msgstr "Tanda CPUI SMP"
 
-#: sysdeps/names/cpu.c:60
-#: sysdeps/names/cpu.c:66
+#: sysdeps/names/cpu.c:60 sysdeps/names/cpu.c:66
 msgid "Number of clock ticks since system boot"
 msgstr "Bilangan denyutan jam sejak boot sistem"
 
-#: sysdeps/names/cpu.c:61
-#: sysdeps/names/cpu.c:67
+#: sysdeps/names/cpu.c:61 sysdeps/names/cpu.c:67
 msgid "Number of clock ticks the system spent in user mode"
 msgstr "Bilangan denyutan jam diluangkan dalam mod pengguna"
 
-#: sysdeps/names/cpu.c:62
-#: sysdeps/names/cpu.c:68
+#: sysdeps/names/cpu.c:62 sysdeps/names/cpu.c:68
 msgid "Number of clock ticks the system spent in user mode (nice)"
 msgstr "Bilangan denyutan jam diluangkan dalam mod pengguna (nice)"
 
-#: sysdeps/names/cpu.c:63
-#: sysdeps/names/cpu.c:69
+#: sysdeps/names/cpu.c:63 sysdeps/names/cpu.c:69
 msgid "Number of clock ticks the system spent in system mode"
 msgstr "Bilangan denyutan jam diluangkan dalam mod sistem"
 
-#: sysdeps/names/cpu.c:64
-#: sysdeps/names/cpu.c:70
+#: sysdeps/names/cpu.c:64 sysdeps/names/cpu.c:70
 msgid "Number of clock ticks the system spent in the idle task"
 msgstr "Bilangan denyutan jam diluangkan dalam task leka"
 
@@ -240,8 +237,7 @@ msgstr "Frekuensi denyutan (default ialah 100)"
 msgid "Bit field indicating which CPU is currently running"
 msgstr "Medan bit menunjukkan CPU mana sedang terlaksana"
 
-#: sysdeps/names/fsusage.c:40
-#: sysdeps/names/fsusage.c:49
+#: sysdeps/names/fsusage.c:40 sysdeps/names/fsusage.c:49
 msgid "Total blocks"
 msgstr "Jumlah blok"
 
@@ -253,13 +249,11 @@ msgstr "Blok kosong"
 msgid "Available blocks"
 msgstr "Blok yang tinggal"
 
-#: sysdeps/names/fsusage.c:43
-#: sysdeps/names/fsusage.c:52
+#: sysdeps/names/fsusage.c:43 sysdeps/names/fsusage.c:52
 msgid "Total file nodes"
 msgstr "Jumlah nod fail"
 
-#: sysdeps/names/fsusage.c:44
-#: sysdeps/names/fsusage.c:53
+#: sysdeps/names/fsusage.c:44 sysdeps/names/fsusage.c:53
 msgid "Free file nodes"
 msgstr "Nod fail kosong"
 
@@ -283,14 +277,15 @@ msgstr "Task Terlaksana"
 msgid "Number of Tasks"
 msgstr "Bilangan Task"
 
-#: sysdeps/names/loadavg.c:43
-#: sysdeps/names/loadavg.c:51
+#: sysdeps/names/loadavg.c:43 sysdeps/names/loadavg.c:51
 msgid "Last PID"
 msgstr "PID Terakhir"
 
 #: sysdeps/names/loadavg.c:48
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-msgstr "Bilangan job yang dilaksanakan serentak berpurata lebih daripada 1,5 dan 15 minit"
+msgstr ""
+"Bilangan job yang dilaksanakan serentak berpurata lebih daripada 1,5 dan 15 "
+"minit"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Number of tasks currently running"
@@ -360,70 +355,53 @@ msgstr "Memori yang digunakan untuk proses pengguna dalam kB"
 msgid "Memory in locked pages in kB"
 msgstr "Memori dalam page terkunci dalam kB"
 
-#: 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
+#: sysdeps/names/mountlist.c:39 sysdeps/names/mountlist.c:46
+#: sysdeps/names/proclist.c:39 sysdeps/names/proclist.c:46
+#: sysdeps/names/procmap.c:39 sysdeps/names/procmap.c:46
 msgid "Number of list elements"
 msgstr "Bilangan unsur senarai"
 
-#: sysdeps/names/mountlist.c:40
-#: sysdeps/names/mountlist.c:47
-#: sysdeps/names/proclist.c:40
-#: sysdeps/names/proclist.c:47
-#: sysdeps/names/procmap.c:40
-#: sysdeps/names/procmap.c:47
+#: sysdeps/names/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 "Total size of list"
 msgstr "Jumlah saiz senarai"
 
-#: sysdeps/names/mountlist.c:41
-#: sysdeps/names/mountlist.c:48
-#: sysdeps/names/proclist.c:41
-#: sysdeps/names/proclist.c:48
-#: sysdeps/names/procmap.c:41
-#: sysdeps/names/procmap.c:48
+#: sysdeps/names/mountlist.c:41 sysdeps/names/mountlist.c:48
+#: sysdeps/names/proclist.c:41 sysdeps/names/proclist.c:48
+#: sysdeps/names/procmap.c:41 sysdeps/names/procmap.c:48
 msgid "Size of a single list element"
 msgstr "Saiz unsur senarai tunggal"
 
-#: sysdeps/names/msg_limits.c:41
-#: sysdeps/names/msg_limits.c:52
+#: sysdeps/names/msg_limits.c:41 sysdeps/names/msg_limits.c:52
 msgid "Size in kilobytes of message pool"
 msgstr "Saiz dalam kilobyte pool mesej"
 
-#: sysdeps/names/msg_limits.c:42
-#: sysdeps/names/msg_limits.c:53
+#: sysdeps/names/msg_limits.c:42 sysdeps/names/msg_limits.c:53
 msgid "Number of entries in message map"
 msgstr "Bilangan kemasukan di peta mesej"
 
-#: sysdeps/names/msg_limits.c:43
-#: sysdeps/names/msg_limits.c:54
+#: sysdeps/names/msg_limits.c:43 sysdeps/names/msg_limits.c:54
 msgid "Max size of message"
 msgstr "Saiz max mesej"
 
-#: sysdeps/names/msg_limits.c:44
-#: sysdeps/names/msg_limits.c:55
+#: sysdeps/names/msg_limits.c:44 sysdeps/names/msg_limits.c:55
 msgid "Default max size of queue"
 msgstr "Saiz max default untuk queuqe"
 
-#: sysdeps/names/msg_limits.c:45
-#: sysdeps/names/msg_limits.c:56
+#: sysdeps/names/msg_limits.c:45 sysdeps/names/msg_limits.c:56
 msgid "Max queues system wide"
 msgstr "Maksikum giliran seluruh sistem"
 
-#: sysdeps/names/msg_limits.c:46
-#: sysdeps/names/msg_limits.c:57
+#: sysdeps/names/msg_limits.c:46 sysdeps/names/msg_limits.c:57
 msgid "Message segment size"
 msgstr "Saiz segmen mesej"
 
-#: sysdeps/names/msg_limits.c:47
-#: sysdeps/names/msg_limits.c:58
+#: sysdeps/names/msg_limits.c:47 sysdeps/names/msg_limits.c:58
 msgid "Number of system message headers"
 msgstr "Bilangan kepala mesej sistem"
 
-#: sysdeps/names/netload.c:46
-#: sysdeps/names/netload.c:64
+#: sysdeps/names/netload.c:46 sysdeps/names/netload.c:64
 msgid "Interface Flags"
 msgstr "Flag Antaramuka"
 
@@ -431,63 +409,51 @@ msgstr "Flag Antaramuka"
 msgid "MTU"
 msgstr "MTU"
 
-#: sysdeps/names/netload.c:48
-#: sysdeps/names/netload.c:66
+#: sysdeps/names/netload.c:48 sysdeps/names/netload.c:66
 msgid "Subnet"
 msgstr "Subnet"
 
-#: sysdeps/names/netload.c:49
-#: sysdeps/names/netload.c:67
+#: sysdeps/names/netload.c:49 sysdeps/names/netload.c:67
 msgid "Address"
 msgstr "Alamat"
 
-#: sysdeps/names/netload.c:50
-#: sysdeps/names/netload.c:68
+#: sysdeps/names/netload.c:50 sysdeps/names/netload.c:68
 msgid "Packets In"
 msgstr "Paket Masuk"
 
-#: sysdeps/names/netload.c:51
-#: sysdeps/names/netload.c:69
+#: sysdeps/names/netload.c:51 sysdeps/names/netload.c:69
 msgid "Packets Out"
 msgstr "Paket Keluar"
 
-#: sysdeps/names/netload.c:52
-#: sysdeps/names/netload.c:70
+#: sysdeps/names/netload.c:52 sysdeps/names/netload.c:70
 msgid "Packets Total"
 msgstr "Jumlah Paket"
 
-#: sysdeps/names/netload.c:53
-#: sysdeps/names/netload.c:71
+#: sysdeps/names/netload.c:53 sysdeps/names/netload.c:71
 msgid "Bytes In"
 msgstr "Byte Masuk"
 
-#: sysdeps/names/netload.c:54
-#: sysdeps/names/netload.c:72
+#: sysdeps/names/netload.c:54 sysdeps/names/netload.c:72
 msgid "Bytes Out"
 msgstr "Byte Keluar"
 
-#: sysdeps/names/netload.c:55
-#: sysdeps/names/netload.c:73
+#: sysdeps/names/netload.c:55 sysdeps/names/netload.c:73
 msgid "Bytes Total"
 msgstr "Jumlah Byte"
 
-#: sysdeps/names/netload.c:56
-#: sysdeps/names/netload.c:74
+#: sysdeps/names/netload.c:56 sysdeps/names/netload.c:74
 msgid "Errors In"
 msgstr "Ralat Masuk"
 
-#: sysdeps/names/netload.c:57
-#: sysdeps/names/netload.c:75
+#: sysdeps/names/netload.c:57 sysdeps/names/netload.c:75
 msgid "Errors Out"
 msgstr "Ralat Keluar"
 
-#: sysdeps/names/netload.c:58
-#: sysdeps/names/netload.c:76
+#: sysdeps/names/netload.c:58 sysdeps/names/netload.c:76
 msgid "Errors Total"
 msgstr "Jumlah Ralat"
 
-#: sysdeps/names/netload.c:59
-#: sysdeps/names/netload.c:77
+#: sysdeps/names/netload.c:59 sysdeps/names/netload.c:77
 msgid "Collisions"
 msgstr "Perlanggaran"
 
@@ -495,8 +461,7 @@ msgstr "Perlanggaran"
 msgid "Maximum Transfer Unit"
 msgstr "Unit Pemindahan Maksimum"
 
-#: sysdeps/names/ppp.c:39
-#: sysdeps/names/ppp.c:46
+#: sysdeps/names/ppp.c:39 sysdeps/names/ppp.c:46
 msgid "PPP State"
 msgstr "Keadaan PPP"
 
@@ -516,8 +481,7 @@ msgstr "Bilangan byte input"
 msgid "Number of output bytes"
 msgstr "Bilangan byte output"
 
-#: sysdeps/names/procargs.c:39
-#: sysdeps/names/procmem.c:48
+#: sysdeps/names/procargs.c:39 sysdeps/names/procmem.c:48
 msgid "Size"
 msgstr "Saiz"
 
@@ -566,7 +530,8 @@ msgstr "WChan"
 msgid ""
 "Kernel flags of the process.\n"
 "\n"
-"On Linux, currently every flag has the math bit set, because crt0.s checks for math emulation, so this is not included in the output.\n"
+"On Linux, currently every flag has the math bit set, because crt0.s checks "
+"for math emulation, so this is not included in the output.\n"
 "\n"
 "This is probably a bug, as not every process is a compiled C program.\n"
 "\n"
@@ -574,7 +539,8 @@ msgid ""
 msgstr ""
 "Flag kernel bagi proses.\n"
 "\n"
-"Di dlaam linux, semua flag mempunyai set bit math, kerana crt0.s memeriksa emulati math, oleh itu ia tidak akan disertakan di dalam output.\n"
+"Di dlaam linux, semua flag mempunyai set bit math, kerana crt0.s memeriksa "
+"emulati math, oleh itu ia tidak akan disertakan di dalam output.\n"
 "\n"
 "Ini mungkin pejijat, kerana bukan semua program dikompil oleh C.\n"
 "\n"
@@ -582,13 +548,21 @@ msgstr ""
 
 #. Min_Flt
 #: sysdeps/names/prockernel.c:60
-msgid "The number of minor faults the process has made, those which have not required loading a memory page from disk."
-msgstr "Bilangan kesalahan kecil yang proses lakukan, yang mana tidak memerlukan memuatan page memori daripada cakera."
+msgid ""
+"The number of minor faults the process has made, those which have not "
+"required loading a memory page from disk."
+msgstr ""
+"Bilangan kesalahan kecil yang proses lakukan, yang mana tidak memerlukan "
+"memuatan page memori daripada cakera."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:63
-msgid "The number of major faults the process has made, those which have required loading a memory page from disk."
-msgstr "Bilangan kesalahan besar yang proses lakukan, yang mana tidak memerlukan memuatkan page memori daripada cakera."
+msgid ""
+"The number of major faults the process has made, those which have required "
+"loading a memory page from disk."
+msgstr ""
+"Bilangan kesalahan besar yang proses lakukan, yang mana tidak memerlukan "
+"memuatkan page memori daripada cakera."
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:66
@@ -602,8 +576,12 @@ msgstr "Bilangan kesalahan besar yang proses dan anaknya telah lakukan."
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:72
-msgid "The current value of esp (32-bit stack pointer), as found in the kernel stack page for the process."
-msgstr "Nilai semasa bagi esp (pentuding tindanan 32-bit), yg dijumpai pada page tindanan bagi proses."
+msgid ""
+"The current value of esp (32-bit stack pointer), as found in the kernel "
+"stack page for the process."
+msgstr ""
+"Nilai semasa bagi esp (pentuding tindanan 32-bit), yg dijumpai pada page "
+"tindanan bagi proses."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:75
@@ -612,7 +590,11 @@ msgstr "EIP semasa(pentuding arahan 32-bit)."
 
 #. NWChan
 #: sysdeps/names/prockernel.c:77
-msgid "This is the \"channel\" in which the process is waiting.  This is the address of a system call, and can be looked up in a namelist if you need a textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to see the WCHAN field in action)"
+msgid ""
+"This is the \"channel\" in which the process is waiting.  This is the "
+"address of a system call, and can be looked up in a namelist if you need a "
+"textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
+"see the WCHAN field in action)"
 msgstr ""
 
 #. WChan
@@ -657,11 +639,18 @@ msgid "Number of pages of shared (mmap'd) memory"
 msgstr "Bilangan page bagi memori shared (mmap'd)"
 
 #: sysdeps/names/procmem.c:58
-msgid "Number of pages the process has in real memory, minus 3 for administrative purposes. This is just the pages which count towards text, data, or stack space. This does not include pages which have not been demand-loaded in, or which are swapped out."
-msgstr "Bilangan page yang proses ada pada memori sebenar, tolak 3 untuk kegunaan pentadbiran. Ini hanya page yang mengira teks, data, atak ruang stack "
+msgid ""
+"Number of pages the process has in real memory, minus 3 for administrative "
+"purposes. This is just the pages which count towards text, data, or stack "
+"space. This does not include pages which have not been demand-loaded in, or "
+"which are swapped out."
+msgstr ""
+"Bilangan page yang proses ada pada memori sebenar, tolak 3 untuk kegunaan "
+"pentadbiran. Ini hanya page yang mengira teks, data, atak ruang stack "
 
 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr "Had semasa dalam byte pada rss proses (usually 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:43
@@ -905,8 +894,12 @@ msgid "The time (in jiffies) of the process's next timeout"
 msgstr "Masa (dalam jiffies) bagi hadmasa proses seterusnya"
 
 #: sysdeps/names/proctime.c:59
-msgid "The time (in jiffies) before the next SIGALRM is sent to the process due to an interval timer."
-msgstr "Masa (dalam jiffies) sebelum SIGALRM seterusnya di hantar ke proses kerana selangwaktu timer"
+msgid ""
+"The time (in jiffies) before the next SIGALRM is sent to the process due to "
+"an interval timer."
+msgstr ""
+"Masa (dalam jiffies) sebelum SIGALRM seterusnya di hantar ke proses kerana "
+"selangwaktu timer"
 
 #: sysdeps/names/proctime.c:61
 msgid "Tick frequency"
@@ -1060,93 +1053,75 @@ msgstr "Bilangan kumpulan proses tambahan"
 msgid "Array of additional process groups"
 msgstr "Array kumpulan proses tambahan"
 
-#: sysdeps/names/sem_limits.c:43
-#: sysdeps/names/sem_limits.c:57
+#: sysdeps/names/sem_limits.c:43 sysdeps/names/sem_limits.c:57
 msgid "Number of entries in semaphore map"
 msgstr "Bilangan kemasukan pada peta semaphore"
 
-#: sysdeps/names/sem_limits.c:44
-#: sysdeps/names/sem_limits.c:58
+#: sysdeps/names/sem_limits.c:44 sysdeps/names/sem_limits.c:58
 msgid "Max number of arrays"
 msgstr "Bilangan maksimum array"
 
-#: sysdeps/names/sem_limits.c:45
-#: sysdeps/names/sem_limits.c:59
+#: sysdeps/names/sem_limits.c:45 sysdeps/names/sem_limits.c:59
 msgid "Max semaphores system wide"
 msgstr "Maksimum semaphore seluruh sistem"
 
-#: sysdeps/names/sem_limits.c:46
-#: sysdeps/names/sem_limits.c:60
+#: sysdeps/names/sem_limits.c:46 sysdeps/names/sem_limits.c:60
 msgid "Number of undo structures system wide"
 msgstr "Bilangan struktur nyahcara seluruh sistem"
 
-#: sysdeps/names/sem_limits.c:47
-#: sysdeps/names/sem_limits.c:61
+#: sysdeps/names/sem_limits.c:47 sysdeps/names/sem_limits.c:61
 msgid "Max semaphores per array"
 msgstr "Maksimum semaphore per array"
 
-#: sysdeps/names/sem_limits.c:48
-#: sysdeps/names/sem_limits.c:62
+#: sysdeps/names/sem_limits.c:48 sysdeps/names/sem_limits.c:62
 msgid "Max ops per semop call"
 msgstr "Maksimum operasi per panggilan semop"
 
-#: sysdeps/names/sem_limits.c:49
-#: sysdeps/names/sem_limits.c:63
+#: sysdeps/names/sem_limits.c:49 sysdeps/names/sem_limits.c:63
 msgid "Max number of undo entries per process"
 msgstr "Bilangan maksimum kemasukan nyahcara per proses"
 
-#: sysdeps/names/sem_limits.c:50
-#: sysdeps/names/sem_limits.c:64
+#: sysdeps/names/sem_limits.c:50 sysdeps/names/sem_limits.c:64
 msgid "sizeof struct sem_undo"
 msgstr "sizeof struct sem_undo"
 
-#: sysdeps/names/sem_limits.c:51
-#: sysdeps/names/sem_limits.c:65
+#: sysdeps/names/sem_limits.c:51 sysdeps/names/sem_limits.c:65
 msgid "Semaphore max value"
 msgstr "Nilai maksimum Semaphore"
 
-#: sysdeps/names/sem_limits.c:52
-#: sysdeps/names/sem_limits.c:66
+#: sysdeps/names/sem_limits.c:52 sysdeps/names/sem_limits.c:66
 msgid "Adjust on exit max value"
 msgstr "Sesuaikan pada nilai maksimum keluar"
 
-#: sysdeps/names/shm_limits.c:40
-#: sysdeps/names/shm_limits.c:49
+#: sysdeps/names/shm_limits.c:40 sysdeps/names/shm_limits.c:49
 msgid "Max segment size"
 msgstr "Saiz segmen maksimum"
 
-#: sysdeps/names/shm_limits.c:41
-#: sysdeps/names/shm_limits.c:50
+#: sysdeps/names/shm_limits.c:41 sysdeps/names/shm_limits.c:50
 msgid "Min segment size"
 msgstr "Saiz segmen minima"
 
-#: sysdeps/names/shm_limits.c:42
-#: sysdeps/names/shm_limits.c:51
+#: sysdeps/names/shm_limits.c:42 sysdeps/names/shm_limits.c:51
 msgid "Max number of segments"
 msgstr "Bilangan segmen maksimum"
 
-#: sysdeps/names/shm_limits.c:43
-#: sysdeps/names/shm_limits.c:52
+#: sysdeps/names/shm_limits.c:43 sysdeps/names/shm_limits.c:52
 msgid "Max shared segments per process"
 msgstr "Segmen terkongsi maksimum per proses"
 
-#: sysdeps/names/shm_limits.c:44
-#: sysdeps/names/shm_limits.c:53
+#: sysdeps/names/shm_limits.c:44 sysdeps/names/shm_limits.c:53
 msgid "Max total shared memory"
 msgstr "Jumlah maksma memori terkongsi"
 
-#: sysdeps/names/swap.c:40
-#: sysdeps/names/swap.c:49
+#: sysdeps/names/swap.c:40 sysdeps/names/swap.c:49
 msgid "Total Swap Space"
 msgstr "Jumlah Ruang Swap"
 
-#: sysdeps/names/swap.c:41
-#: sysdeps/names/swap.c:50
+#: sysdeps/names/swap.c:41 sysdeps/names/swap.c:50
 msgid "Used Swap Space"
 msgstr "Ruang Swap Digunakan"
 
-#: sysdeps/names/swap.c:42
-#: sysdeps/names/swap.c:51
+#: sysdeps/names/swap.c:42 sysdeps/names/swap.c:51
 msgid "Free Swap Space"
 msgstr "Swap Space Bebas"
 
@@ -1166,88 +1141,71 @@ msgstr "Jumlah bilangan page swap yang dibawa masuk sejak sistem dihidupkan"
 msgid "Total number of swap pages that have been brought out since system boot"
 msgstr "Jumlah bilangan page swap yang dibawa keluar sejak sistem dihidupkan"
 
-#: sysdeps/names/sysdeps.c:50
-#: sysdeps/names/sysdeps.c:77
+#: sysdeps/names/sysdeps.c:50 sysdeps/names/sysdeps.c:77
 msgid "Server Features"
 msgstr "Sifat Pelayan"
 
-#: sysdeps/names/sysdeps.c:51
-#: sysdeps/names/sysdeps.c:78
+#: sysdeps/names/sysdeps.c:51 sysdeps/names/sysdeps.c:78
 msgid "CPU Usage"
 msgstr "Penggunaan CPU"
 
-#: sysdeps/names/sysdeps.c:52
-#: sysdeps/names/sysdeps.c:79
+#: sysdeps/names/sysdeps.c:52 sysdeps/names/sysdeps.c:79
 msgid "Memory Usage"
 msgstr "Penggunaan Memori"
 
-#: sysdeps/names/sysdeps.c:53
-#: sysdeps/names/sysdeps.c:80
+#: sysdeps/names/sysdeps.c:53 sysdeps/names/sysdeps.c:80
 msgid "Swap Usage"
 msgstr "Penggunaan Swap"
 
-#: sysdeps/names/sysdeps.c:54
-#: sysdeps/names/sysdeps.c:81
+#: sysdeps/names/sysdeps.c:54 sysdeps/names/sysdeps.c:81
 msgid "System Uptime"
 msgstr "Uptime Sistem"
 
-#: sysdeps/names/sysdeps.c:55
-#: sysdeps/names/sysdeps.c:82
+#: sysdeps/names/sysdeps.c:55 sysdeps/names/sysdeps.c:82
 msgid "Load Averange"
 msgstr "Purata Muatan"
 
-#: sysdeps/names/sysdeps.c:56
-#: sysdeps/names/sysdeps.c:83
+#: sysdeps/names/sysdeps.c:56 sysdeps/names/sysdeps.c:83
 msgid "Shared Memory Limits"
 msgstr "Had Memori Terkongsi"
 
-#: sysdeps/names/sysdeps.c:57
-#: sysdeps/names/sysdeps.c:84
+#: sysdeps/names/sysdeps.c:57 sysdeps/names/sysdeps.c:84
 msgid "Message Queue Limits"
 msgstr "Had Queue Mesej"
 
-#: sysdeps/names/sysdeps.c:58
-#: sysdeps/names/sysdeps.c:85
+#: sysdeps/names/sysdeps.c:58 sysdeps/names/sysdeps.c:85
 msgid "Semaphore Set Limits"
 msgstr "Had Set Semaphore"
 
-#: sysdeps/names/sysdeps.c:59
-#: sysdeps/names/sysdeps.c:86
+#: sysdeps/names/sysdeps.c:59 sysdeps/names/sysdeps.c:86
 msgid "List of running Processes"
 msgstr "Senarai proses terlaksana"
 
-#: sysdeps/names/sysdeps.c:60
-#: sysdeps/names/sysdeps.c:87
+#: sysdeps/names/sysdeps.c:60 sysdeps/names/sysdeps.c:87
 msgid "Process Status information"
 msgstr "Maklumat Status proses"
 
-#: sysdeps/names/sysdeps.c:61
-#: sysdeps/names/sysdeps.c:88
+#: sysdeps/names/sysdeps.c:61 sysdeps/names/sysdeps.c:88
 msgid "Process UID and TTY information"
 msgstr "Maklumat UID dan TTY proses"
 
-#: sysdeps/names/sysdeps.c:62
-#: sysdeps/names/sysdeps.c:89
+#: sysdeps/names/sysdeps.c:62 sysdeps/names/sysdeps.c:89
 msgid "Process Memory information"
 msgstr "Maklumat Memori proses"
 
-#: sysdeps/names/sysdeps.c:63
-#: sysdeps/names/sysdeps.c:90
+#: sysdeps/names/sysdeps.c:63 sysdeps/names/sysdeps.c:90
 msgid "Process Time information"
 msgstr "Maklumat Masa proses"
 
-#: sysdeps/names/sysdeps.c:64
-#: sysdeps/names/sysdeps.c:91
+#: sysdeps/names/sysdeps.c:64 sysdeps/names/sysdeps.c:91
 msgid "Process Signal information"
 msgstr "Maklumat Isyarat proses"
 
-#: sysdeps/names/sysdeps.c:65
-#: sysdeps/names/sysdeps.c:92
+#: sysdeps/names/sysdeps.c:65 sysdeps/names/sysdeps.c:92
 msgid "Process Kernel Data information"
 msgstr "Maklumat Data Kernel proses"
 
-#: sysdeps/names/sysdeps.c:66
-#: sysdeps/names/sysdeps.c:93
+#: sysdeps/names/sysdeps.c:66 sysdeps/names/sysdeps.c:93
 msgid "Process Segment information"
 msgstr "Makluman Segmen proses"
 
@@ -1255,8 +1213,7 @@ msgstr "Makluman Segmen proses"
 msgid "Process Arguments"
 msgstr "Hujah Proses"
 
-#: sysdeps/names/sysdeps.c:68
-#: sysdeps/names/sysdeps.c:95
+#: sysdeps/names/sysdeps.c:68 sysdeps/names/sysdeps.c:95
 msgid "Process Memory Map"
 msgstr "Peta Meori Proses"
 
@@ -1264,18 +1221,15 @@ msgstr "Peta Meori Proses"
 msgid "Mount List"
 msgstr "Senarai lekapan"
 
-#: sysdeps/names/sysdeps.c:70
-#: sysdeps/names/sysdeps.c:97
+#: sysdeps/names/sysdeps.c:70 sysdeps/names/sysdeps.c:97
 msgid "File System Usage"
 msgstr "Penggunaan Sistem Fail"
 
-#: sysdeps/names/sysdeps.c:71
-#: sysdeps/names/sysdeps.c:98
+#: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "Network Load"
 msgstr "Muatan Rangkaian"
 
-#: sysdeps/names/sysdeps.c:72
-#: sysdeps/names/sysdeps.c:99
+#: sysdeps/names/sysdeps.c:72 sysdeps/names/sysdeps.c:99
 msgid "PPP Statistics"
 msgstr "Statistik PPP"
 
@@ -1305,164 +1259,133 @@ msgstr "Masa dalam saat sejak sistem dihidupkan"
 
 #: sysdeps/names/uptime.c:47
 msgid "Time in seconds the system spent in the idle task since system boot"
-msgstr "Masa dalam saat sistem peruntukkan pada task leka sejak sistem dihidupkan"
+msgstr ""
+"Masa dalam saat sistem peruntukkan pada task leka sejak sistem dihidupkan"
 
 #: sysdeps/names/uptime.c:48
 msgid "Time of last system boot in seconds since the epoch"
 msgstr "Masa bagi proses but akhir dalam saat sejak epok"
 
-#: sysdeps/osf1/siglist.c:28
-#: sysdeps/sun4/siglist.c:28
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Letak"
 
-#: sysdeps/osf1/siglist.c:29
-#: sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Gangguan"
 
-#: sysdeps/osf1/siglist.c:30
-#: sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Keluar"
 
-#: sysdeps/osf1/siglist.c:31
-#: sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Arahan terlarang"
 
-#: sysdeps/osf1/siglist.c:32
-#: sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Jerangkap Surih"
 
-#: sysdeps/osf1/siglist.c:33
-#: sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Batal"
 
-#: sysdeps/osf1/siglist.c:34
-#: sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "Ralat EMT"
 
-#: sysdeps/osf1/siglist.c:35
-#: sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Pengecualian Floating-point"
 
-#: sysdeps/osf1/siglist.c:36
-#: sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Bunuh"
 
-#: sysdeps/osf1/siglist.c:37
-#: sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Ralat Bas"
 
-#: sysdeps/osf1/siglist.c:38
-#: sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr ""
 
-#: sysdeps/osf1/siglist.c:39
-#: sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Hujah teruk ke panggilan sistem"
 
-#: sysdeps/osf1/siglist.c:40
-#: sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Paip pecah"
 
-#: sysdeps/osf1/siglist.c:41
-#: sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Jam loceng"
 
-#: sysdeps/osf1/siglist.c:42
-#: sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Penamatan"
 
-#: sysdeps/osf1/siglist.c:43
-#: sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Keadaan segera pada soket"
 
-#: sysdeps/osf1/siglist.c:44
-#: sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Henti"
 
-#: sysdeps/osf1/siglist.c:45
-#: sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Hentian papankekunci"
 
-#: sysdeps/osf1/siglist.c:46
-#: sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Teruskan"
 
-#: sysdeps/osf1/siglist.c:47
-#: sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Status anak berubah"
 
-#: sysdeps/osf1/siglist.c:48
-#: sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Bacaan latar belakang daripada tty"
 
-#: sysdeps/osf1/siglist.c:49
-#: sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Penulisan latar belakang daripada tty"
 
-#: sysdeps/osf1/siglist.c:50
-#: sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "I/O sekarang dibolehkan"
 
-#: sysdeps/osf1/siglist.c:51
-#: sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU melebihi had"
 
-#: sysdeps/osf1/siglist.c:52
-#: sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Saiz fail melebihi had"
 
-#: sysdeps/osf1/siglist.c:53
-#: sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Jam loceng maya"
 
-#: sysdeps/osf1/siglist.c:54
-#: sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Memprofil jam loceng"
 
-#: sysdeps/osf1/siglist.c:55
-#: sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Penukaran saiz tetingkap"
 
-#: sysdeps/osf1/siglist.c:56
-#: sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Permintaan maklumat"
 
-#: sysdeps/osf1/siglist.c:57
-#: sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Isyarat dinyatakan pengguna 1"
 
-#: sysdeps/osf1/siglist.c:58
-#: sysdeps/sun4/siglist.c:58
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Isyarat dinyatakan pengguna 2"
-

po/nl.po

@@ -4,16 +4,16 @@
 # 
 msgid ""
 msgstr ""
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Project-Id-Version: libgtop CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-06 20:22+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-01 18:11+0100\n"
 "Last-Translator: Jeroen van der Vegt <A.J.vanderVegt@ITS.TUDelft.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: examples/smp.c:74
 #, c-format

po/no.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-13 00:30+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-13 00:34+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"

po/pl.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-13 15:28+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2002-07-05 19:13+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -533,6 +533,7 @@ msgstr "NWChan"
 msgid "WChan"
 msgstr "WChan"
 
+#. K_Flags
 #: sysdeps/names/prockernel.c:51
 msgid ""
 "Kernel flags of the process.\n"
@@ -554,6 +555,7 @@ msgstr ""
 "\n"
 "Bit koprocesora ma dziesiętną wartość 4, a bit śledzenia - 10."
 
+#. Min_Flt
 #: sysdeps/names/prockernel.c:60
 msgid ""
 "The number of minor faults the process has made, those which have not "
@@ -562,6 +564,7 @@ msgstr ""
 "Liczba pomniejszych błędów spowodowanych przez proces, tych które nie "
 "wymagały wczytania strony pamięci z dysku."
 
+#. Maj_Flt
 #: sysdeps/names/prockernel.c:63
 msgid ""
 "The number of major faults the process has made, those which have required "
@@ -570,15 +573,18 @@ msgstr ""
 "Liczba poważnych błędów wygenerowanych przez proces, które wymagały "
 "wczytania strony pamięci z dysku."
 
+#. CMin_Flt
 #: sysdeps/names/prockernel.c:66
 msgid "The number of minor faults that the process and its children have made."
 msgstr "Liczba pomniejszych błędów spowodowanych przez proces i jego potomków."
 
+#. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
 msgstr ""
 "Liczba poważnych błędów wygenerowanych przez proces oraz jego potomków."
 
+#. KStk_ESP
 #: sysdeps/names/prockernel.c:72
 msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
@@ -592,6 +598,7 @@ msgstr ""
 msgid "The current EIP (32-bit instruction pointer)."
 msgstr "Aktualna wartość EIP (wskaźnika instrukcji)."
 
+#. NWChan
 #: sysdeps/names/prockernel.c:77
 msgid ""
 "This is the \"channel\" in which the process is waiting.  This is the "

po/pt.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
-"Report-Msgid-Bugs-To: Duarte Loreto <happyguy_pt@hotmail.com>\n"
-"POT-Creation-Date: 2004-01-04 01:37+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-04 01:55+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -161,8 +161,8 @@ msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Erro na opção %s: %s.\n"
-"Executar '%s --help' para consultar uma lista completa de opções de "
-"linha de comando.\n"
+"Executar '%s --help' para consultar uma lista completa de opções de linha de "
+"comando.\n"
 
 #: sysdeps/names/cpu.c:44
 msgid "Total CPU Time"
@@ -287,7 +287,8 @@ msgstr "Último PID"
 #: sysdeps/names/loadavg.c:48
 msgid "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
 msgstr ""
-"Média de número de processos em execução simultânea nos últimos 1, 5 e 15 minutos"
+"Média de número de processos em execução simultânea nos últimos 1, 5 e 15 "
+"minutos"
 
 #: sysdeps/names/loadavg.c:49
 msgid "Number of tasks currently running"
@@ -542,7 +543,8 @@ msgstr ""
 "Parâmetros de Kernel do processo.\n"
 "\n"
 "Em Linux, actualmente todos os parâmetros têm o bit math activo pois crt0.s "
-"procura por emulação matemática, pelo que isto não é incluido nos resultados.\n"
+"procura por emulação matemática, pelo que isto não é incluido nos "
+"resultados.\n"
 "\n"
 "Isto poderá ser um erro já que nem todos os processos são aplicações "
 "compiladas em C.\n"

po/sk.po

@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
-"POT-Creation-Date: 2003-11-01 07:13+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-11-01 07:43+0100\n"
 "Last-Translator: Marcel Telka <Marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

po/sq.po

@@ -5,21 +5,21 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.HEAD.sq\n"
+"Project-Id-Version: libgtop.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-02 11:29+0100\n"
-"PO-Revision-Date: 2004-02-02 13:41+0100\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
+"PO-Revision-Date: 2004-02-23 15:10+0100\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: examples/smp.c:74
 #, c-format
 msgid "Ticks (%ld per second):"
-msgstr "Tick (%ld për sekondë):"
+msgstr "Ticks (%ld për sekondë):"
 
 #: examples/smp.c:77
 msgid "Total"
@@ -39,7 +39,7 @@ msgstr "Sys"
 
 #: examples/smp.c:77
 msgid "Idle"
-msgstr "Joaktiv"
+msgstr "Jo në përdorim"
 
 #: examples/smp.c:79
 #, c-format
@@ -77,7 +77,7 @@ msgstr "Sys (%)"
 
 #: examples/smp.c:102
 msgid "Idle (%)"
-msgstr "Idle (%)"
+msgstr "Jo në përdorim (%)"
 
 #: examples/smp.c:104
 #, c-format
@@ -95,14 +95,14 @@ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
 
 #: examples/smp.c:126
 msgid "Spin:"
-msgstr "Spin:"
+msgstr "Rrutullimi:"
 
 #: lib/read.c:78
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "u lexua %d byte"
-msgstr[1] "u lexua %d byte"
+msgstr[1] "u lexuan %d bytes"
 
 #: lib/read_data.c:51
 msgid "read data size"
@@ -113,14 +113,14 @@ msgstr "madhësia e të dhënave të lexuara"
 msgid "read data %d byte"
 msgid_plural "read data %d bytes"
 msgstr[0] "u lexua %d byte me të dhëna"
-msgstr[1] "u lexua %d byte me të dhëna"
+msgstr[1] "u lexuan %d bytes me të dhëna"
 
 #: lib/write.c:51
 #, c-format
 msgid "write %d byte"
 msgid_plural "write %d bytes"
 msgstr[0] "u shkrua %d byte"
-msgstr[1] "u shkrua %d byte"
+msgstr[1] "u shkruan %d bytes"
 
 #: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
@@ -181,7 +181,7 @@ msgstr "Koha e CPU në modalitet sistemi"
 
 #: sysdeps/names/cpu.c:48
 msgid "CPU Time in the Idle Task"
-msgstr "Koha e CPU në idle"
+msgstr "Koha e CPU në pritje"
 
 #: sysdeps/names/cpu.c:49
 msgid "Tick Frequency"
@@ -205,7 +205,7 @@ msgstr "Koha e CPU SMP në modalitet sistemi"
 
 #: sysdeps/names/cpu.c:54
 msgid "SMP CPU Time in the Idle Task"
-msgstr "Koha e CPU SMP në idle"
+msgstr "Koha e CPU SMP në pritje"
 
 #: sysdeps/names/cpu.c:55
 msgid "SMP CPU Flags"
@@ -229,7 +229,7 @@ msgstr "Numri i tick të shpenzuar në modalitet sistemi"
 
 #: sysdeps/names/cpu.c:64 sysdeps/names/cpu.c:70
 msgid "Number of clock ticks the system spent in the idle task"
-msgstr "Numri i tick të shpenzuar në idle"
+msgstr "Numri i tick të shpenzuar në pritje"
 
 #: sysdeps/names/cpu.c:65
 msgid "Tick frequency (default is 100)"
@@ -273,11 +273,11 @@ msgstr "Ngarkesa Mesatare"
 
 #: sysdeps/names/loadavg.c:41
 msgid "Running Tasks"
-msgstr "Procese në ekzekutim"
+msgstr "Proçese në ekzekutim"
 
 #: sysdeps/names/loadavg.c:42
 msgid "Number of Tasks"
-msgstr "Numri i proceseve"
+msgstr "Numri i proçeseve"
 
 #: sysdeps/names/loadavg.c:43 sysdeps/names/loadavg.c:51
 msgid "Last PID"
@@ -289,11 +289,11 @@ msgstr "Numri i job të zbatuar njëkohësisht (mesatarja mbi 1, 5 dhe 15 minuta
 
 #: sysdeps/names/loadavg.c:49
 msgid "Number of tasks currently running"
-msgstr "Numri i proceseve aktualisht në ekzekutim"
+msgstr "Numri i proçeseve aktualisht në ekzekutim"
 
 #: sysdeps/names/loadavg.c:50
 msgid "Total number of tasks"
-msgstr "Numri i plotë i proceseve"
+msgstr "Numri i plotë i proçeseve"
 
 #: sysdeps/names/mem.c:42
 msgid "Total Memory"
@@ -349,7 +349,7 @@ msgstr "Madhësia e kujtesës në cache në kB"
 
 #: sysdeps/names/mem.c:60
 msgid "Memory used from user processes in kB"
-msgstr "Kujtesa e përdorur nga proceset e përdoruesit në kB"
+msgstr "Kujtesa e përdorur nga proçeset e përdoruesit në kB"
 
 #: sysdeps/names/mem.c:61
 msgid "Memory in locked pages in kB"
@@ -542,7 +542,8 @@ msgstr ""
 "Në Linux, aktualisht çdo flag ka të vendosur math, sepse crt0.s kontrollon "
 "për emulimin matematik, prandaj nuk përfshihet në output.\n"
 "\n"
-"Ky mund të jetë një difekt, se jo çdo proçes është një program i kompiluar në C.\n"
+"Ky mund të jetë një difekt, se jo çdo proçes është një program i kompiluar "
+"në C.\n"
 "\n"
 "Bit math duhet të jetë një dhjetore 4, dhe bit i marrë është dhjetor 10."
 
@@ -552,8 +553,8 @@ msgid ""
 "The number of minor faults the process has made, those which have not "
 "required loading a memory page from disk."
 msgstr ""
-"Numri i dështimeve të vogla të proçesit, për të cilat nuk ka nevojë ngarkimi "
-"i një faqe kujteseje nga disku."
+"Numri i dështimeve të vegjël të proçesit, për të cilat nuk ka nevojë "
+"ngarkimi i një faqe kujteseje nga disku."
 
 #. Maj_Flt
 #: sysdeps/names/prockernel.c:63
@@ -561,18 +562,18 @@ msgid ""
 "The number of major faults the process has made, those which have required "
 "loading a memory page from disk."
 msgstr ""
-"Numri i dështimeve të renda të proçesit, për të cilat ka nevojë ngarkimi "
-"i një faqe kujteseje nga disku."
+"Numri i dështimeve të rënda të proçesit, për të cilat ka nevojë ngarkimi i "
+"një faqe kujteseje nga disku."
 
 #. CMin_Flt
 #: sysdeps/names/prockernel.c:66
 msgid "The number of minor faults that the process and its children have made."
-msgstr "Numri i dështimeve të vogla që proçesi dhe bijtë e tij kanë patur."
+msgstr "Numri i dështimeve të vegjël që proçesi dhe bijtë e tij kanë patur."
 
 #. CMaj_Flt
 #: sysdeps/names/prockernel.c:69
 msgid "The number of major faults that the process and its children have made."
-msgstr "Numri i dështimeve të renda që proçesi dhe bijtë e tij kanë patur."
+msgstr "Numri i dështimeve të rënda që proçesi dhe bijtë e tij kanë patur."
 
 #. KStk_ESP
 #: sysdeps/names/prockernel.c:72
@@ -580,8 +581,8 @@ msgid ""
 "The current value of esp (32-bit stack pointer), as found in the kernel "
 "stack page for the process."
 msgstr ""
-"Vlera aktuale e ESP (stack pointer me 32 bit) sikurse dhënë nga faqja estack "
-"të procesit."
+"Vlera aktuale e ESP (stack pointer me 32 bit) sikurse dhënë nga faqja e "
+"stack të proçesit."
 
 #. KStk_EIP
 #: sysdeps/names/prockernel.c:75
@@ -596,10 +597,10 @@ msgid ""
 "textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -l to "
 "see the WCHAN field in action)"
 msgstr ""
-"Ky është \"kanali\" në të cilin proçesi është në pritje.  Është adresa e "
-"një thirrje të sistemit, dhe mund të shihet në një listë emrore nëse ju nevoitet "
-"një emër në tekst.  (Nëse keni një /etc/psdatabase të rifreskuar, provo ps -l për "
-"të shikuar fushën e WCHAN në veprim)"
+"Ky është \"kanali\" në të cilin proçesi është në pritje.  Është adresa e një "
+"thirrje të sistemit, dhe mund të shihet në një listë emrore nëse ju nevoitet "
+"një emër në tekst.  (Nëse keni një /etc/psdatabase të rifreskuar, provo ps -"
+"l për të shikuar fushën e WCHAN në veprim)"
 
 #. WChan
 #: sysdeps/names/prockernel.c:82
@@ -649,12 +650,14 @@ msgid ""
 "space. This does not include pages which have not been demand-loaded in, or "
 "which are swapped out."
 msgstr ""
-"Numri i faqeve që proçesi ka në kujtesën reale, minus 3 për qëllime administrative. "
-"Janë vetëm faqet që përmbajnë tekst, të dhëna, apo stivë me hapësirë. Nuk "
-"përfshihen faqet që nuk janë kërkuar të ngarkohen, apo të shkarkuara nga swap."
+"Numri i faqeve që proçesi ka në kujtesën reale, minus 3 për qëllime "
+"administrative. Janë vetëm faqet që përmbajnë tekst, të dhëna, apo stivë me "
+"hapësirë. Nuk përfshihen faqet që nuk janë kërkuar të ngarkohen, apo të "
+"shkarkuara nga swap."
 
 #: sysdeps/names/procmem.c:63
-msgid "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
+msgid ""
+"Current limit in bytes on the rss of the process (usually 2,147,483,647)."
 msgstr "Limiti aktual në bytes i rss të proçesit (zakonisht 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:43
@@ -799,23 +802,23 @@ msgstr "Kodi për gjendjen e proçesit (S=sleeping)"
 
 #: sysdeps/names/procstate.c:51
 msgid "UID of process"
-msgstr "UID e procesit"
+msgstr "UID e proçesit"
 
 #: sysdeps/names/procstate.c:52
 msgid "GID of process"
-msgstr "GID e procesit"
+msgstr "GID e proçesit"
 
 #: sysdeps/names/procstate.c:53
 msgid "Real UID of process"
-msgstr "UID real i procesit"
+msgstr "UID real i proçesit"
 
 #: sysdeps/names/procstate.c:54
 msgid "Real GID of process"
-msgstr "DID real i procesit"
+msgstr "DID real i proçesit"
 
 #: sysdeps/names/procstate.c:55
 msgid "Has CPU"
-msgstr "Has CPU"
+msgstr "Ka CPU"
 
 #: sysdeps/names/procstate.c:56
 msgid "Processor"
@@ -823,7 +826,7 @@ msgstr "Proçesori"
 
 #: sysdeps/names/procstate.c:57
 msgid "Last Processor"
-msgstr "Procesori i fundit"
+msgstr "Proçesori i fundit"
 
 #: sysdeps/names/proctime.c:45
 msgid "Start_Time"
@@ -902,8 +905,8 @@ msgid ""
 "The time (in jiffies) before the next SIGALRM is sent to the process due to "
 "an interval timer."
 msgstr ""
-"Koha (në jiffies) para se sinjali tjetër SIGALRM t'i dërgohet proçesit në një "
-"interval kohe."
+"Koha (në jiffies) para se sinjali tjetër SIGALRM t'i dërgohet proçesit në "
+"një interval kohe."
 
 #: sysdeps/names/proctime.c:61
 msgid "Tick frequency"
@@ -1231,7 +1234,7 @@ msgstr "File sistem i përdorur"
 
 #: sysdeps/names/sysdeps.c:71 sysdeps/names/sysdeps.c:98
 msgid "Network Load"
-msgstr "Ngarkesa rrjetit"
+msgstr "Ngarkesa e rrjetit"
 
 #: sysdeps/names/sysdeps.c:72 sysdeps/names/sysdeps.c:99
 msgid "PPP Statistics"
@@ -1283,7 +1286,7 @@ msgstr "Dil"
 
 #: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "Instruksion ilegal"
+msgstr "Instruktim ilegal"
 
 #: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
@@ -1331,7 +1334,7 @@ msgstr "Përfundimi"
 
 #: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Kondicion urgjent në socket "
+msgstr "Konditë urgjente në socket "
 
 #: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
@@ -1339,7 +1342,7 @@ msgstr "Ndalo"
 
 #: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Keyboard stop"
+msgstr "Ndalim nga tastiera"
 
 #: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
@@ -1392,4 +1395,3 @@ msgstr "Sinjal 1 i përcaktuar nga përdoruesi"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Sinjal 2 i përcaktuar nga përdoruesi"
-

po/sr.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-22 01:30+0200\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-10-22 01:44+0200\n"
 "Last-Translator: Бранко Ивановић <popeye@one.ekof.bg.ac.yu>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"

po/sr@Latn.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-10-22 01:30+0200\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2003-10-22 01:44+0200\n"
 "Last-Translator: Branko Ivanović <popeye@one.ekof.bg.ac.yu>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -605,8 +605,8 @@ msgid ""
 msgstr ""
 "Ovo je „kanal“ u kom proces čeka. To je adresa sistemskog poziva i može se "
 "pronaći u spisku imena ukoliko vam je potreban tekstualni naziv. (Ako "
-"posedujete ažuriran /etc/psdatabase, probajte „ps -l“ da vidite WCHAN polje u "
-"akciji)"
+"posedujete ažuriran /etc/psdatabase, probajte „ps -l“ da vidite WCHAN polje "
+"u akciji)"
 
 #. WChan
 #: sysdeps/names/prockernel.c:82
@@ -664,7 +664,8 @@ msgstr ""
 #: sysdeps/names/procmem.c:63
 msgid ""
 "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-msgstr "Trenutno ograničenje u bajtovima na RSS procesa (obično 2,147,483,647)."
+msgstr ""
+"Trenutno ograničenje u bajtovima na RSS procesa (obično 2,147,483,647)."
 
 #: sysdeps/names/procsegment.c:43
 msgid "Text_RSS"

po/sv.po

@@ -9,7 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
-"POT-Creation-Date: 2004-01-06 02:44+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2004-01-06 02:45+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"

po/tr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 1.0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-28 21:47+0000\n"
+"POT-Creation-Date: 2004-03-11 03:27+0100\n"
 "PO-Revision-Date: 2002-09-18 05:37+0300\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: GNOME Turk <gnome-turk@gnome.org>\n"

src/daemon/ChangeLog

@@ -1,3 +1,9 @@
+2004-03-04  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* gnuserv.c: link explicitely to popt and use libgtop-i18n.h
+	instead of libgnome
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am:

src/daemon/Makefile.am

@@ -38,12 +38,13 @@ libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 				  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
 				  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
 				  @sysdeps_suid_lib@ \
-				  $(suid_sysdeps) $(suid_common)\
-				  $(LIBGTOP_LIBS)\
+				  $(suid_sysdeps) $(suid_common) \
+				  $(LIBGTOP_LIBS) \
+				  -lpopt \
 				  @libs_xauth@
 
 libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
-libgtop_server2_LDADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
+libgtop_server2_LDADD		= $(GLIB_LIBS) -lpopt $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
 				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
 
 EXTRA_DIST			= server_config.h.in server_config.pl

src/daemon/gnuserv.c

@@ -31,7 +31,7 @@
 
 #include <config.h>
 
-#include <libgnome/gnome-i18n.h>
+#include "libgtop-i18n.h"
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>

sysdeps/aix/ChangeLog

@@ -1,3 +1,8 @@
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* procargs.c: (glibtop_get_proc_args_s): fix g_malloc usage on non-Linux
+        platforms (patch by Benoit Dejean <bnet@ifrance.com>)
+
 2003-10-21  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: install only one library, libgtop-2.0

sysdeps/aix/procargs.c

@@ -73,7 +73,7 @@ glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 	}
 	
 	size = max_len != 0 ? max_len : 4096;
-	args_buffer = g_malloc (server, size);
+	args_buffer = g_malloc (size);
 	if (args_buffer == NULL)
 	{
 		glibtop_error_io_r (server, "Cannot malloc procsinfo");
@@ -111,7 +111,7 @@ glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
 		len += strlen(args_buffer + len) + 1;
 	}
 
-	args = g_malloc (server, len);
+	args = g_malloc (len);
 	if (args == NULL)
 	{
 		glibtop_error_io_r (server, "Cannot malloc procsinfo");

sysdeps/common/ChangeLog

@@ -1,3 +1,21 @@
+2004-03-15  Bastien Nocera  <hadess@hadess.net>
+
+	* fsusage.c:
+	* fsusage.h: remove use of uintmax_t
+
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* fsusage.c: fix build (we don't have "full-read.h" here)
+
+2003-12-27  Ole Laursen  <olau@hardworking.dk>
+
+	* README.fsusage: Added a few words about the code from GNU
+	Coreutils.
+
+	* fsusage.c, fsusage.h: Resynced from GNU Coreutils 5.0.
+
+	* fsusage-frontend.c: Moved the frontend from fsusage.c to here.
+
 2003-10-21  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am:

sysdeps/common/Makefile.am

@@ -14,7 +14,8 @@ CFLAGS				= @CFLAGS@ $(inodedb_DEFS)
 noinst_LTLIBRARIES		= libgtop_common-2.0.la libgtop_suid_common-2.0.la
 
 libgtop_common_2_0_la_SOURCES	= error.c gnuslib.c \
-				  fsusage.c fsusage.h mountlist.c mountlist.h \
+				  fsusage.c fsusage.h fsusage-frontend.c \
+                                  mountlist.c mountlist.h \
 				  $(inodedb_SRCLIST)
 
 libgtop_common_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)

sysdeps/common/README.fsusage

@@ -0,0 +1,9 @@
+The files fsusage.c and fsusage.h have been stolen from the GNU
+Coreutils package (version 5.0) and are the actual implementation of
+the fsusage function.
+
+The only changes that have been made to these files is that some code
+for SVR2 has been ripped out since it depended on some more code (SVR3
+was released in 1986 and introduced shared libraries), and the
+functions have been prefixed with glibtop_private to avoid name
+clashes with user code.

sysdeps/common/fsusage-frontend.c

@@ -0,0 +1,67 @@
+/* fsusage-frontend.c -- return space usage of mounted filesystems.
+   
+   Copyright (C) 2003 Ole Laursen.
+
+   This program 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, or (at your option)
+   any later version.
+
+   This program 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 this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* This code is simply a front-end for the actual code in fsusage.[ch] which
+   is stolen directly from the GNU Coreutils package. */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#ifndef UINTMAX_MAX
+# define UINTMAX_MAX ((uintmax_t) -1)
+#endif
+
+#include "fsusage.h"
+
+#include <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/fsusage.h>
+
+void
+glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
+		       const char *disk)
+{
+	struct fs_usage fsp;
+
+	glibtop_init_r (&server, 0, 0);
+	
+	memset (buf, 0, sizeof (glibtop_fsusage));
+	memset (&fsp, 0, sizeof (struct fs_usage));
+	
+	if (glibtop_private_get_fs_usage (disk, disk, &fsp) != 0)
+		return;
+
+	buf->blocks = fsp.fsu_blocks;
+	buf->bfree = fsp.fsu_bfree;
+	buf->bavail = fsp.fsu_bavail;
+	buf->files = fsp.fsu_files;
+	buf->ffree = fsp.fsu_ffree;
+	buf->block_size = fsp.fsu_blocksize;
+}

sysdeps/common/fsusage.c

@@ -1,5 +1,6 @@
 /* fsusage.c -- return space usage of mounted filesystems
-   Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +24,12 @@
 #include <sys/stat.h>
 #include "fsusage.h"
 
-int statfs ();
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef CHAR_BIT
+# define CHAR_BIT 8
+#endif
 
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -41,7 +47,7 @@ int statfs ();
 # include <sys/fs/s5param.h>
 #endif
 
-#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY)
+#if defined HAVE_SYS_FILSYS_H && !defined _CRAY
 # include <sys/filsys.h>	/* SVR2 */
 #endif
 
@@ -62,36 +68,29 @@ int statfs ();
 int statvfs ();
 #endif
 
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/fsusage.h>
+/* Many space usage primitives use all 1 bits to denote a value that is
+   not applicable or unknown.  Propagate this information by returning
+   a guint64 value that is all 1 bits if X is all 1 bits, even if X
+   is unsigned and narrower than guint64.  */
+#define PROPAGATE_ALL_ONES(x) \
+  ((sizeof (x) < sizeof (guint64) \
+    && (~ (x) == (sizeof (x) < sizeof (int) \
+		  ? - (1 << (sizeof (x) * CHAR_BIT)) \
+		  : 0))) \
+   ? G_MAXUINT64 : (x))
 
-static int
-get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp);
+/* Extract the top bit of X as an guint64 value.  */
+#define EXTRACT_TOP_BIT(x) ((x) \
+			    & ((guint64) 1 << (sizeof (x) * CHAR_BIT - 1)))
 
-int safe_read ();
-
-/* Return the number of TOSIZE-byte blocks used by
-   BLOCKS FROMSIZE-byte blocks, rounding away from zero.
-   TOSIZE must be positive.  Return -1 if FROMSIZE is not positive.  */
-
-static guint64
-adjust_blocks (blocks, fromsize, tosize)
-     guint64 blocks;
-     int fromsize, tosize;
-{
-  if (tosize <= 0)
-    abort ();
-  if (fromsize <= 0)
-    return -1;
-
-  if (fromsize == tosize)	/* e.g., from 512 to 512 */
-    return blocks;
-  else if (fromsize > tosize)	/* e.g., from 2048 to 512 */
-	return blocks * (guint64)(fromsize / tosize);
-  else				/* e.g., from 256 to 512 */
-	return (blocks + (blocks < 0 ? -1 : 1)) / (guint64)(tosize / fromsize);
-}
+/* If a value is negative, many space usage primitives store it into an
+   integer variable by assignment, even if the variable's type is unsigned.
+   So, if a space usage variable X's top bit is set, convert X to the
+   guint64 value V such that (- (guint64) V) is the negative of
+   the original value.  If X's top bit is clear, just yield X.
+   Use PROPAGATE_TOP_BIT if the original value might be negative;
+   otherwise, use PROPAGATE_ALL_ONES.  */
+#define PROPAGATE_TOP_BIT(x) ((x) | ~ (EXTRACT_TOP_BIT (x) - 1))
 
 /* Fill in the fields of FSP with information about space usage for
    the filesystem on which PATH resides.
@@ -100,79 +99,46 @@ adjust_blocks (blocks, fromsize, tosize)
    Return 0 if successful, -1 if not.  When returning -1, ensure that
    ERRNO is either a system error value, or zero if DISK is NULL
    on a system that requires a non-NULL value.  */
-static int
-get_fs_usage (path, disk, fsp)
-     const char *path;
-     const char *disk;
-     struct fs_usage *fsp;
+int
+glibtop_private_get_fs_usage (const char *path, const char *disk, struct fs_usage *fsp)
 {
 #ifdef STAT_STATFS3_OSF1
-# define CONVERT_BLOCKS(B) adjust_blocks ((guint64)(B), fsd.f_fsize, 512)
 
   struct statfs fsd;
 
   if (statfs (path, &fsd, sizeof (struct statfs)) != 0)
     return -1;
 
+  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
+
 #endif /* STAT_STATFS3_OSF1 */
 
 #ifdef STAT_STATFS2_FS_DATA	/* Ultrix */
-# define CONVERT_BLOCKS(B) adjust_blocks ((guint64)(B), 1024, 512)
 
   struct fs_data fsd;
 
   if (statfs (path, &fsd) != 1)
     return -1;
-  fsp->fsu_blocks = CONVERT_BLOCKS (fsd.fd_req.btot);
-  fsp->fsu_bfree = CONVERT_BLOCKS (fsd.fd_req.bfree);
-  fsp->fsu_bavail = CONVERT_BLOCKS (fsd.fd_req.bfreen);
-  fsp->fsu_files = fsd.fd_req.gtot;
-  fsp->fsu_ffree = fsd.fd_req.gfree;
+
+  fsp->fsu_blocksize = 1024;
+  fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.fd_req.btot);
+  fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.fd_req.bfree);
+  fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.fd_req.bfreen);
+  fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.fd_req.bfreen) != 0;
+  fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.fd_req.gtot);
+  fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.fd_req.gfree);
 
 #endif /* STAT_STATFS2_FS_DATA */
 
-#ifdef STAT_READ_FILSYS		/* SVR2 */
-# ifndef SUPERBOFF
-#  define SUPERBOFF (SUPERB * 512)
-# endif
-# define CONVERT_BLOCKS(B) \
-    adjust_blocks ((guint64)(B), (fsd.s_type == Fs2b ? 1024 : 512), 512)
-
-  struct filsys fsd;
-  int fd;
-
-  if (! disk)
-    {
-      errno = 0;
-      return -1;
-    }
-
-  fd = open (disk, O_RDONLY);
-  if (fd < 0)
-    return -1;
-  lseek (fd, (long) SUPERBOFF, 0);
-  if (safe_read (fd, (char *) &fsd, sizeof fsd) != sizeof fsd)
-    {
-      close (fd);
-      return -1;
-    }
-  close (fd);
-  fsp->fsu_blocks = CONVERT_BLOCKS (fsd.s_fsize);
-  fsp->fsu_bfree = CONVERT_BLOCKS (fsd.s_tfree);
-  fsp->fsu_bavail = CONVERT_BLOCKS (fsd.s_tfree);
-  fsp->fsu_files = (fsd.s_isize - 2) * INOPB * (fsd.s_type == Fs2b ? 2 : 1);
-  fsp->fsu_ffree = fsd.s_tinode;
-
-#endif /* STAT_READ_FILSYS */
-
 #ifdef STAT_STATFS2_BSIZE	/* 4.3BSD, SunOS 4, HP-UX, AIX */
-# define CONVERT_BLOCKS(B) adjust_blocks ((guint64)(B), fsd.f_bsize, 512)
 
   struct statfs fsd;
 
   if (statfs (path, &fsd) < 0)
     return -1;
 
+  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
+
 # ifdef STATFS_TRUNCATES_BLOCK_COUNTS
 
   /* In SunOS 4.1.2, 4.1.3, and 4.1.3_U1, the block counts in the
@@ -180,7 +146,7 @@ get_fs_usage (path, disk, fsp)
      truncation, presumably without botching the 4.1.1 case, in which
      the values are not truncated.  The correct counts are stored in
      undocumented spare fields.  */
-  if (fsd.f_blocks == 0x1fffff && fsd.f_spare[0] > 0)
+  if (fsd.f_blocks == 0x7fffffff / fsd.f_bsize && fsd.f_spare[0] > 0)
     {
       fsd.f_blocks = fsd.f_spare[0];
       fsd.f_bfree = fsd.f_spare[1];
@@ -191,73 +157,72 @@ get_fs_usage (path, disk, fsp)
 #endif /* STAT_STATFS2_BSIZE */
 
 #ifdef STAT_STATFS2_FSIZE	/* 4.4BSD */
-# define CONVERT_BLOCKS(B) adjust_blocks ((guint64)(B), fsd.f_fsize, 512)
 
   struct statfs fsd;
 
   if (statfs (path, &fsd) < 0)
     return -1;
 
+  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
+
 #endif /* STAT_STATFS2_FSIZE */
 
 #ifdef STAT_STATFS4		/* SVR3, Dynix, Irix, AIX */
-# if _AIX || defined(_CRAY)
-#  define CONVERT_BLOCKS(B) adjust_blocks ((guint64)(B), fsd.f_bsize, 512)
-#  ifdef _CRAY
-#   define f_bavail f_bfree
-#  endif
-# else
-#  define CONVERT_BLOCKS(B) (B)
-#  ifndef _SEQUENT_		/* _SEQUENT_ is DYNIX/ptx */
-#   ifndef DOLPHIN		/* DOLPHIN 3.8.alfa/7.18 has f_bavail */
-#    define f_bavail f_bfree
-#   endif
-#  endif
+
+# if !_AIX && !defined _SEQUENT_ && !defined DOLPHIN
+#  define f_bavail f_bfree
 # endif
 
   struct statfs fsd;
 
   if (statfs (path, &fsd, sizeof fsd, 0) < 0)
     return -1;
+
   /* Empirically, the block counts on most SVR3 and SVR3-derived
      systems seem to always be in terms of 512-byte blocks,
      no matter what value f_bsize has.  */
+# if _AIX || defined _CRAY
+   fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
+# else
+   fsp->fsu_blocksize = 512;
+# endif
 
 #endif /* STAT_STATFS4 */
 
 #ifdef STAT_STATVFS		/* SVR4 */
-# define CONVERT_BLOCKS(B) \
-    adjust_blocks ((guint64)(B), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512)
 
   struct statvfs fsd;
 
   if (statvfs (path, &fsd) < 0)
     return -1;
+
   /* f_frsize isn't guaranteed to be supported.  */
+  fsp->fsu_blocksize = (fsd.f_frsize
+			? PROPAGATE_ALL_ONES (fsd.f_frsize)
+			: PROPAGATE_ALL_ONES (fsd.f_bsize));
 
 #endif /* STAT_STATVFS */
 
-#if !defined(STAT_STATFS2_FS_DATA) && !defined(STAT_READ_FILSYS)
+#if !defined STAT_STATFS2_FS_DATA && !defined STAT_READ_FILSYS
 				/* !Ultrix && !SVR2 */
 
-  fsp->fsu_blocks = CONVERT_BLOCKS (fsd.f_blocks);
-  fsp->fsu_bfree = CONVERT_BLOCKS (fsd.f_bfree);
-  fsp->fsu_bavail = CONVERT_BLOCKS (fsd.f_bavail);
-  fsp->fsu_files = fsd.f_files;
-  fsp->fsu_ffree = fsd.f_ffree;
+  fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks);
+  fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree);
+  fsp->fsu_bavail = PROPAGATE_TOP_BIT (fsd.f_bavail);
+  fsp->fsu_bavail_top_bit_set = EXTRACT_TOP_BIT (fsd.f_bavail) != 0;
+  fsp->fsu_files = PROPAGATE_ALL_ONES (fsd.f_files);
+  fsp->fsu_ffree = PROPAGATE_ALL_ONES (fsd.f_ffree);
 
 #endif /* not STAT_STATFS2_FS_DATA && not STAT_READ_FILSYS */
 
   return 0;
 }
 
-#if defined(_AIX) && defined(_I386)
+#if defined _AIX && defined _I386
 /* AIX PS/2 does not supply statfs.  */
 
-int
-statfs (path, fsb)
-     char *path;
-     struct statfs *fsb;
+static int
+statfs (char *path, struct statfs *fsb)
 {
   struct stat stats;
   struct dustat fsd;
@@ -279,24 +244,3 @@ statfs (path, fsb)
 }
 
 #endif /* _AIX && _I386 */
-
-void
-glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
-		       const char *disk)
-{
-	struct fs_usage fsp;
-
-	glibtop_init_r (&server, 0, 0);
-	
-	memset (buf, 0, sizeof (glibtop_fsusage));
-    memset (&fsp, 0, sizeof (struct fs_usage));
-	
-	if (get_fs_usage (disk, disk, &fsp))
-		return;
-
-	buf->blocks = fsp.fsu_blocks;
-	buf->bfree = fsp.fsu_bfree;
-	buf->bavail = fsp.fsu_bavail;
-	buf->files = fsp.fsu_files;
-	buf->ffree = fsp.fsu_ffree;
-}

sysdeps/common/fsusage.h

@@ -1,5 +1,5 @@
 /* fsusage.h -- declarations for filesystem space usage info
-   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1992, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,15 +15,33 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* Space usage statistics for a filesystem.  Blocks are 512-byte. */
+
 #include <glib.h>
 
-/* Space usage statistics for a filesystem.  Blocks are 512-byte. */
+#if !defined FSUSAGE_H_
+# define FSUSAGE_H_
+
 struct fs_usage
 {
-    guint64 fsu_blocks;	/* Total blocks. */
-    guint64 fsu_bfree;	/* Free blocks available to superuser. */
-    guint64 fsu_bavail;	/* Free blocks available to non-superuser. */
-    guint64 fsu_files;	/* Total file nodes. */
-    guint64 fsu_ffree;	/* Free file nodes. */
+  int fsu_blocksize;		/* Size of a block.  */
+  guint64 fsu_blocks;		/* Total blocks. */
+  guint64 fsu_bfree;		/* Free blocks available to superuser. */
+  guint64 fsu_bavail;		/* Free blocks available to non-superuser. */
+  int fsu_bavail_top_bit_set;	/* 1 if fsu_bavail represents a value < 0.  */
+  guint64 fsu_files;		/* Total file nodes. */
+  guint64 fsu_ffree;		/* Free file nodes. */
 };
 
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+int glibtop_private_get_fs_usage PARAMS ((const char *path, const char *disk,
+					  struct fs_usage *fsp));
+
+#endif

sysdeps/freebsd/ChangeLog

@@ -1,3 +1,33 @@
+2004-04-07  Bastien Nocera  <hadess@hadess.net>
+
+	* prockernel.c: (glibtop_get_proc_kernel_p): patch for NetBSD/AMD64
+	support (Julio M. Merino Vidal <jmmv@menta.net>)
+
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* cpu.c: (glibtop_init_cpu_p), (glibtop_get_cpu_p):
+	* glibtop_machine.h:
+	* mem.c:
+	* netload.c: (glibtop_get_netload_p):
+	* prockernel.c: (glibtop_get_proc_kernel_p):
+	* proclist.c: (glibtop_get_proclist_p):
+	* procmap.c: (glibtop_get_proc_map_p):
+	* procmem.c: (glibtop_get_proc_mem_p):
+	* procsignal.c: (glibtop_get_proc_signal_p):
+	* procstate.c: (glibtop_get_proc_state_p):
+	* proctime.c:
+	* procuid.c: (glibtop_get_proc_uid_p):
+	* uptime.c: (glibtop_get_uptime_p): implement NetBSD support, and
+	some build problems on FreeBSD (Closes: #135674)
+
+2004-03-09  Bastien Nocera  <hadess@hadess.net>
+
+	* procargs.c: (glibtop_get_proc_args_p):
+	* procmap.c: (glibtop_get_proc_map_p):
+	* swap.c: (glibtop_get_swap_p): fix g_malloc usage on non-Linux
+        platforms (patch by Benoit Dejean <bnet@ifrance.com>)
+
 2003-10-21  Bastien Nocera  <hadess@hadess.net>
 
 	* Makefile.am: install only one library, libgtop-2.0

sysdeps/freebsd/Makefile.am

@@ -7,7 +7,7 @@ libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c
 
 libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c prockernel.c \

sysdeps/freebsd/cpu.c

@@ -27,11 +27,16 @@
 
 #include <glibtop_suid.h>
 
+#ifdef __NetBSD__
+#include <sys/sched.h>
+#endif
+
 static const unsigned long _glibtop_sysdeps_cpu =
 (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
 (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
 (1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY);
 
+#ifndef KERN_CP_TIME
 /* nlist structure for kernel access */
 static struct nlist nlst [] = {
 #ifdef __bsdi__
@@ -41,20 +46,26 @@ static struct nlist nlst [] = {
 #endif
 	{ 0 }
 };
+#endif
 
 /* MIB array for sysctl */
 static int mib_length=2;
 static int mib [] = { CTL_KERN, KERN_CLOCKRATE };
+#ifdef KERN_CP_TIME
+static int mib2 [] = { CTL_KERN, KERN_CP_TIME };
+#endif
 
 /* Init function. */
 
 void
 glibtop_init_cpu_p (glibtop *server)
 {
+#ifndef KERN_CP_TIME
 	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
 		return;
 	}
+#endif
 
 	/* Set this only if kvm_nlist () succeeded. */
 	server->sysdeps.cpu = _glibtop_sysdeps_cpu;
@@ -65,7 +76,11 @@ glibtop_init_cpu_p (glibtop *server)
 void
 glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 {
+#ifdef KERN_CP_TIME
+	u_int64_t cpts [CPUSTATES];
+#else
 	long cpts [CPUSTATES];
+#endif
 	/* sysctl vars*/
 	struct clockinfo ci;
 	size_t length;
@@ -78,11 +93,19 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 	if (server->sysdeps.cpu == 0)
 		return;
 
+#ifdef KERN_CP_TIME
+	length = sizeof (cpts);
+	if (sysctl (mib2, mib_length, cpts, &length, NULL, 0)) {
+		glibtop_warn_io_r (server, "sysctl");
+		return;
+	}
+#else
 	if (kvm_read (server->machine.kd, nlst [0].n_value,
 		      &cpts, sizeof (cpts)) != sizeof (cpts)) {
 		glibtop_warn_io_r (server, "kvm_read (cp_time)");
 		return;
 	}
+#endif
 	
 	/* Get the clockrate data */
 	length = sizeof (struct clockinfo);

sysdeps/freebsd/glibtop_machine.h

@@ -39,6 +39,14 @@
 #include <osreldate.h>
 #endif
 
+#ifdef __NetBSD__
+#include <sys/proc.h>
+
+#ifndef SRUN
+#define SRUN    SACTIVE
+#endif
+#endif
+
 G_BEGIN_DECLS
 
 typedef struct _glibtop_machine glibtop_machine;

sysdeps/freebsd/mem.c

@@ -29,7 +29,9 @@
 
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
+#if defined(__NetBSD__)  && (__NetBSD_Version__ < 105020000)
 #include <vm/vm_param.h>
+#endif
 
 #if defined(__NetBSD__)  && (__NetBSD_Version__ >= 104000000)
 #include <uvm/uvm_extern.h>
@@ -74,7 +76,6 @@ static struct nlist nlst [] = {
 };
 
 /* MIB array for sysctl */
-static int mib_length=2;
 #ifdef __bsdi__
 static int mib [] = { CTL_VM, VM_TOTAL };
 #else

sysdeps/freebsd/netload.c

@@ -83,6 +83,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
     u_long ifnetaddr, ifnetfound, ifaddraddr;
     struct sockaddr *sa;
     char tname [16];
+    char temp [16];
 
     union {
 	struct ifaddr ifa;
@@ -109,10 +110,13 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 			  sizeof (ifnet)) != sizeof (ifnet))
 		    glibtop_error_io_r (server, "kvm_read (ifnetaddr)");
 
-#if defined(__FreeBSD__) || defined(__bsdi__)
+#if (defined(__FreeBSD__) && (__FreeBSD_version < 501113)) || defined(__bsdi__)
 	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
 			  tname, 16) != 16)
 		    glibtop_error_io_r (server, "kvm_read (if_name)");
+	    snprintf(temp, (15 - strlen(tname)), "%d", ifnet.if_unit);
+	    strcat(tname, temp);
+	    tname [15] = 0;
 #else
 	    strncpy (tname, ifnet.if_xname, 16);
 	    tname [15] = 0;
@@ -140,39 +144,39 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 		sin = (struct sockaddr_in *)sa;
 
 		if (ifnet.if_flags & IFF_UP)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_UP;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
 		if (ifnet.if_flags & IFF_BROADCAST)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_BROADCAST;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
 		if (ifnet.if_flags & IFF_DEBUG)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_DEBUG;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
 		if (ifnet.if_flags & IFF_LOOPBACK)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_LOOPBACK;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
 		if (ifnet.if_flags & IFF_POINTOPOINT)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_POINTOPOINT;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
 		if (ifnet.if_flags & IFF_RUNNING)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_RUNNING;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
 		if (ifnet.if_flags & IFF_NOARP)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_NOARP;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
 		if (ifnet.if_flags & IFF_PROMISC)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_PROMISC;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
 		if (ifnet.if_flags & IFF_ALLMULTI)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_ALLMULTI;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
 		if (ifnet.if_flags & IFF_OACTIVE)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_OACTIVE;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
 		if (ifnet.if_flags & IFF_SIMPLEX)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_SIMPLEX;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
 		if (ifnet.if_flags & IFF_LINK0)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK0;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
 		if (ifnet.if_flags & IFF_LINK1)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK1;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
 		if (ifnet.if_flags & IFF_LINK2)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK2;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
 #ifdef __FreeBSD__
 		if (ifnet.if_flags & IFF_ALTPHYS)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_ALTPHYS;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
 #endif
 		if (ifnet.if_flags & IFF_MULTICAST)
-			buf->if_flags |= GLIBTOP_IF_FLAGS_MULTICAST;
+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
 
 #if !defined(__bsdi__)
 		/* Commenting out to "fix" #13345. */

sysdeps/freebsd/procargs.c

@@ -93,7 +93,7 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 		size += strlen (*ptr)+1;
 
 	size += 2;
-	retval = g_malloc (server, size);
+	retval = g_malloc (size);
 	memset (retval, 0, size);
 
 	for (ptr = args; *ptr; ptr++) {

sysdeps/freebsd/prockernel.c

@@ -34,12 +34,10 @@
 #if (!defined __OpenBSD__) && (!defined __bsdi__)
 #include <sys/user.h>
 #endif
-#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__))
+#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
+    !defined(__NetBSD__)
 #include <machine/pcb.h>
 #endif
-#if defined(__FreeBSD__) && !defined(__alpha__)
-#include <machine/tss.h>
-#endif
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -48,6 +46,23 @@
 #include <osreldate.h>
 #endif
 
+#ifdef __NetBSD__
+#include <machine/vmparam.h>
+#include <machine/pmap.h>
+#ifdef __arm32__
+#define	KERNBASE	KERNEL_BASE
+#endif
+#endif
+
+#ifdef __NetBSD__
+#include <machine/vmparam.h>
+#include <machine/pmap.h>
+#ifdef __arm32__
+#define	KERNBASE	KERNEL_BASE
+#endif
+#endif
+
+
 static const unsigned long _glibtop_sysdeps_proc_kernel_pstats =
 (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) +
 (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) +
@@ -78,9 +93,11 @@ glibtop_get_proc_kernel_p (glibtop *server,
 			   pid_t pid)
 {
 	struct kinfo_proc *pinfo;
+#ifndef __FreeBSD__
 	struct user *u_addr = (struct user *)USRSTACK;
 	struct pstats pstats;
 	struct pcb pcb;
+#endif
 	int count;
 
 	char filename [BUFSIZ];
@@ -101,17 +118,36 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	if ((pinfo == NULL) || (count != 1))
 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
 
-	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+
+#define	PROC_WCHAN	ki_wchan
+#define	PROC_WMESG	ki_wmesg
+#define	PROC_WMESG	ki_wmesg
+
+#else
+
+#define	PROC_WCHAN	kp_proc.p_wchan
+#define	PROC_WMESG	kp_proc.p_wmesg
+#define	PROC_WMESG	kp_eproc.e_wmesg
+
+#endif
+
+#if !defined(__NetBSD__) || !defined(SACTIVE)
+	buf->nwchan = (unsigned long) pinfo [0].PROC_WCHAN &~ KERNBASE;
+
 	buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
 
-	if (pinfo [0].kp_proc.p_wchan && pinfo [0].kp_proc.p_wmesg) {
-		strncpy (buf->wchan, pinfo [0].kp_eproc.e_wmesg,
+	if (pinfo [0].PROC_WCHAN && pinfo [0].PROC_WMESG) {
+		strncpy (buf->wchan, pinfo [0].PROC_WMESG,
 			 sizeof (buf->wchan) - 1);
 		buf->wchan [sizeof (buf->wchan) - 1] = 0;
 		buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN);
 	} else {
 		buf->wchan [0] = 0;
 	}
+#endif
+
+#ifndef __FreeBSD__
 
 	/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
 
@@ -129,8 +165,17 @@ glibtop_get_proc_kernel_p (glibtop *server,
 
 	glibtop_suid_enter (server);
 
+#if !defined(__NetBSD__) || !defined(SACTIVE)
+#ifdef __NetBSD__
+	/* On NetBSD, there is no kvm_uread(), and kvm_read() always reads
+	 * from kernel memory.  */
+
+	if (kvm_read (server->machine.kd,
+#else
+
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
 	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+#endif
 		       (unsigned long) &u_addr->u_stats,
 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
 		{
@@ -149,8 +194,12 @@ glibtop_get_proc_kernel_p (glibtop *server,
 			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
 		}
 
+#ifdef __NetBSD__
+	if (kvm_read (server->machine.kd,
+#else
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
 	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+#endif
 		       (unsigned long) &u_addr->u_pcb,
 		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
 		{
@@ -167,18 +216,55 @@ glibtop_get_proc_kernel_p (glibtop *server,
 			/*xxx FreeBSD/Alpha? */
 #endif
 #else
+#ifdef __i386__
 			buf->kstk_esp = (guint64) pcb.pcb_tss.tss_esp0;
 #ifdef __bsdi__
 			buf->kstk_eip = (guint64) pcb.pcb_tss.tss_eip;
 #else
 			buf->kstk_eip = (guint64) pcb.pcb_tss.__tss_eip;
 #endif
-
+#else
+#if defined(__NetBSD__)
+#if defined(__m68k__)
+			buf->kstk_esp = (u_int64_t) pcb.pcb_usp;
+			buf->kstk_eip = (u_int64_t) 0;
+#elif defined(__x86_64__)
+			buf->kstk_esp = (u_int64_t) pcb.pcb_usersp;
+			buf->kstk_eip = (u_int64_t) 0;
+#elif (defined(__arm32__) || defined(__powerpc__))
+			buf->kstk_esp = (u_int64_t) pcb.pcb_sp;
+			buf->kstk_eip = (u_int64_t) 0;
+#elif defined(__mipsel__)
+			buf->kstk_esp = (u_int64_t) pcb.pcb_context[8];
+			buf->kstk_eip = (u_int64_t) 0;
+#elif defined(__sparc__)
+			buf->kstk_esp = (u_int64_t) pcb.pcb_sp;
+			buf->kstk_eip = (u_int64_t) pcb.pcb_pc;
+#elif defined(__alpha__)
+			buf->kstk_esp = (u_int64_t) pcb.pcb_context[9];
+			buf->kstk_eip = (u_int64_t) pcb.pcb_context[8];
+#else
+			/* provide some defaults for other platforms */
+			buf->kstk_esp = (u_int64_t) 0;
+			buf->kstk_eip = (u_int64_t) 0;
+#endif /* ${MACHINE_ARCH} */
+#endif /* __NetBSD__ */
 			buf->flags |= _glibtop_sysdeps_proc_kernel_pcb;
+#endif
 #endif
 		}
+#endif
 
 	/* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */
 
 	glibtop_suid_leave (server);
+
+#else
+	/* XXX: the code here was, quite frankly, junk, and almost
+	 * certainly wrong - remove it all, leave these fields
+	 * unpopulated, and give up until such time as the right
+	 * code is produced for both FreeBSD 4.x and 5.x
+	 */
+	return;
+#endif /* __FreeBSD__ */
 }

sysdeps/freebsd/proclist.c

@@ -85,13 +85,25 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 	pids = g_realloc (pids, count * sizeof (unsigned));
 	/* Copy the pids over to this chain */
 	for (i=j=0; i < count; i++) {
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#define PROC_STAT	ki_stat
+#define PROC_RUID	ki_ruid
+#define PROC_PID	ki_pid
+
+#else
+#define PROC_STAT	kp_proc.p_stat
+#define PROC_RUID	kp_eproc.e_pcred.p_ruid
+#define PROC_PID	kp_proc.p_pid
+
+#endif
+
 		if ((real_which & GLIBTOP_EXCLUDE_IDLE) &&
-		    (pinfo[i].kp_proc.p_stat != SRUN))
+		    (pinfo[i].PROC_STAT != SRUN))
 			continue;
 		else if ((real_which & GLIBTOP_EXCLUDE_SYSTEM) &&
-			 (pinfo[i].kp_eproc.e_pcred.p_ruid == 0))
+			 (pinfo[i].PROC_RUID == 0))
 			continue;
-		pids [j++] = (unsigned) pinfo[i].kp_proc.p_pid;
+		pids [j++] = (unsigned) pinfo[i].PROC_PID;
 	} /* end for */
 	/* Set the fields in buf */
 	buf->number = j;

sysdeps/freebsd/procmap.c

@@ -31,9 +31,21 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
 #include <vm/vm_object.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_map.h>
+#elif defined(__NetBSD__) && (__NetBSD_Version__ >= 105020000)
+#include <uvm/uvm_extern.h>
+#else
+#include <vm/vm_object.h>
+#include <vm/vm_map.h>
+#if (__FreeBSD_version >= 400011)
+#include <vm/vm.h>
+#else
+#include <vm/vm_prot.h>
+#endif
+#endif
 
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@ -45,7 +57,9 @@
 #include <sys/user.h>
 #endif
 #include <sys/sysctl.h>
+#if !defined(__NetBSD__) || (__NetBSD_Version__ < 105020000)
 #include <vm/vm.h>
+#endif
 
 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
 /* Fixme ... */
@@ -90,8 +104,9 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 	glibtop_map_entry *maps;
 #if defined __FreeBSD__
 	struct vnode vnode;
+#if __FreeBSD_version >= 500039
 	struct inode inode;
-	struct mount mount;
+#endif
 #endif
 	int count, i = 0;
 	int update = 0;
@@ -113,7 +128,11 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 	/* Now we get the memory maps. */
 
 	if (kvm_read (server->machine.kd,
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+		      (unsigned long) pinfo [0].ki_vmspace,
+#else
 		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
+#endif 
 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace))
 		glibtop_error_io_r (server, "kvm_read (vmspace)");
 
@@ -131,7 +150,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	buf->total = buf->number * buf->size;
 
-	maps = g_malloc (server, buf->total);
+	maps = g_malloc (buf->total);
 
 	memset (maps, 0, buf->total);
 
@@ -213,9 +232,10 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 #endif
 
 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if defined(UVM_VNODE_VALID)
 		if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
 			continue;
-
+#endif
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
 
@@ -243,6 +263,15 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 			      &vnode, sizeof (vnode)) != sizeof (vnode))
 			glibtop_error_io_r (server, "kvm_read (vnode)");
 
+#if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
+               switch (vnode.v_type) {
+                   case VREG:
+                       maps [i-1].inode = vnode.v_cachedid;
+                       maps [i-1].device = vnode.v_cachedfs;
+                   default:
+                   continue;
+               }
+#else
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
 
@@ -255,7 +284,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 			      (unsigned long) vnode.v_mount,
 			      &mount, sizeof (mount)) != sizeof (mount))
 			glibtop_error_io_r (server, "kvm_read (mount)");
-
+#endif
 		maps [i-1].inode  = inode.i_number;
 		maps [i-1].device = inode.i_dev;
 #endif