Merge from trunk

commands/acpi.c

@@ -229,7 +229,7 @@ grub_acpi_create_ebda (void)
 				   sizeof (struct grub_acpi_rsdp_v10)) == 0)
 	  {
 	    grub_memcpy (target, v1, sizeof (struct grub_acpi_rsdp_v10));
-	    grub_dprintf ("acpi", "Copying rsdpv2 to %p\n", target);
+	    grub_dprintf ("acpi", "Copying rsdpv1 to %p\n", target);
 	    v1inebda = target;
 	    target += sizeof (struct grub_acpi_rsdp_v10);
 	    target = (grub_uint8_t *) ((((long) target - 1) | 0xf) + 1);

commands/search.c

@@ -166,9 +166,7 @@ GRUB_MOD_INIT(search_fs_label)
   cmd =
     grub_register_command (COMMAND_NAME, grub_cmd_do_search,
 			   N_("NAME [VARIABLE]"),
-			   "Search devices by " SEARCH_TARGET "."
-			   " If VARIABLE is specified, "
-			   "the first device found is set to a variable.");
+			   HELP_MESSAGE);
 }
 
 #ifdef DO_SEARCH_FILE

commands/search_file.c

@@ -2,4 +2,5 @@
 #define FUNC_NAME grub_search_fs_file
 #define COMMAND_NAME "search.file"
 #define SEARCH_TARGET "file"
+#define HELP_MESSAGE N_("Search devices by file. If VARIABLE is specified, the first device found is set to a variable.")
 #include "search.c"

commands/search_label.c

@@ -2,4 +2,5 @@
 #define FUNC_NAME grub_search_label
 #define COMMAND_NAME "search.fs_label"
 #define SEARCH_TARGET "filesystem label"
+#define HELP_MESSAGE N_("Search devices by label. If VARIABLE is specified, the first device found is set to a variable.")
 #include "search.c"

commands/search_uuid.c

@@ -2,4 +2,5 @@
 #define FUNC_NAME grub_search_fs_uuid
 #define COMMAND_NAME "search.fs_uuid"
 #define SEARCH_TARGET "filesystem UUID"
+#define HELP_MESSAGE N_("Search devices by UUID. If VARIABLE is specified, the first device found is set to a variable.")
 #include "search.c"

commands/xnu_uuid.c

@@ -31,6 +31,7 @@
 #include <grub/misc.h>
 #include <grub/env.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 #include <grub/crypto.h>
 #include <grub/i18n.h>