vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve string. Gettextize.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-12 15:25:25 +01:00
parent 78dde88e8c
commit d61386e21d
64 changed files with 219 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-08 Vladimir Serbinenko <phcoder@gmail.com>
Improve string. Gettextize.
2012-02-11 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-11 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Remove -Winline altogether and -Wmissing-prototypes on * configure.ac: Remove -Winline altogether and -Wmissing-prototypes on

13
grub-core/bus/usb/serial/ftdi.c
View file

@ -23,6 +23,7 @@
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/usb.h> #include <grub/usb.h>
#include <grub/usbserial.h> #include <grub/usbserial.h>
#include <grub/i18n.h>
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -137,19 +138,23 @@ ftdi_hw_configure (struct grub_serial_port *port,
divisor = get_divisor (config->speed); divisor = get_divisor (config->speed);
if (divisor == 0) if (divisor == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port speed"));
if (config->parity != GRUB_SERIAL_PARITY_NONE if (config->parity != GRUB_SERIAL_PARITY_NONE
&& config->parity != GRUB_SERIAL_PARITY_ODD && config->parity != GRUB_SERIAL_PARITY_ODD
&& config->parity != GRUB_SERIAL_PARITY_EVEN) && config->parity != GRUB_SERIAL_PARITY_EVEN)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port parity"));
if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1 if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
&& config->stop_bits != GRUB_SERIAL_STOP_BITS_2) && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port stop bits number"));
if (config->word_len < 5 || config->word_len > 8) if (config->word_len < 5 || config->word_len > 8)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port word length"));
port->config = *config; port->config = *config;
port->configured = 0; port->configured = 0;

13
grub-core/bus/usb/serial/pl2303.c
View file

@ -23,6 +23,7 @@
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/usb.h> #include <grub/usb.h>
#include <grub/usbserial.h> #include <grub/usbserial.h>
#include <grub/i18n.h>
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -150,19 +151,23 @@ pl2303_hw_configure (struct grub_serial_port *port,
struct grub_serial_config *config) struct grub_serial_config *config)
{ {
if (!is_speed_supported (config->speed)) if (!is_speed_supported (config->speed))
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port speed"));
if (config->parity != GRUB_SERIAL_PARITY_NONE if (config->parity != GRUB_SERIAL_PARITY_NONE
&& config->parity != GRUB_SERIAL_PARITY_ODD && config->parity != GRUB_SERIAL_PARITY_ODD
&& config->parity != GRUB_SERIAL_PARITY_EVEN) && config->parity != GRUB_SERIAL_PARITY_EVEN)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port parity"));
if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1 if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
&& config->stop_bits != GRUB_SERIAL_STOP_BITS_2) && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port stop bits number"));
if (config->word_len < 5 || config->word_len > 8) if (config->word_len < 5 || config->word_len > 8)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port word length"));
port->config = *config; port->config = *config;
port->configured = 0; port->configured = 0;

3
grub-core/commands/gptsync.c
View file

@ -133,7 +133,8 @@ grub_cmd_gptsync (grub_command_t cmd __attribute__ ((unused)),
if (! partition) if (! partition)
{ {
grub_device_close (dev); grub_device_close (dev);
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such partition"); return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
N_("no such partition"));
} }
if (partition->start + partition->len > 0xffffffff) if (partition->start + partition->len > 0xffffffff)

2
grub-core/commands/i386/cmostest.c
View file

@ -60,7 +60,7 @@ grub_cmd_cmostest (struct grub_command *cmd __attribute__ ((unused)),
if (value & (1 << bit)) if (value & (1 << bit))
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
return grub_error (GRUB_ERR_TEST_FAILURE, "false"); return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
} }
static grub_err_t static grub_err_t

4
grub-core/commands/i386/cpuid.c
View file

@ -50,7 +50,9 @@ grub_cmd_cpuid (grub_extcmd_context_t ctxt __attribute__ ((unused)),
char **args __attribute__ ((unused))) char **args __attribute__ ((unused)))
{ {
return grub_cpuid_has_longmode ? GRUB_ERR_NONE return grub_cpuid_has_longmode ? GRUB_ERR_NONE
: grub_error (GRUB_ERR_TEST_FAILURE, "false"); /* TRANSLATORS: it's a standalone boolean value,
opposite of "true". */
: grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
} }
static grub_extcmd_t cmd; static grub_extcmd_t cmd;

2
grub-core/commands/i386/pc/lsapm.c
View file

@ -72,7 +72,7 @@ grub_cmd_lsapm (grub_command_t cmd __attribute__ ((unused)),
{ {
struct grub_apm_info info; struct grub_apm_info info;
if (!grub_apm_get_info (&info)) if (!grub_apm_get_info (&info))
return grub_error (GRUB_ERR_IO, "no APM found"); return grub_error (GRUB_ERR_IO, N_("no APM found"));
grub_printf_ (N_("Version %u.%u\n" grub_printf_ (N_("Version %u.%u\n"
"32-bit CS = 0x%x, len = 0x%x, offset = 0x%x\n" "32-bit CS = 0x%x, len = 0x%x, offset = 0x%x\n"

3
grub-core/commands/i386/pc/play.c
View file

@ -181,7 +181,8 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
{ {
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name or tempo and notes required"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("filename or tempo and notes expected"));
if (argc == 1) if (argc == 1)
{ {

6
grub-core/commands/keystatus.c
View file

@ -78,11 +78,11 @@ grub_cmd_keystatus (grub_extcmd_context_t ctxt,
FOR_ACTIVE_TERM_INPUTS (term) FOR_ACTIVE_TERM_INPUTS (term)
if (!term->getkeystatus) if (!term->getkeystatus)
return grub_error (GRUB_ERR_TEST_FAILURE, "false"); return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
else else
nterms++; nterms++;
if (!nterms) if (!nterms)
return grub_error (GRUB_ERR_TEST_FAILURE, "false"); return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
return 0; return 0;
} }
@ -91,7 +91,7 @@ grub_cmd_keystatus (grub_extcmd_context_t ctxt,
if (mods >= 0 && (mods & expect_mods) != 0) if (mods >= 0 && (mods & expect_mods) != 0)
return 0; return 0;
else else
return grub_error (GRUB_ERR_TEST_FAILURE, "false"); return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
} }
static grub_extcmd_t cmd; static grub_extcmd_t cmd;

18
grub-core/commands/legacycfg.c
View file

@ -454,7 +454,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
} }
while (0); while (0);
return grub_error (GRUB_ERR_BAD_OS, "couldn't load file %s\n", return grub_error (GRUB_ERR_BAD_OS, "couldn't load file %s",
args[0]); args[0]);
} }
@ -468,7 +468,8 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
{ {
cmd = grub_command_find ("initrd16"); cmd = grub_command_find ("initrd16");
if (!cmd) if (!cmd)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "command initrd16 not found"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
"initrd16");
return cmd->func (cmd, argc, args); return cmd->func (cmd, argc, args);
} }
@ -476,13 +477,14 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
{ {
cmd = grub_command_find ("module"); cmd = grub_command_find ("module");
if (!cmd) if (!cmd)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "command module not found"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
"module");
return cmd->func (cmd, argc, args); return cmd->func (cmd, argc, args);
} }
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"you need to load the kernel first"); N_("you need to load the kernel first"));
} }
static grub_err_t static grub_err_t
@ -495,7 +497,8 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
{ {
cmd = grub_command_find ("initrd16"); cmd = grub_command_find ("initrd16");
if (!cmd) if (!cmd)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "command initrd16 not found"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
"initrd16");
return cmd->func (cmd, argc, args); return cmd->func (cmd, argc, args);
} }
@ -511,7 +514,8 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
newargs[0] = nounzipbuf; newargs[0] = nounzipbuf;
cmd = grub_command_find ("module"); cmd = grub_command_find ("module");
if (!cmd) if (!cmd)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "command module not found"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("can't find command `%s'"),
"module");
err = cmd->func (cmd, argc + 1, newargs); err = cmd->func (cmd, argc + 1, newargs);
grub_free (newargs); grub_free (newargs);
@ -519,7 +523,7 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
} }
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"you need to load the kernel first"); N_("you need to load the kernel first"));
} }
static grub_err_t static grub_err_t

