* grub-core/commands/videoinfo.c (hook): Replace "Direct"

	with "Direct color" and "Packed" with "Packed pixel".
	(grub_cmd_videoinfo): Simplify legend.

diff --git a/ChangeLog b/ChangeLog
index a3b920ee3fbccb1df5849d21e9192d641585f80e..f532d805333459b32f256d2b4772301593846ba3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/videoinfo.c (hook): Replace "Direct"
+       with "Direct color" and "Packed" with "Packed pixel".
+       (grub_cmd_videoinfo): Simplify legend.
+
 2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/getroot.c (grub_make_system_path_relative_to_its_root): Fix

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index 358cd80ea17cf95d094794914f6a518fc804845c..025943157e1cdeafaa51938d35dab3f572d4b1d0 100644 (file)
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -55,7 +55,7 @@ hook (const struct grub_video_mode_info *info)
     grub_xputs (_("Text-only "));
   /* Show mask and position details for direct color modes.  */
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB)
-    grub_printf_ (N_("Direct, mask: %d/%d/%d/%d  pos: %d/%d/%d/%d"),
+    grub_printf_ (N_("Direct color, mask: %d/%d/%d/%d  pos: %d/%d/%d/%d"),
                  info->red_mask_size,
                  info->green_mask_size,
                  info->blue_mask_size,
@@ -65,7 +65,7 @@ hook (const struct grub_video_mode_info *info)
                  info->blue_field_pos,
                  info->reserved_field_pos);
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
-    grub_xputs (_("Packed "));
+    grub_xputs (_("Packed pixel "));
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_YUV)
     grub_xputs (_("YUV "));
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PLANAR)
@@ -75,6 +75,8 @@ hook (const struct grub_video_mode_info *info)
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_CGA)
     grub_xputs (_("CGA "));
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_NONCHAIN4)
+    /* TRANSLATORS: Non-chain 4 is a 256-color planar
+       (unchained) video memory mode.  */
     grub_xputs (_("Non-chain 4 "));
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP)
     grub_xputs (_("Monochrome "));
@@ -150,8 +152,7 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
   id = grub_video_get_driver_id ();
 
   grub_puts_ (N_("List of supported video modes:"));
-  grub_puts_ (N_("Legend: P=Packed pixel, D=Direct color, "
-                "mask/pos=R/G/B/reserved"));
+  grub_puts_ (N_("Legend: mask/position=red/green/blue/reserved"));
 
   FOR_VIDEO_ADAPTERS (adapter)
   {