diff --git a/ChangeLog b/ChangeLog
index 7da0c929e..d90116d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-01-03  Carles Pina i Estany  <carles@pina.cat>
+
+	* commands/acpi.c (GRUB_MOD_INIT): Capitalise some words from help.
+	* commands/efi/loadbios.c (GRUB_MOD_INIT): Capitalise BIOS.
+	* commands/i386/pc/drivemap.c (GRUB_MOD_INIT): Remove space. Add
+	full stop.
+	* commands/loadenv.c (GRUB_MOD_INIT): Remove command name from
+	summary. Gettextizze the strings.
+	* commands/probe.c (grub_cmd_probe): Capitalise UUID and FS.
+	* commands/xnu_uuid.c (GRUB_MOD_INIT): Capitalise XNU.
+	* disk/loopback.c (grub_arg_options): Capitalise first letter. Add
+	full stop.
+	(GRUB_MOD_INIT): Remove command name from summary.
+	* hello/hello.c (GRUD_MOT_INIT): Add missing full stop. Improve the
+	summary.
+	* loader/i386/bsd.c (grub_arg_option): Capitalise CDROM.
+	* term/i386/pc/serial.c (options): Add full stops.
+	(GRUB_MOD_INIT): Remove command name from the summary.
+
 2010-01-03  Carles Pina i Estany  <carles@pina.cat>
 
 	* commands/acpi.c: Gettextizze help strings and/or options. Include
diff --git a/commands/acpi.c b/commands/acpi.c
index 4d54539fd..f62592115 100644
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -760,10 +760,10 @@ GRUB_MOD_INIT(acpi)
 {
   cmd = grub_register_extcmd ("acpi", grub_cmd_acpi,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      N_("[-1|-2] [--exclude=table1,table2|"
-			      "--load-only=table1,table2] filename1 "
-			      " [filename2] [...]"),
-			      N_("Load host acpi tables and tables "
+			      N_("[-1|-2] [--exclude=TABLE1,TABLE2|"
+			      "--load-only=table1,table2] FILE1"
+			      " [FILE2] [...]"),
+			      N_("Load host ACPI tables and tables "
 			      "specified by arguments."),
 			      options);
 }
diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index 0f0d7bc10..653327d6c 100644
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -202,11 +202,11 @@ static grub_command_t cmd_fakebios, cmd_loadbios;
 GRUB_MOD_INIT(loadbios)
 {
   cmd_fakebios = grub_register_command ("fakebios", grub_cmd_fakebios,
-					0, N_("Fake bios."));
+					0, N_("Fake BIOS."));
 
   cmd_loadbios = grub_register_command ("loadbios", grub_cmd_loadbios,
 					"BIOS_DUMP [INT10_DUMP]",
-					N_("Load bios dump."));
+					N_("Load BIOS dump."));
 }
 
 GRUB_MOD_FINI(loadbios)
diff --git a/commands/i386/pc/drivemap.c b/commands/i386/pc/drivemap.c
index 3d1dcf614..3baacba49 100644
--- a/commands/i386/pc/drivemap.c
+++ b/commands/i386/pc/drivemap.c
@@ -404,7 +404,7 @@ GRUB_MOD_INIT (drivemap)
   cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap,
 					GRUB_COMMAND_FLAG_BOTH,
 					"drivemap"
-					N_(" -l | -r | [-s] grubdev osdisk"),
+					N_("-l | -r | [-s] grubdev osdisk."),
 					N_("Manage the BIOS drive mappings."),
 					options);
   drivemap_hook =
diff --git a/commands/loadenv.c b/commands/loadenv.c
index 6f8714411..910392614 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -385,20 +385,20 @@ GRUB_MOD_INIT(loadenv)
   cmd_load =
     grub_register_extcmd ("load_env", grub_cmd_load_env,
 			  GRUB_COMMAND_FLAG_BOTH,
-			  "load_env [-f FILE]",
-			  "Load variables from environment block file.",
+			  N_("[-f FILE]"),
+			  N_("Load variables from environment block file."),
 			  options);
   cmd_list =
     grub_register_extcmd ("list_env", grub_cmd_list_env,
 			  GRUB_COMMAND_FLAG_BOTH,
-			  "list_env [-f FILE]",
-			  "List variables from environment block file.",
+			  N_("[-f FILE]"),
+			  N_("List variables from environment block file."),
 			  options);
   cmd_save =
     grub_register_extcmd ("save_env", grub_cmd_save_env,
 			  GRUB_COMMAND_FLAG_BOTH,
-			  "[-f FILE] variable_name [...]",
-			  "Save variables to environment block file.",
+			  N_("[-f FILE] variable_name [...]"),
+			  N_("Save variables to environment block file."),
 			  options);
 }
 
