2010-01-03 Carles Pina i Estany <carles@pina.cat>

	* commands/acpi.c: Gettextizze help strings and/or options. Include
	`grub/i18n.h' if needed.
	* commands/blocklist.c: Likewise.
	* commands/boot.c: Likewise.
	* commands/cat.c: Likewise.
	* commands/cmp.c: Likewise.
	* commands/configfile.c: Likewise.
	* commands/crc.c: Likewise.
	* commands/date.c: Likewise.
	* commands/echo.c: Likewise.
	* commands/efi/fixvideo.c: Likewise.
	* commands/efi/loadbios.c: Likewise.
	* commands/gptsync.c: Likewise.
	* commands/halt.c: Likewise.
	* commands/handler.c: Likewise.
	* commands/hdparm.c: Likewise.
	* commands/hexdump.c: Likewise.
	* commands/i386/cpuid.c: Likewise.
	* commands/i386/pc/drivemap.c: Likewise.
	* commands/i386/pc/halt.c: Likewise.
	* commands/i386/pc/pxecmd.c: Likewise.
	* commands/i386/pc/vbeinfo.c: Likewise.
	* commands/i386/pc/vbetest.c: Likewise.
	* commands/ieee1275/suspend.c: Likewise.
	* commands/keystatus.c: Likewise.
	* commands/loadenv.c: Likewise.
	* commands/ls.c: Likewise.
	* commands/lsmmap.c: Likewise.
	* commands/lspci.c: Likewise.
	* commands/memrw.c: Likewise.
	* commands/minicmd.c: Likewise.
	* commands/parttool.c: Likewise.
	* commands/password.c: Likewise.
	* commands/probe.c: Likewise.
	* commands/read.c: Likewise.
	* commands/reboot.c: Likewise.
	* commands/search.c: Likewise.
	* commands/sleep.c: Likewise.
	* commands/test.c: Likewise.
	* commands/true.c: Likewise.
	* commands/usbtest.c: Likewise.
	* commands/videotest.c: Likewise.
	* commands/xnu_uuid.c: Likewise.
	* disk/loopback.c: Likewise.
	* hello/hello.c: Likewise.
	* loader/i386/bsd.c: Likewise.
	* term/i386/pc/serial.c: Likewise.
	* po/POTFILES: Add new files.

diff --git a/ChangeLog b/ChangeLog
index 3b7ccab32020318b6fc801dbb853eb18e64c2d1c..7da0c929e1f2885d1c129f8599d62a02853ce1d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2010-01-03  Carles Pina i Estany  <carles@pina.cat>
+
+       * commands/acpi.c: Gettextizze help strings and/or options. Include
+       `grub/i18n.h' if needed.
+       * commands/blocklist.c: Likewise.
+       * commands/boot.c: Likewise.
+       * commands/cat.c: Likewise.
+       * commands/cmp.c: Likewise.
+       * commands/configfile.c: Likewise.
+       * commands/crc.c: Likewise.
+       * commands/date.c: Likewise.
+       * commands/echo.c: Likewise.
+       * commands/efi/fixvideo.c: Likewise.
+       * commands/efi/loadbios.c: Likewise.
+       * commands/gptsync.c: Likewise.
+       * commands/halt.c: Likewise.
+       * commands/handler.c: Likewise.
+       * commands/hdparm.c: Likewise.
+       * commands/hexdump.c: Likewise.
+       * commands/i386/cpuid.c: Likewise.
+       * commands/i386/pc/drivemap.c: Likewise.
+       * commands/i386/pc/halt.c: Likewise.
+       * commands/i386/pc/pxecmd.c: Likewise.
+       * commands/i386/pc/vbeinfo.c: Likewise.
+       * commands/i386/pc/vbetest.c: Likewise.
+       * commands/ieee1275/suspend.c: Likewise.
+       * commands/keystatus.c: Likewise.
+       * commands/loadenv.c: Likewise.
+       * commands/ls.c: Likewise.
+       * commands/lsmmap.c: Likewise.
+       * commands/lspci.c: Likewise.
+       * commands/memrw.c: Likewise.
+       * commands/minicmd.c: Likewise.
+       * commands/parttool.c: Likewise.
+       * commands/password.c: Likewise.
+       * commands/probe.c: Likewise.
+       * commands/read.c: Likewise.
+       * commands/reboot.c: Likewise.
+       * commands/search.c: Likewise.
+       * commands/sleep.c: Likewise.
+       * commands/test.c: Likewise.
+       * commands/true.c: Likewise.
+       * commands/usbtest.c: Likewise.
+       * commands/videotest.c: Likewise.
+       * commands/xnu_uuid.c: Likewise.
+       * disk/loopback.c: Likewise.
+       * hello/hello.c: Likewise.
+       * loader/i386/bsd.c: Likewise.
+       * term/i386/pc/serial.c: Likewise.
+       * po/POTFILES: Add new files.
+
 2010-01-02  Colin Watson  <cjwatson@ubuntu.com>
 
        * term/i386/pc/at_keyboard.c

diff --git a/commands/acpi.c b/commands/acpi.c
index ce4e2db36625829f84ba6fedb66386867f3944b0..4d54539fdcc49a521b3db87f40075726aca3759d 100644 (file)
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -28,6 +28,7 @@
 #include <grub/mm.h>
 #include <grub/machine/memory.h>
 #include <grub/memory.h>
+#include <grub/i18n.h>
 
 #ifdef GRUB_MACHINE_EFI
 #include <grub/efi/efi.h>
@@ -36,23 +37,23 @@
 
 static const struct grub_arg_option options[] = {
   {"exclude", 'x', 0,
-   "Don't load host tables specified by comma-separated list.",
+   N_("Don't load host tables specified by comma-separated list."),
    0, ARG_TYPE_STRING},
   {"load-only", 'n', 0,
-   "Load only tables specified by comma-separated list.", 0, ARG_TYPE_STRING},
-  {"v1", '1', 0, "Expose v1 tables.", 0, ARG_TYPE_NONE},
-  {"v2", '2', 0, "Expose v2 and v3 tables.", 0, ARG_TYPE_NONE},
-  {"oemid", 'o', 0, "Set OEMID of RSDP, XSDT and RSDT.", 0, ARG_TYPE_STRING},
+   N_("Load only tables specified by comma-separated list."), 0, ARG_TYPE_STRING},
+  {"v1", '1', 0, N_("Expose v1 tables."), 0, ARG_TYPE_NONE},
+  {"v2", '2', 0, N_("Expose v2 and v3 tables."), 0, ARG_TYPE_NONE},
+  {"oemid", 'o', 0, N_("Set OEMID of RSDP, XSDT and RSDT."), 0, ARG_TYPE_STRING},
   {"oemtable", 't', 0,
-   "Set OEMTABLE ID of RSDP, XSDT and RSDT.", 0, ARG_TYPE_STRING},
+   N_("Set OEMTABLE ID of RSDP, XSDT and RSDT."), 0, ARG_TYPE_STRING},
   {"oemtablerev", 'r', 0,
-   "Set OEMTABLE revision of RSDP, XSDT and RSDT.", 0, ARG_TYPE_INT},
+   N_("Set OEMTABLE revision of RSDP, XSDT and RSDT."), 0, ARG_TYPE_INT},
   {"oemtablecreator", 'c', 0,
-   "Set creator field of RSDP, XSDT and RSDT.", 0, ARG_TYPE_STRING},
+   N_("Set creator field of RSDP, XSDT and RSDT."), 0, ARG_TYPE_STRING},
   {"oemtablecreatorrev", 'd', 0,
-   "Set creator revision of RSDP, XSDT and RSDT.", 0, ARG_TYPE_INT},
-  {"no-ebda", 'e', 0, "Don't update EBDA. May fix failures or hangs on some."
-   " BIOSes but makes it ineffective with OS not receiving RSDP from GRUB.",
+   N_("Set creator revision of RSDP, XSDT and RSDT."), 0, ARG_TYPE_INT},
+  {"no-ebda", 'e', 0, N_("Don't update EBDA. May fix failures or hangs on some."
+   " BIOSes but makes it ineffective with OS not receiving RSDP from GRUB."),
    0, ARG_TYPE_NONE},
   {0, 0, 0, 0, 0, 0}
 };
