Bug#137076: boot-floppies: Remove more redundant phrases
Package: boot-floppies
Version: n/a - current CVS
Severity: minor
Here are more redundant phrases with a patch to get rid of them. My
choice is marked with a star (*).
msgid "/dev/fd0 : first floppy drive" *
msgid "/dev/fd0 : First floppy drive"
msgid "/dev/fd0 : first floppy drive"
msgid "/dev/fd1 : second floppy drive" *
msgid "/dev/fd1 : Second floppy drive"
msgid "/dev/fd1 : second floppy drive"
msgid "/dev/sfd0 : SCSI floppy drive" *
msgid "/dev/sfd0 : SCSI floppy drive"
msgid "Critical Error"
msgid "Critical error" *
msgid "Floppy Error!"
msgid "Floppy Error" *
Perhaps should 'Floppy Error' be changed into 'Floppy error'. I did
not to this, but choose to keep most of the current texts.
The following phrases could probably be combined into one phrase using
'%s' to insert the file path. I did not do this, as I suspect it will
require more changes that just the string.
msgid "Can't open /target/etc/console-tools/config"
msgid "Can't open /target/etc/fstab"
msgid "Cannot open %s: %s\n"
msgid "Cannot open /floppy/type.txt "
msgid "Error writing /target/etc/inittab"
msgid "Error writing /target/etc/inittab.real"
msgid "Error writing /target/etc/pam.d/passwd"
msgid "Error writing /target/etc/securetty"
msgid "Error writing /target/root/.profile"
Index: bootconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/bootconfig.c,v
retrieving revision 1.173
diff -u -3 -p -u -r1.173 bootconfig.c
--- bootconfig.c 2002/03/05 16:04:00 1.173
+++ bootconfig.c 2002/03/06 13:44:14
@@ -2019,7 +2019,7 @@ static char * get_device_number(char * d
command = malloc(sizeof("expr substr \"`ls -l ") + strlen(device) + sizeof("`\" 35 2"));
if ( command == NULL )
{
- problemBox(_("Can't allocate memory"),_("Critical Error"));
+ problemBox(_("Can't allocate memory"),_("Critical error"));
exit(1);
}
strcpy(command,"expr substr \"`ls -l ");
@@ -2028,7 +2028,7 @@ static char * get_device_number(char * d
pipe = popen(command,"r");
if ( pipe == NULL )
{
- problemBox(_("Can't open pipe"),_("Critical Error"));
+ problemBox(_("Can't open pipe"),_("Critical error"));
exit(1);
}
fscanf(pipe,"%u",&temp);
@@ -2041,7 +2041,7 @@ static char * get_device_number(char * d
pipe = popen(command,"r");
if ( pipe == NULL )
{
- problemBox(_("Can't open pipe"),_("Critical Error"));
+ problemBox(_("Can't open pipe"),_("Critical error"));
exit(1);
}
fscanf(pipe,"%u",&temp);
@@ -2050,7 +2050,7 @@ static char * get_device_number(char * d
number = malloc(sizeof("0x") + 4);
if ( number == NULL )
{
- problemBox(_("Can't allocate memory"),_("Critical Error"));
+ problemBox(_("Can't allocate memory"),_("Critical error"));
exit(1);
}
free (command); /* Free what we do not need any more */
@@ -2066,13 +2066,13 @@ static char * get_device_number(char * d
else
{
/* FIXME: should the file name be printed here? */
- problemBox (_("Specified file is not device", _("Critical Error")));
+ problemBox (_("Specified file is not device", _("Critical error")));
exit (1);
}
else
{
- problemBox (_("Cannot stat device", _("Critical Error")));
+ problemBox (_("Cannot stat device", _("Critical error")));
exit (1);
}
@@ -2109,14 +2109,14 @@ int create_ramdisk(char * device_number,
command = malloc(sizeof("dd < /dev/zero > " FLOP_RAMDISK " bs=1k count=") + strlen(size));
if ( command == NULL )
{
- problemBox(_("Can't allocate memory"),_("Critical Error"));
+ problemBox(_("Can't allocate memory"),_("Critical error"));
return 1;
}
strcpy(command,"dd < /dev/zero > " FLOP_RAMDISK " bs=1k count=");
strcat(command,size);
if (execlog(command,LOG_INFO) )
{
- problemBox(_("Emptying ramdisk file resulted in an error, can't continue"),_("Critical Error"));
+ problemBox(_("Emptying ramdisk file resulted in an error, can't continue"),_("Critical error"));
return 1;
}
/* a minix fs would be better. But we don't have the tools available */
@@ -2125,7 +2125,7 @@ int create_ramdisk(char * device_number,
strcat(command,size);
if ( execlog(command,LOG_INFO) )
{
- problemBox(_("Creating an ext2 partition in ramdisk resulted in an error, can't continue"),_("Critical Error"));
+ problemBox(_("Creating an ext2 partition in ramdisk resulted in an error, can't continue"),_("Critical error"));
return 1;
}
/* FIXME:
@@ -2174,7 +2174,7 @@ int create_ramdisk(char * device_number,
strcat(command," " FLOP_TMP_DIR "/lib/modules");
if ( execlog(command,LOG_DEBUG ) )
{
- problemBox(_("Unable to copy saved modules to ramdisk, can't continue"),_("Critical Error"));
+ problemBox(_("Unable to copy saved modules to ramdisk, can't continue"),_("Critical error"));
return 1;
}
/*
@@ -2193,7 +2193,7 @@ int create_ramdisk(char * device_number,
fd2 = fopen(MOD_SAVE_FILE,"r");
if ( fd2 == NULL )
{
- problemBox(_("Can't open the 'mod-save' file. Please report this bug"),_("Critical Error"));
+ problemBox(_("Can't open the 'mod-save' file. Please report this bug"),_("Critical error"));
return 1;
}
while (fgets(buffer,sizeof(buffer),fd2))
@@ -2215,17 +2215,17 @@ int create_ramdisk(char * device_number,
if (execlog("cp /sbin/insmod " FLOP_TMP_DIR "/sbin",LOG_DEBUG) )
{
- problemBox(_("Can't copy needed files"),_("Critical Error"));
+ problemBox(_("Can't copy needed files"),_("Critical error"));
return 1;
}
if (execlog("cp /bin/mount /bin/umount /bin/sh " FLOP_TMP_DIR "/bin",LOG_DEBUG) )
{
- problemBox(_("Can't copy needed files"),_("Critical Error"));
+ problemBox(_("Can't copy needed files"),_("Critical error"));
return 1;
}
if (execlog("cp /lib/ld-linux.so.2 /lib/libc.so.6 " FLOP_TMP_DIR "/lib",LOG_DEBUG) )
{
- problemBox(_("Can't copy needed files"),_("Critical Error"));
+ problemBox(_("Can't copy needed files"),_("Critical error"));
return 1;
}
execlog("umount " FLOP_TMP_DIR,LOG_DEBUG);
Index: choose_medium.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/choose_medium.c,v
retrieving revision 1.145
diff -u -3 -p -u -r1.145 choose_medium.c
--- choose_medium.c 2002/03/06 13:05:32 1.145
+++ choose_medium.c 2002/03/06 13:44:15
@@ -75,14 +75,14 @@ int mount_and_check_floppy(char *device,
items = 0;
if (strcmp(InstallationRootDevice, "/dev/fd0")) {
- choices[items].string = _("/dev/fd0 : first floppy drive");
+ choices[items].string = _("/dev/fd0 : first floppy drive");
choices[items].tag = NULL;
choices[items].state = 0;
dlist[items] = "/dev/fd0";
items++;
}
if (strcmp(InstallationRootDevice, "/dev/fd1")) {
- choices[items].string = _("/dev/fd1 : second floppy drive");
+ choices[items].string = _("/dev/fd1 : second floppy drive");
choices[items].tag = NULL;
choices[items].state = 0;
dlist[items] = "/dev/fd1";
@@ -90,7 +90,7 @@ int mount_and_check_floppy(char *device,
}
#ifdef SCSI_FLOPPY
if (strcmp(InstallationRootDevice, "/dev/sfd0")) {
- choices[items].string = _("/dev/sfd0 : SCSI floppy drive");
+ choices[items].string = _("/dev/sfd0 : SCSI floppy drive");
choices[items].tag = NULL;
choices[items].state = 0;
dlist[items] = "/dev/sfd0";
@@ -1705,8 +1705,8 @@ int do_eject(void)
#define EJ_fd0 0
#define EJ_fd1 1
struct d_choices ch[2] = {
- {NULL, _("/dev/fd0 : First floppy drive"), 0},
- {NULL, _("/dev/fd1 : Second floppy drive"), 0} };
+ {NULL, _("/dev/fd0 : first floppy drive"), 0},
+ {NULL, _("/dev/fd1 : second floppy drive"), 0} };
static int Eject_Device = EJ_none;
Eject_Device =
Index: extract_kernel.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/extract_kernel.c,v
retrieving revision 1.56
diff -u -3 -p -u -r1.56 extract_kernel.c
--- extract_kernel.c 2002/03/05 19:18:01 1.56
+++ extract_kernel.c 2002/03/06 13:44:15
@@ -295,7 +295,7 @@ int choose_and_install(void) {
ERRMSG(_("extracting %s from non-floppy device %s failed with %d"),
_("Rescue Floppy"),
Archive_Dir, status);
- vaproblemBox(_("Floppy Error!"),
+ vaproblemBox(_("Floppy Error"),
_("The attempt to extract the %s from disk failed."),
_("Rescue Floppy"));
} else {
Index: floppy_merge.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/floppy_merge.c,v
retrieving revision 1.15
diff -u -3 -p -u -r1.15 floppy_merge.c
--- floppy_merge.c 2001/07/04 16:56:44 1.15
+++ floppy_merge.c 2002/03/06 13:44:15
@@ -67,7 +67,7 @@ readFloppy(int fd_in, int fd_out, struct
if ( old_errno == 0 && read(fd_in, buf, 1) != 1 )
old_errno = errno;
if ( old_errno == 0 )
- problemBox(_("Floppy read error: the floppy unexpectedly ended."), _("Floppy Error!"));
+ problemBox(_("Floppy read error: the floppy unexpectedly ended."), _("Floppy Error"));
else
perrorBox(_("Floppy read error"));
status=-1;
@@ -95,7 +95,7 @@ readFloppy(int fd_in, int fd_out, struct
return (-1);
}
if ( checksum != originalChecksum ) {
- problemBox(_("The floppy disk checksum does not match the checksum made when it was written."),_("Floppy Error!"));
+ problemBox(_("The floppy disk checksum does not match the checksum made when it was written."),_("Floppy Error"));
unlink(TEMPFILE);
return (-1);
}
@@ -181,7 +181,7 @@ int getFloppies(const char * message, co
if ( (status = read(fd_in,(char*)&block,HEADER_SIZE)) != HEADER_SIZE) {
eject_floppy(device);
if ( status > 0 )
- problemBox(_("Could not read floppy: Unexpected end-of-file."),_("Floppy Error!"));
+ problemBox(_("Could not read floppy: Unexpected end-of-file."),_("Floppy Error"));
else
perrorBox(_("Could not read floppy"));
continue;
Index: floppy_modules.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/floppy_modules.c,v
retrieving revision 1.22
diff -u -3 -p -u -r1.22 floppy_modules.c
--- floppy_modules.c 2001/12/06 21:21:37 1.22
+++ floppy_modules.c 2002/03/06 13:44:15
@@ -205,7 +205,7 @@ int load_modules_after_boot(void)
if ( pipe != NULL )
{
pclose(pipe);
- problemBox(_("Unable to mount the floppy disk, can't continue"),_("Critical Error"));
+ problemBox(_("Unable to mount the floppy disk, can't continue"),_("Critical error"));
return 1;
}
modules_dir = malloc(sizeof(MOUNT_DIR) + sizeof('/') + sizeof(BOOT_MODULES_PLACE));
@@ -229,7 +229,7 @@ int load_modules_after_boot(void)
dir = opendir(modules_dir);
if ( dir == NULL )
{
- problemBox(_("opendir(modules_dir) returned NULL, please report this bug to gemorin@debian.org"),_("Critical Error"));
+ problemBox(_("opendir(modules_dir) returned NULL, please report this bug to gemorin@debian.org"),_("Critical error"));
free(modules_dir);
umount(MOUNT_DIR);
return 1;
@@ -327,7 +327,7 @@ int load_modules_after_boot(void)
* directory exists otherwise we try to "mkdir" it */
if ( (! NAME_ISDIR(MOD_SAVE_DIR,&statbuf)) && (mkdir(MOD_SAVE_DIR,0777) != 0) )
{
- problemBox(_("Unable to access or create the directory used for saving the modules, can't continue"),_("Critical Error"));
+ problemBox(_("Unable to access or create the directory used for saving the modules, can't continue"),_("Critical error"));
cleanquit(q);
}
tmp2 = realloc(tmp2,sizeof("cp ") + strlen(mod_choices[ret].string) + sizeof(" ") + sizeof(MOD_SAVE_DIR));
@@ -473,7 +473,7 @@ int add_modules_from_floppy(void)
{
pclose(pipe);
#if !(#cpu(s390))
- problemBox(_("Unable to mount the floppy disk, can't continue"),_("Critical Error"));
+ problemBox(_("Unable to mount the floppy disk, can't continue"),_("Critical error"));
#endif
return -1;
}
Reply to: