updated kn.po

Added Catalan (Valencian) translation
Added entries for Hindi Translation updated by Rajesh Ranjan
2014-02-05 16:39:57 +05:30 · 2009-09-02 18:34:00 +02:00 · 2009-06-10 20:09:47 +05:30 · 2009-06-10 20:08:36 +05:30 · 2009-05-15 18:01:16 +05:30 · 2009-04-18 20:42:39 +02:00
125 changed files with 1259 additions and 9292 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4

 if EXAMPLES
 EXAMPLES_DIR = examples
@@ -17,9 +16,7 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 	 libgtop-2.0.pc.in acinclude.m4 \
 	intltool-extract.in \
 	intltool-merge.in \
-	libgtop.doap \
-	intltool-update.in \
-	m4/introspection.m4
+	intltool-update.in

 DISTCLEANFILES = \
 	intltool-extract \
@@ -35,4 +32,4 @@ pkgconfig_DATA = libgtop-2.0.pc
 libgtop-features.def: features.def
 	@LN_S@ $< $@

-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
--- a/43
+++ b/43
@@ -1,46 +1,3 @@
-30 August 2011: Overview of changes in 2.28.4
-=============================================
-* Fix numerous bugs in the FreeBSD backend.
-* Split off OpenBSD code in its own backend, and fixes.
-* Updated translations.
-
-25 March 2011: Overview of changes in 2.28.3
-================================================
-* Fix build issue for strict linkers.
-* Add Introspection support
-* Cygwin fixes.
-* FreeBSD: Fix get_mem() on 64-bit systems.
-* Updated translations.
-
-28 September 2010: Overview of changes in 2.28.2
-================================================
-* Updated translations.
-
-30 March 2010: Overview of changes in 2.28.1
-============================================
-* Updated translations.
-
-21 September 2009: Overview of changes in 2.28.0
-================================================
-* Updated translations.
-
-25 May 2009: Overview of changes in 2.27.3
-==========================================
-* linux:
-  - fixed format error.
-
-3 May 2009: Overview of changes in 2.27.2
-=========================================
-* linux:
-  - glibtop_get_proc_map: oops, fixed segfault.
-
-3 May 2009: Overview of changes in 2.27.1
-=========================================
-* linux:
-  - glibtop_get_proc_map is ~40% faster. This should be noticeable
-    in system-monitor.
-* New cygwin support.
-
 13 April 2009: Overview of changes in 2.26.1
 ============================================
 * linux:
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@ dnl Configure script for the Gnome library
 dnl

 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [28])
-m4_define([libgtop_micro_version], [4])
+m4_define([libgtop_minor_version], [26])
+m4_define([libgtop_micro_version], [1])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])

 dnl  increment if the interface has additions, changes, removals.
@@ -25,18 +25,15 @@ m4_define([libgtop_server_version], [5])
 # Version code calculation
 m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)])

-AC_PREREQ(2.62)
+AC_PREREQ(2.59)
 AC_INIT([libgtop], [libgtop_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
 AC_CONFIG_SRCDIR(copyright.txt)
 AC_CONFIG_HEADERS(config.h)

-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE([-Wno-portability tar-ustar no-dist-gzip dist-xz])
-AC_CONFIG_MACRO_DIR([m4])
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+AC_CANONICAL_SYSTEM

+AM_INIT_AUTOMAKE
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])

 AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version])
@@ -384,8 +381,6 @@ sysdeps/solaris/Makefile
 sysdeps/aix/Makefile
 sysdeps/bsd/Makefile
 sysdeps/darwin/Makefile
-sysdeps/cygwin/Makefile
-sysdeps/openbsd/Makefile
 src/Makefile
 src/daemon/Makefile
 lib/Makefile
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -743,7 +743,7 @@ The description above is taken from the manual page of the @file{/proc}
 filesystem under Linux and is a little bit confusing, so I make this clear
 here. 

-@strong{A word for people porting LibGTop to other systems:}
+@strong{Note for people porting LibGTop to other systems:}
 Every operating system has its own idea about the memory usage of a process
 and also system utilities like @code{ps} show different things on different
 systems.
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,8 +6,6 @@ INCLUDES		= @INCLUDES@

 DEFS			= @DEFS@

-LDFLAGS			= $(LIBGTOP_EXTRA_LIBS)
-
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
 			  openfiles smp proclist mem wd affinity
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,7 +7,7 @@ libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  read_data.c write.c lib.c parameter.c \
 				  sysdeps.c

-libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols $(srcdir)/libgtop.sym -no-undefined
+libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO) -export-symbols $(srcdir)/libgtop.sym
 libgtop_2_0_la_LIBADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)

 BUILT_SOURCES			= lib.c
@@ -20,36 +20,3 @@ EXTRA_DIST			= lib.pl libgtop.sym

 CLEANFILES			= lib.c

-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --accept-unprefixed
-INTROSPECTION_COMPILER_ARGS =
-
-if HAVE_INTROSPECTION
-introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h \
-			../include/glibtop/close.h ../include/glibtop/loadavg.h ../include/glibtop/prockernel.h ../include/glibtop/procstate.h \
-			../include/glibtop/sem_limits.h ../include/glibtop/uptime.h ../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \
-			../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/version.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
-			../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \
-			../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h ../include/glibtop/global.h \
-			../include/glibtop/procsignal.h ../include/glibtop/union.h ../include/glibtop/gnuserv.h \
-			../include/glibtop/parameter.h ../include/glibtop/mountlist.h ../include/glibtop/fsusage.h ../include/glibtop/procmap.h ../include/glibtop/signal.h \
-			../include/glibtop/sysinfo.h ../include/glibtop/ppp.h ../include/glibtop/procargs.h ../include/glibtop/netload.h \
-			../include/glibtop/procwd.h ../include/glibtop/procaffinity.h \
-			../include/glibtop/netlist.h ../include/glibtop/procopenfiles.h ../include/glibtop/open.h
-
-GTop-2.0.gir: libgtop-2.0.la
-GTop_2_0_gir_INCLUDES = GObject-2.0
-GTop_2_0_gir_CFLAGS = $(INCLUDES)
-GTop_2_0_gir_LIBS = libgtop-2.0.la
-GTop_2_0_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += GTop-2.0.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -69,18 +69,12 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_sysdeps_private_mountlist=yes
 	  libgtop_sysdeps_private_fsusage=yes
 	  ;;
-	netbsd*|bsdi*)
+	netbsd*|openbsd*|bsdi*)
 	  libgtop_sysdeps_dir=bsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
-	openbsd*)
-	  libgtop_sysdeps_dir=openbsd
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
-	  ;;
 	freebsd*|kfreebsd*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
@@ -109,13 +103,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
-	cygwin*)
-	  libgtop_sysdeps_dir=cygwin
-	  libgtop_use_machine_h=no
-	  libgtop_need_server=no
-	  libgtop_have_sysinfo=yes
-	  libgtop_sysdeps_private_mountlist=yes
-	  ;;
 	*)
 	  if test x$hacker_mode = xyes ; then
 	    case "$host_os" in
--- a/libgtop.doap
+++ b/libgtop.doap
@@ -1,21 +0,0 @@
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
-         xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">libgtop</name>
-  <shortdesc xml:lang="en">LibGTop2</shortdesc>
-  <download-page rdf:resource="http://download.gnome.org/sources/libgtop/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=libgtop" />
-  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Benoît Dejean</foaf:name>
-      <foaf:mbox rdf:resource="mailto:benoit@placenet.org" />
-      <gnome:userid>bdejean</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-</Project>
-
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -1,96 +0,0 @@
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -3,7 +3,6 @@
 am
 ar
 as
-ast
 az
 be
 bg
@@ -20,7 +19,6 @@ dz
 el
 en_CA
 en_GB
-en@shaw
 eo
 es
 et
@@ -46,7 +44,6 @@ ky
 la
 lt
 lv
-mai
 mg
 mi
 mk
@@ -77,7 +74,6 @@ ta
 te
 th
 tr
-ug
 uk
 vi
 xh
--- a/po/ast.po
+++ b/po/ast.po
@@ -1,220 +0,0 @@
-# Asturian translation for libgtop.
-# Copyright (C) 2010 libgtop's COPYRIGHT HOLDER
-# This file is distributed under the same license as the libgtop package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-11-12 10:53+0000\n"
-"PO-Revision-Date: 2010-01-06 18:12+0100\n"
-"Last-Translator: astur <malditoastur@gmail.com>\n"
-"Language-Team: Asturian <alministradores@softastur.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"
-"X-Poedit-Language: asturian\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "lleíu %d byte"
-msgstr[1] "lleíos %d bytes"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "lleíu tamañu de datos"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "lleíu %lu byte de datos"
-msgstr[1] "lleíos %lu bytes de datos"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "escritu %d byte"
-msgstr[1] "escritos %d bytes"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "Activar depuración"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "Activa salida detallada"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "Nun se pudo abrir un procesu en segundu planu"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "Invocáu dende inetd"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Executa '%s --help' pa ver una llista ensembre de les opciones de llinia de comandos disponibles.\n"
-
-#: ../sysdeps/osf1/siglist.c:27
-#: ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Terminar"
-
-#: ../sysdeps/osf1/siglist.c:28
-#: ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Interrupción"
-
-#: ../sysdeps/osf1/siglist.c:29
-#: ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "Colar"
-
-#: ../sysdeps/osf1/siglist.c:30
-#: ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "Instrucción illegal"
-
-#: ../sysdeps/osf1/siglist.c:31
-#: ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "Atrapar traza"
-
-#: ../sysdeps/osf1/siglist.c:32
-#: ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "Encaboxar"
-
-#: ../sysdeps/osf1/siglist.c:33
-#: ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "Fallu EMT"
-
-#: ../sysdeps/osf1/siglist.c:34
-#: ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "Esceición de coma flotante"
-
-#: ../sysdeps/osf1/siglist.c:35
-#: ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Matar"
-
-#: ../sysdeps/osf1/siglist.c:36
-#: ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "Fallu de bus"
-
-#: ../sysdeps/osf1/siglist.c:37
-#: ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "Violación de segmentu"
-
-#: ../sysdeps/osf1/siglist.c:38
-#: ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "Argumentu malu na llamada al sistema"
-
-#: ../sysdeps/osf1/siglist.c:39
-#: ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "Tubería rota"
-
-#: ../sysdeps/osf1/siglist.c:40
-#: ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "Alarma de reló"
-
-#: ../sysdeps/osf1/siglist.c:41
-#: ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "Terminación"
-
-#: ../sysdeps/osf1/siglist.c:42
-#: ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "Condición urxente en socket"
-
-#: ../sysdeps/osf1/siglist.c:43
-#: ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "Parar"
-
-#: ../sysdeps/osf1/siglist.c:44
-#: ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "Parada de tecláu"
-
-#: ../sysdeps/osf1/siglist.c:45
-#: ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "Siguir"
-
-#: ../sysdeps/osf1/siglist.c:46
-#: ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "Cambiu d'estáu de fíu"
-
-#: ../sysdeps/osf1/siglist.c:47
-#: ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "Llectura en segundu planu de tty"
-
-#: ../sysdeps/osf1/siglist.c:48
-#: ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "Escritura en segundu planu a tty"
-
-#: ../sysdeps/osf1/siglist.c:49
-#: ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "E/S agora puédese"
-
-#: ../sysdeps/osf1/siglist.c:50
-#: ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "Perpaseste la llende del CPU"
-
-#: ../sysdeps/osf1/siglist.c:51
-#: ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Tamañu llende de ficheru perpasáu"
-
-#: ../sysdeps/osf1/siglist.c:52
-#: ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "Alarma de reló virtual"
-
-#: ../sysdeps/osf1/siglist.c:53
-#: ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "Alarma de reló perfilada"
-
-#: ../sysdeps/osf1/siglist.c:54
-#: ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "Cambéu del tamañu de ventana"
-
-#: ../sysdeps/osf1/siglist.c:55
-#: ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "Solicitú d'información"
-
-#: ../sysdeps/osf1/siglist.c:56
-#: ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Señal 1 definida pol usuariu"
-
-#: ../sysdeps/osf1/siglist.c:57
-#: ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Señal 2 definida pol usuariu"
-
--- a/po/be.po
+++ b/po/be.po
@@ -1,193 +1,213 @@
+# Беларускі пераклад libgtop.HEAD.
+# Беларускі пераклад libgtop.HEAD
+# Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 # Vital Khilko <dojlid@mova.org>, 2003.
 # Ales Nyakhaychyk <nab@mail.by>, 2004.
-# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.master\n"
+"Project-Id-Version: libgtop.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-24 19:42+0300\n"
-"PO-Revision-Date: 2011-07-24 19:41+0300\n"
-"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
-"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
-"Language: be\n"
+"POT-Creation-Date: 2006-04-07 13:38+0200\n"
+"PO-Revision-Date: 2004-03-13 14:28+0200\n"
+"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
+"Language-Team: Belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.0.2\n"

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

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

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

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

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

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "АДЛАДКА"
+
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
-msgstr "Уключыць падрабязны вывад"
+msgstr "Уключыць дэталёвы вывад"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "ПАДРАБЯЗНА"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
-msgstr "Не адгаліноўваць фонавы працэс"
+msgstr "Ня нараджаць у рэжыме тла"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "БЯЗ-ДЭМАНУ"
+
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
-msgstr "Запушчаны з дапамогай inetd"
+msgstr "Выкліканы з inetd"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"
+
+#: ../src/daemon/gnuserv.c:500
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Каб убачыць спіс наяўных опцый загаднага радка, запусціце \"%s --help\".\n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Абрыў сувязі (HUP)"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Перарыў (INT)"
+"Памылка ў ключох %s: %s.\n"
+"Запусьціце '%s --help' каб убачыць поўны сьпіс даступных ключоў.\n"

 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "Выхад (QUIT)"
+msgid "Hangup"
+msgstr "Разарваць"

 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "Забароненая інструкцыя (ILL)"
+msgid "Interrupt"
+msgstr "Перарваць"

 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "Захоп трасіроўкі (TRAP)"
+msgid "Quit"
+msgstr "Выйсьці"

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

 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "Памылка (EMT)"
+msgid "Trace trap"
+msgstr "Захоп трасыроўкі"

 #: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "Выключэнне float (FPE)"
+msgid "Abort"
+msgstr "Перарываньне"

 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Забойства (KILL)"
+msgid "EMT error"
+msgstr "Памылка EMT"

 #: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "Памылка магістралі (BUS)"
+msgid "Floating-point exception"
+msgstr "Выключэньне пункту, які плавае"

 #: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "Парушэнне сегментацыі (SEGV)"
+msgid "Kill"
+msgstr "Забіць"

 #: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "Хібны аргумент сістэмнага выкліку (SYS)"
+msgid "Bus error"
+msgstr "Памылка шыны"

 #: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "Зламаны канал (PIPE)"
+msgid "Segmentation violation"
+msgstr "Парушэньне сэгментацыі"

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

 #: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "Знішчэнне (TERM)"
+msgid "Broken pipe"
+msgstr "Парушаны канал"

 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "Тэрміновыя даныя на сокеце (URG)"
+msgid "Alarm clock"
+msgstr "Таймэр"

 #: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "Прыпыненне (STOP)"
+msgid "Termination"
+msgstr "Завяршэньне"

 #: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "Прыпыненне з клавіятуры (TSTP)"
+msgid "Urgent condition on socket"
+msgstr "Тэрміновыя умовы сокету"

 #: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "Працяг працы (CONT)"
+msgid "Stop"
+msgstr "Спыніць"

 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "Змена стану нашчадка (CHLD)"
+msgid "Keyboard stop"
+msgstr "Спыненьне клявіятуры"

 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "Фонавае чытанне з tty (TTIN)"
+msgid "Continue"
+msgstr "Працягнуць"

 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "Фонавы запіс у tty (TTOU)"
+msgid "Child status has changed"
+msgstr "Стан нашчадку быў зьменены"

 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "Магчымасць уводу/вываду (IO)"
+msgid "Background read from tty"
+msgstr "Чытаньне ў тле з tty"

 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "Абмежаванне працэсара (XCPU)"
+msgid "Background write to tty"
+msgstr "Запіс у тле ў tty"

 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Абмежаванне памеру файла (XFSZ)"
+msgid "I/O now possible"
+msgstr "Зараз магчымы ўвод/вывад"

 #: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "Віртуальны таймер (VTALRM)"
+msgid "CPU limit exceeded"
+msgstr "Перавышана мяжа ЦПУ"

 #: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "Таймер прафілявання (PROF)"
+msgid "File size limit exceeded"
+msgstr "Перавышана мяжа памеру файлу"

 #: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "Змена памераў акна (WINCH)"
+msgid "Virtual alarm clock"
+msgstr "Віртуальны таймэр"

 #: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "Запыт інфармацыі (INFO)"
+msgid "Profiling alarm clock"
+msgstr "Прафіляваны таймэр"

 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Карыстальніцкі сігнал 1 (USR1)"
+msgid "Window size change"
+msgstr "Зьмена памераў акна"

 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+msgid "Information request"
+msgstr "Запыт інфармацыі"
+
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+msgid "User defined signal 1"
+msgstr "Сыгнал карыстальніку 1"
+
+#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
 msgid "User defined signal 2"
-msgstr "Карыстальніцкі сігнал 2 (USR2)"
+msgstr "Сыгнал карыстальніку 2"
--- a/po/bn.po
+++ b/po/bn.po
@@ -4,23 +4,21 @@
 # Vat <vatzcar@yahoo.co.in>, 2003.
 # Mahay Alam Khan <makl10n@yahoo.com>, 2005.
 # Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
-# Israt Jahan <israt@ankur.org.bd>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-04-17 10:17+0000\n"
-"PO-Revision-Date: 2010-01-21 16:02+0600\n"
-"Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
-"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
+"Project-Id-Version: libgtop\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-01 06:02+0200\n"
+"PO-Revision-Date: 2005-10-01 01:05+0600\n"
+"Last-Translator: Mahay Alam Khan <makl10n@yahoo.com>\n"
+"Language-Team: Bengali <gnome-translation@bengalinux.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=0;\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: ../lib/read.c:51
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -31,11 +29,11 @@ msgstr[1] "%d বাইট পড়েছি"
 # #########################################
 # দয়া করে "গেছে" এর পরিবর্তে "গিয়েছে" লিখেন
 # #########################################
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:53
 msgid "read data size"
 msgstr "ডাটা সাইজ পড়ো"

-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -44,7 +42,7 @@ msgstr[1] "%lu বাইট তথ্য পড়েছি"

 # msgstr "%d বাইট তথ্য পড়া গেছে"
 # msgstr "%d বাইট তথ্য পড়া হোক"
-#: ../lib/write.c:51
+#: ../lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -52,189 +50,195 @@ msgstr[0] "%d বাইট লিখেছি"
 msgstr[1] "%d বাইট লিখেছি"

 # msgstr "%d বাইট লেখা হয়েছে"
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "ডিবাগিং চালু করুন"

+# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
+# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
+# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "ডিবাগ"
+
 # msgstr "ডিবাগ"
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "বর্ণনাযুক্ত আউটপুট সক্রিয় করো"

-#: ../src/daemon/gnuserv.c:459
+# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
+# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "বর্ণনাযুক্ত"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "পশ্চাতে ফর্ক করা হবে না"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "inetd এর থেকে নেওয়া হয়েছে"

-#: ../src/daemon/gnuserv.c:495
-#| msgid ""
-#| "Error on option %s: %s.\n"
-#| "Run '%s --help' to see a full list of available command line options.\n"
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "কমান্ড লাইন অপশনের সম্পূর্ণ তালিকা দেখার জন্য  '%s --help' লিখুন।\n"
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"
+
+#: ../src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"অপশন %s এ ভুল হয়েছে: %s।\n"
+"কমান্ড লাইন অপশনের সম্পূর্ণ তালিকা দেখার জন্য '%s --help' লিখুন।\n"

 # msgstr "সিস্টেম বুট হবার পর থেকে নিষ্ক্রিয় কাজে অতিবাহিত সময় (সেকেন্ডে)"
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "সংযোগ বিচ্ছিন্ন করুন"

-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "ইন্টেরাপ্ট"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "প্রস্থান"

 # msgstr "প্রস্থান"
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "অবৈধ ইনস্ট্রাকশন"

 # msgstr "অবৈধ ইনস্ট্রাকশন"
 # Instruction এখানে Technical term।
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "ট্রেস ট্র্যাপ"

 # ২ এটা আসলে ঠিক বোঝা যাচ্ছে না। তাই মনে হয় বাদ রাখাই ভাল
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "বাতিল করো"

 # msgstr "বন্ধ করা"
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT সংক্রান্ত ভুল"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "দশমিক সংক্রান্ত ব্যতিক্রম"

 # msgstr "ভগ্নাংশ সংক্রান্ত ব্যতীক্রম" <-- বানান ভুল
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "কিল"

 # msgstr "শেষ করা (Kill)"
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "বাস সংক্রান্ত ভুল"

 # msgstr "বাস (Bus) সংক্রান্ত সমস্যা"
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "সেগমেন্ট সীমা লঙ্ঘন"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"

 # msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "অচল পাইপ"

 # msgstr "অচল পাইপ"
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "এলার্ম ঘড়ি"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "সমাপন"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "সকেটে জরুরি অবস্থা"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "বন্ধ করুন"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "কিবোর্ড বন্ধ করুন"

 # ২ কীবোর্ড 
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "চালিয়ে যান"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Child এর অবস্থা পরিবর্তিত হয়েছে"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "পশ্চাত থেকে tty পড়া"

 # ভাল হইলো না
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "পশ্চাত থেকে tty এ লেখা"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "এখন I/O সম্ভব"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "CPU সীমা ছাড়িয়ে গেছে"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "ফাইলের সাইজ সীমা ছাড়িয়ে গেছে"

 # msgstr "ফাইলের আয়তন সীমা ছাড়িয়ে গেছে"
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "কাল্পনিক এলার্ম ঘড়ি"

 # msgstr "কাল্পনিক এলার্ম ঘড়ি"
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "এলার্ম ঘড়ি প্রোফাইল করা হচ্ছে"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "উইন্ডোর সাইজ পরিবর্তন"

 # msgstr "উইন্ডো'র আয়তন পরিবর্তন"
 # Window এর বাংলা করার দরকার নাই
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "তথ্যের আবেদন"

 # msgstr "তথ্যের আবেদন"
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ১"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ২"

-# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
-# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
-# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
-#~ msgid "DEBUG"
-#~ msgstr "ডিবাগ"
-
-# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
-# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
-#~ msgid "VERBOSE"
-#~ msgstr "বর্ণনাযুক্ত"
-
-#~ msgid "NO-DAEMON"
-#~ msgstr "NO-DAEMON"
-
-#~ msgid "INETD"
-#~ msgstr "INETD"
-
 #~ msgid "Ticks (%ld per second):"
 #~ msgstr "টিক (প্রতি সেকেন্ডে %ld সংখ্যক):"

--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-16 22:33+0200\n"
-"PO-Revision-Date: 2011-04-04 22:04+0200\n"
+"PO-Revision-Date: 2005-09-04 01:16+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -61,7 +61,7 @@ msgstr "Ha estat cridat des d'inetd"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Executeu «%s --help»  per veure una llista completa de les opcions "
+"Executeu «%s --help»  per a veure una llista completa de les opcions "
 "disponibles de la línia d'ordres.\n"

 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
@@ -86,7 +86,7 @@ msgstr "Captura traça"

 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
-msgstr "Interromp"
+msgstr "Avorta"

 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -1,21 +1,23 @@
+# translation of libgtop.gnome-2-26.po to catalan
 # Catalan translation of libgtop.
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
+#
 # Softcatalà <gnome@softcatala.net>, 2000, 2001, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2002, 2003, 2004, 2005.
-#
+# Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop 2.9.91\n"
+"Project-Id-Version: libgtop.gnome-2-26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-29 21:31+0100\n"
-"PO-Revision-Date: 2005-09-04 01:16+0200\n"
-"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
-"Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca\n"
+"POT-Creation-Date: 2009-09-02 18:33+0200\n"
+"PO-Revision-Date: 2009-08-29 10:37+0200\n"
+"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
+"Language-Team: catalan <tradgnome@softcatala.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"
+"X-Generator: KBabel 1.11.4\n"

 #: ../lib/read.c:51
 #, c-format
@@ -48,11 +50,11 @@ msgstr "Activa la depuració"

 #: ../src/daemon/gnuserv.c:457
 msgid "Enable verbose output"
-msgstr "Activa la eixida detallada"
+msgstr "Activa l'eixida detallada"

 #: ../src/daemon/gnuserv.c:459
 msgid "Don't fork into background"
-msgstr "No bifurquis al segon pla"
+msgstr "No bifurques al segon pla"

 #: ../src/daemon/gnuserv.c:461
 msgid "Invoked from inetd"
@@ -188,15 +190,3 @@ msgstr "Senyal 1 definit per l'usuari"
 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "Senyal 2 definit per l'usuari"
-
-#~ msgid "DEBUG"
-#~ msgstr "DEPURACIÓ"
-
-#~ msgid "VERBOSE"
-#~ msgstr "DETALLA"
-
-#~ msgid "NO-DAEMON"
-#~ msgstr "SENSE DIMONI"
-
-#~ msgid "INETD"
-#~ msgstr "INETD"
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,15 +2,15 @@
 # This file is distributed under the same license as the libgtop package.
 # Copyright (C) 2004 Miloslav Trmac <mitr@volny.cz>.
 # Miloslav Trmac <mitr@volny.cz>, 2002, 2003, 2004.
-# Lucas Lommer <llommer@svn.gnome.org>, 2008, 2010.
+# Lucas Lommer <llommer@svn.gnome.org>, 2008.
 # Petr Kovar <pknbe@volny.cz>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 17:38+0200\n"
-"PO-Revision-Date: 2010-03-28 17:19+0100\n"
+"POT-Creation-Date: 2008-02-11 19:20+0100\n"
+"PO-Revision-Date: 2008-02-11 19:17+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -46,27 +46,27 @@ msgstr[0] "zapsán %d bajt"
 msgstr[1] "zapsány %d bajty"
 msgstr[2] "zapsáno %d bajtů"

-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Povolit ladění"

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "Povolit podrobný výstup"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "Nevětvit do pozadí"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Spuštěno z inetd"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Spusťte prosím „%s --help“, chcete-li zobrazit všechny dostupné přepínače "
+"Spusťte prosím \"%s --help\", chcete-li zobrazit všechny dostupné přepínače "
 "příkazové řádky.\n"

 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
