Prepared release 2.35.90

only need to deal with ascii.

.gitignore

@@ -1,45 +1,38 @@
-*~
+*.a
 *.bak
+*.core
+*.diff
+*.gmo
+*.header
+*.in
+*.la
+*.lo
 *.o
 *.out
-*.a
+*.patch
-*.gmo
+*.pot
-*.lo
-*.la
-*.core
 *.s
+*.sed
+*.sin
 *.stamp
-.libs
+*.swp
+*~
 .deps
-Makefile
+.libs
-Makefile.in
+ABOUT-NLS
-src/daemon/libgtop_daemon2
-src/daemon/libgtop_server2
-stamp-h1
-po/stamp-it
-po/POTFILES
-po/Makefile.in.in
-missing
-m4/
-ltmain.sh
-libtool
-libgtopconfig.h
-libgtop.spec
-libgtop-2.0.pc
-lib/lib.c
-lib/GTop-2.0.gir
-lib/GTop-2.0.typelib
 INSTALL
+Makefile
+Makevars.template
+Rules-quot
 aclocal.m4
 autom4te.cache/
+compile
 config.guess
 config.h
-config.h.in
 config.log
 config.status
 config.sub
 configure
-compile
 depcomp
 doc/libgtop2.info
 doc/mdate-sh
@@ -79,7 +72,20 @@ examples/timings
 examples/wd
 gtk-doc.make
 install-sh
-intltool-extract.in
+lib/GTop-2.0.gir
-intltool-merge.in
+lib/GTop-2.0.typelib
-intltool-update.in
+lib/lib.c
-
+libgtop-2.0.pc
+libgtop.spec
+libgtopconfig.h
+libtool
+ltmain.sh
+m4/
+missing
+po/POTFILES
+po/stamp-it
+src/daemon/libgtop_daemon2
+src/daemon/libgtop_server2
+stamp-h1
+stamp-po
+tmp-*

Makefile.am

@@ -15,17 +15,9 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 	 features.def libgtopconfig.h.in \
 	libgtop-sysdeps.m4 README \
 	 libgtop-2.0.pc.in acinclude.m4 \
-	intltool-extract.in \
-	intltool-merge.in \
 	libgtop.doap \
-	intltool-update.in \
 	m4/introspection.m4
 
-DISTCLEANFILES = \
-	intltool-extract \
-	intltool-merge \
-	intltool-update
-
 dist-hook:
 	cp libgtop.spec $(distdir)
 

NEWS

@@ -1,3 +1,56 @@
+13 February 2017: Overview of changes in 2.35.90
+================================================
+
+* Linux:
+  - Use dynamically allocated cpu buffer
+  - Do not cache getpagesize()
+  - Use faster g_ascii_isspace in tokenization
+  - Ignore paragraphs not describing a CPU/core
+
+* Updated translations
+* Added more gettext options
+
+16 January 2017: Overview of changes in 2.34.2
+================================================
+
+* Linux:
+  - fill last_processor member
+
+* Updated translations
+* Added more gettext options
+
+20 August 2016: Overview of changes in 2.34.1
+================================================
+
+* FreeBSD:
+  - rewrite netload to use official APIs
+  - mark wireless interfaces as such
+
+* All
+  - rename --with-libgtop-examples to --with-examples
+  - use gettext instead of intltool/glib-gettext
+  - added Language headers to the translations
+
+
+Special thanks to Gleb Smirnoff, Antoine Brodin, Koop Mast and Ting-Wei Lan for
+the FreeBSD fixes, to Javier Jardón for the gettext migration and to Piotr Drąg
+for adding the Language headers.
+
+22 March 2016: Overview of changes in 2.34.0
+================================================
+
+* Stable release
+
+29 February 2016: Overview of changes in 2.33.91
+
+* Updated translations
+* Fix building on must-libc
+
+18 January 2016: Overview of changes in 2.33.4
+
+* On OpenBSD only PID 1 is special
+* Call setlocale in main
+
 14 December: Overview of changes in 2.33.3
 
 * Fixed borken compilation on OpenBSD 

configure.ac

@@ -3,8 +3,8 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [33])
+m4_define([libgtop_minor_version], [35])
-m4_define([libgtop_micro_version], [3])
+m4_define([libgtop_micro_version], [90])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.
@@ -215,16 +215,14 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)
 
-IT_PROG_INTLTOOL([0.35.0])
+AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [Define to the gettext package used by the library])
 
-AM_GLIB_GNU_GETTEXT
-GLIB_DEFINE_LOCALEDIR([GTOPLOCALEDIR])
-
 AC_PATH_XTRA
 
 dnl For Solaris

examples/Makefile.am

@@ -1,5 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/sysdeps/$(sysdeps_dir) \
+	-DGTOPLOCALEDIR=\"$(localedir)\" \
+	$(GLIB_CFLAGS)
+
 AM_LDFLAGS			= $(LIBGTOP_EXTRA_LIBS)
 
 noinst_PROGRAMS	= 	first second pprint procargs df netlist \

libgtop-sysdeps.m4

@@ -13,7 +13,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_SUBST(libgtop_sysdeps_dir)
 	AC_SUBST(libgtop_need_server)
 
