diff --git a/ChangeLog b/ChangeLog
index ec639e40b..a88d90609 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/acpihalt.c: Add TRANSLATORS comments.
+	* grub-core/commands/keystatus.c: Likewise.
+	* grub-core/commands/loadenv.c: Likewise.
+	* grub-core/commands/probe.c: Likewise.
+	* grub-core/commands/regexp.c: Likewise.
+	* grub-core/commands/true.c: Likewise.
+	* grub-core/commands/videoinfo.c: Likewise.
+	* grub-core/disk/cryptodisk.c: Likewise.
+	* grub-core/disk/ldm.c: Likewise.
+	* grub-core/disk/loopback.c: Likewise.
+	* grub-core/disk/luks.c: Likewise.
+	* grub-core/fs/zfs/zfsinfo.c: Likewise.
+	* grub-core/kern/disk.c: Likewise.
+	* grub-core/kern/emu/hostdisk.c: Likewise.
+
 2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Add TRANSLATORS comment.
diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
index b9092cc10..3db224d4d 100644
--- a/grub-core/commands/acpihalt.c
+++ b/grub-core/commands/acpihalt.c
@@ -355,6 +355,7 @@ grub_acpi_halt (void)
 
   grub_millisleep (1500);
 
+  /* TRANSLATORS: It's computer shutdown using ACPI, not disabling ACPI.  */
   grub_puts_ (N_("ACPI shutdown failed"));
 }
 #endif
