Build daemon on linux.

svn path=/branches/linux_daemon/; revision=2615

.gitignore

@@ -1,101 +0,0 @@
-sysdeps/Makefile
-sysdeps/Makefile.in
-sysdeps/*/Makefile
-sysdeps/*/Makefile.in
-sysdeps/*/.deps
-sysdeps/*/.libs
-sysdeps/*/*.o
-sysdeps/*/*.lo
-sysdeps/*/*.la
-src/*/Makefile
-src/*/Makefile.in
-src/*/.deps
-src/Makefile
-src/Makefile.in
-stamp-h1
-po/*.gmo
-po/stamp-it
-po/POTFILES
-po/Makefile.in.in
-po/Makefile.in
-po/Makefile
-missing
-misc/Makefile
-misc/Makefile.in
-m4/
-ltmain.sh
-libtool
-libgtopconfig.h
-libgtop.spec
-libgtop-2.0.pc
-lib/Makefile
-lib/Makefile.in
-lib/.deps
-lib/.libs
-lib/*.o
-lib/*.lo
-lib/*.la
-lib/lib.c
-lib/GTop-2.0.gir
-lib/GTop-2.0.typelib
-INSTALL
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-compile
-depcomp
-doc/Makefile
-doc/Makefile.in
-doc/libgtop2.info
-doc/mdate-sh
-doc/reference/Makefile
-doc/reference/Makefile.in
-doc/reference/html/
-doc/reference/libgtop-decl-list.txt
-doc/reference/libgtop-decl.txt
-doc/reference/tmpl/
-doc/reference/version.xml
-doc/reference/xml/
-doc/stamp-vti
-doc/texinfo.tex
-doc/version.texi
-examples/.deps/
-examples/.libs/
-examples/*.o
-examples/Makefile
-examples/Makefile.in
-examples/affinity
-examples/df
-examples/first
-examples/mem
-examples/mountlist
-examples/netlist
-examples/netload
-examples/openfiles
-examples/pprint
-examples/procargs
-examples/proclist
-examples/procmap
-examples/second
-examples/smp
-examples/sysdeps
-examples/timings
-examples/wd
-gtk-doc.make
-include/Makefile
-include/Makefile.in
-include/glibtop/Makefile
-include/glibtop/Makefile.in
-install-sh
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-

COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

MAINTAINERS

@@ -1,4 +1 @@
-Benoît Dejean
+Benoît Dejean (benoit@placenet.org)
-E-mail: benoit@placenet.org
-Userid: bdejean
-

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
-	intltool-update.in \
-	m4/introspection.m4
 
 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

NEWS

@@ -1,156 +1,3 @@
-19 August 2013: Overview of changes in 2.28.5
-=============================================
-* Fix numerous bugs in the OpenBSD backend.
-* Updated translations.
-
-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:
-  - glibtop_get_mounlist(...): also hide "none" fs.
-
-1 Mars 2009: Overview of changes in 2.26.0
-==========================================
-* Nothing.
-
-17 February 2009: Overview of changes in 2.25.91
-================================================
-* Synced with gnome-2-24.
-
-19 January 2009: Overview of changes in 2.24.4
-==============================================
-* Fixed license: libgtop is GPL-2.
-
-12 January 2009: Overview of changes in 2.24.3
-==============================================
-* linux:
-  - fixed potential memory leak. Vincent Untz.
-  - fixed read(2) usage. Should fix the missing cpus bug in system-monitor.
-* darwin:
-  - fixed build. "paul".
-
-22 Septembre 2008: Overview of changes in 2.24.0
-================================================
-* Translation updates.
-
-18 August 2008: Overview of changes in 2.23.90
-==============================================
-* freebsd:
-  - updated port by Joe Marcus Clarke.
-
-23 June 2008: Overview of changes in 2.23.4
-===========================================
-* linux:
-  - Fixed and improved glibtop_get_fsusage with kernel >= 2.6.25.
-    Closes #539360.
-
-24 May 2008: Overview of changes in 2.23.2
-==========================================
-* glibtop_get_proc_open_files API can also lists IPv6 TCP sockets.
-* glibtop_get_proc_affinity : new API to retrieve process CPU affinity.
-
-(Let's hope one day i'll find the gtk-doc documentation ...)
-
-* linux:
-  - fixed parsing of big /proc/stat for uptime.
-
-04 April 2008: Overview of changes in 2.22.1
-============================================
-* Fixed compilation/dist for !linux.
-  Closes #525953.
-
-10 Mars 2008: Overview of changes in 2.22.0
-===========================================
-* linux:
-  - fixed proc_kernel.
- 
-25 February 2008: Overview of changes in 2.21.92
-================================================
-* linux:
-  - fixed smaps parsing on >= 2.6.24.x.
-
-14 January 2008: Overview of changes in 2.21.5
-==============================================
-* freebsd:
-  - fixed build on GNU/kfreebsd. Petr Salinger.
-  - fixed procmem units. Kuang-che Wu.
-
-28 October 2007: Overview of changes in 2.21.1
-==============================================
-* don't export _p/_s private symbols anymore. This is not an API/ABI breakage.
-* darwin implementation by Benjamin Reed.
-* linux:
-  - splitted fsusage and mountlist implementations;
-  - smarter mountlist(allfs = False);
-  - fixed some compile warning on 64bit;
-* solaris:
-  - fixed netload build by Henry Zhang.
-
-16 September 2007: Overview of changes in 2.20.0
-================================================
-* Updated translations.
-
-27 August 2007: Overview of changes in 2.19.92
-==============================================
-* Fixed stupid hardwired path in linux/sysinfo.c
-
-26 August 2007: Overview of changes in 2.19.91
-==============================================
-* Translations updates.
-* linux:
-  - Small internal improvement. Might fix sysinfo when having more than
-  8 CPUS.
-
-9 July 2007: Overview of changes in 2.19.5
-==========================================
-* linux:
-  - fixed proc_map for >= 2.6.22
-* freebsd:
-  - implemented procwd and procopenfiles
-    Joe Marcus Clarke
-
 18 June 2007: Overview of changes in 2.19.4
 ===========================================
 * solaris:

autogen.sh

@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Gnome Top Library"
 
-(test -f $srcdir/configure.ac \
+(test -f $srcdir/configure.in \
   && test -f $srcdir/copyright.txt \
   && test -d $srcdir/sysdeps) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"

configure.in

@@ -3,12 +3,12 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [28])
+m4_define([libgtop_minor_version], [19])
-m4_define([libgtop_micro_version], [6])
+m4_define([libgtop_micro_version], [4])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.
-m4_define([libgtop_current], [10])
+m4_define([libgtop_current], [8])
 
 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
@@ -17,7 +17,7 @@ m4_define([libgtop_revision], [0])
 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-m4_define([libgtop_age], [0])
+m4_define([libgtop_age], [1])
 
 # Increase each time you change the client/server protocol.
 m4_define([libgtop_server_version], [5])
@@ -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
+AC_CANONICAL_SYSTEM
-
-AM_INIT_AUTOMAKE([-Wno-portability tar-ustar no-dist-gzip dist-xz])
-AC_CONFIG_MACRO_DIR([m4])
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
+AM_INIT_AUTOMAKE
 AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
 
 AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version])
@@ -91,9 +88,8 @@ GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES
 
 GLIB_REQUIRED=2.6.0
-GOBJECT_REQUIRED=2.26.0
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GOBJECT_REQUIRED)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
@@ -384,9 +380,6 @@ sysdeps/freebsd/Makefile
 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

copyright.txt

@@ -16,7 +16,7 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 

debian/rules.in

@@ -10,7 +10,7 @@
 i=$(shell pwd)/debian/tmp
 b=$(shell pwd)/debian/build
 
-configure: configure.ac
+configure: configure.in
 	@echo "--- Making configure script and configuring"
 	chmod +x autogen.sh
 	./autogen.sh --prefix=/@PREFIX@ --with-gnome=/@GNOMEPREFIX@ \

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.

doc/reference/libgtop-docs.xml

@@ -36,8 +36,8 @@
       Documentation License</citetitle> from the Free Software
       Foundation by visiting <ulink type="http"
       url="http://www.fsf.org">their Web site</ulink> or by writing
-      to: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      to: Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02110-1301, USA.</para>
+      Boston, MA 02111-1307, USA.</para>
 
       <para>Many of the names used by companies to distinguish their
       products and services are claimed as trademarks. Where those

doc/reference/libgtop-sections.txt

@@ -219,8 +219,17 @@ glibtop_set_parameter_l
 <INCLUDE>glibtop/procargs.h</INCLUDE>
 <SECTION>
 <FILE>procargs</FILE>
+GLIBTOP_PROC_ARGS_SIZE
+GLIBTOP_MAX_PROC_ARGS
 glibtop_proc_args
+glibtop_get_proc_args_l
 glibtop_get_proc_args
+glibtop_get_proc_args_r
+glibtop_init_proc_args_p
+glibtop_get_proc_args_p
+glibtop_init_proc_args_s
+glibtop_get_proc_args_s
+glibtop_get_proc_argv_l
 glibtop_get_proc_argv
 </SECTION>
 
@@ -411,8 +420,26 @@ glibtop_get_proc_uid_s
 <INCLUDE>glibtop/proctime.h</INCLUDE>
 <SECTION>
 <FILE>proctime</FILE>
+GLIBTOP_PROC_TIME_START_TIME
+GLIBTOP_PROC_TIME_RTIME
+GLIBTOP_PROC_TIME_UTIME
+GLIBTOP_PROC_TIME_STIME
+GLIBTOP_PROC_TIME_CUTIME
+GLIBTOP_PROC_TIME_CSTIME
+GLIBTOP_PROC_TIME_TIMEOUT
+GLIBTOP_PROC_TIME_IT_REAL_VALUE
+GLIBTOP_PROC_TIME_FREQUENCY
+GLIBTOP_PROC_TIME_XCPU_UTIME
+GLIBTOP_PROC_TIME_XCPU_STIME
+GLIBTOP_MAX_PROC_TIME
 glibtop_proc_time
 glibtop_get_proc_time
+glibtop_get_proc_time_r
+glibtop_get_proc_time_l
+glibtop_init_proc_time_p
+glibtop_get_proc_time_p
+glibtop_init_proc_time_s
+glibtop_get_proc_time_s
 </SECTION>
 
 <INCLUDE>glibtop/signal.h</INCLUDE>
@@ -488,6 +515,10 @@ glibtop_send_version
 <INCLUDE>glibtop/proclist.h</INCLUDE>
 <SECTION>
 <FILE>proclist</FILE>
+GLIBTOP_PROCLIST_NUMBER
+GLIBTOP_PROCLIST_TOTAL
+GLIBTOP_PROCLIST_SIZE
+GLIBTOP_MAX_PROCLIST
 GLIBTOP_KERN_PROC_ALL
 GLIBTOP_KERN_PROC_PID
 GLIBTOP_KERN_PROC_PGRP
@@ -501,6 +532,12 @@ GLIBTOP_EXCLUDE_SYSTEM
 GLIBTOP_EXCLUDE_NOTTY
 glibtop_proclist
 glibtop_get_proclist
+glibtop_get_proclist_r
+glibtop_get_proclist_l
+glibtop_init_proclist_p
+glibtop_get_proclist_p
+glibtop_init_proclist_s
+glibtop_get_proclist_s
 </SECTION>
 
 <INCLUDE>glibtop/sem_limits.h</INCLUDE>

examples/Makefile.am

@@ -1,10 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_LDFLAGS			= $(LIBGTOP_EXTRA_LIBS)
+LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+
+INCLUDES		= @INCLUDES@
+
+DEFS			= @DEFS@
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp proclist mem wd affinity
+			  openfiles smp proclist mem wd
 
 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -54,5 +58,3 @@ wd_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 mem_SOURCE	= mem.c
 mem_LDADD	= $(top_builddir)/lib/libgtop-2.0.la
 
-affinity_SOURCES	= affinity.c
-affinity_LDADD	= $(top_builddir)/lib/libgtop-2.0.la

examples/affinity.c

@@ -1,34 +0,0 @@
-#include <glibtop.h>
-#include <glibtop/procaffinity.h>
-
-#include <glib.h>
-#include <unistd.h>
-
-int main(int argc, char **argv)
-{
-	pid_t pid;
-	glibtop_proc_affinity buf;
-	guint16 *cpus;
-	size_t i;
-
-	if (argc < 2 || !(pid = strtoul(argv[1], NULL, 0)))
-		pid = getpid();
-
-	glibtop_init();
-
-	cpus = glibtop_get_proc_affinity(&buf, pid);
-
-	g_print("Process %u:\n"
-		" - all: %d\n",
-		(unsigned)pid, buf.all);
-
-	for (i = 0; i != buf.number; ++i)
-		g_print(" - CPU#%u is set\n", cpus[i]);
-
-	g_free(cpus);
-
-	glibtop_close();
-
-	return 0;
-}
-

examples/df.c

@@ -15,35 +15,28 @@ static void print_fsusage(const char *mountpoint)
 
   glibtop_get_fsusage(&buf, mountpoint);
 
-  printf("%-30s %10llu %10llu %10llu %5.1f %10llu %10llu\n",
+  printf("%-20s %-10llu %-10llu %-10llu %.1f\n",
 	 mountpoint,
 	 buf.blocks * buf.block_size >> 20,
 	 (buf.blocks - buf.bavail) * buf.block_size >> 20,
 	 buf.bavail * buf.block_size >> 20,
-	 (buf.blocks - buf.bavail) * 100.0 / (buf.blocks ? buf.blocks : 1.0),
+	 (buf.blocks - buf.bavail) * 100.0 / buf.blocks
-	 buf.read,
-	 buf.write
 	 );
 }
 
 
-int main(int argc, char **argv)
+int main()
 {
   glibtop_mountlist buf;
-
-  glibtop_init();
-
-  printf("%-30s %10s %10s %10s %5s %10s %10s\n",
-	 "Filesystem", "Size", "Used", "Avail", "Use%", "Read", "Write");
-
-  if (argc > 1) {
-    while (*++argv)
-      print_fsusage(*argv);
-  } else {
   glibtop_mountentry *entries;
   size_t i;
 
-    entries = glibtop_get_mountlist(&buf, TRUE);
+  glibtop_init();
+
+  printf("%-20s %-10s %-10s %-10s %-10s\n",
+	 "Filesystem", "Size", "Used", "Avail", "Use%");
+
+  entries = glibtop_get_mountlist(&buf, FALSE);
 
   for(i = 0; i < buf.number; ++i)
     {
@@ -51,7 +44,6 @@ int main(int argc, char **argv)
     }
 
   g_free(entries);
-  }
 
   glibtop_close();
 

examples/first.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -47,9 +47,9 @@ main (int argc, char *argv [])
 {
 	glibtop_union data;
 	glibtop_sysdeps sysdeps;
-	unsigned c, method, count, port, i;
+	unsigned c, method, count, port, i, *ptr;
 	char buffer [BUFSIZ];
-	pid_t pid, ppid, *ptr;
+	pid_t pid, ppid;
 	char *args;
 
 	count = PROFILE_COUNT;

examples/mountlist.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/netlist.c

@@ -14,8 +14,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/netload.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/openfiles.c

@@ -37,16 +37,9 @@ static void show_open_files(pid_t pid)
 		  printf("socket %s:%d\n", files[i].info.sock.dest_host, files[i].info.sock.dest_port);
 		  break;
 
-	  case GLIBTOP_FILE_TYPE_INET6SOCKET:
-		  printf("socket [%s]:%d\n", files[i].info.sock.dest_host, files[i].info.sock.dest_port);
-		  break;
-
 	  case GLIBTOP_FILE_TYPE_LOCALSOCKET:
 		  printf("localsocket %s\n", files[i].info.localsock.name);
 		  break;
-
-	  default:
-		  printf("unknown type\n");
 	  }
   }
 

examples/pprint.c

@@ -3,7 +3,6 @@
 #endif
 
 #include <glibtop.h>
-#include <glibtop/sysinfo.h>
 
 #include <glibtop/union.h>
 
@@ -30,41 +29,9 @@ for(i = 0; i < (SIZE - 1); ++i) printf(".%u = " FORMAT ", ", i, buf.ARRAY[i]); \
 printf(".%u = " FORMAT " }\n", SIZE - 1 , buf.ARRAY[SIZE - 1]); \
 } while(0)
 
-#define PPRINT_ENTRY_ARRAY(ARRAY, SIZE) do { \
-size_t i; \
-printf("\t%4lu B %3lu " #ARRAY "[%lu] = { ", \
-(unsigned long) sizeof buf->ARRAY, 0,\
-(unsigned long) G_N_ELEMENTS(buf->ARRAY)); \
-for(i = 0; i < SIZE; ++i) { \
-printf ("[ ");\
-PPRINT_HASHTABLE(buf->ARRAY[i].values); \
-printf ("]\n");\
-} \
-printf("} "); \
-} while(0)
-
-#define PPRINT_HASHTABLE(HASHTABLE) do { \
-g_hash_table_foreach (HASHTABLE, (GHFunc)pprint_hashtable_item, NULL); \
-} while(0)
-
 #define FOOTER_PPRINT() putchar('\n');
 
-static void pprint_hashtable_item(gchar* key, gchar* value, gpointer user_data) 
-{
-  printf ("'%s': '%s', ", key, value);
-}
-static void pprint_get_sysinfo(void)
-{
-  const glibtop_sysinfo *buf;
 
-  buf = glibtop_get_sysinfo();
-
-  HEADER_PPRINT(glibtop_get_sysinfo);
-  //PPRINT(flags, "%#llx");
-  //PPRINT(ncpu, "%llu");
-  PPRINT_ENTRY_ARRAY(cpuinfo, 4);
-  FOOTER_PPRINT();
-}
 
 static void pprint_get_cpu(void)
 {
@@ -324,7 +291,6 @@ int main()
 {
   glibtop_init();
 
-  pprint_get_sysinfo();
   pprint_get_cpu();
 
   pprint_get_fsusage("/");

examples/proclist.c

@@ -11,7 +11,7 @@
 
 static void print_pids(guint64 which, guint64 arg)
 {
-	pid_t *pids;
+	unsigned *pids;
 	unsigned i;
 	glibtop_proclist buf;
 

examples/procmap.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -108,10 +108,10 @@ main (int argc, char *argv [])
 
 			if (sizeof (void*) == 8)
 				format = "%016lx-%016lx %016lx - "
-					 "%02x:%02x %08lu - %5.5s - %s\n";
+					 "%02x:%02x %08lu - %4s - %s\n";
 			else
 				format = "%08lx-%08lx %08lx - "
-					 "%02x:%02x %08lu - %5.5s - %s\n";
+					 "%02x:%02x %08lu - %4s - %s\n";
 
 			fprintf (stderr, format,
 				 (unsigned long) maps [i].start,

examples/second.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -239,8 +239,7 @@ main (int argc, char *argv [])
 {
 	glibtop_proclist proclist;
 	glibtop_sysdeps sysdeps;
-	unsigned i;
+	unsigned *ptr, pid, i;
-	pid_t *ptr, pid;
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);

examples/smp.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

examples/sysdeps.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H

examples/timings.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -44,7 +44,7 @@
 #endif
 
 #ifndef PROFILE_COUNT_EXPENSIVE
-#define PROFILE_COUNT_EXPENSIVE		(PROFILE_COUNT / 10)
+#define PROFILE_COUNT_EXPENSIVE		10000L
 #endif
 
 #define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 +	(unsigned long) elapsed_utime.tv_usec)
@@ -73,13 +73,13 @@ int
 main (int argc, char *argv [])
 {
 	glibtop_union data;
-	unsigned c;
+	unsigned c, count, *ptr;
 	struct rusage total_start, total_end;
 	struct rusage rusage_start, rusage_end;
 	struct timeval elapsed_utime, elapsed_stime;
 	pid_t pid;
 
-	pid = getpid ();
+	count = PROFILE_COUNT;
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
@@ -184,10 +184,12 @@ main (int argc, char *argv [])
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);
 
+	printf ("\n");
+
 	getrusage (RUSAGE_SELF, &rusage_start);
 
 	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
-		pid_t* ptr = glibtop_get_proclist (&data.proclist, 0, 0);
+		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
 		g_free (ptr);
 	}
 
@@ -205,26 +207,9 @@ main (int argc, char *argv [])
 		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
 		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
 
-	getrusage (RUSAGE_SELF, &rusage_start);
+	pid = getpid ();
 
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
+	printf ("\n");
-		char** ptr = glibtop_get_netlist (&data.netlist);
-		g_strfreev (ptr);
-	}
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Netlist      (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proclist.flags,
-		PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
 
 	getrusage (RUSAGE_SELF, &rusage_start);
 
@@ -282,27 +267,6 @@ main (int argc, char *argv [])
 
 	getrusage (RUSAGE_SELF, &rusage_start);
 
-	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
-		glibtop_map_entry* entries;
-		entries = glibtop_get_proc_map (&data.proc_map, pid);
-		g_free (entries);
-	}
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Map     (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_map.flags, PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT_EXPENSIVE,
-		(long double) ELAPSED_STIME / PROFILE_COUNT_EXPENSIVE);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_segment (&data.proc_segment, pid);
 
@@ -321,27 +285,6 @@ main (int argc, char *argv [])
 
 	getrusage (RUSAGE_SELF, &rusage_start);
 
-	for (c = 0; c < PROFILE_COUNT; c++) {
-		char** argv;
-		argv = glibtop_get_proc_argv (&data.proc_args, pid, 0);
-		g_strfreev(argv);
-	}
-
-	getrusage (RUSAGE_SELF, &rusage_end);
-
-	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
-			  &elapsed_utime);
-
-	libgtop_timersub (&rusage_end.ru_stime, &rusage_start.ru_stime,
-			  &elapsed_stime);
-
-	printf ("Proc_Args    (0x%08lx): %7lu - %9.2Lf - %9.2Lf\n",
-		(unsigned long) data.proc_args.flags, PROFILE_COUNT,
-		(long double) ELAPSED_UTIME / PROFILE_COUNT,
-		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
-	getrusage (RUSAGE_SELF, &rusage_start);
-
 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_time (&data.proc_time, pid);
 

features.def

@@ -23,5 +23,4 @@ void|netload|ulong(if_flags,mtu,subnet,address,packets_in,packets_out,packets_to
 void|ppp|ulong(state,bytes_in,bytes_out)|ushort(device)
 char **|netlist|unsigned(number)
 char **|proc_wd|ulong(number),str(root),str(exe)|pid_t(pid)
-guint16*|proc_affinity|ulong(number),int(all)|pid_t(pid)
 

glibtop.h

@@ -15,15 +15,14 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__
 
-#include <glib.h>
+#include <glib/gmacros.h>
-#include <glib-object.h>
 
 G_BEGIN_DECLS
 
@@ -139,8 +138,6 @@ glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);
 
-GType     glibtop_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif

include/glibtop/Makefile.am

@@ -8,7 +8,7 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  procsignal.h union.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
 			  sysinfo.h ppp.h procargs.h netload.h \
-			  procwd.h procaffinity.h \
+			  procwd.h \
 			  netlist.h procopenfiles.h open.h
 
 noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h

include/glibtop/call-vector.h.in

@@ -19,8 +19,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_CALL_VECTOR_H__

include/glibtop/close.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_CLOSE_H__

include/glibtop/command.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_COMMAND_H__
@@ -58,9 +58,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_NETLIST		24
 #define GLIBTOP_CMND_PROC_OPEN_FILES	25
 #define GLIBTOP_CMND_PROC_WD		26
-#define GLIBTOP_CMND_PROC_AFFINITY	27
 
-#define GLIBTOP_MAX_CMND		28
+#define GLIBTOP_MAX_CMND		27
 
 #define _GLIBTOP_PARAM_SIZE		16
 

include/glibtop/cpu.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_CPU_H__
@@ -54,7 +54,7 @@ G_BEGIN_DECLS
    Yes we are :)
    Nobody should really be using more than 32 processors.
 */
