* grub-core/commands/date.c (GRUB_MOD_INIT): Remove non-uniform

	"Command for ...".
	* grub-core/commands/hdparm.c (options): Use "Display" rather than
	"Check" since we don't check anything.
	* grub-core/commands/i386/cpuid.c (options): Clarify that long mode
	is 64-bit one.
	* grub-core/commands/search_wrap.c (options): Clarify the conditions.
	* grub-core/disk/geli.c (grub_md_sha256_real): Fix typo.
	(grub_md_sha512_real): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 358027ae2824e03d73f956c75577f173080f49b8..eb5b65c414e1fcb281b6873cc52ec53e1b82b688 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/date.c (GRUB_MOD_INIT): Remove non-uniform
+       "Command for ...".
+       * grub-core/commands/hdparm.c (options): Use "Display" rather than
+       "Check" since we don't check anything.
+       * grub-core/commands/i386/cpuid.c (options): Clarify that long mode
+       is 64-bit one.
+       * grub-core/commands/search_wrap.c (options): Clarify the conditions.
+       * grub-core/disk/geli.c (grub_md_sha256_real): Fix typo.
+       (grub_md_sha512_real): Likewise.
+
 2012-03-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/gptsync.c: Fix typographic quoting.

diff --git a/grub-core/commands/date.c b/grub-core/commands/date.c
index d27162077fc28443512cd14c140b9004818f7e6d..8e1f41f141bf203a801986442db2dcec6104fa7e 100644 (file)
--- a/grub-core/commands/date.c
+++ b/grub-core/commands/date.c
@@ -139,7 +139,7 @@ GRUB_MOD_INIT(date)
   cmd =
     grub_register_command ("date", grub_cmd_date,
                           N_("[[year-]month-day] [hour:minute[:second]]"),
-                          N_("Command to display/set current datetime."));
+                          N_("Display/set current datetime."));
 }
 
 GRUB_MOD_FINI(date)

diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c
index d1e2178c4411a64ff7f8aebd325ea8cd320bd6f9..f97a9044934e24f4bc214e24dc3e5db3679077a1 100644 (file)
--- a/grub-core/commands/hdparm.c
+++ b/grub-core/commands/hdparm.c
@@ -33,10 +33,10 @@ static const struct grub_arg_option options[] = {
   {"apm",             'B', 0, N_("Set Advanced Power Management\n"
                              "(1=low, ..., 254=high, 255=off)."),
                              0, ARG_TYPE_INT},
-  {"power",           'C', 0, N_("Check power mode."), 0, ARG_TYPE_NONE},
+  {"power",           'C', 0, N_("Display power mode."), 0, ARG_TYPE_NONE},
   {"security-freeze", 'F', 0, N_("Freeze ATA security settings until reset."),
                              0, ARG_TYPE_NONE},
-  {"health",          'H', 0, N_("Check SMART health status."), 0, ARG_TYPE_NONE},
+  {"health",          'H', 0, N_("Display SMART health status."), 0, ARG_TYPE_NONE},
   {"aam",             'M', 0, N_("Set Automatic Acoustic Management\n"
                              "(0=off, 128=quiet, ..., 254=fast)."),
                              0, ARG_TYPE_INT},

diff --git a/grub-core/commands/i386/cpuid.c b/grub-core/commands/i386/cpuid.c
index f2f250bb6931b9c6f0a0563bd1a68f49d9a8b915..3b895cb937202027781d6a53236f1d69ed64363e 100644 (file)
--- a/grub-core/commands/i386/cpuid.c
+++ b/grub-core/commands/i386/cpuid.c
@@ -36,7 +36,9 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static const struct grub_arg_option options[] =
   {
-    {"long-mode", 'l', 0, N_("Check for long mode flag (default)."), 0, 0},
+    /* TRANSLATORS: "(default)" at the end means that this option is used if
+       no argument is specified.  */
+    {"long-mode", 'l', 0, N_("Check if CPU supports 64-bit (long) mode (default)."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 

diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index 51c0170abc5be1a014e03249979de6565510344e..8981972f2560d0056e3fa232e12fc44b8e046854 100644 (file)
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -43,20 +43,25 @@ static const struct grub_arg_option options[] =
      N_("First try the device HINT. If HINT ends in comma, "
        "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
     {"hint-ieee1275",   0, GRUB_ARG_OPTION_REPEATABLE,
-     N_("First try the device HINT if on IEEE1275. If HINT ends in comma, "
-       "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+     N_("First try the device HINT if currently running on IEEE1275. "
+       "If HINT ends in comma, also try subpartitions"),
+     N_("HINT"), ARG_TYPE_STRING},
     {"hint-bios",   0, GRUB_ARG_OPTION_REPEATABLE,
-     N_("First try the device HINT if on BIOS. If HINT ends in comma, "
-       "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+     N_("First try the device HINT if on currently running BIOS. "
+       "If HINT ends in comma, also try subpartitions"),
+     N_("HINT"), ARG_TYPE_STRING},
     {"hint-baremetal",   0, GRUB_ARG_OPTION_REPEATABLE,
-     N_("First try the device HINT. If HINT ends in comma, "
-       "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+     N_("First try the device HINT if direct hardware access is suported. "
+       "If HINT ends in comma, also try subpartitions"),
+     N_("HINT"), ARG_TYPE_STRING},
     {"hint-efi",   0, GRUB_ARG_OPTION_REPEATABLE,
-     N_("First try the device HINT if on EFI. If HINT ends in comma, "
-       "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+     N_("First try the device HINT if on currently running EFI. "
+       "If HINT ends in comma, also try subpartitions"),
+     N_("HINT"), ARG_TYPE_STRING},
     {"hint-arc",   0, GRUB_ARG_OPTION_REPEATABLE,
-     N_("First try the device HINT if on ARC. If HINT ends in comma, "
-       "also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
+     N_("First try the device HINT if on currently running ARC."
+       " If HINT ends in comma, also try subpartitions"),
+     N_("HINT"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 

diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c
index 3a7929bf9f81a2fce94a55592c51e5fb0e5fdcaa..f9315df0de5872ae0cb658d3c4c87cdd65e3303d 100644 (file)
--- a/grub-core/disk/geli.c
+++ b/grub-core/disk/geli.c
@@ -72,7 +72,7 @@ grub_md_sha256_real (void)
   const gcry_md_spec_t *ret;
   ret = grub_crypto_lookup_md_by_name ("sha256");
   if (!ret)
-    grub_util_error ("%s", _("Coulnd't load sha256"));
+    grub_util_error ("%s", _("Couldn't load sha256"));
   return ret;
 }
 
@@ -82,7 +82,7 @@ grub_md_sha512_real (void)
   const gcry_md_spec_t *ret;
   ret = grub_crypto_lookup_md_by_name ("sha512");
   if (!ret)
-    grub_util_error ("%s", _("Coulnd't load sha512"));
+    grub_util_error ("%s", _("Couldn't load sha512"));
   return ret;
 }