dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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