-	AC_ARG_WITH(libgtop-examples,
+	AC_ARG_WITH(examples,
 	AS_HELP_STRING([--with-examples],
 	[Build the libgtop examples @<:@default=yes@:>@]),[
 	build_examples="$withval"], [build_examples=yes])

po/Makevars

@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no

po/am.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2003-01-16 08:39+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ar.po

@@ -15,6 +15,7 @@ msgstr ""
 "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: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/as.po

@@ -12,6 +12,7 @@ msgstr ""
 "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"
+"Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ast.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2010-01-06 18:12+0100\n"
 "Last-Translator: astur <malditoastur@gmail.com>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/az.po

@@ -12,6 +12,7 @@ msgstr ""
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <translation-team-az@lists.sourceforge."
 "net>\n"
+"Language: az\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/bn.po

@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2010-01-21 16:02+0600\n"
 "Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
+"Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/bn_IN.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2007-08-10 14:47+0530\n"
 "Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
 "Language-Team: Bengali INDIA\n"
+"Language: bn_IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ca.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2011-04-04 22:04+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ca@valencia.po

@@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2011-04-04 22:04+0200\n"
 "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
-"Language: ca-XV\n"
+"Language: ca@valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/cs.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2010-03-28 17:19+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/cy.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2005-08-29 20:39+0100\n"
 "Last-Translator: Bryn Salisbury <bryn@randomlyevil.org.uk>\n"
 "Language-Team: Welsh <gnome-cy@www.linux.org>\n"
+"Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/da.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-16 23:21+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/de.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-19 19:28+0200\n"
 "Last-Translator: Hendrik Richter <hendrikr@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/dz.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-28 11:12-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
+"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/en@shaw.po

@@ -9,6 +9,7 @@ msgstr ""
 "PO-Revision-Date: 2010-05-12 18:37 -0400\n"
 "Last-Translator: Thomas Thurman <tthurman@gnome.org>\n"
 "Language-Team: Shavian <ubuntu-l10n-en-shaw@launchpad.net>\n"
+"Language: en@shaw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/en_CA.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2004-12-29 15:51-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
+"Language: en_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/en_GB.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2007-05-15 22:52-0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: English/GB <en@li.org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/eo.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2011-06-08 11:49+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
 "Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/es.po

@@ -14,10 +14,10 @@ msgstr ""
 "PO-Revision-Date: 2007-05-14 09:30+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"First-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 

po/et.po

@@ -16,6 +16,7 @@ msgstr ""
 "PO-Revision-Date: 2007-05-14 08:09+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/eu.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2008-01-10 23:26+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/fi.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2005-01-29 15:17+0200\n"
 "Last-Translator: Pauli Virtanen <pauli.virtanen@hut.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/fr.po

@@ -16,6 +16,7 @@ msgstr ""
 "PO-Revision-Date: 2007-08-24 21:27+0200\n"
 "Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ga.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2009-08-20 09:47-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/gu.po

@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2007-08-07 12:42+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati <fedora-trans-gu@redhat.com>\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"<magnet@magnet-i.com>\n"
 "Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "X-Generator: KBabel 1.11.4\n"

po/he.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2003-03-18 18:06+0200\n"
 "Last-Translator: Yair Hershkovitz <yairhr@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/hi.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2009-06-10 14:37+0530\n"
 "Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
 "Language-Team: Hindi <hindi.sf.net>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/hr.po

@@ -5,19 +5,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 15:24+0000\n"
+"POT-Creation-Date: 2016-04-26 22:07+0000\n"
-"PO-Revision-Date: 2007-06-19 23:43+0000\n"
+"PO-Revision-Date: 2009-06-30 04:01+0000\n"
-"Last-Translator: Ante Karamatić <ivoks@grad.hr>\n"
+"Last-Translator: Ante Karamatić <ante.karamatic@canonical.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2008-05-27 21:06+0000\n"
+"X-Launchpad-Export-Date: 2016-09-15 11:39+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Generator: Launchpad (build 18186)\n"
+"Language: hr\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:49
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -25,11 +26,11 @@ msgstr[0] "čitaj %d byte"
 msgstr[1] "čitaj %d bytea"
 msgstr[2] "čitaj %d byteova"
 
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:49
 msgid "read data size"
 msgstr "veličina pročitanih podataka"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:66
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -37,7 +38,7 @@ msgstr[0] "čitaj %lu byte podataka"
 msgstr[1] "čitaj %lu bytea podataka"
 msgstr[2] "čitaj %lu byteova podataka"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:49
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -45,19 +46,19 @@ msgstr[0] "zapisao %d byte"
 msgstr[1] "zapisao %d bytea"
 msgstr[2] "zapisao %d byteova"
 
-#: ../src/daemon/gnuserv.c:458
+#: ../src/daemon/gnuserv.c:456
 msgid "Enable debugging"
 msgstr "Omogućavanje debugiranja"
 
-#: ../src/daemon/gnuserv.c:460
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable verbose output"
 msgstr "Omogući opširni izlaz"
 
-#: ../src/daemon/gnuserv.c:462
+#: ../src/daemon/gnuserv.c:460
 msgid "Don't fork into background"
 msgstr "Bez forkanja u pozadini"
 
-#: ../src/daemon/gnuserv.c:464
+#: ../src/daemon/gnuserv.c:462
 msgid "Invoked from inetd"
 msgstr "Pozvano iz inetda"
 
@@ -65,7 +66,8 @@ msgstr "Pozvano iz inetda"
 #, c-format
 msgid ""
 "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Pokrenite naredbu '%s --help' kako biste vidjeli popis dostupnih opcija.\n"
+msgstr ""
+"Pokrenite naredbu '%s --help' kako biste vidjeli popis dostupnih opcija.\n"
 
 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
 msgid "Hangup"

po/hu.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-09 22:02+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@fsf.hu>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/id.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2010-04-18 14:46+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/it.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-10-02 23:18+0200\n"
 "Last-Translator: Alessio Frusciante <algol@firenze.linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ja.po

@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2011-09-11 07:40+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ka.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2006-03-18 03:28+0100\n"
 "Last-Translator: Alexander Didebulidze <didebuli@in.tum.de>\n"
 "Language-Team: Georgian <gnome@inet.ge>\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ko.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2013-03-19 02:23+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ku.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2005-10-15 16:41+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
+"Language: ku\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/la.po

@@ -9,6 +9,7 @@ msgstr ""
 "PO-Revision-Date: 2008-11-14 22:00-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Latin <la@li.org>\n"
+"Language: la\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/lt.po

@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-16 13:58+0300\n"
 "Last-Translator: Žygimantas Beručka <zygis@gnome.org>\n"
 "Language-Team: Lithuanian <gnome-lt@lists.akl.lt>\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/mai.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-11 20:50+0530\n"
 "Last-Translator: Sangeeta Kumari <sangeeta09@gmail.com>\n"
 "Language-Team: Maithili <maithili.sf.net>\n"
+"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/mg.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2006-07-05 21:48+0300\n"
 "Last-Translator: Fano Rajaonarisoa <rajfanhar@yahoo.fr>\n"
 "Language-Team: Malagasy <i18n-malagasy-gnome@gna.org>\n"
+"Language: mg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/mi.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2004-06-26 19:13+1200\n"
 "Last-Translator: John C Barstow <jbowtie@amathaine.com>\n"
 "Language-Team: Maori <maori@nzlinux.org.nz>\n"
+"Language: mi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/mk.po

@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-02 21:56+0200\n"
 "Last-Translator: Arangel Angov <arangel@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ml.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-12 20:37+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
+"Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/mn.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2004-01-05 21:47+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/mr.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-12 10:37+0530\n"
 "Last-Translator: sandeep shedmake <sandeep.shedmake@gmail.com>\n"
 "Language-Team: marathi\n"
+"Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ms.po

@@ -9,6 +9,7 @@ msgstr ""
 "PO-Revision-Date: 2003-11-11 03:36+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@list.sourceforge.net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ne.po

@@ -17,6 +17,7 @@ msgstr ""
 "PO-Revision-Date: 2007-12-19 12:53+0545\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
+"Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/nl.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-17 18:54+0200 \n"
 "Last-Translator: Wouter Bolsterlee <wbolster@gnome.org>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/nn.po

@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2009-10-17 18:26+0200\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@ulrik.uio.no>\n"
 "Language-Team: Norsk (nynorsk) <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/oc.po

@@ -3,15 +3,16 @@
 # This file is distributed under the GNU General Public License Version 2.
 # Cédric Valmary <cvalmary@yahoo.fr>, 2015.
 # Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>, 2015.
+# Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"&keywords=I18N+L10N&component=general\n"
+"product=libgtop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-04-30 07:47+0000\n"
+"POT-Creation-Date: 2016-05-05 20:08+0000\n"
-"PO-Revision-Date: 2015-10-31 08:15+0200\n"
+"PO-Revision-Date: 2016-05-05 21:47+0200\n"
-"Last-Translator: Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric Valmary (totenoc.eu) <cvalmary@yahoo.fr>\n"
-"Language-Team: Tot en òc (totenoc.eu)\n"
+"Language-Team: Tot En Òc\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,48 +21,48 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:49
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d octet legit"
 msgstr[1] "%d octets legits"
 
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:49
 msgid "read data size"
 msgstr "talha de las donadas legidas"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:66
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "lectura de %lu octet de donadas"
 msgstr[1] "lectura de %lu octets de donadas"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:49
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "escritura de %d octet"
 msgstr[1] "escritura de %d octets"
 
-#: ../src/daemon/gnuserv.c:455
+#: ../src/daemon/gnuserv.c:456
 msgid "Enable debugging"
 msgstr "Activa lo desbugatge"
 
-#: ../src/daemon/gnuserv.c:457
+#: ../src/daemon/gnuserv.c:458
 msgid "Enable verbose output"
 msgstr "Activa la sortida verbosa"
 
-#: ../src/daemon/gnuserv.c:459
+#: ../src/daemon/gnuserv.c:460
 msgid "Don't fork into background"
-msgstr "Aviar pas en prètzfach de fons"
+msgstr "Aviar pas en prètzfait de fons"
 
-#: ../src/daemon/gnuserv.c:461
+#: ../src/daemon/gnuserv.c:462
 msgid "Invoked from inetd"
 msgstr "Invocat a partir d'inetd"
 
-#: ../src/daemon/gnuserv.c:495
+#: ../src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
@@ -150,11 +151,11 @@ msgstr "L'estat del filh a cambiat"
 
 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
-msgstr "Lectura sus tty en rèire plan"
+msgstr "Lectura sus tty en rèireplan"
 
 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
-msgstr "Escritura sus tty en rèire plan"
+msgstr "Escritura sus tty en rèireplan"
 
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"

po/or.po

@@ -16,6 +16,7 @@ msgstr ""
 "PO-Revision-Date: 2009-03-10 19:21+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
+"Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/pa.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2009-03-16 05:37+0000\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjab-l10n@list.sf.net>\n"
+"Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/pl.po

@@ -1,31 +1,27 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Polish translation for libgtop.
-# Aviary.pl
+# Copyright © 1999-2016 the libgtop authors.
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
+# This file is distributed under the same license as the libgtop package.
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# gnomepl@aviary.pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 1999-2002.
 # Artur Flinta <aflinta@at.kernel.pl>, 2004-2007.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2015.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2016.
-# Aviary.pl <gnomepl@aviary.pl>, 2010-2015.
+# Aviary.pl <community-poland@mozilla.org>, 2010-2016.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-26 19:45+0200\n"
+"POT-Creation-Date: 2016-07-12 09:17+0000\n"
-"PO-Revision-Date: 2015-08-26 19:47+0200\n"
+"PO-Revision-Date: 2016-08-20 15:54+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <gnomepl@aviary.pl>\n"
+"Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
 
-#: ../lib/read.c:49
+#: lib/read.c:49
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -33,11 +29,11 @@ msgstr[0] "odczyt %d bajtu"
 msgstr[1] "odczyt %d bajtów"
 msgstr[2] "odczyt %d bajtów"
 
-#: ../lib/read_data.c:49
+#: lib/read_data.c:49
 msgid "read data size"
 msgstr "odczyt rozmiaru danych"
 
-#: ../lib/read_data.c:66
+#: lib/read_data.c:66
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -45,7 +41,7 @@ msgstr[0] "odczytano jeden bajt danych"
 msgstr[1] "odczytano %lu bajty danych"
 msgstr[2] "odczytano %lu bajtów danych"
 
-#: ../lib/write.c:49
+#: lib/write.c:49
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -53,149 +49,149 @@ msgstr[0] "zapisano jeden bajt"
 msgstr[1] "zapisano %d bajty"
 msgstr[2] "zapisano %d bajtów"
 
-#: ../src/daemon/gnuserv.c:455
+#: src/daemon/gnuserv.c:456
 msgid "Enable debugging"
 msgstr "Włącza debugowanie"
 
-#: ../src/daemon/gnuserv.c:457
+#: src/daemon/gnuserv.c:458
 msgid "Enable verbose output"
-msgstr "Wyświetla więcej informacji"
+msgstr "Więcej informacji"
 
-#: ../src/daemon/gnuserv.c:459
+#: src/daemon/gnuserv.c:460
 msgid "Don't fork into background"
-msgstr "Uruchamia program bez przechodzenia w tło"
+msgstr "Bez przechodzenia w tło"
 
-#: ../src/daemon/gnuserv.c:461
+#: src/daemon/gnuserv.c:462
 msgid "Invoked from inetd"
 msgstr "Wywołanie przez inetd"
 
-#: ../src/daemon/gnuserv.c:495
+#: src/daemon/gnuserv.c:498
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
 "Polecenie „%s --help” wyświetli pełną listę dostępnych opcji wiersza "
 "poleceń.\n"
 
-#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27
+#: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27
 msgid "Hangup"
 msgstr "Zawieszenie"
 
-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Interrupt"
 msgstr "Przerwanie"
 
-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Quit"
 msgstr "Zakończenie"
 
-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Illegal instruction"
 msgstr "Niedozwolona instrukcja"
 
-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Trace trap"
 msgstr "Trace trap"
 
-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Abort"
 msgstr "Przerwanie"
 
-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "EMT error"
 msgstr "Błąd EMT"
 
-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "Floating-point exception"
-msgstr "Wyjątek związany z liczbą zmiennoprzecinkową"
+msgstr "Wyjątek związany z liczbą zmiennoprzecinkową"
 
-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Kill"
 msgstr "Wymuszenie zakończenia"
 
-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Bus error"
 msgstr "Błąd magistrali"
 
-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Segmentation violation"
 msgstr "Naruszenie ochrony pamięci"
 
-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Bad argument to system call"
 msgstr "Błędny parametr dla wywołania systemowego"
 
-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Broken pipe"
 msgstr "Uszkodzony potok"
 
-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Alarm clock"
 msgstr "Budzik"
 
-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Termination"
 msgstr "Zakończenie"
 
-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Urgent condition on socket"
-msgstr "Pilny warunek związany z gniazdem"
+msgstr "Pilny warunek związany z gniazdem"
 
-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Stop"
 msgstr "Zatrzymanie"
 
-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Keyboard stop"
 msgstr "Zatrzymanie klawiatury"
 
-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Continue"
 msgstr "Kontynuacja"
 
-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Child status has changed"
 msgstr "Zmiana stanu procesu potomnego"
 
-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
-msgstr "Odczyt w tle z urządzenia TTY"
+msgstr "Odczyt w tle z urządzenia TTY"
 
-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
-msgstr "Zapis w tle do urządzenia TTY"
+msgstr "Zapis w tle do urządzenia TTY"
 
-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"
 msgstr "Wejście/wyjście jest teraz dostępne"
 
-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "CPU limit exceeded"
 msgstr "Przekroczono ograniczenie procesora"
 
-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "File size limit exceeded"
 msgstr "Przekroczono ograniczenie rozmiaru plików"
 
-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "Virtual alarm clock"
 msgstr "Wirtualny budzik"
 
-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Profiling alarm clock"
 msgstr "Profilowanie budzika"
 
-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Window size change"
 msgstr "Zmiana rozmiaru okna"
 
-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Information request"
 msgstr "Żądanie informacji"
 
-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "User defined signal 1"
 msgstr "1. sygnał określony przez użytkownika"
 
-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 2"
 msgstr "2. sygnał określony przez użytkownika"

po/pt_BR.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2008-07-24 13:23-0300\n"
 "Last-Translator: Vladimir Melo <vladimirmelo.psi@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ro.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-20 00:44+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ru.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-05 15:01+0200\n"
 "Last-Translator: Nickolay V. Shmyrev <nshmyrev@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/rw.po

@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2005-03-28 19:35-0700\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"Language: rw\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/sk.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-03-06 22:12+0100\n"
 "Last-Translator: Marcel Telka <Marcel@telka.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/sl.po

@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2010-05-11 15:26+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/sq.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2008-09-20 12:25+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
+"Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/sr.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2005-03-06 09:51+0100\n"
 "Last-Translator: Данило Шеган <danilo@gnome.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/sr@latin.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2005-03-06 09:51+0100\n"
 "Last-Translator: Danilo Šegan <danilo@gnome.org>\n"
 "Language-Team: Serbian (sr) <gnom@prevod.org>\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/sv.po

@@ -15,6 +15,7 @@ msgstr ""
 "PO-Revision-Date: 2007-05-27 11:44+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ta.po

@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-08 17:29+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/te.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-17 19:09+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
+"Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/th.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2007-05-18 17:23+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/tr.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2008-09-14 02:31+0300\n"
 "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/ug.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2010-10-08 10:12+0600\n"
 "Last-Translator: Sahran <sahran@live.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"Language: ug\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/uk.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-12 11:35+0300\n"
 "Last-Translator: Maxim Dziumanenko <dziumanenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/vi.po

@@ -11,6 +11,7 @@ msgstr "Project-Id-Version: libgtop GNOME 2.20\n"
 "PO-Revision-Date: 2007-06-27 17:37+09300\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/xh.po

@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2005-03-30 22:54+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
+"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/zh_CN.po

@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-09-07 17:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/zh_HK.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-02-09 08:06+0800\n"
 "Last-Translator: Abel Cheung <abel@oaka.org>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

po/zh_TW.po

@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2008-02-14 23:04+0800\n"
 "Last-Translator: Abel Cheung <abel@oaka.org>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

src/daemon/gnuserv.c

@@ -43,6 +43,7 @@
 #include <glibtop/gnuserv.h>
 
 #include <errno.h>
+#include <locale.h>
 
 #include "daemon.h"
 
@@ -473,6 +474,8 @@ main (int argc, char **argv)
 
     int ils = -1;		/* internet domain listen socket */
 
+    setlocale (LC_ALL, "");
+
     /* On non-glibc systems, this is not set up for us.  */
     if (!program_invocation_name) {
 	char *arg;

sysdeps/freebsd/netload.c

@@ -1,7 +1,9 @@
 /* Copyright (C) 1998-99 Martin Baulig
+   Copyright (C) 2014 Gleb Smirnoff
    This file is part of LibGTop 1.0.
 
    Contributed by Martin Baulig <martin@home-of-linux.org>, October 1998.
+   Contributed by Gleb Smirnoff <glebius@FreeBSD.org>, September 2014
 
    LibGTop is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -26,25 +28,17 @@
 
 #include <glibtop_suid.h>
 
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
-
+#include <sys/sockio.h>
+#include <netinet/in.h>
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_types.h>
+#include <net/if_media.h>
-
+#include <ifaddrs.h>
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <netinet/in.h>
-#include <netinet/in_var.h>
 
 static const unsigned long _glibtop_sysdeps_netload =
 (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
+(1L << GLIBTOP_NETLOAD_MTU) +
 (1L << GLIBTOP_NETLOAD_PACKETS_IN) +
 (1L << GLIBTOP_NETLOAD_PACKETS_OUT) +
 (1L << GLIBTOP_NETLOAD_PACKETS_TOTAL) +
@@ -54,35 +48,24 @@ static const unsigned long _glibtop_sysdeps_netload =
 (1L << GLIBTOP_NETLOAD_ERRORS_IN) +
 (1L << GLIBTOP_NETLOAD_ERRORS_OUT) +
 (1L << GLIBTOP_NETLOAD_ERRORS_TOTAL) +
-(1L << GLIBTOP_NETLOAD_COLLISIONS);
+(1L << GLIBTOP_NETLOAD_COLLISIONS) +
+(1L << GLIBTOP_NETLOAD_HWADDRESS);
 
 static const unsigned long _glibtop_sysdeps_netload_data =
-(1L << GLIBTOP_NETLOAD_ADDRESS) +
+(1L << GLIBTOP_NETLOAD_SUBNET) +
-(1L << GLIBTOP_NETLOAD_MTU);
+(1L << GLIBTOP_NETLOAD_ADDRESS);
 
 static const unsigned long _glibtop_sysdeps_netload6 =
 (1L << GLIBTOP_NETLOAD_ADDRESS6) +
+(1L << GLIBTOP_NETLOAD_PREFIX6) +
 (1L << GLIBTOP_NETLOAD_SCOPE6);
 
-/* nlist structure for kernel access */
-static struct nlist nlst [] =
-        {
-                { "_ifnet"
-                },
-                { 0 }
-        };
-
 /* Init function. */
 
 void
 _glibtop_init_netload_p (glibtop *server)
 {
-        if (kvm_nlist (server->machine->kd, nlst) < 0) {
+        server->sysdeps.netload = _glibtop_sysdeps_netload;
-                glibtop_warn_io_r (server, "kvm_nlist");
-		return;
-	}
-
-	server->sysdeps.netload = _glibtop_sysdeps_netload;
 }
 
 /* Provides Network statistics. */
@@ -91,154 +74,141 @@ void
 glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
                        const char *interface)
 {
-        struct ifnet ifnet;
+        struct ifaddrs *ifap, *ifa;
-        u_long ifnetaddr;
-        struct sockaddr *sa = NULL;
-
-        union {
-                struct ifaddr ifa;
-                struct in_ifaddr in;
-        } ifaddr;
 
         memset (buf, 0, sizeof (glibtop_netload));
 
-	if (server->sysdeps.netload == 0) return;
+        if (server->sysdeps.netload == 0)
+                return;
 
-        if (kvm_read (server->machine->kd, nlst [0].n_value,
+        if (getifaddrs(&ifap) != 0) {
-                        &ifnetaddr, sizeof (ifnetaddr)) != sizeof (ifnetaddr)) {
+                glibtop_warn_io_r (server, "getifaddrs");
-                glibtop_warn_io_r (server, "kvm_read (ifnet)");
+                return;
-		return;
+        }
-	}
 
-        for (/* NOP */; ifnetaddr; ifnetaddr = (u_long) ifnet.if_link.tqe_next)
+#define IFA_STAT(s)     (((struct if_data *)ifa->ifa_data)->ifi_ ## s)
-        {
-                struct sockaddr_in *sin;
-                register char *cp;
-                u_long ifaddraddr;
 
-		if (kvm_read (server->machine->kd, ifnetaddr, &ifnet,
+        for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-			      sizeof (ifnet)) != sizeof (ifnet)) {
+                if (strcmp (ifa->ifa_name, interface) != 0)
-			glibtop_warn_io_r (server,
+                        continue;
-					   "kvm_read (ifnetaddr)");
-			break;
-		}
 
-		if (strcmp (ifnet.if_xname, interface) != 0)
+                switch (ifa->ifa_addr->sa_family) {
-			continue;
+                case AF_LINK: {
-		
+                        struct sockaddr_dl *sdl;
-	        if (ifnet.if_flags & IFF_UP)
+                        struct ifmediareq ifmr;
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
+                        struct ifreq ifr;
-                if (ifnet.if_flags & IFF_BROADCAST)
+                        int s, flags;
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
-                if (ifnet.if_flags & IFF_DEBUG)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
-                if (ifnet.if_flags & IFF_LOOPBACK)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
-                if (ifnet.if_flags & IFF_POINTOPOINT)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
-#ifdef IFF_DRV_RUNNING
-                if (ifnet.if_drv_flags & IFF_DRV_RUNNING)
-#else
-                if (ifnet.if_flags & IFF_RUNNING)
-#endif
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
-                if (ifnet.if_flags & IFF_NOARP)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
-                if (ifnet.if_flags & IFF_PROMISC)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
-                if (ifnet.if_flags & IFF_ALLMULTI)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
-#ifdef IFF_DRV_OACTIVE
-                if (ifnet.if_drv_flags & IFF_DRV_OACTIVE)
-#else
-                if (ifnet.if_flags & IFF_OACTIVE)
-#endif
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
-                if (ifnet.if_flags & IFF_SIMPLEX)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
-                if (ifnet.if_flags & IFF_LINK0)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
-                if (ifnet.if_flags & IFF_LINK1)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
-                if (ifnet.if_flags & IFF_LINK2)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
-                if (ifnet.if_flags & IFF_ALTPHYS)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
-                if (ifnet.if_flags & IFF_MULTICAST)
-                        buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
 
-                buf->packets_in = ifnet.if_ipackets;
+                        s = socket(AF_INET, SOCK_DGRAM, 0);
-                buf->packets_out = ifnet.if_opackets;
+                        if (s < 0) {
-                buf->packets_total = buf->packets_in + buf->packets_out;
+                                glibtop_warn_io_r(server, "socket(AF_INET)");
-
+                                break;
-                buf->bytes_in = ifnet.if_ibytes;
-                buf->bytes_out = ifnet.if_obytes;
-                buf->bytes_total = buf->bytes_in + buf->bytes_out;
-
-                buf->errors_in = ifnet.if_ierrors;
-                buf->errors_out = ifnet.if_oerrors;
-                buf->errors_total = buf->errors_in + buf->errors_out;
-
-                buf->collisions = ifnet.if_collisions;
-                buf->flags = _glibtop_sysdeps_netload;
-
-                for (ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first; ifaddraddr; ifaddraddr = (u_long) ifaddr.ifa.ifa_link.tqe_next) {
-                        if ((kvm_read (server->machine->kd, ifaddraddr, &ifaddr,
-                                        sizeof (ifaddr)) != sizeof (ifaddr))) {
-                                glibtop_warn_io_r (server,
-						   "kvm_read (ifaddraddr)");
-				break;
-			}
-
-#define CP(x) ((char *)(x))
-                        cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
-                             CP(&ifaddr);
-                        sa = (struct sockaddr *)cp;
-
-                        if (sa->sa_family == AF_LINK) {
-                                struct sockaddr_dl *dl = (struct sockaddr_dl *) sa;
-
-                                memcpy (buf->hwaddress, LLADDR (dl),
-					sizeof (buf->hwaddress));
-                                buf->flags |= GLIBTOP_NETLOAD_HWADDRESS;
-                        } else if (sa->sa_family == AF_INET) {
-                                sin = (struct sockaddr_in *)sa;
-                                /* Commenting out to "fix" #13345. */
-                                buf->subnet = htonl (ifaddr.in.ia_subnet);
-                                buf->address = sin->sin_addr.s_addr;
-                                buf->mtu = ifnet.if_mtu;
-
-                                buf->flags |= _glibtop_sysdeps_netload_data;
-                        } else if (sa->sa_family == AF_INET6) {
-                                struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa;
-                                int in6fd;
-
-                                memcpy (buf->address6, &sin6->sin6_addr,
-					sizeof (buf->address6));
-                                buf->scope6 = (guint8) sin6->sin6_scope_id;
-                                buf->flags |= _glibtop_sysdeps_netload6;
-
-                                in6fd = socket (AF_INET6, SOCK_DGRAM, 0);
-                                if (in6fd >= 0) {
-                                        struct in6_ifreq ifr;
-
-                                        memset (&ifr, 0, sizeof (ifr));
-                                        ifr.ifr_addr = *sin6;
-                                        g_strlcpy (ifr.ifr_name, interface,
-                                                   sizeof (ifr.ifr_name));
-                                        if (ioctl (in6fd, SIOCGIFNETMASK_IN6,
-						  (char *) &ifr) >= 0) {
-                                                memcpy (buf->prefix6,
-						        &ifr.ifr_addr.sin6_addr,
-                                                        sizeof (buf->prefix6));
-                                                buf->flags |= GLIBTOP_NETLOAD_PREFIX6;
-                                        }
-                                        close (in6fd);
-                                }
                         }
-                } /* end of for ( ifaddraddr ) */
 
-		/* found the interface anyway */
+                        memset(&ifmr, 0, sizeof(ifmr));
-                break;
+                        (void)strlcpy(ifmr.ifm_name, ifa->ifa_name,
-        } /* end of for ( ifnetaddr ) */
+                                sizeof(ifmr.ifm_name));
+                        if (ioctl(s, SIOCGIFXMEDIA, (caddr_t)&ifmr) < 0 &&
+                            ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
+                                glibtop_warn_io_r(server, "ioctl(SIOCGIFMEDIA)");
+                        } else {
+                                if (IFM_TYPE (ifmr.ifm_current) & IFM_IEEE80211)
+                                    buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_WIRELESS);
+                                if (IFM_TYPE (ifmr.ifm_active) & IFM_IEEE80211)
+                                    buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_WIRELESS);
+                        }
+
+                        memset(&ifr, 0, sizeof(ifr));
+                        (void)strlcpy(ifr.ifr_name, ifa->ifa_name,
+                                sizeof(ifr.ifr_name));
+                        if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
+                                glibtop_warn_io_r(server, "ioctl(SIOCGIFFLAGS)");
+                                close(s);
+                                break;
+                        }
+
+                        close(s);
+
+                        flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
+
+                        if (flags & IFF_UP)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
+                        if (flags & IFF_BROADCAST)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
+                        if (flags & IFF_DEBUG)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
+                        if (flags & IFF_LOOPBACK)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
+                        if (flags & IFF_POINTOPOINT)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
+                        if (flags & IFF_RUNNING)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
+                        if (flags & IFF_NOARP)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
+                        if (flags & IFF_PROMISC)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
+                        if (flags & IFF_ALLMULTI)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
+                        if (flags & IFF_OACTIVE)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
+                        if (flags & IFF_SIMPLEX)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
+                        if (flags & IFF_LINK0)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
+                        if (flags & IFF_LINK1)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
+                        if (flags & IFF_LINK2)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
+                        if (flags & IFF_ALTPHYS)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
+                        if (flags & IFF_MULTICAST)
+                                buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
+
+                        buf->packets_in = IFA_STAT(ipackets);
+                        buf->packets_out = IFA_STAT(opackets);
+                        buf->packets_total = buf->packets_in + buf->packets_out;
+
+                        buf->bytes_in = IFA_STAT(ibytes);
+                        buf->bytes_out = IFA_STAT(obytes);
+                        buf->bytes_total = buf->bytes_in + buf->bytes_out;
+
+                        buf->errors_in = IFA_STAT(ierrors);
+                        buf->errors_out = IFA_STAT(oerrors);
+                        buf->errors_total = buf->errors_in + buf->errors_out;
+
+                        buf->collisions = IFA_STAT(collisions);
+
+                        sdl = (struct sockaddr_dl *)(void *)ifa->ifa_addr;
+                        memcpy(buf->hwaddress, LLADDR(sdl),
+                                sizeof(buf->hwaddress));
+                        buf->mtu = IFA_STAT(mtu);
+                        buf->flags |= _glibtop_sysdeps_netload;
+                        break;
+                }
+                case AF_INET: {
+                        struct sockaddr_in *sin;
+
+                        sin = (struct sockaddr_in *)(void *)ifa->ifa_addr;
+                        buf->address = sin->sin_addr.s_addr;
+                        sin = (struct sockaddr_in *)(void *)ifa->ifa_netmask;
+                        buf->subnet = sin->sin_addr.s_addr & buf->address;
+                        buf->flags |= _glibtop_sysdeps_netload_data;
+                        break;
+                }
+                case AF_INET6: {
+                        struct sockaddr_in6 *sin6;
+
+                        sin6 = (struct sockaddr_in6 *)(void *)ifa->ifa_addr;
+                        memcpy(buf->address6, &sin6->sin6_addr,
+                                sizeof(buf->address6));
+                        buf->scope6 = (guint8 )sin6->sin6_scope_id;
+                        sin6 = (struct sockaddr_in6 *)(void *)ifa->ifa_netmask;
+                        memcpy(buf->prefix6, &sin6->sin6_addr,
+                                sizeof(buf->prefix6));
+                        buf->flags |= _glibtop_sysdeps_netload6;
+                        break;
+                }
+                } // switch() end
+        }
+        freeifaddrs(ifap);
 }