2
grub-core/commands/parttool.c
View file

@ -269,7 +269,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
break; break;
} }
if (! cur) if (! cur)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unrecognised argument %s", return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("unknown argument `%s'"),
args[i]); args[i]);
ptool = cur; ptool = cur;
pargs = (struct grub_parttool_args *) pargs = (struct grub_parttool_args *)

12
grub-core/commands/password_pbkdf2.c
View file

@ -94,7 +94,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
if (grub_memcmp (args[1], "grub.pbkdf2.sha512.", if (grub_memcmp (args[1], "grub.pbkdf2.sha512.",
sizeof ("grub.pbkdf2.sha512.") - 1) != 0) sizeof ("grub.pbkdf2.sha512.") - 1) != 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "incorrect PBKDF2 password"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid PBKDF2 password"));
ptr = args[1] + sizeof ("grub.pbkdf2.sha512.") - 1; ptr = args[1] + sizeof ("grub.pbkdf2.sha512.") - 1;
@ -103,10 +103,12 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
return grub_errno; return grub_errno;
pass->c = grub_strtoul (ptr, &ptr, 0); pass->c = grub_strtoul (ptr, &ptr, 0);
if (grub_errno)
return grub_errno;
if (*ptr != '.') if (*ptr != '.')
{ {
grub_free (pass); grub_free (pass);
return grub_error (GRUB_ERR_BAD_ARGUMENT, "incorrect PBKDF2 password"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid PBKDF2 password"));
} }
ptr++; ptr++;
@ -114,7 +116,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
if (!ptr2 || ((ptr2 - ptr) & 1) || grub_strlen (ptr2 + 1) & 1) if (!ptr2 || ((ptr2 - ptr) & 1) || grub_strlen (ptr2 + 1) & 1)
{ {
grub_free (pass); grub_free (pass);
return grub_error (GRUB_ERR_BAD_ARGUMENT, "incorrect PBKDF2 password"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid PBKDF2 password"));
} }
pass->saltlen = (ptr2 - ptr) >> 1; pass->saltlen = (ptr2 - ptr) >> 1;
@ -137,7 +139,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
grub_free (pass->salt); grub_free (pass->salt);
grub_free (pass); grub_free (pass);
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"incorrect PBKDF2 password"); N_("invalid PBKDF2 password"));
} }
*ptro = (hex1 << 4) | hex2; *ptro = (hex1 << 4) | hex2;
@ -166,7 +168,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
grub_free (pass->salt); grub_free (pass->salt);
grub_free (pass); grub_free (pass);
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"incorrect PBKDF2 password"); N_("invalid PBKDF2 password"));
} }
*ptro = (hex1 << 4) | hex2; *ptro = (hex1 << 4) | hex2;

6
grub-core/commands/terminal.c
View file

@ -108,7 +108,8 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
if (term) if (term)
break; break;
if (again) if (again)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n", return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("terminal `%s' isn't found"),
args[i]); args[i]);
for (aut = autoloads; aut; aut = aut->next) for (aut = autoloads; aut; aut = aut->next)
if (grub_strcmp (args[i], aut->name) == 0 if (grub_strcmp (args[i], aut->name) == 0
@ -126,7 +127,8 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
break; break;
} }
if (!aut) if (!aut)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n", return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("terminal `%s' isn't found"),
args[i]); args[i]);
again = 1; again = 1;
} }

2
grub-core/commands/test.c
View file

@ -416,7 +416,7 @@ grub_cmd_test (grub_command_t cmd __attribute__ ((unused)),
argc--; argc--;
return test_parse (args, &argn, argc) ? GRUB_ERR_NONE return test_parse (args, &argn, argc) ? GRUB_ERR_NONE
: grub_error (GRUB_ERR_TEST_FAILURE, "false"); : grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
} }
static grub_command_t cmd_1, cmd_2; static grub_command_t cmd_1, cmd_2;

4
grub-core/commands/time.c
View file

@ -35,12 +35,12 @@ grub_cmd_time (grub_command_t ctxt __attribute__ ((unused)),
grub_uint32_t end; grub_uint32_t end;
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "command expected"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("no command is specified"));
cmd = grub_command_find (args[0]); cmd = grub_command_find (args[0]);
if (!cmd) if (!cmd)
return grub_error (GRUB_ERR_UNKNOWN_COMMAND, "Unknown command `%s'\n", return grub_error (GRUB_ERR_UNKNOWN_COMMAND, N_("can't find command `%s'"),
args[0]); args[0]);
start = grub_get_time_ms (); start = grub_get_time_ms ();

2
grub-core/commands/true.c
View file

@ -36,7 +36,7 @@ grub_cmd_false (struct grub_command *cmd __attribute__ ((unused)),
int argc __attribute__ ((unused)), int argc __attribute__ ((unused)),
char *argv[] __attribute__ ((unused))) char *argv[] __attribute__ ((unused)))
{ {
return grub_error (GRUB_ERR_TEST_FAILURE, "false"); return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
} }
static grub_command_t cmd_true, cmd_false; static grub_command_t cmd_true, cmd_false;

4
grub-core/commands/videoinfo.c
View file

@ -126,7 +126,9 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
if (grub_errno) if (grub_errno)
return grub_errno; return grub_errno;
if (*ptr != 'x') if (*ptr != 'x')
return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid mode specification"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("invalid video mode specification `%s'"),
args[0]);
ptr++; ptr++;
height = grub_strtoul (ptr, &ptr, 0); height = grub_strtoul (ptr, &ptr, 0);
if (grub_errno) if (grub_errno)

4
grub-core/disk/arc/arcdisk.c
View file