-#define GLIBTOP_NCPU		1024
+#define GLIBTOP_NCPU		32
 
 typedef struct _glibtop_cpu	glibtop_cpu;
 

include/glibtop/error.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 

include/glibtop/fsusage.h

@@ -14,8 +14,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_FSUSAGE_H__

include/glibtop/glibtop-server.h

@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 2.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__
+
+#include <glibtop/global.h>
+#include <glibtop/sysdeps.h>
+
+G_BEGIN_DECLS
+
+typedef struct _glibtop_server		glibtop_server;
+typedef struct _glibtop_server_info	glibtop_server_info;
+
+typedef struct _glibtop_closure		glibtop_closure;
+
+struct _glibtop_server_info
+{
+    int ncpu;			/* Number of CPUs, zero if single-processor */
+    unsigned long features;	/* Server is required for this features */
+    glibtop_sysdeps sysdeps;	/* Detailed feature list */
+    glibtop_sysdeps required;	/* Required feature list */
+    glibtop_sysdeps wanted;	/* We only want this features */
+};
+
+struct	_glibtop_server
+{
+    glibtop_server_info *info;
+
+    int refcount;
+    unsigned flags;
+    const char *name;
+
+    void *_priv;
+};
+
+glibtop_server *
+glibtop_server_new (void);
+
+void
+glibtop_server_ref (glibtop_server *server);
+
+void
+glibtop_server_unref (glibtop_server *server);
+
+G_END_DECLS
+
+#endif