sysdeps/linux/glibtop_private.c

@@ -51,7 +51,7 @@ char *
 skip_token (const char *p)
 {
 	p = next_token(p);
-	while (*p && !isspace(*p)) p++;
+	while (*p && !g_ascii_isspace(*p)) p++;
 	p = next_token(p);
 	return (char *)p;
 }
@@ -178,20 +178,6 @@ get_boot_time(glibtop *server)
 }
 
 
-size_t
-get_page_size(void)
-{
-	static size_t pagesize = 0;
-
-	if(G_UNLIKELY(!pagesize))
-	{
-		pagesize = getpagesize();
-	}
-
-	return pagesize;
-}
-
-
 
 gboolean
 check_cpu_line(glibtop *server, const char *line, unsigned i)

sysdeps/linux/glibtop_private.h

@@ -37,7 +37,7 @@ G_BEGIN_DECLS
 static inline char*
 next_token(const char *p)
 {
-	while (isspace(*p)) p++;
+	while (g_ascii_isspace(*p)) p++;
 	return (char*) p;
 }
 
@@ -122,10 +122,6 @@ unsigned long
 get_boot_time(glibtop *server);
 
 
-size_t
-get_page_size(void);
-
-
 gboolean
 check_cpu_line(glibtop *server, const char *line, unsigned n);
 