--- a/po/en@shaw.po
+++ b/po/en@shaw.po
@@ -1,187 +0,0 @@
-# Shavian translation for libgtop.
-# Copyright (C) 2010 The Gnome Foundation.
-# Thomas Thurman <tthurman@gnome.org>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2010-05-11 13:26+0000\n"
-"PO-Revision-Date: 2010-05-12 18:37 -0400\n"
-"Last-Translator: Thomas Thurman <tthurman@gnome.org>\n"
-"Language-Team: Shavian <ubuntu-l10n-en-shaw@launchpad.net>\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"
-
-#, c-format
-#: ../lib/read.c:51
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "𐑮𐑧𐑛 %d 𐑚𐑲𐑑"
-msgstr[1] "𐑮𐑧𐑛 %d 𐑚𐑲𐑑𐑕"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "𐑮𐑧𐑛 𐑛𐑱𐑑𐑩 𐑕𐑲𐑟"
-
-#, c-format
-#: ../lib/read_data.c:70
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "𐑮𐑧𐑛 %lu 𐑚𐑲𐑑 𐑝 𐑛𐑱𐑑𐑩"
-msgstr[1] "𐑮𐑧𐑛 %lu 𐑚𐑲𐑑𐑕 𐑝 𐑛𐑱𐑑𐑩"
-
-#, c-format
-#: ../lib/write.c:51
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "𐑮𐑴𐑑 %d 𐑚𐑲𐑑"
-msgstr[1] "𐑮𐑴𐑑 %d 𐑚𐑲𐑑𐑕"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "𐑦𐑯𐑱𐑚𐑩𐑤 𐑛𐑰𐑚𐑳𐑜𐑦𐑙"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "𐑦𐑯𐑱𐑚𐑩𐑤 𐑝𐑻𐑚𐑴𐑕 𐑬𐑑𐑐𐑫𐑑"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "𐑛𐑴𐑯𐑑 𐑓𐑹𐑒 𐑦𐑯𐑑𐑫 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "𐑦𐑯𐑝𐑴𐑒𐑑 𐑓𐑮𐑪𐑥 inetd"
-
-#, c-format
-#: ../src/daemon/gnuserv.c:495
-msgid ""
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr "𐑮𐑳𐑯 '%s --help' 𐑑 𐑕𐑰 𐑩 𐑓𐑫𐑤 𐑤𐑦𐑕𐑑 𐑝 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑒𐑩𐑥𐑭𐑯𐑛 𐑤𐑲𐑯 𐑪𐑐𐑖𐑩𐑯𐑟.\n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "𐑣𐑨𐑙𐑜𐑩𐑐"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "𐑦𐑯𐑑𐑻𐑳𐑐𐑑"
-
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "𐑒𐑢𐑦𐑑"
-
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "𐑦𐑤𐑰𐑜𐑩𐑤 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯"
-
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "𐑑𐑮𐑱𐑕 𐑑𐑮𐑨𐑐"
-
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "𐑩𐑚𐑹𐑑"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "EMT 𐑻𐑼"
-
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "𐑓𐑤𐑴𐑑𐑦𐑙-𐑐𐑶𐑯𐑑 𐑦𐑒𐑕𐑧𐑐𐑖𐑩𐑯"
-
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "𐑒𐑦𐑤"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "𐑚𐑳𐑕 𐑻𐑼"
-
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "𐑕𐑧𐑜𐑥𐑩𐑯𐑑𐑱𐑖𐑩𐑯 𐑝𐑲𐑩𐑤𐑱𐑖𐑩𐑯"
-
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "𐑚𐑨𐑛 𐑸𐑜𐑿𐑥𐑩𐑯𐑑 𐑑 𐑕𐑦𐑕𐑑𐑩𐑥 𐑒𐑷𐑤"
-
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "𐑚𐑮𐑴𐑒𐑩𐑯 𐑐𐑲𐑐"
-
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "𐑩𐑤𐑸𐑥 𐑒𐑤𐑪𐑒"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "𐑑𐑻𐑥𐑩𐑯𐑱𐑖𐑩𐑯"
-
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "𐑻𐑡𐑩𐑯𐑑 𐑒𐑩𐑯𐑛𐑦𐑖𐑩𐑯 𐑪𐑯 𐑕𐑪𐑒𐑩𐑑"
-
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "𐑕𐑑𐑪𐑐"
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "𐑒𐑰𐑚𐑪𐑮𐑛 𐑕𐑑𐑪𐑐"
-
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "𐑒𐑩𐑯𐑑𐑦𐑯𐑿"
-
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "𐑗𐑲𐑤𐑛 𐑕𐑑𐑱𐑑𐑫𐑕 𐑣𐑨𐑟 𐑗𐑱𐑯𐑡𐑛"
-
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛 𐑮𐑧𐑛 𐑓𐑮𐑪𐑥 tty"
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛 𐑮𐑲𐑑 𐑑 tty"
-
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "I/O 𐑯𐑬 𐑐𐑪𐑕𐑩𐑚𐑩𐑤"
-
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "CPU 𐑤𐑦𐑥𐑦𐑑 𐑩𐑒𐑕𐑰𐑛𐑩𐑛"
-
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "𐑓𐑲𐑤 𐑕𐑲𐑟 𐑤𐑦𐑥𐑦𐑑 𐑩𐑒𐑕𐑰𐑛𐑩𐑛"
-
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "𐑝𐑻𐑗𐑫𐑩𐑤 𐑩𐑤𐑸𐑥 𐑒𐑤𐑪𐑒"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "𐑐𐑮𐑴𐑓𐑲𐑤𐑦𐑙 𐑩𐑤𐑸𐑥 𐑒𐑤𐑪𐑒"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "𐑢𐑦𐑯𐑛𐑴 𐑕𐑲𐑟 𐑗𐑱𐑯𐑡"
-
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "𐑦𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑮𐑦𐑒𐑢𐑧𐑕𐑑"
-
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "𐑿𐑟𐑼 𐑛𐑦𐑓𐑲𐑯𐑛 𐑕𐑦𐑜𐑯𐑩𐑤 1"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "𐑿𐑟𐑼 𐑛𐑦𐑓𐑲𐑯𐑛 𐑕𐑦𐑜𐑯𐑩𐑤 2"
-
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,193 +1,208 @@
-# Esperanto translation for libgtop.
-# Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# Esperanto translation of libgtop
+# Copyright (C) 2006 THE libgtop'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the libgtop package.
 # Dominique PELLE <dominique.pelle@free.fr>, 2006.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libgtop&component=general\n"
-"POT-Creation-Date: 2011-03-31 17:35+0000\n"
-"PO-Revision-Date: 2011-06-08 11:49+0200\n"
-"Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-06-08 00:34+0530\n"
+"PO-Revision-Date: 2006-06-06 21:30+1200\n"
+"Last-Translator: Dominique PELLE <dominique.pelle@free.fr>\n"
+"Language-Team: Esperanto <eo-tradukado@lists.tuxfamily.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"
-"X-Launchpad-Export-Date: 2011-06-08 09:44+0000\n"
-"X-Generator: Launchpad (build 13144)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"

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

-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:53
 msgid "read data size"
-msgstr "grando de legita datumo"
+msgstr "grandeco de legita datumo"

-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "legis %lu bajton da datumo"
 msgstr[1] "legis %lu bajtojn da datumo"

-#: ../lib/write.c:51
+#: ../lib/write.c:53
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "skribis %d bajton"
 msgstr[1] "skribis %d bajtojn"

-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
-msgstr "Enŝalti sencimigon"
+msgstr "Ebligu sencimigon"

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "SENCIMIGO"
+
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
-msgstr "Enŝalti babileman eligon"
+msgstr "Ebligu babileman eligon"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "BABILEMA"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
-msgstr "Ne forki fonen"
+msgstr "Ne forku fone"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NE-DEMONO"
+
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
-msgstr "Alvokita de \"inetd\""
+msgstr "Alvokita de inetd"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"
+
+#: ../src/daemon/gnuserv.c:500
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Ruli '%s --help' por vidigi tutan liston de disponeblajn komandliniaj "
-"opciojn.\n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Malkonekti"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Interrompi"
+"Eraro en opcio %s: %s.\n"
+"Lanĉu '%s --help' por vidi plenan liston de uzeblaj opcioj de komanda "
+"linio.\n"

 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "Ĉesi"
+msgid "Hangup"
+msgstr "Malkontaktu"

 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+msgid "Interrupt"
+msgstr "Interrompu"
+
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+msgid "Quit"
+msgstr "Adiaŭu"
+
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Illegal instruction"
 msgstr "Nevalida komando"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "Trace trap"
 msgstr "Spura escepto"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "Ĉesigi"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "EMT-eraro"
-
 #: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+msgid "Abort"
+msgstr "Ĉesigu"
+
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+msgid "EMT error"
+msgstr "EMT eraro"
+
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Floating-point exception"
 msgstr "Glitpunkta escepto"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Mortigi"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "Bus-eraro"
-
 #: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+msgid "Kill"
+msgstr "Mortigu"
+
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+msgid "Bus error"
+msgstr "Busa eraro"
+
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Segmentation violation"
 msgstr "Aliro al nerezervita memoro"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Bad argument to system call"
-msgstr "Nevalida argumento al sistemvoko"
+msgstr "Nevalida argumento de kornovoko"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Broken pipe"
 msgstr "Rompita dukto"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "Alarm-takto"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "Finiĝo"
-
 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+msgid "Alarm clock"
+msgstr "Vekhorloĝo"
+
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+msgid "Termination"
+msgstr "Ĉesigo"
+
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Urgent condition on socket"
 msgstr "Urĝa kondiĉo ĉe kontaktoskatolo"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "Haltigi"
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "Klavara halto"
-
 #: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "Daŭrigi"
+msgid "Stop"
+msgstr "Ĉesigu"

 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+msgid "Keyboard stop"
+msgstr "Klavara ĉesigo"
+
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+msgid "Continue"
+msgstr "Daŭrigu"
+
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Child status has changed"
 msgstr "Stato de ido ŝanĝiĝis"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "Fona lego de  \"tty\""
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "Fona skribo al \"tty\""
-
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+msgid "Background read from tty"
+msgstr "Fona lego el tty"
+
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+msgid "Background write to tty"
+msgstr "Fona skribo al tty"
+
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "I/O now possible"
 msgstr "Eneligo nun eblas"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "CPU limit exceeded"
 msgstr "Limo de procesilo superitas"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "File size limit exceeded"
-msgstr "Limo de dosiergrando superitas"
+msgstr "Limo de dosiergrandeco superitas"

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

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Profiling alarm clock"
 msgstr "Profila alarm-takto"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "Window size change"
-msgstr "Ŝanĝo de fenestrogrando"
+msgstr "Ŝanĝo de grandeco de fenestro"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "Information request"
 msgstr "Informpeto"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
 msgid "User defined signal 1"
 msgstr "Uzant-difinita signalo 1"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
 msgid "User defined signal 2"
 msgstr "Uzant-difinita signalo 2"
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,233 +1,206 @@
 # Persian translation of libgtop.
-# Copyright (C) 2010, 2011 Iranian Free Software Users Group (IFSUG.org)translation team.
 # Copyright (C) 2003, 2005 Sharif FarsiWeb, Inc.
 # Roozbeh Pournader <roozbeh@farsiweb.info>, 2003.
 # Azin Azadi <aazadi@gmail.com>, 2005.
-# Arash Mousavi <mousavi.arash@gmail.com>, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-04 20:06+0000\n"
-"PO-Revision-Date: 2011-04-24 17:45+0330\n"
-"Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
-"Language-Team: Persian <translate@ifsug.org>\n"
-"Language: fa\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
+"PO-Revision-Date: 2005-02-03 13:40+0330\n"
+"Last-Translator: Azin Azadi <aazadi@gmail.com>\n"
+"Language-Team: Persian <farsi@lists.sharif.edu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-Language: Persian\n"
-"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
-"X-Poedit-SourceCharset: utf-8\n"

-#: ../lib/read.c:51
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "خوانده شد %Id بایت"

-#: ../lib/read_data.c:51
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "‌اندازه‌ی داده‌های خوانده شده"

-#: ../lib/read_data.c:70
-#, c-format
+#: lib/read_data.c:72
+#, fuzzy, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "%lu بایت اطلاعات خوانده شد"
+msgstr[0] "خوانده شد %Id بایت"

-#: ../lib/write.c:51
-#, c-format
+#: lib/write.c:52
+#, fuzzy, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "%Id بایت نوشته شد"

-#: ../src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "به کار انداختن اشکال‌زدایی"

-#: ../src/daemon/gnuserv.c:457
+#: src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "اشکال‌زدایی"
+
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "به کار انداختن خروجی مفصل"

-#: ../src/daemon/gnuserv.c:459
+#: src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "مفصل"
+
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "عدم انشعاب در پس‌زمینه"

-#: ../src/daemon/gnuserv.c:461
+#: src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "از inetd احضار شد"

-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "برای نمایش تمام گزینه‌های موجود خط فرمان «%s --help» را اجرا کنید.\n"
+#: src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"

-#: ../sysdeps/osf1/siglist.c:27
-#: ../sysdeps/sun4/siglist.c:27
+#: src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"خطا در گزینه‌ی ‎.\n"
+"%s: %sبرای دیدن فهرست کاملی از گزینه‌های موجود برای سطر فرمان، «%s --help» را "
+"اجرا کنید.\n"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "معوق گذاشتن"

-#: ../sysdeps/osf1/siglist.c:28
-#: ../sysdeps/sun4/siglist.c:28
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "وقفه"

-#: ../sysdeps/osf1/siglist.c:29
-#: ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "خروج"

-#: ../sysdeps/osf1/siglist.c:30
-#: ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "دستورالعمل غیرمجاز"

-#: ../sysdeps/osf1/siglist.c:31
-#: ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "ردگیری تله"

-#: ../sysdeps/osf1/siglist.c:32
-#: ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "قطع کردن"

-#: ../sysdeps/osf1/siglist.c:33
-#: ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "خطای EMT"

-#: ../sysdeps/osf1/siglist.c:34
-#: ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "استثنای ممیز شناور"

-#: ../sysdeps/osf1/siglist.c:35
-#: ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "خاموش کردن"

-#: ../sysdeps/osf1/siglist.c:36
-#: ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "خطای گذرگاه"

-#: ../sysdeps/osf1/siglist.c:37
-#: ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "تخلف قطعه قطعه کردن"

-#: ../sysdeps/osf1/siglist.c:38
-#: ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "آرگومان بد به فراخوانی سیستم"

-#: ../sysdeps/osf1/siglist.c:39
-#: ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "لوله‌ی شکسته"

-#: ../sysdeps/osf1/siglist.c:40
-#: ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "ساعت زنگی"

-#: ../sysdeps/osf1/siglist.c:41
-#: ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "پایان دادن"

-#: ../sysdeps/osf1/siglist.c:42
-#: ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "وضعیت اورژانس برای سوکت"

-#: ../sysdeps/osf1/siglist.c:43
-#: ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "توقف"

-#: ../sysdeps/osf1/siglist.c:44
-#: ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "توقف صفحه‌کلید"

-#: ../sysdeps/osf1/siglist.c:45
-#: ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "ادامه"

-#: ../sysdeps/osf1/siglist.c:46
-#: ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "وضعیت بچه عوض شد"

-#: ../sysdeps/osf1/siglist.c:47
-#: ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "خواندن پس‌زمینه از tty"

-#: ../sysdeps/osf1/siglist.c:48
-#: ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "نوشتن پس‌زمینه در tty"

-#: ../sysdeps/osf1/siglist.c:49
-#: ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "ورودی/خروجی اکنون امکان دارد"

-#: ../sysdeps/osf1/siglist.c:50
-#: ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "بیشتر از محدودیت واحد پردازش مرکزی شد"

-#: ../sysdeps/osf1/siglist.c:51
-#: ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "بیشتر از محدودیت اندازه‌ی پرونده شد"

-#: ../sysdeps/osf1/siglist.c:52
-#: ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
+#, fuzzy
 msgid "Virtual alarm clock"
 msgstr "ساعت هشدار مجازی"

-#: ../sysdeps/osf1/siglist.c:53
-#: ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr "درحال تنظیم زنگ هشدار"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:54
-#: ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "تغییر اندازه‌ی پنجره"

-#: ../sysdeps/osf1/siglist.c:55
-#: ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "درخواست اطلاعات"

-#: ../sysdeps/osf1/siglist.c:56
-#: ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "سیگنال تعریف شده توسط کاربر ۱"

-#: ../sysdeps/osf1/siglist.c:57
-#: ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "سیگنال تعریف شده توسط کاربر ۲"
-
-#~ msgid "DEBUG"
-#~ msgstr "اشکال‌زدایی"
-
-#~ msgid "VERBOSE"
-#~ msgstr "مفصل"
-
-#~ msgid "NO-DAEMON"
-#~ msgstr "NO-DAEMON"
-
-#~ msgid "INETD"
-#~ msgstr "INETD"
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,201 +1,203 @@
-# Irish translations for libgtop package.
-# Copyright (C) 1998-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libgtop package.
-# Alastair McKinstry <mckinstry@computer.org>, 1998.
-# Paul Duffy <dubhthach@frink.nuigalway.ie>, 2003.
-# Seán de Búrca <leftmostcat@gmail.com>, 2009.
-#
+# Irish (gaeilge) translations for libgtop.pot (Gnome)
+# Copyright (C) 1998,2004 Free Software Foundation, Inc.
+# Alastair McKinstry <mckinstry@computer.org>, 1998
+# Paul Duffy <dubhthach@frink.nuigalway.ie>, 2003
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.master\n"
+"Project-Id-Version: libgtop-GNOME-2-0-port \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-20 09:28-0600\n"
-"PO-Revision-Date: 2009-08-20 09:47-0600\n"
-"Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"

-#: ../lib/read.c:51
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "léigh %d bheart"
-msgstr[1] "léigh %d bheart"
-msgstr[2] "léigh %d bheart"
-msgstr[3] "léigh %d mbeart"
-msgstr[4] "léigh %d beart"
+msgstr[0] ""
+msgstr[1] ""

-#: ../lib/read_data.c:51
+#: lib/read_data.c:53
 msgid "read data size"
-msgstr "léigh méid sonraí"
+msgstr ""

-#: ../lib/read_data.c:70
+#: lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "léigh %lu bheart sonraí"
-msgstr[1] "léigh %lu bheart sonraí"
-msgstr[2] "léigh %lu bheart sonraí"
-msgstr[3] "léigh %lu mbeart sonraí"
-msgstr[4] "léigh %lu beart sonraí"
+msgstr[0] ""
+msgstr[1] ""

-#: ../lib/write.c:51
+#: lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "scríobh %d bheart"
-msgstr[1] "scríobh %d bheart"
-msgstr[2] "scríobh %d bheart"
-msgstr[3] "scríobh %d mbeart"
-msgstr[4] "scríobh %d beart"
+msgstr[0] ""
+msgstr[1] ""

-#: ../src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
-msgstr "Cumasaigh dífhabhtú"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "Cumasaigh aschur foclach"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "Ná forc isteach sa chúlra"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "Glaodh ó inetd"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Rith '%s --help' chun liosta iomlán roghanna líne na n-orduithe le fáil a "
-"fheiceáil.\n"

-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr ""
+
+#: src/daemon/gnuserv.c:462
+msgid "Enable verbose output"
+msgstr ""
+
+#: src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr ""
+
+#: src/daemon/gnuserv.c:464
+msgid "Don't fork into background"
+msgstr ""
+
+#: src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr ""
+
+#: src/daemon/gnuserv.c:466
+msgid "Invoked from inetd"
+msgstr ""
+
+#: src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr ""
+
+#: src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr "Croch"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
-msgstr "Idirbhriseadh"
+msgstr "Idirbhrís"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
-msgstr "Scor"
+msgstr "Ealu"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
-msgstr "Treoir neamhcheadaithe"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
-msgstr "Gaiste loirg"
+msgstr ""

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

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
-msgstr "Earráid EMT"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
-msgstr "Eisceacht snámhphointe"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
-msgstr "Marú"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
-msgstr "Earráid bhus"
+msgstr "Earraidh Bus"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
-msgstr "Sárú deighilte"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
-msgstr "Drochargóint go glao córais"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
-msgstr "Píopa briste"
+msgstr "Píopa Briste"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
-msgstr "Clog aláraim"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
-msgstr "Críoch"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
-msgstr "Staid práinneach ar shoicéad"
+msgstr ""

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

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Stad méarchláir"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
-msgstr "Leanúint ar aghaidh"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
-msgstr "Athraíodh stádas mic"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
-msgstr "Léamh cúlrach ó tty"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
-msgstr "Scríobh cúlrach go tty"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
-msgstr "I/A indéanta anois"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "Imithe thar teorainn LAP"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Imithe thar teorainn mhéid chomhaid"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
-msgstr "Clog aláraim fíorúil"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
-msgstr "Clog aláraim próifílithe"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
-msgstr "Athrú mhéid fhuinneoige"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
-msgstr "Iarratas eolais"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
-msgstr "Comhartha sainmhínithe ag an úsáideoir 1"
+msgstr ""

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
-msgstr "Comhartha sainmhínithe ag an úsáideoir 2"
+msgstr ""
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,19 +14,18 @@
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005.
 # Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007.
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
-# Fran Diéguez <frandieguez@ubuntu.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-27 03:18+0100\n"
-"PO-Revision-Date: 2010-01-10 03:46+0100\n"
-"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"Language: gl\n"
+"POT-Creation-Date: 2009-03-16 23:15+0100\n"
+"PO-Revision-Date: 2009-03-10 20:17+0000\n"
+"Last-Translator: Suso Baleato <suso.baleato@xunta.es>\n"
+"Language-Team: Galego <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: ../lib/read.c:51
@@ -64,7 +63,7 @@ msgstr "Activar a saída detallada"

 #: ../src/daemon/gnuserv.c:459
 msgid "Don't fork into background"
-msgstr "Non facer fork nunha tarefa de fondo"
+msgstr "Non facer fork na tarefa de fondo"

 #: ../src/daemon/gnuserv.c:461
 msgid "Invoked from inetd"
@@ -74,8 +73,8 @@ msgstr "Invocado desde inetd"
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Execute '%s --help' para ver a lista completa das opcións de liña de ordes "
-"dispoñíbeis.\n"
+"Execute '%s --help' para ver a lista completa das opcións de liña de "
+"comandos dispoñíbeis.\n"

 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
@@ -139,7 +138,7 @@ msgstr "Finalización"

 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
-msgstr "Condición urxente no socket"
+msgstr "Condición urxente no conectador"

 #: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
--- a/po/id.po
+++ b/po/id.po
@@ -1,218 +1,207 @@
-# Translation of libtop into Indonesian
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the libgtop package.
-# Mohammad DAMT <mdamt@bisnisweb.com>, 2003.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2010-03-30 15:14+0000\n"
-"PO-Revision-Date: 2010-04-18 14:46+0700\n"
-"Last-Translator: Andika Triwidada <andika@gmail.com>\n"
-"Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
+"Project-Id-Version: libgtop libgtop-GNOME-2-0-port\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
+"PO-Revision-Date: 2003-02-10 18:01+0700\n"
+"Last-Translator: Mohammad DAMT <mdamt@bisnisweb.com>\n"
+"Language-Team: Indonesia <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Poedit-Language: Indonesian\n"
-"X-Poedit-Country: Indonesia\n"

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

-#: ../lib/read_data.c:51
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "ukuran data saat membaca"

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

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

-#: ../src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Aktifkan debuging"

-#: ../src/daemon/gnuserv.c:457
+#: src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "DEBUG"
+
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Aktifkan output yang lengkap"

-#: ../src/daemon/gnuserv.c:459
+#: src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Jangan fork ke background"

-#: ../src/daemon/gnuserv.c:461
+#: src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Diaktifkan dari inetd"

-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Jalankan '%s --help' untuk melihat daftar penuh pilihan perintah yang tersedia.\n"
+#: src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"

-#: ../sysdeps/osf1/siglist.c:27
-#: ../sysdeps/sun4/siglist.c:27
+#: src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Error pada pilihan %s: %s.\n"
+"Jalankan '%s --help' untuk melihat daftar penuh pilihan perintah yang "
+"tersedia\n"
+
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Hangup"

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

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

-#: ../sysdeps/osf1/siglist.c:30
-#: ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Instruksi ilegal"

-#: ../sysdeps/osf1/siglist.c:31
-#: ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Jebakan trace"

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

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

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

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

-#: ../sysdeps/osf1/siglist.c:36
-#: ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Error bus"

-#: ../sysdeps/osf1/siglist.c:37
-#: ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Pelanggaran segmentasi"

-#: ../sysdeps/osf1/siglist.c:38
-#: ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Parameter ke sistem call salah"

-#: ../sysdeps/osf1/siglist.c:39
-#: ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Pipa rusak"

-#: ../sysdeps/osf1/siglist.c:40
-#: ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Jam alarm"

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

-#: ../sysdeps/osf1/siglist.c:42
-#: ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Kondisi gawat pada soket"

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

-#: ../sysdeps/osf1/siglist.c:44
-#: ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
-msgstr "Hentikan papan tik"
+msgstr "Stop keyboard"

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

-#: ../sysdeps/osf1/siglist.c:46
-#: ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Status anak telah berubah"

-#: ../sysdeps/osf1/siglist.c:47
-#: ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Baca diam-diam dari tty"

-#: ../sysdeps/osf1/siglist.c:48
-#: ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Tulis diam-diam ke tty"

-#: ../sysdeps/osf1/siglist.c:49
-#: ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "I/O dimungkinkan"

-#: ../sysdeps/osf1/siglist.c:50
-#: ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
-msgstr "Batas CPU terlampaui"
+msgstr "Batasan CPU terlampaui"

-#: ../sysdeps/osf1/siglist.c:51
-#: ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
-msgstr "Batas ukuran file terlampaui"
+msgstr "Batasan ukuran file terlampaui"

-#: ../sysdeps/osf1/siglist.c:52
-#: ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Jam alarm virtual"

-#: ../sysdeps/osf1/siglist.c:53
-#: ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Melakukan profil jam alarm"

-#: ../sysdeps/osf1/siglist.c:54
-#: ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Ukuran window berubah"

-#: ../sysdeps/osf1/siglist.c:55
-#: ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Permintaan informasi"

-#: ../sysdeps/osf1/siglist.c:56
-#: ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Sinyal 1 milik user"

-#: ../sysdeps/osf1/siglist.c:57
-#: ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Sinyal 2 milik user"
-
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,30 +1,30 @@
 # libgtop ja.po.
-# Copyright (C) 1998,2000,2002-2007,2009-2010 Free Software Foundation, Inc.
+# Copyright (C) 1998,2000,2002-2007 Free Software Foundation, Inc.
 # Eiichiro ITANI <emu@ceres.dti.ne.jp>, 1998
-# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2000, 2002, 2010.
+# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2000, 2002.
 # Yukihiro Nakai <nakai@gnome.gr.jp>, 2000.
 # KAMAGASAKO Masatoshi <emerald@gnome.gr.jp>, 2003.
-# Takeshi AIHANA <takeshi.aihana@gmail.com>, 2004-2007,2009.
+# Takeshi AIHANA <takeshi.aihana@gmail.com>, 2004-2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=libgtop&component=general\n"
-"POT-Creation-Date: 2010-06-27 13:25+0000\n"
-"PO-Revision-Date: 2009-10-04 17:38+0900\n"
-"Last-Translator: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
+"Project-Id-Version: libgtop trunk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-08 01:03+0900\n"
+"PO-Revision-Date: 2007-07-08 01:03+0900\n"
+"Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #: ../lib/read.c:51
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "%dバイト読み込み"
+msgstr[0] " %dバイト読み込み"
+msgstr[1] " %dバイト読み込み"

 #: ../lib/read_data.c:51
 msgid "read data size"
@@ -34,36 +34,38 @@ msgstr "データの読み込みサイズ"
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
-msgstr[0] "%luバイトデータの読み込み"
+msgstr[0] " %luバイトデータの読み込み"
+msgstr[1] " %luバイトデータの読み込み"

 #: ../lib/write.c:51
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "%dバイトの書き込み"
+msgstr[0] " %dバイトの書き込み"
+msgstr[1] " %dバイトの書き込み"

-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "デバッグを有効にする"

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "詳細な出力にする"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "子プロセスをバックグラウンドに回さない"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "`inetd` から起動する"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "利用可能なコマンド・ラインのオプション一覧を表示する場合は '%s --help' を実行"
-"してください\n"
+"して下さい\n"

 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
@@ -155,7 +157,7 @@ msgstr "TTY へのバックグラウンド書き込み"

 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
-msgstr "I/O が使用可能"
+msgstr "I/Oが使用可能"

 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
@@ -183,8 +185,8 @@ msgstr "情報リクエスト"

 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
-msgstr "ユーザ定義のシグナル1"
+msgstr "ユーザ定義シグナル１"

 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
-msgstr "ユーザ定義のシグナル2"
+msgstr "ユーザ定義シグナル２"
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,21 +1,23 @@
 # translation of libgtop.HEAD.po to Kannada
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Shankar Prasad <svenkate@redhat.com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop.HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product="
+"libgtop&component=general\n"
 "POT-Creation-Date: 2009-03-01 23:08+0000\n"
-"PO-Revision-Date: 2009-03-14 20:01+0530\n"
+"PO-Revision-Date: 2009-03-14 10:31-0400\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: Kannada <en@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"
-"X-Generator: KBabel 1.11.4\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.2.3\n"

 #: ../lib/read.c:51
 #, c-format
@@ -61,129 +63,160 @@ msgstr "inetd ಇಂದ ರದ್ದು ಮಾಡಲಾದ"
 #: ../src/daemon/gnuserv.c:495
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "ಲಭ್ಯವಿರುವ ಆಜ್ಞೆಯ ಒಂದು ಸಂಪೂರ್ಣ ಪಟ್ಟಿಯನ್ನು ನೋಡಲು '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ.\n"
+msgstr ""
+"ಲಭ್ಯವಿರುವ ಆಜ್ಞೆಯ ಒಂದು ಸಂಪೂರ್ಣ ಪಟ್ಟಿಯನ್ನು ನೋಡಲು '%s --help' ಅನ್ನು ಚಲಾಯಿಸಿ.\n"

-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: ../sysdeps/osf1/siglist.c:27
+#: ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
 msgstr "ನೇತಾಡು"

