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
Download patch file Download diff file Expand all files Collapse all files

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

@ -133,7 +133,8 @@ grub_cmd_gptsync (grub_command_t cmd __attribute__ ((unused)),
if (! partition)
{
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)

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))
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

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)))
{
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;

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;
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"
"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)
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)
{

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)
if (!term->getkeystatus)
return grub_error (GRUB_ERR_TEST_FAILURE, "false");
return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
else
nterms++;
if (!nterms)
return grub_error (GRUB_ERR_TEST_FAILURE, "false");
return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
return 0;
}
@ -91,7 +91,7 @@ grub_cmd_keystatus (grub_extcmd_context_t ctxt,
if (mods >= 0 && (mods & expect_mods) != 0)
return 0;
else
return grub_error (GRUB_ERR_TEST_FAILURE, "false");
return grub_error (GRUB_ERR_TEST_FAILURE, N_("false"));
}
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);
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]);
}
@ -468,7 +468,8 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
{
cmd = grub_command_find ("initrd16");
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);
}
@ -476,13 +477,14 @@ grub_cmd_legacy_initrd (struct grub_command *mycmd __attribute__ ((unused)),
{
cmd = grub_command_find ("module");
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 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
@ -495,7 +497,8 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
{
cmd = grub_command_find ("initrd16");
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);
}
@ -511,7 +514,8 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
newargs[0] = nounzipbuf;
cmd = grub_command_find ("module");
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);
grub_free (newargs);
@ -519,7 +523,7 @@ grub_cmd_legacy_initrdnounzip (struct grub_command *mycmd __attribute__ ((unused
}
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

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

@ -269,7 +269,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
break;
}
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]);
ptool = cur;
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.",
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;
@ -103,10 +103,12 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
return grub_errno;
pass->c = grub_strtoul (ptr, &ptr, 0);
if (grub_errno)
return grub_errno;
if (*ptr != '.')
{
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++;
@ -114,7 +116,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
if (!ptr2 || ((ptr2 - ptr) & 1) || grub_strlen (ptr2 + 1) & 1)
{
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;
@ -137,7 +139,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
grub_free (pass->salt);
grub_free (pass);
return grub_error (GRUB_ERR_BAD_ARGUMENT,
"incorrect PBKDF2 password");
N_("invalid PBKDF2 password"));
}
*ptro = (hex1 << 4) | hex2;
@ -166,7 +168,7 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
grub_free (pass->salt);
grub_free (pass);
return grub_error (GRUB_ERR_BAD_ARGUMENT,
"incorrect PBKDF2 password");
N_("invalid PBKDF2 password"));
}
*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)
break;
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]);
for (aut = autoloads; aut; aut = aut->next)
if (grub_strcmp (args[i], aut->name) == 0
@ -126,7 +127,8 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
break;
}
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]);
again = 1;
}

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

@ -416,7 +416,7 @@ grub_cmd_test (grub_command_t cmd __attribute__ ((unused)),
argc--;
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;

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;
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]);
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]);
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)),
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;

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

@ -126,7 +126,9 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
if (grub_errno)
return grub_errno;
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++;
height = grub_strtoul (ptr, &ptr, 0);
if (grub_errno)