From 8f95d002fecfe678edac810d221bead3121618e8 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 3 Mar 2012 13:09:14 +0100 Subject: [PATCH] * 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. --- ChangeLog | 12 ++++++++++++ grub-core/commands/date.c | 2 +- grub-core/commands/hdparm.c | 4 ++-- grub-core/commands/i386/cpuid.c | 4 +++- grub-core/commands/search_wrap.c | 25 +++++++++++++++---------- grub-core/disk/geli.c | 4 ++-- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 358027ae2..eb5b65c41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-03-03 Vladimir Serbinenko + + * 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 * grub-core/commands/gptsync.c: Fix typographic quoting. diff --git a/grub-core/commands/date.c b/grub-core/commands/date.c index d27162077..8e1f41f14 100644 --- 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 d1e2178c4..f97a90449 100644 --- 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 f2f250bb6..3b895cb93 100644 --- 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 51c0170ab..8981972f2 100644 --- 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 3a7929bf9..f9315df0d 100644 --- 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; }