@@ -759,11 +760,11 @@ GRUB_MOD_INIT(acpi)
 {
   cmd = grub_register_extcmd ("acpi", grub_cmd_acpi,
                              GRUB_COMMAND_FLAG_BOTH,
-                             "[-1|-2] [--exclude=table1,table2|"
+                             N_("[-1|-2] [--exclude=table1,table2|"
                              "--load-only=table1,table2] filename1 "
-                             " [filename2] [...]",
-                             "Load host acpi tables and tables "
-                             "specified by arguments.",
+                             " [filename2] [...]"),
+                             N_("Load host acpi tables and tables "
+                             "specified by arguments."),
                              options);
 }
 

diff --git a/commands/blocklist.c b/commands/blocklist.c
index 3c9ef3a5841e17e6c7818968f8d4fba347df9afa..fec59a828569c3d92832730ba9e9ec5da9940697 100644 (file)
--- a/commands/blocklist.c
+++ b/commands/blocklist.c
@@ -24,6 +24,7 @@
 #include <grub/disk.h>
 #include <grub/partition.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),
@@ -110,7 +111,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(blocklist)
 {
   cmd = grub_register_command ("blocklist", grub_cmd_blocklist,
-                              "FILE", "Print a block list.");
+                              N_("FILE"), N_("Print a block list."));
 }
 
 GRUB_MOD_FINI(blocklist)

diff --git a/commands/boot.c b/commands/boot.c
index fe0453b8a744e0b88815a57927ccf54109751455..1ec1e6f77f75c1425c4ca8d261667ad94190d6ca 100644 (file)
--- a/commands/boot.c
+++ b/commands/boot.c
@@ -23,6 +23,7 @@
 #include <grub/loader.h>
 #include <grub/kernel.h>
 #include <grub/mm.h>
+#include <grub/i18n.h>
 
 static grub_err_t (*grub_loader_boot_func) (void);
 static grub_err_t (*grub_loader_unload_func) (void);
@@ -186,7 +187,7 @@ GRUB_MOD_INIT(boot)
 {
   cmd_boot =
     grub_register_command ("boot", grub_cmd_boot,
-                          0, "Boot an operating system.");
+                          0, N_("Boot an operating system."));
 }
 
 GRUB_MOD_FINI(boot)

diff --git a/commands/cat.c b/commands/cat.c
index 9d0373b3aa303ddbcd81c30f861bbec6ca2d0cdc..844034777a46c7f1a12572de84c0d898d2c2fd5c 100644 (file)
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -24,6 +24,7 @@
 #include <grub/misc.h>
 #include <grub/gzio.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
@@ -78,7 +79,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(cat)
 {
   cmd = grub_register_command_p1 ("cat", grub_cmd_cat,
-                                 "FILE", "Show the contents of a file.");
+                                 N_("FILE"), N_("Show the contents of a file."));
 }
 
 GRUB_MOD_FINI(cat)

diff --git a/commands/cmp.c b/commands/cmp.c
index bdd8ff82d21ceed604cf16b60a839ebe47ab5a52..8fd93964001cea538f88808264b923b71b62aea6 100644 (file)
--- a/commands/cmp.c
+++ b/commands/cmp.c
@@ -23,6 +23,7 @@
 #include <grub/mm.h>
 #include <grub/gzio.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 #define BUFFER_SIZE 512
 
@@ -109,7 +110,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(cmp)
 {
   cmd = grub_register_command ("cmp", grub_cmd_cmp,
-                              "FILE1 FILE2", "Compare two files.");
+                              N_("FILE1 FILE2"), N_("Compare two files."));
 }
 
 GRUB_MOD_FINI(cmp)

diff --git a/commands/configfile.c b/commands/configfile.c
index d1fe9169e507af4210374363fa0caa22f8b36590..469447711457eb31b55cebc6166f8231203ca6da 100644 (file)
--- a/commands/configfile.c
+++ b/commands/configfile.c
@@ -22,6 +22,7 @@
 #include <grub/env.h>
 #include <grub/normal.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_source (grub_command_t cmd, int argc, char **args)
@@ -53,16 +54,16 @@ GRUB_MOD_INIT(configfile)
 {
   cmd_configfile =
     grub_register_command ("configfile", grub_cmd_source,
-                          "FILE", "Load another config file.");
+                          N_("FILE"), N_("Load another config file."));
   cmd_source =
     grub_register_command ("source", grub_cmd_source,
-                          "FILE",
-                          "Load another config file without changing context."
+                          N_("FILE"),
+                          N_("Load another config file without changing context.")
                           );
   cmd_dot =
     grub_register_command (".", grub_cmd_source,
-                          "FILE",
-                          "Load another config file without changing context."
+                          N_("FILE"),
+                          N_("Load another config file without changing context.")
                           );
 }
 

diff --git a/commands/crc.c b/commands/crc.c
index a6c17caf06897e7da4bc5cabeed36db61609f5c4..dff9fd55ccbeae3228f07140d362d474fe4ce7a1 100644 (file)
--- a/commands/crc.c
+++ b/commands/crc.c
@@ -23,6 +23,7 @@
 #include <grub/misc.h>
 #include <grub/lib/crc.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_crc (grub_command_t cmd __attribute__ ((unused)),
@@ -57,8 +58,8 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(crc)
 {
   cmd = grub_register_command ("crc", grub_cmd_crc,
-                              "FILE",
-                              "Calculate the crc32 checksum of a file.");
+                              N_("FILE"),
+                              N_("Calculate the crc32 checksum of a file."));
 }
 
 GRUB_MOD_FINI(crc)

diff --git a/commands/date.c b/commands/date.c
index 7197b066e919a6327bf8e5477df2138931c70e35..623db494305114afb944a15c1d8605bd0f3de4cf 100644 (file)
--- a/commands/date.c
+++ b/commands/date.c
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/datetime.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 #define GRUB_DATETIME_SET_YEAR         1
 #define GRUB_DATETIME_SET_MONTH                2
@@ -135,8 +136,8 @@ GRUB_MOD_INIT(date)
 {
   cmd =
     grub_register_command ("date", grub_cmd_date,
-                          "[[year-]month-day] [hour:minute[:second]]",
-                          "Command to display/set current datetime.");
+                          N_("[[year-]month-day] [hour:minute[:second]]"),
+                          N_("Command to display/set current datetime."));
 }
 
 GRUB_MOD_FINI(date)

diff --git a/commands/echo.c b/commands/echo.c
index 4d5a59df3f55be6acdd2e2a0254bdcf3ba43b752..4fea091cb41e2c311baf5c2c8c96aef5703358f7 100644 (file)
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -20,11 +20,12 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
-    {0, 'n', 0, "Do not output the trailing newline.", 0, 0},
-    {0, 'e', 0, "Enable interpretation of backslash escapes.", 0, 0},
+    {0, 'n', 0, N_("Do not output the trailing newline."), 0, 0},
+    {0, 'e', 0, N_("Enable interpretation of backslash escapes."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -113,7 +114,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(echo)
 {
   cmd = grub_register_extcmd ("echo", grub_cmd_echo, GRUB_COMMAND_FLAG_BOTH,
-                             "[-e|-n] STRING", "Display a line of text.",
+                             N_("[-e|-n] STRING"), N_("Display a line of text."),
                              options);
 }
 

diff --git a/commands/efi/fixvideo.c b/commands/efi/fixvideo.c
index 68566223753765edfae93888478469c756471ce3..0f821b7a2618db964fff702d8022ea4fc562414e 100644 (file)
--- a/commands/efi/fixvideo.c
+++ b/commands/efi/fixvideo.c
@@ -22,6 +22,7 @@
 #include <grub/file.h>
 #include <grub/pci.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static struct grub_video_patch
 {
@@ -99,7 +100,7 @@ static grub_command_t cmd_fixvideo;
 GRUB_MOD_INIT(fixvideo)
 {
   cmd_fixvideo = grub_register_command ("fix_video", grub_cmd_fixvideo,
-                                       0, "Fix video problem.");
+                                       0, N_("Fix video problem."));
 
 }
 

diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index de975c724cad1e362f8bab60172881b9a80eb8f8..0f0d7bc10c33ab86a3f1be8a12337e34cd1ef06f 100644 (file)
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -23,6 +23,7 @@
 #include <grub/efi/efi.h>
 #include <grub/pci.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_efi_guid_t acpi_guid = GRUB_EFI_ACPI_TABLE_GUID;
 static grub_efi_guid_t acpi2_guid = GRUB_EFI_ACPI_20_TABLE_GUID;
@@ -201,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, "Fake bios.");
+                                       0, N_("Fake bios."));
 
   cmd_loadbios = grub_register_command ("loadbios", grub_cmd_loadbios,
                                        "BIOS_DUMP [INT10_DUMP]",
-                                       "Load bios dump.");
+                                       N_("Load bios dump."));
 }
 
 GRUB_MOD_FINI(loadbios)