include/glibtop/global.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_GLOBAL_H__

include/glibtop/loadavg.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_LOADAVG_H__

include/glibtop/mem.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_MEM_H__

include/glibtop/mountlist.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_MOUNTLIST_H__
@@ -53,38 +53,6 @@ struct _glibtop_mountlist
 	guint64 size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
 };
 
-/**
- * glibtop_get_mountlist:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer full):
- */
-
-/**
- * glibtop_get_mountlist_r:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_mountlist_s:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_mountlist_l:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
 glibtop_mountentry *
 glibtop_get_mountlist(glibtop_mountlist *buf, int all_fs);
 
@@ -96,8 +64,6 @@ glibtop_get_mountlist_l (glibtop *server, glibtop_mountlist *buf, int all_fs);
 glibtop_mountentry *
 glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs);
 
-GType     glibtop_mountlist_get_type (void) G_GNUC_CONST;
-GType     glibtop_mountentry_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 

include/glibtop/msg_limits.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_MSG_LIMITS_H__

include/glibtop/netlist.h

@@ -13,8 +13,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_NETLIST_H__

include/glibtop/netload.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_NETLOAD_H__

include/glibtop/open.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_OPEN_H__

include/glibtop/parameter.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PARAMETER_H__

include/glibtop/ppp.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PPP_H__

include/glibtop/procaffinity.h

@@ -1,61 +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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef __GLIBTOP_PROCAFFINITY_H__
-#define __GLIBTOP_PROCAFFINITY_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_proc_affinity	glibtop_proc_affinity;
-
-#define GLIBTOP_PROC_AFFINITY_NUMBER	0
-#define GLIBTOP_PROC_AFFINITY_ALL	1
-
-struct _glibtop_proc_affinity
-{
-	guint64	flags;
-	guint32 number;
-	gboolean all;
-};
-
-
-guint16 * glibtop_get_proc_affinity(glibtop_proc_affinity *buf, pid_t pid);
-guint16 * glibtop_get_proc_affinity_l(glibtop *server, glibtop_proc_affinity *buf, pid_t pid);
-
-
-#if GLIBTOP_SUID_PROC_AFFINITY
-
-#define glibtop_get_proc_affinity_r glibtop_get_proc_affinity_p
-void _glibtop_init_proc_affinity_p(glibtop *server);
-guint16 * glibtop_get_proc_affinity_p(glibtop *server, glibtop_proc_affinity *buf, pid_t pid);
-
-#else
-
-#define glibtop_get_proc_affinity_r glibtop_get_proc_affinity_s
-void _glibtop_init_proc_affinity_s(glibtop *server);
-guint16 * glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid);
-
-#endif
-
-G_END_DECLS
-
-#endif

include/glibtop/procargs.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROC_ARGS_H__

include/glibtop/prockernel.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCKERNEL_H__

include/glibtop/proclist.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCLIST_H__
@@ -36,89 +36,22 @@ G_BEGIN_DECLS
 /* You can use the folowing constants as the `which' member of
  * glibtop_get_proclist () to specify which processes to fetch. */
 
-/**
+#define GLIBTOP_KERN_PROC_ALL		0	/* all processes */
- * GLIBTOP_KERN_PROC_ALL:
- *
- * Return information about all processes
- **/
-#define GLIBTOP_KERN_PROC_ALL		0
-
-/**
- * GLIBTOP_KERN_PROC_PID:
- *
- * Return all processes with the pid which is passed in @arg. You can use this to find out whether some process still exists.
- **/
 #define GLIBTOP_KERN_PROC_PID		1
-
-/**
- * GLIBTOP_KERN_PROC_PGRP:
- *
- * Return all processes in the process group passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_PGRP		2
-
-/**
- * GLIBTOP_KERN_PROC_SESSION:
- *
- * Return all processes in the session passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_SESSION	3
-
-/**
- * GLIBTOP_KERN_PROC_TTY:
- *
- * Return all processes which have the controlling tty passed in @arg
- * (which is interpreted as the device number). 
- **/
 #define GLIBTOP_KERN_PROC_TTY		4
-
-/**
- * GLIBTOP_KERN_PROC_UID:
- *
- * Return all processes with the effective uid passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_UID		5
-
-/**
- * GLIBTOP_KERN_PROC_RUID:
- *
- * Return all processes with the real uid passed in @arg. 
- **/
 #define GLIBTOP_KERN_PROC_RUID		6
 
 #define GLIBTOP_KERN_PROC_MASK		15
 
-
-/**
- * GLIBTOP_EXCLUDE_IDLE:
- *
- * Exclude idle processes. 
- **/
 #define GLIBTOP_EXCLUDE_IDLE		0x1000
-
-/**
- * GLIBTOP_EXCLUDE_SYSTEM:
- *
- * Exclude system (on most UNIXes root's) processes.
- **/
 #define GLIBTOP_EXCLUDE_SYSTEM		0x2000
-
-/**
- * GLIBTOP_EXCLUDE_NOTTY:
- *
- * Exclude processes without a controlling terminal.
- **/
 #define GLIBTOP_EXCLUDE_NOTTY		0x4000
 
 typedef struct _glibtop_proclist	glibtop_proclist;
 
-/**
- * glibtop_proclist:
- * @number: Number of entries in the returned list.
- * @total: Total size of the returned list (this equals @number * @size).
- * @size: Size of a single entry in the returned list 
- * (this equals <type>sizeof(unsigned)</type>).
- */
 struct _glibtop_proclist
 {
 	guint64	flags;
@@ -127,15 +60,6 @@ struct _glibtop_proclist
 	guint64 size;			/* GLIBTOP_PROCLIST_SIZE	*/
 };
 
-/**
- * glibtop_get_proclist:
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 
@@ -145,16 +69,6 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg);
 #define glibtop_get_proclist_r		glibtop_get_proclist_s
 #endif
 
-/**
- * glibtop_get_proclist_l:
- * @server: a #glibtop server
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
@@ -162,32 +76,12 @@ glibtop_get_proclist_l (glibtop *server, glibtop_proclist *buf,
 #if GLIBTOP_SUID_PROCLIST
 void _glibtop_init_proclist_p (glibtop *server);
 
-/**
- * glibtop_get_proclist_p:
- * @server: a #glibtop server
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);
 #else
 void _glibtop_init_proclist_s (glibtop *server);
 
-/**
- * glibtop_get_proclist_s:
- * @server: a #glibtop server
- * @buf: a #glibtop_proclist
- * @which: a #GLIBTOP_* constant specifying process type
- * @arg: an argument specific for the process type
- *
- * Returns: (array zero-terminated=1) (transfer none): an array of process
- *     ids
- */
 pid_t*
 glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
 			gint64 which, gint64 arg);

