Merge lp:~stebalien/gnome-disk-utility/fix-units into lp:~ubuntu-desktop/gnome-disk-utility/ubuntu

[Steven]

[Jeremy Bicha (jbicha)]

Thanks very much for submitting this!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-06 21:30:07 +0000
+++ debian/changelog	2012-01-11 22:40:29 +0000
@@ -1,3 +1,10 @@
+gnome-disk-utility (3.0.2-2ubuntu3) precise; urgency=low
+
+  * debian/patches/05_change_speed_units_from_MB_to_Mb.patch:
+    - Change {G,M,K}B/s to {G,M,K}b/s (LP: #631638)
+
+ -- Steven Allen <[e-mail]>  Wed, 11 Jan 2012 17:07:43 -0500
+
 gnome-disk-utility (3.0.2-2ubuntu2) precise; urgency=low
 
   * debian/rules: we need to actually install /usr/lib/gnome-disk-utility

=== added file 'debian/patches/05_change_speed_units_from_MB_to_Mb.patch'
--- debian/patches/05_change_speed_units_from_MB_to_Mb.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/05_change_speed_units_from_MB_to_Mb.patch	2012-01-11 22:40:29 +0000
@@ -0,0 +1,34 @@
+From: Robert Roth <[e-mail]>
+Subject: [PATCH] Fix connection speed unit to use Mb instead of MB(bug 663272)
+Origin: other, http://bugzilla-attachments.gnome.org/attachment.cgi?id=200556
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=663272
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-disk-utility/+bug/631638
+
+---
+ src/gdu/gdu-util.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gdu/gdu-util.c b/src/gdu/gdu-util.c
+index e27c331..c6241d7 100644
+--- a/src/gdu/gdu-util.c
++++ b/src/gdu/gdu-util.c
+@@ -885,13 +885,13 @@ gdu_util_get_speed_for_display (guint64 speed)
+ 
+         if (speed < 1000 * 1000) {
+                 displayed_speed = (double) speed / 1000.0;
+-                str = g_strdup_printf (_("%.1f kB/s"), displayed_speed);
++                str = g_strdup_printf (_("%.1f kb/s"), displayed_speed);
+         } else if (speed < 1000 * 1000 * 1000) {
+                 displayed_speed = (double) speed / 1000.0 / 1000.0;
+-                str = g_strdup_printf (_("%.1f MB/s"), displayed_speed);
++                str = g_strdup_printf (_("%.1f Mb/s"), displayed_speed);
+         } else {
+                 displayed_speed = (double) speed / 1000.0 / 1000.0 / 1000.0;
+-                str = g_strdup_printf (_("%.1f GB/s"), displayed_speed);
++                str = g_strdup_printf (_("%.1f Gb/s"), displayed_speed);
+         }
+ 
+         return str;
+-- 
+1.7.5.4
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-11 14:01:00 +0000
+++ debian/patches/series	2012-01-11 22:40:29 +0000
@@ -3,4 +3,4 @@
 01_delay_autostart.patch
 02_lpi.patch
 04_nodisplay_autostart.patch
-
+05_change_speed_units_from_MB_to_Mb.patch