diff --git a/commands/gptsync.c b/commands/gptsync.c
index b5fe0b8edc3a821f65fb6f22060b2bff86fe7958..d217b5d5c4be2f67ec7da280f91a732f7a23200e 100644 (file)
--- a/commands/gptsync.c
+++ b/commands/gptsync.c
@@ -27,6 +27,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/fs.h>
+#include <grub/i18n.h>
 
 /* Convert a LBA address to a CHS address in the INT 13 format.  */
 /* Taken from grub1. */
@@ -240,13 +241,13 @@ GRUB_MOD_INIT(gptsync)
 {
   (void) mod;                  /* To stop warning. */
   cmd = grub_register_command ("gptsync", grub_cmd_gptsync,
-                              "DEVICE [PARTITION[+/-[TYPE]]] ...",
-                              "Fill hybrid MBR of GPT drive DEVICE. "
+                              N_("DEVICE [PARTITION[+/-[TYPE]]] ..."),
+                              N_("Fill hybrid MBR of GPT drive DEVICE. "
                               "specified partitions will be a part "
                               "of hybrid mbr. Up to 3 partitions are "
                               "allowed. TYPE is an MBR type. "
                               "+ means that partition is active. "
-                              "Only one partition can be active.");
+                              "Only one partition can be active."));
 }
 
 GRUB_MOD_FINI(gptsync)

diff --git a/commands/halt.c b/commands/halt.c
index 09431d3cb52176639fd317fa35e055798a15fcdd..3400115a0b81f5371f4d609a0aa10f068cbbe8e9 100644 (file)
--- a/commands/halt.c
+++ b/commands/halt.c
@@ -20,6 +20,7 @@
 #include <grub/dl.h>
 #include <grub/command.h>
 #include <grub/misc.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_halt (grub_command_t cmd __attribute__ ((unused)),
@@ -35,8 +36,8 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(halt)
 {
   cmd = grub_register_command ("halt", grub_cmd_halt,
-                              0, "Halts the computer.  This command does not"
-                              " work on all firmware implementations.");
+                              0, N_("Halts the computer.  This command does" 
+                              " not work on all firmware implementations."));
 }
 
 GRUB_MOD_FINI(halt)

diff --git a/commands/handler.c b/commands/handler.c
index 09b8ff5d0d12a510dcc74f86fe21142a40c61629..7316db3049e7224e4064b806e3aaa7f7d1ec9754 100644 (file)
--- a/commands/handler.c
+++ b/commands/handler.c
@@ -23,6 +23,7 @@
 #include <grub/term.h>
 #include <grub/handler.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_handler (struct grub_command *cmd,
@@ -95,16 +96,16 @@ GRUB_MOD_INIT(handler)
 {
   cmd_handler =
     grub_register_command ("handler", grub_cmd_handler,
-                          "[class [handler]]",
-                          "List or select a handler.");
+                          N_("[class [handler]]"),
+                          N_("List or select a handler."));
   cmd_terminal_input =
     grub_register_command ("terminal_input", grub_cmd_handler,
-                          "[handler]",
-                          "List or select an input terminal.");
+                          N_("[handler]"),
+                          N_("List or select an input terminal."));
   cmd_terminal_output =
     grub_register_command ("terminal_output", grub_cmd_handler,
-                          "[handler]",
-                          "List or select an output terminal.");
+                          N_("[handler]"),
+                          N_("List or select an output terminal."));
 }
 
 GRUB_MOD_FINI(handler)

diff --git a/commands/hdparm.c b/commands/hdparm.c
index fbcd7f6a80ee0eff013b05f5ba27ed9042fd7e2f..a3f8bbff03f652f4968070a9f849b8124d84a0ee 100644 (file)
--- a/commands/hdparm.c
+++ b/commands/hdparm.c
@@ -24,29 +24,30 @@
 #include <grub/mm.h>
 #include <grub/lib/hexdump.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] = {
