nalika / rpms / grub2

Forked from rpms/grub2 2 years ago
Clone

Blame SOURCES/0043-Fix-several-translatable-strings.patch

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