-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:28
+#: ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "ತಡೆ"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:29
+#: ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "ತ್ಯಜಿಸು"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:30
+#: ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "ಅನಧೀಕೃತ ಸೂಚನೆ"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:31
+#: ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "ಜಾಡಿನ ಟ್ರಾಪ್"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:32
+#: ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "ಸ್ಥಗಿತಗೊಳಿಸು"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:33
+#: ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "EMT ದೋಷ"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:34
+#: ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
 msgstr "ತೇಲುವ-ಬಿಂದುವಿನ ವಿನಾಯಿತಿ"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:35
+#: ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "ಕೊಲ್ಲು"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:36
+#: ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "ಬಸ್ ದೋಷ"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:37
+#: ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "ಸೆಗ್ಮೆಂಟೇಶನ್ ಉಲ್ಲಂಘನೆ"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:38
+#: ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಕೋಶಕ್ಕೆ ಸರಿಯಲ್ಲದ ಆರ್ಗ್ಯುಮೆಂಟ್"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:39
+#: ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "ತುಂಡಾದ ಪೈಪ್"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:40
+#: ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "ಅಲಾರಮ್ ಗಡಿಯಾರ"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:41
+#: ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "ಅಂತ್ಯಗೊಳಿಕೆ"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:42
+#: ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
 msgstr "ಸಾಕೆಟ್‌ನಲ್ಲಿ ತುರ್ತು ಪರಿಸ್ಥಿತಿ"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:43
+#: ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "ನಿಲ್ಲಿಸು"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:44
+#: ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
 msgstr "ಕೀಲಿಮಣೆ ನಿಲುಗಡೆ"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:45
+#: ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "ಮುಂದುವರೆ"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:46
+#: ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "ಚೈಲ್ಡಿನ ಸ್ಥಿತಿ ಬದಲಾಗಿದೆ"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:47
+#: ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
 msgstr "tty ಇಂದ ಓದಲಾದ ಹಿನ್ನಲೆ"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:48
+#: ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
 msgstr "tty ಗೆ ಹಿನ್ನಲೆ ಬರೆಯುವಿಕೆ"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:49
+#: ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
 msgstr "I/O ಈಗ ಸಾಧ್ಯವಿದೆ"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:50
+#: ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "CPU ಮಿತಿಯನ್ನು ಮೀರಲಾಗಿದೆ"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:51
+#: ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "ಕಡತದ ಗಾತ್ರದ ಮಿತಿಯನ್ನು ಮೀರಲಾಗಿದೆ"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:52
+#: ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "ವರ್ಚುವಲ್ ಅಲಾರಮ್ ಗಡಿಯಾರ"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:53
+#: ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "ಪ್ರೊಫೈಲಿಂಗ್ ಅಲಾರಮ್ ಗಡಿಯಾರ"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:54
+#: ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "ವಿಂಡೋ ಗಾತ್ರದ ಬದಲಾವಣೆ"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:55
+#: ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "ಮಾಹಿತಿಯ ಮನವಿ"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:56
+#: ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
 msgstr "ಬಳಕೆದಾರ ಸೂಚಿತ ಸಂಕೇತ ೧"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:57
+#: ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "ಬಳಕೆದಾರ ಸೂಚಿತ ಸಂಕೇತ ೨"
-
--- a/po/ky.po
+++ b/po/ky.po
@@ -20,10 +20,10 @@ msgstr ""

 #: ../lib/read.c:65
 #, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "%d байт окулду"
-msgstr[1] ""
+#msgid "read %d byte"
+#msgid_plural "read %d bytes"
+#msgstr[0] "%d байт окулду"
+#msgstr[1] ""

 #: ../lib/read_data.c:53
 msgid "read data size"
@@ -31,17 +31,17 @@ msgstr "окулган берилиштердин көлөмү"

 #: ../lib/read_data.c:72
 #, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "%lu байт берилиш окулду"
-msgstr[1] ""
+#msgid "read %lu byte of data"
+#msgid_plural "read %lu bytes of data"
+#msgstr[0] "%lu байт берилиш окулду"
+#msgstr[1] ""

 #: ../lib/write.c:52
 #, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "%d байт жазылды"
-msgstr[1] ""
+#msgid "wrote %d byte"
+#msgid_plural "wrote %d bytes"
+#msgstr[0] "%d байт жазылды"
+#msgstr[1] ""

 #: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
--- a/po/lv.po
+++ b/po/lv.po
@@ -4,22 +4,19 @@
 #
 # Peteris Krisjanis <peteris.krisjanis@os.lv>, 2002.
 # Raivis Dejus <orvils@gmail.com>, 2006, 2009.
-# Peteris Krisjanis <pecisk@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-11-12 10:53+0000\n"
-"PO-Revision-Date: 2010-04-26 11:18+0300\n"
-"Last-Translator: Peteris Krisjanis <pecisk@gmail.com>\n"
-"Language-Team: Latviešu <lata-l10n@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-07 14:35+0100\n"
+"PO-Revision-Date: 2009-01-25 17:52+0200\n"
+"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
+"Language-Team: Latvian <locale@laka.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
-"X-Generator: Lokalize 1.0\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"

 #: ../lib/read.c:51
 #, c-format
@@ -45,27 +42,27 @@ msgstr[2] "lasīt %lu baitu datus"
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "ierakstīts %d baits"
-msgstr[1] "ierakstīti %d baiti"
-msgstr[2] "ierakstīti %d baitu"
+msgstr[0] "ierakstīju %d baitu"
+msgstr[1] "ierakstīju %d baitus"
+msgstr[2] "ierakstīju %d baitu"

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

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

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

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Izsaukts no inetd"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
@@ -130,7 +127,7 @@ msgstr "Modinātājs"

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

 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
--- a/po/mai.po
+++ b/po/mai.po
@@ -1,189 +0,0 @@
-# translation of libgtop.master.po to Maithili
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Sangeeta Kumari <sangeeta09@gmail.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-09-02 16:38+0000\n"
-"PO-Revision-Date: 2009-09-11 20:50+0530\n"
-"Last-Translator: Sangeeta Kumari <sangeeta09@gmail.com>\n"
-"Language-Team: Maithili <maithili.sf.net>\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\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "%d बाइट पढ़ू"
-msgstr[1] "%d बाइट पढ़ू"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "आंकड़ाक आकार पढ़ू"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "%lu आंकड़ाक बाइट पढ़ू"
-msgstr[1] "%lu आंकड़ाक बाइट पढ़ू"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "%d बाइट लिखलक"
-msgstr[1] "%d बाइट लिखलक"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "डिबगिंग सक्षम करू"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "वर्बोज आउटपुट सक्षम करू"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "पृष्ठभूमिमे फॉर्क नहि करू"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "inetd मारफत बोलाएल गेल"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "'%s --help' चलाबू उपलब्ध कमांड लाइन विकल्प देखबाक लेल.\n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "हैंगअप"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "रूकाबट"
-
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "बाहर"
-
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "अबैध निर्देश"
-
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "ट्रेस ट्रैप"
-
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "छोड़ू"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "EMT त्रुटि"
-
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "फ्लोटिंग-पाइंट अपबाद"
-
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "मारू"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "बस त्रुटि"
-
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "सेगमेंटेशन अतिक्रमण"
-
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "सिस्टम कालमे गलत आर्गुमेंट"
-
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "टूटल पाइप"
-
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "अलार्म घड़ी"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "समाप्त"
-
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "साकेट पर अत्यावश्यक अवस्था"
-
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "रोकू"
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "कीबोर्ड रोकू"
-
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "जारी राखू"
-
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "शिशुक स्थिति बदैल गेल अछि"
-
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "टीटीवाइ सँ पढ़बाक काज पृष्ठभूमिमे करू"
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "टीटीवाइ पर लिखबाक काज पृष्ठभूमिमे करू"
-
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "आइ/ओ आब संभव"
-
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "सीपीयू सीमा सँ बाहर पहुँच गेल"
-
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "फाइलक आकार सीमा सँ बाहर पहुँच गेल"
-
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "आभासी अलार्म घड़ी"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "प्रोफाइलिंग अलार्म घड़ी"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "विंडो आकार परिवर्तन"
-
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "जानकारी निवेदन"
-
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "प्रयोक्ता परिभाषित संकेत १"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "प्रयोक्ता परिभाषित संकेत २"
-
--- a/po/ml.po
+++ b/po/ml.po
@@ -1,4 +1,4 @@
-# translation of libgtop.master.ml.po to
+# translation of libgtop.HEAD.ml.po to Malayalam
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # FSF-India <locale@gnu.org.in>, 2003.
@@ -6,189 +6,205 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.master.ml\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-04-17 10:17+0000\n"
-"PO-Revision-Date: 2009-09-12 20:37+0530\n"
-"Last-Translator: \n"
-"Language-Team:  <en@li.org>\n"
+"Project-Id-Version: libgtop.HEAD.ml\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-04 16:32+0200\n"
+"PO-Revision-Date: 2006-08-05 01:18+0530\n"
+"Last-Translator: Ani Peter <apeter@redhat.com>\n"
+"Language-Team: Malayalam\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"

-#: ../lib/read.c:51
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d ബൈറ്റ് വായിക്കുക"
 msgstr[1] "%d ബൈറ്റ്സ് വായിക്കുക"

-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:53
 msgid "read data size"
 msgstr "ഡേറ്റായുടെ വലിപ്പം വായിക്കുക"

-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "%lu ബൈറ്റ് ഡേറ്റാ വായിക്കുക"
 msgstr[1] "%lu ബൈറ്റ്സ് ഡേറ്റാ വായിക്കുക"

-#: ../lib/write.c:51
+#: ../lib/write.c:53
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "%d ബൈറ്റ് എഴുതി"
 msgstr[1] "%d ബൈറ്റ്സ് എഴുതി"

-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "ഡീബഗ്ഗിങ് പ്രവര്‍ത്തന സജ്ജമാക്കുക"

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "ഡീബഗ്"
+
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "വര്‍ബറോസ് ഔട്ട് പുട്ട് പ്രവര്‍ത്തന സജ്ജമാക്കുക"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "വര്‍ബറോസ്"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "പശ്ചാത്തലത്തിലേക്ക് fork ചെയ്യുവാന്‍ പാടില്ല"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "ഡെമണ്‍ ഇല്ല"
+
+#: ../src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "inetd-ല്‍ നിന്നുമുളള വിളി"

-#: ../src/daemon/gnuserv.c:495
-#, c-format
-#| msgid ""
-#| "Error on option %s: %s.\n"
-#| "Run '%s --help' to see a full list of available command line options.\n"
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഉപാധികളുടെ മുഴുവന്‍ പട്ടികയ്ക്ക് '%s --help' പ്രവര്‍ത്തിപ്പിക്കുക.\n"
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"

-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: ../src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"ഉപാധി %s-ല്‍ പിഴവ്: %s.\n"
+"ലഭ്യമായ കമാന്‍ഡ് ലൈന്‍ ഉപാധികളുടെ മുഴുവന്‍ പട്ടികയ്ക്ക് '%s --help' പ്രവര്‍ത്തിപ്പിക്കുക.\n"
+
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Hangup"
 msgstr "അവസാനിപ്പിക്കുക"

-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Interrupt"
 msgstr "ഇന്‍ററപ്റ്റ്"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Quit"
 msgstr "പുറത്ത് കടക്കുക"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Illegal instruction"
 msgstr "തെറ്റായ നിര്‍ദ്ദേശം"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "Trace trap"
 msgstr "തടസ്സം കണ്ടുപിടിക്കുക"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Abort"
 msgstr "നിര്‍ത്തലാക്കുക"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "EMT error"
 msgstr "EMT പിശക്"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Floating-point exception"
 msgstr "ഫ്ളോട്ടിങ്-പോയിന്‍റ് എക്സെപ്ഷന്‍"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Kill"
 msgstr "അവസാനിപ്പിക്കുക"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bus error"
 msgstr "ബസില്‍ പിശക്"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Segmentation violation"
 msgstr "സെഗ്മന്‍റേഷനില്‍ തെറ്റ്"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Bad argument to system call"
 msgstr "സിസ്റ്റം കോളിലേക്ക് തെറ്റായ ആര്‍ഗ്യുമെന്‍റ്"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Broken pipe"
 msgstr "പൊട്ടിയ പൈപ്പ്"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Alarm clock"
 msgstr "അലാറം ക്ളോക്ക്"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Termination"
 msgstr "അവസാനിപ്പിക്കല്‍"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Urgent condition on socket"
 msgstr "സോക്കന്‍റില്‍ ഗുരുതരമായ അവസ്ഥ"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Stop"
 msgstr "നിര്‍ത്തുക"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Keyboard stop"
 msgstr "കീബോര്‍ഡ് നിര്‍ത്തുക"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Continue"
 msgstr "തുടരുക"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Child status has changed"
 msgstr "ചൈള്‍ഡിന്‍റെ അവസ്ഥ മാറിയിരിക്കുന്നു"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "Background read from tty"
 msgstr "tty-ല്‍ നിന്നും പശ്ചാത്തലം വായിക്കുക"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "Background write to tty"
 msgstr "tty-ലേക്ക് പശ്ചാത്തലം എഴുതുക"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "I/O now possible"
 msgstr "I/O ഇപ്പോള്‍ സാധ്യമാണ്"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "CPU limit exceeded"
 msgstr "CPU പരിമിധി കവിഞ്ഞു"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "File size limit exceeded"
 msgstr "ഫയലിന്‍റെ വലിപ്പ പരിമിധി കവിഞ്ഞു"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Virtual alarm clock"
 msgstr "വിര്‍ച്ച്വല്‍ അലാറം ക്ളോക്ക്"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Profiling alarm clock"
 msgstr "അലാറം ക്ളോക്ക് പ്രൊഫൈല്‍ ചെയ്യുന്നു"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "Window size change"
 msgstr "ജീലകത്തിന്‍റെ വലിപ്പത്തലുളള മാറ്റം"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "Information request"
 msgstr "വിവരങ്ങള്‍ക്കായുളള അഭ്യര്‍ത്ഥന"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
 msgid "User defined signal 1"
 msgstr "യൂസര്‍ ഡിഫൈന്‍ഡ് സിഗ്നല്‍ 1"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
 msgid "User defined signal 2"
 msgstr "യൂസര്‍ ഡിഫൈന്‍ഡ് സിഗ്നല്‍ 2"

--- a/po/nn.po
+++ b/po/nn.po
@@ -1,24 +1,22 @@
 # translation of nn.po to Norwegian Nynorsk
 # Norwegian (nynorsk) translation of libgtop.
 # Copyright (C) 2001 Roy-Magne Mo
-#
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
 # Roy-Magne Mo <rmo@sunnmore.net>, 2001.
 # Åsmund Skjæveland <aasmunds@fys.uio.no>, 2004.
-# Åsmund Skjæveland <aasmunds@ulrik.uio.no>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-05-25 20:29+0000\n"
-"PO-Revision-Date: 2009-10-17 18:26+0200\n"
-"Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
-"Language-Team: Norsk (nynorsk) <i18n-nn@lister.ping.uio.no>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-04-04 13:45+0200\n"
+"PO-Revision-Date: 2008-04-04 13:45+0200\n"
+"Last-Translator: Eskild Hustvedt <eskildh@gnome.org>\n"
+"Language-Team: Norwegian Nynorsk <i18n-no@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: VIM\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"

 #: ../lib/read.c:51
@@ -43,26 +41,26 @@ msgstr[1] "las %lu byte data"
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "skreiv %d byte"
-msgstr[1] "skreiv %d byte"
+msgstr[0] "skriv %d byte"
+msgstr[1] "skriv %d byte"

-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
 msgstr "Skru på feilsøking"

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
 msgstr "Skru på ordrike utdata"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
-msgstr "Ikkje fork av i bakgrunnen"
+msgstr "Ikkje fork av inn i bakgrunnen"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Starta frå inetd"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
@@ -82,7 +80,7 @@ msgstr "Avslutt"

 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
-msgstr "Ulovleg instruksjon"
+msgstr "Ulovleg instruksjon."

 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
@@ -98,7 +96,7 @@ msgstr "EMT-feil"

 #: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
-msgstr "Flyttalunntak"
+msgstr "Flyttaluttrykk"

 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
@@ -126,7 +124,7 @@ msgstr "Alarmklokke"

 #: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Termination"
-msgstr "Avslutting"
+msgstr "Avlustting"

 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
@@ -142,11 +140,11 @@ msgstr "Tastaturstopp"

 #: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
 msgid "Continue"
-msgstr "Hald fram"
+msgstr "Fortset"

 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
-msgstr "Status på barn er endra"
+msgstr "Status på born er endra"

 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
@@ -170,7 +168,7 @@ msgstr "Filstorleikgrense passert"

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

 #: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
@@ -178,7 +176,7 @@ msgstr "Profilerer alarmklokke"

 #: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
 msgid "Window size change"
-msgstr "Endring i vindaugestorleik"
+msgstr "Endring i vindaugsstorleik"

 #: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
 msgid "Information request"
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,24 +1,17 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# gnomepl@aviary.pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Copyright (C) 2001-2005 Free Software Foundation, Inc.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-25 12:52+0100\n"
-"PO-Revision-Date: 2010-02-25 12:47+0100\n"
-"Last-Translator: Tomasz Dominikowski <dominikowski@gmail.com>\n"
-"Language-Team: Polish <gnomepl@aviary.pl>\n"
+"POT-Creation-Date: 2007-09-17 21:16+0200\n"
+"PO-Revision-Date: 2002-07-05 19:13+0200\n"
+"Last-Translator: GNOME PL Team <translators@gnomepl.org>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"

 #: ../lib/read.c:51
 #, c-format
@@ -48,27 +41,26 @@ msgstr[0] "zapisano jeden bajt"
 msgstr[1] "zapisano %d bajty"
 msgstr[2] "zapisano %d bajtów"

-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
-msgstr "Włącza debugowanie"
+msgstr "Uaktywnia śledzenie"

-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
-msgstr "Wyświetla więcej informacji"
+msgstr "Uaktywnia informowanie o przebiegu"

-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
 msgid "Don't fork into background"
 msgstr "Uruchamia program bez przechodzenia w tło"

-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:464
 msgid "Invoked from inetd"
 msgstr "Wywołanie przez inetd"

-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Proszę wykonać \"%s --help\", aby wyświetlić pełną listę dostępnych opcji.\n"
+msgstr "Uruchom \"%s --help\" aby wyświetlić pełną listę dostępnych opcji.\n"

 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
@@ -76,7 +68,7 @@ msgstr "Zawieszenie"

 #: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
-msgstr "Przerwanie"
+msgstr "Przerwanie (Interrupt)"

 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
 msgid "Quit"
@@ -92,7 +84,7 @@ msgstr "Trace trap"

 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
-msgstr "Przerwanie"
+msgstr "Przerwanie (Abort)"

 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
@@ -104,23 +96,23 @@ msgstr "Wyjątek związany z liczbą zmiennoprzecinkową"

 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
 msgid "Kill"
-msgstr "Wymuszenie zakończenia"
+msgstr "Usunięcie (Kill)"

 #: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
 msgid "Bus error"
-msgstr "Błąd magistrali"
+msgstr "Błąd szyny"

 #: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
-msgstr "Naruszenie ochrony pamięci"
+msgstr "Naruszenie segmentacji"

 #: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
-msgstr "Błędny parametr dla wywołania systemowego"
+msgstr "Niepoprawny parametr wywołania systemowego"

 #: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
-msgstr "Uszkodzony potok"
+msgstr "Przerwany potok"

 #: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
@@ -136,7 +128,7 @@ msgstr "Pilny warunek związany z gniazdem"

 #: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
 msgid "Stop"
-msgstr "Zatrzymanie"
+msgstr "Zatrzymanie (Stop)"

 #: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
@@ -148,27 +140,27 @@ msgstr "Kontynuacja"

 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
-msgstr "Zmiana stanu procesu potomnego"
+msgstr "Zmiana statusu proc. potomnego"

 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
-msgstr "Odczyt w tle z urządzenia TTY"
+msgstr "Odczyt w tle z urządzenia tty"

 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
-msgstr "Zapis w tle do urządzenia TTY"
+msgstr "Zapis w tle do urządzenia tty"

 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
-msgstr "Wejście/wyjście jest teraz dostępne"
+msgstr "Wejście/wyjście teraz dostępne"

 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
-msgstr "Przekroczenie ograniczenia procesora"
+msgstr "Przekroczenie limitu CPU"

 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
-msgstr "Przekroczono ograniczenie rozmiaru plików"
+msgstr "Przekroczenie limitu rozm. plików"

 #: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
@@ -188,8 +180,20 @@ msgstr "Żądanie informacji"

 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
-msgstr "1. sygnał określony przez użytkownika"
+msgstr "1. sygnał zdefiniowany przez użytkownika"

 #: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
-msgstr "2. sygnał określony przez użytkownika"
+msgstr "2. sygnał zdefiniowany przez użytkownika"
+
+#~ msgid "DEBUG"
+#~ msgstr "ŚLEDZENIE"
+
+#~ msgid "VERBOSE"
+#~ msgstr "PRZEBIEG"
+
+#~ msgid "NO-DAEMON"
+#~ msgstr "NIE-DEMON"
+
+#~ msgid "INETD"
+#~ msgstr "INETD"
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2007-07-21 14:34-0300\n"
 "PO-Revision-Date: 2008-07-24 13:23-0300\n"
 "Last-Translator: Vladimir Melo <vladimirmelo.psi@gmail.com>\n"
-"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,13 +1,13 @@
 # Romanian translation for libgtop
-# Copyright (C) 2003 - 2009, Free Software Foundation, Inc.
-# Mișu Moldovan <dumol@gnome.ro>, 2003 - 2009.
+# Copyright (C) 2003 - 2008, Free Software Foundation, Inc.
+# Mișu Moldovan <dumol@gnome.ro>, 2003 - 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-13 08:49+0100\n"
-"PO-Revision-Date: 2009-09-20 00:44+0300\n"
+"PO-Revision-Date: 2008-09-18 22:36+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgstr[2] "s-au citit %d de octeți"

 #: ../lib/read_data.c:51
 msgid "read data size"
-msgstr "mărime date citite"
+msgstr "mărime date citire"

 #: ../lib/read_data.c:70
 #, c-format
@@ -46,7 +46,7 @@ msgstr[2] "s-au scris %d de octeți"

 #: ../src/daemon/gnuserv.c:458
 msgid "Enable debugging"
