* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Add TRANSLATORS

	comments.
	* grub-core/gdb/gdb.c (grub_cmd_gdbstub): Likewise.
	(GRUB_MOD_INIT): Likewise.
	* grub-core/loader/i386/linux.c (grub_cmd_linux): Clarify that it's
	VGA mode.
	* grub-core/net/net.c (grub_net_route_address): Add TRANSLATORS
	comments.
	* util/grub-install.in (usage): Likewise.
	Spell ID in whole letters.
	Add missing ending dot.
	Quote variables.
	* util/grub-reboot.in: Fix capitalisation.
	* util/grub-set-default.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index cf68d3f166a84e0d4df605569ae56fce247b361f..e6d3e13ea48b0a51956f2849d2831f4fb7f645e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Add TRANSLATORS
+       comments.
+       * grub-core/gdb/gdb.c (grub_cmd_gdbstub): Likewise.
+       (GRUB_MOD_INIT): Likewise.
+       * grub-core/loader/i386/linux.c (grub_cmd_linux): Clarify that it's
+       VGA mode.
+       * grub-core/net/net.c (grub_net_route_address): Add TRANSLATORS
+       comments.
+       * util/grub-install.in (usage): Likewise.
+       Spell ID in whole letters.
+       Add missing ending dot.
+       Quote variables.
+       * util/grub-reboot.in: Fix capitalisation.
+       * util/grub-set-default.in: Likewise.
+
 2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/getroot.c (strip_extra_slashes) [CYGWIN]: #ifdef-out.

diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
index 44f76e24af302a2c8830a894819cc446d278c971..fb4c65ac919c999ec968fba75dbf9c159f6d33b9 100644 (file)
--- a/grub-core/fs/zfs/zfsinfo.c
+++ b/grub-core/fs/zfs/zfsinfo.c
@@ -153,10 +153,17 @@ print_vdev_info (char *nvlist, int tab)
          print_tabs (tab);
          if (!child)
            {
+             /* TRANSLATORS: it's the element carying the number %d, not
+                total element number. And the number itself is fine,
+                only the element isn't.
+             */
              grub_printf_ (N_("Mirror element number %d isn't correct\n"), i);
              continue;
            }
 
+         /* TRANSLATORS: it's the element carying the number %d, not
+            total element number. This is used in enumeration
+            "Element number 1", "Element number 2", ... */
          grub_printf_ (N_("Mirror element number %d:\n"), i);
          print_vdev_info (child, tab + 1);
 