@ -258,7 +258,7 @@ grub_arcdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
totl, &count)) totl, &count))
return grub_error (GRUB_ERR_READ_ERROR, return grub_error (GRUB_ERR_READ_ERROR,
N_("failure reading sector 0x%llx " N_("failure reading sector 0x%llx "
" from `%s'"), "from `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);
totl -= count; totl -= count;
@ -294,7 +294,7 @@ grub_arcdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
if (GRUB_ARC_FIRMWARE_VECTOR->write (last_handle, buf, if (GRUB_ARC_FIRMWARE_VECTOR->write (last_handle, buf,
totl, &count)) totl, &count))
return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx " return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx "
" from `%s'"), "to `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);
totl -= count; totl -= count;

8
grub-core/disk/diskfilter.c
View file

@ -402,7 +402,7 @@ grub_diskfilter_read_node (const struct grub_diskfilter_node *node,
0, size << GRUB_DISK_SECTOR_BITS, buf); 0, size << GRUB_DISK_SECTOR_BITS, buf);
else else
return grub_error (GRUB_ERR_UNKNOWN_DEVICE, return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
"physical volume %s not found", node->pv->name); N_("physical volume %s not found"), node->pv->name);
} }
if (node->lv) if (node->lv)
@ -601,7 +601,8 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,
buf, read_sector + b, buf, read_sector + b,
read_size) : read_size) :
grub_error (GRUB_ERR_BAD_DEVICE, grub_error (GRUB_ERR_BAD_DEVICE,
"raid6rec is not loaded")); N_("module `%s' isn't loaded"),
"raid6rec"));
} }
else else
{ {
@ -610,7 +611,8 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,
buf, read_sector + b, buf, read_sector + b,
read_size) : read_size) :
grub_error (GRUB_ERR_BAD_DEVICE, grub_error (GRUB_ERR_BAD_DEVICE,
"raid5rec is not loaded")); N_("module `%s' isn't loaded"),
"raid5rec"));
} }
if (err) if (err)

9
grub-core/disk/efi/efidisk.c
View file

@ -533,7 +533,10 @@ grub_efidisk_read (struct grub_disk *disk, grub_disk_addr_t sector,
(grub_efi_uintn_t) size << disk->log_sector_size, (grub_efi_uintn_t) size << disk->log_sector_size,
buf); buf);
if (status != GRUB_EFI_SUCCESS) if (status != GRUB_EFI_SUCCESS)
return grub_error (GRUB_ERR_READ_ERROR, "efidisk read error"); return grub_error (GRUB_ERR_READ_ERROR,
N_("failure reading sector 0x%llx from `%s'"),
(unsigned long long) sector,
disk->name);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
@ -559,7 +562,9 @@ grub_efidisk_write (struct grub_disk *disk, grub_disk_addr_t sector,
(grub_efi_uintn_t) size << disk->log_sector_size, (grub_efi_uintn_t) size << disk->log_sector_size,
(void *) buf); (void *) buf);
if (status != GRUB_EFI_SUCCESS) if (status != GRUB_EFI_SUCCESS)
return grub_error (GRUB_ERR_WRITE_ERROR, "efidisk write error"); return grub_error (GRUB_ERR_WRITE_ERROR,
N_("failure writing sector 0x%llx to `%s'"),
(unsigned long long) sector, disk->name);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

14
grub-core/disk/i386/pc/biosdisk.c
View file

@ -465,7 +465,7 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
int i; int i;
if (cmd) if (cmd)
return grub_error (GRUB_ERR_WRITE_ERROR, "can\'t write to cdrom"); return grub_error (GRUB_ERR_WRITE_ERROR, N_("cannot write to cdrom"));
for (i = 0; i < GRUB_BIOSDISK_CDROM_RETRY_COUNT; i++) for (i = 0; i < GRUB_BIOSDISK_CDROM_RETRY_COUNT; i++)
if (! grub_biosdisk_rw_int13_extensions (0x42, data->drive, dap)) if (! grub_biosdisk_rw_int13_extensions (0x42, data->drive, dap))
@ -473,7 +473,7 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
if (i == GRUB_BIOSDISK_CDROM_RETRY_COUNT) if (i == GRUB_BIOSDISK_CDROM_RETRY_COUNT)
return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx " return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx "
" from `%s'"), "from `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);
} }
@ -497,7 +497,9 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
1024 /* cylinders */ * 1024 /* cylinders */ *
256 /* heads */ * 256 /* heads */ *
63 /* spt */) 63 /* spt */)
return grub_error (GRUB_ERR_OUT_OF_RANGE, "%s out of disk", disk->name); return grub_error (GRUB_ERR_OUT_OF_RANGE,
N_("attempt to read or write outside of disk `%s'"),
disk->name);
soff = ((grub_uint32_t) sector) % data->sectors + 1; soff = ((grub_uint32_t) sector) % data->sectors + 1;
head = ((grub_uint32_t) sector) / data->sectors; head = ((grub_uint32_t) sector) / data->sectors;
@ -516,12 +518,12 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
{ {
case GRUB_BIOSDISK_READ: case GRUB_BIOSDISK_READ:
return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx " return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx "
" from `%s'"), "from `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);
case GRUB_BIOSDISK_WRITE: case GRUB_BIOSDISK_WRITE:
return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx " return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx "
" from `%s'"), "to `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);
} }
@ -587,7 +589,7 @@ grub_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
struct grub_biosdisk_data *data = disk->data; struct grub_biosdisk_data *data = disk->data;
if (data->flags & GRUB_BIOSDISK_FLAG_CDROM) if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
return grub_error (GRUB_ERR_IO, "can't write to CDROM"); return grub_error (GRUB_ERR_IO, N_("cannot write to cdrom"));
while (size) while (size)
{ {

2
grub-core/disk/ieee1275/nand.c
View file

@ -179,7 +179,7 @@ grub_nand_read (grub_disk_t disk, grub_disk_addr_t sector,
if ((IEEE1275_CALL_ENTRY_FN (&args) == -1) || (args.result)) if ((IEEE1275_CALL_ENTRY_FN (&args) == -1) || (args.result))
return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx " return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx "
" from `%s'"), "from `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);

4
grub-core/disk/ieee1275/ofdisk.c
View file

@ -366,7 +366,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
&actual); &actual);
if (actual != (grub_ssize_t) (size << GRUB_DISK_SECTOR_BITS)) if (actual != (grub_ssize_t) (size << GRUB_DISK_SECTOR_BITS))
return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx " return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx "
" from `%s'"), "from `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);
@ -386,7 +386,7 @@ grub_ofdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
&actual); &actual);
if (actual != (grub_ssize_t) (size << GRUB_DISK_SECTOR_BITS)) if (actual != (grub_ssize_t) (size << GRUB_DISK_SECTOR_BITS))
return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx " return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx "
" from `%s'"), "to `%s'"),
(unsigned long long) sector, (unsigned long long) sector,
disk->name); disk->name);

3
grub-core/disk/scsi.c
View file