diff --git a/grub-core/commands/keystatus.c b/grub-core/commands/keystatus.c
index 6f706ae40..0925c6a0f 100644
--- a/grub-core/commands/keystatus.c
+++ b/grub-core/commands/keystatus.c
@@ -27,6 +27,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static const struct grub_arg_option options[] =
   {
+    /* TRANSLATORS: "Check" in a sense that if this key is pressed then
+       "true" is returned, otherwise "false".  */
     {"shift", 's', 0, N_("Check Shift key."), 0, 0},
     {"ctrl", 'c', 0, N_("Check Control key."), 0, 0},
     {"alt", 'a', 0, N_("Check Alt key."), 0, 0},
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 4dcb5d49a..18ebb7eab 100644
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -32,6 +32,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 static const struct grub_arg_option options[] =
   {
+    /* TRANSLATORS: This option is used to override default filename
+       for loading and storing environment.  */
     {"file", 'f', 0, N_("Specify filename."), 0, ARG_TYPE_PATHNAME},
     {0, 0, 0, 0, 0, 0}
   };
diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c
index 695ce307a..b19bd3e73 100644
--- a/grub-core/commands/probe.c
+++ b/grub-core/commands/probe.c
@@ -38,6 +38,8 @@ static const struct grub_arg_option options[] =
   {
     {"set",             's', 0,
      N_("Set a variable to return value."), "VAR", ARG_TYPE_STRING},
+    /* TRANSLATORS: It's a driver that is currently in use to access
+       the diven disk.  */
     {"driver",		'd', 0, N_("Determine driver."), 0, 0},
     {"partmap",		'p', 0, N_("Determine partition map type."), 0, 0},
     {"fs",		'f', 0, N_("Determine filesystem type."), 0, 0},
diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
index 35844c5e1..e6d19e60d 100644
--- a/grub-core/commands/regexp.c
+++ b/grub-core/commands/regexp.c
@@ -146,7 +146,11 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(regexp)
 {
-  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp, 0, N_("REGEXP STRING"),
+  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp, 0,
+			      /* TRANSLATORS: This are two arguments. So it's
+				 two separate units to translate and pay
+				 attention not to reverse them.  */
+			      N_("REGEXP STRING"),
 			      N_("Test if REGEXP matches STRING."), options);
 
   /* Setup GRUB script wildcard translator.  */
diff --git a/grub-core/commands/true.c b/grub-core/commands/true.c
index b76682d06..8cbba6583 100644
--- a/grub-core/commands/true.c
+++ b/grub-core/commands/true.c
@@ -46,13 +46,11 @@ GRUB_MOD_INIT(true)
 {
   cmd_true =
     grub_register_command ("true", grub_cmd_true,
-			   /* TRANSLATORS: it's imperative, not
-			      infinitive.  */
+			   /* TRANSLATORS: it's a command description.  */
 			   0, N_("Do nothing, successfully."));
   cmd_false =
     grub_register_command ("false", grub_cmd_false,
-			   /* TRANSLATORS: it's imperative, not
-			      infinitive.  */
+			   /* TRANSLATORS: it's a command description.  */
 			   0, N_("Do nothing, unsuccessfully."));
 }
 
diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index 025943157..97945edae 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -69,6 +69,9 @@ hook (const struct grub_video_mode_info *info)
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_YUV)
     grub_xputs (_("YUV "));
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PLANAR)
+    /* TRANSLATORS: "Planar" is the video memory where you have to write
+       in several different banks "plans" to control the different color
+       components of the same pixel.  */
     grub_xputs (_("Planar "));
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_HERCULES)
     grub_xputs (_("Hercules "));
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 7b0873948..1ac906d90 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -40,6 +40,7 @@ grub_cryptodisk_dev_t grub_cryptodisk_list;
 static const struct grub_arg_option options[] =
   {
     {"uuid", 'u', 0, N_("Mount by UUID."), 0, 0},
+    /* TRANSLATORS: It's still restricted to cryptodisks only.  */
     {"all", 'a', 0, N_("Mount all."), 0, 0},
     {"boot", 'b', 0, N_("Mount all volumes with `boot' flag set."), 0, 0},
     {0, 0, 0, 0, 0, 0}
diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
index e34963aa1..5a36d26be 100644
--- a/grub-core/disk/ldm.c
+++ b/grub-core/disk/ldm.c
@@ -965,7 +965,11 @@ grub_util_ldm_embed (struct grub_disk *disk, unsigned int *nsectors,
       if (lv->size < *nsectors)
 	return grub_error (GRUB_ERR_OUT_OF_RANGE,
 			   /* TRANSLATORS: it's a partition for embedding,
-			      not a partition embed into something.  */
+			      not a partition embed into something. GRUB
+			      install tools put core.img into a place
+			      usable for bootloaders (called generically
+			      "embedding zone") and this operation is
+			      called "embedding".  */
 			   N_("your LDM embedding Partition is too small;"
 			      " embedding won't be possible"));
       *nsectors = lv->size;
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
index afdcf481d..f3b19eff7 100644
--- a/grub-core/disk/loopback.c
+++ b/grub-core/disk/loopback.c
@@ -38,6 +38,8 @@ static struct grub_loopback *loopback_list;
 
 static const struct grub_arg_option options[] =
   {
+    /* TRANSLATORS: The disk is simply removed from the list of available ones,
+       not wiped, avoid to scare user.  */
     {"delete", 'd', 0, N_("Delete the specified loopback drive."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
@@ -224,6 +226,8 @@ GRUB_MOD_INIT(loopback)
 {
   cmd = grub_register_extcmd ("loopback", grub_cmd_loopback, 0,
 			      N_("[-d] DEVICENAME FILE."),
+			      /* TRANSLATORS: The file itself is not destroyed
+				 or transformed into drive.  */
 			      N_("Make a virtual drive from a file."), options);
   grub_disk_dev_register (&grub_loopback_dev);
 }
diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
index a5c0d3418..44f3cacb7 100644
--- a/grub-core/disk/luks.c
+++ b/grub-core/disk/luks.c
@@ -434,6 +434,8 @@ luks_recover_key (grub_disk_t source,
 	  continue;
 	}
 
+      /* TRANSLATORS: It's a cryptographic key slot: one element of an array
+	 where each element is either empty or holds a key.  */
       grub_printf_ (N_("Slot %d opened\n"), i);
 
       /* Set the master key.  */
diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
index c2aca5afa..fdb587a4c 100644
--- a/grub-core/fs/zfs/zfsinfo.c
+++ b/grub-core/fs/zfs/zfsinfo.c
@@ -236,6 +236,9 @@ get_bootpath (char *nvlist, char **bootpath, char **devid)
 }
 
 static const char *poolstates[] = {
+  /* TRANSLATORS: Here we speak about ZFS pools it's semi-marketing,
+     semi-technical term by Sun/Oracle and should be translated in sync with
+     other ZFS-related software and documentation.  */
   [POOL_STATE_ACTIVE] = N_("Pool state: active"),
   [POOL_STATE_EXPORTED] = N_("Pool state: exported"),
   [POOL_STATE_DESTROYED] = N_("Pool state: destroyed"),
diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
index a3c278ac8..1f55f90a8 100644
--- a/grub-core/kern/disk.c
+++ b/grub-core/kern/disk.c
@@ -284,6 +284,8 @@ grub_disk_open (const char *name)
       disk->partition = grub_partition_probe (disk, p + 1);
       if (! disk->partition)
 	{
+	  /* TRANSLATORS: It means that the specified partition e.g.
+	     hd0,msdos1=/dev/sda1 doesn't exist.  */
 	  grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("no such partition"));
 	  goto fail;
 	}
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 1b5655c10..895edf149 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -253,6 +253,7 @@ grub_util_get_fd_size (int fd, const char *name, unsigned *log_secsize)
   struct stat st;
 
   if (fstat (fd, &st) < 0)
+    /* TRANSLATORS: "stat" comes from the name of POSIX function.  */
     grub_util_error (_("cannot stat `%s': %s"), name, strerror (errno));
 
 #if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
@@ -444,8 +445,8 @@ grub_util_follow_gpart_up (const char *name, grub_disk_addr_t *off_out, char **n
       break;
   if (!class)
     /* TRANSLATORS: geom is the name of (k)FreeBSD device framework.
-       Usually left untranslated.
-     */
+       Usually left untranslated. "part" is the identifier of one of its
+       classes.  */
     grub_util_error (_("couldn't find geom `part' class"));
 
   LIST_FOREACH (geom, &class->lg_geom, lg_geom)