From: Yves Blusseau <blusseau@zetam.org>
Date: Tue, 21 Sep 2010 09:17:54 +0000 (+0200)
Subject:     * util/grub-editenv.c: Update strings to avoid warnings when generating
X-Git-Tag: 1.99~442
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=934d7e44b259b42efa2721a39a95eb1961b60ea0;p=thirdparty%2Fgrub.git

* util/grub-editenv.c: Update strings to avoid warnings when generating
    grub.pot file.
    * util/grub-setup.c: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index d3f29692a..6f4835ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-21  Yves Blusseau  <blusseau@zetam.org>
+
+	* util/grub-editenv.c: Update strings to avoid warnings when generating
+	grub.pot file.
+	* util/grub-setup.c: Likewise.
+	
+
 2010-09-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Change version to 1.99~beta0.
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index bfda7c3d8..519945411 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -99,10 +99,10 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
 
 struct argp argp = {
   options, argp_parser, N_("FILENAME COMMAND"),
-  N_("\n\
-Tool to edit environment block.\n\
-\v\
-If FILENAME is '-', the default value %s is used.\n"),
+  "\n"N_("\
+Tool to edit environment block.")
+"\v"N_("\
+If FILENAME is '-', the default value %s is used."),
   NULL, help_filter, NULL
 };
 
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 62ba9747e..0c5470830 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -791,11 +791,11 @@ argp_parser (int key, char *arg, struct argp_state *state)
 
 static struct argp argp = {
   options, argp_parser, N_("DEVICE"),
-  N_("\n\
+  "\n"N_("\
 Set up images to boot from DEVICE.\n\
 \n\
-You should not normally run this program directly.  Use grub-install instead.\n\
-\v\
+You should not normally run this program directly.  Use grub-install instead.")
+"\v"N_("\
 DEVICE must be an OS device (e.g. /dev/sda1)."),
   NULL, help_filter, NULL
 };