@ -26,6 +26,7 @@
#include <grub/scsi.h> #include <grub/scsi.h>
#include <grub/scsicmd.h> #include <grub/scsicmd.h>
#include <grub/time.h> #include <grub/time.h>
#include <grub/i18n.h>
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -718,7 +719,7 @@ grub_scsi_write (grub_disk_t disk __attribute((unused)),
scsi = disk->data; scsi = disk->data;
if (scsi->devtype == grub_scsi_devtype_cdrom) if (scsi->devtype == grub_scsi_devtype_cdrom)
return grub_error (GRUB_ERR_IO, "no CD burning"); return grub_error (GRUB_ERR_IO, N_("cannot write to cdrom"));
while (size) while (size)
{ {

2
grub-core/fs/bfs.c
View file

@ -216,7 +216,7 @@ read_bfs_file (grub_disk_t disk,
if (off + len > grub_bfs_to_cpu64 (ino->size)) if (off + len > grub_bfs_to_cpu64 (ino->size))
return grub_error (GRUB_ERR_OUT_OF_RANGE, return grub_error (GRUB_ERR_OUT_OF_RANGE,
"attempt to read past the end of file"); N_("attempt to read past the end of file"));
if (off < (grub_bfs_to_cpu64 (ino->max_direct_range) << RANGE_SHIFT)) if (off < (grub_bfs_to_cpu64 (ino->max_direct_range) << RANGE_SHIFT))
{ {

4
grub-core/fs/btrfs.c
View file

@ -574,7 +574,9 @@ find_device (struct grub_btrfs_data *data, grub_uint64_t id, int do_rescan)
grub_device_iterate (hook); grub_device_iterate (hook);
if (!dev_found) if (!dev_found)
{ {
grub_error (GRUB_ERR_BAD_FS, "couldn't find a member device"); grub_error (GRUB_ERR_BAD_FS,
N_("couldn't find a necesssary member device "
"of multi-device filesystem"));
return NULL; return NULL;
} }
data->n_devices_attached++; data->n_devices_attached++;

3
grub-core/fs/ntfs.c
View file

@ -487,7 +487,8 @@ read_data (struct grub_ntfs_attr *at, char *pa, char *dest,
return (grub_ntfscomp_func) ? grub_ntfscomp_func (at, dest, ofs, len, ctx, return (grub_ntfscomp_func) ? grub_ntfscomp_func (at, dest, ofs, len, ctx,
vcn) : vcn) :
grub_error (GRUB_ERR_BAD_FS, "ntfscomp module not loaded"); grub_error (GRUB_ERR_BAD_FS, N_("module `%s' isn't loaded"),
"ntfscomp");
} }
static grub_err_t static grub_err_t

10
grub-core/fs/zfs/zfs.c
View file

@ -415,7 +415,7 @@ zio_checksum_verify (zio_cksum_t zc, grub_uint32_t checksum,
(unsigned long long) zc.zc_word[1], (unsigned long long) zc.zc_word[1],
(unsigned long long) zc.zc_word[2], (unsigned long long) zc.zc_word[2],
(unsigned long long) zc.zc_word[3]); (unsigned long long) zc.zc_word[3]);
return grub_error (GRUB_ERR_BAD_FS, "checksum verification failed"); return grub_error (GRUB_ERR_BAD_FS, N_("checksum verification failed"));
} }
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
@ -1204,7 +1204,9 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc,
sector = DVA_OFFSET_TO_PHYS_SECTOR (offset); sector = DVA_OFFSET_TO_PHYS_SECTOR (offset);
if (!desc->dev) if (!desc->dev)
{ {
return grub_error (GRUB_ERR_BAD_FS, "member drive unknown"); return grub_error (GRUB_ERR_BAD_FS,
N_("couldn't find a necesssary member device "
"of multi-device filesystem"));
} }
/* read in a data block */ /* read in a data block */
return grub_disk_read (desc->dev->disk, sector, 0, len, buf); return grub_disk_read (desc->dev->disk, sector, 0, len, buf);
@ -1608,7 +1610,9 @@ zio_read (blkptr_t *bp, grub_zfs_endian_t endian, void **buf,
if (encrypted) if (encrypted)
{ {
if (!grub_zfs_decrypt) if (!grub_zfs_decrypt)
err = grub_error (GRUB_ERR_BAD_FS, "zfscrypt module not loaded"); err = grub_error (GRUB_ERR_BAD_FS,
N_("module `%s' isn't loaded"),
"zfscrypt");
else else
{ {
unsigned i, besti = 0; unsigned i, besti = 0;

4
grub-core/fs/zfs/zfscrypt.c
View file

@ -288,7 +288,7 @@ grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher,
if (!cipher) if (!cipher)
return grub_error (GRUB_ERR_ACCESS_DENIED, return grub_error (GRUB_ERR_ACCESS_DENIED,
"no decryption key available");; N_("no decryption key available"));
err = algo_decrypt (cipher, algo, err = algo_decrypt (cipher, algo,
(grub_uint8_t *) buf, (grub_uint8_t *) buf,
(grub_uint8_t *) buf, (grub_uint8_t *) buf,
@ -300,7 +300,7 @@ grub_zfs_decrypt_real (grub_crypto_cipher_handle_t cipher,
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
if (grub_zfs_to_cpu32 (expected_mac[i], endian) if (grub_zfs_to_cpu32 (expected_mac[i], endian)
!= grub_be_to_cpu32 (mac[i])) != grub_be_to_cpu32 (mac[i]))
return grub_error (GRUB_ERR_BAD_FS, "MAC verification failed"); return grub_error (GRUB_ERR_BAD_FS, N_("MAC verification failed"));
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

4
grub-core/fs/zfs/zfsinfo.c
View file

@ -249,7 +249,7 @@ grub_cmd_zfsinfo (grub_command_t cmd __attribute__ ((unused)), int argc,
int found; int found;
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
if (args[0][0] == '(' && args[0][grub_strlen (args[0]) - 1] == ')') if (args[0][0] == '(' && args[0][grub_strlen (args[0]) - 1] == ')')
{ {
@ -325,7 +325,7 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc,
grub_uint64_t mdnobj; grub_uint64_t mdnobj;
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "filesystem name required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
devname = grub_file_get_device_name (args[0]); devname = grub_file_get_device_name (args[0]);
if (grub_errno) if (grub_errno)

2
grub-core/gettext/gettext.c
View file

@ -373,7 +373,7 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)),
int argc, char **args) int argc, char **args)
{ {
if (argc != 1) if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "text to translate required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
const char *translation; const char *translation;
translation = grub_gettext_translate (args[0]); translation = grub_gettext_translate (args[0]);

2
grub-core/hello/hello.c
View file

@ -33,7 +33,7 @@ grub_cmd_hello (grub_extcmd_context_t ctxt __attribute__ ((unused)),
int argc __attribute__ ((unused)), int argc __attribute__ ((unused)),
char **args __attribute__ ((unused))) char **args __attribute__ ((unused)))
{ {
grub_printf ("Hello World\n"); grub_printf ("%s\n", _("Hello World"));
return 0; return 0;
} }

6
grub-core/io/gzio.c
View file

@ -1172,20 +1172,20 @@ test_zlib_header (grub_gzio_t gzio)
/* Check that compression method is DEFLATE. */ /* Check that compression method is DEFLATE. */
if ((cmf & 0xf) != DEFLATED) if ((cmf & 0xf) != DEFLATED)
{ {
grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "unsupported gzip format"); grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, N_("unsupported gzip format"));
return 0; return 0;
} }
if ((cmf * 256 + flg) % 31) if ((cmf * 256 + flg) % 31)
{ {
grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "unsupported gzip format"); grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, N_("unsupported gzip format"));
return 0; return 0;
} }
/* Dictionary isn't supported. */ /* Dictionary isn't supported. */
if (flg & 0x20) if (flg & 0x20)
{ {
grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "unsupported gzip format"); grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, N_("unsupported gzip format"));
return 0; return 0;
} }

2
grub-core/io/lzopio.c
View file

@ -509,7 +509,7 @@ grub_lzopio_read (grub_file_t file, char *buf, grub_size_t len)
return ret; return ret;
CORRUPTED: CORRUPTED:
grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "lzop file corrupted"); grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, N_("lzop file corrupted"));
return -1; return -1;
} }