include/glibtop/procmap.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROC_MAP_H__
@@ -92,42 +92,6 @@ glibtop_map_entry *
 glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
 
 
-/**
- * glibtop_get_proc_map:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_map_l:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_map_p:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_map_s:
- * @server:
- * @buf: (out):
- * @pid:
- *
- * Returns: (transfer none):
- */
-
 #if GLIBTOP_SUID_PROC_MAP
 #define glibtop_get_proc_map_r		glibtop_get_proc_map_p
 #else
@@ -149,8 +113,6 @@ glibtop_map_entry *
 glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid);
 #endif
 
-GType     glibtop_map_entry_get_type (void) G_GNUC_CONST;
-GType     glibtop_proc_map_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 

include/glibtop/procmem.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCMEM_H__

include/glibtop/procopenfiles.h

@@ -18,8 +18,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROC_OPEN_FILES_H__
@@ -53,8 +53,7 @@ enum glibtop_file_type {
 	GLIBTOP_FILE_TYPE_FILE		= 1,
 	GLIBTOP_FILE_TYPE_PIPE		= 2,
 	GLIBTOP_FILE_TYPE_INETSOCKET	= 4,
-	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8,
+	GLIBTOP_FILE_TYPE_LOCALSOCKET	= 8
-	GLIBTOP_FILE_TYPE_INET6SOCKET	= 16
 };
 
 typedef struct _glibtop_open_files_entry glibtop_open_files_entry;
@@ -66,8 +65,7 @@ struct _glibtop_open_files_entry
 	int fd;
 	guint16 type; /* An "enum glibtop_file_type" value. */
 	union {
-		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET or
+		/* When type == GLIBTOP_FILE_TYPE_INETSOCKET */
-		 * when type == GLIBTOP_FILE_TYPE_INET6SOCKET */
 		struct {
 			char dest_host[GLIBTOP_OPEN_DEST_HOST_LEN+1];
 			int dest_port;
@@ -94,42 +92,6 @@ struct _glibtop_proc_open_files
 	guint64 size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
 };
 
-/**
- * glibtop_get_proc_open_files:
- * @server:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_open_files_l:
- * @server:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_open_files_p:
- * @server:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
-/**
- * glibtop_get_proc_open_files_l:
- * @server:
- * @buf: (out):
- * @all_fs:
- *
- * Returns: (transfer none):
- */
-
 glibtop_open_files_entry *
 glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid);
 
@@ -154,9 +116,6 @@ glibtop_open_files_entry *
 glibtop_get_proc_open_files_s (glibtop *server, glibtop_proc_open_files *buf, pid_t pid);
 #endif
 
-GType     glibtop_open_files_entry_get_type (void) G_GNUC_CONST;
-GType     glibtop_proc_open_files_get_type (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif

include/glibtop/procsegment.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCSEGMENT_H__

include/glibtop/procsignal.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCSIGNAL_H__

include/glibtop/procstate.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCSTATE_H__

include/glibtop/proctime.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCTIME_H__
@@ -46,50 +46,26 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;
 
 /* Time section */
 
-/**
- * glibtop_proc_time:
- * @start_time: Start time of process in seconds since the epoch.
- * @rtime: Real time accumulated by process (should be @utime + @stime).
- * @utime: User-mode CPU time accumulated by process.
- * @stime: Kernel-mode CPU time accumulated by process.
- * @cutime: Cumulative utime of process and reaped children.
- * @cstime: Cumulative stime of process and reaped children.
- * @timeout: The time (in jiffies) of the process’s next timeout.
- * @it_real_value: The time (in jiffies) before the next <type>SIGALRM</type>
- * is sent to the process due to an interval timer.
- * @frequency: Tick frequency.
- * @xcpu_utime: SMP user-mode CPU time accumulated by process.
- * @xcpu_stime: SMP kernel-mode CPU time accumulated by process 
- *
- * Process time data filled by glibtop_get_proc_time().
- *
- * Under Linux the @start_time value may be wrong due to the information
- * available from the kernel.
- * 
- * The Linux kernel defines <type>INITIAL_JIFFIES</type> which implies a time
- * shift. Because <type>INITIAL_JIFFIES</type> is not user-space defined,
- * we cannot use it to compute an accurate @start_time. On Linux 2.6,
- * <type>INITIAL_JIFFIES</type> is 300 so @start_time is 
- * always 3s different from the real start time of the given process. You 
- * may also get shift results if your system clock is not synchronised 
- * with your hardware clock. See <command>man hwclock</command>.
- */
 struct _glibtop_proc_time
 {
-    /*< private >*/
 	guint64	flags;
-	/*< public >*/
+	guint64 start_time;	/* start time of process --
-	guint64 start_time;
+				 * seconds since 1-1-70 */
-	guint64 rtime;
+	guint64 rtime;		/* real time accumulated by process */
-	guint64 utime;
+	guint64 utime;		/* user-mode CPU time accumulated by process */
-	guint64 stime;
+	guint64 stime;		/* kernel-mode CPU time accumulated by process */
-	guint64 cutime;
+	guint64 cutime;		/* cumulative utime of process and
-	guint64 cstime;
+				 * reaped children */
-	guint64 timeout;
+	guint64 cstime;		/* cumulative stime of process and
-	guint64 it_real_value;
+				 * reaped children */
-	guint64 frequency;
+	guint64 timeout;	/* The time (in jiffies) of the process's
-	guint64 xcpu_utime [GLIBTOP_NCPU];
+				 * next timeout */
-	guint64 xcpu_stime [GLIBTOP_NCPU];
+	guint64 it_real_value;	/* The time (in jiffies) before the
+				 * next SIGALRM is sent to the process
+				 * due to an interval timer. */
+	guint64 frequency;	/* Tick frequency. */
+	guint64 xcpu_utime [GLIBTOP_NCPU];	/* utime and stime for all CPUs on */
+	guint64 xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
 };
 
 

include/glibtop/procuid.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCUID_H__

include/glibtop/procwd.h

@@ -13,8 +13,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_PROCWD_H__

include/glibtop/read.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_READ_H__

include/glibtop/read_data.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_READ_DATA_H__

include/glibtop/sem_limits.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SEM_LIMITS_H__

include/glibtop/shm_limits.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SHM_LIMITS_H__

include/glibtop/signal.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SIGNAL_H__

include/glibtop/swap.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SWAP_H__

include/glibtop/sysdeps.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SYSDEPS_H__
@@ -52,9 +52,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_NETLIST		23
 #define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
 #define GLIBTOP_SYSDEPS_PROC_WD		25
-#define GLIBTOP_SYSDEPS_PROC_AFFINITY	26
 
-#define GLIBTOP_MAX_SYSDEPS		27
+#define GLIBTOP_MAX_SYSDEPS		26
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -89,7 +88,6 @@ struct _glibtop_sysdeps
 	guint64 netload;		/* glibtop_netload	*/
 	guint64 ppp;			/* glibtop_ppp		*/
 	guint64	proc_wd;		/* glibtop_proc_wd	*/
-	guint64	proc_affinity;		/* glibtop_proc_affinity */
 };
 
 void glibtop_get_sysdeps (glibtop_sysdeps *buf);

include/glibtop/sysinfo.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_SYSINFO_H__

include/glibtop/union.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_UNION_H__
@@ -43,7 +43,6 @@
 #include <glibtop/procmap.h>
 #include <glibtop/procopenfiles.h>
 #include <glibtop/procwd.h>
-#include <glibtop/procaffinity.h>
 
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
@@ -83,7 +82,6 @@ union _glibtop_union
 	glibtop_ppp		ppp;
 	glibtop_proc_open_files proc_open_files;
 	glibtop_proc_wd		proc_wd;
-	glibtop_proc_affinity	proc_affinity;
 };
 
 G_END_DECLS

include/glibtop/uptime.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_UPTIME_H__

include/glibtop/version.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_VERSION_H__

include/glibtop/write.h

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #ifndef __GLIBTOP_WRITE_H__

lib/Makefile.am

@@ -5,9 +5,9 @@ lib_LTLIBRARIES			= libgtop-2.0.la
 
 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 boxed.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 --warn-all
-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

lib/boxed.c

@@ -1,47 +0,0 @@
-/* Copyright (C) 2011 Red Hat
-   This file is part of LibGTop 1.0.
-
-   Contributed by Jasper St. Pierre <jstpierre@mecheye.net>, November 2011
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/mountlist.h>
-#include <glibtop/procmap.h>
-#include <glibtop/procopenfiles.h>
-
-#define DEFINE_BOXED(type)                              \
-    static type *                                       \
-    type##_copy (type *p)                               \
-    {                                                   \
-        type *n = g_new (type, 1);                      \
-        memcpy (n, p, sizeof (type));                   \
-        return n;                                       \
-    }                                                   \
-                                                        \
-    G_DEFINE_BOXED_TYPE (type,                          \
-                         type,                          \
-                         type##_copy,                   \
-                         g_free)
-
-DEFINE_BOXED (glibtop);
-DEFINE_BOXED (glibtop_map_entry);
-DEFINE_BOXED (glibtop_proc_map);
-DEFINE_BOXED (glibtop_open_files_entry);
-DEFINE_BOXED (glibtop_proc_open_files);
-DEFINE_BOXED (glibtop_mountentry);
-DEFINE_BOXED (glibtop_mountlist);

lib/close.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/command.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/error.c

@@ -0,0 +1,173 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* 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 <glib/gstrfuncs.h>
+#include <errno.h>
+
+#define DEFAULT_NAME	"LibGTop-Server"
+
+/* Prints error message and exits. */
+
+static void
+print_server_name (glibtop_server *server)
+{
+    fprintf (stderr, "%s: ", server ?
+	     (server->name ? server->name : DEFAULT_NAME)
+	     : DEFAULT_NAME);
+}
+
+void
+glibtop_error_vr (glibtop_server *server, char *format, va_list args)
+{
+    print_server_name (server);
+    vfprintf (stderr, format, args);
+    fprintf (stderr, "\n");
+
+#ifdef LIBGTOP_ENABLE_DEBUG
+    abort ();
+#else
+    exit (1);
+#endif
+}
+
+void
+glibtop_error_io_vr (glibtop_server *server, char *format, int error, va_list args)
+{
+    print_server_name (server);
+    vfprintf (stderr, format, args);
+    fprintf (stderr, ": %s\n", g_strerror (error));
+
+#ifdef LIBGTOP_ENABLE_DEBUG
+    abort ();
+#else
+    exit (1);
+#endif
+}
+
+void
+glibtop_warn_vr (glibtop_server *server, char *format, va_list args)
+{
+    print_server_name (server);
+    vfprintf (stderr, format, args);
+    fprintf (stderr, "\n");
+
+#ifdef LIBGTOP_FATAL_WARNINGS
+    abort ();
+#endif
+}
+
+void
+glibtop_warn_io_vr (glibtop_server *server, char *format, int error, va_list args)
+{
+    print_server_name (server);
+    vfprintf (stderr, format, args);
+    fprintf (stderr, ": %s\n", g_strerror (error));
+
+#ifdef LIBGTOP_FATAL_WARNINGS
+    abort ();
+#endif
+}
+
+void
+glibtop_error_r (glibtop_server *server, char *format, ...)
+{
+    va_list args;
+
+    va_start (args, format);
+    glibtop_error_vr (server, format, args);
+    va_end (args);
+}
+
+void
+glibtop_warn_r (glibtop_server *server, char *format, ...)
+{
+    va_list args;
+
+    va_start (args, format);
+    glibtop_warn_vr (server, format, args);
+    va_end (args);
+}
+
+void
+glibtop_error_io_r (glibtop_server *server, char *format, ...)
+{
+    va_list args;
+
+    va_start (args, format);
+    glibtop_error_io_vr (server, format, errno, args);
+    va_end (args);
+}
+
+void
+glibtop_warn_io_r (glibtop_server *server, char *format, ...)
+{
+    va_list args;
+
+    va_start (args, format);
+    glibtop_warn_io_vr (server, format, errno, args);
+    va_end (args);
+}
+
+#ifndef  __GNUC__
+
+static void
+glibtop_error (char *format, ...)
+{
+    va_list args;
+    va_start (args, format);
+    glibtop_error_vr (glibtop_global_server, format, args);
+    va_end (args);
+}
+
+static void
+glibtop_warn (char *format, ...)
+{
+    va_list args;
+    va_start (args, format);
+    glibtop_warn_vr (glibtop_global_server, format, args);
+    va_end (args);
+}
+
+static void
+glibtop_error_io (char *format, ...)
+{
+    va_list args;
+    va_start (args, format);
+    glibtop_error_io_vr (glibtop_global_server, format, errno, args);
+    va_end (args);
+}
+
+static void
+glibtop_warn_io (char *format, ...)
+{
+    va_list args;
+    va_start (args, format);
+    glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
+    va_end (args);
+}
+
+#endif /* no __GNUC__ */

