diff --git a/ChangeLog b/ChangeLog
index cf68d3f16..e6d3e13ea 100644
--- 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 44f76e24a..fb4c65ac9 100644
--- 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 5f30109f9..7cc7a4134 100644
--- 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 7a5a5161b..e2a988a50 100644
--- 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 c49d33472..798cbde56 100644
--- 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 0b7438f98..78a0fe195 100644
--- 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 3f052aaf3..bc97269ed 100644
--- 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 a954f1bfa..92e1b2942 100644
--- 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