2
grub-core/io/xzio.c
View file

@ -278,7 +278,7 @@ grub_xzio_read (grub_file_t file, char *buf, grub_size_t len)
case XZ_DATA_ERROR: case XZ_DATA_ERROR:
case XZ_BUF_ERROR: case XZ_BUF_ERROR:
grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
"file corrupted or unsupported block options"); N_("xz file corrupted or unsupported block options"));
return -1; return -1;
default: default:
break; break;

4
grub-core/kern/corecmd.c
View file

@ -68,7 +68,7 @@ grub_core_cmd_unset (struct grub_command *cmd __attribute__ ((unused)),
{ {
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"no environment variable specified"); N_("one argument expected"));
grub_env_unset (argv[0]); grub_env_unset (argv[0]);
return 0; return 0;
@ -83,7 +83,7 @@ grub_core_cmd_insmod (struct grub_command *cmd __attribute__ ((unused)),
grub_dl_t mod; grub_dl_t mod;
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
p = grub_strchr (argv[0], '/'); p = grub_strchr (argv[0], '/');
if (! p) if (! p)

2
grub-core/kern/disk.c
View file

@ -284,7 +284,7 @@ grub_disk_open (const char *name)
disk->partition = grub_partition_probe (disk, p + 1); disk->partition = grub_partition_probe (disk, p + 1);
if (! disk->partition) if (! disk->partition)
{ {
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such partition"); grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("no such partition"));
goto fail; goto fail;
} }
} }

8
grub-core/kern/misc.c
View file

@ -373,7 +373,7 @@ grub_strtoul (const char *str, char **end, int base)
#if GRUB_CPU_SIZEOF_LONG != 8 #if GRUB_CPU_SIZEOF_LONG != 8
if (num > ~0UL) if (num > ~0UL)
{ {
grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected"); grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
return ~0UL; return ~0UL;
} }
#endif #endif
@ -427,7 +427,8 @@ grub_strtoull (const char *str, char **end, int base)
/* NUM * BASE + DIGIT > ~0ULL */ /* NUM * BASE + DIGIT > ~0ULL */
if (num > grub_divmod64 (~0ULL - digit, base, 0)) if (num > grub_divmod64 (~0ULL - digit, base, 0))
{ {
grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected"); grub_error (GRUB_ERR_OUT_OF_RANGE,
N_("overflow is detected"));
return ~0ULL; return ~0ULL;
} }
@ -437,7 +438,8 @@ grub_strtoull (const char *str, char **end, int base)
if (! found) if (! found)
{ {
grub_error (GRUB_ERR_BAD_NUMBER, "unrecognized number"); grub_error (GRUB_ERR_BAD_NUMBER,
N_("unrecognized number"));
return 0; return 0;
} }

3
grub-core/kern/rescue_parser.c
View file

@ -23,6 +23,7 @@
#include <grub/parser.h> #include <grub/parser.h>
#include <grub/misc.h> #include <grub/misc.h>
#include <grub/command.h> #include <grub/command.h>
#include <grub/i18n.h>
grub_err_t grub_err_t
grub_rescue_parse_line (char *line, grub_reader_getline_t getline) grub_rescue_parse_line (char *line, grub_reader_getline_t getline)
@ -63,7 +64,7 @@ grub_rescue_parse_line (char *line, grub_reader_getline_t getline)
} }
else else
{ {
grub_printf ("Unknown command `%s'\n", name); grub_printf_ (N_("Unknown command `%s'.\n"), name);
if (grub_command_find ("help")) if (grub_command_find ("help"))
grub_printf ("Try `help' for usage\n"); grub_printf ("Try `help' for usage\n");
} }

3
grub-core/lib/legacy_parse.c
View file

@ -22,6 +22,7 @@
#include <grub/err.h> #include <grub/err.h>
#include <grub/legacy_parse.h> #include <grub/legacy_parse.h>
#include <grub/i386/pc/vesa_modes_table.h> #include <grub/i386/pc/vesa_modes_table.h>
#include <grub/i18n.h>
struct legacy_command struct legacy_command
{ {
@ -801,7 +802,7 @@ grub_legacy_parse (const char *buf, char **entryname, char **suffix)
len = grub_strlen (corig); len = grub_strlen (corig);
if (!slash) if (!slash)
{ {
grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid color specification `%s'", grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid color specification `%s'"),
args[0]); args[0]);
return NULL; return NULL;
} }

3
grub-core/loader/efi/chainloader.c
View file

@ -241,7 +241,8 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
size = grub_file_size (file); size = grub_file_size (file);
if (!size) if (!size)
{ {
grub_error (GRUB_ERR_BAD_OS, "file is empty"); grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
filename);
goto fail; goto fail;
} }
pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12); pages = (((grub_efi_uintn_t) size + ((1 << 12) - 1)) >> 12);

3
grub-core/loader/multiboot_mbi2.c
View file

@ -33,6 +33,7 @@
#include <grub/env.h> #include <grub/env.h>
#include <grub/video.h> #include <grub/video.h>
#include <grub/acpi.h> #include <grub/acpi.h>
#include <grub/i18n.h>
#if defined (GRUB_MACHINE_EFI) #if defined (GRUB_MACHINE_EFI)
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
@ -98,7 +99,7 @@ grub_multiboot_load (grub_file_t file, const char *filename)
if (len < 32) if (len < 32)
{ {
grub_free (buffer); grub_free (buffer);
return grub_error (GRUB_ERR_BAD_OS, "file too small"); return grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), filename);
} }
COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0); COMPILE_TIME_ASSERT (MULTIBOOT_HEADER_ALIGN % 4 == 0);

2
grub-core/mmap/mmap.c
View file

@ -361,7 +361,7 @@ grub_cmd_badram (grub_command_t cmd __attribute__ ((unused)),
} }
if (argc != 1) if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "badram string required"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
grub_dprintf ("badram", "executing badram\n"); grub_dprintf ("badram", "executing badram\n");

9
grub-core/net/bootp.c
View file

@ -302,7 +302,8 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
grub_uint8_t taglength; grub_uint8_t taglength;
if (argc < 4) if (argc < 4)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "4 arguments expected"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("four arguments expected"));
FOR_NET_NETWORK_LEVEL_INTERFACES (inter) FOR_NET_NETWORK_LEVEL_INTERFACES (inter)
if (grub_strcmp (inter->name, args[1]) == 0) if (grub_strcmp (inter->name, args[1]) == 0)
@ -405,7 +406,8 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),
} }
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"unrecognised format specification %s", args[3]); N_("unrecognised DHCP option format specification `%s'"),
args[3]);
} }
/* FIXME: allow to specify mac address. */ /* FIXME: allow to specify mac address. */
@ -546,7 +548,8 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
continue; continue;
grub_error_push (); grub_error_push ();
grub_net_network_level_interface_unregister (&ifaces[j]); grub_net_network_level_interface_unregister (&ifaces[j]);
err = grub_error (GRUB_ERR_FILE_NOT_FOUND, "couldn't configure %s", err = grub_error (GRUB_ERR_FILE_NOT_FOUND,
N_("couldn't autoconfigure %s"),
ifaces[j].card->name); ifaces[j].card->name);
} }

11
grub-core/net/dns.c
View file

@ -436,7 +436,8 @@ grub_net_dns_lookup (const char *name,
} }
if (!n_servers) if (!n_servers)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no DNS servers"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("no DNS servers configured"));
*naddresses = 0; *naddresses = 0;
if (cache) if (cache)
@ -491,7 +492,7 @@ grub_net_dns_lookup (const char *name,
{ {
grub_free (data.name); grub_free (data.name);
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"domain component is too long"); N_("domain name component is too long"));
} }
*optr = (dot - iptr); *optr = (dot - iptr);
optr++; optr++;
@ -583,14 +584,16 @@ grub_net_dns_lookup (const char *name,
if (*data.naddresses) if (*data.naddresses)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
if (data.dns_err) if (data.dns_err)
return grub_error (GRUB_ERR_NET_NO_DOMAIN, "no DNS domain found"); return grub_error (GRUB_ERR_NET_NO_DOMAIN,
N_("no DNS record found"));
if (err) if (err)
{ {
grub_errno = err; grub_errno = err;
return err; return err;
} }
return grub_error (GRUB_ERR_TIMEOUT, "no DNS reply received"); return grub_error (GRUB_ERR_TIMEOUT,
N_("no DNS reply received"));
} }
static grub_err_t static grub_err_t

6
grub-core/net/http.c
View file

@ -101,7 +101,7 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
int code; int code;
if (grub_memcmp (ptr, "HTTP/1.1 ", sizeof ("HTTP/1.1 ") - 1) != 0) if (grub_memcmp (ptr, "HTTP/1.1 ", sizeof ("HTTP/1.1 ") - 1) != 0)
return grub_error (GRUB_ERR_NET_INVALID_RESPONSE, return grub_error (GRUB_ERR_NET_INVALID_RESPONSE,
"unsupported HTTP response"); N_("unsupported HTTP response"));
ptr += sizeof ("HTTP/1.1 ") - 1; ptr += sizeof ("HTTP/1.1 ") - 1;
code = grub_strtoul (ptr, &ptr, 10); code = grub_strtoul (ptr, &ptr, 10);
if (grub_errno) if (grub_errno)
@ -112,11 +112,11 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, grub_size_t len)
break; break;
case 404: case 404:
data->err = GRUB_ERR_FILE_NOT_FOUND; data->err = GRUB_ERR_FILE_NOT_FOUND;
data->errmsg = grub_xasprintf ("file `%s' not found", data->filename); data->errmsg = grub_xasprintf (_("file `%s' not found"), data->filename);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
default: default:
data->err = GRUB_ERR_NET_UNKNOWN_ERROR; data->err = GRUB_ERR_NET_UNKNOWN_ERROR;
data->errmsg = grub_xasprintf ("unsupported HTTP error %d: %s", data->errmsg = grub_xasprintf (_("unsupported HTTP error %d: %s"),
code, ptr); code, ptr);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }

23
grub-core/net/net.c
View file

@ -191,7 +191,7 @@ grub_net_link_layer_resolve (struct grub_net_network_level_interface *inf,
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
return grub_error (GRUB_ERR_TIMEOUT, return grub_error (GRUB_ERR_TIMEOUT,
"timeout: could not resolve hardware address"); N_("timeout: could not resolve hardware address"));
} }
void void
@ -347,7 +347,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)),
{ {
if (slaacs[j]->slaac_counter) if (slaacs[j]->slaac_counter)
continue; continue;
err = grub_error (GRUB_ERR_FILE_NOT_FOUND, "couldn't configure %s", err = grub_error (GRUB_ERR_FILE_NOT_FOUND,
N_("couldn't autoconfigure %s"),
ifaces[j]->card->name); ifaces[j]->card->name);
} }
@ -630,7 +631,8 @@ grub_net_route_address (grub_net_network_level_address_t addr,
bestroute = route; bestroute = route;
} }
if (bestroute == NULL) if (bestroute == NULL)
return grub_error (GRUB_ERR_NET_NO_ROUTE, "destination unreachable"); return grub_error (GRUB_ERR_NET_NO_ROUTE,
N_("destination unreachable"));
if (!bestroute->is_gateway) if (!bestroute->is_gateway)
{ {
@ -642,7 +644,8 @@ grub_net_route_address (grub_net_network_level_address_t addr,
curtarget = bestroute->gw; curtarget = bestroute->gw;
} }
return grub_error (GRUB_ERR_NET_ROUTE_LOOP, "route loop detected"); return grub_error (GRUB_ERR_NET_ROUTE_LOOP,
N_("route loop detected"));
} }
static grub_err_t static grub_err_t
@ -1168,7 +1171,8 @@ grub_net_open_real (const char *name)
} }
if (!server) if (!server)
{ {
grub_error (GRUB_ERR_NET_BAD_ADDRESS, "no server"); grub_error (GRUB_ERR_NET_BAD_ADDRESS,
N_("no server is specified"));
return NULL; return NULL;
} }
@ -1198,7 +1202,10 @@ grub_net_open_real (const char *name)
return ret; return ret;
} }
} }
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such device");
/* Restore original error. */
grub_error (GRUB_ERR_UNKNOWN_DEVICE, N_("disk `%s' not found"),
name);
return NULL; return NULL;
} }
@ -1375,7 +1382,7 @@ grub_net_fs_read_real (grub_file_t file, char *buf, grub_size_t len)
else else
return total; return total;
} }
grub_error (GRUB_ERR_TIMEOUT, "timeout reading '%s'", net->name); grub_error (GRUB_ERR_TIMEOUT, N_("timeout reading '%s'"), net->name);
return -1; return -1;
} }
@ -1488,7 +1495,7 @@ GRUB_MOD_INIT(net)
N_("Add a network address.")); N_("Add a network address."));
cmd_slaac = grub_register_command ("net_ipv6_autoconf", cmd_slaac = grub_register_command ("net_ipv6_autoconf",
grub_cmd_ipv6_autoconf, grub_cmd_ipv6_autoconf,
"[CARD [HWADDRESS]]", N_("[CARD [HWADDRESS]]"),
N_("Perform an IPV6 autoconfiguration")); N_("Perform an IPV6 autoconfiguration"));
cmd_deladdr = grub_register_command ("net_del_addr", grub_cmd_deladdr, cmd_deladdr = grub_register_command ("net_del_addr", grub_cmd_deladdr,

6
grub-core/net/tcp.c
View file

@ -657,9 +657,11 @@ grub_net_tcp_open (char *server,
{ {
grub_list_remove (GRUB_AS_LIST (socket)); grub_list_remove (GRUB_AS_LIST (socket));
if (socket->they_reseted) if (socket->they_reseted)
grub_error (GRUB_ERR_NET_PORT_CLOSED, "port closed"); grub_error (GRUB_ERR_NET_PORT_CLOSED,
N_("connection refused"));
else else
grub_error (GRUB_ERR_NET_NO_ANSWER, "no answer"); grub_error (GRUB_ERR_NET_NO_ANSWER,
N_("connection timeout"));
grub_netbuff_free (nb); grub_netbuff_free (nb);
destroy_pq (socket); destroy_pq (socket);

2
grub-core/normal/context.c
View file

@ -186,7 +186,7 @@ grub_cmd_export (struct grub_command *cmd __attribute__ ((unused)),
if (argc < 1) if (argc < 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"no environment variable specified"); N_("one argument expected"));
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
grub_env_export (args[i]); grub_env_export (args[i]);

4
grub-core/normal/menu.c
View file

@ -373,7 +373,9 @@ menu_init (int entry, grub_menu_t menu, int nested)
} }
} }
else else
grub_error (GRUB_ERR_BAD_MODULE, "no gfxmenu found"); grub_error (GRUB_ERR_BAD_MODULE,
N_("module `%s' isn't loaded"),
"gfxmenu");
grub_print_error (); grub_print_error ();
grub_wait_after_message (); grub_wait_after_message ();
} }

2
grub-core/normal/misc.c
View file

@ -115,7 +115,7 @@ grub_normal_print_device_info (const char *name)
grub_printf (_(" - Partition start at %llu"), grub_printf (_(" - Partition start at %llu"),
(unsigned long long) grub_partition_get_start (dev->disk->partition)); (unsigned long long) grub_partition_get_start (dev->disk->partition));
if (grub_disk_get_size (dev->disk) == GRUB_DISK_SIZE_UNKNOWN) if (grub_disk_get_size (dev->disk) == GRUB_DISK_SIZE_UNKNOWN)
grub_puts_ (" - Total size unknown"); grub_puts_ (N_(" - Total size unknown"));
else else
grub_printf (_(" - Total size %llu sectors"), grub_printf (_(" - Total size %llu sectors"),
(unsigned long long) grub_disk_get_size (dev->disk)); (unsigned long long) grub_disk_get_size (dev->disk));

6
grub-core/parttool/msdospart.c
View file

@ -48,7 +48,7 @@ static grub_err_t grub_pcpart_boot (const grub_device_t dev,
struct grub_msdos_partition_mbr mbr; struct grub_msdos_partition_mbr mbr;
if (dev->disk->partition->offset) if (dev->disk->partition->offset)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "not a primary partition"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("not a primary partition"));
index = dev->disk->partition->index; index = dev->disk->partition->index;
part = dev->disk->partition; part = dev->disk->partition;
@ -126,7 +126,9 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
|| grub_msdos_partition_is_extended (type)) || grub_msdos_partition_is_extended (type))
{ {
dev->disk->partition = part; dev->disk->partition = part;
return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid type"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("the partition type 0x%x isn't "
"valid"));
} }
mbr.entries[index].type = type; mbr.entries[index].type = type;

12
grub-core/script/execute.c
View file

@ -26,6 +26,7 @@
#include <grub/lib/arg.h> #include <grub/lib/arg.h>
#include <grub/normal.h> #include <grub/normal.h>
#include <grub/extcmd.h> #include <grub/extcmd.h>
#include <grub/i18n.h>
/* Max digits for a char is 3 (0xFF is 255), similarly for an int it /* Max digits for a char is 3 (0xFF is 255), similarly for an int it
is sizeof (int) * 3, and one extra for a possible -ve sign. */ is sizeof (int) * 3, and one extra for a possible -ve sign. */
@ -157,7 +158,8 @@ grub_script_return (grub_command_t cmd __attribute__((unused)),
unsigned long n; unsigned long n;
if (! scope || argc > 1) if (! scope || argc > 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "not in function scope"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("not in function scope"));
if (argc == 0) if (argc == 0)
{ {
@ -297,7 +299,8 @@ static grub_err_t
grub_script_env_set (const char *name, const char *val) grub_script_env_set (const char *name, const char *val)
{ {
if (grub_env_special (name)) if (grub_env_special (name))
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad variable name"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("invalid variable name `%s'"), name);
return grub_env_set (name, val); return grub_env_set (name, val);
} }
@ -579,7 +582,8 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
if (argv.argc < 2 || ! argv.args[1]) if (argv.argc < 2 || ! argv.args[1])
{ {
grub_script_argv_free (&argv); grub_script_argv_free (&argv);
return grub_error (GRUB_ERR_BAD_ARGUMENT, "missing arguments"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("no command is specified"));
} }
invert = 1; invert = 1;
@ -644,7 +648,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
if (ret == GRUB_ERR_TEST_FAILURE) if (ret == GRUB_ERR_TEST_FAILURE)
grub_errno = ret = GRUB_ERR_NONE; grub_errno = ret = GRUB_ERR_NONE;
else if (ret == GRUB_ERR_NONE) else if (ret == GRUB_ERR_NONE)
ret = grub_error (GRUB_ERR_TEST_FAILURE, "false"); ret = grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
else else
{ {
grub_print_error (); grub_print_error ();

2
grub-core/script/function.c
View file

@ -106,7 +106,7 @@ grub_script_function_find (char *functionname)
tmp[20] = 0; tmp[20] = 0;
/* Avoid truncating inside UTF-8 character. */ /* Avoid truncating inside UTF-8 character. */
tmp[grub_getend (tmp, tmp + grub_strlen (tmp))] = 0; tmp[grub_getend (tmp, tmp + grub_strlen (tmp))] = 0;
grub_error (GRUB_ERR_UNKNOWN_COMMAND, "unknown command `%s'", tmp); grub_error (GRUB_ERR_UNKNOWN_COMMAND, N_("can't find command `%s'"), tmp);
} }
return func; return func;

13
grub-core/term/ns8250.c
View file

@ -24,6 +24,7 @@
#include <grub/cpu/io.h> #include <grub/cpu/io.h>
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/time.h> #include <grub/time.h>
#include <grub/i18n.h>
#ifdef GRUB_MACHINE_PCBIOS #ifdef GRUB_MACHINE_PCBIOS
#include <grub/machine/memory.h> #include <grub/machine/memory.h>
@ -194,19 +195,23 @@ serial_hw_configure (struct grub_serial_port *port,
divisor = serial_get_divisor (port, config); divisor = serial_get_divisor (port, config);
if (divisor == 0) if (divisor == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port speed"));
if (config->parity != GRUB_SERIAL_PARITY_NONE if (config->parity != GRUB_SERIAL_PARITY_NONE
&& config->parity != GRUB_SERIAL_PARITY_ODD && config->parity != GRUB_SERIAL_PARITY_ODD
&& config->parity != GRUB_SERIAL_PARITY_EVEN) && config->parity != GRUB_SERIAL_PARITY_EVEN)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port parity"));
if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1 if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
&& config->stop_bits != GRUB_SERIAL_STOP_BITS_2) && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port stop bits number"));
if (config->word_len < 5 || config->word_len > 8) if (config->word_len < 5 || config->word_len > 8)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port word length"));
port->config = *config; port->config = *config;
port->configured = 0; port->configured = 0;

10
grub-core/term/serial.c
View file

@ -184,7 +184,9 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args)
port = grub_serial_find (name); port = grub_serial_find (name);
if (!port) if (!port)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown serial port"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("serial port `%s' isn't found"),
name);
config = port->config; config = port->config;
@ -203,7 +205,8 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args)
else if (! grub_strcmp (state[4].arg, "even")) else if (! grub_strcmp (state[4].arg, "even"))
config.parity = GRUB_SERIAL_PARITY_EVEN; config.parity = GRUB_SERIAL_PARITY_EVEN;
else else
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad parity"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port parity"));
} }
if (state[5].set) if (state[5].set)
@ -213,7 +216,8 @@ grub_cmd_serial (grub_extcmd_context_t ctxt, int argc, char **args)
else if (! grub_strcmp (state[5].arg, "2")) else if (! grub_strcmp (state[5].arg, "2"))
config.stop_bits = GRUB_SERIAL_STOP_BITS_2; config.stop_bits = GRUB_SERIAL_STOP_BITS_2;
else else
return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad number of stop bits"); return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port stop bits number"));
} }
/* Initialize with new settings. */ /* Initialize with new settings. */

7
grub-core/term/terminfo.c
View file

@ -169,7 +169,8 @@ grub_terminfo_set_current (struct grub_term_output *term,
return grub_errno; return grub_errno;
} }
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminfo type"); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("unknown terminfo type `%s'"),
str);
} }
grub_err_t grub_err_t
@ -664,7 +665,7 @@ grub_cmd_terminfo (grub_extcmd_context_t ctxt, int argc, char **args)
return grub_errno; return grub_errno;
if (*ptr != 'x') if (*ptr != 'x')
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"incorrect geometry specification"); N_("incorrect terminal dimensions specification"));
ptr++; ptr++;
h = grub_strtoul (ptr, &ptr, 0); h = grub_strtoul (ptr, &ptr, 0);
if (grub_errno) if (grub_errno)
@ -694,7 +695,7 @@ grub_cmd_terminfo (grub_extcmd_context_t ctxt, int argc, char **args)
} }
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"no terminal %s found or it's not handled by terminfo", N_("terminal %s isn't found or it's not handled by terminfo"),
args[0]); args[0]);
} }

5
grub-core/video/bitmap.c
View file

@ -22,6 +22,7 @@
#include <grub/dl.h> #include <grub/dl.h>
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/misc.h> #include <grub/misc.h>
#include <grub/i18n.h>
GRUB_MOD_LICENSE ("GPLv3+"); GRUB_MOD_LICENSE ("GPLv3+");
@ -202,7 +203,9 @@ grub_video_bitmap_load (struct grub_video_bitmap **bitmap,
reader = reader->next; reader = reader->next;
} }
return grub_error (GRUB_ERR_BAD_FILE_TYPE, "unsupported bitmap format"); return grub_error (GRUB_ERR_BAD_FILE_TYPE,
N_("bitmap file `%s' is of"
" unsupported format"), filename);
} }
/* Return bitmap width. */ /* Return bitmap width. */

2
grub-core/video/readers/jpeg.c
View file

@ -773,7 +773,7 @@ grub_cmd_jpegtest (grub_command_t cmd __attribute__ ((unused)),
struct grub_video_bitmap *bitmap = 0; struct grub_video_bitmap *bitmap = 0;
if (argc != 1) if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("file name expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
grub_video_reader_jpeg (&bitmap, args[0]); grub_video_reader_jpeg (&bitmap, args[0]);
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)

4
grub-core/video/video.c
View file

@ -541,7 +541,7 @@ grub_video_set_mode (const char *modestring,
grub_free (modevar); grub_free (modevar);
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"no suitable mode found"); N_("no suitable video mode found"));
} }
/* Skip separator. */ /* Skip separator. */
@ -705,7 +705,7 @@ grub_video_set_mode (const char *modestring,
grub_free (modevar); grub_free (modevar);
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"no suitable mode found"); N_("no suitable video mode found"));
} }
/* Initialize Video API module. */ /* Initialize Video API module. */

5
include/grub/misc.h
View file

@ -24,6 +24,7 @@
#include <grub/types.h> #include <grub/types.h>
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/err.h> #include <grub/err.h>
#include <grub/i18n.h>
/* GCC version checking borrowed from glibc. */ /* GCC version checking borrowed from glibc. */
#if defined(__GNUC__) && defined(__GNUC_MINOR__) #if defined(__GNUC__) && defined(__GNUC_MINOR__)
@ -285,7 +286,7 @@ grub_strtol (const char *str, char **end, int base)
{ {
if (magnitude > (unsigned long) GRUB_LONG_MAX + 1) if (magnitude > (unsigned long) GRUB_LONG_MAX + 1)
{ {
grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected"); grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
return GRUB_LONG_MIN; return GRUB_LONG_MIN;
} }
return -((long) magnitude); return -((long) magnitude);
@ -294,7 +295,7 @@ grub_strtol (const char *str, char **end, int base)
{ {
if (magnitude > GRUB_LONG_MAX) if (magnitude > GRUB_LONG_MAX)
{ {
grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected"); grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
return GRUB_LONG_MAX; return GRUB_LONG_MAX;
} }
return (long) magnitude; return (long) magnitude;

2
util/grub-fstest.c
View file

@ -50,7 +50,7 @@ execute_command (const char *name, int n, char **args)
cmd = grub_command_find (name); cmd = grub_command_find (name);
if (! cmd) if (! cmd)
grub_util_error (_("can\'t find command %s"), name); grub_util_error (_("can't find command `%s'"), name);
return (cmd->func) (cmd, n, args); return (cmd->func) (cmd, n, args);
} }

4
util/grub-mkimagexx.c
View file

@ -938,7 +938,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
num_sections = grub_target_to_host16 (e->e_shnum); num_sections = grub_target_to_host16 (e->e_shnum);
if (kernel_size < section_offset + section_entsize * num_sections) if (kernel_size < section_offset + section_entsize * num_sections)
grub_util_error ("invalid ELF format"); grub_util_error (_("premature end of file %s"), kernel_path);
sections = (Elf_Shdr *) (kernel_img + section_offset); sections = (Elf_Shdr *) (kernel_img + section_offset);
@ -1025,7 +1025,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
#endif #endif
if (! symtab_section) if (! symtab_section)
grub_util_error ("no symbol table"); grub_util_error ("%s", _("no symbol table"));
} }
else else
{ {

2
util/grub-mount.c
View file

@ -61,7 +61,7 @@ execute_command (const char *name, int n, char **args)
cmd = grub_command_find (name); cmd = grub_command_find (name);
if (! cmd) if (! cmd)
grub_util_error (_("can\'t find command %s"), name); grub_util_error (_("can't find command `%s'"), name);
return (cmd->func) (cmd, n, args); return (cmd->func) (cmd, n, args);
} }