lib/glibtop-server-private.h

@@ -1,4 +1,6 @@
-/* Copyright (C) 2014 Ryan Lortie <desrt@desrt.ca>
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* 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.
@@ -19,13 +21,16 @@
    Boston, MA 02111-1307, USA.
 */
 
-#include <config.h>
+#ifndef __GLIBTOP_SERVER_PRIVATE_H__
-#include <glibtop/sysinfo.h>
+#define __GLIBTOP_SERVER_PRIVATE_H__
 
-static glibtop_sysinfo sysinfo = { .flags = 0 };
+#include <glib.h>
 
-const glibtop_sysinfo *
+typedef struct _glibtop_server_private glibtop_server_private;
-glibtop_get_sysinfo_s (glibtop *server)
+
+struct _glibtop_server_private
 {
-	return &sysinfo;
+    GSList *backend_list;
-}
+};
+
+#endif

lib/glibtop-server.c

@@ -1,5 +1,7 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
 /* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
+   This file is part of LibGTop 2.0.
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
 
@@ -15,29 +17,41 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
 #include <glibtop.h>
-#include <glibtop/prockernel.h>
+#include <glibtop-server-private.h>
 
-static const unsigned long _glibtop_sysdeps_proc_kernel = 0;
+glibtop_server *
-
+glibtop_server_new (void)
-/* Init function. */
-
-void
-_glibtop_init_proc_kernel_s (glibtop *server)
 {
-	server->sysdeps.proc_kernel = _glibtop_sysdeps_proc_kernel;
+    glibtop_server *retval;
+
+    retval = g_new0 (glibtop_server, 1);
+    retval->info = g_new0 (glibtop_server_info, 1);
+    retval->_priv = g_new0 (glibtop_server_private, 1);
+    retval->refcount = 1;
+
+    return retval;
 }
 
-/* Provides detailed information about a process. */
+void
+glibtop_server_ref (glibtop_server *server)
+{
+    server->refcount++;
+}
 
 void
-glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf,
+glibtop_server_unref (glibtop_server *server)
-			   pid_t pid)
 {
-	memset (buf, 0, sizeof (glibtop_proc_kernel));
+    server->refcount--;
+
+    if (server->refcount <= 0) {
+	g_free (server->_priv);
+	g_free (server->info);
+	g_free (server);
+    }
 }

lib/init.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/libgtop.sym

@@ -1,77 +1,130 @@
 glibtop_call_l
+glibtop_call_p
 glibtop_close
+glibtop_close_p
 glibtop_close_r
+glibtop_close_s
 glibtop_get_cpu
 glibtop_get_cpu_l
+glibtop_get_cpu_p
+glibtop_get_cpu_s
 glibtop_get_fsusage
 glibtop_get_fsusage_l
+glibtop_get_fsusage_p
+glibtop_get_fsusage_s
 glibtop_get_loadavg
 glibtop_get_loadavg_l
+glibtop_get_loadavg_p
+glibtop_get_loadavg_s
 glibtop_get_mem
 glibtop_get_mem_l
+glibtop_get_mem_p
+glibtop_get_mem_s
 glibtop_get_mountlist
 glibtop_get_mountlist_l
+glibtop_get_mountlist_p
+glibtop_get_mountlist_s
 glibtop_get_msg_limits
 glibtop_get_msg_limits_l
+glibtop_get_msg_limits_p
+glibtop_get_msg_limits_s
 glibtop_get_netlist
 glibtop_get_netlist_l
+glibtop_get_netlist_p
+glibtop_get_netlist_s
 glibtop_get_netload
 glibtop_get_netload_l
+glibtop_get_netload_p
+glibtop_get_netload_s
 glibtop_get_parameter_l
+glibtop_get_parameter_p
 glibtop_get_ppp
 glibtop_get_ppp_l
+glibtop_get_ppp_p
+glibtop_get_ppp_s
 glibtop_get_proc_args
 glibtop_get_proc_args_l
+glibtop_get_proc_args_p
+glibtop_get_proc_args_s
 glibtop_get_proc_argv
 glibtop_get_proc_argv_l
+glibtop_get_proc_argv_p
 glibtop_get_proc_kernel
 glibtop_get_proc_kernel_l
+glibtop_get_proc_kernel_p
+glibtop_get_proc_kernel_s
 glibtop_get_proclist
 glibtop_get_proclist_l
+glibtop_get_proclist_p
+glibtop_get_proclist_s
 glibtop_get_proc_map
 glibtop_get_proc_map_l
+glibtop_get_proc_map_p
+glibtop_get_proc_map_s
 glibtop_get_proc_mem
 glibtop_get_proc_mem_l
+glibtop_get_proc_mem_p
+glibtop_get_proc_mem_s
 glibtop_get_proc_open_files
 glibtop_get_proc_open_files_l
+glibtop_get_proc_open_files_p
+glibtop_get_proc_open_files_s
 glibtop_get_proc_segment
 glibtop_get_proc_segment_l
+glibtop_get_proc_segment_p
+glibtop_get_proc_segment_s
 glibtop_get_proc_signal
 glibtop_get_proc_signal_l
+glibtop_get_proc_signal_p
+glibtop_get_proc_signal_s
 glibtop_get_proc_state
 glibtop_get_proc_state_l
+glibtop_get_proc_state_p
+glibtop_get_proc_state_s
 glibtop_get_proc_time
 glibtop_get_proc_time_l
+glibtop_get_proc_time_p
+glibtop_get_proc_time_s
 glibtop_get_proc_uid
 glibtop_get_proc_uid_l
+glibtop_get_proc_uid_p
+glibtop_get_proc_uid_s
 glibtop_get_proc_wd
 glibtop_get_proc_wd_l
+glibtop_get_proc_wd_p
+glibtop_get_proc_wd_s
 glibtop_get_sem_limits
 glibtop_get_sem_limits_l
+glibtop_get_sem_limits_p
+glibtop_get_sem_limits_s
 glibtop_get_shm_limits
 glibtop_get_shm_limits_l
-glibtop_get_proc_affinity
+glibtop_get_shm_limits_p
-glibtop_get_proc_affinity_l
+glibtop_get_shm_limits_s
 glibtop_get_swap
 glibtop_get_swap_l
+glibtop_get_swap_p
+glibtop_get_swap_s
 glibtop_get_sysdeps
 glibtop_get_sysdeps_r
 glibtop_get_sysinfo
+glibtop_get_sysinfo_p
+glibtop_get_sysinfo_s
 glibtop_get_uptime
 glibtop_get_uptime_l
+glibtop_get_uptime_p
+glibtop_get_uptime_s
 glibtop_global_server
 glibtop_init
+glibtop_init_p
 glibtop_init_r
+glibtop_init_s
 glibtop_internet_addr
 glibtop_make_connection
 glibtop_open_l
+glibtop_open_p
+glibtop_open_s
 glibtop_server_features
 glibtop_set_parameter_l
+glibtop_set_parameter_p
 glibtop_sys_siglist
-glibtop_mountlist_get_type
-glibtop_mountentry_get_type
-glibtop_open_files_entry_get_type
-glibtop_proc_open_files_get_type
-glibtop_map_entry_get_type
-glibtop_proc_map_get_type
-glibtop_get_type

lib/open.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -148,7 +148,7 @@ glibtop_open_l (glibtop *server, const char *program_name,
 		if (nbytes != size)
 			glibtop_error_r (server,
 					 "Requested %u bytes but got %u.",
-					 (unsigned)size, (unsigned)nbytes);
+					 size, nbytes);
 
 		glibtop_read_l (server, nbytes, buffer);
 

lib/parameter.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/read.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/read_data.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

lib/sysdeps.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>
@@ -47,7 +47,6 @@ GLIBTOP_SUID_PROC_MAP +
 GLIBTOP_SUID_NETLOAD +
 GLIBTOP_SUID_NETLIST +
 GLIBTOP_SUID_PROC_WD +
