gvfs r1716 - in trunk: . hal

[sbacher svn gnome org]

Author: sbacher
Date: Tue Apr  1 17:18:04 2008
New Revision: 1716
URL: http://svn.gnome.org/viewvc/gvfs?rev=1716&view=rev

Log:
	* hal/ghalmount.c: (format_size_for_display), (do_update_from_hal):
	Use consistent translatable strings for mounts and volume (#525286)



Modified:
   trunk/ChangeLog
   trunk/hal/ghalmount.c

Modified: trunk/hal/ghalmount.c
==============================================================================
--- trunk/hal/ghalmount.c	(original)
+++ trunk/hal/ghalmount.c	Tue Apr  1 17:18:04 2008
@@ -365,17 +365,17 @@
   if (size < MEGABYTE_FACTOR)
     {
       displayed_size = (double) size / KILOBYTE_FACTOR;
-      str = g_strdup_printf (_("%.1f kB Media"), displayed_size);
+      str = g_strdup_printf (_("%.1f kB"), displayed_size);
     } 
   else if (size < GIGABYTE_FACTOR)
     {
       displayed_size = (double) size / MEGABYTE_FACTOR;
-      str = g_strdup_printf (_("%.1f MB Media"), displayed_size);
+      str = g_strdup_printf (_("%.1f MB"), displayed_size);
     } 
   else 
     {
       displayed_size = (double) size / GIGABYTE_FACTOR;
-      str = g_strdup_printf (_("%.1f GB Media"), displayed_size);
+      str = g_strdup_printf (_("%.1f GB"), displayed_size);
     }
   
   return str;
@@ -495,7 +495,14 @@
         name = g_strdup (get_disc_name (volume_disc_type, volume_disc_is_blank));
     }
   else
-    name = format_size_for_display (volume_size);
+    {
+      char *size;
+
+      size = format_size_for_display (volume_size);  
+      /* Translators: %s is the size of the mount (e.g. 512 MB) */
+      name = g_strdup_printf (_("%s Media"), size);
+      g_free (size);
+    }
 
   if (m->override_name != NULL)
     {