-msgstr "Activează depanarea"
+msgstr "Activare depanare"

 #: ../src/daemon/gnuserv.c:460
 msgid "Enable verbose output"
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,231 +1,234 @@
-# Slovenian translation of libgtop.
-# Copyright (C) 2005-2006 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libgtop package.
-#
-# Andraž Tori <andraz.tori1@guest.arnes.si>, 2000.
-# Matic Žgur <mr.zgur@gmail.com>, 2006.
-# Matej Urbančič <mateju@svn.gnome.org>, 2007 - 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-14 03:41+0100\n"
-"PO-Revision-Date: 2010-05-11 15:26+0100\n"
-"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "prebranih %d bajtov"
-msgstr[1] "prebran %d bajt"
-msgstr[2] "prebrana %d bajta"
-msgstr[3] "prebrani %d bajti"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "prebrana velikost podatkov"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "prebranih %lu bajtov podatkov"
-msgstr[1] "prebran %lu bajt podatkov"
-msgstr[2] "prebrana %lu bajta podatkov"
-msgstr[3] "prebrani %lu bajti podatkov"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "zapisanih %d bajtov"
-msgstr[1] "zapisan %d bajt"
-msgstr[2] "zapisana %d bajta"
-msgstr[3] "zapisani %d bajti"
-
-#: ../src/daemon/gnuserv.c:458
-msgid "Enable debugging"
-msgstr "Omogoči razhroščevanje"
-
-#: ../src/daemon/gnuserv.c:460
-msgid "Enable verbose output"
-msgstr "Omogoči podroben izpis"
-
-#: ../src/daemon/gnuserv.c:462
-msgid "Don't fork into background"
-msgstr "Ne razveji v ozadje"
-
-#: ../src/daemon/gnuserv.c:464
-msgid "Invoked from inetd"
-msgstr "Poklican s programom inetd"
-
-#: ../src/daemon/gnuserv.c:498
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'.\n"
-
-#: ../sysdeps/osf1/siglist.c:27
-#: ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "Odloži"
-
-#: ../sysdeps/osf1/siglist.c:28
-#: ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "Prekinitev"
-
-#: ../sysdeps/osf1/siglist.c:29
-#: ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "Končaj"
-
-#: ../sysdeps/osf1/siglist.c:30
-#: ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "Neveljaven ukaz"
-
-#: ../sysdeps/osf1/siglist.c:31
-#: ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "Past sledenja"
-
-#: ../sysdeps/osf1/siglist.c:32
-#: ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "Prekliči"
-
-#: ../sysdeps/osf1/siglist.c:33
-#: ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "Napaka EMT"
-
-#: ../sysdeps/osf1/siglist.c:34
-#: ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "Izjema plavajoče vejice"
-
-#: ../sysdeps/osf1/siglist.c:35
-#: ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "Uniči"
-
-#: ../sysdeps/osf1/siglist.c:36
-#: ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "Napaka vodila"
-
-#: ../sysdeps/osf1/siglist.c:37
-#: ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "Napaka razčlenjevanja"
-
-#: ../sysdeps/osf1/siglist.c:38
-#: ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "Slab argument za sistemski klic"
-
-#: ../sysdeps/osf1/siglist.c:39
-#: ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "Pretrgana cev"
-
-#: ../sysdeps/osf1/siglist.c:40
-#: ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "Budilka"
-
-#: ../sysdeps/osf1/siglist.c:41
-#: ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "Zaključek"
-
-#: ../sysdeps/osf1/siglist.c:42
-#: ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "Nujno stanje na vtiču"
-
-#: ../sysdeps/osf1/siglist.c:43
-#: ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "Zaustavi"
-
-#: ../sysdeps/osf1/siglist.c:44
-#: ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "Zaustavitev tipkovnice"
-
-#: ../sysdeps/osf1/siglist.c:45
-#: ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "Nadaljuj"
-
-#: ../sysdeps/osf1/siglist.c:46
-#: ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "Stanje podrejenega procesa se je spremenilo"
-
-#: ../sysdeps/osf1/siglist.c:47
-#: ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "Branje s tty v ozadju"
-
-#: ../sysdeps/osf1/siglist.c:48
-#: ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "Pisanje na tty v ozadju"
-
-#: ../sysdeps/osf1/siglist.c:49
-#: ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "V/I je sedaj mogoč"
-
-#: ../sysdeps/osf1/siglist.c:50
-#: ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "Prekoračena omejitev CPE"
-
-#: ../sysdeps/osf1/siglist.c:51
-#: ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "Prekoračena omejitev dolžine datoteke"
-
-#: ../sysdeps/osf1/siglist.c:52
-#: ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "Navidezna budilka"
-
-#: ../sysdeps/osf1/siglist.c:53
-#: ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "Budilka profiliranja"
-
-#: ../sysdeps/osf1/siglist.c:54
-#: ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "Sprememba velikosti okna"
-
-#: ../sysdeps/osf1/siglist.c:55
-#: ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "Zahteva po podatkih"
-
-#: ../sysdeps/osf1/siglist.c:56
-#: ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "Uporabniško določen signal 1"
-
-#: ../sysdeps/osf1/siglist.c:57
-#: ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "Uporabniško določen signal 2"
-
+# Andraz Tori <andraz.tori1@guest.arnes.si>, 2000.
+# Matic Žgur <mr.zgur@gmail.com>, 2006.
+# Matej Urbančič <matej.urban@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libgtop\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-05-14 03:41+0100\n"
+"PO-Revision-Date: 2007-10-18 16:10+0100\n"
+"Last-Translator: Matej Urbančič <matej.urban@gmail.com>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Language: Slovenian\n"
+
+#: ../lib/read.c:51
+#, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "prebranih %d bajtov"
+msgstr[1] "prebran %d bajt"
+msgstr[2] "prebrana %d bajta"
+msgstr[3] "prebrani %d bajti"
+
+#: ../lib/read_data.c:51
+msgid "read data size"
+msgstr "prebrana velikost podatkov"
+
+#: ../lib/read_data.c:70
+#, c-format
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "prebranih %lu bajtov podatkov"
+msgstr[1] "prebran %lu bajt podatkov"
+msgstr[2] "prebrana %lu bajta podatkov"
+msgstr[3] "prebrani %lu bajti podatkov"
+
+#: ../lib/write.c:51
+#, c-format
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "zapisanih %d bajtov"
+msgstr[1] "zapisan %d bajt"
+msgstr[2] "zapisana %d bajta"
+msgstr[3] "zapisani %d bajti"
+
+#: ../src/daemon/gnuserv.c:458
+msgid "Enable debugging"
+msgstr "Vključi razhroščevanje"
+
+#: ../src/daemon/gnuserv.c:460
+msgid "Enable verbose output"
+msgstr "Vključi podroben izpis"
+
+#: ../src/daemon/gnuserv.c:462
+msgid "Don't fork into background"
+msgstr "Ne razveji se v ozadje"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "Invoked from inetd"
+msgstr "Poklican iz programa inetd"
+
+#: ../src/daemon/gnuserv.c:498
+#, c-format
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr "Z zastavico '%s --help' se izpiše popoln seznam možnosti ukaza.\n"
+
+#: ../sysdeps/osf1/siglist.c:27
+#: ../sysdeps/sun4/siglist.c:27
+msgid "Hangup"
+msgstr "Odloži"
+
+#: ../sysdeps/osf1/siglist.c:28
+#: ../sysdeps/sun4/siglist.c:28
+msgid "Interrupt"
+msgstr "Prekinitev"
+
+#: ../sysdeps/osf1/siglist.c:29
+#: ../sysdeps/sun4/siglist.c:29
+msgid "Quit"
+msgstr "Izhod"
+
+#: ../sysdeps/osf1/siglist.c:30
+#: ../sysdeps/sun4/siglist.c:30
+msgid "Illegal instruction"
+msgstr "Neveljaven ukaz"
+
+#: ../sysdeps/osf1/siglist.c:31
+#: ../sysdeps/sun4/siglist.c:31
+msgid "Trace trap"
+msgstr "Past sledenja"
+
+#: ../sysdeps/osf1/siglist.c:32
+#: ../sysdeps/sun4/siglist.c:32
+msgid "Abort"
+msgstr "Prekini"
+
+#: ../sysdeps/osf1/siglist.c:33
+#: ../sysdeps/sun4/siglist.c:33
+msgid "EMT error"
+msgstr "Napaka EMT"
+
+#: ../sysdeps/osf1/siglist.c:34
+#: ../sysdeps/sun4/siglist.c:34
+msgid "Floating-point exception"
+msgstr "Izjema plavajoče vejice"
+
+#: ../sysdeps/osf1/siglist.c:35
+#: ../sysdeps/sun4/siglist.c:35
+msgid "Kill"
+msgstr "Ubij"
+
+#: ../sysdeps/osf1/siglist.c:36
+#: ../sysdeps/sun4/siglist.c:36
+msgid "Bus error"
+msgstr "Napaka vodila"
+
+#: ../sysdeps/osf1/siglist.c:37
+#: ../sysdeps/sun4/siglist.c:37
+msgid "Segmentation violation"
+msgstr "Segmentacijska napaka"
+
+#: ../sysdeps/osf1/siglist.c:38
+#: ../sysdeps/sun4/siglist.c:38
+msgid "Bad argument to system call"
+msgstr "Nepravilen argument za sistemski klic"
+
+#: ../sysdeps/osf1/siglist.c:39
+#: ../sysdeps/sun4/siglist.c:39
+msgid "Broken pipe"
+msgstr "Pretrgana cev"
+
+#: ../sysdeps/osf1/siglist.c:40
+#: ../sysdeps/sun4/siglist.c:40
+msgid "Alarm clock"
+msgstr "Budilka"
+
+#: ../sysdeps/osf1/siglist.c:41
+#: ../sysdeps/sun4/siglist.c:41
+msgid "Termination"
+msgstr "Zaključek"
+
+#: ../sysdeps/osf1/siglist.c:42
+#: ../sysdeps/sun4/siglist.c:42
+msgid "Urgent condition on socket"
+msgstr "Nujno stanje na vtiču"
+
+#: ../sysdeps/osf1/siglist.c:43
+#: ../sysdeps/sun4/siglist.c:43
+msgid "Stop"
+msgstr "Ustavi"
+
+#: ../sysdeps/osf1/siglist.c:44
+#: ../sysdeps/sun4/siglist.c:44
+msgid "Keyboard stop"
+msgstr "Zaustavitev tipkovnice"
+
+#: ../sysdeps/osf1/siglist.c:45
+#: ../sysdeps/sun4/siglist.c:45
+msgid "Continue"
+msgstr "Nadaljuj"
+
+#: ../sysdeps/osf1/siglist.c:46
+#: ../sysdeps/sun4/siglist.c:46
+msgid "Child status has changed"
+msgstr "Stanje podrejenega procesa se je spremenilo"
+
+#: ../sysdeps/osf1/siglist.c:47
+#: ../sysdeps/sun4/siglist.c:47
+msgid "Background read from tty"
+msgstr "Branje s tty v ozadju"
+
+#: ../sysdeps/osf1/siglist.c:48
+#: ../sysdeps/sun4/siglist.c:48
+msgid "Background write to tty"
+msgstr "Pisanje na tty v ozadju"
+
+#: ../sysdeps/osf1/siglist.c:49
+#: ../sysdeps/sun4/siglist.c:49
+msgid "I/O now possible"
+msgstr "V/I sedaj mogoč"
+
+#: ../sysdeps/osf1/siglist.c:50
+#: ../sysdeps/sun4/siglist.c:50
+msgid "CPU limit exceeded"
+msgstr "Prekoračena omejitev procesorja"
+
+#: ../sysdeps/osf1/siglist.c:51
+#: ../sysdeps/sun4/siglist.c:51
+msgid "File size limit exceeded"
+msgstr "Prekoračena omejitev dolžine datoteke"
+
+#: ../sysdeps/osf1/siglist.c:52
+#: ../sysdeps/sun4/siglist.c:52
+msgid "Virtual alarm clock"
+msgstr "Navidezna budilka"
+
+#: ../sysdeps/osf1/siglist.c:53
+#: ../sysdeps/sun4/siglist.c:53
+msgid "Profiling alarm clock"
+msgstr "Budilka profiliranja"
+
+#: ../sysdeps/osf1/siglist.c:54
+#: ../sysdeps/sun4/siglist.c:54
+msgid "Window size change"
+msgstr "Sprememba velikosti okna"
+
+#: ../sysdeps/osf1/siglist.c:55
+#: ../sysdeps/sun4/siglist.c:55
+msgid "Information request"
+msgstr "Zahteva po podatkih"
+
+#: ../sysdeps/osf1/siglist.c:56
+#: ../sysdeps/sun4/siglist.c:56
+msgid "User defined signal 1"
+msgstr "Uporabniško določen signal 1"
+
+#: ../sysdeps/osf1/siglist.c:57
+#: ../sysdeps/sun4/siglist.c:57
+msgid "User defined signal 2"
+msgstr "Uporabniško določen signal 2"
+
+#~ msgid "DEBUG"
+#~ msgstr "RAZHROŠČUJ"
+#~ msgid "VERBOSE"
+#~ msgstr "ZGOVOREN"
+#~ msgid "NO-DAEMON"
+#~ msgstr "NI-DEAMON"
+#~ msgid "INETD"
+#~ msgstr "INETD"
+
--- a/po/te.po
+++ b/po/te.po
@@ -1,4 +1,4 @@
-# translation of libgtop.master.te.po to Telugu
+# translation of libgtop.gnome-2-26.te.po to Telugu
 # Telugu translation of libgtop
 # This file is distributed under the same license as the libgtop package.
 # Copyright (C) Sree Ganesh <mrthottempudi@yahoo.com>, 2006.
@@ -6,10 +6,10 @@
 # Krishna Babu K <kkrothap@redhat.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.master.te\n"
+"Project-Id-Version: libgtop.gnome-2-26.te\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2009-09-12 15:13+0000\n"
-"PO-Revision-Date: 2009-09-17 19:09+0530\n"
+"POT-Creation-Date: 2009-04-18 19:52+0000\n"
+"PO-Revision-Date: 2009-05-15 17:15+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgstr "ఇన్ఎటిదడ్ నుండీ లే"
 #| "Error on option %s: %s.\n"
 #| "Run '%s --help' to see a full list of available command line options.\n"
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "అందుబాటులోవున్న ఆదేశ వరుస ఐచ్చికముల పూర్తి జాబితాను చూడుటకు '%s --help' నడుపుము.\n"
+msgstr "అందుబాటులో వున్న ఆదేశ వరుస ఐచ్చికాల పూర్తి జాబితా కొరకు '%s --help' నడుపండి.\n"

 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"
@@ -85,11 +85,11 @@ msgstr "చట్టవ్యతిరేక నిర్దేశాలు"

 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
-msgstr "ట్రేస్ ట్రాప్"
+msgstr "ట్రాప్ జాడపట్టుము"

 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
 msgid "Abort"
-msgstr "విరమింపచేయి"
+msgstr "నిలిపివేయి"

 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
 msgid "EMT error"
--- a/po/ug.po
+++ b/po/ug.po
@@ -1,185 +0,0 @@
-# Uyghur translation for libgtop.
-# Copyright (C) 2010 libgtop's COPYRIGHT HOLDER
-# This file is distributed under the same license as the libgtop package.
-# Gheyret Kenji <gheyret@yahoo.com>, 2010.
-# Sahran <sahran@live.com>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libgtop master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2010-12-23 18:26+0000\n"
-"PO-Revision-Date: 2010-10-08 10:12+0600\n"
-"Last-Translator: Sahran <sahran@live.com>\n"
-"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ../lib/read.c:51
-#, c-format
-msgid "read %d byte"
-msgid_plural "read %d bytes"
-msgstr[0] "%d بايت  ئوقۇ"
-
-#: ../lib/read_data.c:51
-msgid "read data size"
-msgstr "ئوقۇلىدىغان سانلىق-مەلۇماتنىڭ چوڭلۇقى"
-
-#: ../lib/read_data.c:70
-#, c-format
-msgid "read %lu byte of data"
-msgid_plural "read %lu bytes of data"
-msgstr[0] "%lu بايت سانلىق-مەلۇمات ئوقۇدى"
-
-#: ../lib/write.c:51
-#, c-format
-msgid "wrote %d byte"
-msgid_plural "wrote %d bytes"
-msgstr[0] "%d بايت سانلىق-مەلۇمات يازدى"
-
-#: ../src/daemon/gnuserv.c:455
-msgid "Enable debugging"
-msgstr "سازلاشنى قوزغات"
-
-#: ../src/daemon/gnuserv.c:457
-msgid "Enable verbose output"
-msgstr "تەپسىلىي چىقىرىشنى قوزغات"
-
-#: ../src/daemon/gnuserv.c:459
-msgid "Don't fork into background"
-msgstr "ئارقا سۇپىدا تارماق جەريان ھاسىل قىلما"
-
-#: ../src/daemon/gnuserv.c:461
-msgid "Invoked from inetd"
-msgstr "«inetd» ئارقىلىق قوزغىتىلغان"
-
-#: ../src/daemon/gnuserv.c:495
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "'%s --help' ئىجرا قىلىنسا بۇيرۇق قۇرى تاللانمىسىنىڭ تولۇق تىزىملىكى كۆرۈنىدۇ.\n"
-
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
-msgid "Hangup"
-msgstr "ئېسىپ قوي"
-
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
-msgid "Interrupt"
-msgstr "ئۆزەك"
-
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
-msgstr "چېكىن"
-
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
-msgstr "خاتا بۇيرۇق"
-
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
-msgstr "ئىزلاش توزىقى"
-
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
-msgstr "توختات"
-
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
-msgstr "EMT خاتالىقى"
-
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
-msgstr "كەسىر سان خاتالىق"
-
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
-msgstr "ئاخىرلاشتۇر"
-
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
-msgstr "باش لىنىيە خاتالىقى"
-
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
-msgstr "جەريان بۆلىكى توقۇنۇشى"
-
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
-msgstr "سىستېما چاقىرغان پارامېتىر خاتا"
-
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
-msgstr "بۇزۇلغان نەيچە"
-
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
-msgstr "قوڭغۇراقلىق سائەت"
-
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
-msgstr "توختات"
-
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
-msgstr "socket دىكى جىددىي ئەھۋال"
-
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
-msgstr "توختا"
-
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
-msgstr "ھەرپتاختا توختات"
-
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
-msgstr "داۋاملاشتۇر"
-
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
-msgstr "بالا پروگراممىنىڭ ھالىتى ئۆزگەردى"
-
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
-msgstr "TTY دىن ئارقىدىن ئوقۇ"
-
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
-msgstr "TTY غا ئارقىدىن ياز"
-
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
-msgstr "I/O نى ئىشلەتكىلى بولىدۇ"
-
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
-msgstr "CPU نىڭ چەكلىمىسىدىن ئېشىپ كەتتى"
-
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
-msgstr "ھۆججەتنىڭ ئۇزۇنلۇقى چەكتىن ئېشىپ كەتتى"
-
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
-msgstr "مەۋھۇم قوڭغۇراقلىق سائەت"
-
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
-msgstr "قوڭغۇراقلىق سائەتنىڭ سەپلىمىسى"
-
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
-msgstr "كۆزنەك چوڭلۇقىنىڭ ئۆزگىرىشى"
-
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
-msgstr "ئۇچۇر ئىلتىماسى"
-
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
-msgstr "ئىشلەتكۈچى بېكىتكەن سىگنال 1"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "ئىشلەتكۈچى بېكىتكەن سىگنال 2"
--- a/sysdeps/Makefile.am
+++ b/sysdeps/Makefile.am
@@ -2,5 +2,4 @@
 SUBDIRS			= common @sysdeps_dir@

 DIST_SUBDIRS		= bsd common linux osf1 \
