Updating branch refs/heads/master
to c4e20903ba66005a87448b6d2939318a979fd868 (commit)
from 6f9ac6c1841b98d51f0658e4b263a4d653ebc8c6 (commit)
commit c4e20903ba66005a87448b6d2939318a979fd868
Author: Harald Judt <h.judt at gmx.at>
Date: Fri May 4 16:56:19 2012 +0200
Replace occurrences of MB with MiB as unit size.
Also, in newer kernels /dev/hda is deprecated, so use /dev/sda for an
up-to-date example.
panel-plugin/config_gui.c | 6 +++---
panel-plugin/main.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/config_gui.c b/panel-plugin/config_gui.c
index 95a589f..1fa64af 100644
--- a/panel-plugin/config_gui.c
+++ b/panel-plugin/config_gui.c
@@ -115,7 +115,7 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
_("Input the device name, then press <Enter>"),
NULL);
gtk_entry_set_max_length (GTK_ENTRY (wTF_Device), 64);
- gtk_entry_set_text (GTK_ENTRY (wTF_Device), _("/dev/hda1"));
+ gtk_entry_set_text (GTK_ENTRY (wTF_Device), _("/dev/sda1"));
eventbox1 = gtk_event_box_new ();
gtk_widget_show (eventbox1);
@@ -178,7 +178,7 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
wRB_IO = gtk_radio_button_new_with_mnemonic (NULL, _("I/O transfer"));
gtk_widget_show (wRB_IO);
gtk_box_pack_start (GTK_BOX (hbox2), wRB_IO, FALSE, FALSE, 0);
- gtk_tooltips_set_tip (tooltips, wRB_IO, _("MB transferred / second"),
+ gtk_tooltips_set_tip (tooltips, wRB_IO, _("MiB transferred / second"),
NULL);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (wRB_IO), wRB_IO_group);
wRB_IO_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (wRB_IO));
@@ -199,7 +199,7 @@ int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
gtk_widget_show (wHBox_MaxIO);
gtk_box_pack_start (GTK_BOX (vbox1), wHBox_MaxIO, TRUE, TRUE, 0);
- label3 = gtk_label_new (_("Max. I/O rate (MB/s) "));
+ label3 = gtk_label_new (_("Max. I/O rate (MiB/s) "));
gtk_widget_show (label3);
gtk_box_pack_start (GTK_BOX (wHBox_MaxIO), label3, FALSE, FALSE, 0);
gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_LEFT);
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 25046bf..9798062 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -218,7 +218,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
snprintf (acToolTips, sizeof(acToolTips), "%s\n"
"----------------\n"
- "I/O (MB/s)\n"
+ "I/O (MiB/s)\n"
" Read :%3.2f\n"
" Write :%3.2f\n"
" Total :%3.2f\n"