-  {"apm",             'B', 0, "Set Advanced Power Management\n"
-                             "(1=low, ..., 254=high, 255=off).",
+  {"apm",             'B', 0, N_("Set Advanced Power Management\n"
+                             "(1=low, ..., 254=high, 255=off)."),
                              0, ARG_TYPE_INT},
-  {"power",           'C', 0, "Check power mode.", 0, ARG_TYPE_NONE},
-  {"security-freeze", 'F', 0, "Freeze ATA security settings until reset.",
+  {"power",           'C', 0, N_("Check power mode."), 0, ARG_TYPE_NONE},
+  {"security-freeze", 'F', 0, N_("Freeze ATA security settings until reset."),
                              0, ARG_TYPE_NONE},
-  {"health",          'H', 0, "Check SMART health status.", 0, ARG_TYPE_NONE},
-  {"aam",             'M', 0, "Set Automatic Acoustic Management\n"
-                             "(0=off, 128=quiet, ..., 254=fast).",
+  {"health",          'H', 0, N_("Check SMART health status."), 0, ARG_TYPE_NONE},
+  {"aam",             'M', 0, N_("Set Automatic Acoustic Management\n"
+                             "(0=off, 128=quiet, ..., 254=fast)."),
                              0, ARG_TYPE_INT},
-  {"standby-timeout", 'S', 0, "Set standby timeout\n"
-                             "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...).",
+  {"standby-timeout", 'S', 0, N_("Set standby timeout\n"
+                             "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...)."),
                              0, ARG_TYPE_INT},
-  {"standby",         'y', 0, "Set drive to standby mode.", 0, ARG_TYPE_NONE},
-  {"sleep",           'Y', 0, "Set drive to sleep mode.", 0, ARG_TYPE_NONE},
-  {"identify",        'i', 0, "Print drive identity and settings.",
+  {"standby",         'y', 0, N_("Set drive to standby mode."), 0, ARG_TYPE_NONE},
+  {"sleep",           'Y', 0, N_("Set drive to sleep mode."), 0, ARG_TYPE_NONE},
+  {"identify",        'i', 0, N_("Print drive identity and settings."),
                              0, ARG_TYPE_NONE},
-  {"dumpid",          'I', 0, "Dump contents of ATA IDENTIFY sector.",
+  {"dumpid",          'I', 0, N_("Dump contents of ATA IDENTIFY sector."),
                               0, ARG_TYPE_NONE},
-  {"smart",            -1, 0, "Disable/enable SMART (0/1).", 0, ARG_TYPE_INT},
-  {"quiet",           'q', 0, "Do not print messages.", 0, ARG_TYPE_NONE},
+  {"smart",            -1, 0, N_("Disable/enable SMART (0/1)."), 0, ARG_TYPE_INT},
+  {"quiet",           'q', 0, N_("Do not print messages."), 0, ARG_TYPE_NONE},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -410,8 +411,8 @@ GRUB_MOD_INIT(hdparm)
 {
   cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm,
                              GRUB_COMMAND_FLAG_BOTH,
-                             "[OPTIONS] DISK",
-                             "Get/set ATA disk parameters.", options);
+                             N_("[OPTIONS] DISK"),
+                             N_("Get/set ATA disk parameters."), options);
 }
 
 GRUB_MOD_FINI(hdparm)

diff --git a/commands/hexdump.c b/commands/hexdump.c
index 771cde34d11d18773b941fc4f3d46a0193c2e30a..5bdbb1f76ba929e655cf68c187a9f88163fba858 100644 (file)
--- a/commands/hexdump.c
+++ b/commands/hexdump.c
@@ -24,11 +24,12 @@
 #include <grub/gzio.h>
 #include <grub/lib/hexdump.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] = {
-  {"skip", 's', 0, "Skip offset bytes from the beginning of file.", 0,
+  {"skip", 's', 0, N_("Skip offset bytes from the beginning of file."), 0,
    ARG_TYPE_INT},
-  {"length", 'n', 0, "Read only LENGTH bytes.", 0, ARG_TYPE_INT},
+  {"length", 'n', 0, N_("Read only LENGTH bytes."), 0, ARG_TYPE_INT},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -121,8 +122,8 @@ GRUB_MOD_INIT (hexdump)
 {
   cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump,
                              GRUB_COMMAND_FLAG_BOTH,
-                             "[OPTIONS] FILE_OR_DEVICE",
-                             "Dump the contents of a file or memory.",
+                             N_("[OPTIONS] FILE_OR_DEVICE"),
+                             N_("Dump the contents of a file or memory."),
                              options);
 }
 

diff --git a/commands/i386/cpuid.c b/commands/i386/cpuid.c
index b1752ca899df3e2ac378d222726ac23f427ef1b2..6eebf91a1ce570edf3e9b81fd5d9fb9ab1d2c327 100644 (file)
--- a/commands/i386/cpuid.c
+++ b/commands/i386/cpuid.c
@@ -25,6 +25,7 @@
 #include <grub/command.h>
 #include <grub/extcmd.h>
 #include <grub/i386/cpuid.h>
+#include <grub/i18n.h>
 
 #define cpuid(num,a,b,c,d) \
   asm volatile ("xchgl %%ebx, %1; cpuid; xchgl %%ebx, %1" \
@@ -33,7 +34,7 @@
 
 static const struct grub_arg_option options[] =
   {
-    {"long-mode", 'l', 0, "Check for long mode flag (default).", 0, 0},
+    {"long-mode", 'l', 0, N_("Check for long mode flag (default)."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -88,7 +89,7 @@ done:
 #endif
 
   cmd = grub_register_extcmd ("cpuid", grub_cmd_cpuid, GRUB_COMMAND_FLAG_BOTH,
-                             "[-l]", "Check for CPU features.", options);
+                             "[-l]", N_("Check for CPU features."), options);
 }
 
 GRUB_MOD_FINI(cpuid)

diff --git a/commands/i386/pc/drivemap.c b/commands/i386/pc/drivemap.c
index adef57576cb86e533fd8d01c8adfecd889becba3..3d1dcf614158b6d9a950faf500c293bcd5ce65f8 100644 (file)
--- a/commands/i386/pc/drivemap.c
+++ b/commands/i386/pc/drivemap.c
@@ -26,6 +26,7 @@
 #include <grub/env.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/biosnum.h>
+#include <grub/i18n.h>
 
 
 /* Real mode IVT slot (seg:off far pointer) for interrupt 0x13.  */
@@ -33,9 +34,9 @@ static grub_uint32_t *const int13slot = UINT_TO_PTR (4 * 0x13);
 
 /* Remember to update enum opt_idxs accordingly.  */
 static const struct grub_arg_option options[] = {
-  {"list", 'l', 0, "Show the current mappings.", 0, 0},
-  {"reset", 'r', 0, "Reset all mappings to the default values.", 0, 0},
-  {"swap", 's', 0, "Perform both direct and reverse mappings.", 0, 0},
+  {"list", 'l', 0, N_("Show the current mappings."), 0, 0},
+  {"reset", 'r', 0, N_("Reset all mappings to the default values."), 0, 0},
+  {"swap", 's', 0, N_("Perform both direct and reverse mappings."), 0, 0},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -403,8 +404,8 @@ GRUB_MOD_INIT (drivemap)
   cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap,
                                        GRUB_COMMAND_FLAG_BOTH,
                                        "drivemap"
-                                       " -l | -r | [-s] grubdev osdisk",
-                                       "Manage the BIOS drive mappings.",
+                                       N_(" -l | -r | [-s] grubdev osdisk"),
+                                       N_("Manage the BIOS drive mappings."),
                                        options);
   drivemap_hook =
     grub_loader_register_preboot_hook (&install_int13_handler,

diff --git a/commands/i386/pc/halt.c b/commands/i386/pc/halt.c
index c2e22882f8c3c1a094591b53bdbd35a379569044..73c3a2e11f99150b0b17d7bd05fd27cbebab50ab 100644 (file)
--- a/commands/i386/pc/halt.c
+++ b/commands/i386/pc/halt.c
@@ -20,10 +20,11 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
-    {"no-apm", 'n', 0, "Do not use APM to halt the computer.", 0, 0},
+    {"no-apm", 'n', 0, N_("Do not use APM to halt the computer."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -47,7 +48,7 @@ GRUB_MOD_INIT(halt)
 {
   cmd = grub_register_extcmd ("halt", grub_cmd_halt, GRUB_COMMAND_FLAG_BOTH,
                              "[-n]",
-                             "Halt the system, if possible using APM.",
+                             N_("Halt the system, if possible using APM."),
                              options);
 }
 

diff --git a/commands/i386/pc/pxecmd.c b/commands/i386/pc/pxecmd.c
index 1d4fb6a4d3df3a24d7cb10bde0a7801b1e2cf02a..b576a8ea4f5dadb2899e82f20f04f785f6477569 100644 (file)
--- a/commands/i386/pc/pxecmd.c
+++ b/commands/i386/pc/pxecmd.c
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/machine/pxe.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_pxe_unload (grub_command_t cmd __attribute__ ((unused)),
@@ -42,7 +43,7 @@ GRUB_MOD_INIT(pxecmd)
 {
   cmd = grub_register_command ("pxe_unload", grub_cmd_pxe_unload,
                               0,
-                              "Unload PXE environment.");
+                              N_("Unload PXE environment."));
 }
 
 GRUB_MOD_FINI(pxecmd)

diff --git a/commands/i386/pc/vbeinfo.c b/commands/i386/pc/vbeinfo.c
index ee9f3c1868cda8faadd35bf7acd8a4d3be2b6373..14f03846e57e0c36180c05d162eb1e4c67265559 100644 (file)
--- a/commands/i386/pc/vbeinfo.c
+++ b/commands/i386/pc/vbeinfo.c
@@ -24,6 +24,7 @@
 #include <grub/machine/vbe.h>
 #include <grub/mm.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static void *
 real2pm (grub_vbe_farptr_t ptr)
@@ -175,7 +176,7 @@ GRUB_MOD_INIT(vbeinfo)
 {
   cmd =
     grub_register_command ("vbeinfo", grub_cmd_vbeinfo, 0,
-                          "List compatible VESA BIOS extension video modes.");
+                          N_("List compatible VESA BIOS extension video modes."));
 }
 
 GRUB_MOD_FINI(vbeinfo)

diff --git a/commands/i386/pc/vbetest.c b/commands/i386/pc/vbetest.c
index 4050c869eb951a750efb1d7fac56df34ff8a45e8..d97323087e3999cdbf44c897a3371dcc84697bf4 100644 (file)
--- a/commands/i386/pc/vbetest.c
+++ b/commands/i386/pc/vbetest.c
@@ -25,6 +25,7 @@
 #include <grub/machine/init.h>
 #include <grub/machine/vbe.h>
 #include <grub/err.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_vbetest (grub_command_t cmd __attribute__ ((unused)),
@@ -168,7 +169,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(vbetest)
 {
   cmd = grub_register_command ("vbetest", grub_cmd_vbetest,
-                              0, "Test VESA BIOS Extension 2.0+ support.");
+                              0, N_("Test VESA BIOS Extension 2.0+ support."));
 }
 
 GRUB_MOD_FINI(vbetest)

diff --git a/commands/ieee1275/suspend.c b/commands/ieee1275/suspend.c
index fd538f8ea5d39bf14043e92c996f336133b9b3e3..f096cc9baec7f77b9f932a9cade72792b5f26c99 100644 (file)
--- a/commands/ieee1275/suspend.c
+++ b/commands/ieee1275/suspend.c
@@ -22,6 +22,7 @@
 #include <grub/term.h>
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_suspend (grub_command_t cmd __attribute__ ((unused)),
@@ -39,7 +40,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(ieee1275_suspend)
 {
   cmd = grub_register_command ("suspend", grub_cmd_suspend,
-                              0, "Return to Open Firmware prompt.");
+                              0, N_("Return to Open Firmware prompt."));
 }
 
 GRUB_MOD_FINI(ieee1275_suspend)

diff --git a/commands/keystatus.c b/commands/keystatus.c
index 4f82550be910cea5e532af6ca44db2a67eb2b1a7..a0a429284e67532468844e7700c3376093a569ed 100644 (file)
--- a/commands/keystatus.c
+++ b/commands/keystatus.c
@@ -21,12 +21,13 @@
 #include <grub/misc.h>
 #include <grub/extcmd.h>
 #include <grub/term.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
-    {"shift", 's', 0, "Check Shift key.", 0, 0},
-    {"ctrl", 'c', 0, "Check Control key.", 0, 0},
-    {"alt", 'a', 0, "Check Alt key.", 0, 0},
+    {"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},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -70,8 +71,8 @@ GRUB_MOD_INIT(keystatus)
 {
   cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus,
                              GRUB_COMMAND_FLAG_BOTH,
-                             "[--shift] [--ctrl] [--alt]",
-                             "Check key modifier status.",
+                             N_("[--shift] [--ctrl] [--alt]"),
+                             N_("Check key modifier status."),
                              options);
 }
 

diff --git a/commands/loadenv.c b/commands/loadenv.c
index 6ee4d204a0b5e765fef24a817b184ff71ac48a68..6f87144119e98b2c48046aa9fafef1c2346d91d7 100644 (file)
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -26,10 +26,11 @@
 #include <grub/partition.h>
 #include <grub/lib/envblk.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
-    {"file", 'f', 0, "Specify filename.", 0, ARG_TYPE_PATHNAME},
+    {"file", 'f', 0, N_("Specify filename."), 0, ARG_TYPE_PATHNAME},
     {0, 0, 0, 0, 0, 0}
   };
 

diff --git a/commands/ls.c b/commands/ls.c
index 4b1500398761d40e3ee5a31339dfbeaff8593a20..9afca7907ce1693235097f040189001fa0f7d3e4 100644 (file)
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -30,12 +30,13 @@
 #include <grub/normal.h>
 #include <grub/extcmd.h>
 #include <grub/datetime.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
-    {"long", 'l', 0, "Show a long list with more detailed information.", 0, 0},
-    {"human-readable", 'h', 0, "Print sizes in a human readable format.", 0, 0},
-    {"all", 'a', 0, "List all files.", 0, 0},
+    {"long", 'l', 0, N_("Show a long list with more detailed information."), 0, 0},
+    {"human-readable", 'h', 0, N_("Print sizes in a human readable format."), 0, 0},
+    {"all", 'a', 0, N_("List all files."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -260,8 +261,8 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(ls)
 {
   cmd = grub_register_extcmd ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH,
-                             "[-l|-h|-a] [FILE]",
-                             "List devices and files.", options);
+                             N_("[-l|-h|-a] [FILE]"),
+                             N_("List devices and files."), options);
 }
 
 GRUB_MOD_FINI(ls)

diff --git a/commands/lsmmap.c b/commands/lsmmap.c
index 09f141ea06f2cd751313386aa6a5bbd4bc992750..d5eef1ce995f62a7c69a7ee58a01a901215ecc49 100644 (file)
--- a/commands/lsmmap.c
+++ b/commands/lsmmap.c
@@ -20,6 +20,7 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_lsmmap (grub_command_t cmd __attribute__ ((unused)),
@@ -43,7 +44,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(lsmmap)
 {
   cmd = grub_register_command ("lsmmap", grub_cmd_lsmmap,
-                              0, "List memory map provided by firmware.");
+                              0, N_("List memory map provided by firmware."));
 }
 
 GRUB_MOD_FINI(lsmmap)

diff --git a/commands/lspci.c b/commands/lspci.c
index 63e60abe05bf51e0e81268bb49ce13a17a5d93b4..c2abd8736c21e78c7d90017949adf70f154bda29 100644 (file)
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -21,6 +21,7 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 struct grub_pci_classname
 {
@@ -218,7 +219,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(lspci)
 {
   cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, GRUB_COMMAND_FLAG_BOTH,
-                             "[-i]", "List PCI devices.", options);
+                             "[-i]", N_("List PCI devices."), options);
 }
 
 GRUB_MOD_FINI(lspci)

diff --git a/commands/memrw.c b/commands/memrw.c
index 8e9c3db1148ff9de0256c352033dc880d0175118..d0908a2371b4adc1708ca6882a2f13458e2fa4a9 100644 (file)
--- a/commands/memrw.c
+++ b/commands/memrw.c
@@ -21,13 +21,14 @@
 #include <grub/misc.h>
 #include <grub/extcmd.h>
 #include <grub/env.h>
+#include <grub/i18n.h>
 
 static grub_extcmd_t cmd_read_byte, cmd_read_word, cmd_read_dword;
 static grub_command_t cmd_write_byte, cmd_write_word, cmd_write_dword;
 
 static const struct grub_arg_option options[] =
   {
-    {0, 'v', 0, "Save read value into variable VARNAME.",
+    {0, 'v', 0, N_("Save read value into variable VARNAME."),
      "VARNAME", ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
@@ -119,22 +120,22 @@ GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
     grub_register_extcmd ("read_byte", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-                         "ADDR", "Read byte from ADDR.", options);
+                         N_("ADDR"), N_("Read byte from ADDR."), options);
   cmd_read_word =
     grub_register_extcmd ("read_word", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-                         "ADDR", "Read word from ADDR.", options);
+                         N_("ADDR"), N_("Read word from ADDR."), options);
   cmd_read_dword =
     grub_register_extcmd ("read_dword", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-                         "ADDR", "Read dword from ADDR.", options);
+                         N_("ADDR"), N_("Read dword from ADDR."), options);
   cmd_write_byte =
     grub_register_command ("write_byte", grub_cmd_write,
-                          "ADDR VALUE [MASK]", "Write byte VALUE to ADDR.");
+                          N_("ADDR VALUE [MASK]"), N_("Write byte VALUE to ADDR."));
   cmd_write_word =
     grub_register_command ("write_word", grub_cmd_write,
-                          "ADDR VALUE [MASK]", "Write word VALUE to ADDR.");
+                          N_("ADDR VALUE [MASK]"), N_("Write word VALUE to ADDR."));
   cmd_write_dword =
     grub_register_command ("write_dword", grub_cmd_write,
-                          "ADDR VALUE [MASK]", "Write dword VALUE to ADDR.");
+                          N_("ADDR VALUE [MASK]"), N_("Write dword VALUE to ADDR."));
 }
 
 GRUB_MOD_FINI(memrw)

diff --git a/commands/minicmd.c b/commands/minicmd.c
index 47b57e3ed468f9dca4aa55d9171b0eace67438d0..72e855fafefa584a09b4594f1104edaf5f1808bf 100644 (file)
--- a/commands/minicmd.c
+++ b/commands/minicmd.c
@@ -27,6 +27,7 @@
 #include <grub/term.h>
 #include <grub/loader.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 /* cat FILE */
 static grub_err_t
@@ -354,28 +355,28 @@ GRUB_MOD_INIT(minicmd)
 {
   cmd_cat =
     grub_register_command ("cat", grub_mini_cmd_cat,
-                          "FILE", "Show the contents of a file.");
+                          N_("FILE"), N_("Show the contents of a file."));
   cmd_help =
     grub_register_command ("help", grub_mini_cmd_help,
-                          0, "Show this message.");
+                          0, N_("Show this message."));
   cmd_root =
     grub_register_command ("root", grub_mini_cmd_root,
-                          "[DEVICE]", "Set the root device.");
+                          N_("[DEVICE]"), N_("Set the root device."));
   cmd_dump =
     grub_register_command ("dump", grub_mini_cmd_dump,
-                          "ADDR", "Dump memory.");
+                          N_("ADDR"), N_("Dump memory."));
   cmd_rmmod =
     grub_register_command ("rmmod", grub_mini_cmd_rmmod,
-                          "MODULE", "Remove a module.");
+                          N_("MODULE"), N_("Remove a module."));
   cmd_lsmod =
     grub_register_command ("lsmod", grub_mini_cmd_lsmod,
-                          0, "Show loaded modules.");
+                          0, N_("Show loaded modules."));
   cmd_exit =
     grub_register_command ("exit", grub_mini_cmd_exit,
-                          0, "Exit from GRUB.");
+                          0, N_("Exit from GRUB."));
   cmd_clear =
     grub_register_command ("clear", grub_mini_cmd_clear,
-                          0, "Clear the screen.");
+                          0, N_("Clear the screen."));
 }
 
 GRUB_MOD_FINI(minicmd)