-			  stub stub_suid sun4 freebsd solaris aix darwin \
-			  cygwin openbsd
+			  stub stub_suid sun4 freebsd solaris aix darwin
--- a/sysdeps/common/fsusage.c
+++ b/sysdeps/common/fsusage.c
@@ -149,15 +149,6 @@ _glibtop_freebsd_get_fsusage_read_write(glibtop *server,
 #define _glibtop_get_fsusage_read_write(S, B, P) \
 	_glibtop_freebsd_get_fsusage_read_write(S, B, P)

-#elif defined(__OpenBSD__)
-void
-_glibtop_openbsd_get_fsusage_read_write(glibtop *server,
-					glibtop_fsusage *buf,
-					const char *path);
-
-#define _glibtop_get_fsusage_read_write(S, B, P) \
-	_glibtop_openbsd_get_fsusage_read_write(S, B, P)
-
 #else /* default fallback */
 #warning glibtop_get_fsusage .read .write are not implemented.
 static inline void
@@ -279,7 +270,7 @@ glibtop_get_fsusage_s (glibtop *server, glibtop_fsusage *buf,
    return;

 #if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
-	|| defined(__FreeBSD__) || defined(__OpenBSD__)
+	|| defined(__FreeBSD__)
  /* Solaris but not SunOS and FreeBSD */
  buf->block_size = fsd.f_frsize;
 #else
--- a/sysdeps/cygwin/Makefile.am
+++ b/sysdeps/cygwin/Makefile.am
@@ -1,18 +0,0 @@
-INCLUDES			= @INCLUDES@
-
-noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la
-
-libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
-				  uptime.c loadavg.c mountlist.c shm_limits.c msg_limits.c \
-				  sem_limits.c proclist.c procstate.c procuid.c \
-				  proctime.c procmem.c procsignal.c prockernel.c \
-				  procsegment.c procargs.c procmap.c siglist.c \
-				  sysinfo.c netload.c ppp.c glibtop_private.c \
-				  netlist.c procaffinity.c procopenfiles.c procwd.c
-
-libgtop_sysdeps_2_0_la_LIBADD	=  @GLIB_LIBS@
-
-libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h
-libgtopincludedir		= $(includedir)/libgtop-2.0
-
-noinst_HEADERS			= glibtop_private.h
--- a/sysdeps/cygwin/close.c
+++ b/sysdeps/cygwin/close.c
@@ -1,29 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/close.h>
-
-/* Closes pipe to gtop server. */
-
-void
-glibtop_close_s (glibtop *server)
-{ }
--- a/sysdeps/cygwin/cpu.c
+++ b/sysdeps/cygwin/cpu.c
@@ -1,103 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/cpu.h>
-
-#include "glibtop_private.h"
-
-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);
-
-static const unsigned long _glibtop_sysdeps_cpu_smp =
-(1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) +
-(1L << GLIBTOP_XCPU_NICE) + (1L << GLIBTOP_XCPU_SYS) +
-(1L << GLIBTOP_XCPU_IDLE);
-
-/* Init function. */
-
-void
-_glibtop_init_cpu_s (glibtop *server)
-{
-	server->sysdeps.cpu = _glibtop_sysdeps_cpu;
-
-	if (server->ncpu)
-		server->sysdeps.cpu |= _glibtop_sysdeps_cpu_smp;
-}
-
-/* Provides information about cpu usage. */
-
-#define FILENAME	"/proc/stat"
-
-void
-glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
-{
-	char buffer [BUFSIZ], *p;
-	int i;
-
-	memset (buf, 0, sizeof (glibtop_cpu));
-
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
-
-	/*
-	 * GLOBAL
-	 */
-
-	p = skip_token (buffer);	/* "cpu" */
-
-	buf->user = strtoull (p, &p, 0);
-	buf->nice = strtoull (p, &p, 0);
-	buf->sys  = strtoull (p, &p, 0);
-	buf->idle = strtoull (p, &p, 0);
-	buf->total = buf->user + buf->nice + buf->sys + buf->idle;
-
-	buf->frequency = 100;
-	buf->flags = _glibtop_sysdeps_cpu;
-
-	/*
-	 * PER CPU
-	 */
-
-	for (i = 0; i <= server->ncpu; i++) {
-
-		p = skip_line(p); /* move to ^ */
-
-		if (!check_cpu_line_warn(server, p, i))
-			break;
-
-		p = skip_token(p); /* "cpuN" */
-
-		buf->xcpu_user [i] = strtoull (p, &p, 0);
-		buf->xcpu_nice [i] = strtoull (p, &p, 0);
-		buf->xcpu_sys  [i] = strtoull (p, &p, 0);
-		buf->xcpu_idle [i] = strtoull (p, &p, 0);
-		buf->xcpu_total[i] = buf->xcpu_user [i] \
-			+ buf->xcpu_nice [i] \
-			+ buf->xcpu_sys  [i] \
-			+ buf->xcpu_idle [i];
-	}
-
-	if(server->ncpu) /* ok, that's a real SMP */
-		buf->flags |= _glibtop_sysdeps_cpu_smp;
-}
--- a/sysdeps/cygwin/glibtop_machine.h
+++ b/sysdeps/cygwin/glibtop_machine.h
@@ -1,44 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MACHINE_H__
-#define __GLIBTOP_MACHINE_H__
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_machine		glibtop_machine;
-
-struct _glibtop_machine
-{
-	pid_t	last_pid;
-	int	no_update;
-	int	fd_stat, fd_meminfo, fd_loadavg;
-	char	proc_stat [BUFSIZ], proc_statm [BUFSIZ];
-	char	proc_status [BUFSIZ];
-};
-
-G_END_DECLS
-
-#endif
--- a/sysdeps/cygwin/glibtop_private.c
+++ b/sysdeps/cygwin/glibtop_private.c
@@ -1,221 +0,0 @@
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-
-#include "glibtop_private.h"
-
-#include <glib.h>
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-
-
-unsigned long long
-get_scaled(const char *buffer, const char *key)
-{
-	const char    *ptr = buffer;
-	char	      *next;
-	unsigned long long value;
-
-	if (key) {
-		if (G_LIKELY((ptr = strstr(buffer, key))))
-			ptr += strlen(key);
-		else {
-			g_warning("Could not read key '%s' in buffer '%s'",
-				  key, buffer);
-			return 0;
-		}
-	}
-
-	value = strtoull(ptr, &next, 0);
-
-	for ( ; *next; ++next) {
-		if (*next == 'k') {
-			value *= 1024;
-			break;
-		} else if (*next == 'M') {
-			value *= 1024 * 1024;
-			break;
-		}
-	}
-
-	return value;
-}
-
-
-char *
-skip_token (const char *p)
-{
-	p = next_token(p);
-	while (*p && !isspace(*p)) p++;
-	p = next_token(p);
-	return (char *)p;
-}
-
-
-/*
- * Read functions
- */
-enum TRY_FILE_TO_BUFFER
-{
-	TRY_FILE_TO_BUFFER_OK = 0,
-	TRY_FILE_TO_BUFFER_OPEN = -1,
-	TRY_FILE_TO_BUFFER_READ = -2
-};
-
-/*
- * Doesn't handle bufsiz == 0
- */
-int try_file_to_buffer(char *buffer, size_t bufsiz, const char *format, ...)
-{
-	char path[4096];
-	int fd;
-	size_t len = 0;
-	ssize_t nread = 0;
-	va_list pa;
-
-	if (G_UNLIKELY(bufsiz <= sizeof(char*)))
-	  g_warning("Huhu, bufsiz of %lu looks bad", (gulong)bufsiz);
-
-	va_start(pa, format);
-
-	/* C99 also provides vsnprintf */
-	g_vsnprintf(path, sizeof path, format, pa);
-
-	va_end(pa);
-
-	bufsiz--; /* reserve 1 for trailing NUL */
-	buffer [0] = '\0';
-
-	if((fd = open (path, O_RDONLY)) < 0)
-		return TRY_FILE_TO_BUFFER_OPEN;
-
-	while (len < bufsiz) {
-		nread = read (fd, buffer + len, bufsiz - len);
-
-		if (G_UNLIKELY(nread < 0)) {
-			if (errno == EINTR)
-				continue;
-			else
-				break;
-		}
-
-		len += nread;
-
-		if (nread == 0)
-			break;
-	}
-
-	close (fd);
-
-	if (nread < 0)
-		return TRY_FILE_TO_BUFFER_READ;
-
-	buffer [len] = '\0';
-
-	return TRY_FILE_TO_BUFFER_OK;
-}
-
-
-void
-file_to_buffer(glibtop *server, char *buffer, size_t bufsiz, const char *filename)
-{
-	switch(try_file_to_buffer(buffer, bufsiz, "%s", filename))
-	{
-	case TRY_FILE_TO_BUFFER_OPEN:
-		glibtop_error_io_r (server, "open (%s)", filename);
-	case TRY_FILE_TO_BUFFER_READ:
-		glibtop_error_io_r (server, "read (%s)", filename);
-	}
-}
-
-
-
-
-static unsigned long
-read_boot_time(glibtop *server)
-{
-	char* line = NULL;
-	size_t size = 0;
-	FILE* stat;
-	unsigned long btime = 0;
-
-	if (!(stat = fopen("/proc/stat", "r"))) {
-		glibtop_error_io_r(server, "fopen(\"/proc/stat\")");
-		goto out;
-	}
-
-	while (getline(&line, &size, stat) != -1) {
-		if (!strncmp(line, "btime", 5)) {
-			btime = strtoul(skip_token(line), NULL, 10);
-			break;
-		}
-	}
-
-	free(line);
-	fclose(stat);
-out:
-	return btime;
-}
-
-
-
-unsigned long
-get_boot_time(glibtop *server)
-{
-	static unsigned long boot_time = 0UL;
-
-	if(G_UNLIKELY(!boot_time))
-	{
-		boot_time = read_boot_time(server);
-	}
-
-	return boot_time;
-}
-
-
-size_t
-get_page_size(void)
-{
-	static size_t pagesize = 0;
-
-	if(G_UNLIKELY(!pagesize))
-	{
-		pagesize = getpagesize();
-	}
-
-	return pagesize;
-}
-
-
-
-gboolean
-check_cpu_line(glibtop *server, const char *line, unsigned i)
-{
-	char start[10];
-
-	g_snprintf(start, sizeof start, "cpu%u", i);
-
-	return g_str_has_prefix(line, start);
-}
-
-
-
-gboolean safe_readlink(const char *path, char *buf, size_t bufsiz)
-{
-	ssize_t ret;
-
-	ret = readlink(path, buf, bufsiz - 1);
-
-	if (ret == -1) {
-		g_warning("Could not read link %s : %s", path, strerror(errno));
-		return FALSE;
-	}
-
-	buf[ret] = '\0';
-	return TRUE;
-}
--- a/sysdeps/cygwin/glibtop_private.h
+++ b/sysdeps/cygwin/glibtop_private.h
@@ -1,152 +0,0 @@
-/* Copyright (C) 2004 Benoît Dejean
-   This file is part of LibGTop 2.0.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CYGWIN__GLIBTOP_PRIVATE_H__
-#define __CYGWIN__GLIBTOP_PRIVATE_H__
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-
-#include <glib.h>
-
-#include <fcntl.h>
-#include <ctype.h>
-#include <string.h>
-
-G_BEGIN_DECLS
-
-
-static inline char*
-next_token(const char *p)
-{
-	while (isspace(*p)) p++;
-	return (char*) p;
-}
-
-char *
-skip_token (const char *p);
-
-static inline char *
-skip_multiple_token (const char *p, size_t count)
-{
-	while(count--)
-		p = skip_token (p);
-
-	return (char *)p;
-}
-
-
-static inline char *
-skip_line (const char *p)
-{
-	while (*p && *p != '\n') p++;
-	return (char *) (*p ? p+1 : p);
-}
-
-/*
- * Smart strtoul which handles binary suffixes
- * e.g: get_scaled("Size: 32 kB", "Size:") == 32768
- * key can be NULL if there's not prefix to strip (or prefix size is known
- */
-unsigned long long
-get_scaled(const char *buffer, const char *key);
-
-
-/* aborts on error */
-void
-file_to_buffer(glibtop *server, char *buffer, size_t bufsiz, const char *filename);
-
-/* return < 0 on error, otherwise 0 on success */
-int
-try_file_to_buffer(char *buffer, size_t bufsiz, const char *format, ...) G_GNUC_PRINTF(3, 4);
-
-
-/* some inline functions that wrap proc path
- * as fast as macros :)
- */
-
-static inline int
-proc_file_to_buffer (char *buffer, size_t bufsiz, const char *fmt, pid_t pid)
-{
-	return try_file_to_buffer(buffer, bufsiz, fmt, pid);
-}
-
-static inline int
-proc_stat_to_buffer (char *buffer, size_t bufsiz, pid_t pid)
-{
-	return proc_file_to_buffer(buffer, bufsiz, "/proc/%d/stat", pid);
-}
-
-static inline int
-proc_status_to_buffer (char *buffer, size_t bufsiz, pid_t pid)
-{
-	return proc_file_to_buffer(buffer, bufsiz, "/proc/%d/status", pid);
-}
-
-static inline int
-proc_statm_to_buffer (char *buffer, size_t bufsiz, pid_t pid)
-{
-	return proc_file_to_buffer(buffer, bufsiz, "/proc/%d/statm", pid);
-}
-
-
-static inline char *
-proc_stat_after_cmd (char *p)
-{
-	p = strrchr (p, ')');
-	if (G_LIKELY(p))
-		*p++ = '\0';
-	return p;
-}
-
-
-unsigned long
-get_boot_time(glibtop *server);
-
-
-size_t
-get_page_size(void);
-
-
-gboolean
-check_cpu_line(glibtop *server, const char *line, unsigned n);
-
-
-static inline gboolean
-check_cpu_line_warn(glibtop *server, const char *line, unsigned i)
-{
-	gboolean ret;
-
-	ret = check_cpu_line(server, line, i);
-
-	if (G_UNLIKELY(!ret))
-		glibtop_warn_io_r(server,
-				  "'%s' does not start with 'cpu%u'",
-				  line, i);
-
-	return ret;
-}
-
-
-gboolean safe_readlink(const char *path, char *buf, size_t bufsiz);
-
-
-G_END_DECLS
-
-#endif /* __CYGWIN__GLIBTOP_PRIVATE_H__ */
--- a/sysdeps/cygwin/glibtop_server.h
+++ b/sysdeps/cygwin/glibtop_server.h
@@ -1,50 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CYGWIN__GLIBTOP_SERVER_H__
-#define __CYGWIN__GLIBTOP_SERVER_H__
-
-#define GLIBTOP_SUID_CPU		0
-#define GLIBTOP_SUID_MEM		0
-#define GLIBTOP_SUID_SWAP		0
-#define GLIBTOP_SUID_UPTIME		0
-#define GLIBTOP_SUID_LOADAVG		0
-#define GLIBTOP_SUID_SHM_LIMITS		0
-#define GLIBTOP_SUID_MSG_LIMITS		0
-#define GLIBTOP_SUID_SEM_LIMITS		0
-#define GLIBTOP_SUID_PROCLIST		0
-#define GLIBTOP_SUID_PROC_STATE		0
-#define GLIBTOP_SUID_PROC_UID		0
-#define GLIBTOP_SUID_PROC_MEM		0
-#define GLIBTOP_SUID_PROC_TIME		0
-#define GLIBTOP_SUID_PROC_SIGNAL	0
-#define GLIBTOP_SUID_PROC_KERNEL	0
-#define GLIBTOP_SUID_PROC_SEGMENT	0
-#define GLIBTOP_SUID_PROC_ARGS		0
-#define GLIBTOP_SUID_PROC_MAP		0
-#define GLIBTOP_SUID_NETLOAD		0
-#define GLIBTOP_SUID_NETLIST		0
-#define GLIBTOP_SUID_PROC_AFFINITY	0
-#define GLIBTOP_SUID_PROC_WD		0
-#define GLIBTOP_SUID_PPP		0
-#define GLIBTOP_SUID_PROC_FILE		0
-
-#endif /* __CYGWIN__GLIBTOP_SERVER_H__ */
--- a/sysdeps/cygwin/loadavg.c
+++ b/sysdeps/cygwin/loadavg.c
@@ -1,81 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/loadavg.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_loadavg =
-(1L << GLIBTOP_LOADAVG_LOADAVG);
-
-static const unsigned long _glibtop_sysdeps_loadavg_tasks =
-(1L << GLIBTOP_LOADAVG_NR_RUNNING) +
-(1L << GLIBTOP_LOADAVG_NR_TASKS) +
-(1L << GLIBTOP_LOADAVG_LAST_PID);
-
-/* Init function. */
-
-void
-_glibtop_init_loadavg_s (glibtop *server)
-{
-	server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
-}
-
-/* Provides load load averange. */
-
-#define FILENAME	"/proc/loadavg"
-
-void
-glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
-{
-	char buffer [BUFSIZ], *p, *old;
-
-	memset (buf, 0, sizeof (glibtop_loadavg));
-
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
-
-	buf->loadavg [0] = g_ascii_strtod (buffer, &p);
-	buf->loadavg [1] = g_ascii_strtod (p, &p);
-	buf->loadavg [2] = g_ascii_strtod (p, &p);
-
-	buf->flags = _glibtop_sysdeps_loadavg;
-
-	p = next_token(p);
-
-	/* Older Linux versions don't have the nr_running/nr_tasks fields. */
-
-	old = p;
-	while (*p) {
-		if (*p == '/')
-			break;
-		if (!isdigit (*p))
-			return;
-		p++;
-	}
-
-	buf->nr_running  = strtoull (old, &p, 0); p++;
-	buf->nr_tasks    = strtoull (p, &p, 0);
-	buf->last_pid    = strtoull (p, &p, 0);
-
-	buf->flags |= _glibtop_sysdeps_loadavg_tasks;
-}
--- a/sysdeps/cygwin/mem.c
+++ b/sysdeps/cygwin/mem.c
@@ -1,61 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/mem.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_mem =
-(1L << GLIBTOP_MEM_TOTAL) + (1L << GLIBTOP_MEM_USED) +
-(1L << GLIBTOP_MEM_FREE) + (1L << GLIBTOP_MEM_SHARED) +
-(1L << GLIBTOP_MEM_USER);
-
-/* Init function. */
-
-void
-_glibtop_init_mem_s (glibtop *server)
-{
-	server->sysdeps.mem = _glibtop_sysdeps_mem;
-}
-
-/* Provides information about memory usage. */
-
-#define FILENAME	"/proc/meminfo"
-
-void
-glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
-{
-	char buffer [BUFSIZ];
-
-	memset(buf, 0, sizeof *buf);
-
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
-
-	buf->total  = get_scaled(buffer, "MemTotal:");
-	buf->free   = get_scaled(buffer, "MemFree:");
-	buf->used   = buf->total - buf->free;
-	buf->shared = 0;
-
-	buf->user = buf->total - buf->free;
-	buf->flags = _glibtop_sysdeps_mem;
-}
--- a/sysdeps/cygwin/mountlist.c
+++ b/sysdeps/cygwin/mountlist.c
@@ -1,164 +0,0 @@
-/* mountlist.c -- return a list of mounted filesystems
-   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-
-   This file is a fork of sysdeps/common/mountlist.c.
-
-   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.  */
-
-
-/*
-Local Variables:
-mode: C
-c-file-style: "gnu"
-End:
-*/
-
-#include <config.h>
-
-#include <stdio.h>
-#include <mntent.h>
-
-#include <glibtop.h>
-#include <glibtop/mountlist.h>
-#include <glibtop/error.h>
-
-
-/* IgnoreList */
-
-
-typedef struct
-{
-  GHashTable *table;
-} IgnoreList;
-
-
-static IgnoreList*
-ignore_list_new(void)
-{
-  IgnoreList* ig;
-  ig = g_new(IgnoreList, 1);
-  ig->table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-  return ig;
-}
-
-
-static void
-ignore_list_delete(IgnoreList* ig)
-{
-  if (ig) {
-    g_hash_table_destroy(ig->table);
-    g_free(ig);
-  }
-}
-
-
-static void
-ignore_list_add(IgnoreList* ig, const char* fs)
-{
-  g_hash_table_insert(ig->table, g_strdup(fs), GINT_TO_POINTER(1));
-}
-
-
-static gboolean
-ignore_list_has(IgnoreList* ig, const char* fs)
-{
-  gpointer data;
-  data = g_hash_table_lookup(ig->table, fs);
-  return data != NULL;
-}
-
-
-/* ~IgnoreList */
-
-
-static gboolean
-ignore_fs(const char *fstype, IgnoreList** ig)
-{
-  if (!*ig) {
-    FILE* fs;
-    char line[128];
-
-    *ig = ignore_list_new();
-
-    ignore_list_add(*ig, "none");
-
-    if ((fs = fopen("/proc/filesystems", "r")) != NULL) {
-      while (fgets(line, sizeof line, fs)) {
-	if (!strncmp(line, "nodev", 5)) {
-	  char *type;
-	  type = g_strstrip(line + 5);
-	  ignore_list_add(*ig, type);
-	}
-      }
-      fclose(fs);
-    }
-  }
-
-  return ignore_list_has(*ig, fstype);
-}
-
-
-glibtop_mountentry *
-glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
-{
-  const struct mntent *mnt;
-  FILE *fp;
-  GArray* entries;
-  IgnoreList* ig = NULL;
-
-  memset(buf, 0, sizeof(glibtop_mountlist));
-
-  /* wild guess, preallocate 8 entries
-     on a desktop, almost everyone has / and a tmpfs for udev
-     if all_fs, there are also proc, sys, fuse, binfmt, etc */
-  entries = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_mountentry), 8);
-
-  if (!(fp = setmntent(MOUNTED, "r"))) {
-      glibtop_warn_io_r(server, "Could not open %s", MOUNTED);
-      goto out;
-    }
-
-  while ((mnt = getmntent(fp)))
-    {
-      glibtop_mountentry *me;
-      gsize len;
-
-      if (!all_fs && ignore_fs(mnt->mnt_type, &ig))
-	continue;
-
-      len = entries->len;
-      g_array_set_size(entries, len + 1);
-      me = &g_array_index(entries, glibtop_mountentry, len);
-
-      g_strlcpy(me->devname, mnt->mnt_fsname, sizeof me->devname);
-      g_strlcpy(me->mountdir, mnt->mnt_dir, sizeof me->mountdir);
-      g_strlcpy(me->type, mnt->mnt_type, sizeof me->type);
-    }
-
-    endmntent(fp);
-
-
-  out:
-    ignore_list_delete(ig);
-
-    buf->size = sizeof(glibtop_mountentry);
-    buf->number = entries->len;
-    buf->total = buf->number * buf->size;
-    buf->flags = (1 << GLIBTOP_MOUNTLIST_SIZE)
-    | (1 << GLIBTOP_MOUNTLIST_NUMBER)
-    | (1 << GLIBTOP_MOUNTLIST_TOTAL);
-
-  return (glibtop_mountentry*) g_array_free(entries, FALSE);
-}
--- a/sysdeps/cygwin/msg_limits.c
+++ b/sysdeps/cygwin/msg_limits.c
@@ -1,59 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/msg_limits.h>
-
-#define _KERNEL
-#include <sys/ipc.h>
-#include <sys/msg.h>
-
-static const unsigned long _glibtop_sysdeps_msg_limits =
-(1L << GLIBTOP_IPC_MSGMAX) + (1L << GLIBTOP_IPC_MSGMNB) +
-(1L << GLIBTOP_IPC_MSGMNI) + (1L << GLIBTOP_IPC_MSGSSZ) +
-(1L << GLIBTOP_IPC_MSGTQL);
-
-/* Init function. */
-
-void
-_glibtop_init_msg_limits_s (glibtop *server)
-{
-	server->sysdeps.msg_limits = _glibtop_sysdeps_msg_limits;
-}
-
-/* Provides information about sysv ipc limits. */
-
-void
-glibtop_get_msg_limits_s (glibtop *server, glibtop_msg_limits *buf)
-{
-	struct msginfo msginfo;
-
-	memset (buf, 0, sizeof (glibtop_msg_limits));
-
-	msgctl (0, IPC_INFO, (void*) &msginfo);
-
-	buf->msgmax = msginfo.msgmax;
-	buf->msgmnb = msginfo.msgmnb;
-	buf->msgmni = msginfo.msgmni;
-	buf->msgssz = msginfo.msgssz;
-	buf->msgtql = msginfo.msgtql;
-	buf->flags = _glibtop_sysdeps_msg_limits;
-}
--- a/sysdeps/cygwin/netlist.c
+++ b/sysdeps/cygwin/netlist.c
@@ -1,39 +0,0 @@
-/* This file is part of LibGTop 2.0.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/netlist.h>
-
-static const unsigned long _glibtop_sysdeps_netlist = 0;
-
-/* Init function. */
-
-void
-_glibtop_init_netlist_s (glibtop *server)
-{
-	server->sysdeps.netlist = _glibtop_sysdeps_netlist;
-}
-
-char**
-glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf)
-{
-	memset (buf, 0, sizeof (glibtop_netlist));
-
-	return NULL;
-}
--- a/sysdeps/cygwin/netload.c
+++ b/sysdeps/cygwin/netload.c
@@ -1,44 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, October 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/netload.h>
-
-static const unsigned long _glibtop_sysdeps_netload = 0;
-
-/* Init function. */
-
-void
-_glibtop_init_netload_s (glibtop *server)
-{
-	server->sysdeps.netload = _glibtop_sysdeps_netload;
-}
-
-/* Provides network statistics. */
-
-void
-glibtop_get_netload_s (glibtop *server, glibtop_netload *buf,
-		       const char *interface)
-{
-	memset (buf, 0, sizeof (glibtop_netload));
-}
--- a/sysdeps/cygwin/open.c
+++ b/sysdeps/cygwin/open.c
@@ -1,68 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/cpu.h>
-#include <glibtop/open.h>
-#include <glibtop/error.h>
-
-#include "glibtop_private.h"
-
-/* ======================================================= */
-
-/* Opens pipe to gtop server. Returns 0 on success and -1 on error. */
-
-#define FILENAME	"/proc/stat"
-
-void
-glibtop_open_s (glibtop *server, const char *program_name,
-		const unsigned long features,
-		const unsigned flags)
-{
-	char buffer [BUFSIZ], *p = buffer;
-
-	server->name = program_name;
-
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
-
-	p = skip_line(p); /* cpu */
-
-	for (server->real_ncpu = 0; /* nop */; server->real_ncpu++) {
-
-		if (!check_cpu_line(server, p, server->real_ncpu)) {
-			server->real_ncpu--;
-			break;
-		}
-
-		p = skip_line(p);
-	}
-
-	server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
-
-	if (server->real_ncpu != server->ncpu) {
-		glibtop_warn_r(server,
-			       "This machine has %d CPUs, "
-			       "%d are being monitored.",
-			       server->real_ncpu + 1,
-			       server->ncpu + 1);
-	}
-}
--- a/sysdeps/cygwin/ppp.c
+++ b/sysdeps/cygwin/ppp.c
@@ -1,43 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, October 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/ppp.h>
-
-static const unsigned long _glibtop_sysdeps_ppp = 0;
-
-/* Init function. */
-
-void
-_glibtop_init_ppp_s (glibtop *server)
-{
-	server->sysdeps.ppp = _glibtop_sysdeps_ppp;
-}
-
-/* Provides PPP/ISDN information. */
-
-void
-glibtop_get_ppp_s (glibtop *server, glibtop_ppp *buf, unsigned short device)
-{
-	memset (buf, 0, sizeof (glibtop_ppp));
-}
--- a/sysdeps/cygwin/procaffinity.c
+++ b/sysdeps/cygwin/procaffinity.c
@@ -1,39 +0,0 @@
-/* This file is part of LibGTop 2.0.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/procaffinity.h>
-
-static const unsigned long _glibtop_sysdeps_proc_affinity = 0;
-
-/* Init function. */
-
-void
-_glibtop_init_proc_affinity_s (glibtop *server)
-{
-	server->sysdeps.proc_affinity = _glibtop_sysdeps_proc_affinity;
-}
-
-guint16*
-glibtop_get_proc_affinity_s (glibtop *server, glibtop_proc_affinity *buf, pid_t pid)
-{
-	memset (buf, 0, sizeof (glibtop_proc_affinity));
-
-	return NULL;
-}
--- a/sysdeps/cygwin/procargs.c
+++ b/sysdeps/cygwin/procargs.c
@@ -1,70 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procargs.h>
-
-static const unsigned long _glibtop_sysdeps_proc_args =
-(1L << GLIBTOP_PROC_ARGS_SIZE);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_args_s (glibtop *server)
-{
-	server->sysdeps.proc_args = _glibtop_sysdeps_proc_args;
-}
-
-/* Provides detailed information about a process. */
-
-char *
-glibtop_get_proc_args_s (glibtop *server, glibtop_proc_args *buf,
-			 pid_t pid, unsigned max_len)
-{
-	char filename[48]; /* magiv */
-
-	char *args;
-	gsize length;
-	GError *error = NULL;
-
-	memset (buf, 0, sizeof (glibtop_proc_args));
-
-	sprintf (filename, "/proc/%d/cmdline", pid);
-
-	if(!g_file_get_contents(filename, &args, &length, &error)) {
-		g_error_free(error);
-		buf->size = 0;
-		return NULL;
-	}
-
-	if(max_len && max_len < length) {
-		args = g_realloc(args, max_len);
-		args[max_len - 1] = '\0';
-		length = max_len;
-	}
-
-	buf->size = length;
-	buf->flags = _glibtop_sysdeps_proc_args;
-
-	return args;
-}
--- a/sysdeps/cygwin/prockernel.c
+++ b/sysdeps/cygwin/prockernel.c
@@ -1,43 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/prockernel.h>
-
-static const unsigned long _glibtop_sysdeps_proc_kernel = 0;
-
-/* Init function. */
-
-void
-_glibtop_init_proc_kernel_s (glibtop *server)
-{
-	server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf,
-			   pid_t pid)
-{
-	memset (buf, 0, sizeof (glibtop_proc_kernel));
-}
--- a/sysdeps/cygwin/proclist.c
+++ b/sysdeps/cygwin/proclist.c
@@ -1,169 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/proclist.h>
-
-#include <glibtop/procuid.h>
-#include <glibtop/procstate.h>
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <ctype.h>
-
-static const unsigned long _glibtop_sysdeps_proclist =
-(1L << GLIBTOP_PROCLIST_TOTAL) + (1L << GLIBTOP_PROCLIST_NUMBER) +
-(1L << GLIBTOP_PROCLIST_SIZE);
-
-/* Init function. */
-
-void
-_glibtop_init_proclist_s (glibtop *server)
-{
-	server->sysdeps.proclist = _glibtop_sysdeps_proclist;
-}
-
-/* Fetch list of currently running processes.
- *
- * The interface of this function is a little bit different from the others:
- * buf->flags is only set if the call succeeded, in this case pids_chain,
- * a list of the pids of all currently running processes is returned,
- * buf->number is the number of elements of this list and buf->size is
- * the size of one single element (sizeof (unsigned)). The total size is
- * stored in buf->total.
- *
- * The calling function has to free the memory to which a pointer is returned.
- *
- * On error, NULL is returned and buf->flags is zero. */
-
-pid_t*
-glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
-			gint64 which, gint64 arg)
-{
-	DIR *proc;
-	struct dirent *entry;
-	GArray *pids;
-	glibtop_proc_uid procuid;
-	glibtop_proc_state procstate;
-	struct stat statb;
-
-	memset (buf, 0, sizeof (glibtop_proclist));
-
-	proc = opendir ("/proc");
-	if (!proc) return NULL;
-
-	if(fstat(dirfd(proc), &statb) != 0) return NULL;
-
-	pids = g_array_sized_new(FALSE, FALSE, sizeof(pid_t), statb.st_nlink);
-
-	/* read every every entry in /proc */
-
-	while((entry = readdir (proc))) {
-		pid_t pid;
-
-		if (entry->d_type != DT_DIR)
-			continue;
-
-		if (!(pid = strtoul(entry->d_name, NULL, 10)))
-			continue;
-
-		switch (which & GLIBTOP_KERN_PROC_MASK) {
-		case GLIBTOP_KERN_PROC_ALL:
-			break;
-		case GLIBTOP_KERN_PROC_PID:
-			if ((pid_t) arg != pid)
-				continue;
-			break;
-		case GLIBTOP_KERN_PROC_UID:
-		{
-			char path[32];
-			struct stat path_stat;
-
-			snprintf(path, sizeof path, "/proc/%u", (unsigned)pid);
-
-			if (stat(path, &path_stat))
-				continue;
-
-			if ((uid_t) arg != path_stat.st_uid)
-				continue;
-		}
-			break;
-		case GLIBTOP_KERN_PROC_PGRP:
-			/* Do you really, really need this ? */
-			glibtop_get_proc_uid_s (server, &procuid, pid);
-			if (procuid.flags & (1L << GLIBTOP_PROC_UID_PGRP))
-				if ((int) arg != procuid.pgrp)
-					continue;
-			break;
-		case GLIBTOP_KERN_PROC_SESSION:
-			/* Do you really, really need this ? */
-			glibtop_get_proc_uid_s (server, &procuid, pid);
-			if (procuid.flags & (1L << GLIBTOP_PROC_UID_SESSION))
-				if ((int) arg != procuid.session)
-					continue;
-			break;
-		case GLIBTOP_KERN_PROC_TTY:
-			/* Do you really, really need this ? */
-			glibtop_get_proc_uid_s (server, &procuid, pid);
-			if (procuid.flags & (1L << GLIBTOP_PROC_UID_TTY))
-				if ((int) arg != procuid.tty)
-					continue;
-			break;
-		case GLIBTOP_KERN_PROC_RUID:
-			/* Do you really, really need this ? */
-			glibtop_get_proc_uid_s (server, &procuid, pid);
-			if (procuid.flags & (1L << GLIBTOP_PROC_UID_EUID))
-				if ((int) arg != procuid.euid)
-					continue;
-			break;
-		}
-
-		if (which & GLIBTOP_EXCLUDE_NOTTY) {
-			glibtop_get_proc_uid_s (server, &procuid, pid);
-			if (procuid.flags & (1L << GLIBTOP_PROC_UID_TTY))
-				if (procuid.tty == -1) continue;
-		}
-
-		if (which & GLIBTOP_EXCLUDE_IDLE) {
-			glibtop_get_proc_state_s (server, &procstate, pid);
-			if (procstate.flags & (1L << GLIBTOP_PROC_STATE_STATE))
-				if (procstate.state != GLIBTOP_PROCESS_RUNNING) continue;
-		}
-
-		if (which & GLIBTOP_EXCLUDE_SYSTEM) {
-			glibtop_get_proc_uid_s (server, &procuid, pid);
-			if (procuid.flags & (1L << GLIBTOP_PROC_UID_UID))
-				if (procuid.uid == 0) continue;
-		}
-
-		g_array_append_val(pids, pid);
-	}
-
-	closedir (proc);
-
-	buf->flags = _glibtop_sysdeps_proclist;
-	buf->size = sizeof(pid_t);
-	buf->number = pids->len;
-	buf->total = buf->number * buf->size;
-
-	return (pid_t*)g_array_free(pids, FALSE);
-}
--- a/sysdeps/cygwin/procmap.c
+++ b/sysdeps/cygwin/procmap.c
@@ -1,162 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glib.h>
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procmap.h>
-
-#include <stddef.h>
-
-#include "glibtop_private.h"
-
-#define MKDEV(ma,mi)    (((ma) << 20) | (mi))
-
-#define  MAPS_FILE "/proc/%u/maps"
-
-
-#define PROC_MAPS_FORMAT "%16" G_GINT64_MODIFIER "x-%16" G_GINT64_MODIFIER "x %4c %16" G_GINT64_MODIFIER "x %02hx:%02hx %" G_GINT64_MODIFIER "u%*[ ]%n"
-
-
-static const unsigned long _glibtop_sysdeps_proc_map =
-(1L << GLIBTOP_PROC_MAP_NUMBER) + (1L << GLIBTOP_PROC_MAP_TOTAL) +
-(1L << GLIBTOP_PROC_MAP_SIZE);
-
-static const unsigned long _glibtop_sysdeps_map_entry =
-(1L << GLIBTOP_MAP_ENTRY_START) + (1L << GLIBTOP_MAP_ENTRY_END) +
-(1L << GLIBTOP_MAP_ENTRY_OFFSET) + (1L << GLIBTOP_MAP_ENTRY_PERM) +
-(1L << GLIBTOP_MAP_ENTRY_INODE) + (1L << GLIBTOP_MAP_ENTRY_DEVICE) +
-(1L << GLIBTOP_MAP_ENTRY_FILENAME);
-
-
-/* Init function. */
-
-void
-_glibtop_init_proc_map_s (glibtop *server)
-{
-	server->sysdeps.proc_map = _glibtop_sysdeps_proc_map;
-}
-
-
-glibtop_map_entry *
-glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
-{
-	char procfilename[GLIBTOP_MAP_FILENAME_LEN+1];
-
-	/*
-	  default size of 100 maybe inaccurate.
-	  It's the average number of entry per process on my laptop
-	*/
-
-	GArray *entry_list = g_array_sized_new(FALSE, FALSE,
-					       sizeof(glibtop_map_entry),
-					       100);
-	FILE *maps;
-	const char *filename;
-	char *line = NULL;
-	size_t line_size = 0;
-
-	memset (buf, 0, sizeof (glibtop_proc_map));
-
-	filename = MAPS_FILE;
-
-	snprintf (procfilename, sizeof procfilename, filename, (unsigned)pid);
-
-	if((maps = fopen (procfilename, "r")) == NULL) {
-	  return (glibtop_map_entry*) g_array_free(entry_list, TRUE);
-	}
-
-	while(TRUE)
-	{
-		unsigned long perm;
-		guint len;
-		int line_end;
-
-		unsigned short dev_major, dev_minor;
-		guint64 start, end, offset, inode;
-		char flags[4];
-		char *filename;
-
-		glibtop_map_entry *entry;
-
-		if (getline(&line, &line_size, maps) == -1)
-			break;
-
-	new_entry_line:
-
-		if (sscanf(line, PROC_MAPS_FORMAT,
-			   &start, &end, flags, &offset,
-			   &dev_major, &dev_minor, &inode, &line_end) != 7)
-			continue;
-
-		filename = line + line_end;
-		g_strstrip(filename);
-
-		/* Compute access permissions. */
-		perm = 0;
-
-		if (flags [0] == 'r')
-			perm |= GLIBTOP_MAP_PERM_READ;
-
-		if (flags [1] == 'w')
-			perm |= GLIBTOP_MAP_PERM_WRITE;
-
-		if (flags [2] == 'x')
-			perm |= GLIBTOP_MAP_PERM_EXECUTE;
-
-		if (flags [3] == 's')
-			perm |= GLIBTOP_MAP_PERM_SHARED;
-		else if (flags [3] == 'p')
-			perm |= GLIBTOP_MAP_PERM_PRIVATE;
-
-		/*
-		  avoid copying the entry, grow by 1 and point to the last
-		  element.
-		*/
-		len = entry_list->len;
-		g_array_set_size(entry_list, len + 1);
-		entry = &g_array_index(entry_list, glibtop_map_entry, len);
-
-		entry->flags = _glibtop_sysdeps_map_entry;
-		entry->start = start;
-		entry->end = end;
-		entry->offset = offset;
-		entry->perm = perm;
-		entry->device = MKDEV(dev_major, dev_minor);
-		entry->inode = inode;
-		g_strlcpy(entry->filename, filename, sizeof entry->filename);
-	}
-
-eof:
-
-	free(line);
-	fclose (maps);
-
-	buf->flags = _glibtop_sysdeps_proc_map;
-
-	buf->number = entry_list->len;
-	buf->size = sizeof (glibtop_map_entry);
-	buf->total = buf->number * buf->size;
-
-	return (glibtop_map_entry*) g_array_free(entry_list, FALSE);
-}
--- a/sysdeps/cygwin/procmem.c
+++ b/sysdeps/cygwin/procmem.c
@@ -1,68 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procmem.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_proc_mem =
-(1L << GLIBTOP_PROC_MEM_SIZE) + (1L << GLIBTOP_PROC_MEM_RESIDENT) +
-(1L << GLIBTOP_PROC_MEM_SHARE);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_mem_s (glibtop *server)
-{
-	server->sysdeps.proc_mem = _glibtop_sysdeps_proc_mem;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
-{
-	char buffer [BUFSIZ], *p;
-	const size_t pagesize = get_page_size();
-
-	memset (buf, 0, sizeof (glibtop_proc_mem));
-
-	if (proc_statm_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	buf->size     = strtoull (buffer, &p, 0);
-	buf->resident = strtoull (p, &p, 0);
-	buf->share    = strtoull (p, &p, 0);
-
-	buf->size     *= pagesize;
-	buf->resident *= pagesize;
-	buf->share    *= pagesize;
-
-	/* dummy values */
-	buf->vsize = buf->size;
-	buf->rss_rlim = ~0;
-
-	buf->flags |= _glibtop_sysdeps_proc_mem;
-	buf->rss = buf->resident;
-}
--- a/sysdeps/cygwin/procopenfiles.c
+++ b/sysdeps/cygwin/procopenfiles.c
@@ -1,324 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   Copyright (C) 2004 Nicolás Lichtmaier
-   This file is part of LibGTop 1.0.
-
-   Modified by Nicolás Lichtmaier to give a process open files.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procopenfiles.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <stdio.h>
-#include <arpa/inet.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_proc_open_files =
-(1L << GLIBTOP_PROC_OPEN_FILES_NUMBER)|
-(1L << GLIBTOP_PROC_OPEN_FILES_TOTAL)|
-(1L << GLIBTOP_PROC_OPEN_FILES_SIZE);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_open_files_s (glibtop *server)
-{
-	server->sysdeps.proc_open_files = _glibtop_sysdeps_proc_open_files;
-}
-
-
-
-typedef void (*LineParser)(GHashTable *dict, const char *line);
-
-
-static void
-parse_file(const char *filename, LineParser parser, GHashTable *dict)
-{
-	FILE *f;
-	char *line = NULL;
-	size_t size = 0;
-
-	f = fopen(filename, "r");
-
-	if(!f) {
-		g_warning("Cannot open '%s'", filename);
-		return;
-	}
-
-
-	/* skip the first line */
-	if (getline(&line, &size, f) == -1)
-		goto eof;
-
-	while (getline(&line, &size, f) != -1)
-		parser(dict, line);
-
- eof:
-	free(line);
-	fclose(f);
-}
-
-
-static GHashTable*
-get_all(const char *filename, LineParser parser)
-{
-	GHashTable *dict;
-
-	dict = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-				     NULL, g_free);
-
-	parse_file(filename, parser, dict);
-
-	return dict;
-}
-
-
-
-
-
-struct Inet6SocketEntry
-{
-	char host[GLIBTOP_OPEN_DEST_HOST_LEN + 1];
-	int port;
-};
-
-
-static void
-inet6_socket_parser(GHashTable *dict, const char* line)
-{
-	struct Inet6SocketEntry *se;
-	int sock;
-	struct in6_addr addr;
-
-	se = g_malloc0(sizeof *se);
-
-	if(sscanf(line, "%*d: %*s %8x%8x%8x%8x:%4x %*x %*x:%*x %*x:%*x %*d %*d %*d %d",
-		  &addr.s6_addr32[0], &addr.s6_addr32[1], &addr.s6_addr32[2],
-		  &addr.s6_addr32[3], &se->port, &sock) != 6)
-		goto error;
-
-	if(!inet_ntop(AF_INET6, &addr, se->host, sizeof se->host))
-		goto error;
-
-	g_hash_table_insert(dict, GINT_TO_POINTER(sock), se);
-	return;
-
- error:
-	g_free(se);
-}
-
-
-static inline GHashTable *
-get_all_inet6_sockets()
-{
-	return get_all("/proc/net/tcp6", inet6_socket_parser);
-}
-
-
-
-
-
-struct InetSocketEntry
-{
-	char host[GLIBTOP_OPEN_DEST_HOST_LEN + 1];
-	int port;
-};
-
-
-static void
-inet_socket_parser(GHashTable *dict, const char* line)
-{
-	struct InetSocketEntry *se;
-	int sock;
-	unsigned addr;
-
-	se = g_malloc0(sizeof *se);
-
-	if(sscanf(line, "%*d: %*x:%*x %8x:%4x %*x %*x:%*x %*x:%*x %*d %*d %*d %d",
-		  &addr, &se->port, &sock) != 3)
-		goto error;
-
-	if(!inet_ntop(AF_INET, &addr, se->host, sizeof se->host))
-		goto error;
-
-	g_hash_table_insert(dict, GINT_TO_POINTER(sock), se);
-	return;
-
- error:
-	g_free(se);
-}
-
-
-static inline GHashTable *
-get_all_inet_sockets()
-{
-	return get_all("/proc/net/tcp", inet_socket_parser);
-}
-
-
-
-
-
-struct LocalSocketEntry
-{
-	char name[GLIBTOP_OPEN_DEST_HOST_LEN + 1];
-};
-
-
-static void
-local_socket_parser(GHashTable *dict, const char *line)
-{
-	int sock;
-	struct LocalSocketEntry *use;
-	char *p;
-
-	use = g_malloc0(sizeof *use);
-
-	/* dfaf1640: 00000003 00000000 00000000 0001 03  6457 /dev/log */
-	p = skip_multiple_token(line, 6);
-
-	sock = strtoul(p, &p, 10);
-	g_strlcpy(use->name, p, sizeof use->name);
-	g_strstrip(use->name);
-	g_hash_table_insert(dict, GINT_TO_POINTER(sock), use);
-}
-
-
-static inline GHashTable *
-get_all_local_sockets()
-{
-	return get_all("/proc/net/unix", local_socket_parser);
-}
-
-
-
-/* Provides detailed information about a process' open files */
-
-glibtop_open_files_entry *
-glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pid_t pid)
-{
-	char fn [BUFSIZ];
-	GArray *entries;
-	GHashTable *inet6_sockets = NULL, *inet_sockets = NULL, *local_sockets = NULL;
-	struct dirent *direntry;
-	DIR *dir;
-
-	memset (buf, 0, sizeof (glibtop_proc_open_files));
-
-	sprintf (fn, "/proc/%d/fd", pid);
-
-	dir = opendir (fn);
-	if (!dir) return NULL;
-
-	entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));
-
-	while((direntry = readdir(dir))) {
-		char tgt [BUFSIZ];
-		glibtop_open_files_entry entry = {0};
-
-		if(direntry->d_name[0] == '.')
-			continue;
-
-		g_snprintf(fn, sizeof fn, "/proc/%d/fd/%s",
-			   pid, direntry->d_name);
-
-		if (!safe_readlink(fn, tgt, sizeof tgt))
-			continue;
-
-		entry.fd = atoi(direntry->d_name);
-
-		if(g_str_has_prefix(tgt, "socket:["))
-		{
-			int sockfd;
-			struct Inet6SocketEntry *i6se;
-			struct InetSocketEntry *ise;
-			struct LocalSocketEntry *lse;
-
-			if(!inet6_sockets) inet6_sockets = get_all_inet6_sockets();
-			if(!inet_sockets) inet_sockets = get_all_inet_sockets();
-			if(!local_sockets) local_sockets = get_all_local_sockets();
-
-			sockfd = atoi(tgt + 8);
-
-			i6se = g_hash_table_lookup(inet6_sockets,
-						 GINT_TO_POINTER(sockfd));
-
-			if(i6se) {
-				entry.type = GLIBTOP_FILE_TYPE_INET6SOCKET;
-				entry.info.sock.dest_port = i6se->port;
-				g_strlcpy(entry.info.sock.dest_host, i6se->host,
-					  sizeof entry.info.sock.dest_host);
-				goto found;
-			}
-
-			ise = g_hash_table_lookup(inet_sockets,
-						 GINT_TO_POINTER(sockfd));
-
-			if(ise) {
-				entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
-				entry.info.sock.dest_port = ise->port;
-				g_strlcpy(entry.info.sock.dest_host, ise->host,
-					  sizeof entry.info.sock.dest_host);
-				goto found;
-			}
-
-			lse = g_hash_table_lookup(local_sockets,
-						  GINT_TO_POINTER(sockfd));
-
-			if(lse) {
-				entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET;
-				g_strlcpy(entry.info.localsock.name, lse->name,
-					  sizeof entry.info.localsock.name);
-				goto found;
-			}
-
-		found:
-			(void)0; /* kills warning */
-		}
-		else if(g_str_has_prefix(tgt, "pipe:["))
-		{
-			entry.type = GLIBTOP_FILE_TYPE_PIPE;
-		}
-		else
-		{
-			entry.type = GLIBTOP_FILE_TYPE_FILE;
-			g_strlcpy(entry.info.file.name, tgt, sizeof entry.info.file.name);
-		}
-
-		g_array_append_val(entries, entry);
-	}
-
-	closedir (dir);
-
-	if(inet_sockets) g_hash_table_destroy(inet_sockets);
-	if(inet6_sockets) g_hash_table_destroy(inet6_sockets);
-	if(local_sockets) g_hash_table_destroy(local_sockets);
-
-	buf->flags = _glibtop_sysdeps_proc_open_files;
-	buf->number = entries->len;
-	buf->size = sizeof(glibtop_open_files_entry);
-	buf->total = buf->number * buf->size;
-
-	return (glibtop_open_files_entry*)g_array_free(entries, FALSE);
-}
--- a/sysdeps/cygwin/procsegment.c
+++ b/sysdeps/cygwin/procsegment.c
@@ -1,88 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/procsegment.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_proc_segment =
-(1L << GLIBTOP_PROC_SEGMENT_START_CODE) +
-(1L << GLIBTOP_PROC_SEGMENT_END_CODE) +
-(1L << GLIBTOP_PROC_SEGMENT_START_STACK);
-
-static const unsigned long _glibtop_sysdeps_proc_segment_statm =
-(1L << GLIBTOP_PROC_SEGMENT_TEXT_RSS) +
-(1L << GLIBTOP_PROC_SEGMENT_DATA_RSS) +
-(1L << GLIBTOP_PROC_SEGMENT_DIRTY_SIZE);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_segment_s (glibtop *server)
-{
-	server->sysdeps.proc_segment = _glibtop_sysdeps_proc_segment |
-	  _glibtop_sysdeps_proc_segment_statm;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
-			    pid_t pid)
-{
-	char buffer [BUFSIZ], *p;
-	const size_t pagesize = get_page_size();
-
-	memset (buf, 0, sizeof (glibtop_proc_segment));
-
-	if (proc_stat_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	p = proc_stat_after_cmd (buffer);
-	if (!p) return;
-
-	p = skip_multiple_token (p, 23);
-
-	buf->start_code  = strtoull (p, &p, 0);
-	buf->end_code    = strtoull (p, &p, 0);
-	buf->start_stack = strtoull (p, &p, 0);
-
-	buf->flags = _glibtop_sysdeps_proc_segment;
-
-	if (proc_statm_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	p = skip_multiple_token (buffer, 3);
-
-	buf->text_rss   = strtoull (p, &p, 0);
-	buf->shlib_rss  = strtoull (p, &p, 0);
-	buf->data_rss   = strtoull (p, &p, 0);
-	buf->dirty_size = strtoull (p, &p, 0);
-
-	buf->text_rss   *= pagesize;
-	buf->shlib_rss  *= pagesize;
-	buf->data_rss   *= pagesize;
-	buf->dirty_size *= pagesize;
-
-	buf->flags |= _glibtop_sysdeps_proc_segment_statm;
-}
--- a/sysdeps/cygwin/procsignal.c
+++ b/sysdeps/cygwin/procsignal.c
@@ -1,64 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procsignal.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_proc_signal =
-(1L << GLIBTOP_PROC_SIGNAL_SIGNAL) + (1L << GLIBTOP_PROC_SIGNAL_BLOCKED) +
-(1L << GLIBTOP_PROC_SIGNAL_SIGIGNORE) + (1L << GLIBTOP_PROC_SIGNAL_SIGCATCH);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_signal_s (glibtop *server)
-{
-	server->sysdeps.proc_signal = _glibtop_sysdeps_proc_signal;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid)
-{
-	char buffer [BUFSIZ], *p;
-
-	memset (buf, 0, sizeof (glibtop_proc_signal));
-
-	if (proc_stat_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	p = proc_stat_after_cmd (buffer);
-	if (!p) return;
-
-	p = skip_multiple_token (p, 28);
-
-	buf->signal [0]    = strtoull (p, &p, 0);
-	buf->blocked [0]   = strtoull (p, &p, 0);
-	buf->sigignore [0] = strtoull (p, &p, 0);
-	buf->sigcatch [0]  = strtoull (p, &p, 0);
-
-	buf->flags = _glibtop_sysdeps_proc_signal;
-}
--- a/sysdeps/cygwin/procstate.c
+++ b/sysdeps/cygwin/procstate.c
@@ -1,120 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procstate.h>
-
-#include "glibtop_private.h"
-
-#include <sys/stat.h>
-
-static const unsigned long _glibtop_sysdeps_proc_state =
-(1L << GLIBTOP_PROC_STATE_CMD) + (1L << GLIBTOP_PROC_STATE_STATE);
-
-static const unsigned long _glibtop_sysdeps_proc_state_uid =
-(1L << GLIBTOP_PROC_STATE_UID) + (1L << GLIBTOP_PROC_STATE_GID);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_state_s (glibtop *server)
-{
-	server->sysdeps.proc_state = _glibtop_sysdeps_proc_state |
-		_glibtop_sysdeps_proc_state_uid;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
-{
-	char buffer [BUFSIZ], *p;
-	struct stat statb;
-
-	memset (buf, 0, sizeof (glibtop_proc_state));
-
-	/* IMPORTANT NOTICE: For security reasons it is extremely important
-	 *                   that the 'uid' and 'gid' fields have correct
-	 *                   values; NEVER set their flags values if this
-	 *                   is not the case !!! */
-
-	sprintf (buffer, "/proc/%d", pid);
-
-	if (stat (buffer, &statb))
-		return;
-
-	/* For security reasons we use stat () since it is
-	 * more failsafe than parsing the file. */
-
-	buf->uid = statb.st_uid;
-	buf->gid = statb.st_gid;
-
-	buf->flags = _glibtop_sysdeps_proc_state_uid;
-
-	/* Now we read the remaining fields. */
-
-	if (proc_stat_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	p = proc_stat_after_cmd(buffer);
-	p = next_token(p);
-
-	switch(*p)
-	  {
-	  case 'R':
-	    buf->state = GLIBTOP_PROCESS_RUNNING;
-	    break;
-
-	  case 'Z':
-	    buf->state = GLIBTOP_PROCESS_ZOMBIE;
-	    break;
-
-	  case 'S':
-	    buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
-	    break;
-
-	  case 'T':
-	    buf->state = GLIBTOP_PROCESS_STOPPED;
-	    break;
-
-	  case 'D':
-	    buf->state = GLIBTOP_PROCESS_UNINTERRUPTIBLE;
-	    break;
-
-	  case 'W':
-	    buf->state = GLIBTOP_PROCESS_SWAPPING;
-	    break;
-
-	  case 'X':
-	    buf->state = GLIBTOP_PROCESS_DEAD;
-	    break;
-	  }
-
-	p = skip_token (buffer); /* pid */
-	if (G_UNLIKELY(*p++ != '('))
-		glibtop_error_r (server, "Bad data in /proc/%d/stat", pid);
-
-	g_strlcpy (buf->cmd, p, sizeof buf->cmd);
-
-	buf->flags |= _glibtop_sysdeps_proc_state;
-}
--- a/sysdeps/cygwin/proctime.c
+++ b/sysdeps/cygwin/proctime.c
@@ -1,109 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/proctime.h>
-#include <glibtop/uptime.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_proc_time =
-(1L << GLIBTOP_PROC_TIME_UTIME) + (1L << GLIBTOP_PROC_TIME_CUTIME) +
-(1L << GLIBTOP_PROC_TIME_RTIME) +
-(1L << GLIBTOP_PROC_TIME_STIME) + (1L << GLIBTOP_PROC_TIME_CSTIME) +
-(1L << GLIBTOP_PROC_TIME_FREQUENCY) + (1L << GLIBTOP_PROC_TIME_TIMEOUT) +
-(1L << GLIBTOP_PROC_TIME_IT_REAL_VALUE) + (1L << GLIBTOP_PROC_TIME_START_TIME);
-
-static const unsigned long _glibtop_sysdeps_proc_time_smp =
-(1L << GLIBTOP_PROC_TIME_XCPU_UTIME) + (1L << GLIBTOP_PROC_TIME_XCPU_STIME);
-
-/* Init function. */
-
-void
-_glibtop_init_proc_time_s (glibtop *server)
-{
-	server->sysdeps.proc_time = _glibtop_sysdeps_proc_time;
-
-	if (server->ncpu)
-		server->sysdeps.proc_time |= _glibtop_sysdeps_proc_time_smp;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid)
-{
-	char buffer [BUFSIZ], *p;
-	int i;
-
-	memset (buf, 0, sizeof (glibtop_proc_time));
-
-	if (proc_stat_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	p = proc_stat_after_cmd (buffer);
-	if (!p) return;
-
-	p = skip_multiple_token (p, 11);
-
-	/* clock_t  (1/100 s) */
-	buf->utime  = strtoull (p, &p, 0);
-	buf->stime  = strtoull (p, &p, 0);
-	buf->rtime = buf->utime + buf->stime;
-
-	buf->cutime = strtoull (p, &p, 0);
-	buf->cstime = strtoull (p, &p, 0);
-
-	p = skip_multiple_token (p, 3);
-
-	buf->it_real_value = strtoull (p, &p, 0);
-
-	/* seconds since epoch */
-	{
-	  buf->start_time = get_boot_time(server) + strtoull (p, &p, 0) / 100;
-	}
-
-	buf->frequency = 100;
-
-	buf->flags = _glibtop_sysdeps_proc_time;
-
-	if (!server->ncpu)
-		return;
-
-	if (proc_file_to_buffer(buffer, sizeof buffer, "/proc/%d/cpu", pid))
-		return;
-
-	p = skip_multiple_token (p, 3);
-
-	for (i = 0; i <= server->ncpu; i++) {
-
-		if (!check_cpu_line_warn(server, p + 1, i))
-			break;
-
-		p = skip_token(p);
-		buf->xcpu_utime [i] = strtoull (p, &p, 0);
-		buf->xcpu_stime [i] = strtoull (p, &p, 0);
-	}
-
-	buf->flags |= _glibtop_sysdeps_proc_time_smp;
-}
--- a/sysdeps/cygwin/procuid.c
+++ b/sysdeps/cygwin/procuid.c
@@ -1,115 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/procuid.h>
-
-#include "glibtop_private.h"
-
-static const unsigned long _glibtop_sysdeps_proc_uid =
-(1L << GLIBTOP_PROC_UID_UID) + (1L << GLIBTOP_PROC_UID_EUID) +
-(1L << GLIBTOP_PROC_UID_GID) + (1L << GLIBTOP_PROC_UID_EGID);
-
-static const unsigned long _glibtop_sysdeps_proc_uid_stat =
-(1L << GLIBTOP_PROC_UID_PID) + (1L << GLIBTOP_PROC_UID_PPID) +
-(1L << GLIBTOP_PROC_UID_PGRP) + (1L << GLIBTOP_PROC_UID_SESSION) +
-(1L << GLIBTOP_PROC_UID_TTY) + (1L << GLIBTOP_PROC_UID_TPGID) +
-(1L << GLIBTOP_PROC_UID_PRIORITY) + (1L << GLIBTOP_PROC_UID_NICE);
-
-
-/* Init function. */
-
-void
-_glibtop_init_proc_uid_s (glibtop *server)
-{
-	server->sysdeps.proc_uid = _glibtop_sysdeps_proc_uid |
-		_glibtop_sysdeps_proc_uid_stat;
-}
-
-/* Provides detailed information about a process. */
-
-void
-glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
-{
-	char buffer [BUFSIZ], *p;
-
-	memset (buf, 0, sizeof (glibtop_proc_uid));
-
-	if (proc_status_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	/* Search substring 'Pid:' */
-
-	p = strstr (buffer, "\nPid:");
-	if (!p) return;
-
-	p = skip_token (p); /* "Pid:" */
-	buf->pid = strtol (p, &p, 0);
-
-	p = skip_token (p); /* "PPid:" */
-	buf->ppid = strtol (p, &p, 0);
-
-	/* Maybe future Linux versions place something between
-	 * "PPid" and "Uid", so we catch this here. */
-	p = strstr (p, "\nUid:");
-	if (!p) return;
-
-	p = skip_token (p); /* "Uid:" */
-	buf->uid  = strtol (p, &p, 0);
-	buf->euid = strtol (p, &p, 0);
-
-	/* We don't know how many entries on the "Uid:" line
-	 * future Linux version will have, so we catch this here. */
-	p = strstr (p, "\nGid:");
-	if (!p) return;
-
-	p = skip_token (p); /* "Gid:" */
-	buf->gid  = strtol (p, &p, 0);
-	buf->egid = strtol (p, &p, 0);
-
-	buf->flags = _glibtop_sysdeps_proc_uid;
-
-	if (proc_stat_to_buffer(buffer, sizeof buffer, pid))
-		return;
-
-	p = proc_stat_after_cmd (buffer);
-	if (!p) return;
-
-	p = skip_multiple_token (p, 2);
-
-	buf->pgrp    = strtol (p, &p, 0);
-	buf->session = strtol (p, &p, 0);
-	buf->tty     = strtol (p, &p, 0);
-	buf->tpgid   = strtol (p, &p, 0);
-
-	p = skip_multiple_token (p, 9);
-
-	buf->priority = strtol (p, &p, 0);
-	buf->nice     = strtol (p, &p, 0);
-
-	if (buf->tty == 0)
-		/* the old notty val, update elsewhere bef. moving to 0 */
-		buf->tty = -1;
-
-	buf->flags |= _glibtop_sysdeps_proc_uid_stat;
-}
--- a/sysdeps/cygwin/procwd.c
+++ b/sysdeps/cygwin/procwd.c
@@ -1,99 +0,0 @@
-/* Copyright (C) 2007 Benoît Dejean
-   This file is part of LibGTop 2.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/procwd.h>
-#include <glibtop/error.h>
-
-#include <glibtop_private.h>
-
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/types.h>
-
-
-void
-_glibtop_init_proc_wd_s(glibtop *server)
-{
-	server->sysdeps.proc_wd =
-	(1 << GLIBTOP_PROC_WD_EXE) +
-	(1 << GLIBTOP_PROC_WD_ROOT) +
-	(1 << GLIBTOP_PROC_WD_NUMBER);
-
-}
-
-static gboolean is_in(GPtrArray *array, const char *str)
-{
-	guint i;
-
-	for (i = 0; i != array->len; ++i) {
-		if (strcmp(g_ptr_array_index(array, i), str) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-char**
-glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
-{
-	GPtrArray *dirs;
-	char path[80];
-	char dir[256];
-	DIR *task;
-
-	memset(buf, 0, sizeof(glibtop_proc_wd));
-
-	g_snprintf(path, sizeof path, "/proc/%u/root", pid);
-	if (safe_readlink(path, buf->root, sizeof buf->root))
-		buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT);
-
-	g_snprintf(path, sizeof path, "/proc/%u/exe", pid);
-	if (safe_readlink(path, buf->exe, sizeof buf->exe))
-		buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
-
-	dirs = g_ptr_array_sized_new(2);
-
-	g_snprintf(path, sizeof path, "/proc/%u/cwd", pid);
-	if (safe_readlink(path, dir, sizeof dir))
-		g_ptr_array_add(dirs, g_strdup(dir));
-
-	g_snprintf(path, sizeof path, "/proc/%u/task", pid);
-	if ((task = opendir(path)) != NULL) {
-		struct dirent *sub;
-		while ((sub = readdir(task)) != NULL) {
-			/* task dirs have numeric name */
-			if (!isdigit(sub->d_name[0]))
-				continue;
-			g_snprintf(path, sizeof path, "/proc/%u/task/%s/cwd", pid, sub->d_name);
-			if (safe_readlink(path, dir, sizeof dir) && !is_in(dirs, dir))
-				g_ptr_array_add(dirs, g_strdup(dir));
-		}
-		closedir(task);
-	}
-
-	buf->number = dirs->len;
-	buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER);
-
-	g_ptr_array_add(dirs, NULL);
-
-	return (char**) g_ptr_array_free(dirs, FALSE);
-}
-
--- a/sysdeps/cygwin/sem_limits.c
+++ b/sysdeps/cygwin/sem_limits.c
@@ -1,84 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/sem_limits.h>
-
-#define _KERNEL
-#include <sys/ipc.h>
-#include <sys/sem.h>
-
-#ifdef _SEM_SEMUN_UNDEFINED
-
-/* glibc 2.1 will no longer defines semun, instead it defines
- * _SEM_SEMUN_UNDEFINED so users can define semun on their own.
- * Thanks to Albert K T Hui <avatar@deva.net>. */
-
-union semun
-{
-	int val;
-	struct semid_ds *buf;
-	unsigned short int *array;
-	struct seminfo *__buf;
-};
-#endif
-
-static const unsigned long _glibtop_sysdeps_sem_limits =
-(1L << GLIBTOP_IPC_SEMMAP) + (1L << GLIBTOP_IPC_SEMMNI) +
-(1L << GLIBTOP_IPC_SEMMNS) + (1L << GLIBTOP_IPC_SEMMNU) +
-(1L << GLIBTOP_IPC_SEMMSL) + (1L << GLIBTOP_IPC_SEMOPM) +
-(1L << GLIBTOP_IPC_SEMUME) + (1L << GLIBTOP_IPC_SEMUSZ) +
-(1L << GLIBTOP_IPC_SEMVMX) + (1L << GLIBTOP_IPC_SEMAEM);
-
-/* Init function. */
-
-void
-_glibtop_init_sem_limits_s (glibtop *server)
-{
-	server->sysdeps.sem_limits = _glibtop_sysdeps_sem_limits;
-}
-
-/* Provides information about sysv ipc limits. */
-
-void
-glibtop_get_sem_limits_s (glibtop *server, glibtop_sem_limits *buf)
-{
-	struct seminfo	seminfo;
-	union semun	arg;
-
-	memset (buf, 0, sizeof (glibtop_sem_limits));
-
-	buf->flags = _glibtop_sysdeps_sem_limits;
-
-	arg.array = (void *) &seminfo;
-	semctl (0, 0, IPC_INFO, arg);
-
-	buf->semmap = seminfo.semmap;
-	buf->semmni = seminfo.semmni;
-	buf->semmns = seminfo.semmns;
-	buf->semmnu = seminfo.semmnu;
-	buf->semmsl = seminfo.semmsl;
-	buf->semopm = seminfo.semopm;
-	buf->semume = seminfo.semume;
-	buf->semusz = seminfo.semusz;
-	buf->semvmx = seminfo.semvmx;
-	buf->semaem = seminfo.semaem;
-}
--- a/sysdeps/cygwin/shm_limits.c
+++ b/sysdeps/cygwin/shm_limits.c
@@ -1,59 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/shm_limits.h>
-
-#define _KERNEL
-#include <sys/ipc.h>
-#include <sys/shm.h>
-
-static const unsigned long _glibtop_sysdeps_shm_limits =
-(1L << GLIBTOP_IPC_SHMMAX) + (1L << GLIBTOP_IPC_SHMMIN) +
-(1L << GLIBTOP_IPC_SHMMNI) + (1L << GLIBTOP_IPC_SHMSEG) +
-(1L << GLIBTOP_IPC_SHMALL);
-
-/* Init function. */
-
-void
-_glibtop_init_shm_limits_s (glibtop *server)
-{
-	server->sysdeps.shm_limits = _glibtop_sysdeps_shm_limits;
-}
-
-/* Provides information about sysv ipc limits. */
-
-void
-glibtop_get_shm_limits_s (glibtop *server, glibtop_shm_limits *buf)
-{
-	struct shminfo shminfo;
-
-	memset (buf, 0, sizeof (glibtop_shm_limits));
-
-	shmctl (0, IPC_INFO, (void *) &shminfo);
-
-	buf->shmmax = shminfo.shmmax;
-	buf->shmmin = shminfo.shmmin;
-	buf->shmmni = shminfo.shmmni;
-	buf->shmseg = shminfo.shmseg;
-	buf->shmall = shminfo.shmall;
-	buf->flags = _glibtop_sysdeps_shm_limits;
-}
--- a/sysdeps/cygwin/siglist.c
+++ b/sysdeps/cygwin/siglist.c
@@ -1,143 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-
-#include <config.h>
-#include <glibtop/signal.h>
-
-#include <signal.h>
-
-
-#if 0 /* comment */
-perl -nle 'print "{$1,\t\"$1\",\t\"$2\"}," if m|^#define\s*(SIG[A-Z0-9]+).*?/\*\s*(.*?)\s*\*/|'
-	< /usr/include/bits/signum.h
-#endif
-
-
-const glibtop_signame glibtop_sys_siglist [] =
-{
-#ifdef SIGHUP
-	{SIGHUP,	"SIGHUP",       "Hangup (POSIX)."},
-#endif
-#ifdef SIGINT
-	{SIGINT,	"SIGINT",       "Interrupt (ANSI)."},
-#endif
-#ifdef SIGQUIT
-	{SIGQUIT,       "SIGQUIT",      "Quit (POSIX)."},
-#endif
-#ifdef SIGILL
-	{SIGILL,	"SIGILL",       "Illegal instruction (ANSI)."},
-#endif
-#ifdef SIGTRAP
-	{SIGTRAP,       "SIGTRAP",      "Trace trap (POSIX)."},
-#endif
-#ifdef SIGABRT
-	{SIGABRT,       "SIGABRT",      "Abort (ANSI)."},
-#endif
-#ifdef SIGIOT
-	{SIGIOT,	"SIGIOT",       "IOT trap (4.2 BSD)."},
-#endif
-#ifdef SIGBUS
-	{SIGBUS,	"SIGBUS",       "BUS error (4.2 BSD)."},
-#endif
-#ifdef SIGFPE
-	{SIGFPE,	"SIGFPE",       "Floating-point exception (ANSI)."},
-#endif
-#ifdef SIGKILL
-	{SIGKILL,       "SIGKILL",      "Kill, unblockable (POSIX)."},
-#endif
-#ifdef SIGUSR1
-	{SIGUSR1,	"SIGUSR1",      "User-defined signal 1 (POSIX)."},
-#endif
-#ifdef SIGSEGV
-	{SIGSEGV,	"SIGSEGV",      "Segmentation violation (ANSI)."},
-#endif
-#ifdef SIGUSR2
-	{SIGUSR2,	"SIGUSR2",      "User-defined signal 2 (POSIX)."},
-#endif
-#ifdef SIGPIPE
-	{SIGPIPE,       "SIGPIPE",      "Broken pipe (POSIX)."},
-#endif
-#ifdef SIGALRM
-	{SIGALRM,       "SIGALRM",      "Alarm clock (POSIX)."},
-#endif
-#ifdef SIGTERM
-	{SIGTERM,       "SIGTERM",      "Termination (ANSI)."},
-#endif
-#ifdef SIGSTKFLT
-	{SIGSTKFLT,     "SIGSTKFLT",    "Stack fault."},
-#endif
-#ifdef SIGCLD
-	{SIGCLD,	"SIGCLD",       "Same as SIGCHLD (System V)."},
-#endif
-#ifdef SIGCHLD
-	{SIGCHLD,       "SIGCHLD",      "Child status has changed (POSIX)."},
-#endif
-#ifdef SIGCONT
-	{SIGCONT,       "SIGCONT",      "Continue (POSIX)."},
-#endif
-#ifdef SIGSTOP
-	{SIGSTOP,       "SIGSTOP",      "Stop, unblockable (POSIX)."},
-#endif
-#ifdef SIGTSTP
-	{SIGTSTP,       "SIGTSTP",      "Keyboard stop (POSIX)."},
-#endif
-#ifdef SIGTTIN
-	{SIGTTIN,       "SIGTTIN",      "Background read from tty (POSIX)."},
-#endif
-#ifdef SIGTTOU
-	{SIGTTOU,       "SIGTTOU",      "Background write to tty (POSIX)."},
-#endif
-#ifdef SIGURG
-	{SIGURG,	"SIGURG",       "Urgent condition on socket (4.2 BSD)."},
-#endif
-#ifdef SIGXCPU
-	{SIGXCPU,       "SIGXCPU",      "CPU limit exceeded (4.2 BSD)."},
-#endif
-#ifdef SIGXFSZ
-	{SIGXFSZ,       "SIGXFSZ",      "File size limit exceeded (4.2 BSD)."},
-#endif
-#ifdef SIGVTALRM
-	{SIGVTALRM,     "SIGVTALRM",    "Virtual alarm clock (4.2 BSD)."},
-#endif
-#ifdef SIGPROF
-	{SIGPROF,       "SIGPROF",      "Profiling alarm clock (4.2 BSD)."},
-#endif
-#ifdef SIGWINCH
-	{SIGWINCH,      "SIGWINCH",     "Window size change (4.3 BSD, Sun)."},
-#endif
-#ifdef SIGPOLL
-	{SIGPOLL,       "SIGPOLL",      "Pollable event occurred (System V)."},
-#endif
-#ifdef SIGIO
-	{SIGIO,		"SIGIO",	"I/O now possible (4.2 BSD)."},
-#endif
-#ifdef SIGPWR
-	{SIGPWR,	"SIGPWR",       "Power failure restart (System V)."},
-#endif
-#ifdef SIGSYS
-	{SIGSYS,	"SIGSYS",       "Bad system call."},
-#endif
-#ifdef SIGUNUSED
-	{SIGUNUSED,	"SIGUNUSED",	""},
-#endif
-	{0,		NULL,		NULL}
-};
--- a/sysdeps/cygwin/swap.c
+++ b/sysdeps/cygwin/swap.c
@@ -1,81 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/swap.h>
-
-#include "glibtop_private.h"
-
-#include <fcntl.h>
-
-static const unsigned long _glibtop_sysdeps_swap =
-(1L << GLIBTOP_SWAP_TOTAL) + (1L << GLIBTOP_SWAP_USED) +
-(1L << GLIBTOP_SWAP_FREE);
-
-static const unsigned long _glibtop_sysdeps_swap_paging =
-(1L << GLIBTOP_SWAP_PAGEIN) + (1L << GLIBTOP_SWAP_PAGEOUT);
-
-/* Init function. */
-
-void
-_glibtop_init_swap_s (glibtop *server)
-{
-	server->sysdeps.swap = _glibtop_sysdeps_swap |
-		_glibtop_sysdeps_swap_paging;
-}
-
-/* Provides information about swap usage. */
-
-#define MEMINFO		"/proc/meminfo"
-#define PROC_STAT	"/proc/stat"
-
-void
-glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
-{
-	char buffer [BUFSIZ], *p;
-
-	memset (buf, 0, sizeof (glibtop_swap));
-
-	file_to_buffer(server, buffer, sizeof buffer, MEMINFO);
-
-	/* Kernel 2.6 with multiple lines */
-
-	buf->total = get_scaled(buffer, "SwapTotal:");
-	buf->free = get_scaled(buffer, "SwapFree:");
-	buf->used = buf->total - buf->free;
-
-	buf->flags = _glibtop_sysdeps_swap;
-
-	file_to_buffer (server, buffer, sizeof buffer, PROC_STAT);
-
-	p = strstr (buffer, "\nswap");
-
-	if(p)
-	{
-		p = skip_token (p);
-
-		buf->pagein  = strtoull (p, &p, 0);
-		buf->pageout = strtoull (p, &p, 0);
-
-		buf->flags |= _glibtop_sysdeps_swap_paging;
-	}
-}
--- a/sysdeps/cygwin/sysinfo.c
+++ b/sysdeps/cygwin/sysinfo.c
@@ -1,99 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/cpu.h>
-#include <glibtop/sysinfo.h>
-
-#include "glibtop_private.h"
-
-#define FILENAME "/proc/cpuinfo"
-
-static const unsigned long _glibtop_sysdeps_sysinfo =
-(1L << GLIBTOP_SYSINFO_CPUINFO);
-
-static glibtop_sysinfo sysinfo = { .flags = 0 };
-
-static void
-init_sysinfo (glibtop *server)
-{
-	char buffer [16384];
-	gchar ** processors;
-
-	if(G_LIKELY(sysinfo.flags)) return;
-
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
-
-	/* cpuinfo records are seperated by a blank line */
-	processors = g_strsplit(buffer, "\n\n", 0);
-
-	for(sysinfo.ncpu = 0;
-	    sysinfo.ncpu < GLIBTOP_NCPU && processors[sysinfo.ncpu] && *processors[sysinfo.ncpu];
-	    sysinfo.ncpu++) {
-
-		gchar **parts, **p;
-
-		glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
-
-		cpuinfo->labels = g_ptr_array_new ();
-
-		cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal,
-							g_free, g_free);
-
-		cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal,
-							g_free, g_free);
-
-		/* "<key>    : <value>" */
-		parts = g_strsplit_set(processors[sysinfo.ncpu], ":\n", 0);
-
-		for(p = parts; *p && *(p+1); p += 2) {
-
-			/* stole the allocated memory */
-			gchar * const key   = g_strstrip(   *p   );
-			gchar * const value = g_strstrip( *(p+1) );
-
-			g_ptr_array_add(cpuinfo->labels, key);
-			g_hash_table_insert(cpuinfo->values, key, value);
-		}
-
-
-		/* the last key has no value and has not been added */
-		if(*p) g_free(*p);
-
-		/* just g_free instead of g_strvfree because we stole
-		   the memory*/
-
-		g_free(parts);
-
-	}
-
-	g_strfreev(processors);
-
-	sysinfo.flags = _glibtop_sysdeps_sysinfo;
-}
-
-const glibtop_sysinfo *
-glibtop_get_sysinfo_s (glibtop *server)
-{
-	init_sysinfo (server);
-	return &sysinfo;
-}
--- a/sysdeps/cygwin/uptime.c
+++ b/sysdeps/cygwin/uptime.c
@@ -1,61 +0,0 @@
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop/error.h>
-#include <glibtop/uptime.h>
-
-#include "glibtop_private.h"
-
-#include <time.h>
-
-static const unsigned long _glibtop_sysdeps_uptime =
-  (1UL << GLIBTOP_UPTIME_UPTIME) \
-+ (1UL << GLIBTOP_UPTIME_IDLETIME) \
-+ (1UL << GLIBTOP_UPTIME_BOOT_TIME);
-
-/* Init function. */
-
-void
-_glibtop_init_uptime_s (glibtop *server)
-{
-	server->sysdeps.uptime = _glibtop_sysdeps_uptime;
-}
-
-/* Provides uptime and idle time. */
-
-#define FILENAME	"/proc/uptime"
-
-void
-glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
-{
-	char buffer [BUFSIZ], *p;
-
-	memset (buf, 0, sizeof (glibtop_uptime));
-
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
-
-	buf->uptime   = g_ascii_strtod (buffer, &p);
-	buf->idletime = g_ascii_strtod (p, &p);
-	buf->boot_time = get_boot_time(server);
-
-	buf->flags = _glibtop_sysdeps_uptime;
-}
--- a/sysdeps/freebsd/Makefile.am
+++ b/sysdeps/freebsd/Makefile.am
@@ -7,12 +7,12 @@ libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c sysinfo.c shm_limits.c \
 				  cpu.c msg_limits.c sem_limits.c loadavg.c \
 				  uptime.c netlist.c fsusage.c mem.c \
 				  mountlist.c procopenfiles.c procwd.c \
-				  procaffinity.c glibtop_private.c open.c
+				  procaffinity.c glibtop_private.c

 libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)

 libgtop_sysdeps_suid_2_0_la_LIBADD	= $(KVM_LIBS) $(EXTRA_SYSDEPS_LIBS)
