New version 0.2.0pre1

(Old svn revision: 296)
master
Bernhard Walle 2003-08-24 20:07:08 +00:00
parent 1407a73ebb
commit fbca674e03
15 changed files with 2258 additions and 399 deletions

View File

@ -1,10 +1,25 @@
2003-08-24 Bernhard Walle
* Using the last four measures in history so it's easier to read.
* Automatic maximum now really works.
* Using kilobytes for displaying.
* Using thousands separators of the current locale for so that it's easier
to read. Since this feature is not available on in printf() according the
ISO C99 standard I implemented this myself. This code may contain bugs.
* Dropped use of libgtop2 library. New code is based on Wormulon
(http://www.raisdorf.net/wormulon/) the operating systems Linux, FreeBSD,
OpenBSD, NetBSD, Sun Solaris and HP_UX (Hewlett-Packard) are directly
supported. *BSD without use of kvm.
* Maximum is configurable.
* Released 0.2.0pre1 which is a test version for 0.2.0.
2003-08-17 Bernhard Walle
* Added support for other operating systems via libgtop2. Linux and FreeBSD code is still
implemented without libgtop2 but this may change in future.
* Changed "bit/s" string to "byte/s" since the value *is* in byte/s. Translators may update
their translated strings, for the German translation I did this already.
* Changed license to GNU General Public License since linking to the libgtop2 library
requires this. (libgtop2 is *not* LGPL)
* Added support for other operating systems via libgtop2. Linux and FreeBSD
code is still implemented without libgtop2 but this may change in future.
* Changed "bit/s" string to "byte/s" since the value *is* in byte/s.
Translators may update their translated strings, for the German
translation I did this already.
* Changed license to GNU General Public License since linking to the
libgtop2 library requires this. (libgtop2 is *not* LGPL)
* See also i18n changes in po/ChangeLog
* released 0.1.9 which is a test version for 0.2.0

View File

@ -8,6 +8,3 @@ EXTRA_DIST = \
distclean-local:
rm -rf *.cache *~
rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz

View File

@ -78,8 +78,6 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBGTOP_INCS = @LIBGTOP_INCS@
LIBGTOP_LIBS = @LIBGTOP_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
@ -108,6 +106,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLLIBS = @SOLLIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -578,10 +577,6 @@ uninstall-info: uninstall-info-recursive
distclean-local:
rm -rf *.cache *~
rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

36
README
View File

@ -1,20 +1,25 @@
XFce4 Netload plugin
--------------------
- A netload plugin for the Xfce4 desktop environment -- http://www.xfce4.org -
This plugin should work on all operating systems supported by Xfce4. On Linux
and FreeBSD the code for reading the netload is integrated. The code for this is
based on IceWM from Marko Macek (http://www.icewm.org). Other operating systems
such as NetBSD, OpenBSD or Sun Solaris are supported by libgtop2 from the GNOME
desktop (but GNOME is not required by this library). This is because I have no
testing machines for all this operating systems and some systems require a
Client/Server model, i.e. there are root permissions needed to get out system
load and the Xfce4 panel is not running suid root. The library made this easier
to implement (it's implemented by the library and I didn't have to do that).
Following operating systems are supported:
The panel plugin is based on the sample-plugin from Benedikt Meurer and on the
xfce4-systemload-plugin from Riccardo Persichetti. The layout is the same as the
systemload-plugin. This made programming very easy and looks good, too.
* Linux
* FreeBSD, NetBSD, OpenBSD
* Sun Solaris
* HP_UX
I have only Linux installed so I can test only on Linux. If you encounter any
problems on other operating systems (or on Linux, of course) feel free to send
me an e-mail. If you have a patch to fix it it would be better.
The code for the plugin is based on the sample-plugin from Benedikt Meurer and
on the xfce4-systemload-plugin from Riccardo Persichetti. The layout is the same
as the systemload-plugin. This made programming very easy and looks good, too.
The netload code is based on wormulon (a command-line util) from Hendrik Scholz.
You find this program at http://www.raisdorf.net/wormulon/.
I'm not planning making much improvements in the future so if you want to take
over developement, just drop me a note. I just programmed it because I needed it
@ -24,8 +29,11 @@ release of Xfce.
If you have translations for your language, please mail me. I'll include it in
the distribution!
And remember:
-Bernhard
<bernhard.walle@gmx.de>
Interoperability is the keyword, uniformity is a dead end.
-- Olivier Fourdan <fourdan@xfce.org> (founder of Xfce project)
Have a lot of fun ...
Bernhard <bernhard.walle@gmx.de>

32
aclocal.m4 vendored
View File

@ -7322,38 +7322,6 @@ AC_DEFUN(PKG_CHECK_MODULES, [
AC_DEFUN([INIT_LIBGTOP],
[
MINIMUM_LIBGTOP_VERSION=$1
AC_MSG_CHECKING([for LibGTop >= $MINIMUM_LIBGTOP_VERSION])
PC_FILE="libgtop-2.0"
# Make sure the version is sufficient
if $PKG_CONFIG --atleast-version=$MINIMUM_LIBGTOP_VERSION $PC_FILE ; then
GTOP_VERSION=`$PKG_CONFIG $PC_FILE --modversion`
AC_MSG_RESULT([yes ($GTOP_VERSION)])
else
AC_MSG_RESULT([no])
echo "$as_me: ERROR: LibGTop >= $MINIMUM_LIBGTOP_VERSION not found" >&2;
echo "$as_me: ERROR: Cannot run without LibGTop."
exit 1;
fi
#OK, we've got what we need, so get the necessary flags to compile
LIBGTOP_INCS=`$PKG_CONFIG $PC_FILE --cflags`
LIBGTOP_LIBS=`$PKG_CONFIG $PC_FILE --libs`
# And make sure they get plugged into the Makefile
AC_SUBST(LIBGTOP_INCS)
AC_SUBST(LIBGTOP_LIBS)
])
dnl From Benedikt Meurer (benedikt.meurer@unix-ag.uni-siegen.de)
dnl
dnl if debug support is requested:

View File

@ -12,17 +12,23 @@
/* Name of default gettext domain */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the `gethostname' function. */
#undef HAVE_GETHOSTNAME
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
@ -36,14 +42,20 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the `malloc' function. */
#undef HAVE_MALLOC
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <net/if.h> header file. */
#undef HAVE_NET_IF_H
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
/* Define to 1 if you have the <net/if_mib.h> header file. */
#undef HAVE_NET_IF_MIB_H
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@ -57,23 +69,29 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/sysctl.h> header file. */
#undef HAVE_SYS_SYSCTL_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <time.h> header file. */
#undef HAVE_TIME_H
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@ -101,3 +119,6 @@
/* Version number of package */
#undef VERSION
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t

2137
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@ AC_INIT([panel-plugin/netload.c])
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.1.9])
AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.0pre1])
AM_MAINTAINER_MODE
@ -24,12 +24,30 @@ AC_HEADER_STDC
dnl Substitute in Makefiles
AC_SUBST(OS)
AC_CHECK_FUNCS([gethostname])
AC_CHECK_FUNCS([memset])
AC_CHECK_FUNCS([socket])
AC_CHECK_FUNCS([strstr])
AC_CHECK_FUNCS([malloc])
AC_CHECK_FUNCS([bzero])
AC_CHECK_HEADERS([arpa/inet.h])
AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([string.h])
AC_CHECK_HEADERS([sys/ioctl.h])
AC_CHECK_HEADERS([sys/param.h])
AC_CHECK_HEADERS([sys/socket.h])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([unistd.h])
AC_HEADER_SYS_WAIT
AC_PROG_GCC_TRADITIONAL
AC_TYPE_SIZE_T
AC_CHECK_HEADERS( [sys/time.h time.h],
[],
[AC_MSG_ERROR([We need sys/time.h and time.h])]
)
AC_CHECK_LIB(kstat, kstat_open, SOLLIBS="-lkstat -lsocket", SOLLIBS="")
AC_SUBST(SOLLIBS)
AC_CHECK_LIB(fridge, vanilla_coke, echo "WTF?!",
echo "Warning: No vanilla coke found in fridge.";echo "We highly suggest that you rectify this situation immediatly.")
dnl Check for i18n support
BM_I18N([xfce4-netload], [de lt ca])
@ -37,27 +55,6 @@ BM_I18N([xfce4-netload], [de lt ca])
dnl configure the panel plugin
XFCE_PANEL_PLUGIN([XFCE4_PANEL], [3.99.2])
dnl dnl Determine operating system
case $host_os in
*linux*)
OS=linux
;;
*freebsd*)
OS=freebsd
AC_CHECK_HEADERS(
[fcntl.h sys/socket.h sys/sysctl.h net/if.h net/if_mib.h],
[],
[AC_MSG_ERROR([You must have fcntl.h sys/socket.h sys/sysctl.h net/if.h net/if_mib.h])]
)
;;
*)
OS=libgtop2
dnl Check if libgtop2 is available
INIT_LIBGTOP(2.0.0)
;;
esac
dnl Check for debugging support
BM_DEBUG_SUPPORT

