# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1182033325 0
# Node ID 17f7d072d471191b20ce54de9031512902ebe8c2
# Parent  dda542912f425f11facfe23610cff743db107b7a# Parent  16f3919b78f5aba8a6a2ceee7d6705bb92e89109
merge of '7d3f12af3273e9cf1afa4697ab2ef372d1589163'
     and 'c6d8bd5928a9e1ad839a8430194d3479dc4df0a8'

diff -r dda542912f42 -r 17f7d072d471 finch/gntft.c
--- a/finch/gntft.c	Sat Jun 16 22:24:00 2007 +0000
+++ b/finch/gntft.c	Sat Jun 16 22:35:25 2007 +0000
@@ -411,7 +411,7 @@
 
 	size_str      = purple_str_size_to_units(purple_xfer_get_size(xfer));
 	remaining_str = purple_str_size_to_units(purple_xfer_get_bytes_remaining(xfer));
-	kbsec = g_strdup_printf(_("%.2f KB/s"), kbps);
+	kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps);
 
 	gnt_tree_change_text(GNT_TREE(xfer_dialog->tree), xfer, COLUMN_PROGRESS,
 			g_ascii_dtostr(prog_str, sizeof(prog_str), purple_xfer_get_progress(xfer) * 100.));
diff -r dda542912f42 -r 17f7d072d471 libpurple/util.c
--- a/libpurple/util.c	Sat Jun 16 22:24:00 2007 +0000
+++ b/libpurple/util.c	Sat Jun 16 22:35:25 2007 +0000
@@ -3135,7 +3135,7 @@
 char *
 purple_str_size_to_units(size_t size)
 {
-	static const char *size_str[4] = { "bytes", "KB", "MB", "GB" };
+	static const char *size_str[4] = { "bytes", "KiB", "MiB", "GiB" };
 	float size_mag;
 	int size_index = 0;
 
diff -r dda542912f42 -r 17f7d072d471 pidgin/gtkft.c
--- a/pidgin/gtkft.c	Sat Jun 16 22:24:00 2007 +0000
+++ b/pidgin/gtkft.c	Sat Jun 16 22:35:25 2007 +0000
@@ -130,7 +130,7 @@
 	kbps    = (elapsed > 0 ? (kb_sent / elapsed) : 0);
 
 	if (kbsec != NULL) {
-		*kbsec = g_strdup_printf(_("%.2f KB/s"), kbps);
+		*kbsec = g_strdup_printf(_("%.2f KiB/s"), kbps);
 	}
 
 	if (time_elapsed != NULL)