-libgtop_sysdeps_suid_2_0_la_SOURCES	= suid_open.c close.c swap.c \
+libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c swap.c \
 				  proclist.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c \
 				  prockernel.c procsegment.c procargs.c \
--- a/sysdeps/freebsd/cpu.c
+++ b/sysdeps/freebsd/cpu.c
@@ -54,7 +54,6 @@ void
 glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 {
 	long cpts [CPUSTATES];
-	long *cp_times = NULL;
 	struct clockinfo ci;
 	size_t length;
 	int ncpu, i;
@@ -76,16 +75,6 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 		return;
 	}

-	length = 0;
-	if (sysctlbyname ("kern.cp_times", NULL, &length, NULL, 0) == 0) {
-		cp_times = g_malloc (length);
-		length = sizeof(long) * CPUSTATES * (length / (sizeof(long) * CPUSTATES));
-		if (sysctlbyname ("kern.cp_times", cp_times, &length, NULL, 0)) {
-			g_free (cp_times);
-			cp_times = NULL;
-		}
-	}
-
 	/* set user time */
 	buf->user = cpts [CP_USER];
 	/* set nice time */
@@ -100,32 +89,22 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
 	/* set frequency */
 	buf->frequency = (ci.stathz ? ci.stathz : ci.hz);
 	/* set total */