diff --git a/commands/xnu_uuid.c b/commands/xnu_uuid.c
index 32288636b..b94dc0dc7 100644
--- a/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@ -380,7 +380,7 @@ GRUB_MOD_INIT (xnu_uuid)
   cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid,
 			       N_("GRUBUUID [VARNAME]"),
 			       N_("Transform 64-bit UUID to format "
-			       "suitable for xnu."));
+			       "suitable for XNU."));
 }
 
 GRUB_MOD_FINI (xnu_uuid)
diff --git a/disk/loopback.c b/disk/loopback.c
index fbec0426f..a8b7cf5d7 100644
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -37,8 +37,8 @@ static struct grub_loopback *loopback_list;
 
 static const struct grub_arg_option options[] =
   {
-    {"delete", 'd', 0, N_("delete the loopback device entry"), 0, 0},
-    {"partitions", 'p', 0, N_("simulate a hard drive with partitions"), 0, 0},
+    {"delete", 'd', 0, N_("Delete the loopback device entry."), 0, 0},
+    {"partitions", 'p', 0, N_("Simulate a hard drive with partitions."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -246,7 +246,7 @@ GRUB_MOD_INIT(loop)
 {
   cmd = grub_register_extcmd ("loopback", grub_cmd_loopback,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      N_("loopback [-d|-p] DEVICENAME FILE"),
+			      N_("[-d|-p] DEVICENAME FILE."),
 			      N_("Make a device of a file."), options);
   grub_disk_dev_register (&grub_loopback_dev);
 }
diff --git a/hello/hello.c b/hello/hello.c
index 1e2a4ba7f..eff07d941 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -40,7 +40,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(hello)
 {
   cmd = grub_register_extcmd ("hello", grub_cmd_hello, GRUB_COMMAND_FLAG_BOTH,
-			      "hello", N_("Say hello"), 0);
+			      0, N_("Say \"Hello World\"."), 0);
 }
 
 GRUB_MOD_FINI(hello)
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index a7a860bb2..d0f0c464b 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -65,7 +65,7 @@ static const struct grub_arg_option freebsd_opts[] =
     {"dual", 'D', 0, N_("Display output on all consoles."), 0, 0},
     {"serial", 'h', 0, N_("Use serial console."), 0, 0},
     {"askname", 'a', 0, N_("Ask for file name to reboot from."), 0, 0},
-    {"cdrom", 'C', 0, N_("Use cdrom as root."), 0, 0},
+    {"cdrom", 'C', 0, N_("Use CDROM as root."), 0, 0},
     {"config", 'c', 0, N_("Invoke user configuration routing."), 0, 0},
     {"kdb", 'd', 0, N_("Enter in KDB on boot."), 0, 0},
     {"gdb", 'g', 0, N_("Use GDB remote debugger instead of DDB."), 0, 0},
diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c
index e4e3c2755..0f4749eae 100644
--- a/term/i386/pc/serial.c
+++ b/term/i386/pc/serial.c
@@ -42,12 +42,12 @@ static unsigned int npending = 0;
 /* Argument options.  */
 static const struct grub_arg_option options[] =
 {
-  {"unit",   'u', 0, N_("Set the serial unit"),             0, ARG_TYPE_INT},
-  {"port",   'p', 0, N_("Set the serial port address"),     0, ARG_TYPE_STRING},
-  {"speed",  's', 0, N_("Set the serial port speed"),       0, ARG_TYPE_INT},
-  {"word",   'w', 0, N_("Set the serial port word length"), 0, ARG_TYPE_INT},
-  {"parity", 'r', 0, N_("Set the serial port parity"),      0, ARG_TYPE_STRING},
-  {"stop",   't', 0, N_("Set the serial port stop bits"),   0, ARG_TYPE_INT},
+  {"unit",   'u', 0, N_("Set the serial unit."),             0, ARG_TYPE_INT},
+  {"port",   'p', 0, N_("Set the serial port address."),     0, ARG_TYPE_STRING},
+  {"speed",  's', 0, N_("Set the serial port speed."),       0, ARG_TYPE_INT},
+  {"word",   'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT},
+  {"parity", 'r', 0, N_("Set the serial port parity."),      0, ARG_TYPE_STRING},
+  {"stop",   't', 0, N_("Set the serial port stop bits."),   0, ARG_TYPE_INT},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -603,7 +603,7 @@ GRUB_MOD_INIT(serial)
 {
   cmd = grub_register_extcmd ("serial", grub_cmd_serial,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      N_("serial [OPTIONS...]"),
+			      N_("[OPTIONS...]"),
 			      N_("Configure serial port."), options);
 
   /* Set default settings.  */