-GLIBTOP_SUID_PROC_AFFINITY +
 GLIBTOP_SUID_PPP;
 
 const _glibtop_init_func_t _glibtop_init_hook_s [] = {
@@ -114,9 +113,6 @@ const _glibtop_init_func_t _glibtop_init_hook_s [] = {
 #if !GLIBTOP_SUID_PROC_WD
 	_glibtop_init_proc_wd_s,
 #endif
-#if !GLIBTOP_SUID_PROC_AFFINITY
-	_glibtop_init_proc_affinity_s,
-#endif
 #if !GLIBTOP_SUID_PPP
 	_glibtop_init_ppp_s,
 #endif
@@ -187,9 +183,6 @@ const _glibtop_init_func_t _glibtop_init_hook_p [] = {
 #if GLIBTOP_SUID_PROC_WD
 	_glibtop_init_proc_wd_p,
 #endif
-#if GLIBTOP_SUID_PROC_AFFINITY
-	_glibtop_init_proc_affinity_p,
-#endif
 #if GLIBTOP_SUID_PPP
 	_glibtop_init_ppp_p,
 #endif

lib/write.c

@@ -15,8 +15,8 @@
 
    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., 51 Franklin Street, Fifth Floor,
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02110-1301, USA.
+   Boston, MA 02111-1307, USA.
 */
 
 #include <config.h>

libgtop-sysdeps.m4

@@ -63,32 +63,20 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	case "$host_os" in
 	linux*)
 	  libgtop_sysdeps_dir=linux
-	  libgtop_use_machine_h=no
+	  libgtop_use_machine_h=yes
 	  libgtop_have_sysinfo=yes
-	  libgtop_need_server=no
+	  libgtop_need_server=yes
-	  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_sysdeps_private_mountlist=yes
-	  libgtop_sysdeps_private_fsusage=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2555 $(bindir)/libgtop_server2'
-	  ;;
 	freebsd*|kfreebsd*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
-	  libgtop_sysdeps_private_mountlist=yes
-	  libgtop_sysdeps_private_fsusage=yes
 	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server2 && chmod 2755 $(bindir)/libgtop_server2'
 	  ;;
 	solaris*)
@@ -104,20 +92,6 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_have_sysinfo=yes
 	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
 	  ;;
-	darwin*)
-	  libgtop_sysdeps_dir=darwin
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  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
@@ -157,13 +131,30 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 
 	case "$host_os" in
 	*bsd*)
-	  AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
+		case "$host_os" in
+		*kfreebsd*)
+		AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
+		*) 
+	  	AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
+	  	esac
+	  
 	  AC_SUBST(KVM_LIBS)
 
-	  AC_CHECK_HEADERS(net/if_var.h,,, [
+	  case "$host_os" in
-#include <net/if.h>
+	  kfreebsd*)
-#include <sys/types.h>
+	  	EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
-#include <sys/socket.h>])
+		;;
+	  freebsd*)
+	  	osreldate=`sysctl -n kern.osreldate 2>/dev/null`
+		if test -n "${osreldate}" && test ${osreldate} -ge 600000 ; then
+		    EXTRA_SYSDEPS_LIBS="-lgeom -ldevstat"
+		fi
+		;;
+          esac
+
+	  AC_SUBST(EXTRA_SYSDEPS_LIBS)
+
+	  AC_CHECK_HEADERS(net/if_var.h)
 	  AC_MSG_CHECKING([for I4B])
 	  AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -228,10 +219,10 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  fi
 
 	  AC_MSG_CHECKING(what we need to define to get struct msginfo)
-	  AC_CACHE_VAL(msginfo_cv_needs,
+	  AC_CACHE_VAL(msginfo_needs,
-	    msginfo_cv_needs=
+	    msginfo_needs=
 	    for def in nothing KERNEL _KERNEL; do
-	      AC_COMPILE_IFELSE([AC_LANG_SOURCE([#define $def
+	      AC_COMPILE_IFELSE([#define $def
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -243,23 +234,23 @@ main (void)
   struct msginfo mi;
   mi.msgmax = 0;
   return 0;
-}])],
+}],
 	        [
-	          msginfo_cv_needs=$def
+	          msginfo_needs=$def
-	          if test ${msginfo_cv_needs} = KERNEL; then
+	          if test ${msginfo_needs} = KERNEL; then
 	            AC_DEFINE(STRUCT_MSGINFO_NEEDS_KERNEL, 1,
 	              [Define to 1 if we need to define KERNEL to get 'struct msginfo'])
-	          elif test ${msginfo_cv_needs} = _KERNEL; then
+	          elif test ${msginfo_needs} = _KERNEL; then
 	            AC_DEFINE(STRUCT_MSGINFO_NEEDS__KERNEL, 1,
 	              [Define to 1 if we need to define _KERNEL to get 'struct msginfo'])
 	          fi
 	        ]
 	      )
-	      test -n "${msginfo_cv_needs}" && break
+	      test -n "${msginfo_needs}" && break
 	    done
 	  )
-	  AC_MSG_RESULT($msginfo_cv_needs)
+	  AC_MSG_RESULT($msginfo_needs)
-	  if test -z "${msginfo_cv_needs}"; then
+	  if test -z "${msginfo_needs}"; then
 	    AC_MSG_ERROR([Could not find the definition of 'struct msginfo'])
 	  fi
 	  ;;
@@ -320,7 +311,5 @@ main (void)
 	fi
 
 	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
-	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_MOUNTLIST, test x$libgtop_sysdeps_private_mountlist = xyes)
-	AM_CONDITIONAL(LIBGTOP_SYSDEPS_PRIVATE_FSUSAGE, test x$libgtop_sysdeps_private_fsusage = xyes)
 ])
 

libgtop.doap

@@ -1,31 +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#core" />
-  <programming-language>C</programming-language>
-
-  <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>
-
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Robert Roth</foaf:name>
-      <foaf:mbox rdf:resource="mailto:robert.roth.off@gmail.com" />
-      <gnome:userid>robertroth</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-</Project>
-

ltconfig

@@ -16,7 +16,7 @@
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -2756,7 +2756,7 @@ case "$ltmain" in
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a

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])
-])

po/ChangeLog

@@ -1,293 +1,3 @@
-2009-06-10  Manoj Kumar Giri <mgiri@redhat.com>
-
-	* hi.po: Committed Hindi Translation on behalf of Rajesh Ranjan.
-
-2009-03-18  Djihed Afifi <djihed@gmail.com>
-
-	* ar.po: Updated Arabic translation by Khaled Hosny.
-
-2009-03-16  Ignacio Casal Quinteiro  <icq@gnome.org>
-
-	 * gl.po: Updated Galician translation by Suso Baleato.
-
-2009-03-16  Amitakhya Phukan <amitakhya@svn.gnome.org>
-
-	* LINGUAS: Added as.
-	* as.po: Updated Assamese translations.
-
-2009-03-15  Shankar Prasad  <svenkate@redhat.com>
-
-        * kn.po: Added Kannada translations.
-	* LINGUAS: Added Kannad (kn) to the list
-
-2009-03-10  Manoj Kumar Giri  <mgiri@redhat.com>
-
-	* or.po: Updated Oriya Translation.
-
-2009-02-09  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2009-01-29  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2009-01-25  Raivis Dejus  <orvils@gmail.com>
-
-	* lv.po: Updated Latvian translation.
-
-2008-11-14  Thomas Thurman  <tthurman@gnome.org>
-
-        * la.po: added Latin translation by Rafael Garcia.
-        * LINGUAS: added Latin.
-
-2008-10-19  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-09-20  Laurent Dhima  <laurenti@alblinux.net>
-
-	* sq.po: Updated Albanian Translation.
-
-2008-09-19  Mugurel Tudor  <mugurelu@gnome.ro>
-
-	* ro.po: Updated Romanian translation by
-	Mişu Moldovan <dumol@gnome.ro>
-
-2008-09-18  Baris Cicek  <baris@teamforce.name.tr>
-
-	* tr.po: Fixed wrong plural forms
-
-2008-09-18  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-09-15  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-09-14  Baris Cicek  <baris@teamforce.name.tr>
-
-	* tr.po: Updated Turkish Translation.
-
-2008-09-09  Robert Sedak  <robert.sedak@sk.t-com.hr>
-
-	* hr.po: Updated Croatian translation.
-
-2008-08-25  Goran Rakic  <grakic@devbase.net>
-
-        * LINGUAS, sr@latin.po, sr@Latn.po: Conversion from sr@Latn to sr@latin.
-
-2008-08-6  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-07-29  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-07-25  Leonardo Ferreira Fontenelle  <leonardof@gnome.org>
-
-	* pt_BR.po: Terminology improvement by Vladimir Melo.
-
-2008-06-11  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-05-22  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-05-19  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-04-04  Eskild Hustvedt  <eskildh@gnome.org>
-
-	* nn.po: Updated Norwegian Nynorsk translation
-
-2008-03-16  Simos Xenitellis  <simos@gnome.org>
-
-	* el.po: Updated Greek translation.
-
-2008-03-09  Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated
-
-2008-03-06  Marcel Telka  <marcel@telka.sk>
-
-	* sk.po: Updated Slovak translation.
-
-2008-02-26  Changwoo Ryu  <cwryu@debian.org>
-
-	* ko.po: Updated Korean translation.
-
-2008-02-14  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
-
-        * zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
-        * zh_TW.po: Updated Traditional Chinese translation(Taiwan).
-
-2008-02-14  Pawan Chitrakar <chautari@gmail.com>
-
-	* ne.po: Updated Nepali Translation.
-
-2008-02-11  Petr Kovar  <pknbe@volny.cz>
-
-	* cs.po: Updated Czech translation by Lucas Lommer.
-
-2008-01-31  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-01-12  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Khaled Hosny.
-
-2008-01-11  Inaki Larranaga Murgoitio  <dooteo@euskalgnu.org>
-
-	* eu.po: Updated Basque translation.
-
-2007-12-31  Yannig Marchegay <yannig@marchegay.org>
-
-	* oc.po: Updated Occitan translation.
-
-2007-12-28  Rahul Bhalerao <b.rahul.pm@gmail.com>
-
-	* mr.po: Added Marathi translations from Sandeep Shedmake.
-	* LINGUAS: Added an entry for Marathi(mr).
-
-2007-11-28  Ignacio Casal Quinteiro   <nacho.resa@gmail.com>
-
-	* gl.po: Updated Galician Translation.
-
-2007-11-01  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* nb.po: Updated Norwegian bokmål translation.
-
-2007-10-23  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Youssef Chahibi.
-
-2007-10-21  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Youssef Chahibi.
-
-2007-10-18  Matej Urbančič  <mateju@svn.gnome.org>
-
-	* sl.po: Updated Slovenian Translation.
-
-2007-10-15  Yair Hershkovitz  <yairhr@gmail.com>
-
-	* he.po: Updated Hebrew translation.
-
-2007-10-02  Alessio Frusciante  <algol@firenze.linux.it>
-
-	* it.po: Updated Italian translation.
-
-2007-09-18  Alexander Shopov  <ash@contact.bg>
-
-	* bg.po: Updated Bulgarian translation by
-	Alexander Shopov <ash@contact.bg>
-
-2007-09-17  Artur Flinta  <aflinta@svn.gnome.org>
-
-	* pl.po: Updated Polish translation by GNOME PL Team.
-
-2007-09-16  Kenneth Nielsen  <k.nielsen81@gmail.com>
-
-	* da.po: Updated Danish translation
-
-2007-09-16  Gil Forcada  <gforcada@svn.gnome.org>
-
-	* ca.po: Updated Catalan translation.
-
-2007-09-16  Gintautas Miliauskas  <gintas@akl.lt>
-
-	* lt.po: Updated Lithuanian translation.
-
-2007-09-13  Djihed Afifi <djihed@gmail.com> 
-
-	* ar.po: Updated Arabic Translation by Youssef Chahibi.
-
-2007-09-13 Gabor Kelemen  <kelemeng@gnome.hu>
-
-	* hu.po: Translation updated.
-
-2007-09-13  Mugurel Tudor  <mugurelu@gnome.ro>
-
-        * ro.po: Updated Romanian translation
-        by Mişu Moldovan <dumol@gnome.ro>
-
-2007-09-12 Maxim Dziumanenko <dziumanenko@gmail.com>
-
-	* uk.po: Update Ukrainian translation.
-
-2007-09-12  Goran Rakić  <grakic@devbase.net>
-
-	* sr.po, sr@Latn.po: Updated Serbian translation.
-
-2007-09-08  Duarte Loreto <happyguy_pt@hotmail.com>
-
-	* pt.po: Updated Portuguese translation.
-
-2007-09-05  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
- 
-	* ru.po: Updated Russian translation.
-
-2007-09-03  Jovan Naumovski  <jovan@lugola.net>
- 
-	* mk.po: Updated Macedonian translation.
-
-2007-08-24  Stéphane Raimbault  <stephane.raimbault@gmail.com>
-
-	* fr.po: Updated French translation.
-
-2007-08-10  Runa Bhattacharjee <runabh@gmail.com>
-
-	* bn_IN.po: Updated Bengali India Translation.
-
-2007-08-07  Ankit Patel  <ankit644@yahoo.com>
-
-	* gu.po: Updated Gujarati Translation.
-
-2007-08-06  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-08-05  Inaki Larranaga Murgoitio  <dooteo@zundan.com>
-
-	* eu.po: Updated Basque translation.
-
-2007-07-21  Leonardo Ferreira Fontenelle  <leonardof@svn.gnome.org>
-
-	* pt_BR.po: Brazilian Portuguese translation updated by Og Maciel
-	<ogmaciel@ubuntu.com>.
-
-2007-07-19  Hendrik Richter  <hendrikr@gnome.org>
-
-	* de.po: Updated German translation.
-
-2007-07-17  Wouter Bolsterlee  <wbolster@svn.gnome.org>
-
-	* nl.po: Dutch translation updated by Wouter Bolsterlee.
-
-2007-07-16  Ilkka Tuohela  <hile@iki.fi>
-
-	* fi.po: Updated Finnish translation.
-
-2007-07-09  I. Felix <ifelix@svn.gnome.org>
-
-	* ta.po:  Tamil Translation updated by Tirumurthi Vasudevan
-
-2007-07-07  Takeshi AIHANA <takeshi.aihana@gmail.com>
-
-	* ja.po: Updated Japanese translation.
-
-2007-06-27  Clytie Siddall <clytie@riverland.net.au>
-
-	* vi.po: Updated Vietnamese translation.
-
 2007-06-23  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* nb.po: Updated Norwegian bokmål translation.

