appcat
/
xfce4-speed-plugin
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

New version 0.2.0pre3 

Fixed a small bug, implemented configurable update interval and improved automatic maximum.


(Old svn revision: 300)
master
Bernhard Walle 2003-08-26 20:34:46 +00:00
parent bf777a0384
commit bee2164e55
12 changed files with 269 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-08-26 Bernhard Walle
* Implemented configurable update interval.
* Fixed small bug with operating system specific data initialization.
* Improved the automatic maximum function.
* Released 0.2.0pre3 which is the next test version for 0.2.0.
2003-08-25 Bernhard Walle 2003-08-25 Bernhard Walle
* Changed all static variables to a structure which is given the function * Changed all static variables to a structure which is given the function
as a parameter. This makes more than one instance of the plugin possible. as a parameter. This makes more than one instance of the plugin possible.

2
configure vendored
View File

@ -1748,7 +1748,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE=xfce4-netload-plugin PACKAGE=xfce4-netload-plugin
VERSION=0.2.0pre2 VERSION=0.2.0pre3
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View File

@ -9,7 +9,7 @@ AC_INIT([panel-plugin/netload.c])
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.0pre2]) AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.0pre3])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

4
panel-plugin/net.c
View File

@ -1,7 +1,7 @@
/* XFce 4 - Netload Plugin /* XFce 4 - Netload Plugin
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de> * Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
* *
* Id: $Id: net.c,v 1.2 2003/08/25 21:08:58 bwalle Exp $ * Id: $Id: net.c,v 1.3 2003/08/26 20:34:46 bwalle Exp $
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -85,6 +85,8 @@ void init_netload(netdata* data, const char* device)
data->backup_out = data->stats.tx_bytes; data->backup_out = data->stats.tx_bytes;
data->correct_interface = TRUE; data->correct_interface = TRUE;
init_osspecific( data );
} }

156
panel-plugin/netload.c
View File

@ -1,7 +1,7 @@
/* XFce 4 - Netload Plugin /* XFce 4 - Netload Plugin
* Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de> * Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
* *
* Id: $Id: netload.c,v 1.4 2003/08/25 21:08:58 bwalle Exp $ * Id: $Id: netload.c,v 1.5 2003/08/26 20:34:46 bwalle Exp $
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -44,7 +44,13 @@ extern xmlDocPtr xmlconfig;
/* Defaults */ /* Defaults */
#define DEFAULT_TEXT "Net" #define DEFAULT_TEXT "Net"
#define DEFAULT_DEVICE "eth0" #define DEFAULT_DEVICE "eth0"
#define DEFAULT_MAX 4096
#define INIT_MAX 4096
#define MINIMAL_MAX 1024
#define SHRINK_MAX 0.75
#define HISTSIZE_CALCULATE 4
#define HISTSIZE_STORE 20
static gchar* DEFAULT_COLOR[] = { "#FF4F00", "#FFE500" }; static gchar* DEFAULT_COLOR[] = { "#FF4F00", "#FFE500" };
@ -61,6 +67,7 @@ typedef struct
gboolean use_label; gboolean use_label;
gboolean auto_max; gboolean auto_max;
gulong max[SUM]; gulong max[SUM];
gint update_interval;
GdkColor color[SUM]; GdkColor color[SUM];
gchar *label_text; gchar *label_text;
gchar *network_device; gchar *network_device;
@ -74,7 +81,7 @@ typedef struct
GtkWidget *status[SUM]; GtkWidget *status[SUM];
GtkWidget *ebox; GtkWidget *ebox;
gulong history[SUM][4]; gulong history[SUM][HISTSIZE_STORE];
gulong net_max[SUM]; gulong net_max[SUM];
t_monitor_options options; t_monitor_options options;
@ -88,6 +95,9 @@ typedef struct
GtkBox *opt_hbox; GtkBox *opt_hbox;
GtkWidget *opt_use_label; GtkWidget *opt_use_label;
/* Update interval */
GtkWidget *update_spinner;
/* Network device */ /* Network device */
GtkWidget *net_entry; GtkWidget *net_entry;
@ -115,14 +125,16 @@ typedef struct
} t_global_monitor; } t_global_monitor;
static gint update_monitors(t_global_monitor *global)
static gboolean update_monitors(t_global_monitor *global)
{ {
char buffer[SUM+1][BUFSIZ]; char buffer[SUM+1][BUFSIZ];
gchar caption[BUFSIZ]; gchar caption[BUFSIZ];
gulong net[SUM+1]; gulong net[SUM+1];
gulong display[SUM+1]; gulong display[SUM+1], max;
guint64 histcalculate;
double temp; double temp;
gint i; gint i, j;
get_current_netload( &(global->monitor->data), &(net[IN]), &(net[OUT]), &(net[TOT]) ); get_current_netload( &(global->monitor->data), &(net[IN]), &(net[OUT]), &(net[TOT]) );
@ -137,13 +149,39 @@ static gint update_monitors(t_global_monitor *global)
global->monitor->history[i][0] = 0; global->monitor->history[i][0] = 0;
} }
display[i] = histcalculate = 0;
(global->monitor->history[i][0] + global->monitor->history[i][1] + for( j = 0; j < HISTSIZE_CALCULATE; j++ )
global->monitor->history[i][2] + global->monitor->history[i][3]) / 4; {
global->monitor->history[i][3] = global->monitor->history[i][2]; histcalculate += global->monitor->history[i][j];
global->monitor->history[i][2] = global->monitor->history[i][1]; }
global->monitor->history[i][1] = global->monitor->history[i][0]; display[i] = histcalculate / HISTSIZE_CALCULATE;
/* shift for next run */
for( j = HISTSIZE_STORE - 1; j > 0; j-- )
{
global->monitor->history[i][j] = global->monitor->history[i][j-1];
}
/* update maximum */
if( global->monitor->options.auto_max )
{
max = max_array( global->monitor->history[i], HISTSIZE_STORE );
if( display[i] > global->monitor->net_max[i] )
{
global->monitor->net_max[i] = display[i];
}
else if( max < global->monitor->net_max[i] * SHRINK_MAX
&& global->monitor->net_max[i] * SHRINK_MAX >= MINIMAL_MAX )
{
global->monitor->net_max[i] *= SHRINK_MAX;
}
}
if( i == IN )
{
fprintf( stderr, "Max = %lu\n", global->monitor->net_max[i] );
}
temp = (double)display[i] / global->monitor->net_max[i]; temp = (double)display[i] / global->monitor->net_max[i];
if( temp > 1 ) if( temp > 1 )
{ {
@ -155,26 +193,35 @@ static gint update_monitors(t_global_monitor *global)
} }
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(global->monitor->status[i]), temp); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(global->monitor->status[i]), temp);
/* update maximum */
if( global->monitor->options.auto_max && display[i] > global->monitor->net_max[i])
{
global->monitor->net_max[i] = display[i];
}
format_with_thousandssep( buffer[i], BUFSIZ, display[i] / 1024.0, 2 ); format_with_thousandssep( buffer[i], BUFSIZ, display[i] / 1024.0, 2 );
} }
format_with_thousandssep( buffer[TOT], BUFSIZ, (display[IN]+display[OUT]) / 1024, 2 ); format_with_thousandssep( buffer[TOT], BUFSIZ, (display[IN]+display[OUT]) / 1024, 2 );
g_snprintf(caption, sizeof(caption), g_snprintf(caption, sizeof(caption),
_("Average of last 4 measures:" _("Average of last %d measures:\n"
"\nIncoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"), "Incoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"),
buffer[IN], buffer[OUT], buffer[TOT]); HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->monitor->ebox), caption, NULL); gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->monitor->ebox), caption, NULL);
return TRUE; return TRUE;
} }
static void run_update (t_global_monitor *global)
{
if( global->timeout_id > 0 )
{
g_source_remove (global->timeout_id);
global->timeout_id = 0;
}
if (global->monitor->options.update_interval > 0)
{
global->timeout_id = g_timeout_add( global->monitor->options.update_interval,
(GtkFunction)update_monitors, global);
}
}
static t_global_monitor * monitor_new(void) static t_global_monitor * monitor_new(void)
{ {
t_global_monitor *global; t_global_monitor *global;
@ -198,6 +245,7 @@ static t_global_monitor * monitor_new(void)
global->monitor->options.network_device = g_strdup(DEFAULT_DEVICE); global->monitor->options.network_device = g_strdup(DEFAULT_DEVICE);
global->monitor->options.use_label = TRUE; global->monitor->options.use_label = TRUE;
global->monitor->options.auto_max = TRUE; global->monitor->options.auto_max = TRUE;
global->monitor->options.update_interval = UPDATE_TIMEOUT;
for (i = 0; i < SUM; i++) for (i = 0; i < SUM; i++)
{ {
@ -207,9 +255,9 @@ static t_global_monitor * monitor_new(void)
global->monitor->history[i][1] = 0; global->monitor->history[i][1] = 0;
global->monitor->history[i][2] = 0; global->monitor->history[i][2] = 0;
global->monitor->history[i][3] = 0; global->monitor->history[i][3] = 0;
global->monitor->net_max[i] = DEFAULT_MAX; global->monitor->net_max[i] = INIT_MAX;
global->monitor->options.max[i] = DEFAULT_MAX; global->monitor->options.max[i] = INIT_MAX;
} }
global->monitor->ebox = gtk_event_box_new(); global->monitor->ebox = gtk_event_box_new();
@ -353,11 +401,9 @@ static void monitor_set_orientation (Control * ctrl, int orientation)
gtk_container_add(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box)); gtk_container_add(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box));
gtk_widget_show(GTK_WIDGET(global->ebox)); gtk_widget_show(GTK_WIDGET(global->ebox));
global->timeout_id = g_timeout_add(UPDATE_TIMEOUT, run_update( global );
(GtkFunction)update_monitors, global);
} }
static gboolean monitor_control_new(Control *ctrl) static gboolean monitor_control_new(Control *ctrl)
{ {
t_global_monitor *global; t_global_monitor *global;
@ -433,7 +479,7 @@ static void setup_monitor(t_global_monitor *global)
/* Maximum */ /* Maximum */
if( global->monitor->options.auto_max ) if( global->monitor->options.auto_max )
{ {
global->monitor->net_max[i] = DEFAULT_MAX; global->monitor->net_max[i] = INIT_MAX;
} }
else else
{ {
@ -448,6 +494,8 @@ static void setup_monitor(t_global_monitor *global)
} }
init_netload( &(global->monitor->data), global->monitor->options.network_device); init_netload( &(global->monitor->data), global->monitor->options.network_device);
run_update( global );
} }
@ -515,6 +563,11 @@ static void monitor_read_config(Control *ctrl, xmlNodePtr node)
global->monitor->options.auto_max = atol(value); global->monitor->options.auto_max = atol(value);
g_free(value); g_free(value);
} }
if ((value = xmlGetProp(node, (const xmlChar *) "Update_Interval")))
{
global->monitor->options.update_interval = atoi(value);
g_free(value);
}
break; break;
} }
} }
@ -577,6 +630,9 @@ static void monitor_write_config(Control *ctrl, xmlNodePtr parent)
g_snprintf(value, 2, "%d", global->monitor->options.auto_max); g_snprintf(value, 2, "%d", global->monitor->options.auto_max);
xmlSetProp(root, "Auto_Max", value); xmlSetProp(root, "Auto_Max", value);
g_snprintf(value, 20, "%d", global->monitor->options.update_interval);
xmlSetProp(root, "Update_Interval", value);
root = xmlNewTextChild(parent, NULL, MONITOR_ROOT, NULL); root = xmlNewTextChild(parent, NULL, MONITOR_ROOT, NULL);
} }
@ -643,6 +699,11 @@ static void monitor_apply_options_cb(GtkWidget *button, t_global_monitor *global
g_strdup(gtk_entry_get_text(GTK_ENTRY(global->monitor->max_entry[i]))), g_strdup(gtk_entry_get_text(GTK_ENTRY(global->monitor->max_entry[i]))),
NULL ) * 1024; NULL ) * 1024;
} }
global->monitor->options.update_interval =
(gint)(gtk_spin_button_get_value(
GTK_SPIN_BUTTON(global->monitor->update_spinner) ) * 1000 + 0.5);
setup_monitor(global); setup_monitor(global);
} }
@ -716,7 +777,7 @@ static void max_label_toggled(GtkWidget *check_button, t_global_monitor *global)
/* reset maximum if necessary */ /* reset maximum if necessary */
if( global->monitor->options.auto_max ) if( global->monitor->options.auto_max )
{ {
global->monitor->net_max[i] = DEFAULT_MAX; global->monitor->net_max[i] = INIT_MAX;
} }
} }
@ -793,6 +854,8 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
GtkBox *vbox, *global_vbox, *net_hbox; GtkBox *vbox, *global_vbox, *net_hbox;
GtkWidget *device_label, *unit_label[SUM], *max_label[SUM]; GtkWidget *device_label, *unit_label[SUM], *max_label[SUM];
GtkWidget *sep1, *sep2; GtkWidget *sep1, *sep2;
GtkBox *update_hbox;
GtkWidget *update_label, *update_unit_label;
GtkWidget *color_label[SUM]; GtkWidget *color_label[SUM];
GtkWidget *align; GtkWidget *align;
GtkBox *color_hbox[SUM]; GtkBox *color_hbox[SUM];
@ -808,6 +871,7 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
N_("Maximum (outgoing):") N_("Maximum (outgoing):")
}; };
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
global = (t_global_monitor *)control->data; global = (t_global_monitor *)control->data;
global->opt_dialog = gtk_widget_get_toplevel(done); global->opt_dialog = gtk_widget_get_toplevel(done);
@ -833,6 +897,7 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
gtk_box_pack_start(GTK_BOX(global->monitor->opt_hbox), gtk_box_pack_start(GTK_BOX(global->monitor->opt_hbox),
GTK_WIDGET(global->monitor->opt_use_label), GTK_WIDGET(global->monitor->opt_use_label),
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_size_group_add_widget(sg, global->monitor->opt_use_label);
global->monitor->opt_entry = gtk_entry_new(); global->monitor->opt_entry = gtk_entry_new();
gtk_entry_set_max_length(GTK_ENTRY(global->monitor->opt_entry), gtk_entry_set_max_length(GTK_ENTRY(global->monitor->opt_entry),
@ -852,7 +917,7 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
global->monitor->options.use_label); global->monitor->options.use_label);
gtk_widget_set_sensitive(GTK_WIDGET(global->monitor->opt_entry), gtk_widget_set_sensitive(GTK_WIDGET(global->monitor->opt_entry),
global->monitor->options.use_label); global->monitor->options.use_label);
/* Network device */ /* Network device */
net_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5)); net_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox),
@ -874,12 +939,35 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
gtk_box_pack_start(GTK_BOX(net_hbox), GTK_WIDGET(global->monitor->net_entry), gtk_box_pack_start(GTK_BOX(net_hbox), GTK_WIDGET(global->monitor->net_entry),
FALSE, FALSE, 0); FALSE, FALSE, 0);
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget(sg, global->monitor->opt_use_label);
gtk_size_group_add_widget(sg, device_label); gtk_size_group_add_widget(sg, device_label);
gtk_widget_show_all(GTK_WIDGET(net_hbox)); gtk_widget_show_all(GTK_WIDGET(net_hbox));
/* Update timevalue */
update_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox),
GTK_WIDGET(update_hbox), FALSE, FALSE, 0);
update_label = gtk_label_new(_("Update interval:"));
gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0);
global->monitor->update_spinner = gtk_spin_button_new_with_range (0.1, 10.0, 0.05);
gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner),
global->monitor->options.update_interval / 1000.0 );
gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(global->monitor->update_spinner),
FALSE, FALSE, 0);
update_unit_label = gtk_label_new(_("ms"));
gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_unit_label),
FALSE, FALSE, 0);
gtk_widget_show_all(GTK_WIDGET(update_hbox));
gtk_size_group_add_widget(sg, update_label);
sep1 = gtk_hseparator_new(); sep1 = gtk_hseparator_new();
gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(sep1), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(sep1), FALSE, FALSE, 0);
gtk_widget_show(sep1); gtk_widget_show(sep1);
@ -911,7 +999,7 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
g_snprintf( buffer, BUFSIZ, "%.2f", global->monitor->options.max[i] / 1024.0 ); g_snprintf( buffer, BUFSIZ, "%.2f", global->monitor->options.max[i] / 1024.0 );
gtk_entry_set_text(GTK_ENTRY(global->monitor->max_entry[i]), buffer); gtk_entry_set_text(GTK_ENTRY(global->monitor->max_entry[i]), buffer);
gtk_entry_set_width_chars(GTK_ENTRY(global->monitor->max_entry[i]), 10); gtk_entry_set_width_chars(GTK_ENTRY(global->monitor->max_entry[i]), 7);
gtk_widget_show(global->monitor->max_entry[i]); gtk_widget_show(global->monitor->max_entry[i]);
gtk_box_pack_start(GTK_BOX(global->monitor->max_hbox[i]), GTK_WIDGET(global->monitor->max_entry[i]), gtk_box_pack_start(GTK_BOX(global->monitor->max_hbox[i]), GTK_WIDGET(global->monitor->max_entry[i]),
@ -920,8 +1008,6 @@ static void monitor_create_options(Control *control, GtkContainer *container, Gt
unit_label[i] = gtk_label_new(_("kByte/s")); unit_label[i] = gtk_label_new(_("kByte/s"));
gtk_box_pack_start(GTK_BOX(global->monitor->max_hbox[i]), GTK_WIDGET(unit_label[i]), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(global->monitor->max_hbox[i]), GTK_WIDGET(unit_label[i]), FALSE, FALSE, 0);
sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget(sg, global->monitor->opt_use_label);
gtk_size_group_add_widget(sg, max_label[i]); gtk_size_group_add_widget(sg, max_label[i]);
gtk_widget_show_all(GTK_WIDGET(global->monitor->max_hbox[i])); gtk_widget_show_all(GTK_WIDGET(global->monitor->max_hbox[i]));

30
panel-plugin/utils.c
View File

@ -30,6 +30,36 @@
#define BUFSIZ 512 #define BUFSIZ 512
#endif #endif
unsigned long min_array( unsigned long array[], int size )
{
int i;
unsigned long min = array[0];
for( i = 1; i < size; i++ )
{
if( array[i] < min )
{
min = array[i];
}
}
return min;
}
unsigned long max_array( unsigned long array[], int size )
{
int i;
unsigned long max = array[0];
for( i = 1; i < size; i++ )
{
if( array[i] > max )
{
max = array[i];
}
}
return max;
}
char* format_with_thousandssep( char* string, int stringsize, double number, int digits ) char* format_with_thousandssep( char* string, int stringsize, double number, int digits )
{ {

18
panel-plugin/utils.h
View File

@ -14,4 +14,22 @@
*/ */
char* format_with_thousandssep( char* string, int stringsize, double number, int digits ); char* format_with_thousandssep( char* string, int stringsize, double number, int digits );
/**
* Returns the minimum of the array. The array must contain at least one element.
* @param array the array which must contain at least one element.
* <code>NULL</code> is not allowed
* @param size the size of the array
* @return the minimum
*/
unsigned long min_array( unsigned long array[], int size );
/**
* Returns the maximum of the array. The array must contain at least one element.
* @param array the array which must contain at least one element.
* <code>NULL</code> is not allowed
* @param size the size of the array
* @return the minimum
*/
unsigned long max_array( unsigned long array[], int size );
#endif /* UTILS_H */ #endif /* UTILS_H */

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2003-08-25 Bernhard Walle
* Updated translation strings according to the new release.
* Updated German translation.
2003-08-24 Bernhard Walle 2003-08-24 Bernhard Walle
* Updated German translation. Now there are more configuration options * Updated German translation. Now there are more configuration options
available so there are also more translation strings. available so there are also more translation strings.

34
po/ca.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: XFce 4\n" "Project-Id-Version: XFce 4\n"
"POT-Creation-Date: 2003-08-25 22:58+0200\n" "POT-Creation-Date: 2003-08-26 22:25+0200\n"
"PO-Revision-Date: 2003-08-15 15:38+0100\n" "PO-Revision-Date: 2003-08-15 15:38+0100\n"
"Last-Translator: Carles Mu-oz Gorriz <carlesmu@internautas.org>\n" "Last-Translator: Carles Mu-oz Gorriz <carlesmu@internautas.org>\n"
"Language-Team: ca <LL@li.org>\n" "Language-Team: ca <LL@li.org>\n"
@ -14,10 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: panel-plugin/netload.c:170 #: panel-plugin/netload.c:202
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"Average of last 4 measures:\n" "Average of last %d measures:\n"
"Incoming: %s kByte/s\n" "Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n" "Outgoing: %s kByte/s\n"
"Total: %s kByte/s" "Total: %s kByte/s"
@ -26,44 +26,52 @@ msgstr ""
"Sortint: %lld bit/s\n" "Sortint: %lld bit/s\n"
"Total: %lld bit/s" "Total: %lld bit/s"
#: panel-plugin/netload.c:752 #: panel-plugin/netload.c:813
msgid "Select color" msgid "Select color"
msgstr "Seleccioneu el color" msgstr "Seleccioneu el color"
#: panel-plugin/netload.c:803 #: panel-plugin/netload.c:866
msgid "Bar color (incoming):" msgid "Bar color (incoming):"
msgstr "Color de la barra (sortint):" msgstr "Color de la barra (sortint):"
#: panel-plugin/netload.c:804 #: panel-plugin/netload.c:867
msgid "Bar color (outgoing):" msgid "Bar color (outgoing):"
msgstr "Color de la barra (entrant):" msgstr "Color de la barra (entrant):"
#: panel-plugin/netload.c:807 #: panel-plugin/netload.c:870
#, fuzzy #, fuzzy
msgid "Maximum (incoming):" msgid "Maximum (incoming):"
msgstr "Color de la barra (sortint):" msgstr "Color de la barra (sortint):"
#: panel-plugin/netload.c:808 #: panel-plugin/netload.c:871
#, fuzzy #, fuzzy
msgid "Maximum (outgoing):" msgid "Maximum (outgoing):"
msgstr "Color de la barra (entrant):" msgstr "Color de la barra (entrant):"
#: panel-plugin/netload.c:831 #: panel-plugin/netload.c:895
msgid "Text to display:" msgid "Text to display:"
msgstr "Text a mostrar:" msgstr "Text a mostrar:"
#: panel-plugin/netload.c:861 #: panel-plugin/netload.c:926
msgid "Network device:" msgid "Network device:"
msgstr "Dispositiu de xarxa" msgstr "Dispositiu de xarxa"
#: panel-plugin/netload.c:888 #: panel-plugin/netload.c:952
msgid "Update interval:"
msgstr ""
#: panel-plugin/netload.c:963
msgid "ms"
msgstr ""
#: panel-plugin/netload.c:976
msgid "Automatic maximum" msgid "Automatic maximum"
msgstr "" msgstr ""
#: panel-plugin/netload.c:920 #: panel-plugin/netload.c:1008
msgid "kByte/s" msgid "kByte/s"
msgstr "" msgstr ""
#: panel-plugin/netload.c:1010 #: panel-plugin/netload.c:1096
msgid "Netload" msgid "Netload"
msgstr "Càrrega de red" msgstr "Càrrega de red"

36
po/de.po
View File

@ -3,7 +3,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: de\n" "Project-Id-Version: de\n"
"POT-Creation-Date: 2003-08-25 22:58+0200\n" "POT-Creation-Date: 2003-08-26 22:25+0200\n"
"PO-Revision-Date: 2003-08-10 19:35+0200\n" "PO-Revision-Date: 2003-08-10 19:35+0200\n"
"Last-Translator: Bernhard Walle <bernhard.walle@gmx.de>\n" "Last-Translator: Bernhard Walle <bernhard.walle@gmx.de>\n"
"Language-Team: Deutsch <www.xfce.org>\n" "Language-Team: Deutsch <www.xfce.org>\n"
@ -11,55 +11,63 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0.2\n" "X-Generator: KBabel 1.0.2\n"
#: panel-plugin/netload.c:170 #: panel-plugin/netload.c:202
#, c-format #, c-format
msgid "" msgid ""
"Average of last 4 measures:\n" "Average of last %d measures:\n"
"Incoming: %s kByte/s\n" "Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n" "Outgoing: %s kByte/s\n"
"Total: %s kByte/s" "Total: %s kByte/s"
msgstr "" msgstr ""
"Durchschnitt der letzten 4 Messungen:\n" "Durchschnitt der letzten %d Messungen:\n"
"Eingehend: %s kByte/s\n" "Eingehend: %s kByte/s\n"
"Ausgehend: %s kByte/s\n" "Ausgehend: %s kByte/s\n"
"Gesamt: %s kByte/s" "Gesamt: %s kByte/s"
#: panel-plugin/netload.c:752 #: panel-plugin/netload.c:813
msgid "Select color" msgid "Select color"
msgstr "Farbe auswählen" msgstr "Farbe auswählen"
#: panel-plugin/netload.c:803 #: panel-plugin/netload.c:866
msgid "Bar color (incoming):" msgid "Bar color (incoming):"
msgstr "Balkenfarbe (eingehend):" msgstr "Balkenfarbe (eingehend):"
#: panel-plugin/netload.c:804 #: panel-plugin/netload.c:867
msgid "Bar color (outgoing):" msgid "Bar color (outgoing):"
msgstr "Balkenfarbe (ausgehend):" msgstr "Balkenfarbe (ausgehend):"
#: panel-plugin/netload.c:807 #: panel-plugin/netload.c:870
msgid "Maximum (incoming):" msgid "Maximum (incoming):"
msgstr "Maximum (eingehend):" msgstr "Maximum (eingehend):"
#: panel-plugin/netload.c:808 #: panel-plugin/netload.c:871
msgid "Maximum (outgoing):" msgid "Maximum (outgoing):"
msgstr "Maximum (ausgehend):" msgstr "Maximum (ausgehend):"
#: panel-plugin/netload.c:831 #: panel-plugin/netload.c:895
msgid "Text to display:" msgid "Text to display:"
msgstr "Angezeigter Text:" msgstr "Angezeigter Text:"
#: panel-plugin/netload.c:861 #: panel-plugin/netload.c:926
msgid "Network device:" msgid "Network device:"
msgstr "Netzwerkschnittstelle:" msgstr "Netzwerkschnittstelle:"
#: panel-plugin/netload.c:888 #: panel-plugin/netload.c:952
msgid "Update interval:"
msgstr "Aktualisierungsintervall:"
#: panel-plugin/netload.c:963
msgid "ms"
msgstr "ms"
#: panel-plugin/netload.c:976
msgid "Automatic maximum" msgid "Automatic maximum"
msgstr "Automatisches Maximum" msgstr "Automatisches Maximum"
#: panel-plugin/netload.c:920 #: panel-plugin/netload.c:1008
msgid "kByte/s" msgid "kByte/s"
msgstr "kByte/s" msgstr "kByte/s"
#: panel-plugin/netload.c:1010 #: panel-plugin/netload.c:1096
msgid "Netload" msgid "Netload"
msgstr "Netzlast" msgstr "Netzlast"

34
po/lt.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: xfce4-netload 1.0\n" "Project-Id-Version: xfce4-netload 1.0\n"
"POT-Creation-Date: 2003-08-25 22:58+0200\n" "POT-Creation-Date: 2003-08-26 22:25+0200\n"
"PO-Revision-Date: 2003-08-15 11:08+0300\n" "PO-Revision-Date: 2003-08-15 11:08+0300\n"
"Last-Translator: Mantas <zaz@xxx.lt>\n" "Last-Translator: Mantas <zaz@xxx.lt>\n"
"Language-Team: <komp_lt@konferencijos.lt>\n" "Language-Team: <komp_lt@konferencijos.lt>\n"
@ -14,10 +14,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: panel-plugin/netload.c:170 #: panel-plugin/netload.c:202
#, fuzzy, c-format #, fuzzy, c-format
msgid "" msgid ""
"Average of last 4 measures:\n" "Average of last %d measures:\n"
"Incoming: %s kByte/s\n" "Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n" "Outgoing: %s kByte/s\n"
"Total: %s kByte/s" "Total: %s kByte/s"
@ -26,44 +26,52 @@ msgstr ""
"Siunčiami: %lld bitų/s\n" "Siunčiami: %lld bitų/s\n"
"Viso: %lld bitų/s" "Viso: %lld bitų/s"
#: panel-plugin/netload.c:752 #: panel-plugin/netload.c:813
msgid "Select color" msgid "Select color"
msgstr "Pasirinkite spalvą" msgstr "Pasirinkite spalvą"
#: panel-plugin/netload.c:803 #: panel-plugin/netload.c:866
msgid "Bar color (incoming):" msgid "Bar color (incoming):"
msgstr "Juostos spalva (gaunami duomenys)" msgstr "Juostos spalva (gaunami duomenys)"
#: panel-plugin/netload.c:804 #: panel-plugin/netload.c:867
msgid "Bar color (outgoing):" msgid "Bar color (outgoing):"
msgstr "Juostos spalva (siunčiami duomenys)" msgstr "Juostos spalva (siunčiami duomenys)"
#: panel-plugin/netload.c:807 #: panel-plugin/netload.c:870
#, fuzzy #, fuzzy
msgid "Maximum (incoming):" msgid "Maximum (incoming):"
msgstr "Juostos spalva (gaunami duomenys)" msgstr "Juostos spalva (gaunami duomenys)"
#: panel-plugin/netload.c:808 #: panel-plugin/netload.c:871
#, fuzzy #, fuzzy
msgid "Maximum (outgoing):" msgid "Maximum (outgoing):"
msgstr "Juostos spalva (siunčiami duomenys)" msgstr "Juostos spalva (siunčiami duomenys)"
#: panel-plugin/netload.c:831 #: panel-plugin/netload.c:895
msgid "Text to display:" msgid "Text to display:"
msgstr "Rodomas tekstas:" msgstr "Rodomas tekstas:"
#: panel-plugin/netload.c:861 #: panel-plugin/netload.c:926
msgid "Network device:" msgid "Network device:"
msgstr "Tinklo įrenginys" msgstr "Tinklo įrenginys"
#: panel-plugin/netload.c:888 #: panel-plugin/netload.c:952
msgid "Update interval:"
msgstr ""
#: panel-plugin/netload.c:963
msgid "ms"
msgstr ""
#: panel-plugin/netload.c:976
msgid "Automatic maximum" msgid "Automatic maximum"
msgstr "" msgstr ""
#: panel-plugin/netload.c:920 #: panel-plugin/netload.c:1008
msgid "kByte/s" msgid "kByte/s"
msgstr "" msgstr ""
#: panel-plugin/netload.c:1010 #: panel-plugin/netload.c:1096
msgid "Netload" msgid "Netload"
msgstr "Tinklo apkrovimas" msgstr "Tinklo apkrovimas"

34
po/xfce4-netload.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2003-08-25 22:58+0200\n" "POT-Creation-Date: 2003-08-26 22:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -15,51 +15,59 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: panel-plugin/netload.c:170 #: panel-plugin/netload.c:202
#, c-format #, c-format
msgid "" msgid ""
"Average of last 4 measures:\n" "Average of last %d measures:\n"
"Incoming: %s kByte/s\n" "Incoming: %s kByte/s\n"
"Outgoing: %s kByte/s\n" "Outgoing: %s kByte/s\n"
"Total: %s kByte/s" "Total: %s kByte/s"
msgstr "" msgstr ""
#: panel-plugin/netload.c:752 #: panel-plugin/netload.c:813
msgid "Select color" msgid "Select color"
msgstr "" msgstr ""
#: panel-plugin/netload.c:803 #: panel-plugin/netload.c:866
msgid "Bar color (incoming):" msgid "Bar color (incoming):"
msgstr "" msgstr ""
#: panel-plugin/netload.c:804 #: panel-plugin/netload.c:867
msgid "Bar color (outgoing):" msgid "Bar color (outgoing):"
msgstr "" msgstr ""
#: panel-plugin/netload.c:807 #: panel-plugin/netload.c:870
msgid "Maximum (incoming):" msgid "Maximum (incoming):"
msgstr "" msgstr ""
#: panel-plugin/netload.c:808 #: panel-plugin/netload.c:871
msgid "Maximum (outgoing):" msgid "Maximum (outgoing):"
msgstr "" msgstr ""
#: panel-plugin/netload.c:831 #: panel-plugin/netload.c:895
msgid "Text to display:" msgid "Text to display:"
msgstr "" msgstr ""
#: panel-plugin/netload.c:861 #: panel-plugin/netload.c:926
msgid "Network device:" msgid "Network device:"
msgstr "" msgstr ""
#: panel-plugin/netload.c:888 #: panel-plugin/netload.c:952
msgid "Update interval:"
msgstr ""
#: panel-plugin/netload.c:963
msgid "ms"
msgstr ""
#: panel-plugin/netload.c:976
msgid "Automatic maximum" msgid "Automatic maximum"
msgstr "" msgstr ""
#: panel-plugin/netload.c:920 #: panel-plugin/netload.c:1008
msgid "kByte/s" msgid "kByte/s"
msgstr "" msgstr ""
#: panel-plugin/netload.c:1010 #: panel-plugin/netload.c:1096
msgid "Netload" msgid "Netload"
msgstr "" msgstr ""