sysdeps/linux/netload.c

@@ -34,7 +34,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#if !defined (__GLIBC__) || __GNU_LIBRARY__ > 1
 /* GNU LibC */
 #include <net/if.h>
 #include <netinet/ip_icmp.h>
@@ -43,7 +43,7 @@
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <net/if.h>
-#else /* Libc 5 */
+#elif defined (__GLIBC__) /* Libc 5 */
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/ip.h>

sysdeps/linux/procmem.c

@@ -82,7 +82,7 @@ void
 glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
 {
 	char buffer [BUFSIZ], *p;
-	const size_t pagesize = get_page_size();
+	const size_t pagesize = getpagesize();
 
 	memset (buf, 0, sizeof (glibtop_proc_mem));
 

sysdeps/linux/procsegment.c

@@ -53,7 +53,7 @@ glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
 			    pid_t pid)
 {
 	char buffer [BUFSIZ], *p;
-	const size_t pagesize = get_page_size();
+	const size_t pagesize = getpagesize();
 
 	memset (buf, 0, sizeof (glibtop_proc_segment));
 

sysdeps/linux/procstate.c

@@ -110,6 +110,9 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
 	    break;
 	  }
 
+	p = skip_multiple_token (p, 36);
+	buf->last_processor = atoi (p);
+
 	p = skip_token (buffer); /* pid */
 	if (G_UNLIKELY(*p++ != '('))
 		glibtop_error_r (server, "Bad data in /proc/%d/stat", pid);