diff --git a/commands/parttool.c b/commands/parttool.c
index 62fe5ad2bbb194c7d1fac9b60ef7da58056d37dd..3f69d5525155c838ce70fb7085c54a75a2af492e 100644 (file)
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -29,6 +29,7 @@
 #include <grub/partition.h>
 #include <grub/parttool.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static struct grub_parttool *parts = 0;
 static int curhandle = 0;
@@ -322,7 +323,7 @@ GRUB_MOD_INIT(parttool)
 {
   mymod = mod;
   cmd = grub_register_command ("parttool", grub_cmd_parttool,
-                              "PARTITION COMMANDS",
+                              N_("PARTITION COMMANDS"),
                               helpmsg);
 }
 

diff --git a/commands/password.c b/commands/password.c
index d9b31f962b1d8998344778d90add37a2d6b07600..2869ffc53b33c467025e91207877382b031fb0b7 100644 (file)
--- a/commands/password.c
+++ b/commands/password.c
@@ -23,6 +23,7 @@
 #include <grub/env.h>
 #include <grub/normal.h>
 #include <grub/dl.h>
+#include <grub/i18n.h>
 
 static grub_dl_t my_mod;
 
@@ -75,9 +76,9 @@ GRUB_MOD_INIT(password)
 {
   my_mod = mod;
   cmd = grub_register_command ("password", grub_cmd_password,
-                              "USER PASSWORD",
-                              "Set user password (plaintext). "
-                              "Unrecommended and insecure.");
+                              N_("USER PASSWORD"),
+                              N_("Set user password (plaintext). "
+                              "Unrecommended and insecure."));
 }
 
 GRUB_MOD_FINI(password)

