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

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))
return grub_error (GRUB_ERR_READ_ERROR,
N_("failure reading sector 0x%llx "
" from `%s'"),
"from `%s'"),
(unsigned long long) sector,
disk->name);
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,
totl, &count))
return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx "
" from `%s'"),
"to `%s'"),
(unsigned long long) sector,
disk->name);
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);
else
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)
@ -601,7 +601,8 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,
buf, read_sector + b,
read_size) :
grub_error (GRUB_ERR_BAD_DEVICE,
"raid6rec is not loaded"));
N_("module `%s' isn't loaded"),
"raid6rec"));
}
else
{
@ -610,7 +611,8 @@ read_segment (struct grub_diskfilter_segment *seg, grub_disk_addr_t sector,
buf, read_sector + b,
read_size) :
grub_error (GRUB_ERR_BAD_DEVICE,
"raid5rec is not loaded"));
N_("module `%s' isn't loaded"),
"raid5rec"));
}
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,
buf);
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;
}
@ -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,
(void *) buf);
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;
}

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;
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++)
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)
return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx "
" from `%s'"),
"from `%s'"),
(unsigned long long) sector,
disk->name);
}
@ -497,7 +497,9 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
1024 /* cylinders */ *
256 /* heads */ *
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;
head = ((grub_uint32_t) sector) / data->sectors;
@ -516,12 +518,12 @@ grub_biosdisk_rw (int cmd, grub_disk_t disk,
{
case GRUB_BIOSDISK_READ:
return grub_error (GRUB_ERR_READ_ERROR, N_("failure reading sector 0x%llx "
" from `%s'"),
"from `%s'"),
(unsigned long long) sector,
disk->name);
case GRUB_BIOSDISK_WRITE:
return grub_error (GRUB_ERR_WRITE_ERROR, N_("failure writing sector 0x%llx "
" from `%s'"),
"to `%s'"),
(unsigned long long) sector,
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;
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)
{

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

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

@ -26,6 +26,7 @@
#include <grub/scsi.h>
#include <grub/scsicmd.h>
#include <grub/time.h>
#include <grub/i18n.h>
GRUB_MOD_LICENSE ("GPLv3+");
@ -718,7 +719,7 @@ grub_scsi_write (grub_disk_t disk __attribute((unused)),
scsi = disk->data;
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)
{