From 0c1be6e7b6266078aa2b5ae948cb63a88320fd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 9 Feb 2019 12:27:35 +0000 Subject: [PATCH 1/7] autogen.sh: Use autoreconf instead deprecated gnome-common See https://wiki.gnome.org/Projects/GnomeCommon/Migration --- autogen.sh | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/autogen.sh b/autogen.sh index 72573680..9d394bff 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,20 +1,40 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=$(dirname "$0") +test -n "$srcdir" || srcdir=. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +olddir=$(pwd) -(test -f $srcdir/configure.ac \ - && test -f $srcdir/copyright.txt \ - && test -d $srcdir/sysdeps) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level gnome directory" - exit 1 +cd $srcdir + +(test -f configure.ac) || { + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" + exit 1 } -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -REQUIRED_AUTOMAKE_VERSION=1.9 -. gnome-autogen.sh +# shellcheck disable=SC2016 +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) + +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 + echo "*** If you wish to pass any to it, please specify them on the" >&2 + echo "*** '$0' command line." >&2 + echo "" >&2 +fi + +aclocal --install || exit 1 +gtkdocize --copy || exit 1 +autoreconf --verbose --force --install || exit 1 + +cd "$olddir" +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 + + if [ "$1" = "--help" ]; then + exit 0 + else + echo "Now type 'make' to compile $PKG_NAME" || exit 1 + fi +else + echo "Skipping configure process." +fi From 00140eadc888df7a870e7dde3d07c8f75d152c07 Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Mon, 18 Feb 2019 20:52:54 +0200 Subject: [PATCH 2/7] Prepared release 2.39.91 --- NEWS | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 31fa0de8..d793800d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +18 February 2019: Overview of changes in 2.39.91 + +* Replace deprecated gnome-common with autoreconf + 04 February 2019: Overview of changes in 2.39.90 ================================================ diff --git a/configure.ac b/configure.ac index ade5c440..579500d7 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl m4_define([libgtop_major_version], [2]) m4_define([libgtop_minor_version], [39]) -m4_define([libgtop_micro_version], [90]) +m4_define([libgtop_micro_version], [91]) m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version]) dnl increment if the interface has additions, changes, removals. From e88e854e577c849d03f2f623529e97016c4eeaa5 Mon Sep 17 00:00:00 2001 From: Kristjan SCHMIDT Date: Sun, 24 Feb 2019 11:07:31 +0000 Subject: [PATCH 3/7] Update Esperanto translation --- po/eo.po | 110 +++++++++++++++++++++++++++---------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/po/eo.po b/po/eo.po index 2ccd808f..42804144 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2,193 +2,193 @@ # Copyright (C) 2006-2011 Free Software Foundation, Inc. # This file is distributed under the same license as the libgtop package. # Dominique PELLE , 2006. -# Kristjan SCHMIDT , 2010, 2011. -# +# Kristjan SCHMIDT , 2010, 2011, 2019. msgid "" msgstr "" "Project-Id-Version: libgtop\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=libgtop&component=general\n" -"POT-Creation-Date: 2011-03-31 17:35+0000\n" -"PO-Revision-Date: 2011-06-08 11:49+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgtop/issues\n" +"POT-Creation-Date: 2018-01-25 10:19+0000\n" +"PO-Revision-Date: 2019-02-24 12:06+0200\n" "Last-Translator: Kristjan SCHMIDT \n" -"Language-Team: Esperanto \n" +"Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Launchpad-Export-Date: 2011-06-08 09:44+0000\n" -"X-Generator: Launchpad (build 13144)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" -#: ../lib/read.c:51 +#: lib/read.c:49 #, c-format msgid "read %d byte" msgid_plural "read %d bytes" msgstr[0] "legis %d bajton" msgstr[1] "legis %d bajtojn" -#: ../lib/read_data.c:51 +#: lib/read_data.c:49 msgid "read data size" msgstr "grando de legita datumo" -#: ../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] "legis %lu bajton da datumo" msgstr[1] "legis %lu bajtojn da datumo" -#: ../lib/write.c:51 +#: lib/write.c:49 #, c-format msgid "wrote %d byte" msgid_plural "wrote %d bytes" msgstr[0] "skribis %d bajton" msgstr[1] "skribis %d bajtojn" -#: ../src/daemon/gnuserv.c:455 +#: src/daemon/gnuserv.c:456 msgid "Enable debugging" msgstr "Enŝalti sencimigon" -#: ../src/daemon/gnuserv.c:457 +#: src/daemon/gnuserv.c:458 msgid "Enable verbose output" msgstr "Enŝalti babileman eligon" -#: ../src/daemon/gnuserv.c:459 -msgid "Don't fork into background" +#: src/daemon/gnuserv.c:460 +#| msgid "Don't fork into background" +msgid "Don’t fork into background" msgstr "Ne forki fonen" -#: ../src/daemon/gnuserv.c:461 +#: src/daemon/gnuserv.c:462 msgid "Invoked from inetd" msgstr "Alvokita de \"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" +#| msgid "" +#| "Run '%s --help' to see a full list of available command line options.\n" +msgid "Run “%s --help” to see a full list of available command line options.\n" msgstr "" -"Ruli '%s --help' por vidigi tutan liston de disponeblajn komandliniaj " -"opciojn.\n" +"Ruli “%s --help” por vidi tutan liston de disponeblajn komandliniaj opciojn." +"\n" -#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27 +#: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27 msgid "Hangup" msgstr "Malkonekti" -#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28 +#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28 msgid "Interrupt" msgstr "Interrompi" -#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29 +#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29 msgid "Quit" msgstr "Ĉesi" -#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30 +#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30 msgid "Illegal instruction" msgstr "Nevalida komando" -#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31 +#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31 msgid "Trace trap" msgstr "Spura escepto" -#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32 +#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32 msgid "Abort" msgstr "Ĉesigi" -#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33 +#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33 msgid "EMT error" msgstr "EMT-eraro" -#: ../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 "Glitpunkta escepto" -#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35 +#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35 msgid "Kill" msgstr "Mortigi" -#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36 +#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36 msgid "Bus error" msgstr "Bus-eraro" -#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37 +#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37 msgid "Segmentation violation" msgstr "Aliro al nerezervita memoro" -#: ../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 "Nevalida argumento al sistemvoko" -#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39 +#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39 msgid "Broken pipe" msgstr "Rompita dukto" -#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40 +#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40 msgid "Alarm clock" msgstr "Alarm-takto" -#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41 +#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41 msgid "Termination" msgstr "Finiĝo" -#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42 +#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42 msgid "Urgent condition on socket" msgstr "Urĝa kondiĉo ĉe kontaktoskatolo" -#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43 +#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43 msgid "Stop" msgstr "Haltigi" -#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44 +#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44 msgid "Keyboard stop" msgstr "Klavara halto" -#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45 +#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45 msgid "Continue" msgstr "Daŭrigi" -#: ../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 "Stato de ido ŝanĝiĝis" -#: ../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 "Fona lego de \"tty\"" +msgstr "Fona lego de \"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 "Fona skribo al \"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 "Eneligo nun eblas" -#: ../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 "Limo de procesilo superitas" -#: ../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 "Limo de dosiergrando superitas" -#: ../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 "Virtuala alarm-takto" -#: ../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 "Profila alarm-takto" -#: ../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 "Ŝanĝo de fenestrogrando" -#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55 +#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55 msgid "Information request" msgstr "Informpeto" -#: ../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 "Uzant-difinita signalo 1" -#: ../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 "Uzant-difinita signalo 2" From 334f1e5c4cf0a673d29690e37ab5f2fdc0ae1285 Mon Sep 17 00:00:00 2001 From: Ask Hjorth Larsen Date: Sun, 24 Feb 2019 14:52:58 +0100 Subject: [PATCH 4/7] Updated Danish translation --- po/da.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/po/da.po b/po/da.po index 3a31f531..dd5ae047 100644 --- a/po/da.po +++ b/po/da.po @@ -10,12 +10,11 @@ msgid "" msgstr "" "Project-Id-Version: libgtop\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?" -"product=libgtop&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-04-07 11:45+0000\n" -"PO-Revision-Date: 2017-09-10 17:51+0200\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgtop/issues\n" +"POT-Creation-Date: 2018-01-25 10:19+0000\n" +"PO-Revision-Date: 2019-02-14 00:00+0200\n" "Last-Translator: Ole Laursen \n" -"Language-Team: Danish \n" +"Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +65,9 @@ msgstr "Kaldt fra inetd" #: src/daemon/gnuserv.c:498 #, c-format msgid "Run “%s --help” to see a full list of available command line options.\n" -msgstr "Kør “%s --help” for at få en liste over alle tilgængelige kommandolinjetilvalg.\n" +msgstr "" +"Kør “%s --help” for at få en liste over alle tilgængelige " +"kommandolinjetilvalg.\n" #: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27 msgid "Hangup" From 8871660dac7a3ffd5cb483ed801754683b5b12ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Thu, 7 Mar 2019 16:28:17 +0100 Subject: [PATCH 5/7] Fix several array and transfer annotations --- include/glibtop/mountlist.h | 8 ++++---- include/glibtop/netlist.h | 8 ++++---- include/glibtop/proclist.h | 8 ++++---- include/glibtop/procmap.h | 8 ++++---- include/glibtop/procopenfiles.h | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h index f4691b36..f9d88cdf 100644 --- a/include/glibtop/mountlist.h +++ b/include/glibtop/mountlist.h @@ -58,7 +58,7 @@ struct _glibtop_mountlist * @buf: * @all_fs: * - * Returns: (transfer full): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -66,7 +66,7 @@ struct _glibtop_mountlist * @buf: (out): * @all_fs: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -74,7 +74,7 @@ struct _glibtop_mountlist * @buf: (out): * @all_fs: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -82,7 +82,7 @@ struct _glibtop_mountlist * @buf: (out): * @all_fs: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_mountentry * diff --git a/include/glibtop/netlist.h b/include/glibtop/netlist.h index f5ed2ffe..a6fc4abd 100644 --- a/include/glibtop/netlist.h +++ b/include/glibtop/netlist.h @@ -45,7 +45,7 @@ struct _glibtop_netlist * glibtop_get_netlist: * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist(glibtop_netlist *buf); @@ -61,7 +61,7 @@ char** glibtop_get_netlist(glibtop_netlist *buf); * @server: a #glibtop server * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist_l (glibtop *server, glibtop_netlist *buf); @@ -74,7 +74,7 @@ void _glibtop_init_netlist_p (glibtop *server); * @server: a #glibtop server * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist_p (glibtop *server, glibtop_netlist *buf); @@ -86,7 +86,7 @@ void _glibtop_init_netlist_s (glibtop *server); * @server: a #glibtop server * @buf: a #glibtop_netlist * - * Returns: (array zero-terminated=1) (transfer none): an array of network + * Returns: (array zero-terminated=1) (transfer full): an array of network * interface names. */ char** glibtop_get_netlist_s (glibtop *server, glibtop_netlist *buf); diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h index 417d618a..4380de3d 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -133,7 +133,7 @@ struct _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 + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* @@ -152,7 +152,7 @@ glibtop_get_proclist(glibtop_proclist *buf, gint64 which, gint64 arg); * @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 + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* @@ -169,7 +169,7 @@ void _glibtop_init_proclist_p (glibtop *server); * @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 + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* @@ -185,7 +185,7 @@ void _glibtop_init_proclist_s (glibtop *server); * @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 + * Returns: (array zero-terminated=1) (transfer full): an array of process * ids */ pid_t* diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index e0516d7d..9466279b 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -98,7 +98,7 @@ struct _glibtop_proc_map * @buf: * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_map_entry * glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); @@ -111,7 +111,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -120,7 +120,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ /** @@ -129,7 +129,7 @@ glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ #if GLIBTOP_SUID_PROC_MAP diff --git a/include/glibtop/procopenfiles.h b/include/glibtop/procopenfiles.h index 4bcc2fda..42847965 100644 --- a/include/glibtop/procopenfiles.h +++ b/include/glibtop/procopenfiles.h @@ -99,7 +99,7 @@ struct _glibtop_proc_open_files * @buf: * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_open_files_entry * @@ -118,7 +118,7 @@ glibtop_get_proc_open_files(glibtop_proc_open_files *buf, pid_t pid); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_open_files_entry * @@ -134,7 +134,7 @@ void _glibtop_init_proc_open_files_p (glibtop *server); * @buf: (out): * @pid: * - * Returns: (transfer none): + * Returns: (transfer full) (array zero-terminated=1): */ glibtop_open_files_entry * From 8b37040b5b00c955f71a905f80ffc5b80e9fa117 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sun, 10 Mar 2019 17:10:13 +0000 Subject: [PATCH 6/7] Update Estonian translation --- po/et.po | 95 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 47 deletions(-) diff --git a/po/et.po b/po/et.po index b3353b06..62b50f7a 100644 --- a/po/et.po +++ b/po/et.po @@ -11,183 +11,184 @@ msgid "" msgstr "" "Project-Id-Version: libgtop HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-14 03:41+0100\n" -"PO-Revision-Date: 2007-05-14 08:09+0300\n" -"Last-Translator: Ivar Smolin \n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgtop/issues\n" +"POT-Creation-Date: 2018-01-25 10:19+0000\n" +"PO-Revision-Date: 2019-03-10 19:08+0200\n" +"Last-Translator: Mart Raudsepp \n" "Language-Team: Estonian \n" "Language: et\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: Poedit 2.2\n" -#: ../lib/read.c:51 +#: lib/read.c:49 #, c-format msgid "read %d byte" msgid_plural "read %d bytes" msgstr[0] "loetud %d bait" msgstr[1] "loetud %d baiti" -#: ../lib/read_data.c:51 +#: lib/read_data.c:49 msgid "read data size" msgstr "loetud andmete hulk" -#: ../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] "loetud %lu bait andmeid" msgstr[1] "loetud %lu baiti andmeid" -#: ../lib/write.c:51 +#: lib/write.c:49 #, c-format msgid "wrote %d byte" msgid_plural "wrote %d bytes" msgstr[0] "kirjutatud %d bait" msgstr[1] "kirjutatud %d baiti" -#: ../src/daemon/gnuserv.c:458 +#: src/daemon/gnuserv.c:456 msgid "Enable debugging" msgstr "Silumise lubamine" -#: ../src/daemon/gnuserv.c:460 +#: src/daemon/gnuserv.c:458 msgid "Enable verbose output" msgstr "Teaberohke väljundi lubamine" -#: ../src/daemon/gnuserv.c:462 -msgid "Don't fork into background" +#: src/daemon/gnuserv.c:460 +msgid "Don’t fork into background" msgstr "Taustale siirdumine keelatud" -#: ../src/daemon/gnuserv.c:464 +#: src/daemon/gnuserv.c:462 msgid "Invoked from inetd" msgstr "Käivitatakse inetd abil" -#: ../src/daemon/gnuserv.c:498 +#: src/daemon/gnuserv.c:498 #, c-format -msgid "Run '%s --help' to see a full list of available command line options.\n" -msgstr "Kõigi käsureavõtmete nimekirja vaatamiseks käivita '%s --help'.\n" +msgid "Run “%s --help” to see a full list of available command line options.\n" +msgstr "Kõigi käsureavõtmete nimekirja vaatamiseks käivita „%s --help“.\n" -#: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27 +#: sysdeps/osf1/siglist.c:27 sysdeps/sun4/siglist.c:27 msgid "Hangup" msgstr "Toru hargilepanek" -#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28 +#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28 msgid "Interrupt" msgstr "Katkestamine" -#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29 +#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29 msgid "Quit" msgstr "Lõpetamine" -#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30 +#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30 msgid "Illegal instruction" msgstr "Lubamatu instruktsioon" -#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31 +#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31 msgid "Trace trap" msgstr "Jälitamispüünis" -#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32 +#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32 msgid "Abort" msgstr "Katkestamine" -#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33 +#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33 msgid "EMT error" msgstr "EMT viga" -#: ../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 "Ujukomaviga" -#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35 +#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35 msgid "Kill" msgstr "Kõrvaldamine" -#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36 +#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36 msgid "Bus error" msgstr "Siini viga" -#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37 +#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37 msgid "Segmentation violation" msgstr "Segmenteerimisviga" -#: ../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 "Vigane süsteemikutsungi argument" -#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39 +#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39 msgid "Broken pipe" msgstr "Katkine toru" -#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40 +#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40 msgid "Alarm clock" msgstr "Alarmkell" -#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41 +#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41 msgid "Termination" msgstr "Lõpetamine" -#: ../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 "Sokli edasilükkamatu seisund" -#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43 +#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43 msgid "Stop" msgstr "Seiskamine" -#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44 +#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44 msgid "Keyboard stop" msgstr "Seiskamine klaviatuurilt" -#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45 +#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45 msgid "Continue" msgstr "Jätkamine" -#: ../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 "Lapsprotsessi olek muudetud" -#: ../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 "Taustalugemine tty'lt" -#: ../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 "Taustakirjutamine tty'le" -#: ../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 "S/V on nüüd võimalik" -#: ../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 "Protsessoriaja piirang ületatud" -#: ../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 "Failisuuruse piirang ületatud" -#: ../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 "Virtuaalne alarmkell" -#: ../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 "Alarmkella profileerimine" -#: ../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 "Akna suuruse muutmine" -#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55 +#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55 msgid "Information request" msgstr "Teabepäring" -#: ../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 "Kasutaja kirjeldatud signaal 1" -#: ../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 "Kasutaja kirjeldatud signaal 2" From abccaf488a929de1e95e6a748485575dec52c998 Mon Sep 17 00:00:00 2001 From: Robert Roth Date: Mon, 11 Mar 2019 10:59:50 +0200 Subject: [PATCH 7/7] Prepared release 2.40.0 --- NEWS | 5 +++++ configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d793800d..21c7e299 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +11 March 2019: Overview of changes in 2.40.0 +================================================ + +* Fixed array and transfer annotations for documentation + 18 February 2019: Overview of changes in 2.39.91 * Replace deprecated gnome-common with autoreconf diff --git a/configure.ac b/configure.ac index 579500d7..472f44b4 100644 --- a/configure.ac +++ b/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], [39]) -m4_define([libgtop_micro_version], [91]) +m4_define([libgtop_minor_version], [40]) +m4_define([libgtop_micro_version], [0]) m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version]) dnl increment if the interface has additions, changes, removals.