diff --git a/commands/probe.c b/commands/probe.c
index 7de1c1d34a66f634f8c47c545d52f56362564491..c2cc599e99eefcdaf29eda3c649cd0d4069c6283 100644 (file)
--- a/commands/probe.c
+++ b/commands/probe.c
@@ -30,16 +30,17 @@
 #include <grub/misc.h>
 #include <grub/env.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
     {"set",             's', GRUB_ARG_OPTION_OPTIONAL,
-     "Set a variable to return value.", "VAR", ARG_TYPE_STRING},
-    {"driver",         'd', 0, "Determine driver.", 0, 0},
-    {"partmap",                'p', 0, "Determine partition map type.", 0, 0},
-    {"fs",             'f', 0, "Determine filesystem type.", 0, 0},
-    {"fs-uuid",                'u', 0, "Determine filesystem UUID.", 0, 0},
-    {"label",          'l', 0, "Determine filesystem label.", 0, 0},
+     N_("Set a variable to return value."), "VAR", ARG_TYPE_STRING},
+    {"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},
+    {"fs-uuid",                'u', 0, N_("Determine filesystem UUID."), 0, 0},
+    {"label",          'l', 0, N_("Determine filesystem label."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -150,8 +151,8 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT (probe)
 {
   cmd = grub_register_extcmd ("probe", grub_cmd_probe, GRUB_COMMAND_FLAG_BOTH,
-                             "[DEVICE]",
-                             "Retrieve device info.", options);
+                             N_("[DEVICE]"),
+                             N_("Retrieve device info."), options);
 }
 
 GRUB_MOD_FINI (probe)

diff --git a/commands/read.c b/commands/read.c
index 5f4451a72ae58395a14d76521b4f62256270690e..8a7c4a01ff2c3eb2de0af6dc06860dc009175ad1 100644 (file)
--- a/commands/read.c
+++ b/commands/read.c
@@ -24,6 +24,7 @@
 #include <grub/term.h>
 #include <grub/types.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static char *
 grub_getline (void)
@@ -79,8 +80,8 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(read)
 {
   cmd = grub_register_command ("read", grub_cmd_read,
-                              "[ENVVAR]",
-                              "Set variable with user input.");
+                              N_("[ENVVAR]"),
+                              N_("Set variable with user input."));
 }
 
 GRUB_MOD_FINI(read)

diff --git a/commands/reboot.c b/commands/reboot.c
index 2add295eff78f63ca30539a707b747ac6fadf89b..eedd53c91771e55d25d0adb38bd1ac8e8603fde5 100644 (file)
--- a/commands/reboot.c
+++ b/commands/reboot.c
@@ -20,6 +20,7 @@
 #include <grub/dl.h>
 #include <grub/command.h>
 #include <grub/misc.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)),
@@ -35,7 +36,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(reboot)
 {
   cmd = grub_register_command ("reboot", grub_cmd_reboot,
-                              0, "Reboot the computer.");
+                              0, N_("Reboot the computer."));
 }
 
 GRUB_MOD_FINI(reboot)

diff --git a/commands/search.c b/commands/search.c
index 01e83739bb50f3ecb7e8066c134b5403d7638a84..2f0cef8aac5764804ea4d904b75e9428bd4fb48f 100644 (file)
--- a/commands/search.c
+++ b/commands/search.c
@@ -165,7 +165,7 @@ GRUB_MOD_INIT(search_fs_label)
 {
   cmd =
     grub_register_command (COMMAND_NAME, grub_cmd_do_search,
-                          "NAME [VARIABLE]",
+                          N_("NAME [VARIABLE]"),
                           "Search devices by " SEARCH_TARGET "."
                           " If VARIABLE is specified, "
                           "the first device found is set to a variable.");

diff --git a/commands/sleep.c b/commands/sleep.c
index eb9aeb510b21d748e11c581f5caa766157911aa2..a2caad89a1403d5824c57a947259fb66ba5366f3 100644 (file)
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -24,11 +24,12 @@
 #include <grub/misc.h>
 #include <grub/machine/time.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] =
   {
-    {"verbose", 'v', 0, "Verbose countdown.", 0, 0},
-    {"interruptible", 'i', 0, "Interruptible with ESC.", 0, 0},
+    {"verbose", 'v', 0, N_("Verbose countdown."), 0, 0},
+    {"interruptible", 'i', 0, N_("Interruptible with ESC."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -105,8 +106,8 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(sleep)
 {
   cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, GRUB_COMMAND_FLAG_BOTH,
-                             "NUMBER_OF_SECONDS",
-                             "Wait for a specified number of seconds.",
+                             N_("NUMBER_OF_SECONDS"),
+                             N_("Wait for a specified number of seconds."),
                              options);
 }
 

diff --git a/commands/test.c b/commands/test.c
index 8d1e248595ee9ee143f65be59b125ec69348b21e..318a4226404465acc25d636cb3b96c819a859368 100644 (file)
--- a/commands/test.c
+++ b/commands/test.c
@@ -25,6 +25,7 @@
 #include <grub/device.h>
 #include <grub/file.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 /* A simple implementation for signed numbers. */
 static int
@@ -420,9 +421,9 @@ static grub_command_t cmd_1, cmd_2;
 GRUB_MOD_INIT(test)
 {
   cmd_1 = grub_register_command ("[", grub_cmd_test,
-                                "EXPRESSION ]", "Evaluate an expression.");
+                                N_("EXPRESSION ]"), N_("Evaluate an expression."));
   cmd_2 = grub_register_command ("test", grub_cmd_test,
-                                "EXPRESSION", "Evaluate an expression.");
+                                N_("EXPRESSION"), N_("Evaluate an expression."));
 }
 
 GRUB_MOD_FINI(test)

diff --git a/commands/true.c b/commands/true.c
index ef9f65889270eba2b2509076a914507ac7d082ff..aa812585380025ca43ec0da56fe723fe23318657 100644 (file)
--- a/commands/true.c
+++ b/commands/true.c
@@ -19,6 +19,7 @@
 
 #include <grub/dl.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_true (struct grub_command *cmd __attribute__ ((unused)),
@@ -43,10 +44,10 @@ GRUB_MOD_INIT(true)
 {
   cmd_true =
     grub_register_command ("true", grub_cmd_true,
-                          0, "Do nothing, successfully.");
+                          0, N_("Do nothing, successfully."));
   cmd_false =
     grub_register_command ("false", grub_cmd_false,
-                          0, "Do nothing, unsuccessfully.");
+                          0, N_("Do nothing, unsuccessfully."));
 }
 
 GRUB_MOD_FINI(true)