po/LINGUAS

@@ -1,9 +1,7 @@
-#
 # please keep this list sorted alphabetically
+#
 am
 ar
-as
-ast
 az
 be
 bg
@@ -11,7 +9,6 @@ bn
 bn_IN
 bs
 ca
-ca@valencia
 cs
 cy
 da
@@ -20,7 +17,6 @@ dz
 el
 en_CA
 en_GB
-en@shaw
 eo
 es
 et
@@ -28,7 +24,6 @@ eu
 fa
 fi
 fr
-fur
 ga
 gl
 gu
@@ -40,20 +35,16 @@ id
 it
 ja
 ka
-kn
 ko
 ku
 ky
-la
 lt
 lv
-mai
 mg
 mi
 mk
 ml
 mn
-mr
 ms
 nb
 ne
@@ -72,14 +63,12 @@ sk
 sl
 sq
 sr
-sr@latin
+sr@Latn
 sv
 ta
 te
-tg
 th
 tr
-ug
 uk
 vi
 xh

po/ar.po

@@ -1,205 +1,249 @@
-# translation of libgtop.HEAD.po to Arabic
+# translation of libgtop.HEAD.ar.po to Arabic
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Arafat Medini <lumina@silverpen.de>, 2002,2003.
 # Isam Bayazidi <bayazidi@arabeyes.org>, 2002.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
-# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2008.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop.HEAD\n"
+"Project-Id-Version: libgtop.HEAD.ar\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: \n"
-"product=libgtop&component=general\n"
+"POT-Creation-Date: 2006-07-23 08:51+0200\n"
-"POT-Creation-Date: 2009-03-16 22:15+0000\n"
+"PO-Revision-Date: 2006-11-25 15:36+0200\n"
-"PO-Revision-Date: 2008-07-28 19:26+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
+"Language-Team: Arabic <support@arabeyes.org>\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=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"Plural-Forms: Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : 3\n"
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
-msgstr[0] "قرأ صفر بايت"
+msgstr[0] "اقرأ بايت واحدة"
-msgstr[1] "قرأ بايت واحدة"
+msgstr[1] "اقرأ بايتين"
-msgstr[2] "قرأ بايتين"
+msgstr[2] "اقرأ %d بايتات"
-msgstr[3] "قرأ %Id بايتات"
+msgstr[3] "اقرأ %d بايت"
-msgstr[4] "قرأ %Id بايت"
-msgstr[5] "قرأ %Id بايت"
 
-#: ../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] "قرأ صفر بايت من البيانات"
+msgstr[0] "اقرأ بايت واحدة "
-msgstr[1] "قرأ بايت واحدة من البيانات"
+msgstr[1] "اقرأ بايتين"
-msgstr[2] "قرأ بايتين من البيانات"
+msgstr[2] "اقرأ %lu بايتات"
-msgstr[3] "قرأ %lu بايتات من البيانات"
+msgstr[3] "اقرأ %lu بايت"
-msgstr[4] "قرأ %lu بايت من البيانات"
-msgstr[5] "قرأ %lu بايت من البيانات"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:53
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
-msgstr[0] "كتب صفر بايت"
+msgstr[0] "كتابة بايت واحدة"
-msgstr[1] "كتب بايت واحدة"
+msgstr[1] "كتابة بايتين"
-msgstr[2] "كتب بايتين"
+msgstr[2] "كتابة %d بايتات"
-msgstr[3] "كتب %Id بايتات"
+msgstr[3] "كتابة %d بايت"
-msgstr[4] "كتب %Id بايت"
-msgstr[5] "كتب %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 "Enable verbose output"
+msgid "DEBUG"
-msgstr "فعّل الخرْج المسهِب"
+msgstr "DEBUG"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:462
+msgid "Enable verbose output"
+msgstr "فعّل خرْج مسهِب"
+
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: ../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
+#: ../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 ""
-msgstr "شغّل '%s --help' لرؤية قائمة كاملة لخيارات سطر الأوامر.\n"
+"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:27 ../sysdeps/sun4/siglist.c:27
+#: ../sysdeps/osf1/siglist.c:29
+#: ../sysdeps/sun4/siglist.c:29
 msgid "Hangup"
-msgstr "علّق"
+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 "تتبع الأثر"
+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 "خطأ في ناقل"
+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 "معطى سيء لنداء النظام"
+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 "إيقاف من لوحة المفاتيح"
+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 "الدخْل/الخرْج ممكن الآن"
+msgstr "دخْل/خرْج ممكن الآن"
 
-#: ../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 "تجاوز حد الـمعالج"
 
-#: ../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 "تشخيص ساعة التنبيه"
+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 معرفة من طرف المستخدم"
+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 معرفة من طرف المستخدم"
+msgstr "اشارة 2 معرفة من طرف المستخدم"
+

po/as.po

@@ -1,191 +0,0 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Amitakhya Phukan <aphukan@fedoraproject.org>, 2009.
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011.
-msgid ""
-msgstr ""
-"Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=libgtop&component=general\n"
-"POT-Creation-Date: 2010-11-17 08:15+0000\n"
-"PO-Revision-Date: 2011-08-17 16:13+0530\n"
-"Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
-"Language-Team: as_IN <kde-i18n-doc@kde.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: Lokalize 1.0\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 "পটভূমিত fork নকৰিব"
-
-#: ../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 "Kill কৰক"
-
-#: ../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 "ব্যবহাৰকাৰী নিৰ্ধাৰিত সংকেত ১"
-
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
-msgid "User defined signal 2"
-msgstr "ব্যবহাৰকাৰী নিৰ্ধাৰিত সংকেত ২"
-

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"
-

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"
+"POT-Creation-Date: 2006-04-07 13:38+0200\n"
-"PO-Revision-Date: 2011-07-24 19:41+0300\n"
+"PO-Revision-Date: 2004-03-13 14:28+0200\n"
-"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
+"Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
-"Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
+"Language-Team: Belarusian <i18n@mova.org>\n"
-"Language: be\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"
+"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"
+"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"
+"Памылка ў ключох %s: %s.\n"
-
+"Запусьціце '%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)"
 
 #: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
-msgid "Quit"
+msgid "Hangup"
-msgstr "Выхад (QUIT)"
+msgstr "Разарваць"
 
 #: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
-msgid "Illegal instruction"
+msgid "Interrupt"
-msgstr "Забароненая інструкцыя (ILL)"
+msgstr "Перарваць"
 
 #: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
-msgid "Trace trap"
+msgid "Quit"
-msgstr "Захоп трасіроўкі (TRAP)"
+msgstr "Выйсьці"
 
 #: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
-msgid "Abort"
+msgid "Illegal instruction"
-msgstr "Перарванне (ABRT)"
+msgstr "Недапушчальная інструкцыя"
 
 #: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
-msgid "EMT error"
+msgid "Trace trap"
-msgstr "Памылка (EMT)"
+msgstr "Захоп трасыроўкі"
 
 #: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
-msgid "Floating-point exception"
+msgid "Abort"
-msgstr "Выключэнне float (FPE)"
+msgstr "Перарываньне"
 
 #: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
-msgid "Kill"
+msgid "EMT error"
-msgstr "Забойства (KILL)"
+msgstr "Памылка EMT"
 
 #: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
-msgid "Bus error"
+msgid "Floating-point exception"
-msgstr "Памылка магістралі (BUS)"
+msgstr "Выключэньне пункту, які плавае"
 
 #: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