diff --git a/grub-core/gdb/gdb.c b/grub-core/gdb/gdb.c
index 5f30109f9eb888af139a6d52edb5c1f9f6f3a26a..7cc7a413453cbcb056bbe97713e754dee6c9e11c 100644 (file)
--- a/grub-core/gdb/gdb.c
+++ b/grub-core/gdb/gdb.c
@@ -43,6 +43,8 @@ grub_cmd_gdbstub (struct grub_command *cmd __attribute__ ((unused)),
   if (!port)
     return grub_errno;
   grub_gdb_port = port;
+  /* TRANSLATORS: at this position GRUB waits for the user to do an action
+     in remote debugger, namely to tell it to establish connection.  */
   grub_puts_ (N_("Now connect the remote debugger, please."));
   grub_gdb_breakpoint ();
   return 0;
@@ -76,6 +78,9 @@ GRUB_MOD_INIT (gdb)
   cmd = grub_register_command ("gdbstub", grub_cmd_gdbstub,
                               N_("PORT"), N_("Start GDB stub on given port"));
   cmd_break = grub_register_command ("gdbstub_break", grub_cmd_gdb_break,
+                                    /* TRANSLATORS: this refers to triggering
+                                       a breakpoint so that the user will land
+                                       into GDB.  */
                                     0, N_("Break into GDB"));
   cmd_stop = grub_register_command ("gdbstub_stop", grub_cmd_gdbstop,
                                    0, N_("Stop GDB stub"));

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 7a5a5161b4eab9ef0c671b1c5557b40378008d1f..e2a988a50e49c17bff3254b10e39188a02d31d24 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -834,7 +834,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
                vid_mode > GRUB_VESA_MODE_TABLE_END)
              {
                grub_env_set ("gfxpayload", "text");
-               grub_printf_ (N_("%s is deprecated. Mode %d isn't recognized. "
+               grub_printf_ (N_("%s is deprecated. VGA mode %d isn't recognized. "
                                 "Use set gfxpayload=WIDTHxHEIGHT[xDEPTH] "
                                 "before linux command instead.\n"),
                             argv[i], vid_mode);

diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index c49d3347249c8686045d47bc88b32de6065a308c..798cbde56cacde01a81c24c1afeaceb078cd2eab 100644 (file)
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -645,6 +645,9 @@ grub_net_route_address (grub_net_network_level_address_t addr,
     }
 
   return grub_error (GRUB_ERR_NET_ROUTE_LOOP,
+                    /* TRANSLATORS: route loop is a condition when e.g.
+                       to contact server A you need to go through B
+                       and to contact B you need to go through A.  */
                     N_("route loop detected"));
 }
 

diff --git a/util/grub-install.in b/util/grub-install.in
index 0b7438f985f543ca55a746c0f78b7976fced7872..78a0fe19572796e37ecf20f952e982a083c23a57 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -90,7 +90,10 @@ usage () {
     printf "  --modules=%-14s%s\n" "$(gettext "MODULES")" "$(gettext "pre-load specified modules MODULES")"
     dirmsg="$(gettext_printf "install GRUB images under the directory DIR/%s instead of the %s directory" "@grubdirname@" "$grubdir")"
     printf "  --boot-directory=%-7s%s\n" "$(gettext "DIR")" "$dirmsg"
-    printf "  --target=%-15s%s\n" "$(gettext "TARGET")" "$(gettext "install GRUB for TARGET platform [default=current]")"
+    # TRANSLATORS: "TARGET" as in "target platform
+    target_trans="$(gettext "TARGET")"
+    # TRANSLATORS: "current" refers to the platform user's currently running on
+    printf "  --target=%-15s%s\n" "$target_trans" "$(gettext "install GRUB for TARGET platform [default=current]")"
     printf "  --directory=%-12s%s\n" "$(gettext "DIR")" "$(gettext "use GRUB images from DIR. Takes precedence over target")"
     printf "  --grub-setup=%-11s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-setup")"
     printf "  --grub-mkimage=%-9s%s\n" "$(gettext "FILE")" "$(gettext "use FILE as grub-mkimage")"
@@ -99,7 +102,7 @@ usage () {
     printf "  --allow-floppy          %s\n" "$(gettext "make the drive also bootable as floppy (default for fdX devices). May break on some BIOSes.")"
     printf "  --recheck               %s\n" "$(gettext "delete device map if it already exists")"
     printf "  --force                 %s\n" "$(gettext "install even if problems are detected")"
-    printf "  --force-file-id         %s\n" "$(gettext "use ID file even if UUID is available")"
+    printf "  --force-file-id         %s\n" "$(gettext "use identifier file even if UUID is available")"
     printf "  --disk-module=%-10s%s\n" "$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target")"
     printf "  --no-nvram              %s\n" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
     printf "  --removable             %s\n" "$(gettext "the installation device is removable. This option is only available on EFI.")"
@@ -613,7 +616,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
        elif [ x"$grub_modinfo_platform" = xloongson ] || [ x"$grub_modinfo_platform" = xqemu ] || [ x"$grub_modinfo_platform" = xcoreboot ] || [ x"$grub_modinfo_platform" = xmultiboot ] || [ x"$grub_modinfo_platform" = xqemu-mips ]; then
             hints="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=baremetal_hints --device`"
        else
-            gettext "No hints available for your platform. Expect reduced performance" 1>&2
+            gettext "No hints available for your platform. Expect reduced performance." 1>&2
            echo 1>&2
            hints=
         fi
@@ -746,7 +749,7 @@ elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ]
     fi
 elif [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = xmips-arc ]; then
     dvhtool -d "${install_device}" --unix-to-vh "{grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" grub
-    gettext "You will have to set SystemPartition and OSLoader manually." 1>&2
+    gettext "You will have to set \`SystemPartition' and \`OSLoader' manually." 1>&2
     echo 1>&2
 elif [ x"$grub_modinfo_platform" = xefi ]; then
     cp "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/core.${imgext}" "${efidir}/${efi_file}"

diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index 3f052aaf3e58aa7003c7f1833f2a35494f52be20..bc97269ed830e716d6c649c7c791759ed145cee1 100644 (file)
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -111,7 +111,7 @@ do
 done
 
 if test "x$entry" = x; then
-    gettext "menu entry not specified." 1>&2
+    gettext "Menu entry not specified." 1>&2
     echo >&2
     usage
     exit 1

diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index a954f1bfa37c5d7689772b654fbf17b9cd3911f1..92e1b2942b00dbae90e9886a94ff9dee502edd67 100644 (file)
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -111,7 +111,7 @@ do
 done
 
 if test "x$entry" = x; then
-    gettext "menu entry not specified." 1>&2
+    gettext "Menu entry not specified." 1>&2
     echo >&2
     usage
     exit 1