diff --git a/commands/usbtest.c b/commands/usbtest.c
index df124ca18311e6d12de73697adb1e084a9043057..b884a93f14a215794e81b8aa50dd9ab89ae7fd2c 100644 (file)
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -25,6 +25,7 @@
 #include <grub/dl.h>
 #include <grub/usb.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static const char *usb_classes[] =
   {
@@ -195,7 +196,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(usbtest)
 {
   cmd = grub_register_command ("usb", grub_cmd_usbtest,
-                              0, "Test USB support.");
+                              0, N_("Test USB support."));
 }
 
 GRUB_MOD_FINI(usbtest)

diff --git a/commands/videotest.c b/commands/videotest.c
index e27552510f55495aadf56d643b7edd0162f402a4..850639bd96e32ea48ea4dbe5f9e9ae1457394445 100644 (file)
--- a/commands/videotest.c
+++ b/commands/videotest.c
@@ -24,6 +24,7 @@
 #include <grub/font.h>
 #include <grub/term.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
@@ -178,7 +179,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(videotest)
 {
   cmd = grub_register_command ("videotest", grub_cmd_videotest,
-                              0, "Test video subsystem.");
+                              0, N_("Test video subsystem."));
 }
 
 GRUB_MOD_FINI(videotest)

diff --git a/commands/xnu_uuid.c b/commands/xnu_uuid.c
index 31e69ad13b1e98ecb5e6fe5ae82a457ca052f769..32288636b91335934e928cb9f2dda144612dd5a8 100644 (file)
--- a/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@ -31,6 +31,7 @@
 #include <grub/misc.h>
 #include <grub/env.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 struct tohash
 {
@@ -377,9 +378,9 @@ static grub_command_t cmd;
 GRUB_MOD_INIT (xnu_uuid)
 {
   cmd = grub_register_command ("xnu_uuid", grub_cmd_xnu_uuid,
-                              "GRUBUUID [VARNAME]",
-                              "Transform 64-bit UUID to format "
-                              "suitable for xnu.");
+                              N_("GRUBUUID [VARNAME]"),
+                              N_("Transform 64-bit UUID to format "
+                              "suitable for xnu."));
 }
 
 GRUB_MOD_FINI (xnu_uuid)