-	buf->total = cpts [CP_USER] + cpts [CP_NICE] \
+	buf->total = cpts [CP_USER] + cpts [CP_NICE]
 		+ cpts [CP_SYS] + cpts [CP_IDLE] + cpts [CP_INTR];

 	ncpu = server->ncpu + 1;

 	for (i = 0; i < ncpu; i++) {
-		if (cp_times) {
-			buf->xcpu_user[i] = cp_times[i * CPUSTATES + CP_USER];
-			buf->xcpu_nice[i] = cp_times[i * CPUSTATES + CP_NICE];
-			buf->xcpu_sys[i] = cp_times[i * CPUSTATES + CP_SYS];
-			buf->xcpu_idle[i] = cp_times[i * CPUSTATES + CP_IDLE];
-			buf->xcpu_irq[i] = cp_times[i * CPUSTATES + CP_INTR];
-		} else {
-			buf->xcpu_user[i] = cpts [CP_USER] / ncpu;
-			buf->xcpu_nice[i] = cpts [CP_NICE] / ncpu;
-			buf->xcpu_sys[i] = cpts [CP_SYS] / ncpu;
-			buf->xcpu_idle[i] = cpts [CP_IDLE] / ncpu;
-			buf->xcpu_irq[i] = cpts [CP_INTR] / ncpu;
-		}
+		buf->xcpu_user[i] = cpts [CP_USER] / ncpu;
+		buf->xcpu_nice[i] = cpts [CP_NICE] / ncpu;
+		buf->xcpu_sys[i] = cpts [CP_SYS] / ncpu;
+		buf->xcpu_idle[i] = cpts [CP_IDLE] / ncpu;
+		buf->xcpu_irq[i] = cpts [CP_INTR] / ncpu;
 		buf->xcpu_total[i] = buf->xcpu_user[i] + buf->xcpu_nice[i] \
 				     + buf->xcpu_sys[i] + buf->xcpu_idle[i] \
 				     + buf->xcpu_irq[i];
 	}

-	g_free (cp_times);
-
 	/* Set the flags last. */
 	buf->flags = _glibtop_sysdeps_cpu;

--- a/sysdeps/freebsd/glibtop_machine.h
+++ b/sysdeps/freebsd/glibtop_machine.h
@@ -24,7 +24,6 @@

 #include <sys/param.h>
 #include <nlist.h>
-#include <limits.h>
 #include <kvm.h>
 #include <sys/dkstat.h>
 #include <time.h>
--- a/sysdeps/freebsd/mem.c
+++ b/sysdeps/freebsd/mem.c
@@ -79,10 +79,10 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
 	buffers = 0;

 	buf->total = memtotal;
-	buf->used = (memused * (gulong) pagesize);
+	buf->used = (memused * pagesize);
 	buf->free = (buf->total - buf->used);
 	buf->shared = 0;
-	buf->cached = (cached * (gulong) pagesize);
+	buf->cached = (cached * pagesize);
 	buf->buffer = buffers;

 	buf->user = buf->total - buf->free - buf->cached - buf->buffer;
--- a/sysdeps/freebsd/nosuid.c
+++ b/sysdeps/freebsd/nosuid.c
@@ -21,8 +21,16 @@

 #include <config.h>
 #include <glibtop.h>
+#include <glibtop/open.h>
 #include <glibtop/close.h>

+void
+glibtop_open_s (glibtop *server,
+		const char *program_name,
+		const unsigned long features,
+		const unsigned flags)
+{ }
+
 void
 glibtop_close_s (glibtop *server)
 { }
--- a/sysdeps/freebsd/open.c
+++ b/sysdeps/freebsd/open.c
@@ -20,33 +20,76 @@
 */

 #include <config.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
 #include <glibtop.h>
-#include <glibtop/open.h>
-#include <glibtop/cpu.h>
 #include <glibtop/error.h>
+#include <glibtop/open.h>
+#include <glibtop/init_hooks.h>

-#include <glibtop_private.h>
-
+/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */

 void
-glibtop_open_s (glibtop *server, const char *program_name,
+glibtop_init_p (glibtop *server, const unsigned long features,
+		const unsigned flags)
+{
+	const _glibtop_init_func_t *init_fkt;
+
+	if (server == NULL)
+		glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
+
+	/* Do the initialization, but only if not already initialized. */
+
+	if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
+		glibtop_open_p (server, "glibtop", features, flags);
+
+		for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
+			(*init_fkt) (server);
+
+		server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
+	}
+}
+
+void
+glibtop_open_p (glibtop *server, const char *program_name,
 		const unsigned long features,
 		const unsigned flags)
 {
-	int ncpus;
-	size_t len;
+#ifdef DEBUG
+	fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
+#endif

-	len = sizeof (ncpus);
-	sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
-	server->real_ncpu = ncpus - 1;
-	server->ncpu = MIN(GLIBTOP_NCPU - 1, server->real_ncpu);
+	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */

+	server->machine.uid = getuid ();
+	server->machine.euid = geteuid ();
+	server->machine.gid = getgid ();
+	server->machine.egid = getegid ();
 #if defined(__FreeBSD_kernel__)
 	server->os_version_code = __FreeBSD_kernel_version;
 #else
 	server->os_version_code = __FreeBSD_version;
 #endif
+	/* Setup machine-specific data */
+	server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");

+	if (server->machine.kd == NULL)
+		glibtop_error_io_r (server, "kvm_open");
+
+	/* Drop priviledges. */
+
+	if (setreuid (server->machine.euid, server->machine.uid))
+		_exit (1);
+
+	if (setregid (server->machine.egid, server->machine.gid))
+		_exit (1);
+
+	/* !!! END OF SUID ROOT PART !!! */
+
+	/* Our effective uid is now those of the user invoking the server,
+	 * so we do no longer have any priviledges. */
+
+	/* NOTE: On FreeBSD, we do not need to be suid root, we just need to
+	 * be sgid kmem.
+	 *
+	 * The server will only use setegid() to get back it's priviledges,
+	 * so it will fail if it is suid root and not sgid kmem. */
 }
--- a/sysdeps/freebsd/procmap.c
+++ b/sysdeps/freebsd/procmap.c
@@ -85,9 +85,7 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode,
        char tagstr[12];
        struct inode inode;
        struct cdev_priv priv;
-#if __FreeBSD_version < 800039
        struct cdev si;
-#endif

        *inum = 0;
        *dev = 0;
@@ -113,18 +111,18 @@ _glibtop_sysdeps_freebsd_dev_inode (glibtop *server, struct vnode *vnode,
                return;
        }