View File

@ -1,4 +1,8 @@
plugindir = @XFCE4_PANEL_PLUGINSDIR@
LIBS = @LIBS@ @SOLLIBS@
EXTRA_DIST = \
wormulon
plugin_LTLIBRARIES = \
libnetload.la
@ -10,14 +14,19 @@ libnetload_la_LDFLAGS = \
libnetload_la_SOURCES = \
netload.c \
utils.c \
utils.h \
net.h \
net_@OS@.c
net.c \
os.h \
wormulon.h \
slurm.h
libnetload_la_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@LIBGTOP_INCS@ \
@XFCE4_PANEL_CFLAGS@
libnetload_la_LIBADD = \
@LIBGTOP_LIBS@ \
@SOLLIBS@ \
@XFCE4_PANEL_LIBS@

View File

@ -78,10 +78,8 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
LDFLAGS = @LDFLAGS@
LIBGTOP_INCS = @LIBGTOP_INCS@
LIBGTOP_LIBS = @LIBGTOP_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBS = @LIBS@ @SOLLIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -108,6 +106,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOLLIBS = @SOLLIBS@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
@ -159,6 +158,10 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
plugindir = @XFCE4_PANEL_PLUGINSDIR@
EXTRA_DIST = \
wormulon
plugin_LTLIBRARIES = \
libnetload.la
@ -171,18 +174,23 @@ libnetload_la_LDFLAGS = \
libnetload_la_SOURCES = \
netload.c \
utils.c \
utils.h \
net.h \
net_@OS@.c
net.c \
os.h \
wormulon.h \
slurm.h
libnetload_la_CFLAGS = \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
@LIBGTOP_INCS@ \
@XFCE4_PANEL_CFLAGS@
libnetload_la_LIBADD = \
@LIBGTOP_LIBS@ \
@SOLLIBS@ \
@XFCE4_PANEL_LIBS@
subdir = panel-plugin
@ -194,14 +202,15 @@ LTLIBRARIES = $(plugin_LTLIBRARIES)
libnetload_la_DEPENDENCIES =
am_libnetload_la_OBJECTS = libnetload_la-netload.lo \
libnetload_la-net_@OS@.lo
libnetload_la-utils.lo libnetload_la-net.lo
libnetload_la_OBJECTS = $(am_libnetload_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libnetload_la-net_@OS@.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/libnetload_la-netload.Plo
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libnetload_la-net.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/libnetload_la-netload.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/libnetload_la-utils.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@ -259,8 +268,9 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetload_la-net_@OS@.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetload_la-net.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetload_la-netload.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetload_la-utils.Plo@am__quote@
distclean-depend:
-rm -rf ./$(DEPDIR)
@ -331,38 +341,71 @@ libnetload_la-netload.lo: netload.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-netload.lo `test -f 'netload.c' || echo '$(srcdir)/'`netload.c
libnetload_la-net_@OS@.o: net_@OS@.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-net_@OS@.o -MD -MP -MF "$(DEPDIR)/libnetload_la-net_@OS@.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-net_@OS@.o `test -f 'net_@OS@.c' || echo '$(srcdir)/'`net_@OS@.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-net_@OS@.Tpo" "$(DEPDIR)/libnetload_la-net_@OS@.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-net_@OS@.Tpo"; exit 1; \
libnetload_la-utils.o: utils.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-utils.o -MD -MP -MF "$(DEPDIR)/libnetload_la-utils.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-utils.Tpo" "$(DEPDIR)/libnetload_la-utils.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-utils.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net_@OS@.c' object='libnetload_la-net_@OS@.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-net_@OS@.Po' tmpdepfile='$(DEPDIR)/libnetload_la-net_@OS@.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='libnetload_la-utils.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-utils.Po' tmpdepfile='$(DEPDIR)/libnetload_la-utils.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net_@OS@.o `test -f 'net_@OS@.c' || echo '$(srcdir)/'`net_@OS@.c
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
libnetload_la-net_@OS@.obj: net_@OS@.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-net_@OS@.obj -MD -MP -MF "$(DEPDIR)/libnetload_la-net_@OS@.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-net_@OS@.obj `if test -f 'net_@OS@.c'; then $(CYGPATH_W) 'net_@OS@.c'; else $(CYGPATH_W) '$(srcdir)/net_@OS@.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-net_@OS@.Tpo" "$(DEPDIR)/libnetload_la-net_@OS@.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-net_@OS@.Tpo"; exit 1; \
libnetload_la-utils.obj: utils.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-utils.obj -MD -MP -MF "$(DEPDIR)/libnetload_la-utils.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-utils.Tpo" "$(DEPDIR)/libnetload_la-utils.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-utils.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net_@OS@.c' object='libnetload_la-net_@OS@.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-net_@OS@.Po' tmpdepfile='$(DEPDIR)/libnetload_la-net_@OS@.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='libnetload_la-utils.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-utils.Po' tmpdepfile='$(DEPDIR)/libnetload_la-utils.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net_@OS@.obj `if test -f 'net_@OS@.c'; then $(CYGPATH_W) 'net_@OS@.c'; else $(CYGPATH_W) '$(srcdir)/net_@OS@.c'; fi`
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`
libnetload_la-net_@OS@.lo: net_@OS@.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-net_@OS@.lo -MD -MP -MF "$(DEPDIR)/libnetload_la-net_@OS@.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-net_@OS@.lo `test -f 'net_@OS@.c' || echo '$(srcdir)/'`net_@OS@.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-net_@OS@.Tpo" "$(DEPDIR)/libnetload_la-net_@OS@.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-net_@OS@.Tpo"; exit 1; \
libnetload_la-utils.lo: utils.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-utils.lo -MD -MP -MF "$(DEPDIR)/libnetload_la-utils.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-utils.Tpo" "$(DEPDIR)/libnetload_la-utils.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-utils.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net_@OS@.c' object='libnetload_la-net_@OS@.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-net_@OS@.Plo' tmpdepfile='$(DEPDIR)/libnetload_la-net_@OS@.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='libnetload_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-utils.Plo' tmpdepfile='$(DEPDIR)/libnetload_la-utils.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net_@OS@.lo `test -f 'net_@OS@.c' || echo '$(srcdir)/'`net_@OS@.c
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
libnetload_la-net.o: net.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-net.o -MD -MP -MF "$(DEPDIR)/libnetload_la-net.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-net.o `test -f 'net.c' || echo '$(srcdir)/'`net.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-net.Tpo" "$(DEPDIR)/libnetload_la-net.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-net.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net.c' object='libnetload_la-net.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-net.Po' tmpdepfile='$(DEPDIR)/libnetload_la-net.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net.o `test -f 'net.c' || echo '$(srcdir)/'`net.c
libnetload_la-net.obj: net.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-net.obj -MD -MP -MF "$(DEPDIR)/libnetload_la-net.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-net.obj `if test -f 'net.c'; then $(CYGPATH_W) 'net.c'; else $(CYGPATH_W) '$(srcdir)/net.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-net.Tpo" "$(DEPDIR)/libnetload_la-net.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-net.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net.c' object='libnetload_la-net.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-net.Po' tmpdepfile='$(DEPDIR)/libnetload_la-net.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net.obj `if test -f 'net.c'; then $(CYGPATH_W) 'net.c'; else $(CYGPATH_W) '$(srcdir)/net.c'; fi`
libnetload_la-net.lo: net.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -MT libnetload_la-net.lo -MD -MP -MF "$(DEPDIR)/libnetload_la-net.Tpo" \
@am__fastdepCC_TRUE@ -c -o libnetload_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnetload_la-net.Tpo" "$(DEPDIR)/libnetload_la-net.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libnetload_la-net.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='net.c' object='libnetload_la-net.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libnetload_la-net.Plo' tmpdepfile='$(DEPDIR)/libnetload_la-net.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnetload_la_CFLAGS) $(CFLAGS) -c -o libnetload_la-net.lo `test -f 'net.c' || echo '$(srcdir)/'`net.c
mostlyclean-libtool:
-rm -f *.lo

View File

@ -1,8 +1,12 @@
2003-08-24 Bernhard Walle
* Updated German translation. Now there are more configuration options
available so there are also more translation strings.
2003-08-17 Bernhard Walle
* Changed string from "bit/s" to "byte/s" and updated German translation.
(The value has always been "byte/s", only the string was wrong.)
2003-08-15 Carles Mu<EFBFBD>oz Gorriz
2003-08-15 Carles Muñoz Gorriz
* Added Catalan translation
2003-08-15 Mantas

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: XFce 4\n"
"POT-Creation-Date: 2003-08-17 16:30+0200\n"
"POT-Creation-Date: 2003-08-24 16:31+0200\n"
"PO-Revision-Date: 2003-08-15 15:38+0100\n"
"Last-Translator: Carles Mu-oz Gorriz <carlesmu@internautas.org>\n"
"Language-Team: ca <LL@li.org>\n"
@ -14,37 +14,56 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: panel-plugin/netload.c:149
#: panel-plugin/netload.c:166
#, fuzzy, c-format
msgid ""
"Incoming: %lld byte/s\n"
"Outgoing: %lld byte/s\n"
"Total: %lld byte/s"
"Average of last 4 measures:\n"
"Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n"
"Total: %s kByte/s"
msgstr ""
"Entrant: %lld bit/s\n"
"Sortint: %lld bit/s\n"
"Total: %lld bit/s"
#: panel-plugin/netload.c:652
#: panel-plugin/netload.c:748
msgid "Select color"
msgstr "Seleccioneu el color"
#: panel-plugin/netload.c:701
#: panel-plugin/netload.c:799
msgid "Bar color (incoming):"
msgstr "Color de la barra (sortint):"
#: panel-plugin/netload.c:702
#: panel-plugin/netload.c:800
msgid "Bar color (outgoing):"
msgstr "Color de la barra (entrant):"
#: panel-plugin/netload.c:723
#: panel-plugin/netload.c:803
#, fuzzy
msgid "Maximum (incoming):"
msgstr "Color de la barra (sortint):"
#: panel-plugin/netload.c:804
#, fuzzy
msgid "Maximum (outgoing):"
msgstr "Color de la barra (entrant):"
#: panel-plugin/netload.c:827
msgid "Text to display:"
msgstr "Text a mostrar:"
#: panel-plugin/netload.c:754
#: panel-plugin/netload.c:857
msgid "Network device:"
msgstr "Dispositiu de xarxa"
#: panel-plugin/netload.c:842
#: panel-plugin/netload.c:884
msgid "Automatic maximum"
msgstr ""
#: panel-plugin/netload.c:916
msgid "kByte/s"
msgstr ""
#: panel-plugin/netload.c:1006
msgid "Netload"
msgstr "Càrrega de red"

View File

@ -3,7 +3,7 @@
msgid ""
msgstr ""
"Project-Id-Version: de\n"
"POT-Creation-Date: 2003-08-17 16:30+0200\n"
"POT-Creation-Date: 2003-08-24 16:31+0200\n"
"PO-Revision-Date: 2003-08-10 19:35+0200\n"
"Last-Translator: Bernhard Walle <bernhard.walle@gmx.de>\n"
"Language-Team: Deutsch <www.xfce.org>\n"
@ -11,37 +11,55 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n"
#: panel-plugin/netload.c:149
#: panel-plugin/netload.c:166
#, c-format
msgid ""
"Incoming: %lld byte/s\n"
"Outgoing: %lld byte/s\n"
"Total: %lld byte/s"
"Average of last 4 measures:\n"
"Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n"
"Total: %s kByte/s"
msgstr ""
"Eingehend: %lld byte/s\n"
"Ausgehend: %lld byte/s\n"
"Gesamt: %lld byte/s"
"Durchschnitt der letzten 4 Messungen:\n"
"Eingehend: %s kByte/s\n"
"Ausgehend: %s kByte/s\n"
"Gesamt: %s kByte/s"
#: panel-plugin/netload.c:652
#: panel-plugin/netload.c:748
msgid "Select color"
msgstr "Farbe auswählen"
#: panel-plugin/netload.c:701
#: panel-plugin/netload.c:799
msgid "Bar color (incoming):"
msgstr "Balkenfarbe (eingehend):"
#: panel-plugin/netload.c:702
#: panel-plugin/netload.c:800
msgid "Bar color (outgoing):"
msgstr "Balkenfarbe (ausgehend):"
#: panel-plugin/netload.c:723
#: panel-plugin/netload.c:803
msgid "Maximum (incoming):"
msgstr "Maximum (eingehend):"
#: panel-plugin/netload.c:804
msgid "Maximum (outgoing):"
msgstr "Maximum (ausgehend):"
#: panel-plugin/netload.c:827
msgid "Text to display:"
msgstr "Angezeigter Text:"
#: panel-plugin/netload.c:754
#: panel-plugin/netload.c:857
msgid "Network device:"
msgstr "Netzwerkschnittstelle:"
#: panel-plugin/netload.c:842
#: panel-plugin/netload.c:884
msgid "Automatic maximum"
msgstr "Automatisches Maximum"
#: panel-plugin/netload.c:916
msgid "kByte/s"
msgstr "kByte/s"
#: panel-plugin/netload.c:1006
msgid "Netload"
msgstr "Netzlast"

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: xfce4-netload 1.0\n"
"POT-Creation-Date: 2003-08-17 16:30+0200\n"
"POT-Creation-Date: 2003-08-24 16:31+0200\n"
"PO-Revision-Date: 2003-08-15 11:08+0300\n"
"Last-Translator: Mantas <zaz@xxx.lt>\n"
"Language-Team: <komp_lt@konferencijos.lt>\n"
@ -14,37 +14,56 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: panel-plugin/netload.c:149
#: panel-plugin/netload.c:166
#, fuzzy, c-format
msgid ""
"Incoming: %lld byte/s\n"
"Outgoing: %lld byte/s\n"
"Total: %lld byte/s"
"Average of last 4 measures:\n"
"Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n"
"Total: %s kByte/s"
msgstr ""
"Gaunami: %lld bitų/s\n"
"Siunčiami: %lld bitų/s\n"
"Viso: %lld bitų/s"
#: panel-plugin/netload.c:652
#: panel-plugin/netload.c:748
msgid "Select color"
msgstr "Pasirinkite spalvą"
#: panel-plugin/netload.c:701
#: panel-plugin/netload.c:799
msgid "Bar color (incoming):"
msgstr "Juostos spalva (gaunami duomenys)"
#: panel-plugin/netload.c:702
#: panel-plugin/netload.c:800
msgid "Bar color (outgoing):"
msgstr "Juostos spalva (siunčiami duomenys)"
#: panel-plugin/netload.c:723
#: panel-plugin/netload.c:803
#, fuzzy
msgid "Maximum (incoming):"
msgstr "Juostos spalva (gaunami duomenys)"
#: panel-plugin/netload.c:804
#, fuzzy
msgid "Maximum (outgoing):"
msgstr "Juostos spalva (siunčiami duomenys)"
#: panel-plugin/netload.c:827
msgid "Text to display:"
msgstr "Rodomas tekstas:"
#: panel-plugin/netload.c:754
#: panel-plugin/netload.c:857
msgid "Network device:"
msgstr "Tinklo įrenginys"
#: panel-plugin/netload.c:842
#: panel-plugin/netload.c:884
msgid "Automatic maximum"
msgstr ""
#: panel-plugin/netload.c:916
msgid "kByte/s"
msgstr ""
#: panel-plugin/netload.c:1006
msgid "Netload"
msgstr "Tinklo apkrovimas"

View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2003-08-17 16:30+0200\n"
"POT-Creation-Date: 2003-08-24 16:31+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -15,34 +15,51 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: panel-plugin/netload.c:149
#: panel-plugin/netload.c:166
#, c-format
msgid ""
"Incoming: %lld byte/s\n"
"Outgoing: %lld byte/s\n"
"Total: %lld byte/s"
"Average of last 4 measures:\n"
"Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n"
"Total: %s kByte/s"
msgstr ""
#: panel-plugin/netload.c:652
#: panel-plugin/netload.c:748
msgid "Select color"
msgstr ""
#: panel-plugin/netload.c:701
#: panel-plugin/netload.c:799
msgid "Bar color (incoming):"
msgstr ""
#: panel-plugin/netload.c:702
#: panel-plugin/netload.c:800
msgid "Bar color (outgoing):"
msgstr ""
#: panel-plugin/netload.c:723
#: panel-plugin/netload.c:803
msgid "Maximum (incoming):"
msgstr ""
#: panel-plugin/netload.c:804
msgid "Maximum (outgoing):"
msgstr ""
#: panel-plugin/netload.c:827
msgid "Text to display:"
msgstr ""
#: panel-plugin/netload.c:754
#: panel-plugin/netload.c:857
msgid "Network device:"
msgstr ""
#: panel-plugin/netload.c:842
#: panel-plugin/netload.c:884
msgid "Automatic maximum"
msgstr ""
#: panel-plugin/netload.c:916
msgid "kByte/s"
msgstr ""
#: panel-plugin/netload.c:1006
msgid "Netload"
msgstr ""