-msgid "Segmentation violation"
+msgid "Kill"
-msgstr "Парушэнне сегментацыі (SEGV)"
+msgstr "Забіць"
 
 #: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
-msgid "Bad argument to system call"
+msgid "Bus error"
-msgstr "Хібны аргумент сістэмнага выкліку (SYS)"
+msgstr "Памылка шыны"
 
 #: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
-msgid "Broken pipe"
+msgid "Segmentation violation"
-msgstr "Зламаны канал (PIPE)"
+msgstr "Парушэньне сэгментацыі"
 
 #: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
-msgid "Alarm clock"
+msgid "Bad argument to system call"
-msgstr "Таймер (ALRM)"
+msgstr "Кепскі аргумэнт у сыстэмным выкліку"
 
 #: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
-msgid "Termination"
+msgid "Broken pipe"
-msgstr "Знішчэнне (TERM)"
+msgstr "Парушаны канал"
 
 #: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
-msgid "Urgent condition on socket"
+msgid "Alarm clock"
-msgstr "Тэрміновыя даныя на сокеце (URG)"
+msgstr "Таймэр"
 
 #: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
-msgid "Stop"
+msgid "Termination"
-msgstr "Прыпыненне (STOP)"
+msgstr "Завяршэньне"
 
 #: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
-msgid "Keyboard stop"
+msgid "Urgent condition on socket"
-msgstr "Прыпыненне з клавіятуры (TSTP)"
+msgstr "Тэрміновыя умовы сокету"
 
 #: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
-msgid "Continue"
+msgid "Stop"
-msgstr "Працяг працы (CONT)"
+msgstr "Спыніць"
 
 #: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
-msgid "Child status has changed"
+msgid "Keyboard stop"
-msgstr "Змена стану нашчадка (CHLD)"
+msgstr "Спыненьне клявіятуры"
 
 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
-msgid "Background read from tty"
+msgid "Continue"
-msgstr "Фонавае чытанне з tty (TTIN)"
+msgstr "Працягнуць"
 
 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
-msgid "Background write to tty"
+msgid "Child status has changed"
-msgstr "Фонавы запіс у tty (TTOU)"
+msgstr "Стан нашчадку быў зьменены"
 
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
-msgid "I/O now possible"
+msgid "Background read from tty"
-msgstr "Магчымасць уводу/вываду (IO)"
+msgstr "Чытаньне ў тле з tty"
 
 #: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
-msgid "CPU limit exceeded"
+msgid "Background write to tty"
-msgstr "Абмежаванне працэсара (XCPU)"
+msgstr "Запіс у тле ў tty"
 
 #: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
-msgid "File size limit exceeded"
+msgid "I/O now possible"
-msgstr "Абмежаванне памеру файла (XFSZ)"
+msgstr "Зараз магчымы ўвод/вывад"
 
 #: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
-msgid "Virtual alarm clock"
+msgid "CPU limit exceeded"
-msgstr "Віртуальны таймер (VTALRM)"
+msgstr "Перавышана мяжа ЦПУ"
 
 #: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
-msgid "Profiling alarm clock"
+msgid "File size limit exceeded"
-msgstr "Таймер прафілявання (PROF)"
+msgstr "Перавышана мяжа памеру файлу"
 
 #: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
-msgid "Window size change"
+msgid "Virtual alarm clock"
-msgstr "Змена памераў акна (WINCH)"
+msgstr "Віртуальны таймэр"
 
 #: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
-msgid "Information request"
+msgid "Profiling alarm clock"
-msgstr "Запыт інфармацыі (INFO)"
+msgstr "Прафіляваны таймэр"
 
 #: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
-msgid "User defined signal 1"
+msgid "Window size change"
-msgstr "Карыстальніцкі сігнал 1 (USR1)"
+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"

po/bg.po

@@ -1,191 +1,210 @@
-# Bulgarian translation for libgtop po-file
+# Bulgarian translation for libgtop
-# Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 # Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>, 2002.
 # Yanko Kaneti <yaneti@declera.com>, 2002.
 # Rostislav Raykov <zbrox@i-space.org>, 2004.
-# Vladimir Petkov <kaladan@gmail.com>, 2005.
+# Vladimir Petkov <vpetkov@i-space.org>, 2005.
-# Alexander Shopov <ash@kambanaria.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libgtop master\n"
+"Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 18:21+0300\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
-"PO-Revision-Date: 2012-04-01 18:20+0300\n"
+"PO-Revision-Date: 2005-07-28 14:04+0300\n"
-"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Last-Translator: Rostislav Raykov <zbrox@i-space.org>\n"
-"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
-"Language: bg\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"
+"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] "прочетен %d байт"
 msgstr[1] "прочетени %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 байта данни"
 
-#: ../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 байта"
 
-#: ../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 "DEBUG"
+
+#: 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 "Не се поражда процес във фонов режим"
 
-#: ../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
+#: 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 ""
-msgstr "Изпълнете „%s --help“ за пълния списък от опции за командата.\n"
+"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:27 ../sysdeps/sun4/siglist.c:27
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
-msgstr "Затваряне на връзката"
+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 "Грешка на емулацията"
+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 "Надхвърляне на сегмента"
+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 "Неотложно състояние на socket"
 
-#: ../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 "Фоново четене от терминал"
+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 "Фонов запис в терминал"
+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 "Възможен е вх./изх."
+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 "Превишен процесорен лимит"
+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 "Превишено ограничение за размер на файл"
 
-#: ../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 "Виртуален алармен часовник"
 
-#: ../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 "Сигнал на потребител 1"
 
-#: ../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 "Сигнал на потребител 2"

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"
+"Project-Id-Version: libgtop\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: \n"
-"product=libgtop&component=general\n"
+"POT-Creation-Date: 2005-10-01 06:02+0200\n"
-"POT-Creation-Date: 2009-04-17 10:17+0000\n"
+"PO-Revision-Date: 2005-10-01 01:05+0600\n"
-"PO-Revision-Date: 2010-01-21 16:02+0600\n"
+"Last-Translator: Mahay Alam Khan <makl10n@yahoo.com>\n"
-"Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
+"Language-Team: Bengali <gnome-translation@bengalinux.org>\n"
-"Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\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
+#: ../src/daemon/gnuserv.c:466
-#| msgid ""
+msgid "INETD"
-#| "Error on option %s: %s.\n"
+msgstr "INETD"
-#| "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"
+#: ../src/daemon/gnuserv.c:500
-msgstr "কমান্ড লাইন অপশনের সম্পূর্ণ তালিকা দেখার জন্য  '%s --help' লিখুন।\n"
+#, 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 সংখ্যক):"
 

po/bn_IN.po

@@ -1,27 +1,26 @@
 # Bengali India  translation of libgtop.
-# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libgtop package.
-#
 # Vat <vatzcar@yahoo.co.in>, 2003.
 # Mahay Alam Khan <makl10n@yahoo.com>, 2005.
 # Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
-# Runa Bhattacharjee <runabh@gmail.com>, 2007.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: bn_IN\n"
+"Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-14 03:41+0100\n"
+"POT-Creation-Date: 2006-09-01 01:20+0200\n"
-"PO-Revision-Date: 2007-08-10 14:47+0530\n"
+"PO-Revision-Date: 2006-08-07 12:47+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
-"Language-Team: Bengali INDIA\n"
+"Language-Team: Bengali India\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"
+"X-Generator: KBabel 1.9.1\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -32,11 +31,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"
@@ -45,7 +44,7 @@ msgstr[1] "%lu বাইট তথ্য পড়া হয়েছে"
 
 # msgstr "%d বাইট তথ্য পড়া গেছে"
 # msgstr "%d বাইট তথ্য পড়া হোক"
-#: ../lib/write.c:51
+#: ../lib/write.c:53
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -53,169 +52,192 @@ msgstr[0] "%d বাইট লেখা হয়েছে"
 msgstr[1] "%d বাইট লেখা হয়েছে"
 
 # msgstr "%d বাইট লেখা হয়েছে"
-#: ../src/daemon/gnuserv.c:458
+#: ../src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "ডিবাগ ব্যবস্থা সক্রিয় করুন"
 
-# msgstr "ডিবাগ"
+# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
+# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
+# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
 #: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "DEBUG"
+
+# msgstr "ডিবাগ"
+#: ../src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "বিস্তারিত (ভার্বোস) আউটপুট সক্রিয় করা হবে"
 
+# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
+# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
 #: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: ../src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "পটভূমিতে fork করা হবে না"
 
 #: ../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:498
+#: ../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' প্রয়োগ "
+"%s বিকল্পে সমস্যা: %s.\n"
+"কমান্ত-লাইন থেকে ব্যবহারযোগ্য সমস্ত বিকল্পের সম্পূর্ণ তালিকা দেখতে '%s --help' প্রয়োগ "
 "করুন।\n"
 
 # msgstr "সিস্টেম বুট হবার পর থেকে নিষ্ক্রিয় কাজে অতিবাহিত সময় (সেকেন্ডে)"
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: ../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 "ইন্টারাপ্ট উৎপন্ন করা হবে"
+msgstr "ইন্টারাপ্ট উৎপন্ন করুন"
 
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
 msgid "Quit"
 msgstr "প্রস্থান"
 
 # 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 "অবৈধ নির্দেশ"
 
 # msgstr "অবৈধ ইনস্ট্রাকশন"
 # Instruction এখানে Technical term।
-#: ../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 "অস্বাভাবিক প্রস্থান"
 
 # 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 "ফ্লোটিং-পয়েন্ট এক্সেপশন"
 
 # msgstr "ভগ্নাংশ সংক্রান্ত ব্যতীক্রম" <-- বানান ভুল
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
 msgid "Kill"
 msgstr "Kill করুন"
 
 # msgstr "শেষ করা (Kill)"
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
 msgid "Bus error"
 msgstr "বাস সংক্রান্ত সমস্যা"
 
 # msgstr "বাস (Bus) সংক্রান্ত সমস্যা"
-#: ../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 "সিস্টেম-কল'এ ভুল আর্গুমেন্ট প্রেরিত হয়েছে"
 
 # msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
 msgid "Broken pipe"
 msgstr "ক্ষতিগ্রস্ত পাইপ"
 
 # 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 "ফাইলের মাপের সীমা অতিক্রান্ত"
 
 # 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 "ভার্চুয়াল অ্যালার্ম ঘড়ি"
 
 # 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 "উইন্ডোর মাপে পরিবর্তন"
 
 # msgstr "উইন্ডো'র আয়তন পরিবর্তন"
 # Window এর বাংলা করার দরকার নাই
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
 msgid "Information request"
 msgstr "তথ্যের অনুরোধ"
 
 # 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 "ব্যবহারকারী নির্ধারিত সিগনাল ১"
 
-#: ../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 "ব্যবহারকারী নির্ধারিত সিগনাল ২"
-