* 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 d3f29692a6c5f6ea5efc876bd1445588e4bce804..6f4835ca7b6665a837a0f42f8e22ae532ef5b920 100644 (file)
--- 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 bfda7c3d8cb2efc04a47349dfe264d91ac7324ed..519945411ccf81358612fe4be3084765d19902e2 100644 (file)
--- 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 62ba9747e722c8cfea2f2f181546ea9fad894de4..0c5470830f691020e176cc34a57616639fb9ce00 100644 (file)
--- 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
 };