diff --git a/disk/loopback.c b/disk/loopback.c
index c877dd8af543fce29b2bbfe4f77d868f7243903f..fbec0426fff7cf204ff7282627661b20d804b117 100644 (file)
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -23,6 +23,7 @@
 #include <grub/disk.h>
 #include <grub/mm.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 struct grub_loopback
 {
@@ -36,8 +37,8 @@ static struct grub_loopback *loopback_list;
 
 static const struct grub_arg_option options[] =
   {
-    {"delete", 'd', 0, "delete the loopback device entry", 0, 0},
-    {"partitions", 'p', 0, "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}
   };
 
@@ -245,8 +246,8 @@ GRUB_MOD_INIT(loop)
 {
   cmd = grub_register_extcmd ("loopback", grub_cmd_loopback,
                              GRUB_COMMAND_FLAG_BOTH,
-                             "loopback [-d|-p] DEVICENAME FILE",
-                             "Make a device of a file.", options);
+                             N_("loopback [-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 be60761ec7a8b34f1cb2dfc149d993710daaa56e..1e2a4ba7f3dc393f2a2ae71593eb3319823352ac 100644 (file)
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -24,6 +24,7 @@
 #include <grub/err.h>
 #include <grub/dl.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 grub_cmd_hello (struct grub_extcmd *cmd __attribute__ ((unused)),
@@ -39,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", "Say hello", 0);
+                             "hello", N_("Say hello"), 0);
 }
 
 GRUB_MOD_FINI(hello)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index ca60b0be91a496e0eb04043fdccdccdf88028fb8..a7a860bb28b931c0af63f12e78f2a86c906a015f 100644 (file)
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -34,6 +34,7 @@
 #include <grub/aout.h>
 #include <grub/command.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 #ifdef GRUB_MACHINE_PCBIOS
 #include <grub/machine/biosnum.h>
@@ -61,20 +62,20 @@ static grub_uint32_t openbsd_root;
 
 static const struct grub_arg_option freebsd_opts[] =
   {
-    {"dual", 'D', 0, "Display output on all consoles.", 0, 0},
-    {"serial", 'h', 0, "Use serial console.", 0, 0},
-    {"askname", 'a', 0, "Ask for file name to reboot from.", 0, 0},
-    {"cdrom", 'C', 0, "Use cdrom as root.", 0, 0},
-    {"config", 'c', 0, "Invoke user configuration routing.", 0, 0},
-    {"kdb", 'd', 0, "Enter in KDB on boot.", 0, 0},
-    {"gdb", 'g', 0, "Use GDB remote debugger instead of DDB.", 0, 0},
-    {"mute", 'm', 0, "Disable all boot output.", 0, 0},
+    {"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},
+    {"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},
+    {"mute", 'm', 0, N_("Disable all boot output."), 0, 0},
     {"nointr", 'n', 0, "", 0, 0},
-    {"pause", 'p', 0, "Wait for keypress after every line of output.", 0, 0},
+    {"pause", 'p', 0, N_("Wait for keypress after every line of output."), 0, 0},
     {"quiet", 'q', 0, "", 0, 0},
-    {"dfltroot", 'r', 0, "Use compiled-in rootdev.", 0, 0},
-    {"single", 's', 0, "Boot into single mode.", 0, 0},
-    {"verbose", 'v', 0, "Boot with verbose messages.", 0, 0},
+    {"dfltroot", 'r', 0, N_("Use compiled-in rootdev."), 0, 0},
+    {"single", 's', 0, N_("Boot into single mode."), 0, 0},
+    {"verbose", 'v', 0, N_("Boot with verbose messages."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -89,12 +90,12 @@ static const grub_uint32_t freebsd_flags[] =
 
 static const struct grub_arg_option openbsd_opts[] =
   {
-    {"askname", 'a', 0, "Ask for file name to reboot from.", 0, 0},
-    {"halt", 'b', 0, "Don't reboot, just halt.", 0, 0},
-    {"config", 'c', 0, "Change configured devices.", 0, 0},
-    {"single", 's', 0, "Boot into single mode.", 0, 0},
-    {"kdb", 'd', 0, "Enter in KDB on boot.", 0, 0},
-    {"root", 'r', 0, "Set root device.", "wdXY", ARG_TYPE_STRING},
+    {"askname", 'a', 0, N_("Ask for file name to reboot from."), 0, 0},
+    {"halt", 'b', 0, N_("Don't reboot, just halt."), 0, 0},
+    {"config", 'c', 0, N_("Change configured devices."), 0, 0},
+    {"single", 's', 0, N_("Boot into single mode."), 0, 0},
+    {"kdb", 'd', 0, N_("Enter in KDB on boot."), 0, 0},
+    {"root", 'r', 0, N_("Set root device."), "wdXY", ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -108,19 +109,19 @@ static const grub_uint32_t openbsd_flags[] =
 
 static const struct grub_arg_option netbsd_opts[] =
   {
-    {"no-smp", '1', 0, "Disable SMP.", 0, 0},
-    {"no-acpi", '2', 0, "Disable ACPI.", 0, 0},
-    {"askname", 'a', 0, "Ask for file name to reboot from.", 0, 0},
-    {"halt", 'b', 0, "Don't reboot, just halt.", 0, 0},
-    {"config", 'c', 0, "Change configured devices.", 0, 0},
-    {"kdb", 'd', 0, "Enter in KDB on boot.", 0, 0},
+    {"no-smp", '1', 0, N_("Disable SMP."), 0, 0},
+    {"no-acpi", '2', 0, N_("Disable ACPI."), 0, 0},
+    {"askname", 'a', 0, N_("Ask for file name to reboot from."), 0, 0},
+    {"halt", 'b', 0, N_("Don't reboot, just halt."), 0, 0},
+    {"config", 'c', 0, N_("Change configured devices."), 0, 0},
+    {"kdb", 'd', 0, N_("Enter in KDB on boot."), 0, 0},
     {"miniroot", 'm', 0, "", 0, 0},
-    {"quiet", 'q', 0, "Don't display boot diagnostic messages.", 0, 0},
-    {"single", 's', 0, "Boot into single mode.", 0, 0},
-    {"verbose", 'v', 0, "Boot with verbose messages.", 0, 0},
-    {"debug", 'x', 0, "Boot with debug messages.", 0, 0},
-    {"silent", 'z', 0, "Supress normal output (warnings remain).", 0, 0},
-    {"root", 'r', 0, "Set root device.", "DEVICE", ARG_TYPE_STRING},
+    {"quiet", 'q', 0, N_("Don't display boot diagnostic messages."), 0, 0},
+    {"single", 's', 0, N_("Boot into single mode."), 0, 0},
+    {"verbose", 'v', 0, N_("Boot with verbose messages."), 0, 0},
+    {"debug", 'x', 0, N_("Boot with debug messages."), 0, 0},
+    {"silent", 'z', 0, N_("Supress normal output (warnings remain)."), 0, 0},
+    {"root", 'r', 0, N_("Set root device."), N_("DEVICE"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -1280,25 +1281,25 @@ GRUB_MOD_INIT (bsd)
 {
   cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
                                      GRUB_COMMAND_FLAG_BOTH,
-                                     "FILE", "Load kernel of FreeBSD.",
+                                     N_("FILE"), N_("Load kernel of FreeBSD."),
                                      freebsd_opts);
   cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd,
                                      GRUB_COMMAND_FLAG_BOTH,
-                                     "FILE", "Load kernel of OpenBSD.",
+                                     N_("FILE"), N_("Load kernel of OpenBSD."),
                                      openbsd_opts);
   cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,
                                     GRUB_COMMAND_FLAG_BOTH,
-                                    "FILE", "Load kernel of NetBSD.",
+                                    N_("FILE"), N_("Load kernel of NetBSD."),
                                     netbsd_opts);
   cmd_freebsd_loadenv =
     grub_register_command ("kfreebsd_loadenv", grub_cmd_freebsd_loadenv,
-                          0, "Load FreeBSD env.");
+                          0, N_("Load FreeBSD env."));
   cmd_freebsd_module =
     grub_register_command ("kfreebsd_module", grub_cmd_freebsd_module,
-                          0, "Load FreeBSD kernel module.");
+                          0, N_("Load FreeBSD kernel module."));
   cmd_freebsd_module_elf =
     grub_register_command ("kfreebsd_module_elf", grub_cmd_freebsd_module_elf,
-                          0, "Load FreeBSD kernel module (ELF).");
+                          0, N_("Load FreeBSD kernel module (ELF)."));
 
   my_mod = mod;
 }

diff --git a/po/POTFILES b/po/POTFILES
index 6efa1221902156670b4b0b96d7fd153f9ffa0642..4e7e032ec3131c099d7ec3a0ba791eef1edd0032 100644 (file)
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,13 +1,62 @@
 # List of files which contain translatable strings.
+commands/acpi.c
+commands/blocklist.c
+commands/boot.c
+commands/cat.c
+commands/cmp.c
+commands/configfile.c
+commands/crc.c
+commands/date.c
+commands/echo.c
+commands/efi/fixvideo.c
+commands/efi/loadbios.c
+commands/gptsync.c
+commands/halt.c
+commands/handler.c
+commands/hdparm.c
+commands/help.c
+commands/hexdump.c
+commands/i386/cpuid.c
+commands/i386/pc/drivemap.c
+commands/i386/pc/halt.c
 commands/i386/pc/play.c
+commands/i386/pc/pxecmd.c
+commands/i386/pc/vbeinfo.c
+commands/i386/pc/vbetest.c
+commands/ieee1275/suspend.c
+commands/keystatus.c
 commands/loadenv.c
+commands/ls.c
+commands/lsmmap.c
+commands/lspci.c
+commands/memrw.c
+commands/minicmd.c
+commands/parttool.c
+commands/password.c
+commands/probe.c
+commands/read.c
+commands/reboot.c
 commands/search.c
-commands/help.c
+commands/search.c
+commands/sleep.c
+commands/test.c
+commands/true.c
+commands/usbtest.c
+commands/videotest.c
+commands/xnu_uuid.c
+
+disk/loopback.c
+
+hello/hello.c
 
 lib/arg.c
 
+loader/i386/bsd.c
+
 normal/dyncmd.c
 
+term/i386/pc/serial.c
+
 util/i386/pc/grub-mkimage.c
 util/i386/pc/grub-setup.c
 

diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c
index 1c68f9bfc9f96c32f16ca9c18e72790f28773a80..e4e3c2755f8a3afd384b569a903baea7e3a7bee5 100644 (file)
--- a/term/i386/pc/serial.c
+++ b/term/i386/pc/serial.c
@@ -26,6 +26,7 @@
 #include <grub/terminfo.h>
 #include <grub/cpu/io.h>
 #include <grub/extcmd.h>
+#include <grub/i18n.h>
 
 #define TEXT_WIDTH     80
 #define TEXT_HEIGHT    25
@@ -41,12 +42,12 @@ static unsigned int npending = 0;
 /* Argument options.  */
 static const struct grub_arg_option options[] =
 {
-  {"unit",   'u', 0, "Set the serial unit",             0, ARG_TYPE_INT},
-  {"port",   'p', 0, "Set the serial port address",     0, ARG_TYPE_STRING},
-  {"speed",  's', 0, "Set the serial port speed",       0, ARG_TYPE_INT},
-  {"word",   'w', 0, "Set the serial port word length", 0, ARG_TYPE_INT},
-  {"parity", 'r', 0, "Set the serial port parity",      0, ARG_TYPE_STRING},
-  {"stop",   't', 0, "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}
 };
 
@@ -602,8 +603,8 @@ GRUB_MOD_INIT(serial)
 {
   cmd = grub_register_extcmd ("serial", grub_cmd_serial,
                              GRUB_COMMAND_FLAG_BOTH,
-                             "serial [OPTIONS...]",
-                             "Configure serial port.", options);
+                             N_("serial [OPTIONS...]"),
+                             N_("Configure serial port."), options);
 
   /* Set default settings.  */
   serial_settings.port      = serial_hw_get_port (0);