From e0c8ad50db4b14c2b36570454f98e7c7f6d13645 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 12 Jan 2011 15:59:08 -0700 Subject: [PATCH 01/58] Rebuild for xfce4-panel 4.7 --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 46ac6ee..9830838 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Fri Dec 10 2010 Christoph Wickert - 1.0.0-2 +- Rebuild for xfce4-panel 4.7 + * Fri Dec 10 2010 Christoph Wickert - 1.0.0-1 - Update to 1.0.0 - Remove all patches (upstreamed) From 0cc74f6f45ac89b8e0a8dec6a0e7730e9435c64e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 16:22:49 -0600 Subject: [PATCH 02/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 9830838..7f0af3c 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Dec 10 2010 Christoph Wickert - 1.0.0-2 - Rebuild for xfce4-panel 4.7 From cad1db6ddb871e0f7c0d2c34115df1330e4d38e6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:39:51 -0500 Subject: [PATCH 03/58] Rebuild for new libpng --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 7f0af3c..24a3122 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Tue Dec 06 2011 Adam Jackson - 1.0.0-4 +- Rebuild for new libpng + * Wed Feb 09 2011 Fedora Release Engineering - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From ddb8a2402e806cb82f5ad519b08f4a97946d97eb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:49:55 -0600 Subject: [PATCH 04/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 24a3122..66c649f 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 1.0.0-4 - Rebuild for new libpng From 78cc5a6b09f59fe2dfa6532117ea328e55523766 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 14 Jan 2012 15:47:03 -0500 Subject: [PATCH 05/58] Update to 1.1.0 Add VCS key --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 53 ++++++++++++++++++++++++++++----------- 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 5aed3a4..eacc4c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.0.0.tar.bz2 +/xfce4-netload-plugin-1.1.0.tar.bz2 diff --git a/sources b/sources index e2a1f13..dca9c83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cab53e8cc2b9bfdf7ffd2230916ca3df xfce4-netload-plugin-1.0.0.tar.bz2 +19bee8171e7d681cb79539417f0b5917 xfce4-netload-plugin-1.1.0.tar.bz2 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 66c649f..2ed2ebb 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,58 +1,81 @@ -%global minor_version 1.0 +%global minor_version 1.1 -Name: xfce4-netload-plugin -Version: 1.0.0 -Release: 5%{?dist} -Summary: Network-load monitor for the Xfce panel +Name: xfce4-netload-plugin +Version: 1.1.0 +Release: 1%{?dist} +Summary: Network-load monitor for the Xfce panel -Group: User Interface/Desktops -License: GPLv2+ -URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Group: User Interface/Desktops +License: GPLv2+ +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +#VCS: git:git://git.xfce.org/panel-plugins/xfce4-netload-plugin +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel -BuildRequires: gettext, intltool -Requires: xfce4-panel >= 4.4.0 +BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.7.0 +BuildRequires: pkgconfig(libxfce4ui-1) >= 4.7.0 +BuildRequires: libxml2-devel +BuildRequires: gettext, intltool +Requires: xfce4-panel >= 4.7.0 %description A network-load monitor plugin for the Xfce panel. + %prep %setup -q +# use xfce4-panel#s 4.8 paths if possible +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 +sed -i 's|panel-plugins|panel/plugins|' panel-plugin/Makefile.* +%endif + %build -%configure --disable-static +%configure make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} + %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + %postun if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi + %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README -%{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/icons/hicolor/*/*/* +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 +%{_libexecdir}/xfce4/panel/plugins/%{name} +%{_datadir}/xfce4/panel/plugins/*.desktop +%else +%{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop +%endif %changelog +* Sat Jan 14 2012 Christoph Wickert - 1.1.0-1 +- Update to 1.1.0 +- Add VCS key + * Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3eac6bf1e1dbf23e7b41fc76e6684e75555b5b26 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 9 Mar 2012 23:58:58 +0100 Subject: [PATCH 06/58] Don't use libxecdir if possible --- xfce4-netload-plugin.spec | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 2ed2ebb..9f2e207 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,13 +2,16 @@ Name: xfce4-netload-plugin Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-1.1.0-new-plugin-location.patch +# contains all translations from translations.xfce.org as of 2012-03-09 +Patch1: %{name}-1.1.0-update-translations.patch #VCS: git:git://git.xfce.org/panel-plugins/xfce4-netload-plugin BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,19 +28,22 @@ A network-load monitor plugin for the Xfce panel. %prep %setup -q -# use xfce4-panel#s 4.8 paths if possible +# use new location for xfce4-panel 4.8 plugins (if possible) %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 -sed -i 's|panel-plugins|panel/plugins|' panel-plugin/Makefile.* +%patch0 -p1 -b .new-location %endif +%patch1 -p1 -b .update + + %build %configure make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} %find_lang %{name} @@ -57,21 +63,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_datadir}/icons/hicolor/*/*/* + %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 -%{_libexecdir}/xfce4/panel/plugins/%{name} +%{_libdir}/xfce4/panel/plugins/%{name} %{_datadir}/xfce4/panel/plugins/*.desktop %else %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %endif + %changelog +* Fri Mar 09 2012 Christoph Wickert - 1.1.0-2 +- Don't use libxecdir if possible + * Sat Jan 14 2012 Christoph Wickert - 1.1.0-1 - Update to 1.1.0 - Add VCS key From 1d49896edf88362b1ad71fde1ba74976bdf144e8 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 9 Mar 2012 23:59:31 +0100 Subject: [PATCH 07/58] Add new patches --- ...oad-plugin-1.1.0-new-plugin-location.patch | 56 + ...oad-plugin-1.1.0-update-translations.patch | 2245 +++++++++++++++++ 2 files changed, 2301 insertions(+) create mode 100644 xfce4-netload-plugin-1.1.0-new-plugin-location.patch create mode 100644 xfce4-netload-plugin-1.1.0-update-translations.patch diff --git a/xfce4-netload-plugin-1.1.0-new-plugin-location.patch b/xfce4-netload-plugin-1.1.0-new-plugin-location.patch new file mode 100644 index 0000000..b8f0348 --- /dev/null +++ b/xfce4-netload-plugin-1.1.0-new-plugin-location.patch @@ -0,0 +1,56 @@ +diff -dur xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.am xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.am +--- xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.am 2012-01-07 15:50:00.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.am 2012-03-09 22:05:17.201838947 +0100 +@@ -1,4 +1,4 @@ +-plugindir = $(libexecdir)/xfce4/panel-plugins ++plugindir = $(libdir)/xfce4/panel/plugins + plugin_PROGRAMS = xfce4-netload-plugin + + LIBS = @LIBS@ @SOLLIBS@ +@@ -34,7 +34,7 @@ + desktop_in_in_files = netload.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) + +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + @INTLTOOL_DESKTOP_RULE@ + +@@ -47,6 +47,6 @@ + + # get full path into .desktop file + %.desktop.in: %.desktop.in.in +- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \ ++ sed -e "s^@PLUGIN_PATH@^$(libdir)/xfce4/panel/plugins^" \ + $< > $@ + +diff -dur xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.in xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.in +--- xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.in 2012-01-13 12:51:08.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.in 2012-03-09 22:07:05.618821744 +0100 +@@ -213,7 +213,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-plugindir = $(libexecdir)/xfce4/panel-plugins ++plugindir = $(libdir)/xfce4/panel/plugins + xfce4_netload_plugin_SOURCES = \ + netload.c \ + utils.c \ +@@ -245,7 +245,7 @@ + # + desktop_in_in_files = netload.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + EXTRA_DIST = \ + wormulon commandline.c \ +@@ -619,7 +619,7 @@ + + # get full path into .desktop file + %.desktop.in: %.desktop.in.in +- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \ ++ sed -e "s^@PLUGIN_PATH@^$(libdir)/xfce4/panel/plugins^" \ + $< > $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/xfce4-netload-plugin-1.1.0-update-translations.patch b/xfce4-netload-plugin-1.1.0-update-translations.patch new file mode 100644 index 0000000..4cef104 --- /dev/null +++ b/xfce4-netload-plugin-1.1.0-update-translations.patch @@ -0,0 +1,2245 @@ +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ar.po xfce4-netload-plugin-1.1.0/po/ar.po +--- xfce4-netload-plugin-1.1.0.orig/po/ar.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/ar.po 2012-03-09 23:42:00.804896492 +0100 +@@ -0,0 +1,155 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# كريم اولاد الشلحة , 2012. ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2012-02-04 15:18+0000\n" ++"PO-Revision-Date: 2012-02-04 20:24+0000\n" ++"Last-Translator: كريم اولاد الشلحة \n" ++"Language-Team: Arabic Xfce Translation Team\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Language: ar\n" ++"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" ++"X-Generator: Virtaal 0.7.0\n" ++ ++#: ../panel-plugin/netload.c:59 ++msgid "Xfce4-Netload-Plugin" ++msgstr "ملحق-تحميل نيت-لإكسفسي4" ++ ++#: ../panel-plugin/netload.c:62 ++msgid "Unknown error." ++msgstr "خطأ مجهول." ++ ++#: ../panel-plugin/netload.c:63 ++msgid "Linux proc device '/proc/net/dev' not found." ++msgstr "لم يتم العثور على '/proc/net/dev'." ++ ++#: ../panel-plugin/netload.c:64 ++msgid "Interface was not found." ++msgstr "لم يتم العثور غلى الواجهة." ++ ++#: ../panel-plugin/netload.c:162 ++#, c-format ++msgid "<< %s >> (Interface down)" ++msgstr "<< %s >> (واجهة للأسفل)" ++ ++#: ../panel-plugin/netload.c:249 ++#, c-format ++msgid "" ++"<< %s >> (%s)\n" ++"Average of last %d measures:\n" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" ++msgstr "" ++"<< %s >> (%s)\n" ++"معدل أخر %d إجراءات:\n" ++"الوارد: %s/s\n" ++"الصادر: %s/s\n" ++"المجموع: %s/s" ++ ++#: ../panel-plugin/netload.c:251 ++msgid "no IP address" ++msgstr "بدون عنوان IP" ++ ++#: ../panel-plugin/netload.c:533 ++#, c-format ++msgid "" ++"%s: Error in initializing:\n" ++"%s" ++msgstr "" ++"%s: خطأعنذ التمهيد:\n" ++"%s" ++ ++#: ../panel-plugin/netload.c:872 ++msgid "Select color" ++msgstr "اختر لون" ++ ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "لون شريك (ال_وارد):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "لون شريك (ال_صادر):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "أقصى (الوارد):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "أقصى (الصادر):" ++ ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 ++msgid "Network Monitor" ++msgstr "مراقب الشبكة" ++ ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "النص المراد عرضه:" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "جهاز ال_شّبكة:" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "مجال التح_ديث:" ++ ++#: ../panel-plugin/netload.c:1049 ++msgid "s" ++msgstr "ث" ++ ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "أق_صى تلقائيا" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "ك.بايت/ثا" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "ت_قديم البيانات كـ:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "أشرطة" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "قيم" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "أشرطة و قيم" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "تلوين ا_لقيم" ++ ++#: ../panel-plugin/netload.desktop.in.in.h:2 ++msgid "Show network traffic" ++msgstr "عرض حركة الشبكة" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "بايت" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "ك.بايت" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "م.بايت" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "ج.بايت" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ca.po xfce4-netload-plugin-1.1.0/po/ca.po +--- xfce4-netload-plugin-1.1.0.orig/po/ca.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/ca.po 2012-03-09 23:42:00.804896492 +0100 +@@ -3,122 +3,163 @@ + # Copyright (C) 2003, 2004 THE PACKAGE'S COPYRIGHT HOLDER + # This file is distributed under the same license as the + # xfce4-netload-plugin package. +-# Carles Muñoz Gorriz , 2003, 2004, 2007. ++# Carles Muñoz Gorriz , 2003-2004, 2007, 2012. + # Toni Vall , 2004. + # + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" +-"PO-Revision-Date: 2007-05-11 19:37+0100\n" ++"POT-Creation-Date: 2012-01-15 11:15+0000\n" ++"PO-Revision-Date: 2012-01-15 18:07+0100\n" + "Last-Translator: Carles Muñoz Gorriz \n" + "Language-Team: catal \n" ++"Language: \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" + msgstr "Xfce4-Netload-Plugin" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." + msgstr "Error desconegut." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." + msgstr "No s'ha trobat el dispositiu linux «/proc/net/dev»." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." + msgstr "No s'ha trobat la interfície." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" + msgstr "«%s» (interfície caiguda)" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "«%s» (%s)\n" + "Mitjana de les %d últimes mesures:\n" +-"Entrada: %s kB/s\n" +-"Sortida: %s kB/s\n" +-"Total: %s kB/s" ++"Entrada: %s/s\n" ++"Sortida: %s/s\n" ++"Total: %s/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "No hi ha adreça IP" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: Error d'inicialització:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "Seleccioneu el color" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "Color de la barra (entrada):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "Color de la barra (sortida):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "Màxim (entrada):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "Màxim (sortida):" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "Color de la barra (e_ntrada)" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "Color de la barra (s_ortida):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "Màxim (_entrada):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "Màxim (_sortida):" + +-#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:948 ++#: ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" + msgstr "Monitoritza la xarxa" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "Text a mostrar:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "Dispositiu de xarxa:" +- +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "Interval d'actualització:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "_Text a mostrar:" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "_Dispositiu de xarxa:" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "_Interval d'actualització:" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "s" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "Màxim automàtic" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "kB/s" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "Màxim _automàtic" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KiB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "_Mostra les dades com:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "Barres" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "Valors" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "Barres i valors" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "Valors a_colorits" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" + msgstr "Mostra el tràfic de xarxa" + ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GiB" ++ ++#~ msgid "kByte/s" ++#~ msgstr "kB/s" ++ + #~ msgid "Edit Properties" + #~ msgstr "Edita les propietats" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/de.po xfce4-netload-plugin-1.1.0/po/de.po +--- xfce4-netload-plugin-1.1.0.orig/po/de.po 2012-01-13 11:45:12.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/de.po 2012-03-09 23:42:00.804896492 +0100 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: de\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2012-01-08 15:01+0000\n" ++"POT-Creation-Date: 2012-02-01 11:54+0000\n" + "PO-Revision-Date: 2007-01-18 08:45+0100\n" + "Last-Translator: Fabian Nowak \n" + "Language-Team: \n" +@@ -39,7 +39,7 @@ + msgstr "»%s« (Schnittstelle nicht aktiviert)" + + #: ../panel-plugin/netload.c:249 +-#, fuzzy, c-format ++#, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +@@ -58,7 +58,7 @@ + msgstr "keine IP-Adresse" + + #: ../panel-plugin/netload.c:533 +-#, fuzzy, c-format ++#, c-format + msgid "" + "%s: Error in initializing:\n" + "%s" +@@ -71,22 +71,18 @@ + msgstr "Farbe auswählen" + + #: ../panel-plugin/netload.c:938 +-#, fuzzy + msgid "Bar color (i_ncoming):" + msgstr "Balkenfarbe (ei_ngehend):" + + #: ../panel-plugin/netload.c:939 +-#, fuzzy + msgid "Bar color (_outgoing):" + msgstr "Balkenfarbe (au_sgehend):" + + #: ../panel-plugin/netload.c:942 +-#, fuzzy + msgid "Maximum (inco_ming):" + msgstr "_Maximum (eingehend):" + + #: ../panel-plugin/netload.c:943 +-#, fuzzy + msgid "Maximum (o_utgoing):" + msgstr "Maximum (a_usgehend):" + +@@ -95,17 +91,14 @@ + msgstr "Netzwerkmonitor" + + #: ../panel-plugin/netload.c:977 +-#, fuzzy + msgid "_Text to display:" + msgstr "Angezeigter _Text:" + + #: ../panel-plugin/netload.c:1008 +-#, fuzzy + msgid "Network _device:" + msgstr "Netzwerk_schnittstelle:" + + #: ../panel-plugin/netload.c:1036 +-#, fuzzy + msgid "Update _interval:" + msgstr "Aktualisierungs_intervall:" + +@@ -114,7 +107,6 @@ + msgstr "s" + + #: ../panel-plugin/netload.c:1062 +-#, fuzzy + msgid "_Automatic maximum" + msgstr "_Automatisches Maximum" + +@@ -123,27 +115,22 @@ + msgstr "KiB/s" + + #: ../panel-plugin/netload.c:1121 +-#, fuzzy + msgid "_Present data as:" + msgstr "_Daten darstellen als:" + + #: ../panel-plugin/netload.c:1130 +-#, fuzzy + msgid "Bars" + msgstr "Balken" + + #: ../panel-plugin/netload.c:1131 +-#, fuzzy + msgid "Values" + msgstr "Werte" + + #: ../panel-plugin/netload.c:1132 +-#, fuzzy + msgid "Bars and values" + msgstr "Balken und Werte" + + #: ../panel-plugin/netload.c:1182 +-#, fuzzy + msgid "_Colorize values" + msgstr "_Werte färben" + +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/es.po xfce4-netload-plugin-1.1.0/po/es.po +--- xfce4-netload-plugin-1.1.0.orig/po/es.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/es.po 2012-03-09 23:42:00.804896492 +0100 +@@ -1,51 +1,52 @@ + # Spanish translation of xfce4-netload-plugin package. + # Copyright (C) 2003-2005 Bernhard Walle. + # This file is distributed under the same license as the xfce4-netload-plugin package. +-# ++# + # Rudy Godoy , 2005 + # Abel Martín , 2008 +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin 0.3.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" ++"POT-Creation-Date: 2012-01-21 09:18+0000\n" + "PO-Revision-Date: 2009-08-21 01:42-0300\n" + "Last-Translator: elega \n" + "Language-Team: Debian l10n Spanish Team \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: \n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" + msgstr "Xfce4-Netload-Plugin" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." + msgstr "Error desconocido." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." + msgstr "Dispositivo de proc de Linux '/proc/net/dev' no encontrado." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." + msgstr "No se encontró la interfaz." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" + msgstr "<< %s >> (Bajar interfaz)" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "<< %s >> (%s)\n" + "Promedio de las últimas %d medidas:\n" +@@ -53,74 +54,112 @@ + "Salida: %s kByte/s\n" + "Total: %s kByte/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "sin dirección IP" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: Fallo al inicializar:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "Seleccionar color" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "Color de barra (entrada):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "Color de barra (salida):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "Máximo (entrada):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "Máximo (salida):" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "Color de barra (e_ntrada):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "Color de barra (_salida):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "Máximo (entr_ada):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "Máximo (s_alida):" + +-#: ../panel-plugin/netload.c:849 +-#: ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" + msgstr "Monitor de red" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "Texto a mostrar:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "Dispositivo de red:" +- +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "Intervalo de actualización:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "_Texto a mostrar:" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "_Dispositivo de red:" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "_Intervalo de actualización:" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "s" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "Máximo automático" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "kByte/s" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "Máximo _automático" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KiB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "_Presentar datos como:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "Barras" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "Valores" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "Barras y valores" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "_Colorear valores" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" + msgstr "Mostrar tráfico de red" + ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GiB" ++ ++#~ msgid "kByte/s" ++#~ msgstr "kByte/s" ++ + #~ msgid "Edit Properties" + #~ msgstr "Editar propiedades" ++ + #~ msgid "Netload" + #~ msgstr "Carga de red" +- +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/eu.po xfce4-netload-plugin-1.1.0/po/eu.po +--- xfce4-netload-plugin-1.1.0.orig/po/eu.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/eu.po 2012-03-09 23:42:00.804896492 +0100 +@@ -3,51 +3,52 @@ + # Copyright (C) 2003-2005 Bernhard Walle. + # This file is distributed under the same license as the + # xfce4-netload-plugin package. +-# ++# + # Piarres Beobide , 2005, 2009. + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin.master\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" ++"POT-Creation-Date: 2012-01-16 10:15+0000\n" + "PO-Revision-Date: 2009-08-18 09:17+0200\n" + "Last-Translator: Piarres Beobide \n" + "Language-Team: Euskara \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: KBabel 1.11.4\n" ++"Language: \n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: KBabel 1.11.4\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" + msgstr "Xfce4-SareKarga-Plugin-a" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." + msgstr "Errore ezezaguna." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." + msgstr "Ez da '/proc/net/dev' Linux proc gailua aurkitu." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." + msgstr "Ez da interfazea aurkitu." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" + msgstr "<< %s >> (Interfazea deskonektaturik)" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "<< %s >> (%s)\n" + "Azken %d neurketen bataz bestekoa:\n" +@@ -55,68 +56,106 @@ + "Irteera: %s kByte/s\n" + "Guztira: %s kByte/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "ez dago IP helbiderik" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: Errorea abiaraztean:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "Hautatu kolorea" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "Barra kolorea (sarrera):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "Barra kolorea (irteera):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "Gehienezkoa (sarrera):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "Gehienezkoa (irteera):" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "Barra kolorea (s_arrera):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "Barra kolorea (_irteera):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "Gehienezkoa (_sarrera):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "Gehienezkoa (i_rteera):" + +-#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" + msgstr "Sare Monitorea" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "Bistaratzeko testua:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "Sare gailua:" +- +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "Eguneratze epea:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "Bistaratzeko _testua:" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "Sare _gailua:" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "Eguneratze _tartea:" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "s" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "Gehienezko automatikoa" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "kByte/s" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "_Gehienezko automatikoa" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "_Bistarazi datuak:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "Barrak" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "Balioak" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "Barra eta balioak" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "_Koloreztatuko balioak" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" + msgstr "Ikusi sare trafikoa" + ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GB" ++ ++#~ msgid "kByte/s" ++#~ msgstr "kByte/s" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/id.po xfce4-netload-plugin-1.1.0/po/id.po +--- xfce4-netload-plugin-1.1.0.orig/po/id.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/id.po 2012-03-09 23:42:00.804896492 +0100 +@@ -2,48 +2,49 @@ + # Copyright (C) 2003-2006 Bernhard Walle. + # This file is distributed under the same license as the xfce4-netload-plugin package. + # Andhika padmawan , 2008. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin 0.2.4\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" ++"POT-Creation-Date: 2012-01-29 02:42+0000\n" + "PO-Revision-Date: 2008-06-21 09:30+0700\n" + "Last-Translator: Andhika Padmawan \n" + "Language-Team: Indonesian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: id\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" + msgstr "Xfce4-Netload-Plugin" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." + msgstr "Galat tak dikenal." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." + msgstr "Divais proc Linux '/proc/net/dev' tak ditemukan." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." + msgstr "Antarmuka tak ditemukan." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" + msgstr "<< %s >> (Antarmuka tidak aktif)" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "<< %s >> (%s)\n" + "Ukuran rata-rata %d terakhir:\n" +@@ -51,67 +52,106 @@ + "Keluar: %s kBita/s\n" + "Total: %s kBita/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "tak ada alamat IP" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: Galat ketika menginisialisasi:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "Pilih warna" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "Batang warna (masuk):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "Batang warna (keluar):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "Maksimum (masuk):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "Maksimum (keluar):" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "Batang warna (_masuk):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "Batang warna (_keluar):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "Maksimum (m_asuk):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "Maksimum (k_eluar):" + +-#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" + msgstr "Monitor Jaringan" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "Teks untuk ditampilkan:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "Divais jaringan:" +- +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "Interval mutakhirkan:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "_Teks untuk ditampilkan:" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "Divais _jaringan:" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "Interval _pemutakhiran:" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "s" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "Maksimum otomatis" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "kBita/s" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "_Maksimum otomatis" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KiB/d" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "Tampilkan _data sebagai:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "Batang" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "Nilai" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "Batang dan nilai" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "_Warnai nilai" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" + msgstr "Tampilkan arus jaringan" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GiB" ++ ++#~ msgid "kByte/s" ++#~ msgstr "kBita/s" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ja.po xfce4-netload-plugin-1.1.0/po/ja.po +--- xfce4-netload-plugin-1.1.0.orig/po/ja.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/ja.po 2012-03-09 23:42:00.804896492 +0100 +@@ -1,122 +1,160 @@ + # Japanese translations for xfce4-netload-plugin package. + # Copyright (C) 2003,2004,2005,2006,2007 +-# Benedikt Meurer +-# Bernhard Walle +-# Hendrik Scholz (Wormulon code base) ++# Benedikt Meurer ++# Bernhard Walle ++# Hendrik Scholz (Wormulon code base) + # This file is distributed under the same license as the xfce4-netload-plugin package. + # Nobuhiro Iwamatsu , 2007 +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" +-"PO-Revision-Date: 2007-02-24 20:52+0900\n" +-"Last-Translator: Nobuhiro Iwamatsu \n" +-"Language-Team: Japanese \n" ++"POT-Creation-Date: 2012-02-21 22:51+0900\n" ++"PO-Revision-Date: 2012-02-21 23:02+0900\n" ++"Last-Translator: Masato Hashimoto \n" ++"Language-Team: Japanese \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: ja\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" + msgstr "Xfce4-Netload プラグイン" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." +-msgstr "不明なエラー" ++msgstr "未知のエラーです。" + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." +-msgstr "Linux proc デバイスの '/proc/net/dev' が見つかりません" ++msgstr "Linux proc デバイスの '/proc/net/dev' が見つかりません。" + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." + msgstr "インターフェイスが見つかりませんでした" + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" + msgstr "<< %s >> (インターフェイス 停止)" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "<< %s >> (%s)\n" +-"最後から %d 測定分の平均:\n" +-"入力: %s kByte/s\n" +-"出力: %s kByte/s\n" +-"合計: %s kByte/s" ++"直近の %d 測定分の平均:\n" ++"受信: %s/s\n" ++"送信: %s/s\n" ++"合計: %s/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "IP アドレスがありません" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: 初期化中のエラー:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" +-msgstr "色を選択" ++msgstr "色の選択" ++ ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "バーの色 (受信)(_I):" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "バーの色 (入力):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "バーの色 (出力):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "最大 (入力):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "最大 (出力):" ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "バーの色 (送信)(_O):" + +-#: ../panel-plugin/netload.c:849 +-#: ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "最大 (受信)(_M):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "最大 (送信)(_U):" ++ ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" + msgstr "ネットワークモニター" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "表示するテキスト:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "ネットワークデバイス:" +- +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "更新間隔:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "表示文字列(_T):" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "ネットワークデバイス(_D):" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "更新間隔(_I):" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "秒" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "自動最大値" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "キロバイト/秒" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "最大値を自動調整する(_A)" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KiB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "データの表示形式(_P):" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "バー" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "数値" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "バーと数値" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "数値に色をつける(_C)" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" +-msgstr "ネットワークトラフィックを表示する" ++msgstr "ネットワークトラフィックを表示します" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GiB" + ++#~ msgid "kByte/s" ++#~ msgstr "キロバイト/秒" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ko.po xfce4-netload-plugin-1.1.0/po/ko.po +--- xfce4-netload-plugin-1.1.0.orig/po/ko.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/ko.po 2012-03-09 23:42:00.804896492 +0100 +@@ -2,121 +2,162 @@ + # Copyright (C) Free Software Foundation + # This file is distributed under the same license as the xfce4-netload-plugin package. + # ByungHyun Choi, 2005. +-# ++# Seong-ho Cho , 2011-2012. + # + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" +-"PO-Revision-Date: 2007-02-20 12:45+0900\n" +-"Last-Translator: ByungHyun Choi\n" +-"Language-Team: xfce4-users-kr-i18n \n" ++"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" ++"POT-Creation-Date: 2012-02-27 16:45+0000\n" ++"PO-Revision-Date: 2012-02-28 06:40+0900\n" ++"Last-Translator: Seong-ho, Cho \n" ++"Language-Team: xfce4-users-kr-i18n \n" ++"Language: ko\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" +-msgstr "Xfce4 네트웍 감시" ++msgstr "Xfce4-Netload-Plugin" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." + msgstr "알 수 없는 오류." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." +-msgstr "Linux proc 장치 '/proc/net/dev'를 못 찾겠습니다." ++msgstr "Linux proc 장치 '/proc/net/dev'를 찾을 수 없습니다." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." +-msgstr "네트웍 장치를 못 찾겠습니다." ++msgstr "인터페이스를 찾을 수 없습니다." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" +-msgstr "<< %s >> (사망)" ++msgstr "<< %s >> (인터페이스 죽음)" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "<< %s >> (%s)\n" + "최근 %d 회 측정 평균:\n" +-"들어오는 것: %s kByte/s\n" +-"나가는 것: %s kByte/s\n" +-"전부: %s kByte/s" ++"들어오는 것: %s/s\n" ++"나가는 것: %s/s\n" ++"전부: %s/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "IP 주소가 없습니다." + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: 초기화 도중 오류 발생:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "색상을 선택하십시오." + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "막대 색(들어오는 것):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "막대 색(나가는 것):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "최대 (들어오는 것):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "최대 (나가는 것)" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "막대 색(들어오는 것)(_N):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "막대 색(나가는 것)(_O):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "최대 (들어오는 것)(_M):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "최대 (나가는 것)(_U):" + +-#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:948 ++#: ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" +-msgstr "네트웍 감시:" ++msgstr "네트워크 감시기" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "표시:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "표시할 내용(_T):" + +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "네트웍 장치:" ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "네트워크 장치(_D):" + +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "검사 간격:" ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "업데이트 간격(_I):" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "초" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "최대치 자동 설정" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "kByte/s" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "최대치 자동 설정(_A)" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KiB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "다음으로 데이터 보이기(_P):" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "막대" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "값" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "막대와 값" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "값을 색상화(_C)" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" +-msgstr "네트웍 상태 보임" ++msgstr "네트워크 상태를 보입니다" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GiB" ++ ++#~ msgid "kByte/s" ++#~ msgstr "kByte/s" + + #~ msgid "Netload" + #~ msgstr "네트워크 감시" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/lt.po xfce4-netload-plugin-1.1.0/po/lt.po +--- xfce4-netload-plugin-1.1.0.orig/po/lt.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/lt.po 2012-03-09 23:42:00.805896497 +0100 +@@ -2,118 +2,159 @@ + # Copyright (C) 2003 GPL + # This file is distributed under the same license as the xfce4-netload. + # Mantas , 2003. +-# ++# Algimantas Margevičius , 2012. ++# + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload 1.0\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" +-"PO-Revision-Date: 2003-08-15 11:08+0300\n" +-"Last-Translator: Mantas \n" +-"Language-Team: \n" ++"POT-Creation-Date: 2012-01-22 14:06+0000\n" ++"PO-Revision-Date: 2012-01-22 16:43+0200\n" ++"Last-Translator: Algimantas Margevičius \n" ++"Language-Team: Lietuvių <>\n" ++"Language: \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" ++"%100<10 || n%100>=20) ? 1 : 2)\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" +-msgstr "" ++msgstr "Xfce4-Netload-įskiepis" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." +-msgstr "" ++msgstr "Nežinoma klaida." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." +-msgstr "" ++msgstr "Linux proc įrenginys „/proc/net/dev“ nerastas." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." +-msgstr "" ++msgstr "Sąsaja nerasta." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" +-msgstr "" ++msgstr "<< %s >> (Sąsaja neaktyvi)" + +-#: ../panel-plugin/netload.c:228 +-#, fuzzy, c-format ++#: ../panel-plugin/netload.c:249 ++#, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" +-"Gaunami: %lld bitų/s\n" +-"Siunčiami: %lld bitų/s\n" +-"Viso: %lld bitų/s" ++"<< %s >> (%s)\n" ++"Vidurkis paskutinių %d matavimų:\n" ++"Gaunami: %s/s\n" ++"Siunčiami: %s/s\n" ++"Viso: %s/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" +-msgstr "" ++msgstr "nėra IP adreso" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" ++"%s: Klaida inicijuojant:\n" ++"%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "Pasirinkite spalvą" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "Juostos spalva (gaunami duomenys)" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "Juostos spalva (siunčiami duomenys)" +- +-#: ../panel-plugin/netload.c:843 +-#, fuzzy +-msgid "Maximum (incoming):" +-msgstr "Juostos spalva (gaunami duomenys)" +- +-#: ../panel-plugin/netload.c:844 +-#, fuzzy +-msgid "Maximum (outgoing):" +-msgstr "Juostos spalva (siunčiami duomenys)" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "Juostos spalva (_gaunami duomenys):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "Juostos spalva (_siunčiami duomenys):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "Daugiausia (_gaunami duomenys):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "Daugiausia (_siunčiami duomenys):" + +-#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 +-#, fuzzy ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" +-msgstr "Tinklo įrenginys" ++msgstr "Tinklo stebėjimas" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "Rodomas tekstas:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "Tinklo įrenginys" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "_Rodomas tekstas:" + +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "" ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "_Tinklo įrenginys:" + +-#: ../panel-plugin/netload.c:946 +-msgid "s" +-msgstr "" ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "Atnaujinimo _intervalas:" + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "" ++#: ../panel-plugin/netload.c:1049 ++msgid "s" ++msgstr "s" + +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "_Automatinis didžiausias" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "_Atvaizduoti duomenis kaip:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "Juostos" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "Reikšmės" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "Juostos ir reikšmės" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "_Nuspalvoti reikšmes" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" +-msgstr "" ++msgstr "Rodyti tinklo srautą" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GB" + + #~ msgid "Netload" + #~ msgstr "Tinklo apkrovimas" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ru.po xfce4-netload-plugin-1.1.0/po/ru.po +--- xfce4-netload-plugin-1.1.0.orig/po/ru.po 2011-12-08 10:26:14.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/ru.po 2012-03-09 23:42:00.805896497 +0100 +@@ -8,43 +8,44 @@ + msgstr "" + "Project-Id-Version: xfce4-netload-plugin 0.3.3\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-01-05 02:01+0100\n" ++"POT-Creation-Date: 2012-02-16 11:39+0000\n" + "PO-Revision-Date: 2010-03-01 11:14+0200\n" + "Last-Translator: Dima Smirnov \n" + "Language-Team: Russian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"Language: ru\n" + +-#: ../panel-plugin/netload.c:57 ++#: ../panel-plugin/netload.c:59 + msgid "Xfce4-Netload-Plugin" + msgstr "Модуль сетевой активности Xfce4" + +-#: ../panel-plugin/netload.c:60 ++#: ../panel-plugin/netload.c:62 + msgid "Unknown error." + msgstr "Неизвестная ошибка." + +-#: ../panel-plugin/netload.c:61 ++#: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." + msgstr "Не найдено устройство '/proc/net/dev'." + +-#: ../panel-plugin/netload.c:62 ++#: ../panel-plugin/netload.c:64 + msgid "Interface was not found." + msgstr "Интерфейс не найден." + +-#: ../panel-plugin/netload.c:144 ++#: ../panel-plugin/netload.c:162 + #, c-format + msgid "<< %s >> (Interface down)" + msgstr "Интерфейс << %s >> выключен" + +-#: ../panel-plugin/netload.c:228 ++#: ../panel-plugin/netload.c:249 + #, c-format + msgid "" + "<< %s >> (%s)\n" + "Average of last %d measures:\n" +-"Incoming: %s kByte/s\n" +-"Outgoing: %s kByte/s\n" +-"Total: %s kByte/s" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" + msgstr "" + "<< %s >> (%s)\n" + "Среднее значение %d \n" +@@ -53,70 +54,109 @@ + "Исходящий: %s кБайт/s\n" + "Всего: %s кБайт/s" + +-#: ../panel-plugin/netload.c:230 ++#: ../panel-plugin/netload.c:251 + msgid "no IP address" + msgstr "нет IP-адреса" + +-#: ../panel-plugin/netload.c:468 ++#: ../panel-plugin/netload.c:533 + #, c-format + msgid "" +-"%s: Error in initalizing:\n" ++"%s: Error in initializing:\n" + "%s" + msgstr "" + "%s: Ошибка инициализации:\n" + "%s" + +-#: ../panel-plugin/netload.c:773 ++#: ../panel-plugin/netload.c:872 + msgid "Select color" + msgstr "Выбор цвета" + +-#: ../panel-plugin/netload.c:839 +-msgid "Bar color (incoming):" +-msgstr "Цвет индикатора (входящий):" +- +-#: ../panel-plugin/netload.c:840 +-msgid "Bar color (outgoing):" +-msgstr "Цвет индикатора (исходящий):" +- +-#: ../panel-plugin/netload.c:843 +-msgid "Maximum (incoming):" +-msgstr "Максимум (входящий):" +- +-#: ../panel-plugin/netload.c:844 +-msgid "Maximum (outgoing):" +-msgstr "Максимум (исходящий):" ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "Цвет индикатора (вхо_дящий):" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "Цвет индикатора (исход_ящий):" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "Максимум (в_ходящий):" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "Максимум (_исходящий):" + +-#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 ++#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 + msgid "Network Monitor" + msgstr "Сетевой монитор" + +-#: ../panel-plugin/netload.c:878 +-msgid "Text to display:" +-msgstr "Подпись:" +- +-#: ../panel-plugin/netload.c:909 +-msgid "Network device:" +-msgstr "Сетевое устройство:" +- +-#: ../panel-plugin/netload.c:935 +-msgid "Update interval:" +-msgstr "Интервал обновления:" ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "_Подпись:" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "Сетевое _устройство:" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "Интервал о_бновления:" + +-#: ../panel-plugin/netload.c:946 ++#: ../panel-plugin/netload.c:1049 + msgid "s" + msgstr "сек." + +-#: ../panel-plugin/netload.c:959 +-msgid "Automatic maximum" +-msgstr "Автоматически определять максимум" +- +-#: ../panel-plugin/netload.c:991 +-msgid "kByte/s" +-msgstr "кБайт/с" ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "_Автоматически определять максимум" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "КиБ/с" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "Представ_ление в виде:" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "Столбцов" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "Значений" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "Столбцов и значений" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "_Цветные значения" + + #: ../panel-plugin/netload.desktop.in.in.h:2 + msgid "Show network traffic" + msgstr "Показывать сетевой трафик" + ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "Б" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "КиБ" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "КиБ" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "ГиБ" ++ ++#~ msgid "kByte/s" ++#~ msgstr "кБайт/с" ++ + #~ msgid "Netload" + #~ msgstr "Монитор сетевой активности" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/zh_CN.po xfce4-netload-plugin-1.1.0/po/zh_CN.po +--- xfce4-netload-plugin-1.1.0.orig/po/zh_CN.po 2012-01-13 11:45:12.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/zh_CN.po 2012-03-09 23:42:00.805896497 +0100 +@@ -4,15 +4,15 @@ + # the xfce4-netload-plugin package. + # Vern Sun , 2007. + # Hunt Xu , 2009. +-# Chipong Luo , 2011, 2012. ++# Chipong Luo , 2011, 2012. + # + msgid "" + msgstr "" + "Project-Id-Version: xfce4-netload-plugin\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2012-01-09 00:00+0000\n" ++"POT-Creation-Date: 2012-02-08 12:06+0000\n" + "PO-Revision-Date: 2009-11-09 19:47+0800\n" +-"Last-Translator: Chipong Luo \n" ++"Last-Translator: Chipong Luo \n" + "Language-Team: Chinese (Simplified) \n" + "Language: zh_CN\n" + "MIME-Version: 1.0\n" +@@ -29,7 +29,7 @@ + + #: ../panel-plugin/netload.c:63 + msgid "Linux proc device '/proc/net/dev' not found." +-msgstr "未找到 Linux 设备 ‘/proc/net/dev’。" ++msgstr "未找到 Linux proc 设备 ‘/proc/net/dev’。" + + #: ../panel-plugin/netload.c:64 + msgid "Interface was not found." +@@ -94,7 +94,7 @@ + + #: ../panel-plugin/netload.c:977 + msgid "_Text to display:" +-msgstr "要显示的文本(_T)：" ++msgstr "要显示的文字(_T)：" + + #: ../panel-plugin/netload.c:1008 + msgid "Network _device:" +@@ -110,7 +110,7 @@ + + #: ../panel-plugin/netload.c:1062 + msgid "_Automatic maximum" +-msgstr "自动调节最大值(_A)" ++msgstr "自动最大值(_A)" + + #: ../panel-plugin/netload.c:1096 + msgid "KiB/s" +@@ -154,4 +154,4 @@ + + #: ../panel-plugin/utils.c:78 + msgid "GiB" +-msgstr "G" +\ Kein Zeilenumbruch am Dateiende. ++msgstr "G" +diff -Nur xfce4-netload-plugin-1.1.0.orig/po/zh_TW.po xfce4-netload-plugin-1.1.0/po/zh_TW.po +--- xfce4-netload-plugin-1.1.0.orig/po/zh_TW.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-netload-plugin-1.1.0/po/zh_TW.po 2012-03-09 23:42:00.805896497 +0100 +@@ -0,0 +1,157 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-netload-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2012-01-14 23:45+0000\n" ++"PO-Revision-Date: 2012-01-15 12:32+0800\n" ++"Last-Translator: Cheng-Chia Tseng \n" ++"Language-Team: chinese-l10n \n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0\n" ++ ++#: ../panel-plugin/netload.c:59 ++msgid "Xfce4-Netload-Plugin" ++msgstr "Xfce4-Netload-Plugin" ++ ++#: ../panel-plugin/netload.c:62 ++msgid "Unknown error." ++msgstr "未知錯誤。" ++ ++#: ../panel-plugin/netload.c:63 ++msgid "Linux proc device '/proc/net/dev' not found." ++msgstr "找不到 Linux proc 裝置「/proc/net/dev」。" ++ ++#: ../panel-plugin/netload.c:64 ++msgid "Interface was not found." ++msgstr "找不到介面。" ++ ++#: ../panel-plugin/netload.c:162 ++#, c-format ++msgid "<< %s >> (Interface down)" ++msgstr "<< %s >> (介面 down)" ++ ++#: ../panel-plugin/netload.c:249 ++#, c-format ++msgid "" ++"<< %s >> (%s)\n" ++"Average of last %d measures:\n" ++"Incoming: %s/s\n" ++"Outgoing: %s/s\n" ++"Total: %s/s" ++msgstr "" ++"<< %s >> (%s)\n" ++"最近 %d 次測量平均：\n" ++"傳入：%s/s\n" ++"傳出：%s/s\n" ++"總計：%s/s" ++ ++#: ../panel-plugin/netload.c:251 ++msgid "no IP address" ++msgstr "無 IP 位址" ++ ++#: ../panel-plugin/netload.c:533 ++#, c-format ++msgid "" ++"%s: Error in initializing:\n" ++"%s" ++msgstr "" ++"%s：初始化發生錯誤：\n" ++"%s" ++ ++#: ../panel-plugin/netload.c:872 ++msgid "Select color" ++msgstr "選取色彩" ++ ++#: ../panel-plugin/netload.c:938 ++msgid "Bar color (i_ncoming):" ++msgstr "條色彩 (傳入)(_N)：" ++ ++#: ../panel-plugin/netload.c:939 ++msgid "Bar color (_outgoing):" ++msgstr "條色彩 (傳出)(_O)：" ++ ++#: ../panel-plugin/netload.c:942 ++msgid "Maximum (inco_ming):" ++msgstr "最大 (傳入)(_M)：" ++ ++#: ../panel-plugin/netload.c:943 ++msgid "Maximum (o_utgoing):" ++msgstr "最大 (傳出)(_U)：" ++ ++#: ../panel-plugin/netload.c:948 ++#: ../panel-plugin/netload.desktop.in.in.h:1 ++msgid "Network Monitor" ++msgstr "網路監視器" ++ ++#: ../panel-plugin/netload.c:977 ++msgid "_Text to display:" ++msgstr "要顯示的文字(_T)：" ++ ++#: ../panel-plugin/netload.c:1008 ++msgid "Network _device:" ++msgstr "網路裝置(_D)：" ++ ++#: ../panel-plugin/netload.c:1036 ++msgid "Update _interval:" ++msgstr "更新時間隔 (_I)：" ++ ++#: ../panel-plugin/netload.c:1049 ++msgid "s" ++msgstr "s" ++ ++#: ../panel-plugin/netload.c:1062 ++msgid "_Automatic maximum" ++msgstr "自動最大(_A)" ++ ++#: ../panel-plugin/netload.c:1096 ++msgid "KiB/s" ++msgstr "KiB/s" ++ ++#: ../panel-plugin/netload.c:1121 ++msgid "_Present data as:" ++msgstr "顯示資料為(_P)：" ++ ++#: ../panel-plugin/netload.c:1130 ++msgid "Bars" ++msgstr "條" ++ ++#: ../panel-plugin/netload.c:1131 ++msgid "Values" ++msgstr "值" ++ ++#: ../panel-plugin/netload.c:1132 ++msgid "Bars and values" ++msgstr "條與值" ++ ++#: ../panel-plugin/netload.c:1182 ++msgid "_Colorize values" ++msgstr "色彩化值(_C)" ++ ++#: ../panel-plugin/netload.desktop.in.in.h:2 ++msgid "Show network traffic" ++msgstr "顯示網路流量" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "B" ++msgstr "B" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "KiB" ++msgstr "KiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "MiB" ++msgstr "MiB" ++ ++#: ../panel-plugin/utils.c:78 ++msgid "GiB" ++msgstr "GiB" ++ From 794c1e5580b001e6597da83264689bfccb6ea5b6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 4 Apr 2012 23:32:47 -0600 Subject: [PATCH 08/58] Rebuild for Xfce 4.10 --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 9f2e207..926fc16 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -81,6 +81,9 @@ rm -rf %{buildroot} %changelog +* Thu Apr 05 2012 Kevin Fenzi - 1.1.0-3 +- Rebuild for Xfce 4.10 + * Fri Mar 09 2012 Christoph Wickert - 1.1.0-2 - Don't use libxecdir if possible From 4a2e927658cda5d8c612358e00b5be76facaf2c4 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 15 Apr 2012 09:50:27 -0600 Subject: [PATCH 09/58] Rebuild for Xfce 4.10(pre2) --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 926fc16..68ceb06 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -81,6 +81,9 @@ rm -rf %{buildroot} %changelog +* Sun Apr 15 2012 Kevin Fenzi - 1.1.0-4 +- Rebuild for Xfce 4.10(pre2) + * Thu Apr 05 2012 Kevin Fenzi - 1.1.0-3 - Rebuild for Xfce 4.10 From 877fe4f36f1e896f85287272033539c4ff86c44b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 20 Jul 2012 17:05:08 -0600 Subject: [PATCH 10/58] Update to 1.2.0 --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 24 +++++------------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index eacc4c9..c46a772 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.0.0.tar.bz2 /xfce4-netload-plugin-1.1.0.tar.bz2 +/xfce4-netload-plugin-1.2.0.tar.bz2 diff --git a/sources b/sources index dca9c83..497b763 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19bee8171e7d681cb79539417f0b5917 xfce4-netload-plugin-1.1.0.tar.bz2 +05180d60ed347029dc125368c1d4406e xfce4-netload-plugin-1.2.0.tar.bz2 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 68ceb06..97762e6 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,18 +1,14 @@ %global minor_version 1.1 Name: xfce4-netload-plugin -Version: 1.1.0 -Release: 4%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-1.1.0-new-plugin-location.patch -# contains all translations from translations.xfce.org as of 2012-03-09 -Patch1: %{name}-1.1.0-update-translations.patch -#VCS: git:git://git.xfce.org/panel-plugins/xfce4-netload-plugin BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.7.0 @@ -28,13 +24,6 @@ A network-load monitor plugin for the Xfce panel. %prep %setup -q -# use new location for xfce4-panel 4.8 plugins (if possible) -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 -%patch0 -p1 -b .new-location -%endif - -%patch1 -p1 -b .update - %build %configure @@ -70,17 +59,14 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_datadir}/icons/hicolor/*/*/* - -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 -%{_libdir}/xfce4/panel/plugins/%{name} -%{_datadir}/xfce4/panel/plugins/*.desktop -%else %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop -%endif %changelog +* Fri Jul 20 2012 Kevin Fenzi - 1.2.0-1 +- Update to 1.2.0 + * Sun Apr 15 2012 Kevin Fenzi - 1.1.0-4 - Rebuild for Xfce 4.10(pre2) From 807f8792d839939597f1231700e844643030ff10 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:37:38 -0600 Subject: [PATCH 11/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 97762e6..5252f47 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -64,6 +64,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 20 2012 Kevin Fenzi - 1.2.0-1 - Update to 1.2.0 From 4ff801e010b81a770d48209246187781193e6ef4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:01:20 -0500 Subject: [PATCH 12/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 5252f47..0593eef 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -64,6 +64,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From ad3947420f1d44e8e44dd45c9bd0431e71102c8a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:39:30 -0500 Subject: [PATCH 13/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 0593eef..1f67d14 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -64,6 +64,9 @@ rm -rf %{buildroot} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 021ed71c6bba6988542b56207cf7e31a80df173e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:46:58 +0000 Subject: [PATCH 14/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 1f67d14..39186e6 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -64,6 +64,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 4da665bd1c6c55d7f6dcd0fd764106ca694bdf45 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 28 Oct 2014 07:42:56 -0600 Subject: [PATCH 15/58] Add patch to increase network interface name length to 20. - Fixes bug #1002329 --- ...tload-plugin-1.2.0-infterface-length.patch | 36 +++++++++++++++++++ xfce4-netload-plugin.spec | 12 ++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 xfce4-netload-plugin-1.2.0-infterface-length.patch diff --git a/xfce4-netload-plugin-1.2.0-infterface-length.patch b/xfce4-netload-plugin-1.2.0-infterface-length.patch new file mode 100644 index 0000000..6f10f73 --- /dev/null +++ b/xfce4-netload-plugin-1.2.0-infterface-length.patch @@ -0,0 +1,36 @@ +diff -Nur xfce4-netload-plugin-1.2.0.orig/panel-plugin/net.h xfce4-netload-plugin-1.2.0/panel-plugin/net.h +--- xfce4-netload-plugin-1.2.0.orig/panel-plugin/net.h 2012-07-10 04:03:59.000000000 -0600 ++++ xfce4-netload-plugin-1.2.0/panel-plugin/net.h 2014-10-28 07:18:42.783328109 -0600 +@@ -29,7 +29,7 @@ + #define UP_UPDATE_INTERVAL 20 + #define IP_UPDATE_INTERVAL 20 + #define IP_ADDRESS_LENGTH 64 +-#define INTERFACE_NAME_LENGTH 9 ++#define INTERFACE_NAME_LENGTH 19 + + #ifndef gettext_noop + #define gettext_noop(String) String +diff -Nur xfce4-netload-plugin-1.2.0.orig/panel-plugin/netload.c xfce4-netload-plugin-1.2.0/panel-plugin/netload.c +--- xfce4-netload-plugin-1.2.0.orig/panel-plugin/netload.c 2012-07-15 09:16:37.000000000 -0600 ++++ xfce4-netload-plugin-1.2.0/panel-plugin/netload.c 2014-10-28 07:18:42.784328091 -0600 +@@ -51,7 +51,7 @@ + static gchar* DEFAULT_COLOR[] = { "#FF4F00", "#FFE500" }; + + #define UPDATE_TIMEOUT 250 +-#define MAX_LENGTH 10 ++#define MAX_LENGTH 20 + + #define IN 0 + #define OUT 1 +diff -Nur xfce4-netload-plugin-1.2.0.orig/panel-plugin/slurm.h xfce4-netload-plugin-1.2.0/panel-plugin/slurm.h +--- xfce4-netload-plugin-1.2.0.orig/panel-plugin/slurm.h 2012-07-10 04:03:59.000000000 -0600 ++++ xfce4-netload-plugin-1.2.0/panel-plugin/slurm.h 2014-10-28 07:18:42.784328091 -0600 +@@ -10,7 +10,7 @@ + #define _SLURM_H_ + + typedef struct IfData{ +- char if_name[10]; /* The device name given as start parameter*/ ++ char if_name[20]; /* The device name given as start parameter*/ + int if_speed; /* The Interface speed */ + char if_speedstring[12]; /* the measuring unit like Mbit, kbit */ + int if_id; /* The ID which the interface inside the OS has */ diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 39186e6..d0c7334 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,13 +2,18 @@ Name: xfce4-netload-plugin Version: 1.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +# Increase interface name limit to 20 chars +# https://bugzilla.xfce.org/show_bug.cgi?id=9807 +# https://bugzilla.xfce.org/show_bug.cgi?id=9869 +# https://bugzilla.redhat.com/show_bug.cgi?id=1002329 +Patch0: xfce4-netload-plugin-1.2.0-infterface-length.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.7.0 @@ -24,6 +29,7 @@ A network-load monitor plugin for the Xfce panel. %prep %setup -q +%patch0 -p1 %build %configure @@ -64,6 +70,10 @@ rm -rf %{buildroot} %changelog +* Tue Oct 28 2014 Kevin Fenzi 1.2.0-6 +- Add patch to increase network interface name length to 20. +- Fixes bug #1002329 + * Mon Aug 18 2014 Fedora Release Engineering - 1.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 0f1fe263d2de6b801fa634d417e30deffb475d0a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 4 Nov 2014 08:16:03 -0700 Subject: [PATCH 16/58] Update to 1.2.2. --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 20 +++++++++----------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index c46a772..4546be8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.0.0.tar.bz2 /xfce4-netload-plugin-1.1.0.tar.bz2 /xfce4-netload-plugin-1.2.0.tar.bz2 +/xfce4-netload-plugin-1.2.2.tar.bz2 diff --git a/sources b/sources index 497b763..6018a7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05180d60ed347029dc125368c1d4406e xfce4-netload-plugin-1.2.0.tar.bz2 +d3611719081f4a45b50abd9e72dc9e00 xfce4-netload-plugin-1.2.2.tar.bz2 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index d0c7334..f322b41 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,19 +1,14 @@ -%global minor_version 1.1 +%global minor_version 1.2 Name: xfce4-netload-plugin -Version: 1.2.0 -Release: 6%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -# Increase interface name limit to 20 chars -# https://bugzilla.xfce.org/show_bug.cgi?id=9807 -# https://bugzilla.xfce.org/show_bug.cgi?id=9869 -# https://bugzilla.redhat.com/show_bug.cgi?id=1002329 -Patch0: xfce4-netload-plugin-1.2.0-infterface-length.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.7.0 @@ -29,8 +24,6 @@ A network-load monitor plugin for the Xfce panel. %prep %setup -q -%patch0 -p1 - %build %configure make %{?_smp_mflags} @@ -41,6 +34,8 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} %find_lang %{name} +rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la + %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -65,11 +60,14 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_datadir}/icons/hicolor/*/*/* -%{_libexecdir}/xfce4/panel-plugins/%{name} +%{_libdir}/xfce4/panel/plugins/libnetload.so %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Tue Nov 04 2014 Kevin Fenzi 1.2.2-1 +- Update to 1.2.2. + * Tue Oct 28 2014 Kevin Fenzi 1.2.0-6 - Add patch to increase network interface name length to 20. - Fixes bug #1002329 From 2b210bcafe6ffa1b4dc9a54501f42f79d4cb6262 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 16 Nov 2014 11:17:05 -0700 Subject: [PATCH 17/58] Update to 1.2.3 --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4546be8..6934534 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.1.0.tar.bz2 /xfce4-netload-plugin-1.2.0.tar.bz2 /xfce4-netload-plugin-1.2.2.tar.bz2 +/xfce4-netload-plugin-1.2.3.tar.bz2 diff --git a/sources b/sources index 6018a7c..a64aa46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3611719081f4a45b50abd9e72dc9e00 xfce4-netload-plugin-1.2.2.tar.bz2 +13fe5514c56527b91a73e87e863edd38 xfce4-netload-plugin-1.2.3.tar.bz2 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index f322b41..e414742 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,7 +1,7 @@ %global minor_version 1.2 Name: xfce4-netload-plugin -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Sun Nov 16 2014 Kevin Fenzi 1.2.3-1 +- Update to 1.2.3 + * Tue Nov 04 2014 Kevin Fenzi 1.2.2-1 - Update to 1.2.2. From 692716beb6ded927bce7842f8372a60b948a3b6f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 22 Nov 2014 15:05:34 -0700 Subject: [PATCH 18/58] Update to 1.2.4. Fixes bug #1157193 --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6934534..c9adc4e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.2.0.tar.bz2 /xfce4-netload-plugin-1.2.2.tar.bz2 /xfce4-netload-plugin-1.2.3.tar.bz2 +/xfce4-netload-plugin-1.2.4.tar.bz2 diff --git a/sources b/sources index a64aa46..b991006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13fe5514c56527b91a73e87e863edd38 xfce4-netload-plugin-1.2.3.tar.bz2 +ce53e1135e4bff5afcd899627110bd11 xfce4-netload-plugin-1.2.4.tar.bz2 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index e414742..8ef792b 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,7 +1,7 @@ %global minor_version 1.2 Name: xfce4-netload-plugin -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Sat Nov 22 2014 Kevin Fenzi 1.2.4-1 +- Update to 1.2.4. Fixes bug #1157193 + * Sun Nov 16 2014 Kevin Fenzi 1.2.3-1 - Update to 1.2.3 From a04cca45c7f6b6f379c62338e557ae01f00dd6bf Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 28 Feb 2015 20:18:34 -0700 Subject: [PATCH 19/58] Rebuild for Xfce 4.12 --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 8ef792b..5639f28 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 28 2015 Kevin Fenzi 1.2.4-2 +- Rebuild for Xfce 4.12 + * Sat Nov 22 2014 Kevin Fenzi 1.2.4-1 - Update to 1.2.4. Fixes bug #1157193 From 814fe5394eb913ab5e0447e646afd6fbb006ad1f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:56:20 +0000 Subject: [PATCH 20/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 5639f28..3aea8c3 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat Feb 28 2015 Kevin Fenzi 1.2.4-2 - Rebuild for Xfce 4.12 From 7a9e900a88f9f5967aa8ba49b921f6ef12d8be7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:26:36 +0000 Subject: [PATCH 21/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 3aea8c3..404825b 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.2.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -65,6 +65,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From d6ee17409c3ea6e7ab3b6bb00537897e66d599a0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 5 Nov 2016 10:46:38 -0600 Subject: [PATCH 22/58] Update to 1.3.0. (gtk3) --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 27 +++++++++++---------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index c9adc4e..104f5d8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.2.2.tar.bz2 /xfce4-netload-plugin-1.2.3.tar.bz2 /xfce4-netload-plugin-1.2.4.tar.bz2 +/xfce4-netload-plugin-1.3.0.tar.bz2 diff --git a/sources b/sources index b991006..1ec2b8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce53e1135e4bff5afcd899627110bd11 xfce4-netload-plugin-1.2.4.tar.bz2 +9b625d8ad513085f2e1569171db00b44 xfce4-netload-plugin-1.3.0.tar.bz2 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 404825b..724a9ae 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,8 +1,8 @@ -%global minor_version 1.2 +%global minor_version 1.3 Name: xfce4-netload-plugin -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -11,11 +11,11 @@ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.7.0 -BuildRequires: pkgconfig(libxfce4ui-1) >= 4.7.0 +BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.12.0 +BuildRequires: pkgconfig(libxfce4ui-1) >= 4.12.0 BuildRequires: libxml2-devel BuildRequires: gettext, intltool -Requires: xfce4-panel >= 4.7.0 +Requires: xfce4-panel >= 4.12.0 %description A network-load monitor plugin for the Xfce panel. @@ -30,10 +30,9 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} %find_lang %{name} - +chmod 755 %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.so rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la @@ -51,20 +50,16 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - -%clean -rm -rf %{buildroot} - - %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_datadir}/icons/hicolor/*/*/* %{_libdir}/xfce4/panel/plugins/libnetload.so -%{_datadir}/xfce4/panel-plugins/*.desktop - +%{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Nov 05 2016 Kevin Fenzi - 1.3.0-1 +- Update to 1.3.0. (gtk3) + * Fri Feb 05 2016 Fedora Release Engineering - 1.2.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 11a7662320bd7dd2468a5167975ed52bd1ea6e7a Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 9 Feb 2017 21:17:44 -0500 Subject: [PATCH 23/58] Update to 1.3.1 (bugfix update) --- .gitignore | 1 + sources | 2 +- ...oad-plugin-1.1.0-new-plugin-location.patch | 56 - ...oad-plugin-1.1.0-update-translations.patch | 2245 ----------------- ...tload-plugin-1.2.0-infterface-length.patch | 36 - xfce4-netload-plugin.spec | 5 +- 6 files changed, 6 insertions(+), 2339 deletions(-) delete mode 100644 xfce4-netload-plugin-1.1.0-new-plugin-location.patch delete mode 100644 xfce4-netload-plugin-1.1.0-update-translations.patch delete mode 100644 xfce4-netload-plugin-1.2.0-infterface-length.patch diff --git a/.gitignore b/.gitignore index 104f5d8..62fda1c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.2.3.tar.bz2 /xfce4-netload-plugin-1.2.4.tar.bz2 /xfce4-netload-plugin-1.3.0.tar.bz2 +/xfce4-netload-plugin-1.3.1.tar.bz2 diff --git a/sources b/sources index 1ec2b8d..ecf87a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b625d8ad513085f2e1569171db00b44 xfce4-netload-plugin-1.3.0.tar.bz2 +SHA512 (xfce4-netload-plugin-1.3.1.tar.bz2) = 34144bf2d95f71276f8b5f4cf417d97d380233805c6fec1b7c559fee5b11468a421d3691230e01d89b40289d5ab22a472dcbef2a7ee0854abd7213e0ef0a3ef9 diff --git a/xfce4-netload-plugin-1.1.0-new-plugin-location.patch b/xfce4-netload-plugin-1.1.0-new-plugin-location.patch deleted file mode 100644 index b8f0348..0000000 --- a/xfce4-netload-plugin-1.1.0-new-plugin-location.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -dur xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.am xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.am ---- xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.am 2012-01-07 15:50:00.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.am 2012-03-09 22:05:17.201838947 +0100 -@@ -1,4 +1,4 @@ --plugindir = $(libexecdir)/xfce4/panel-plugins -+plugindir = $(libdir)/xfce4/panel/plugins - plugin_PROGRAMS = xfce4-netload-plugin - - LIBS = @LIBS@ @SOLLIBS@ -@@ -34,7 +34,7 @@ - desktop_in_in_files = netload.desktop.in.in - desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) - --desktopdir = $(datadir)/xfce4/panel-plugins -+desktopdir = $(datadir)/xfce4/panel/plugins - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - @INTLTOOL_DESKTOP_RULE@ - -@@ -47,6 +47,6 @@ - - # get full path into .desktop file - %.desktop.in: %.desktop.in.in -- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \ -+ sed -e "s^@PLUGIN_PATH@^$(libdir)/xfce4/panel/plugins^" \ - $< > $@ - -diff -dur xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.in xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.in ---- xfce4-netload-plugin-1.1.0.orig/panel-plugin/Makefile.in 2012-01-13 12:51:08.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/panel-plugin/Makefile.in 2012-03-09 22:07:05.618821744 +0100 -@@ -213,7 +213,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --plugindir = $(libexecdir)/xfce4/panel-plugins -+plugindir = $(libdir)/xfce4/panel/plugins - xfce4_netload_plugin_SOURCES = \ - netload.c \ - utils.c \ -@@ -245,7 +245,7 @@ - # - desktop_in_in_files = netload.desktop.in.in - desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) --desktopdir = $(datadir)/xfce4/panel-plugins -+desktopdir = $(datadir)/xfce4/panel/plugins - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - EXTRA_DIST = \ - wormulon commandline.c \ -@@ -619,7 +619,7 @@ - - # get full path into .desktop file - %.desktop.in: %.desktop.in.in -- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \ -+ sed -e "s^@PLUGIN_PATH@^$(libdir)/xfce4/panel/plugins^" \ - $< > $@ - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/xfce4-netload-plugin-1.1.0-update-translations.patch b/xfce4-netload-plugin-1.1.0-update-translations.patch deleted file mode 100644 index 4cef104..0000000 --- a/xfce4-netload-plugin-1.1.0-update-translations.patch +++ /dev/null @@ -1,2245 +0,0 @@ -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ar.po xfce4-netload-plugin-1.1.0/po/ar.po ---- xfce4-netload-plugin-1.1.0.orig/po/ar.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/ar.po 2012-03-09 23:42:00.804896492 +0100 -@@ -0,0 +1,155 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# كريم اولاد الشلحة , 2012. -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2012-02-04 15:18+0000\n" -+"PO-Revision-Date: 2012-02-04 20:24+0000\n" -+"Last-Translator: كريم اولاد الشلحة \n" -+"Language-Team: Arabic Xfce Translation Team\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Language: ar\n" -+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -+"X-Generator: Virtaal 0.7.0\n" -+ -+#: ../panel-plugin/netload.c:59 -+msgid "Xfce4-Netload-Plugin" -+msgstr "ملحق-تحميل نيت-لإكسفسي4" -+ -+#: ../panel-plugin/netload.c:62 -+msgid "Unknown error." -+msgstr "خطأ مجهول." -+ -+#: ../panel-plugin/netload.c:63 -+msgid "Linux proc device '/proc/net/dev' not found." -+msgstr "لم يتم العثور على '/proc/net/dev'." -+ -+#: ../panel-plugin/netload.c:64 -+msgid "Interface was not found." -+msgstr "لم يتم العثور غلى الواجهة." -+ -+#: ../panel-plugin/netload.c:162 -+#, c-format -+msgid "<< %s >> (Interface down)" -+msgstr "<< %s >> (واجهة للأسفل)" -+ -+#: ../panel-plugin/netload.c:249 -+#, c-format -+msgid "" -+"<< %s >> (%s)\n" -+"Average of last %d measures:\n" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" -+msgstr "" -+"<< %s >> (%s)\n" -+"معدل أخر %d إجراءات:\n" -+"الوارد: %s/s\n" -+"الصادر: %s/s\n" -+"المجموع: %s/s" -+ -+#: ../panel-plugin/netload.c:251 -+msgid "no IP address" -+msgstr "بدون عنوان IP" -+ -+#: ../panel-plugin/netload.c:533 -+#, c-format -+msgid "" -+"%s: Error in initializing:\n" -+"%s" -+msgstr "" -+"%s: خطأعنذ التمهيد:\n" -+"%s" -+ -+#: ../panel-plugin/netload.c:872 -+msgid "Select color" -+msgstr "اختر لون" -+ -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "لون شريك (ال_وارد):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "لون شريك (ال_صادر):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "أقصى (الوارد):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "أقصى (الصادر):" -+ -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 -+msgid "Network Monitor" -+msgstr "مراقب الشبكة" -+ -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "النص المراد عرضه:" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "جهاز ال_شّبكة:" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "مجال التح_ديث:" -+ -+#: ../panel-plugin/netload.c:1049 -+msgid "s" -+msgstr "ث" -+ -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "أق_صى تلقائيا" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "ك.بايت/ثا" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "ت_قديم البيانات كـ:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "أشرطة" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "قيم" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "أشرطة و قيم" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "تلوين ا_لقيم" -+ -+#: ../panel-plugin/netload.desktop.in.in.h:2 -+msgid "Show network traffic" -+msgstr "عرض حركة الشبكة" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "بايت" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "ك.بايت" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "م.بايت" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "ج.بايت" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ca.po xfce4-netload-plugin-1.1.0/po/ca.po ---- xfce4-netload-plugin-1.1.0.orig/po/ca.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/ca.po 2012-03-09 23:42:00.804896492 +0100 -@@ -3,122 +3,163 @@ - # Copyright (C) 2003, 2004 THE PACKAGE'S COPYRIGHT HOLDER - # This file is distributed under the same license as the - # xfce4-netload-plugin package. --# Carles Muñoz Gorriz , 2003, 2004, 2007. -+# Carles Muñoz Gorriz , 2003-2004, 2007, 2012. - # Toni Vall , 2004. - # - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" --"PO-Revision-Date: 2007-05-11 19:37+0100\n" -+"POT-Creation-Date: 2012-01-15 11:15+0000\n" -+"PO-Revision-Date: 2012-01-15 18:07+0100\n" - "Last-Translator: Carles Muñoz Gorriz \n" - "Language-Team: catal \n" -+"Language: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" - msgstr "Xfce4-Netload-Plugin" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." - msgstr "Error desconegut." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." - msgstr "No s'ha trobat el dispositiu linux «/proc/net/dev»." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." - msgstr "No s'ha trobat la interfície." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" - msgstr "«%s» (interfície caiguda)" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "«%s» (%s)\n" - "Mitjana de les %d últimes mesures:\n" --"Entrada: %s kB/s\n" --"Sortida: %s kB/s\n" --"Total: %s kB/s" -+"Entrada: %s/s\n" -+"Sortida: %s/s\n" -+"Total: %s/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "No hi ha adreça IP" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: Error d'inicialització:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "Seleccioneu el color" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "Color de la barra (entrada):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "Color de la barra (sortida):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "Màxim (entrada):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "Màxim (sortida):" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "Color de la barra (e_ntrada)" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "Color de la barra (s_ortida):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "Màxim (_entrada):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "Màxim (_sortida):" - --#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:948 -+#: ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" - msgstr "Monitoritza la xarxa" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "Text a mostrar:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "Dispositiu de xarxa:" -- --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "Interval d'actualització:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "_Text a mostrar:" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "_Dispositiu de xarxa:" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "_Interval d'actualització:" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "s" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "Màxim automàtic" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "kB/s" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "Màxim _automàtic" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KiB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "_Mostra les dades com:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "Barres" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "Valors" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "Barres i valors" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "Valors a_colorits" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" - msgstr "Mostra el tràfic de xarxa" - -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GiB" -+ -+#~ msgid "kByte/s" -+#~ msgstr "kB/s" -+ - #~ msgid "Edit Properties" - #~ msgstr "Edita les propietats" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/de.po xfce4-netload-plugin-1.1.0/po/de.po ---- xfce4-netload-plugin-1.1.0.orig/po/de.po 2012-01-13 11:45:12.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/de.po 2012-03-09 23:42:00.804896492 +0100 -@@ -7,7 +7,7 @@ - msgstr "" - "Project-Id-Version: de\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-01-08 15:01+0000\n" -+"POT-Creation-Date: 2012-02-01 11:54+0000\n" - "PO-Revision-Date: 2007-01-18 08:45+0100\n" - "Last-Translator: Fabian Nowak \n" - "Language-Team: \n" -@@ -39,7 +39,7 @@ - msgstr "»%s« (Schnittstelle nicht aktiviert)" - - #: ../panel-plugin/netload.c:249 --#, fuzzy, c-format -+#, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" -@@ -58,7 +58,7 @@ - msgstr "keine IP-Adresse" - - #: ../panel-plugin/netload.c:533 --#, fuzzy, c-format -+#, c-format - msgid "" - "%s: Error in initializing:\n" - "%s" -@@ -71,22 +71,18 @@ - msgstr "Farbe auswählen" - - #: ../panel-plugin/netload.c:938 --#, fuzzy - msgid "Bar color (i_ncoming):" - msgstr "Balkenfarbe (ei_ngehend):" - - #: ../panel-plugin/netload.c:939 --#, fuzzy - msgid "Bar color (_outgoing):" - msgstr "Balkenfarbe (au_sgehend):" - - #: ../panel-plugin/netload.c:942 --#, fuzzy - msgid "Maximum (inco_ming):" - msgstr "_Maximum (eingehend):" - - #: ../panel-plugin/netload.c:943 --#, fuzzy - msgid "Maximum (o_utgoing):" - msgstr "Maximum (a_usgehend):" - -@@ -95,17 +91,14 @@ - msgstr "Netzwerkmonitor" - - #: ../panel-plugin/netload.c:977 --#, fuzzy - msgid "_Text to display:" - msgstr "Angezeigter _Text:" - - #: ../panel-plugin/netload.c:1008 --#, fuzzy - msgid "Network _device:" - msgstr "Netzwerk_schnittstelle:" - - #: ../panel-plugin/netload.c:1036 --#, fuzzy - msgid "Update _interval:" - msgstr "Aktualisierungs_intervall:" - -@@ -114,7 +107,6 @@ - msgstr "s" - - #: ../panel-plugin/netload.c:1062 --#, fuzzy - msgid "_Automatic maximum" - msgstr "_Automatisches Maximum" - -@@ -123,27 +115,22 @@ - msgstr "KiB/s" - - #: ../panel-plugin/netload.c:1121 --#, fuzzy - msgid "_Present data as:" - msgstr "_Daten darstellen als:" - - #: ../panel-plugin/netload.c:1130 --#, fuzzy - msgid "Bars" - msgstr "Balken" - - #: ../panel-plugin/netload.c:1131 --#, fuzzy - msgid "Values" - msgstr "Werte" - - #: ../panel-plugin/netload.c:1132 --#, fuzzy - msgid "Bars and values" - msgstr "Balken und Werte" - - #: ../panel-plugin/netload.c:1182 --#, fuzzy - msgid "_Colorize values" - msgstr "_Werte färben" - -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/es.po xfce4-netload-plugin-1.1.0/po/es.po ---- xfce4-netload-plugin-1.1.0.orig/po/es.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/es.po 2012-03-09 23:42:00.804896492 +0100 -@@ -1,51 +1,52 @@ - # Spanish translation of xfce4-netload-plugin package. - # Copyright (C) 2003-2005 Bernhard Walle. - # This file is distributed under the same license as the xfce4-netload-plugin package. --# -+# - # Rudy Godoy , 2005 - # Abel Martín , 2008 --# -+# - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin 0.3.3\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" -+"POT-Creation-Date: 2012-01-21 09:18+0000\n" - "PO-Revision-Date: 2009-08-21 01:42-0300\n" - "Last-Translator: elega \n" - "Language-Team: Debian l10n Spanish Team \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Language: \n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" - msgstr "Xfce4-Netload-Plugin" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." - msgstr "Error desconocido." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." - msgstr "Dispositivo de proc de Linux '/proc/net/dev' no encontrado." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." - msgstr "No se encontró la interfaz." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" - msgstr "<< %s >> (Bajar interfaz)" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "<< %s >> (%s)\n" - "Promedio de las últimas %d medidas:\n" -@@ -53,74 +54,112 @@ - "Salida: %s kByte/s\n" - "Total: %s kByte/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "sin dirección IP" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: Fallo al inicializar:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "Seleccionar color" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "Color de barra (entrada):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "Color de barra (salida):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "Máximo (entrada):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "Máximo (salida):" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "Color de barra (e_ntrada):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "Color de barra (_salida):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "Máximo (entr_ada):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "Máximo (s_alida):" - --#: ../panel-plugin/netload.c:849 --#: ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" - msgstr "Monitor de red" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "Texto a mostrar:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "Dispositivo de red:" -- --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "Intervalo de actualización:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "_Texto a mostrar:" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "_Dispositivo de red:" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "_Intervalo de actualización:" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "s" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "Máximo automático" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "kByte/s" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "Máximo _automático" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KiB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "_Presentar datos como:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "Barras" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "Valores" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "Barras y valores" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "_Colorear valores" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" - msgstr "Mostrar tráfico de red" - -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GiB" -+ -+#~ msgid "kByte/s" -+#~ msgstr "kByte/s" -+ - #~ msgid "Edit Properties" - #~ msgstr "Editar propiedades" -+ - #~ msgid "Netload" - #~ msgstr "Carga de red" -- -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/eu.po xfce4-netload-plugin-1.1.0/po/eu.po ---- xfce4-netload-plugin-1.1.0.orig/po/eu.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/eu.po 2012-03-09 23:42:00.804896492 +0100 -@@ -3,51 +3,52 @@ - # Copyright (C) 2003-2005 Bernhard Walle. - # This file is distributed under the same license as the - # xfce4-netload-plugin package. --# -+# - # Piarres Beobide , 2005, 2009. - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin.master\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" -+"POT-Creation-Date: 2012-01-16 10:15+0000\n" - "PO-Revision-Date: 2009-08-18 09:17+0200\n" - "Last-Translator: Piarres Beobide \n" - "Language-Team: Euskara \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: KBabel 1.11.4\n" -+"Language: \n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: KBabel 1.11.4\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" - msgstr "Xfce4-SareKarga-Plugin-a" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." - msgstr "Errore ezezaguna." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." - msgstr "Ez da '/proc/net/dev' Linux proc gailua aurkitu." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." - msgstr "Ez da interfazea aurkitu." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" - msgstr "<< %s >> (Interfazea deskonektaturik)" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "<< %s >> (%s)\n" - "Azken %d neurketen bataz bestekoa:\n" -@@ -55,68 +56,106 @@ - "Irteera: %s kByte/s\n" - "Guztira: %s kByte/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "ez dago IP helbiderik" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: Errorea abiaraztean:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "Hautatu kolorea" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "Barra kolorea (sarrera):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "Barra kolorea (irteera):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "Gehienezkoa (sarrera):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "Gehienezkoa (irteera):" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "Barra kolorea (s_arrera):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "Barra kolorea (_irteera):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "Gehienezkoa (_sarrera):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "Gehienezkoa (i_rteera):" - --#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" - msgstr "Sare Monitorea" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "Bistaratzeko testua:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "Sare gailua:" -- --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "Eguneratze epea:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "Bistaratzeko _testua:" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "Sare _gailua:" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "Eguneratze _tartea:" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "s" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "Gehienezko automatikoa" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "kByte/s" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "_Gehienezko automatikoa" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "_Bistarazi datuak:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "Barrak" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "Balioak" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "Barra eta balioak" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "_Koloreztatuko balioak" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" - msgstr "Ikusi sare trafikoa" - -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GB" -+ -+#~ msgid "kByte/s" -+#~ msgstr "kByte/s" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/id.po xfce4-netload-plugin-1.1.0/po/id.po ---- xfce4-netload-plugin-1.1.0.orig/po/id.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/id.po 2012-03-09 23:42:00.804896492 +0100 -@@ -2,48 +2,49 @@ - # Copyright (C) 2003-2006 Bernhard Walle. - # This file is distributed under the same license as the xfce4-netload-plugin package. - # Andhika padmawan , 2008. --# -+# - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin 0.2.4\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" -+"POT-Creation-Date: 2012-01-29 02:42+0000\n" - "PO-Revision-Date: 2008-06-21 09:30+0700\n" - "Last-Translator: Andhika Padmawan \n" - "Language-Team: Indonesian \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Language: id\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" - msgstr "Xfce4-Netload-Plugin" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." - msgstr "Galat tak dikenal." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." - msgstr "Divais proc Linux '/proc/net/dev' tak ditemukan." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." - msgstr "Antarmuka tak ditemukan." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" - msgstr "<< %s >> (Antarmuka tidak aktif)" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "<< %s >> (%s)\n" - "Ukuran rata-rata %d terakhir:\n" -@@ -51,67 +52,106 @@ - "Keluar: %s kBita/s\n" - "Total: %s kBita/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "tak ada alamat IP" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: Galat ketika menginisialisasi:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "Pilih warna" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "Batang warna (masuk):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "Batang warna (keluar):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "Maksimum (masuk):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "Maksimum (keluar):" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "Batang warna (_masuk):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "Batang warna (_keluar):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "Maksimum (m_asuk):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "Maksimum (k_eluar):" - --#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" - msgstr "Monitor Jaringan" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "Teks untuk ditampilkan:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "Divais jaringan:" -- --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "Interval mutakhirkan:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "_Teks untuk ditampilkan:" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "Divais _jaringan:" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "Interval _pemutakhiran:" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "s" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "Maksimum otomatis" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "kBita/s" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "_Maksimum otomatis" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KiB/d" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "Tampilkan _data sebagai:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "Batang" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "Nilai" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "Batang dan nilai" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "_Warnai nilai" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" - msgstr "Tampilkan arus jaringan" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GiB" -+ -+#~ msgid "kByte/s" -+#~ msgstr "kBita/s" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ja.po xfce4-netload-plugin-1.1.0/po/ja.po ---- xfce4-netload-plugin-1.1.0.orig/po/ja.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/ja.po 2012-03-09 23:42:00.804896492 +0100 -@@ -1,122 +1,160 @@ - # Japanese translations for xfce4-netload-plugin package. - # Copyright (C) 2003,2004,2005,2006,2007 --# Benedikt Meurer --# Bernhard Walle --# Hendrik Scholz (Wormulon code base) -+# Benedikt Meurer -+# Bernhard Walle -+# Hendrik Scholz (Wormulon code base) - # This file is distributed under the same license as the xfce4-netload-plugin package. - # Nobuhiro Iwamatsu , 2007 --# -+# - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" --"PO-Revision-Date: 2007-02-24 20:52+0900\n" --"Last-Translator: Nobuhiro Iwamatsu \n" --"Language-Team: Japanese \n" -+"POT-Creation-Date: 2012-02-21 22:51+0900\n" -+"PO-Revision-Date: 2012-02-21 23:02+0900\n" -+"Last-Translator: Masato Hashimoto \n" -+"Language-Team: Japanese \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Language: ja\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" - msgstr "Xfce4-Netload プラグイン" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." --msgstr "不明なエラー" -+msgstr "未知のエラーです。" - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." --msgstr "Linux proc デバイスの '/proc/net/dev' が見つかりません" -+msgstr "Linux proc デバイスの '/proc/net/dev' が見つかりません。" - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." - msgstr "インターフェイスが見つかりませんでした" - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" - msgstr "<< %s >> (インターフェイス 停止)" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "<< %s >> (%s)\n" --"最後から %d 測定分の平均:\n" --"入力: %s kByte/s\n" --"出力: %s kByte/s\n" --"合計: %s kByte/s" -+"直近の %d 測定分の平均:\n" -+"受信: %s/s\n" -+"送信: %s/s\n" -+"合計: %s/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "IP アドレスがありません" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: 初期化中のエラー:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" --msgstr "色を選択" -+msgstr "色の選択" -+ -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "バーの色 (受信)(_I):" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "バーの色 (入力):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "バーの色 (出力):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "最大 (入力):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "最大 (出力):" -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "バーの色 (送信)(_O):" - --#: ../panel-plugin/netload.c:849 --#: ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "最大 (受信)(_M):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "最大 (送信)(_U):" -+ -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" - msgstr "ネットワークモニター" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "表示するテキスト:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "ネットワークデバイス:" -- --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "更新間隔:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "表示文字列(_T):" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "ネットワークデバイス(_D):" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "更新間隔(_I):" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "秒" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "自動最大値" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "キロバイト/秒" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "最大値を自動調整する(_A)" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KiB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "データの表示形式(_P):" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "バー" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "数値" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "バーと数値" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "数値に色をつける(_C)" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" --msgstr "ネットワークトラフィックを表示する" -+msgstr "ネットワークトラフィックを表示します" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GiB" - -+#~ msgid "kByte/s" -+#~ msgstr "キロバイト/秒" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ko.po xfce4-netload-plugin-1.1.0/po/ko.po ---- xfce4-netload-plugin-1.1.0.orig/po/ko.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/ko.po 2012-03-09 23:42:00.804896492 +0100 -@@ -2,121 +2,162 @@ - # Copyright (C) Free Software Foundation - # This file is distributed under the same license as the xfce4-netload-plugin package. - # ByungHyun Choi, 2005. --# -+# Seong-ho Cho , 2011-2012. - # - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" --"PO-Revision-Date: 2007-02-20 12:45+0900\n" --"Last-Translator: ByungHyun Choi\n" --"Language-Team: xfce4-users-kr-i18n \n" -+"Report-Msgid-Bugs-To: xfce4-users-kr-i18n \n" -+"POT-Creation-Date: 2012-02-27 16:45+0000\n" -+"PO-Revision-Date: 2012-02-28 06:40+0900\n" -+"Last-Translator: Seong-ho, Cho \n" -+"Language-Team: xfce4-users-kr-i18n \n" -+"Language: ko\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0;\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" --msgstr "Xfce4 네트웍 감시" -+msgstr "Xfce4-Netload-Plugin" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." - msgstr "알 수 없는 오류." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." --msgstr "Linux proc 장치 '/proc/net/dev'를 못 찾겠습니다." -+msgstr "Linux proc 장치 '/proc/net/dev'를 찾을 수 없습니다." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." --msgstr "네트웍 장치를 못 찾겠습니다." -+msgstr "인터페이스를 찾을 수 없습니다." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" --msgstr "<< %s >> (사망)" -+msgstr "<< %s >> (인터페이스 죽음)" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "<< %s >> (%s)\n" - "최근 %d 회 측정 평균:\n" --"들어오는 것: %s kByte/s\n" --"나가는 것: %s kByte/s\n" --"전부: %s kByte/s" -+"들어오는 것: %s/s\n" -+"나가는 것: %s/s\n" -+"전부: %s/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "IP 주소가 없습니다." - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: 초기화 도중 오류 발생:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "색상을 선택하십시오." - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "막대 색(들어오는 것):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "막대 색(나가는 것):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "최대 (들어오는 것):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "최대 (나가는 것)" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "막대 색(들어오는 것)(_N):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "막대 색(나가는 것)(_O):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "최대 (들어오는 것)(_M):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "최대 (나가는 것)(_U):" - --#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:948 -+#: ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" --msgstr "네트웍 감시:" -+msgstr "네트워크 감시기" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "표시:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "표시할 내용(_T):" - --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "네트웍 장치:" -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "네트워크 장치(_D):" - --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "검사 간격:" -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "업데이트 간격(_I):" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "초" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "최대치 자동 설정" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "kByte/s" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "최대치 자동 설정(_A)" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KiB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "다음으로 데이터 보이기(_P):" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "막대" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "값" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "막대와 값" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "값을 색상화(_C)" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" --msgstr "네트웍 상태 보임" -+msgstr "네트워크 상태를 보입니다" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GiB" -+ -+#~ msgid "kByte/s" -+#~ msgstr "kByte/s" - - #~ msgid "Netload" - #~ msgstr "네트워크 감시" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/lt.po xfce4-netload-plugin-1.1.0/po/lt.po ---- xfce4-netload-plugin-1.1.0.orig/po/lt.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/lt.po 2012-03-09 23:42:00.805896497 +0100 -@@ -2,118 +2,159 @@ - # Copyright (C) 2003 GPL - # This file is distributed under the same license as the xfce4-netload. - # Mantas , 2003. --# -+# Algimantas Margevičius , 2012. -+# - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload 1.0\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" --"PO-Revision-Date: 2003-08-15 11:08+0300\n" --"Last-Translator: Mantas \n" --"Language-Team: \n" -+"POT-Creation-Date: 2012-01-22 14:06+0000\n" -+"PO-Revision-Date: 2012-01-22 16:43+0200\n" -+"Last-Translator: Algimantas Margevičius \n" -+"Language-Team: Lietuvių <>\n" -+"Language: \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" -+"%100<10 || n%100>=20) ? 1 : 2)\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" --msgstr "" -+msgstr "Xfce4-Netload-įskiepis" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." --msgstr "" -+msgstr "Nežinoma klaida." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." --msgstr "" -+msgstr "Linux proc įrenginys „/proc/net/dev“ nerastas." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." --msgstr "" -+msgstr "Sąsaja nerasta." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" --msgstr "" -+msgstr "<< %s >> (Sąsaja neaktyvi)" - --#: ../panel-plugin/netload.c:228 --#, fuzzy, c-format -+#: ../panel-plugin/netload.c:249 -+#, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" --"Gaunami: %lld bitų/s\n" --"Siunčiami: %lld bitų/s\n" --"Viso: %lld bitų/s" -+"<< %s >> (%s)\n" -+"Vidurkis paskutinių %d matavimų:\n" -+"Gaunami: %s/s\n" -+"Siunčiami: %s/s\n" -+"Viso: %s/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" --msgstr "" -+msgstr "nėra IP adreso" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" -+"%s: Klaida inicijuojant:\n" -+"%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "Pasirinkite spalvą" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "Juostos spalva (gaunami duomenys)" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "Juostos spalva (siunčiami duomenys)" -- --#: ../panel-plugin/netload.c:843 --#, fuzzy --msgid "Maximum (incoming):" --msgstr "Juostos spalva (gaunami duomenys)" -- --#: ../panel-plugin/netload.c:844 --#, fuzzy --msgid "Maximum (outgoing):" --msgstr "Juostos spalva (siunčiami duomenys)" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "Juostos spalva (_gaunami duomenys):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "Juostos spalva (_siunčiami duomenys):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "Daugiausia (_gaunami duomenys):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "Daugiausia (_siunčiami duomenys):" - --#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 --#, fuzzy -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" --msgstr "Tinklo įrenginys" -+msgstr "Tinklo stebėjimas" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "Rodomas tekstas:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "Tinklo įrenginys" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "_Rodomas tekstas:" - --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "" -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "_Tinklo įrenginys:" - --#: ../panel-plugin/netload.c:946 --msgid "s" --msgstr "" -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "Atnaujinimo _intervalas:" - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "" -+#: ../panel-plugin/netload.c:1049 -+msgid "s" -+msgstr "s" - --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "_Automatinis didžiausias" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "_Atvaizduoti duomenis kaip:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "Juostos" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "Reikšmės" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "Juostos ir reikšmės" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "_Nuspalvoti reikšmes" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" --msgstr "" -+msgstr "Rodyti tinklo srautą" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GB" - - #~ msgid "Netload" - #~ msgstr "Tinklo apkrovimas" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/ru.po xfce4-netload-plugin-1.1.0/po/ru.po ---- xfce4-netload-plugin-1.1.0.orig/po/ru.po 2011-12-08 10:26:14.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/ru.po 2012-03-09 23:42:00.805896497 +0100 -@@ -8,43 +8,44 @@ - msgstr "" - "Project-Id-Version: xfce4-netload-plugin 0.3.3\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-01-05 02:01+0100\n" -+"POT-Creation-Date: 2012-02-16 11:39+0000\n" - "PO-Revision-Date: 2010-03-01 11:14+0200\n" - "Last-Translator: Dima Smirnov \n" - "Language-Team: Russian \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Language: ru\n" - --#: ../panel-plugin/netload.c:57 -+#: ../panel-plugin/netload.c:59 - msgid "Xfce4-Netload-Plugin" - msgstr "Модуль сетевой активности Xfce4" - --#: ../panel-plugin/netload.c:60 -+#: ../panel-plugin/netload.c:62 - msgid "Unknown error." - msgstr "Неизвестная ошибка." - --#: ../panel-plugin/netload.c:61 -+#: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." - msgstr "Не найдено устройство '/proc/net/dev'." - --#: ../panel-plugin/netload.c:62 -+#: ../panel-plugin/netload.c:64 - msgid "Interface was not found." - msgstr "Интерфейс не найден." - --#: ../panel-plugin/netload.c:144 -+#: ../panel-plugin/netload.c:162 - #, c-format - msgid "<< %s >> (Interface down)" - msgstr "Интерфейс << %s >> выключен" - --#: ../panel-plugin/netload.c:228 -+#: ../panel-plugin/netload.c:249 - #, c-format - msgid "" - "<< %s >> (%s)\n" - "Average of last %d measures:\n" --"Incoming: %s kByte/s\n" --"Outgoing: %s kByte/s\n" --"Total: %s kByte/s" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" - msgstr "" - "<< %s >> (%s)\n" - "Среднее значение %d \n" -@@ -53,70 +54,109 @@ - "Исходящий: %s кБайт/s\n" - "Всего: %s кБайт/s" - --#: ../panel-plugin/netload.c:230 -+#: ../panel-plugin/netload.c:251 - msgid "no IP address" - msgstr "нет IP-адреса" - --#: ../panel-plugin/netload.c:468 -+#: ../panel-plugin/netload.c:533 - #, c-format - msgid "" --"%s: Error in initalizing:\n" -+"%s: Error in initializing:\n" - "%s" - msgstr "" - "%s: Ошибка инициализации:\n" - "%s" - --#: ../panel-plugin/netload.c:773 -+#: ../panel-plugin/netload.c:872 - msgid "Select color" - msgstr "Выбор цвета" - --#: ../panel-plugin/netload.c:839 --msgid "Bar color (incoming):" --msgstr "Цвет индикатора (входящий):" -- --#: ../panel-plugin/netload.c:840 --msgid "Bar color (outgoing):" --msgstr "Цвет индикатора (исходящий):" -- --#: ../panel-plugin/netload.c:843 --msgid "Maximum (incoming):" --msgstr "Максимум (входящий):" -- --#: ../panel-plugin/netload.c:844 --msgid "Maximum (outgoing):" --msgstr "Максимум (исходящий):" -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "Цвет индикатора (вхо_дящий):" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "Цвет индикатора (исход_ящий):" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "Максимум (в_ходящий):" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "Максимум (_исходящий):" - --#: ../panel-plugin/netload.c:849 ../panel-plugin/netload.desktop.in.in.h:1 -+#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1 - msgid "Network Monitor" - msgstr "Сетевой монитор" - --#: ../panel-plugin/netload.c:878 --msgid "Text to display:" --msgstr "Подпись:" -- --#: ../panel-plugin/netload.c:909 --msgid "Network device:" --msgstr "Сетевое устройство:" -- --#: ../panel-plugin/netload.c:935 --msgid "Update interval:" --msgstr "Интервал обновления:" -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "_Подпись:" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "Сетевое _устройство:" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "Интервал о_бновления:" - --#: ../panel-plugin/netload.c:946 -+#: ../panel-plugin/netload.c:1049 - msgid "s" - msgstr "сек." - --#: ../panel-plugin/netload.c:959 --msgid "Automatic maximum" --msgstr "Автоматически определять максимум" -- --#: ../panel-plugin/netload.c:991 --msgid "kByte/s" --msgstr "кБайт/с" -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "_Автоматически определять максимум" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "КиБ/с" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "Представ_ление в виде:" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "Столбцов" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "Значений" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "Столбцов и значений" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "_Цветные значения" - - #: ../panel-plugin/netload.desktop.in.in.h:2 - msgid "Show network traffic" - msgstr "Показывать сетевой трафик" - -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "Б" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "КиБ" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "КиБ" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "ГиБ" -+ -+#~ msgid "kByte/s" -+#~ msgstr "кБайт/с" -+ - #~ msgid "Netload" - #~ msgstr "Монитор сетевой активности" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/zh_CN.po xfce4-netload-plugin-1.1.0/po/zh_CN.po ---- xfce4-netload-plugin-1.1.0.orig/po/zh_CN.po 2012-01-13 11:45:12.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/zh_CN.po 2012-03-09 23:42:00.805896497 +0100 -@@ -4,15 +4,15 @@ - # the xfce4-netload-plugin package. - # Vern Sun , 2007. - # Hunt Xu , 2009. --# Chipong Luo , 2011, 2012. -+# Chipong Luo , 2011, 2012. - # - msgid "" - msgstr "" - "Project-Id-Version: xfce4-netload-plugin\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-01-09 00:00+0000\n" -+"POT-Creation-Date: 2012-02-08 12:06+0000\n" - "PO-Revision-Date: 2009-11-09 19:47+0800\n" --"Last-Translator: Chipong Luo \n" -+"Last-Translator: Chipong Luo \n" - "Language-Team: Chinese (Simplified) \n" - "Language: zh_CN\n" - "MIME-Version: 1.0\n" -@@ -29,7 +29,7 @@ - - #: ../panel-plugin/netload.c:63 - msgid "Linux proc device '/proc/net/dev' not found." --msgstr "未找到 Linux 设备 ‘/proc/net/dev’。" -+msgstr "未找到 Linux proc 设备 ‘/proc/net/dev’。" - - #: ../panel-plugin/netload.c:64 - msgid "Interface was not found." -@@ -94,7 +94,7 @@ - - #: ../panel-plugin/netload.c:977 - msgid "_Text to display:" --msgstr "要显示的文本(_T)：" -+msgstr "要显示的文字(_T)：" - - #: ../panel-plugin/netload.c:1008 - msgid "Network _device:" -@@ -110,7 +110,7 @@ - - #: ../panel-plugin/netload.c:1062 - msgid "_Automatic maximum" --msgstr "自动调节最大值(_A)" -+msgstr "自动最大值(_A)" - - #: ../panel-plugin/netload.c:1096 - msgid "KiB/s" -@@ -154,4 +154,4 @@ - - #: ../panel-plugin/utils.c:78 - msgid "GiB" --msgstr "G" -\ Kein Zeilenumbruch am Dateiende. -+msgstr "G" -diff -Nur xfce4-netload-plugin-1.1.0.orig/po/zh_TW.po xfce4-netload-plugin-1.1.0/po/zh_TW.po ---- xfce4-netload-plugin-1.1.0.orig/po/zh_TW.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-netload-plugin-1.1.0/po/zh_TW.po 2012-03-09 23:42:00.805896497 +0100 -@@ -0,0 +1,157 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-netload-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2012-01-14 23:45+0000\n" -+"PO-Revision-Date: 2012-01-15 12:32+0800\n" -+"Last-Translator: Cheng-Chia Tseng \n" -+"Language-Team: chinese-l10n \n" -+"Language: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0\n" -+ -+#: ../panel-plugin/netload.c:59 -+msgid "Xfce4-Netload-Plugin" -+msgstr "Xfce4-Netload-Plugin" -+ -+#: ../panel-plugin/netload.c:62 -+msgid "Unknown error." -+msgstr "未知錯誤。" -+ -+#: ../panel-plugin/netload.c:63 -+msgid "Linux proc device '/proc/net/dev' not found." -+msgstr "找不到 Linux proc 裝置「/proc/net/dev」。" -+ -+#: ../panel-plugin/netload.c:64 -+msgid "Interface was not found." -+msgstr "找不到介面。" -+ -+#: ../panel-plugin/netload.c:162 -+#, c-format -+msgid "<< %s >> (Interface down)" -+msgstr "<< %s >> (介面 down)" -+ -+#: ../panel-plugin/netload.c:249 -+#, c-format -+msgid "" -+"<< %s >> (%s)\n" -+"Average of last %d measures:\n" -+"Incoming: %s/s\n" -+"Outgoing: %s/s\n" -+"Total: %s/s" -+msgstr "" -+"<< %s >> (%s)\n" -+"最近 %d 次測量平均：\n" -+"傳入：%s/s\n" -+"傳出：%s/s\n" -+"總計：%s/s" -+ -+#: ../panel-plugin/netload.c:251 -+msgid "no IP address" -+msgstr "無 IP 位址" -+ -+#: ../panel-plugin/netload.c:533 -+#, c-format -+msgid "" -+"%s: Error in initializing:\n" -+"%s" -+msgstr "" -+"%s：初始化發生錯誤：\n" -+"%s" -+ -+#: ../panel-plugin/netload.c:872 -+msgid "Select color" -+msgstr "選取色彩" -+ -+#: ../panel-plugin/netload.c:938 -+msgid "Bar color (i_ncoming):" -+msgstr "條色彩 (傳入)(_N)：" -+ -+#: ../panel-plugin/netload.c:939 -+msgid "Bar color (_outgoing):" -+msgstr "條色彩 (傳出)(_O)：" -+ -+#: ../panel-plugin/netload.c:942 -+msgid "Maximum (inco_ming):" -+msgstr "最大 (傳入)(_M)：" -+ -+#: ../panel-plugin/netload.c:943 -+msgid "Maximum (o_utgoing):" -+msgstr "最大 (傳出)(_U)：" -+ -+#: ../panel-plugin/netload.c:948 -+#: ../panel-plugin/netload.desktop.in.in.h:1 -+msgid "Network Monitor" -+msgstr "網路監視器" -+ -+#: ../panel-plugin/netload.c:977 -+msgid "_Text to display:" -+msgstr "要顯示的文字(_T)：" -+ -+#: ../panel-plugin/netload.c:1008 -+msgid "Network _device:" -+msgstr "網路裝置(_D)：" -+ -+#: ../panel-plugin/netload.c:1036 -+msgid "Update _interval:" -+msgstr "更新時間隔 (_I)：" -+ -+#: ../panel-plugin/netload.c:1049 -+msgid "s" -+msgstr "s" -+ -+#: ../panel-plugin/netload.c:1062 -+msgid "_Automatic maximum" -+msgstr "自動最大(_A)" -+ -+#: ../panel-plugin/netload.c:1096 -+msgid "KiB/s" -+msgstr "KiB/s" -+ -+#: ../panel-plugin/netload.c:1121 -+msgid "_Present data as:" -+msgstr "顯示資料為(_P)：" -+ -+#: ../panel-plugin/netload.c:1130 -+msgid "Bars" -+msgstr "條" -+ -+#: ../panel-plugin/netload.c:1131 -+msgid "Values" -+msgstr "值" -+ -+#: ../panel-plugin/netload.c:1132 -+msgid "Bars and values" -+msgstr "條與值" -+ -+#: ../panel-plugin/netload.c:1182 -+msgid "_Colorize values" -+msgstr "色彩化值(_C)" -+ -+#: ../panel-plugin/netload.desktop.in.in.h:2 -+msgid "Show network traffic" -+msgstr "顯示網路流量" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "B" -+msgstr "B" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "KiB" -+msgstr "KiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "MiB" -+msgstr "MiB" -+ -+#: ../panel-plugin/utils.c:78 -+msgid "GiB" -+msgstr "GiB" -+ diff --git a/xfce4-netload-plugin-1.2.0-infterface-length.patch b/xfce4-netload-plugin-1.2.0-infterface-length.patch deleted file mode 100644 index 6f10f73..0000000 --- a/xfce4-netload-plugin-1.2.0-infterface-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur xfce4-netload-plugin-1.2.0.orig/panel-plugin/net.h xfce4-netload-plugin-1.2.0/panel-plugin/net.h ---- xfce4-netload-plugin-1.2.0.orig/panel-plugin/net.h 2012-07-10 04:03:59.000000000 -0600 -+++ xfce4-netload-plugin-1.2.0/panel-plugin/net.h 2014-10-28 07:18:42.783328109 -0600 -@@ -29,7 +29,7 @@ - #define UP_UPDATE_INTERVAL 20 - #define IP_UPDATE_INTERVAL 20 - #define IP_ADDRESS_LENGTH 64 --#define INTERFACE_NAME_LENGTH 9 -+#define INTERFACE_NAME_LENGTH 19 - - #ifndef gettext_noop - #define gettext_noop(String) String -diff -Nur xfce4-netload-plugin-1.2.0.orig/panel-plugin/netload.c xfce4-netload-plugin-1.2.0/panel-plugin/netload.c ---- xfce4-netload-plugin-1.2.0.orig/panel-plugin/netload.c 2012-07-15 09:16:37.000000000 -0600 -+++ xfce4-netload-plugin-1.2.0/panel-plugin/netload.c 2014-10-28 07:18:42.784328091 -0600 -@@ -51,7 +51,7 @@ - static gchar* DEFAULT_COLOR[] = { "#FF4F00", "#FFE500" }; - - #define UPDATE_TIMEOUT 250 --#define MAX_LENGTH 10 -+#define MAX_LENGTH 20 - - #define IN 0 - #define OUT 1 -diff -Nur xfce4-netload-plugin-1.2.0.orig/panel-plugin/slurm.h xfce4-netload-plugin-1.2.0/panel-plugin/slurm.h ---- xfce4-netload-plugin-1.2.0.orig/panel-plugin/slurm.h 2012-07-10 04:03:59.000000000 -0600 -+++ xfce4-netload-plugin-1.2.0/panel-plugin/slurm.h 2014-10-28 07:18:42.784328091 -0600 -@@ -10,7 +10,7 @@ - #define _SLURM_H_ - - typedef struct IfData{ -- char if_name[10]; /* The device name given as start parameter*/ -+ char if_name[20]; /* The device name given as start parameter*/ - int if_speed; /* The Interface speed */ - char if_speedstring[12]; /* the measuring unit like Mbit, kbit */ - int if_id; /* The ID which the interface inside the OS has */ diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 724a9ae..ac369d4 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,7 +1,7 @@ %global minor_version 1.3 Name: xfce4-netload-plugin -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel @@ -57,6 +57,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Thu Feb 09 2017 Mukundan Ragavan - 1.3.1-1 +- Update to 1.3.1 (bugfix update) + * Sat Nov 05 2016 Kevin Fenzi - 1.3.0-1 - Update to 1.3.0. (gtk3) From 53e872b75528d81b24676d872d3a0e52edc8aab7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:03:51 +0000 Subject: [PATCH 24/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index ac369d4..dcd80da 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -57,6 +57,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Feb 09 2017 Mukundan Ragavan - 1.3.1-1 - Update to 1.3.1 (bugfix update) From ab7b465df0f295e0eb6f932a2ad2b32a1825b74c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:39:08 +0000 Subject: [PATCH 25/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index dcd80da..d2c6633 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -57,6 +57,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 9fb4df3d1a4e1339256f6202ab12b449a7dfda0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:34:16 +0000 Subject: [PATCH 26/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index d2c6633..af3dac1 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-netload-plugin Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -57,6 +57,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From c18b6685dd0e5ddf01cd835e0754dd667c5148ef Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:50:46 +0100 Subject: [PATCH 27/58] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- xfce4-netload-plugin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index af3dac1..1aaa172 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -9,7 +9,6 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.12.0 BuildRequires: pkgconfig(libxfce4ui-1) >= 4.12.0 From ff19702e2281af4fc798fc5efaf4c2171ad487c7 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Thu, 15 Feb 2018 00:52:39 -0200 Subject: [PATCH 28/58] - Spec cleanup / modernization --- xfce4-netload-plugin.spec | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 1aaa172..72ae43d 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,8 +1,9 @@ +%global _hardened_build 1 %global minor_version 1.3 Name: xfce4-netload-plugin Version: 1.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -21,41 +22,31 @@ A network-load monitor plugin for the Xfce panel. %prep -%setup -q +%autosetup %build %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install %find_lang %{name} chmod 755 %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.so rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS ChangeLog README +%license COPYING %{_datadir}/icons/hicolor/*/*/* %{_libdir}/xfce4/panel/plugins/libnetload.so %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Thu Feb 15 2018 Filipe Rosset - 1.3.1-5 +- Spec cleanup / modernization + * Fri Feb 09 2018 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From dc6637f38074e4f1729773644d97d0c1e9304178 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 29/58] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xfce4-netload-plugin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 72ae43d..8578817 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -11,6 +11,7 @@ License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +BuildRequires: gcc BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.12.0 BuildRequires: pkgconfig(libxfce4ui-1) >= 4.12.0 BuildRequires: libxml2-devel From dfa940e5bdadac6ea13469a2cb5c3ccbe4e7436f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:15:10 +0000 Subject: [PATCH 30/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 8578817..d14f3fd 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -3,7 +3,7 @@ Name: xfce4-netload-plugin Version: 1.3.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -45,6 +45,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 15 2018 Filipe Rosset - 1.3.1-5 - Spec cleanup / modernization From 82d09b04d187f2fb68ef31a56e3c5124968aa848 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 11 Aug 2018 19:50:09 -0400 Subject: [PATCH 31/58] Rebuilt (xfce 4.13) --- xfce4-netload-plugin.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index d14f3fd..dd85e0f 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,9 +1,10 @@ %global _hardened_build 1 %global minor_version 1.3 +%global xfceversion 4.13 Name: xfce4-netload-plugin Version: 1.3.1 -Release: 6%{?dist} +Release: 20%{?dist} Summary: Network-load monitor for the Xfce panel Group: User Interface/Desktops @@ -11,12 +12,13 @@ License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -BuildRequires: gcc -BuildRequires: pkgconfig(libxfce4panel-1.0) >= 4.12.0 -BuildRequires: pkgconfig(libxfce4ui-1) >= 4.12.0 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig(libxfce4panel-1.0) >= %{xfceversion} +BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion} BuildRequires: libxml2-devel BuildRequires: gettext, intltool -Requires: xfce4-panel >= 4.12.0 + +Requires: xfce4-panel >= %{xfceversion} %description A network-load monitor plugin for the Xfce panel. @@ -45,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Aug 11 2018 Mukundan Ragavan - 1.3.1-20 +- Rebuilt (xfce 4.13) + * Sat Jul 14 2018 Fedora Release Engineering - 1.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 1c68d2f2ade1e3db93549dec1f9b2e2dd0dff595 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 32/58] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xfce4-netload-plugin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index dd85e0f..a9fc91d 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -7,7 +7,6 @@ Version: 1.3.1 Release: 20%{?dist} Summary: Network-load monitor for the Xfce panel -Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 From 0cef5b9d241d2027e3052273a218bfee9b2cc00e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:20:12 +0000 Subject: [PATCH 33/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index a9fc91d..5b92f87 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.3.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -46,6 +46,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.3.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Aug 11 2018 Mukundan Ragavan - 1.3.1-20 - Rebuilt (xfce 4.13) From a9546f78cf721111e9a765869b494b9b0ebceafc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:07:21 +0000 Subject: [PATCH 34/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 5b92f87..1fc6bac 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.3.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -46,6 +46,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.3.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.3.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0e480edda4afe6683fc9ac07c086ec605ca55b0a Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 13 Aug 2019 17:43:50 -0400 Subject: [PATCH 35/58] Update to 1.3.2 --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 62fda1c..382baaa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.2.4.tar.bz2 /xfce4-netload-plugin-1.3.0.tar.bz2 /xfce4-netload-plugin-1.3.1.tar.bz2 +/xfce4-netload-plugin-1.3.2.tar.bz2 diff --git a/sources b/sources index ecf87a9..a872e47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-netload-plugin-1.3.1.tar.bz2) = 34144bf2d95f71276f8b5f4cf417d97d380233805c6fec1b7c559fee5b11468a421d3691230e01d89b40289d5ab22a472dcbef2a7ee0854abd7213e0ef0a3ef9 +SHA512 (xfce4-netload-plugin-1.3.2.tar.bz2) = 519d18b1212d7c43e016220f94c6d0dabcf676ebe4f32e4c166497e7292dd4b297836d37cbea08572ab77ecdda2461b081411a6cd37fe3a20013b4d77419ef93 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 1fc6bac..8381c53 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,10 +1,10 @@ %global _hardened_build 1 %global minor_version 1.3 -%global xfceversion 4.13 +%global xfceversion 4.14 Name: xfce4-netload-plugin -Version: 1.3.1 -Release: 22%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -46,6 +46,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Tue Aug 13 2019 Mukundan Ragavan - 1.3.2-1 +- Update to 1.3.2 + * Sat Jul 27 2019 Fedora Release Engineering - 1.3.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 09f5d26b51b94a2dfa49edbfbee23ca3882ce9f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:22:29 +0000 Subject: [PATCH 36/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 8381c53..e7a3759 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -46,6 +46,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 13 2019 Mukundan Ragavan - 1.3.2-1 - Update to 1.3.2 From ccbe06231fb64dc396ecfb15884b4d5c8e2fa271 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:40:08 +0000 Subject: [PATCH 37/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index e7a3759..e7ee2fe 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -46,6 +46,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 9fd33b6a1e1d177d4614809c6bff5a3b2d9d1331 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:20:09 +0000 Subject: [PATCH 38/58] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xfce4-netload-plugin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index e7ee2fe..8b47c0e 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -11,6 +11,7 @@ License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: pkgconfig(libxfce4panel-1.0) >= %{xfceversion} BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion} From 26978531c5424469a8be7a6828979cb8ff20d014 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:59:04 +0000 Subject: [PATCH 39/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 8b47c0e..27bd54c 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 62a1ebdd8de962972cd4e04756ef1b35f12ccf44 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 2 Feb 2021 21:35:06 -0500 Subject: [PATCH 40/58] Fix FTBFS/rebuild for xfce 4.16 --- xfce4-netload-plugin.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 27bd54c..5169228 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,10 +1,10 @@ %global _hardened_build 1 %global minor_version 1.3 -%global xfceversion 4.14 +%global xfceversion 4.16 Name: xfce4-netload-plugin Version: 1.3.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -13,8 +13,8 @@ Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_versio BuildRequires: make BuildRequires: gcc-c++ -BuildRequires: pkgconfig(libxfce4panel-1.0) >= %{xfceversion} -BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion} +BuildRequires: pkgconfig(libxfce4panel-2.0) >= %{xfceversion} +BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} BuildRequires: libxml2-devel BuildRequires: gettext, intltool @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Tue Feb 02 2021 Mukundan Ragavan - 1.3.2-5 +- Fix FTBFS/rebuild for xfce 4.16 + * Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 62d426af06ba845b9d1de8c76a533d2c8bf0ac8f Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 11 Mar 2021 18:14:33 -0500 Subject: [PATCH 41/58] Update to 1.4.0 --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 382baaa..f530cbe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.3.0.tar.bz2 /xfce4-netload-plugin-1.3.1.tar.bz2 /xfce4-netload-plugin-1.3.2.tar.bz2 +/xfce4-netload-plugin-1.4.0.tar.bz2 diff --git a/sources b/sources index a872e47..72c930c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-netload-plugin-1.3.2.tar.bz2) = 519d18b1212d7c43e016220f94c6d0dabcf676ebe4f32e4c166497e7292dd4b297836d37cbea08572ab77ecdda2461b081411a6cd37fe3a20013b4d77419ef93 +SHA512 (xfce4-netload-plugin-1.4.0.tar.bz2) = b9740251a81382f25ed3c89f10e842ef5432e36696df304a2b038d4a0a0a8c49d9988fff5274f3421870afe4f8cca1755222d6e7c514cea51e6eea7235a00382 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 5169228..8f1a16f 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,10 +1,10 @@ %global _hardened_build 1 -%global minor_version 1.3 +%global minor_version 1.4 %global xfceversion 4.16 Name: xfce4-netload-plugin -Version: 1.3.2 -Release: 5%{?dist} +Version: 1.4.0 +Release: 1%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Wed Mar 11 2021 Mukundan Ragavan - 1.4.0-1 +- Update to 1.4.0 + * Tue Feb 02 2021 Mukundan Ragavan - 1.3.2-5 - Fix FTBFS/rebuild for xfce 4.16 From a759480466f217c181b972be3f0ede97bbba1177 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:30:34 +0000 Subject: [PATCH 42/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 8f1a16f..86f8d8f 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Mar 11 2021 Mukundan Ragavan - 1.4.0-1 - Update to 1.4.0 From c260f1aabad77691e64d071f276861c1040824e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:02:03 +0000 Subject: [PATCH 43/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 86f8d8f..f4d7ef8 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From dc51c5dc26c031dfdab23265dd8eb57bd94fbae0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:03:31 +0000 Subject: [PATCH 44/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index f4d7ef8..383c541 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5facc11c117597e2889ceb3596642304ed1225c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:23:54 +0000 Subject: [PATCH 45/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-netload-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 383c541..e65a222 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,6 +47,9 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8eea241ed9760f5719e83024e37f6d249ba2ecba Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 3 May 2023 20:14:18 -0500 Subject: [PATCH 46/58] rpmautospec --- changelog | 200 +++++++++++++++++++++++++++++++++++++ xfce4-netload-plugin.spec | 203 +------------------------------------- 2 files changed, 202 insertions(+), 201 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9494b65 --- /dev/null +++ b/changelog @@ -0,0 +1,200 @@ +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Mar 11 2021 Mukundan Ragavan - 1.4.0-1 +- Update to 1.4.0 + +* Tue Feb 02 2021 Mukundan Ragavan - 1.3.2-5 +- Fix FTBFS/rebuild for xfce 4.16 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Aug 13 2019 Mukundan Ragavan - 1.3.2-1 +- Update to 1.3.2 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.3.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.3.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Aug 11 2018 Mukundan Ragavan - 1.3.1-20 +- Rebuilt (xfce 4.13) + +* Sat Jul 14 2018 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 15 2018 Filipe Rosset - 1.3.1-5 +- Spec cleanup / modernization + +* Fri Feb 09 2018 Fedora Release Engineering - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 09 2017 Mukundan Ragavan - 1.3.1-1 +- Update to 1.3.1 (bugfix update) + +* Sat Nov 05 2016 Kevin Fenzi - 1.3.0-1 +- Update to 1.3.0. (gtk3) + +* Fri Feb 05 2016 Fedora Release Engineering - 1.2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 28 2015 Kevin Fenzi 1.2.4-2 +- Rebuild for Xfce 4.12 + +* Sat Nov 22 2014 Kevin Fenzi 1.2.4-1 +- Update to 1.2.4. Fixes bug #1157193 + +* Sun Nov 16 2014 Kevin Fenzi 1.2.3-1 +- Update to 1.2.3 + +* Tue Nov 04 2014 Kevin Fenzi 1.2.2-1 +- Update to 1.2.2. + +* Tue Oct 28 2014 Kevin Fenzi 1.2.0-6 +- Add patch to increase network interface name length to 20. +- Fixes bug #1002329 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Jul 20 2012 Kevin Fenzi - 1.2.0-1 +- Update to 1.2.0 + +* Sun Apr 15 2012 Kevin Fenzi - 1.1.0-4 +- Rebuild for Xfce 4.10(pre2) + +* Thu Apr 05 2012 Kevin Fenzi - 1.1.0-3 +- Rebuild for Xfce 4.10 + +* Fri Mar 09 2012 Christoph Wickert - 1.1.0-2 +- Don't use libxecdir if possible + +* Sat Jan 14 2012 Christoph Wickert - 1.1.0-1 +- Update to 1.1.0 +- Add VCS key + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 1.0.0-4 +- Rebuild for new libpng + +* Wed Feb 09 2011 Fedora Release Engineering - 1.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Dec 10 2010 Christoph Wickert - 1.0.0-2 +- Rebuild for xfce4-panel 4.7 + +* Fri Dec 10 2010 Christoph Wickert - 1.0.0-1 +- Update to 1.0.0 +- Remove all patches (upstreamed) + +* Wed Sep 09 2009 Christoph Wickert - 0.4.0-12 +- Fix bar colors (#505214) + +* Mon Jul 27 2009 Fedora Release Engineering - 0.4.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Jun 29 2009 Christoph Wickert - 0.4.0-10 +- Bring back tooltips in GTK 2.16 with Dimitar Zhekov's patch (#508637) + +* Thu Feb 26 2009 Fedora Release Engineering - 0.4.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Christoph Wickert - 0.4.0-8 +- Rebuild for Xfce 4.6 (Beta 3) + +* Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-7 +- Autorebuild for GCC 4.3 + +* Sat Aug 25 2007 Christoph Wickert - 0.4.0-6 +- Rebuild for BuildID feature +- Update license tag + +* Sat Apr 28 2007 Christoph Wickert - 0.4.0-5 +- Rebuild for Xfce 4.4.1 + +* Mon Jan 22 2007 Christoph Wickert - 0.4.0-4 +- Rebuild for Xfce 4.4. +- Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2782) + +* Thu Oct 05 2006 Christoph Wickert - 0.4.0-3 +- Bump release for devel checkin. + +* Wed Sep 13 2006 Christoph Wickert - 0.4.0-2 +- BR perl(XML::Parser). + +* Mon Sep 04 2006 Christoph Wickert - 0.4.0-1 +- Update to 0.4 on XFCE 4.3.90.2. +- Remove bufsize-patch for now. + +* Mon Sep 04 2006 Christoph Wickert - 0.3.3-7 +- Mass rebuild for Fedora Core 6. + +* Tue Apr 11 2006 Christoph Wickert - 0.3.3-6 +- Require xfce4-panel. + +* Sat Feb 18 2006 Christoph Wickert - 0.3.3-5 +- Rebuild for Fedora Extras 5. +- Modify bufsize-patch. + +* Thu Feb 02 2006 Christoph Wickert - 0.3.3-4 +- Add bufsize-patch (#179686). + +* Thu Dec 01 2005 Christoph Wickert - 0.3.3-3 +- Add libxfcegui4-devel BuildReqs. +- Fix %%defattr. + +* Mon Nov 14 2005 Christoph Wickert - 0.3.3-2 +- Initial Fedora Extras version. +- Rebuild for XFCE 4.2.3. +- disable-static instead of removing .a files. + +* Fri Sep 23 2005 Christoph Wickert - 0.3.3-1.fc4.cw +- Updated to version 0.3.3. +- Add libxml2 BuildReqs. + +* Sat Jul 09 2005 Christoph Wickert - 0.3.2-1.fc4.cw +- Updated to version 0.3.2. +- Rebuild for Core 4. + +* Wed Apr 13 2005 Christoph Wickert - 0.3.1-1.fc3.cw +- Updated to version 0.3.1. + +* Wed Apr 13 2005 Christoph Wickert - 0.2.3-1.fc3.cw +- Initial RPM release. diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index e65a222..2d20bb6 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -4,7 +4,7 @@ Name: xfce4-netload-plugin Version: 1.4.0 -Release: 5%{?dist} +Release: %autorelease Summary: Network-load monitor for the Xfce panel License: GPLv2+ @@ -47,203 +47,4 @@ rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %{_datadir}/xfce4/panel/plugins/*.desktop %changelog -* Sat Jan 21 2023 Fedora Release Engineering - 1.4.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Mar 11 2021 Mukundan Ragavan - 1.4.0-1 -- Update to 1.4.0 - -* Tue Feb 02 2021 Mukundan Ragavan - 1.3.2-5 -- Fix FTBFS/rebuild for xfce 4.16 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 13 2019 Mukundan Ragavan - 1.3.2-1 -- Update to 1.3.2 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.3.1-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.3.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Aug 11 2018 Mukundan Ragavan - 1.3.1-20 -- Rebuilt (xfce 4.13) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 15 2018 Filipe Rosset - 1.3.1-5 -- Spec cleanup / modernization - -* Fri Feb 09 2018 Fedora Release Engineering - 1.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Feb 09 2017 Mukundan Ragavan - 1.3.1-1 -- Update to 1.3.1 (bugfix update) - -* Sat Nov 05 2016 Kevin Fenzi - 1.3.0-1 -- Update to 1.3.0. (gtk3) - -* Fri Feb 05 2016 Fedora Release Engineering - 1.2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 28 2015 Kevin Fenzi 1.2.4-2 -- Rebuild for Xfce 4.12 - -* Sat Nov 22 2014 Kevin Fenzi 1.2.4-1 -- Update to 1.2.4. Fixes bug #1157193 - -* Sun Nov 16 2014 Kevin Fenzi 1.2.3-1 -- Update to 1.2.3 - -* Tue Nov 04 2014 Kevin Fenzi 1.2.2-1 -- Update to 1.2.2. - -* Tue Oct 28 2014 Kevin Fenzi 1.2.0-6 -- Add patch to increase network interface name length to 20. -- Fixes bug #1002329 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Kevin Fenzi - 1.2.0-1 -- Update to 1.2.0 - -* Sun Apr 15 2012 Kevin Fenzi - 1.1.0-4 -- Rebuild for Xfce 4.10(pre2) - -* Thu Apr 05 2012 Kevin Fenzi - 1.1.0-3 -- Rebuild for Xfce 4.10 - -* Fri Mar 09 2012 Christoph Wickert - 1.1.0-2 -- Don't use libxecdir if possible - -* Sat Jan 14 2012 Christoph Wickert - 1.1.0-1 -- Update to 1.1.0 -- Add VCS key - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 1.0.0-4 -- Rebuild for new libpng - -* Wed Feb 09 2011 Fedora Release Engineering - 1.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Dec 10 2010 Christoph Wickert - 1.0.0-2 -- Rebuild for xfce4-panel 4.7 - -* Fri Dec 10 2010 Christoph Wickert - 1.0.0-1 -- Update to 1.0.0 -- Remove all patches (upstreamed) - -* Wed Sep 09 2009 Christoph Wickert - 0.4.0-12 -- Fix bar colors (#505214) - -* Mon Jul 27 2009 Fedora Release Engineering - 0.4.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Jun 29 2009 Christoph Wickert - 0.4.0-10 -- Bring back tooltips in GTK 2.16 with Dimitar Zhekov's patch (#508637) - -* Thu Feb 26 2009 Fedora Release Engineering - 0.4.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Christoph Wickert - 0.4.0-8 -- Rebuild for Xfce 4.6 (Beta 3) - -* Mon Feb 18 2008 Fedora Release Engineering - 0.4.0-7 -- Autorebuild for GCC 4.3 - -* Sat Aug 25 2007 Christoph Wickert - 0.4.0-6 -- Rebuild for BuildID feature -- Update license tag - -* Sat Apr 28 2007 Christoph Wickert - 0.4.0-5 -- Rebuild for Xfce 4.4.1 - -* Mon Jan 22 2007 Christoph Wickert - 0.4.0-4 -- Rebuild for Xfce 4.4. -- Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2782) - -* Thu Oct 05 2006 Christoph Wickert - 0.4.0-3 -- Bump release for devel checkin. - -* Wed Sep 13 2006 Christoph Wickert - 0.4.0-2 -- BR perl(XML::Parser). - -* Mon Sep 04 2006 Christoph Wickert - 0.4.0-1 -- Update to 0.4 on XFCE 4.3.90.2. -- Remove bufsize-patch for now. - -* Mon Sep 04 2006 Christoph Wickert - 0.3.3-7 -- Mass rebuild for Fedora Core 6. - -* Tue Apr 11 2006 Christoph Wickert - 0.3.3-6 -- Require xfce4-panel. - -* Sat Feb 18 2006 Christoph Wickert - 0.3.3-5 -- Rebuild for Fedora Extras 5. -- Modify bufsize-patch. - -* Thu Feb 02 2006 Christoph Wickert - 0.3.3-4 -- Add bufsize-patch (#179686). - -* Thu Dec 01 2005 Christoph Wickert - 0.3.3-3 -- Add libxfcegui4-devel BuildReqs. -- Fix %%defattr. - -* Mon Nov 14 2005 Christoph Wickert - 0.3.3-2 -- Initial Fedora Extras version. -- Rebuild for XFCE 4.2.3. -- disable-static instead of removing .a files. - -* Fri Sep 23 2005 Christoph Wickert - 0.3.3-1.fc4.cw -- Updated to version 0.3.3. -- Add libxml2 BuildReqs. - -* Sat Jul 09 2005 Christoph Wickert - 0.3.2-1.fc4.cw -- Updated to version 0.3.2. -- Rebuild for Core 4. - -* Wed Apr 13 2005 Christoph Wickert - 0.3.1-1.fc3.cw -- Updated to version 0.3.1. - -* Wed Apr 13 2005 Christoph Wickert - 0.2.3-1.fc3.cw -- Initial RPM release. +%autochangelog From 5ba051236172ac17377411c54e8a5531cb0b5c4c Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 3 May 2023 20:17:59 -0500 Subject: [PATCH 47/58] Update to v1.4.1 --- .gitignore | 1 + changelog | 2 +- sources | 2 +- xfce4-netload-plugin.spec | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f530cbe..59df57b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.3.1.tar.bz2 /xfce4-netload-plugin-1.3.2.tar.bz2 /xfce4-netload-plugin-1.4.0.tar.bz2 +/xfce4-netload-plugin-1.4.1.tar.bz2 diff --git a/changelog b/changelog index 9494b65..5a17fb9 100644 --- a/changelog +++ b/changelog @@ -10,7 +10,7 @@ * Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Wed Mar 11 2021 Mukundan Ragavan - 1.4.0-1 +* Thu Mar 11 2021 Mukundan Ragavan - 1.4.0-1 - Update to 1.4.0 * Tue Feb 02 2021 Mukundan Ragavan - 1.3.2-5 diff --git a/sources b/sources index 72c930c..69a291d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-netload-plugin-1.4.0.tar.bz2) = b9740251a81382f25ed3c89f10e842ef5432e36696df304a2b038d4a0a0a8c49d9988fff5274f3421870afe4f8cca1755222d6e7c514cea51e6eea7235a00382 +SHA512 (xfce4-netload-plugin-1.4.1.tar.bz2) = b860ab96e9a78099d0250f8bc5fe7a2e9fadaccf5edf6f67fa02a4c65ef0f1948fa8409506db873ff6a6fbfeb2df0c59fa1979b01ba6df5df6b645f4c842eeb9 diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 2d20bb6..641cf8f 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -3,7 +3,7 @@ %global xfceversion 4.16 Name: xfce4-netload-plugin -Version: 1.4.0 +Version: 1.4.1 Release: %autorelease Summary: Network-load monitor for the Xfce panel From 5bc0b3e150f331e032748f415ac8418ad944c12f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:46:29 +0000 Subject: [PATCH 48/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 45b1fe60b58c537fce9b618f8ee23da5e7dae853 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:35:53 +0000 Subject: [PATCH 49/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cdb329866e0e9507ebb7e7ddf987cb89e2621d0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:59:16 +0000 Subject: [PATCH 50/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 097b57a4fd546097237962291821df78bbbd6525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:51:21 +0200 Subject: [PATCH 51/58] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xfce4-netload-plugin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 641cf8f..98933db 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -7,7 +7,8 @@ Version: 1.4.1 Release: %autorelease Summary: Network-load monitor for the Xfce panel -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 From 7df34921eaf7c8bf6ab8f6f6983eac5383ce0dc2 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 22 Dec 2024 16:19:42 -0600 Subject: [PATCH 52/58] rebuild for xfce-4.20 From fc88aba4cd6da3510a7c49b39057538927bcc12b Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Wed, 25 Dec 2024 09:57:22 -0600 Subject: [PATCH 53/58] Update to v1.4.2 --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 59df57b..bbe47c8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.3.2.tar.bz2 /xfce4-netload-plugin-1.4.0.tar.bz2 /xfce4-netload-plugin-1.4.1.tar.bz2 +/xfce4-netload-plugin-1.4.2.tar.bz2 diff --git a/sources b/sources index 69a291d..28a9dfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-netload-plugin-1.4.1.tar.bz2) = b860ab96e9a78099d0250f8bc5fe7a2e9fadaccf5edf6f67fa02a4c65ef0f1948fa8409506db873ff6a6fbfeb2df0c59fa1979b01ba6df5df6b645f4c842eeb9 +SHA512 (xfce4-netload-plugin-1.4.2.tar.bz2) = d7214380f468cbf1dc266c6834b38ef060c24997553a96917836e46cade6c6f5eb3e8c4a9deee410e024a3c4ff4ab6520737619871462073ea2e442172c8934b diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index 98933db..cecc55f 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -3,7 +3,7 @@ %global xfceversion 4.16 Name: xfce4-netload-plugin -Version: 1.4.1 +Version: 1.4.2 Release: %autorelease Summary: Network-load monitor for the Xfce panel @@ -12,12 +12,12 @@ License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: pkgconfig(libxfce4panel-2.0) >= %{xfceversion} BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} BuildRequires: libxml2-devel -BuildRequires: gettext, intltool +BuildRequires: gettext Requires: xfce4-panel >= %{xfceversion} From 1cc72ef29ba274023a7c81c2dd98b1b4a18f49d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:44:26 +0000 Subject: [PATCH 54/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 51d55a4f98e9404d662a9077488e4ad55ba88c61 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 1 Jun 2025 19:01:34 -0500 Subject: [PATCH 55/58] Update to v1.5.0; switch to meson --- .gitignore | 1 + sources | 2 +- xfce4-netload-plugin.spec | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index bbe47c8..34b1348 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xfce4-netload-plugin-0.4.0.tar.bz2 /xfce4-netload-plugin-1.4.0.tar.bz2 /xfce4-netload-plugin-1.4.1.tar.bz2 /xfce4-netload-plugin-1.4.2.tar.bz2 +/xfce4-netload-plugin-1.5.0.tar.xz diff --git a/sources b/sources index 28a9dfa..53a1061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-netload-plugin-1.4.2.tar.bz2) = d7214380f468cbf1dc266c6834b38ef060c24997553a96917836e46cade6c6f5eb3e8c4a9deee410e024a3c4ff4ab6520737619871462073ea2e442172c8934b +SHA512 (xfce4-netload-plugin-1.5.0.tar.xz) = c115abaee2b99fb85f6f1d95d8d0dd02e8a3ef8789af85d75f3f0ab56fa59f5230e4babd065cad8c2c04f716681c1fc17a184009a89b259623ac45c8ebe5031b diff --git a/xfce4-netload-plugin.spec b/xfce4-netload-plugin.spec index cecc55f..190f13c 100644 --- a/xfce4-netload-plugin.spec +++ b/xfce4-netload-plugin.spec @@ -1,23 +1,23 @@ %global _hardened_build 1 -%global minor_version 1.4 -%global xfceversion 4.16 +%global minor_version 1.5 +%global xfceversion 4.20 Name: xfce4-netload-plugin -Version: 1.4.2 +Version: 1.5.0 Release: %autorelease Summary: Network-load monitor for the Xfce panel # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.xz BuildRequires: make BuildRequires: gcc-c++ BuildRequires: pkgconfig(libxfce4panel-2.0) >= %{xfceversion} BuildRequires: pkgconfig(libxfce4ui-2) >= %{xfceversion} BuildRequires: libxml2-devel -BuildRequires: gettext +BuildRequires: meson Requires: xfce4-panel >= %{xfceversion} @@ -29,19 +29,19 @@ A network-load monitor plugin for the Xfce panel. %autosetup %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install + %find_lang %{name} chmod 755 %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.so -rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libnetload.la %files -f %{name}.lang -%doc AUTHORS ChangeLog README +%doc AUTHORS README %license COPYING %{_datadir}/icons/hicolor/*/*/* %{_libdir}/xfce4/panel/plugins/libnetload.so From cf76071930908bd195322f0863d915dc3e60a355 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:47:24 +0000 Subject: [PATCH 56/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0ae0478cadec60e6d8eaec2e7164976148407c20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:37:24 +0000 Subject: [PATCH 57/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 9cfbf1d6bb90f57f5fdff861493d417c2101fdf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:10:31 +0000 Subject: [PATCH 58/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild