* grub-core/commands/i386/pc/play.c: Improve TRANSLATORS comments.

	* grub-core/commands/regexp.c: Likewise.
	* grub-core/loader/i386/linux.c: Likewise.
	* grub-core/partmap/msdos.c: Likewise.
	* grub-core/script/execute.c: Likewise.
	* grub-core/term/gfxterm.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1b11461f37a36400ab945205839d3303abcde541..9c715594ce907d8921bec9e8a2b88887104f7470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/i386/pc/play.c: Improve TRANSLATORS comments.
+       * grub-core/commands/regexp.c: Likewise.
+       * grub-core/loader/i386/linux.c: Likewise.
+       * grub-core/partmap/msdos.c: Likewise.
+       * grub-core/script/execute.c: Likewise.
+       * grub-core/term/gfxterm.c: Likewise.
+
 2012-03-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Add variable parsing in $"..." and fix several mismatches with bash.

diff --git a/grub-core/commands/i386/pc/play.c b/grub-core/commands/i386/pc/play.c
index b14cf7c001d7b23b8e06b0a4342e22604757b6a6..10a018181c217ed15ac2356a06241f4daef30775 100644 (file)
--- a/grub-core/commands/i386/pc/play.c
+++ b/grub-core/commands/i386/pc/play.c
@@ -182,8 +182,10 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
 
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, 
-                      /* TRANSLATORS: it's musical notes, not the notes
-                         you take.  */
+                      /* TRANSLATORS: It's musical notes, not the notes
+                         you take. Play command expects arguments which can
+                         be either a filename or tempo+notes.
+                         This error happens if none is specified.  */
                       N_("filename or tempo and notes expected"));
 
   if (argc == 1)

diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
index e6d19e60daae9c4905a6fcc392a099e22ff942ac..b0706d06943a446197501e2668ce24b324c30da9 100644 (file)
--- a/grub-core/commands/regexp.c
+++ b/grub-core/commands/regexp.c
@@ -38,7 +38,8 @@ static const struct grub_arg_option options[] =
         them in variables. In other programs
         those components aree often referenced with
         back slash, e.g. \1. Compare
-        sed -e 's,\([a-z][a-z]*\),lowercase=\1,g'       
+        sed -e 's,\([a-z][a-z]*\),lowercase=\1,g'
+        The whole matching component is saved in VARNAME, not its number.
        */
       N_("Store matched component NUMBER in VARNAME."),
       N_("[NUMBER:]VARNAME"), ARG_TYPE_STRING },

diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index 1cef2106db39fc5313460a4c582ea08ac673a774..60caa9ec88c65d9378303555f117c0df2eef6976 100644 (file)
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -44,7 +44,10 @@ struct embed_signature
 const char message_warn[][200] = {
   /* TRANSLATORS: MBR gap and boot track is the same thing and is the space
      between MBR and first partitition. If your language translates well only
-     "boot track", you can just use it everywhere.  */
+     "boot track", you can just use it everywhere. Next two messages are about
+     RAID controllers/software bugs which GRUB has to live with. Please spread
+     the message that these are bugs in other software and not merely
+     suboptimal behaviour.  */
   [TYPE_RAID] = N_("Sector %llu is already in use by raid controller `%s';"
                   " avoiding it.  "
                   "Please ask the manufacturer not to store data in MBR gap"),

diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index bc82f56b7179dc99e950574fac605fd4e241216c..38481c0f49208eb72861f3088e797e092ae743cd 100644 (file)
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -170,8 +170,10 @@ grub_script_return (grub_command_t cmd __attribute__((unused)),
 
   if (! scope || argc > 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                      /* TRANSLATORS: it's about not being
-                         inside a function.  */
+                      /* TRANSLATORS: It's about not being
+                         inside a function. "return" can be used only
+                         in a function and this error occurs if it's used
+                         anywhere else.  */
                       N_("not in function body"));
 
   if (argc == 0)

diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
index 41fe431c850bb0dca1fc120dace46c514a60c841..1407109f23214ccdd8298e8eb4dbf831d2f5cc23 100644 (file)
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -1105,7 +1105,8 @@ static const struct grub_arg_option background_image_cmd_options[] =
        in left-top corner). Note that GRUB will accept only original
        keywords stretch and normal, not the translated ones.
        So please put both in translation
-       e.g. stretch(=%STRETCH%)|normal(=%NORMAL). Since many people
+       e.g. stretch(=%STRETCH%)|normal(=%NORMAL%).
+       The percents mark the translated version. Since many people
        may not know the word stretch or normal I recommend
        putting the translation either here or in "Background image mode."
        string.  */