From 412d19db552964e581a5d50649bc76410f8c71df Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Wed, 1 Oct 2003 19:18:57 +0000 Subject: [PATCH] New version 0.2.1: * Fixed bug with wrong calculation of total number because of integer division. * Show warning dialog because of initialization errors only after changes in configuration and not after startup. (Old svn revision: 317) --- ChangeLog | 9 +++++++++ aclocal.m4 | 3 +++ configure | 5 ++++- configure.ac | 2 +- po/ca.po | 28 ++++++++++++++-------------- po/de.po | 28 ++++++++++++++-------------- po/lt.po | 28 ++++++++++++++-------------- po/xfce4-netload.pot | 28 ++++++++++++++-------------- 8 files changed, 73 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2b5f27..51d9f58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-10-01 Bernhard Walle + * Fixed bug #972: The total value in the tooltip is now displayed with + fractional portion + * Fixed bug #962: Any errors about wrong configuration are now only + displayed in a dialog after changing configuration and not after + startup. This should help users whose network device is created after + dialing-in. + * Released 0.2.1 + 2003-09-13 Bernhard Walle * Added MacOS X support since it was added in Wormulon. Thanks to Hendrik Scholz for his work on Wormulon. diff --git a/aclocal.m4 b/aclocal.m4 index f88076e..c99fc88 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -7023,6 +7023,8 @@ glib_DEFUN([GLIB_WITH_NLS], GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" AC_CHECK_FUNCS(dcgettext) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, @@ -7049,6 +7051,7 @@ glib_DEFUN([GLIB_WITH_NLS], DATADIRNAME=lib ;; esac]) + LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else gt_cv_have_gettext=no diff --git a/configure b/configure index 5cd068b..7b51e2e 100755 --- a/configure +++ b/configure @@ -1748,7 +1748,7 @@ fi # Define the identity of the package. PACKAGE=xfce4-netload-plugin - VERSION=0.2.0 + VERSION=0.2.1 cat >>confdefs.h <<_ACEOF @@ -21536,6 +21536,8 @@ else echo "${ECHO_T}no" >&6 fi if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" for ac_func in dcgettext do @@ -21821,6 +21823,7 @@ fi esac fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else gt_cv_have_gettext=no diff --git a/configure.ac b/configure.ac index 0c5a802..f52f6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_INIT([panel-plugin/netload.c]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.0]) +AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.1]) AM_MAINTAINER_MODE diff --git a/po/ca.po b/po/ca.po index b5fc1ea..484df79 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: XFce 4\n" -"POT-Creation-Date: 2003-09-13 13:57+0200\n" +"POT-Creation-Date: 2003-10-01 21:17+0200\n" "PO-Revision-Date: 2003-09-06 16:21+0100\n" "Last-Translator: Carles Mu-oz Gorriz \n" "Language-Team: ca \n" @@ -43,7 +43,7 @@ msgstr "" "Sortint: %s kBytes/s\n" "Total: %s kBytes/s" -#: panel-plugin/netload.c:521 +#: panel-plugin/netload.c:522 #, c-format msgid "" "%s: Error in initalizing:\n" @@ -52,50 +52,50 @@ msgstr "" "%s: Error inicialitzant:\n" "%s" -#: panel-plugin/netload.c:842 +#: panel-plugin/netload.c:867 msgid "Select color" msgstr "Seleccioneu el color" -#: panel-plugin/netload.c:895 +#: panel-plugin/netload.c:922 msgid "Bar color (incoming):" msgstr "Color de la barra (entrant):" -#: panel-plugin/netload.c:896 +#: panel-plugin/netload.c:923 msgid "Bar color (outgoing):" msgstr "Color de la barra (sortint):" -#: panel-plugin/netload.c:899 +#: panel-plugin/netload.c:926 msgid "Maximum (incoming):" msgstr "Màxim (entrant):" -#: panel-plugin/netload.c:900 +#: panel-plugin/netload.c:927 msgid "Maximum (outgoing):" msgstr "Màxim (sortint):" -#: panel-plugin/netload.c:924 +#: panel-plugin/netload.c:951 msgid "Text to display:" msgstr "Text a mostrar:" -#: panel-plugin/netload.c:955 +#: panel-plugin/netload.c:982 msgid "Network device:" msgstr "Dispositiu de xarxa:" -#: panel-plugin/netload.c:981 +#: panel-plugin/netload.c:1008 msgid "Update interval:" msgstr "Interval d'actualització:" -#: panel-plugin/netload.c:992 +#: panel-plugin/netload.c:1019 msgid "s" msgstr "s" -#: panel-plugin/netload.c:1005 +#: panel-plugin/netload.c:1032 msgid "Automatic maximum" msgstr "Màxim automatitzat" -#: panel-plugin/netload.c:1037 +#: panel-plugin/netload.c:1064 msgid "kByte/s" msgstr "kBytes/s" -#: panel-plugin/netload.c:1125 +#: panel-plugin/netload.c:1152 msgid "Netload" msgstr "Càrrega de red" diff --git a/po/de.po b/po/de.po index fbc51f7..cefb44e 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: de\n" -"POT-Creation-Date: 2003-09-13 13:57+0200\n" +"POT-Creation-Date: 2003-10-01 21:17+0200\n" "PO-Revision-Date: 2003-09-06 14:25+0200\n" "Last-Translator: Bernhard Walle \n" "Language-Team: Deutsch \n" @@ -40,7 +40,7 @@ msgstr "" "Ausgehend: %s kByte/s\n" "Gesamt: %s kByte/s" -#: panel-plugin/netload.c:521 +#: panel-plugin/netload.c:522 #, c-format msgid "" "%s: Error in initalizing:\n" @@ -49,50 +49,50 @@ msgstr "" "%s: Fehler beim Initialisieren:\n" "%s" -#: panel-plugin/netload.c:842 +#: panel-plugin/netload.c:867 msgid "Select color" msgstr "Farbe auswählen" -#: panel-plugin/netload.c:895 +#: panel-plugin/netload.c:922 msgid "Bar color (incoming):" msgstr "Balkenfarbe (eingehend):" -#: panel-plugin/netload.c:896 +#: panel-plugin/netload.c:923 msgid "Bar color (outgoing):" msgstr "Balkenfarbe (ausgehend):" -#: panel-plugin/netload.c:899 +#: panel-plugin/netload.c:926 msgid "Maximum (incoming):" msgstr "Maximum (eingehend):" -#: panel-plugin/netload.c:900 +#: panel-plugin/netload.c:927 msgid "Maximum (outgoing):" msgstr "Maximum (ausgehend):" -#: panel-plugin/netload.c:924 +#: panel-plugin/netload.c:951 msgid "Text to display:" msgstr "Angezeigter Text:" -#: panel-plugin/netload.c:955 +#: panel-plugin/netload.c:982 msgid "Network device:" msgstr "Netzwerkschnittstelle:" -#: panel-plugin/netload.c:981 +#: panel-plugin/netload.c:1008 msgid "Update interval:" msgstr "Aktualisierungsintervall:" -#: panel-plugin/netload.c:992 +#: panel-plugin/netload.c:1019 msgid "s" msgstr "s" -#: panel-plugin/netload.c:1005 +#: panel-plugin/netload.c:1032 msgid "Automatic maximum" msgstr "Automatisches Maximum" -#: panel-plugin/netload.c:1037 +#: panel-plugin/netload.c:1064 msgid "kByte/s" msgstr "kByte/s" -#: panel-plugin/netload.c:1125 +#: panel-plugin/netload.c:1152 msgid "Netload" msgstr "Netzlast" diff --git a/po/lt.po b/po/lt.po index 936169b..6b3a6d6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-netload 1.0\n" -"POT-Creation-Date: 2003-09-13 13:57+0200\n" +"POT-Creation-Date: 2003-10-01 21:17+0200\n" "PO-Revision-Date: 2003-08-15 11:08+0300\n" "Last-Translator: Mantas \n" "Language-Team: \n" @@ -42,59 +42,59 @@ msgstr "" "Siunčiami: %lld bitų/s\n" "Viso: %lld bitų/s" -#: panel-plugin/netload.c:521 +#: panel-plugin/netload.c:522 #, c-format msgid "" "%s: Error in initalizing:\n" "%s" msgstr "" -#: panel-plugin/netload.c:842 +#: panel-plugin/netload.c:867 msgid "Select color" msgstr "Pasirinkite spalvą" -#: panel-plugin/netload.c:895 +#: panel-plugin/netload.c:922 msgid "Bar color (incoming):" msgstr "Juostos spalva (gaunami duomenys)" -#: panel-plugin/netload.c:896 +#: panel-plugin/netload.c:923 msgid "Bar color (outgoing):" msgstr "Juostos spalva (siunčiami duomenys)" -#: panel-plugin/netload.c:899 +#: panel-plugin/netload.c:926 #, fuzzy msgid "Maximum (incoming):" msgstr "Juostos spalva (gaunami duomenys)" -#: panel-plugin/netload.c:900 +#: panel-plugin/netload.c:927 #, fuzzy msgid "Maximum (outgoing):" msgstr "Juostos spalva (siunčiami duomenys)" -#: panel-plugin/netload.c:924 +#: panel-plugin/netload.c:951 msgid "Text to display:" msgstr "Rodomas tekstas:" -#: panel-plugin/netload.c:955 +#: panel-plugin/netload.c:982 msgid "Network device:" msgstr "Tinklo įrenginys" -#: panel-plugin/netload.c:981 +#: panel-plugin/netload.c:1008 msgid "Update interval:" msgstr "" -#: panel-plugin/netload.c:992 +#: panel-plugin/netload.c:1019 msgid "s" msgstr "" -#: panel-plugin/netload.c:1005 +#: panel-plugin/netload.c:1032 msgid "Automatic maximum" msgstr "" -#: panel-plugin/netload.c:1037 +#: panel-plugin/netload.c:1064 msgid "kByte/s" msgstr "" -#: panel-plugin/netload.c:1125 +#: panel-plugin/netload.c:1152 msgid "Netload" msgstr "Tinklo apkrovimas" diff --git a/po/xfce4-netload.pot b/po/xfce4-netload.pot index e704a7d..757e508 100644 --- a/po/xfce4-netload.pot +++ b/po/xfce4-netload.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-09-13 13:57+0200\n" +"POT-Creation-Date: 2003-10-01 21:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,57 +40,57 @@ msgid "" "Total: %s kByte/s" msgstr "" -#: panel-plugin/netload.c:521 +#: panel-plugin/netload.c:522 #, c-format msgid "" "%s: Error in initalizing:\n" "%s" msgstr "" -#: panel-plugin/netload.c:842 +#: panel-plugin/netload.c:867 msgid "Select color" msgstr "" -#: panel-plugin/netload.c:895 +#: panel-plugin/netload.c:922 msgid "Bar color (incoming):" msgstr "" -#: panel-plugin/netload.c:896 +#: panel-plugin/netload.c:923 msgid "Bar color (outgoing):" msgstr "" -#: panel-plugin/netload.c:899 +#: panel-plugin/netload.c:926 msgid "Maximum (incoming):" msgstr "" -#: panel-plugin/netload.c:900 +#: panel-plugin/netload.c:927 msgid "Maximum (outgoing):" msgstr "" -#: panel-plugin/netload.c:924 +#: panel-plugin/netload.c:951 msgid "Text to display:" msgstr "" -#: panel-plugin/netload.c:955 +#: panel-plugin/netload.c:982 msgid "Network device:" msgstr "" -#: panel-plugin/netload.c:981 +#: panel-plugin/netload.c:1008 msgid "Update interval:" msgstr "" -#: panel-plugin/netload.c:992 +#: panel-plugin/netload.c:1019 msgid "s" msgstr "" -#: panel-plugin/netload.c:1005 +#: panel-plugin/netload.c:1032 msgid "Automatic maximum" msgstr "" -#: panel-plugin/netload.c:1037 +#: panel-plugin/netload.c:1064 msgid "kByte/s" msgstr "" -#: panel-plugin/netload.c:1125 +#: panel-plugin/netload.c:1152 msgid "Netload" msgstr ""