-#if __FreeBSD_version >= 800039
-        if (kvm_read (server->machine.kd, (gulong) cdev2priv(inode.i_dev), (char *) &priv,
-		      sizeof (priv))
-#else
        if (kvm_read (server->machine.kd, (gulong) inode.i_dev, (char *) &si,
 	              sizeof (si)) != sizeof (si) ||
+#if __FreeBSD_version >= 800039
+            kvm_read (server->machine.kd, (gulong)  cdev2priv(&si), (char *) &priv,
+		      sizeof (priv))
+#else
            kvm_read (server->machine.kd, (gulong) si.si_priv, (char *) &priv,
 		      sizeof (priv))
 #endif
 	    != sizeof (priv))
        {
-                glibtop_warn_io_r (server, "kvm_read (priv)");
+                glibtop_warn_io_r (server, "kvm_read (si)");
                return;
        }

--- a/sysdeps/freebsd/procopenfiles.c
+++ b/sysdeps/freebsd/procopenfiles.c
@@ -35,9 +35,6 @@
 #include <sys/user.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#ifdef HAVE_KINFO_GETFILE
-#include <libutil.h>
-#endif
 #include <string.h>
 #include <stdlib.h>

@@ -266,13 +263,9 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pi
 {
 #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
 	struct kinfo_file *freep, *kif;
-#ifndef HAVE_KINFO_GETFILE
 	int name[4];
 	size_t len;
-#else
-	int cnt;
-#endif
-	ssize_t i;
+	size_t i;
 #else
 	char *output;
 #endif
@@ -281,7 +274,6 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pi
 	memset(buf, 0, sizeof (glibtop_proc_open_files));

 #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-#ifndef HAVE_KINFO_GETFILE
 	name[0] = CTL_KERN;
 	name[1] = KERN_PROC;
 	name[2] = KERN_PROC_FILEDESC;
@@ -295,25 +287,12 @@ glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf,	pi
 		g_free(freep);
 		return NULL;
 	}
-#else
-	freep = kinfo_getfile(pid, &cnt);
-#endif

 	entries = g_array_new(FALSE, FALSE, sizeof(glibtop_open_files_entry));

-#ifndef HAVE_KINFO_GETFILE
 	for (i = 0; i < len / sizeof(*kif); i++, kif++) {
 		glibtop_open_files_entry entry = {0};

-		if (kif->kf_structsize != sizeof(*kif))
-			continue;
-#else
-	for (i = 0; i < cnt; i++) {
-		glibtop_open_files_entry entry = {0};
-
-		kif = &freep[i];
-#endif
-
 		if (kif->kf_fd < 0)
 			continue;

--- a/sysdeps/freebsd/procwd.c
+++ b/sysdeps/freebsd/procwd.c
@@ -27,9 +27,6 @@
 #include <sys/sysctl.h>
 #include <sys/param.h>
 #include <sys/user.h>
-#ifdef HAVE_KINFO_GETFILE
-#include <libutil.h>
-#endif
 #include <string.h>

 static const unsigned long _glibtop_sysdeps_proc_wd =
@@ -43,7 +40,7 @@ _glibtop_init_proc_wd_s(glibtop *server)
 	server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
 }

-#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || __FreeBSD_version < 700104
+#if (__FreeBSD_version >= 800000 && __FreeBSD_version < 800019) || _FreeBSD_version < 700104
 static GPtrArray *
 parse_output(const char *output, glibtop_proc_wd *buf)
 {
@@ -100,39 +97,24 @@ parse_output(const char *output, glibtop_proc_wd *buf)
 char**
 glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
 {
-	int exe_mib[4];
-	size_t len;
+	char path[MAXPATHLEN];
 #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
 	struct kinfo_file *freep, *kif;
 	GPtrArray *dirs;
-#ifndef HAVE_KINFO_GETFILE
-	int name[4];
-#else
-	int cnt;
-#endif
+	size_t len;
 	int i;
+	int name[4];
 #else
 	char *output;
 #endif

 	memset (buf, 0, sizeof (glibtop_proc_wd));
-	len = 0;

-	exe_mib[0] = CTL_KERN;
-	exe_mib[1] = KERN_PROC;
-	exe_mib[2] = KERN_PROC_PATHNAME;
-	exe_mib[3] = pid;
-
-	if (sysctl(exe_mib, 4, NULL, &len, NULL, 0) == 0) {
-		if (len > sizeof(buf->exe))
-			len = sizeof(buf->exe);
-		if (sysctl(exe_mib, 4, buf->exe, &len, NULL, 0) == 0)
-			buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
-	}
+	g_snprintf(path, sizeof(path), "/proc/%u/file", pid);
+	if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
+		buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);

 #if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-#ifndef HAVE_KINFO_GETFILE
-	len = 0;
 	name[0] = CTL_KERN;
 	name[1] = KERN_PROC;
 	name[2] = KERN_PROC_FILEDESC;
@@ -145,21 +127,10 @@ glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
 		g_free(freep);
 		return NULL;
 	}
-#else
-	freep = kinfo_getfile(pid, &cnt);
-#endif

 	dirs = g_ptr_array_sized_new(1);

-#ifndef HAVE_KINFO_GETFILE
 	for (i = 0; i < len / sizeof(*kif); i++, kif++) {
-		if (kif->kf_structsize != sizeof(*kif))
-			continue;
-#else
-	for (i = 0; i < cnt; i++) {
-		kif = &freep[i];
-#endif
-
 		switch (kif->kf_fd) {
 			case KF_FD_TYPE_ROOT:
 				g_strlcpy(buf->root, kif->kf_path,
--- a/sysdeps/freebsd/suid_open.c
+++ b/sysdeps/freebsd/suid_open.c
@@ -1,92 +0,0 @@
-/* Copyright (C) 1998 Joshua Sled
-   This file is part of LibGTop 1.0.
-
-   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/cpu.h>
-#include <glibtop/open.h>
-#include <glibtop/init_hooks.h>
-
-
-/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
-
-void
-glibtop_init_p (glibtop *server, const unsigned long features,
-		const unsigned flags)
-{
-	const _glibtop_init_func_t *init_fkt;
-
-	if (server == NULL)
-		glibtop_error_r (NULL, "glibtop_init_p (server == NULL)");
-
-	/* Do the initialization, but only if not already initialized. */
-
-	if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) {
-		glibtop_open_p (server, "glibtop", features, flags);
-
-		for (init_fkt = _glibtop_init_hook_p; *init_fkt; init_fkt++)
-			(*init_fkt) (server);
-
-		server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
-	}
-}
-
-void
-glibtop_open_p (glibtop *server, const char *program_name,
-		const unsigned long features,
-		const unsigned flags)
-{
-	char errbuf[_POSIX2_LINE_MAX];
-#ifdef DEBUG
-	fprintf (stderr, "DEBUG (%d): glibtop_open_p ()\n", getpid ());
-#endif
-
-	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
-	server->machine.uid = getuid ();
-	server->machine.euid = geteuid ();
-	server->machine.gid = getgid ();
-	server->machine.egid = getegid ();
-	/* Setup machine-specific data */
-	server->machine.kd = kvm_openfiles (NULL, NULL, NULL, O_RDONLY, errbuf);
-
-	if (server->machine.kd == NULL)
-		glibtop_error_io_r (server, "kvm_open");
-
-	/* Drop priviledges. */
-
-	if (setreuid (server->machine.euid, server->machine.uid))
-		_exit (1);
-
-	if (setregid (server->machine.egid, server->machine.gid))
-		_exit (1);
-
-	/* !!! END OF SUID ROOT PART !!! */
-
-	/* Our effective uid is now those of the user invoking the server,
-	 * so we do no longer have any priviledges. */
-
-	/* NOTE: On FreeBSD, we do not need to be suid root, we just need to
-	 * be sgid kmem.
-	 *
-	 * The server will only use setegid() to get back it's priviledges,
-	 * so it will fail if it is suid root and not sgid kmem. */
-}
--- a/sysdeps/freebsd/sysinfo.c
+++ b/sysdeps/freebsd/sysinfo.c
@@ -45,8 +45,8 @@ init_sysinfo (glibtop *server)

 	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);

-	ncpus = server->ncpu + 1;
-
+	len = sizeof (ncpus);
+	sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
 	len = 0;
 	sysctlbyname ("hw.model", NULL, &len, NULL, 0);
 	model = g_malloc (len);
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -2,8 +2,6 @@ INCLUDES			= @INCLUDES@

 noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la

-EXTRA_DIST			= procmap_smaps.gperf procmap_smaps.c
-
 libgtop_sysdeps_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
--- a/sysdeps/linux/fsusage.c
+++ b/sysdeps/linux/fsusage.c
@@ -140,7 +140,7 @@ static void linux_2_6_0(glibtop *server, glibtop_fsusage *buf, const char *path)

 	get_sys_path(server, device, &filename, &format);

-	ret = try_file_to_buffer(buffer, sizeof buffer, "%s", filename);
+	ret = try_file_to_buffer(buffer, sizeof buffer, filename);

 	if (ret < 0) goto out;

--- a/sysdeps/linux/glibtop_private.c
+++ b/sysdeps/linux/glibtop_private.c
@@ -124,7 +124,7 @@ int try_file_to_buffer(char *buffer, size_t bufsiz, const char *format, ...)
 void
 file_to_buffer(glibtop *server, char *buffer, size_t bufsiz, const char *filename)
 {
-	switch(try_file_to_buffer(buffer, bufsiz, "%s", filename))
+	switch(try_file_to_buffer(buffer, bufsiz, filename))
 	{
 	case TRY_FILE_TO_BUFFER_OPEN:
 		glibtop_error_io_r (server, "open (%s)", filename);
--- a/sysdeps/linux/procmap.c
+++ b/sysdeps/linux/procmap.c
@@ -31,7 +31,6 @@

 #include "glibtop_private.h"

-#include "procmap_smaps.c"

 #define  MAPS_FILE "/proc/%u/maps"
 #define SMAPS_FILE "/proc/%u/smaps"
@@ -67,19 +66,35 @@ _glibtop_init_proc_map_s (glibtop *server)
 /* Provides detailed information about a process. */


-static const char*
+
+struct smap_value {
+	char name[16];
+	size_t name_len;
+	ptrdiff_t offset;
+};
+
+static int
+compare(const void* a_key, const void* a_smap)
+{
+	const char* key = a_key;
+	const struct smap_value* smap = a_smap;
+	return strncmp(key, smap->name, smap->name_len);
+}
+
+
+static gboolean
 is_smap_value(const char* s)
 {
 	for ( ; *s; ++s) {

 		if (isspace(*s))
-			return NULL;
+			return FALSE;

 		if (*s == ':')
-			return s;
+			return TRUE;
 	}

-	return NULL;
+	return FALSE;
 }


@@ -90,18 +105,25 @@ is_smap_value(const char* s)
 static gboolean
 parse_smaps(glibtop_map_entry *entry, const char* line)
 {
+#define SMAP_OFFSET(MEMBER) offsetof(glibtop_map_entry, MEMBER)
+#define STR_AND_LEN(X) (X), (sizeof X - 1)

-	const struct smap_value* smap;
-	size_t len;
-	const char* colon;
+	/* keep sorted */
+	const struct smap_value values[] = {
+		{ STR_AND_LEN("Private_Clean:"),	SMAP_OFFSET(private_clean) },
+		{ STR_AND_LEN("Private_Dirty:"),	SMAP_OFFSET(private_dirty) },
+		{ STR_AND_LEN("Rss:"),			SMAP_OFFSET(rss) },
+		{ STR_AND_LEN("Shared_Clean:"),		SMAP_OFFSET(shared_clean) },
+		{ STR_AND_LEN("Shared_Dirty:"),		SMAP_OFFSET(shared_dirty) },
+		{ STR_AND_LEN("Size:"),			SMAP_OFFSET(size) }
+	};

-	if ((colon = is_smap_value(line)) == NULL)
-		return FALSE;
+#undef STR_AND_LEN
+#undef SMAP_OFFSET

-	len = colon - line + 1;
-	smap = _glibtop_find_smap(line, len);
+	struct smap_value* smap;

-//		g_debug("smap %s -> %p", line, smap);
+	smap = bsearch(line, values, G_N_ELEMENTS(values), sizeof values[0], compare);

 	if (smap) {
 		char *offset;
@@ -111,75 +133,14 @@ parse_smaps(glibtop_map_entry *entry, const char* line)
 		offset += smap->offset;
 		value = (void*) offset;

-		*value = get_scaled(line + len, NULL);
+		*value = get_scaled(line + smap->name_len, NULL);
+		return TRUE;
 	}

-	return TRUE;
+	return is_smap_value(line);
 }


-/*
-  sscanf is too slow
-  and system-monitor calls procmap for each pid every second
-
-  manual parsing is faster
-
-  error checking is weaker
-*/
-
-static gboolean
-parse_line(char* line,
-	   guint64* start, guint64* end, char flags[4], guint64* offset,
-	   gushort* dev_major, gushort* dev_minor, guint64* inode,
-	   char** filename)
-{
-	/* %16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%n */
-
-	char *p, *next;
-
-	p = line;
-
-	*start = strtoull(p, &p, 16);
-
-	if (G_UNLIKELY(*p != '-'))
-		return FALSE;
-	p++;
-
-	*end = strtoull(p, &p, 16);
-
-	p = next_token(p);
-
-	memcpy(flags, p, 4);
-	p += 4;
-
-	*offset = strtoull(p, &p, 16);
-
-	*dev_major = strtoul(p, &p, 16);
-
-	if (G_UNLIKELY(*p != ':'))
-		return FALSE;
-	p++;
-
-	*dev_minor = strtoul(p, &p, 16);
-
-	*inode = strtoull(p, &p, 10);
-
-	p = next_token(p);
-
-	*filename = p;
-
-	for ( ; *p; p++) {
-		if (*p == '\n') {
-			*p = '\0';
-			break;
-		}
-	}
-
-	return TRUE;
-}
-
-
-


 glibtop_map_entry *
@@ -192,10 +153,9 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 	  It's the average number of entry per process on my laptop
 	*/

-	size_t added = 0, entry_list_capacity = 100;
 	GArray *entry_list = g_array_sized_new(FALSE, FALSE,
 					       sizeof(glibtop_map_entry),
-					       entry_list_capacity);
+					       100);
 	FILE *maps;
 	const char *filename;
 	gboolean has_smaps;
@@ -220,7 +180,8 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 	while(TRUE)
 	{
 		unsigned long perm;
-		/* int line_end; */
+		guint len;
+		int line_end;

 		unsigned short dev_major, dev_minor;
 		guint64 start, end, offset, inode;
@@ -234,12 +195,6 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)

 	new_entry_line:

-		if (!parse_line(line,
-				&start, &end, flags, &offset,
-				&dev_major, &dev_minor, &inode, &filename))
-			continue;
-
-		/*
 		if (sscanf(line, PROC_MAPS_FORMAT,
 			   &start, &end, flags, &offset,
 			   &dev_major, &dev_minor, &inode, &line_end) != 7)
@@ -247,7 +202,6 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)

 		filename = line + line_end;
 		g_strstrip(filename);
-		*/

 		/* Compute access permissions. */
 		perm = 0;
@@ -270,13 +224,9 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)
 		  avoid copying the entry, grow by 1 and point to the last
 		  element.
 		*/
-
-		if (G_UNLIKELY(added >= entry_list_capacity)) {
-			entry_list_capacity *= 2;
-			g_array_set_size(entry_list, entry_list_capacity);
-		}
-
-		entry = &g_array_index(entry_list, glibtop_map_entry, added++);
+		len = entry_list->len;
+		g_array_set_size(entry_list, len + 1);
+		entry = &g_array_index(entry_list, glibtop_map_entry, len);

 		entry->flags = _glibtop_sysdeps_map_entry;
 		entry->start = start;
@@ -303,13 +253,12 @@ glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf,	pid_t pid)

 eof:

-	g_array_set_size(entry_list, added);
 	free(line);
 	fclose (maps);

 	buf->flags = _glibtop_sysdeps_proc_map;

-	buf->number = added;
+	buf->number = entry_list->len;
 	buf->size = sizeof (glibtop_map_entry);
 	buf->total = buf->number * buf->size;

--- a/sysdeps/linux/procmap_smaps.c
+++ b/sysdeps/linux/procmap_smaps.c
@@ -1,172 +0,0 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
-/* Command-line: gperf sysdeps/linux/procmap_smaps.gperf  */
-/* Computed positions: -k'9' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 8 "sysdeps/linux/procmap_smaps.gperf"
-
-#include "glibtop_private.h"
-#include <glibtop/procmap.h>
-#include <stddef.h>
-#define SMAP_OFFSET(MEMBER) offsetof(glibtop_map_entry, MEMBER)
-#line 14 "sysdeps/linux/procmap_smaps.gperf"
-struct smap_value { int name; ptrdiff_t offset; };
-#include <string.h>
-
-#define TOTAL_KEYWORDS 6
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 14
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 19
-/* maximum key range = 16, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20,  5,  0, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20,  5, 20, 20,  0, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[8]];
-      /*FALLTHROUGH*/
-      case 8:
-      case 7:
-      case 6:
-      case 5:
-      case 4:
-        break;
-    }
-  return hval;
-}
-
-struct stringpool_t
-  {
-    char stringpool_str4[sizeof("Rss:")];
-    char stringpool_str5[sizeof("Size:")];
-    char stringpool_str13[sizeof("Shared_Clean:")];
-    char stringpool_str14[sizeof("Private_Dirty:")];
-    char stringpool_str18[sizeof("Shared_Dirty:")];
-    char stringpool_str19[sizeof("Private_Clean:")];
-  };
-static const struct stringpool_t stringpool_contents =
-  {
-    "Rss:",
-    "Size:",
-    "Shared_Clean:",
-    "Private_Dirty:",
-    "Shared_Dirty:",
-    "Private_Clean:"
-  };
-#define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#ifdef __GNUC_STDC_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static /* manually added */
-const struct smap_value *
-_glibtop_find_smap (register const char *str, register unsigned int len)
-{
-  static const unsigned char lengthtable[] =
-    {
-       0,  0,  0,  0,  4,  5,  0,  0,  0,  0,  0,  0,  0, 13,
-      14,  0,  0,  0, 13, 14
-    };
-  static const struct smap_value wordlist[] =
-    {
-      {-1}, {-1}, {-1}, {-1},
-#line 18 "sysdeps/linux/procmap_smaps.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str4,		SMAP_OFFSET(rss)},
-#line 21 "sysdeps/linux/procmap_smaps.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str5,		SMAP_OFFSET(size)},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 19 "sysdeps/linux/procmap_smaps.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str13,	SMAP_OFFSET(shared_clean)},
-#line 17 "sysdeps/linux/procmap_smaps.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str14,	SMAP_OFFSET(private_dirty)},
-      {-1}, {-1}, {-1},
-#line 20 "sysdeps/linux/procmap_smaps.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str18,	SMAP_OFFSET(shared_dirty)},
-#line 16 "sysdeps/linux/procmap_smaps.gperf"
-      {(int)(long)&((struct stringpool_t *)0)->stringpool_str19,	SMAP_OFFSET(private_clean)}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        if (len == lengthtable[key])
-          {
-            register const char *s = wordlist[key].name + stringpool;
-
-            if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
-              return &wordlist[key];
-          }
-    }
-  return 0;
-}
--- a/sysdeps/linux/procmap_smaps.gperf
+++ b/sysdeps/linux/procmap_smaps.gperf
@@ -1,21 +0,0 @@
-%language=ANSI-C
-%includes
-%struct-type
-%readonly-tables
-%pic
-%define lookup-function-name _glibtop_find_smap
-%compare-lengths
-%{
-#include "glibtop_private.h"
-#include <glibtop/procmap.h>
-#include <stddef.h>
-#define SMAP_OFFSET(MEMBER) offsetof(glibtop_map_entry, MEMBER)
-%}
-struct smap_value { int name; ptrdiff_t offset; };
-%%
-Private_Clean:,	SMAP_OFFSET(private_clean)
-Private_Dirty:,	SMAP_OFFSET(private_dirty)
-Rss:,		SMAP_OFFSET(rss)
-Shared_Clean:,	SMAP_OFFSET(shared_clean)
-Shared_Dirty:,	SMAP_OFFSET(shared_dirty)
-Size:,		SMAP_OFFSET(size)
--- a/sysdeps/openbsd/AUTHORS
+++ b/sysdeps/openbsd/AUTHORS
@@ -1,7 +0,0 @@
-Martin Baulig (martin@home-of-linux.org)
-Josh Sled (jsled@scam.XCF.Berkeley.EDU)
-
-Contributions/bugfixes by:
-Antoine Jacoutot <ajacoutot@openbsd.org>
-Ariane van der Steldt <ariane@stack.nl>
-Jasper Lievisse Adriaanse <jasper@openbsd.org>
--- a/sysdeps/openbsd/Makefile.am
+++ b/sysdeps/openbsd/Makefile.am
@@ -1,25 +0,0 @@
-# $OpenBSD: Makefile.am,v 1.2 2011/05/23 19:35:52 jasper Exp $
-
-INCLUDES			= @INCLUDES@
-
-noinst_LTLIBRARIES		= libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
-
-libgtop_sysdeps_2_0_la_SOURCES	= nosuid.c siglist.c sysinfo.c
-
-libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
-
-libgtop_sysdeps_suid_2_0_la_LIBADD	= $(KVM_LIBS)
-libgtop_sysdeps_suid_2_0_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
-				  uptime.c loadavg.c shm_limits.c msg_limits.c \
-				  sem_limits.c proclist.c procstate.c procuid.c \
-				  proctime.c procmem.c procsignal.c prockernel.c \
-				  procsegment.c procargs.c procmap.c netlist.c \
-				  netload.c ppp.c procopenfiles.c fsusage.c \
-				  procwd.c procaffinity.c glibtop_private.c
-
-libgtop_sysdeps_suid_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)
-
-libgtopinclude_HEADERS		= glibtop_server.h glibtop_machine.h \
-				  glibtop_suid.h glibtop_private.h
-
-libgtopincludedir		= $(includedir)/libgtop-2.0
--- a/sysdeps/openbsd/close.c
+++ b/sysdeps/openbsd/close.c
@@ -1,32 +0,0 @@
-/* $OpenBSD: close.c,v 1.2 2011/05/23 19:35:53 jasper Exp $	*/
-
-/* Copyright (C) 1998 Joshua Sled
-   This file is part of LibGTop 1.0.
-
-   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/close.h>
-
-/* Closes pipe to gtop server. */
-
-void
-glibtop_close_p (glibtop *server)
-{ }
--- a/sysdeps/openbsd/cpu.c
+++ b/sysdeps/openbsd/cpu.c
@@ -1,103 +0,0 @@
-/* $OpenBSD: cpu.c,v 1.7 2011/07/10 15:23:01 jasper Exp $	*/
-
-/* Copyright (C) 1998 Joshua Sled
-   This file is part of LibGTop 1.0.
-
-   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/cpu.h>
-
-#include <glibtop_suid.h>
-
-#include <sys/sched.h>
-
-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) +
-(1L << GLIBTOP_CPU_IRQ);
-
-/* MIB array for sysctl */
-static int mib_length=2;
-static int mib [] = { CTL_KERN, KERN_CLOCKRATE };
-static int mib2 [] = { CTL_KERN, KERN_CPTIME };
-
-/* Init function. */
-
-void
-_glibtop_init_cpu_p (glibtop *server)
-{
-	server->sysdeps.cpu = _glibtop_sysdeps_cpu;
-}
-
-/* Provides information about cpu usage. */
-
-void
-glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
-{
-	gulong cpts [CPUSTATES];
-
-	/* sysctl vars*/
-	struct clockinfo ci;
-	size_t length;
-
-	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_CPU), 0);
-
-	memset (buf, 0, sizeof (glibtop_cpu));
-
-	/* If this fails, the nlist may not be valid. */
-	if (server->sysdeps.cpu == 0)
-		return;
-
-	length = sizeof (cpts);
-	if (sysctl (mib2, mib_length, cpts, &length, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (kern.cptime)");
-		return;
-	}
-
-	/* Get the clockrate data */
-	length = sizeof (struct clockinfo);
-	if (sysctl (mib, mib_length, &ci, &length, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (kern.clockrate)");
-		return;
-	}
-
-	/* set user time */
-	buf->user = cpts [CP_USER];
-	/* set nice time */
-	buf->nice = cpts [CP_NICE];
-	/* set sys time */
-	buf->sys = cpts [CP_SYS];
-	/* set idle time */
-	buf->idle = cpts [CP_IDLE];
-	/* set interrupt time */
-	buf->irq = cpts [CP_INTR];
-
-	/* set frequency */
-	buf->frequency = ci.hz;
-	/* set total */
-	buf->total = cpts [CP_USER] + cpts [CP_NICE]
-		+ cpts [CP_SYS] + cpts [CP_IDLE] + cpts [CP_INTR];
-
-	/* Set the flags last. */
-	buf->flags = _glibtop_sysdeps_cpu;
-}
--- a/sysdeps/openbsd/fsusage.c
+++ b/sysdeps/openbsd/fsusage.c
@@ -1,63 +0,0 @@
-/* $OpenBSD: fsusage.c,v 1.4 2011/05/31 19:25:31 jasper Exp $	*/
-
-#include <config.h>
-
-/*
- * statvfs is lacking various members which are present in statfs,
- * like f_(a)syncreads and f_(a)syncwrites. So eventhough we have
- * statvfs, undef it here untill those members are added.
- */
-#undef HAVE_SYS_STATVFS_H
-#undef STAT_STATVFS
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/fsusage.h>
-
-#include <glibtop_suid.h>
-
-#include <glib.h>
-
-#include <unistd.h>
-#include <sys/param.h>
-#if defined (HAVE_SYS_STATVFS_H)
-#include <sys/statvfs.h>
-#else
-#include <sys/mount.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-void
-_glibtop_openbsd_get_fsusage_read_write(glibtop *server,
-				      glibtop_fsusage *buf,
-				      const char *path);
-
-void
-_glibtop_openbsd_get_fsusage_read_write(glibtop *server,
-				      glibtop_fsusage *buf,
-				      const char *path)
-{
-	int result;
-#if defined (STAT_STATVFS)
-	struct statvfs sfs;
-#else
-	struct statfs sfs;
-#endif
-
-#if defined (STAT_STATVFS)
-	result = statvfs (path, &sfs);
-#else
-	result = statfs (path, &sfs);
-#endif
-
-	if (result == -1) {
-		return;
-	}
-
-	buf->read = sfs.f_syncreads + sfs.f_asyncreads;
-	buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
-	buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
-}
--- a/sysdeps/openbsd/glibtop_machine.h
+++ b/sysdeps/openbsd/glibtop_machine.h
@@ -1,55 +0,0 @@
-/* $OpenBSD: glibtop_machine.h,v 1.3 2011/05/23 19:35:53 jasper Exp $	*/
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_MACHINE_H__
-#define __GLIBTOP_MACHINE_H__
-
-#include <sys/param.h>
-#include <nlist.h>
-#include <kvm.h>
-#include <sys/dkstat.h>
-#include <time.h>
-#include <sys/user.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-#include <fcntl.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_machine glibtop_machine;
-
-struct _glibtop_machine
-{
-	uid_t uid, euid;
-	gid_t gid, egid;
-
-	/* The kernel descriptor, used by kvm_* calls.  We keep and re-use
-	 * it rather than re-getting it for almost all function
-	 * invocations. */
-	kvm_t *kd;
-};
-
-G_END_DECLS
-
-#endif /* __GLIBTOP_MACHINE_H__ */
--- a/sysdeps/openbsd/glibtop_private.c
+++ b/sysdeps/openbsd/glibtop_private.c
@@ -1,56 +0,0 @@
-/* $OpenBSD: glibtop_private.c,v 1.2 2011/05/23 19:35:53 jasper Exp $	*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-
-#include "glibtop_private.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-#include <glib.h>
-#include <errno.h>
-
-char *
-execute_lsof(pid_t pid) {
-	char *output = NULL;
-	char *lsof;
-	char *command;
-	int   exit_status;
-
-	lsof = g_find_program_in_path("lsof");
-	if (lsof == NULL)
-		return NULL;
-
-	command = g_strdup_printf("%s -n -P -Fftn -p %d", lsof, pid);
-	g_free(lsof);
-
-	if (g_spawn_command_line_sync (command, &output, NULL, &exit_status, NULL)) {
-		if (exit_status != 0) {
-			g_warning("Could not execute \"%s\" (%i)\nMake sure lsof(8) is installed sgid kmem.",
-				   command, exit_status);
-			output = NULL;
-		}
-	}
-
-	g_free(command);
-	return output;
-}
-
-/* Ported from linux/glibtop_private.c */
-gboolean
-safe_readlink(const char *path, char *buf, int bufsiz)
-{
-	int ret;
-
-	ret = readlink(path, buf, bufsiz - 1);
-
-	if (ret == -1) {
-		g_warning("Could not read link %s : %s", path, strerror(errno));
-		return FALSE;
-	}
-
-	buf[ret] = '\0';
-	return TRUE;
-}
--- a/sysdeps/openbsd/glibtop_private.h
+++ b/sysdeps/openbsd/glibtop_private.h
@@ -1,42 +0,0 @@
-/* $OpenBSD: glibtop_private.h,v 1.2 2011/05/23 19:35:53 jasper Exp $	*/
-
-/* Copyright (C) 2007 Joe Marcus Clarke
-   This file is part of LibGTop 2.0.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __OPENBSD__GLIBTOP_PRIVATE_H__
-#define __OPENBSD__GLIBTOP_PRIVATE_H__
-
-#include <glibtop.h>
-#include <glibtop/error.h>
-
-#include <glib.h>
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-
-G_BEGIN_DECLS
-
-char *execute_lsof(pid_t pid);
-gboolean safe_readlink(const char *path, char *buf, int bufsiz);
-
-G_END_DECLS
-
-#endif /* __OPENBSD__GLIBTOP_PRIVATE_H__ */
--- a/sysdeps/openbsd/glibtop_server.h
+++ b/sysdeps/openbsd/glibtop_server.h
@@ -1,55 +0,0 @@
-/* $OpenBSD: glibtop_server.h,v 1.2 2011/05/23 19:35:53 jasper Exp $	*/
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SERVER_H__
-#define __GLIBTOP_SERVER_H__
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_SUID_CPU		(1 << GLIBTOP_SYSDEPS_CPU)
-#define GLIBTOP_SUID_MEM		(1 << GLIBTOP_SYSDEPS_MEM)
-#define GLIBTOP_SUID_SWAP		(1 << GLIBTOP_SYSDEPS_SWAP)
-#define GLIBTOP_SUID_UPTIME		(1 << GLIBTOP_SYSDEPS_UPTIME)
-#define GLIBTOP_SUID_LOADAVG		(1 << GLIBTOP_SYSDEPS_LOADAVG)
-#define GLIBTOP_SUID_SHM_LIMITS		(1 << GLIBTOP_SYSDEPS_SHM_LIMITS)
-#define GLIBTOP_SUID_MSG_LIMITS		(1 << GLIBTOP_SYSDEPS_MSG_LIMITS)
-#define GLIBTOP_SUID_SEM_LIMITS		(1 << GLIBTOP_SYSDEPS_SEM_LIMITS)
-#define GLIBTOP_SUID_PROCLIST		(1 << GLIBTOP_SYSDEPS_PROCLIST)
-#define GLIBTOP_SUID_PROC_STATE		(1 << GLIBTOP_SYSDEPS_PROC_STATE)
-#define GLIBTOP_SUID_PROC_UID		(1 << GLIBTOP_SYSDEPS_PROC_UID)
-#define GLIBTOP_SUID_PROC_MEM		(1 << GLIBTOP_SYSDEPS_PROC_MEM)
-#define GLIBTOP_SUID_PROC_TIME		(1 << GLIBTOP_SYSDEPS_PROC_TIME)
-#define GLIBTOP_SUID_PROC_SIGNAL	(1 << GLIBTOP_SYSDEPS_PROC_SIGNAL)
-#define GLIBTOP_SUID_PROC_KERNEL	(1 << GLIBTOP_SYSDEPS_PROC_KERNEL)
-#define GLIBTOP_SUID_PROC_SEGMENT	(1 << GLIBTOP_SYSDEPS_PROC_SEGMENT)
-#define GLIBTOP_SUID_PROC_ARGS		(1 << GLIBTOP_SYSDEPS_PROC_ARGS)
-#define GLIBTOP_SUID_PROC_MAP		(1 << GLIBTOP_SYSDEPS_PROC_MAP)
-#define GLIBTOP_SUID_NETLOAD		(1 << GLIBTOP_SYSDEPS_NETLOAD)
-#define GLIBTOP_SUID_NETLIST		0
-#define GLIBTOP_SUID_PPP		(1 << GLIBTOP_SYSDEPS_PPP)
-#define GLIBTOP_SUID_PROC_WD		0
-#define GLIBTOP_SUID_PROC_AFFINITY	0
-
-G_END_DECLS
-
-#endif
--- a/sysdeps/openbsd/glibtop_suid.h
+++ b/sysdeps/openbsd/glibtop_suid.h
@@ -1,58 +0,0 @@
-/* $OpenBSD: glibtop_suid.h,v 1.2 2011/05/23 19:35:53 jasper Exp $	*/
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_SUID_H__
-#define __GLIBTOP_SUID_H__
-
-G_BEGIN_DECLS
-
-#if _IN_LIBGTOP
-#include <sys/param.h>
-#endif
-
-#define KI_PROC(ki) (&(ki))->kp_proc)
-#define KI_EPROC(ki) (&(ki))->kp_eproc)
-
-#define FORCEUREAD	1
-#define UREADOK(ki)	(FORCEUREAD || (KI_PROC(ki)->p_flag & P_INMEM))
-
-static inline void glibtop_suid_enter (glibtop *server) {
-	setregid (server->machine.gid, server->machine.egid);
-};
-
-static inline void glibtop_suid_leave (glibtop *server) {
-	if (setregid (server->machine.egid, server->machine.gid))
-		_exit (1);
-};
-
-void
-glibtop_init_p (glibtop *server, const unsigned long features,
-		const unsigned flags);
-void
-glibtop_open_p (glibtop *server, const char *program_name,
-		const unsigned long features,
-		const unsigned flags);
-
-G_END_DECLS
-
-#endif
--- a/sysdeps/openbsd/loadavg.c
+++ b/sysdeps/openbsd/loadavg.c
@@ -1,61 +0,0 @@
-/* $OpenBSD: loadavg.c,v 1.2 2011/05/23 19:35:53 jasper Exp $	*/
-
-/* Copyright (C) 1998 Joshua Sled
-   This file is part of LibGTop 1.0.
-
-   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/loadavg.h>
-
-#include <glibtop_suid.h>
-
-static const unsigned long _glibtop_sysdeps_loadavg =
-(1L << GLIBTOP_LOADAVG_LOADAVG);
-
-/* Init function. */
-
-void
-_glibtop_init_loadavg_p (glibtop *server)
-{
-	server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
-}
-
-/* Provides load averange. */
-
-void
-glibtop_get_loadavg_p (glibtop *server, glibtop_loadavg *buf)
-{
-	double ldavg[3];
-	int i;
-
-	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_LOADAVG), 0);
-
-	memset (buf, 0, sizeof (glibtop_loadavg));
-
-	getloadavg (ldavg, 3);
-
-	/* fill in the struct */
-	buf->flags = _glibtop_sysdeps_loadavg;
-	for (i = 0; i < 3; i++) {
-		buf->loadavg [i] = ldavg [i];
-	} /* end for */
-}
--- a/sysdeps/openbsd/mem.c
+++ b/sysdeps/openbsd/mem.c
@@ -1,152 +0,0 @@
-/* $OpenBSD: mem.c,v 1.11 2011/07/10 15:23:01 jasper Exp $	*/
-
-/* Copyright (C) 1998 Joshua Sled
-   This file is part of LibGTop 1.0.
-
-   Contributed by Joshua Sled <jsled@xcf.berkeley.edu>, July 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <config.h>
-#include <glibtop.h>
-#include <glibtop/error.h>
-#include <glibtop/mem.h>
-
-#include <glibtop_suid.h>
-
-#include <sys/mount.h>
-#include <sys/sysctl.h>
-#include <sys/vmmeter.h>
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_param.h>
-
-static const unsigned long _glibtop_sysdeps_mem =
-(1L << GLIBTOP_MEM_TOTAL)  + (1L << GLIBTOP_MEM_USED) +
-(1L << GLIBTOP_MEM_FREE)   + (1L << GLIBTOP_MEM_SHARED) +
-(1L << GLIBTOP_MEM_BUFFER) + (1L << GLIBTOP_MEM_CACHED) +
-(1L << GLIBTOP_MEM_USER)   + (1L << GLIBTOP_MEM_LOCKED);
-
-#ifndef LOG1024
-#define LOG1024		10
-#endif
-
-/* these are for getting the memory statistics */
-static int pageshift;		/* log base 2 of the pagesize */
-
-/* define pagetok in terms of pageshift */
-#define pagetok(size) ((size) << pageshift)
-
-/* nlist structure for kernel access */
-static struct nlist nlst [] = {
-	{ "_bufpages" },
-	{ 0 }
-};
-
-/* MIB array for sysctl */
-static int vmmeter_mib [] = { CTL_VM, VM_METER };
-static int uvmexp_mib  [] = { CTL_VM, VM_UVMEXP };
-static int bcstats_mib [] = { CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT };
-
-/* Init function. */
-
-void
-_glibtop_init_mem_p (glibtop *server)
-{
-	register int pagesize;
-
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
-		glibtop_warn_io_r (server, "kvm_nlist (mem)");
-		return;
-	}
-
-	/* get the page size and calculate pageshift from it */
-	pagesize = sysconf(_SC_PAGESIZE);
-	pageshift = 0;
-	while (pagesize > 1) {
-		pageshift++;
-		pagesize >>= 1;
-	}
-
-	/* we only need the amount of log(2)1024 for our conversion */
-	pageshift -= LOG1024;
-
-	server->sysdeps.mem = _glibtop_sysdeps_mem;
-}
-
-void
-glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
-{
-	struct vmtotal vmt;
-	struct uvmexp uvmexp;
-	struct bcachestats bcstats;
-	u_int v_used_count;
-	u_int v_total_count;
-	u_int v_free_count;
-	size_t length;
-
-	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_MEM), 0);
-
-	memset (buf, 0, sizeof (glibtop_mem));
-
-	if (server->sysdeps.mem == 0)
-		return;
-
-	/* Get the data from sysctl */
-	length = sizeof (vmt);
-	if (sysctl (vmmeter_mib, 2, &vmt, &length, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (vm.vmmeter)");
-		bzero(&vmt, sizeof(length));
-		return;
-	}
-
-	length = sizeof (uvmexp);
-	if (sysctl (uvmexp_mib, 2, &uvmexp, &length, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (vm.uvmexp)");
-		bzero(&uvmexp, sizeof(length));
-		return;
-	}
-
-	length = sizeof (bcstats);
-	if (sysctl (bcstats_mib, 3, &bcstats, &length, NULL, 0)) {
-		glibtop_warn_io_r (server, "sysctl (vfs.generic.bcstats)");
-		bzero(&bcstats, sizeof(length));
-		return;
-	}
-
-	/*
-	 * t_arm = active real memory
-	 * t_rm = total real memory in use
-	 * t_free = free memory pages
-	 */
-	v_total_count = vmt.t_rm + vmt.t_free;
-	v_used_count = vmt.t_rm;
-	v_free_count = vmt.t_free;
-
-	/* convert memory stats to Kbytes */
-	buf->total = (guint64) pagetok (v_total_count) << LOG1024;
-	buf->used  = (guint64) pagetok (v_used_count) << LOG1024;
-	buf->free  = (guint64) pagetok (v_free_count) << LOG1024;
-	buf->locked = (guint64) pagetok (uvmexp.wired) << LOG1024;
-	buf->shared = (guint64) pagetok (vmt.t_rmshr) << LOG1024;
-	buf->cached = (guint64) pagetok (bcstats.numbufpages) << LOG1024;
-	buf->buffer = 0;
-
-	buf->user = buf->total - buf->free - buf->cached - buf->buffer;
-
-	/* Set the values to return */
-	buf->flags = _glibtop_sysdeps_mem;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shankar Prasad	71f7237545	updated kn.po	2014-02-05 16:39:57 +05:30
Carles Ferrando	c8714ddae9	Added Catalan (Valencian) translation	2009-09-02 18:34:00 +02:00
Manoj Kumar Giri	45b8de5185	Added entries for Hindi Translation updated by Rajesh Ranjan	2009-06-10 20:09:47 +05:30
Manoj Kumar Giri	a646d817b8	Updated Hindi Translation on behalf of Rajesh Ranjan	2009-06-10 20:08:36 +05:30
krishnababu k	a1801dcf9e	Adding new Telegu Translations	2009-05-15 18:01:16 +05:30
Benoît Dejean	a607d50f76	Fixed format.	2009-04-18 20:42:39 +02:00
Benoît Dejean	8e9ab26890	plural errors prevents me from pushing the gnome-2-26 branch. Commenting these errors.	2009-04-18 20:38:51 +02:00