sysdeps/linux/sysinfo.c

@@ -36,23 +36,34 @@ static glibtop_sysinfo sysinfo = { .flags = 0 };
 static void
 init_sysinfo (glibtop *server)
 {
-	char buffer [65536];
+	char* buffer;
 	gchar ** processors;
 
 	if(G_LIKELY(sysinfo.flags)) return;
 
-	file_to_buffer(server, buffer, sizeof buffer, FILENAME);
+	if (!g_file_get_contents(FILENAME, &buffer, NULL, NULL)) {
+		glibtop_error_io_r(server, "g_file_get_contents(%s)", FILENAME);
+	}
 
 	/* cpuinfo records are seperated by a blank line */
 	processors = g_strsplit(buffer, "\n\n", 0);
 
-	for(sysinfo.ncpu = 0;
+	g_free(buffer);
-	    sysinfo.ncpu < GLIBTOP_NCPU && processors[sysinfo.ncpu] && *processors[sysinfo.ncpu];
+
-	    sysinfo.ncpu++) {
+	sysinfo.ncpu = 0;
+	for (char** this_proc = &processors[0]; *this_proc && **this_proc; this_proc++) {
+
+		if (sysinfo.ncpu >= GLIBTOP_NCPU) {
+			glibtop_warn_r(server, "Cannot deal with more than %d CPUs", GLIBTOP_NCPU);
+			break;
+		}
 
 		gchar **parts, **p;
-        if (g_strrstr (processors[sysinfo.ncpu], "processor" ) == NULL) 
+		if (g_strrstr (*this_proc, "processor" ) == NULL) {
-            continue;
+		  /* skip unknown paragraph */
+		  continue;
+		}
+
 		glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
 
 		cpuinfo->labels = g_ptr_array_new ();
@@ -64,7 +75,7 @@ init_sysinfo (glibtop *server)
 							g_free, g_free);
 
 		/* "<key>    : <value>" */
-		parts = g_strsplit_set(processors[sysinfo.ncpu], ":\n", 0);
+		parts = g_strsplit_set(*this_proc, ":\n", 0);
 
 		for(p = parts; *p && *(p+1); p += 2) {
 
@@ -85,6 +96,7 @@ init_sysinfo (glibtop *server)
 
 		g_free(parts);
 
+		sysinfo.ncpu++;
 	}
 
 	g_strfreev(processors);

sysdeps/openbsd/procargs.c

@@ -56,11 +56,8 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 
 	memset (buf, 0, sizeof (glibtop_proc_args));
 
-	/*
+	/* Ignore init */
-	 * Don't bother with PIDs below 20, because everything below this
+	if (pid < 2) return NULL;
-	 * number is highly likely to be a kernel thread.
-	 */
-	if (pid < 19) return NULL;
 
 	glibtop_suid_enter (server);