dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone
f725e3
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
f725e3
From: Vladimir Serbinenko <phcoder@gmail.com>
f725e3
Date: Fri, 24 Jan 2014 18:20:27 +0100
f725e3
Subject: [PATCH] Fix several translatable strings.
f725e3
MIME-Version: 1.0
f725e3
Content-Type: text/plain; charset=UTF-8
f725e3
Content-Transfer-Encoding: 8bit
f725e3
f725e3
	Suggested by: D. Prévot.
f725e3
---
f725e3
 grub-core/commands/syslinuxcfg.c | 2 +-
f725e3
 grub-core/loader/arm64/linux.c   | 2 +-
f725e3
 util/grub-syslinux2cfg.c         | 4 ++--
f725e3
 ChangeLog                        | 6 ++++++
f725e3
 4 files changed, 10 insertions(+), 4 deletions(-)
f725e3
f725e3
diff --git a/grub-core/commands/syslinuxcfg.c b/grub-core/commands/syslinuxcfg.c
f725e3
index a4bfc40b6d2..00ae113c5a7 100644
f725e3
--- a/grub-core/commands/syslinuxcfg.c
f725e3
+++ b/grub-core/commands/syslinuxcfg.c
f725e3
@@ -50,7 +50,7 @@ static const struct grub_arg_option options[] =
f725e3
      N_("root directory of the syslinux disk [default=/]."),
f725e3
      N_("DIR"), ARG_TYPE_STRING},
f725e3
     {"cwd",  'c', 0,
f725e3
-     N_("current directory of the syslinux [default is parent directory of input file]."),
f725e3
+     N_("current directory of syslinux [default is parent directory of input file]."),
f725e3
      N_("DIR"), ARG_TYPE_STRING},
f725e3
     {"isolinux",     'i',  0, N_("assume input is an isolinux configuration file."), 0, 0},
f725e3
     {"pxelinux",     'p',  0, N_("assume input is a pxelinux configuration file."), 0, 0},
f725e3
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
f725e3
index 75ad871a81c..65129c21a8d 100644
f725e3
--- a/grub-core/loader/arm64/linux.c
f725e3
+++ b/grub-core/loader/arm64/linux.c
f725e3
@@ -120,7 +120,7 @@ check_kernel (struct grub_arm64_linux_kernel_header *lh)
f725e3
 
f725e3
   if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC)
f725e3
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
f725e3
-		       N_("plain Image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
f725e3
+		       N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
f725e3
 
f725e3
   grub_dprintf ("linux", "UEFI stub kernel:\n");
f725e3
   grub_dprintf ("linux", "text_offset = 0x%012llx\n",
f725e3
diff --git a/util/grub-syslinux2cfg.c b/util/grub-syslinux2cfg.c
f725e3
index 5e944c20a83..f4fda6db9bb 100644
f725e3
--- a/util/grub-syslinux2cfg.c
f725e3
+++ b/util/grub-syslinux2cfg.c
f725e3
@@ -66,10 +66,10 @@ static struct argp_option options[] = {
f725e3
    N_("root directory of the syslinux disk [default=/]."), 0},
f725e3
   {"target-cwd",  'T', N_("DIR"), 0,
f725e3
    N_(
f725e3
-      "current directory of the syslinux as it will be seen on runtime  [default is parent directory of input file]."
f725e3
+      "current directory of syslinux as it will be seen on runtime  [default is parent directory of input file]."
f725e3
 ), 0},
f725e3
   {"cwd",  'c', N_("DIR"), 0,
f725e3
-   N_("current directory of the syslinux [default is parent directory of input file]."), 0},
f725e3
+   N_("current directory of syslinux [default is parent directory of input file]."), 0},
f725e3
 
f725e3
   {"output",  'o', N_("FILE"), 0, N_("write output to FILE [default=stdout]."), 0},
f725e3
   {"isolinux",     'i', 0,      0, N_("assume input is an isolinux configuration file."), 0},
f725e3
diff --git a/ChangeLog b/ChangeLog
f725e3
index 20e8baaa23e..e149d8ef33d 100644
f725e3
--- a/ChangeLog
f725e3
+++ b/ChangeLog
f725e3
@@ -1,3 +1,9 @@
f725e3
+2014-01-24  Vladimir Serbinenko  <phcoder@gmail.com>
f725e3
+
f725e3
+	Fix several translatable strings.
f725e3
+
f725e3
+	Suggested by: D. Prévot.
f725e3
+
f725e3
 2014-01-24  Vladimir Serbinenko  <phcoder@gmail.com>
f725e3
 
f725e3
 	* util/grub-install.c: List available targets.