Bug#137076: marked as done (boot-floppies: Remove more redundant phrases)
Your message dated Tue, 19 Mar 2002 02:58:00 -0500
with message-id <E16nEVM-0003so-00@auric.debian.org>
and subject line Bug#137076: fixed in boot-floppies 3.0.21
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 6 Mar 2002 13:49:04 +0000
>From pre@saruman.uio.no Wed Mar 06 07:49:04 2002
Return-path: <pre@saruman.uio.no>
Received: from mons.uio.no [129.240.130.14] (7411)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 16ibmx-00010S-00; Wed, 06 Mar 2002 07:49:03 -0600
Received: from saruman.uio.no ([129.240.201.202])
by mons.uio.no with esmtp (Exim 2.12 #7)
id 16ibmt-00010R-00; Wed, 6 Mar 2002 14:48:59 +0100
Received: from pre by saruman.uio.no with local (Exim 2.12 #7)
id 16ibmt-0004lz-00; Wed, 6 Mar 2002 14:48:59 +0100
To: submit@bugs.debian.org
Subject: boot-floppies: Remove more redundant phrases
From: Petter Reinholdtsen <pere@hungry.com>
Message-Id: <[🔎] E16ibmt-0004lz-00@saruman.uio.no>
Sender: Petter Reinholdtsen <petter.reinholdtsen@usit.uio.no>
Date: Wed, 6 Mar 2002 14:48:59 +0100
Delivered-To: submit@bugs.debian.org
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;
}
---------------------------------------
Received: (at 137076-close) by bugs.debian.org; 19 Mar 2002 08:01:58 +0000
>From rmurray@auric.debian.org Tue Mar 19 02:01:58 2002
Return-path: <rmurray@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] (mail)
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 16nEZB-0001Yn-00; Tue, 19 Mar 2002 02:01:58 -0600
Received: from rmurray by auric.debian.org with local (Exim 3.12 1 (Debian))
id 16nEVM-0003so-00; Tue, 19 Mar 2002 02:58:00 -0500
From: Adam Di Carlo <aph@debian.org>
To: 137076-close@bugs.debian.org
X-Lisa: $Revision: 1.4 $
Subject: Bug#137076: fixed in boot-floppies 3.0.21
Message-Id: <E16nEVM-0003so-00@auric.debian.org>
Sender: Ryan Murray <rmurray@auric.debian.org>
Date: Tue, 19 Mar 2002 02:58:00 -0500
Delivered-To: 137076-close@bugs.debian.org
We believe that the bug you reported is fixed in the latest version of
boot-floppies, which is due to be installed in the Debian FTP archive:
boot-floppies_3.0.21.dsc
to pool/main/b/boot-floppies/boot-floppies_3.0.21.dsc
boot-floppies_3.0.21.tar.gz
to pool/main/b/boot-floppies/boot-floppies_3.0.21.tar.gz
install-doc_3.0.21_powerpc.deb
to pool/main/b/boot-floppies/install-doc_3.0.21_powerpc.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 137076@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Adam Di Carlo <aph@debian.org> (supplier of updated boot-floppies package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Format: 1.7
Date: Thu, 14 Mar 2002 21:06:31 -0500
Source: boot-floppies
Binary: install-doc
Architecture: source powerpc
Version: 3.0.21
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Adam Di Carlo <aph@debian.org>
Description:
install-doc - Documentation for Debian installation and release notes
Closes: 27007 122633 123948 124143 131030 133935 135504 136818 136842 136904 137076 137089
Changes:
boot-floppies (3.0.21) unstable; urgency=medium
.
* Adam Di Carlo
- we now build against Woody
.
THIS IS A SERIOUS CHANGE but required for Woody release.
If packages from unstable are needed, you will need to copy those to
localdir as configured in `config'
.
- sparc uses libc 2.2.5 now
- sparc/sun4u kernel uses 2.4.18 (thanks BenC)
- sparc doesn't have sun4dm-pci anymore, no one needs it (thanks BenC)
- EXTRACT-i18n was pulling in for all arches cfdisk-utf8, which would
break sparc build
- package searching in 'archive' dir (where downloads go) is sensitive
to the current architecture, making it safe to share the download dir
for multiple arch builds if desired
* Giuseppe Sacco
- new maintainer for the italian translation
- updated scripts/rescue/messages/it/*
- updated utilities/dbootstrap/po/it.po
- translated README-Users.it.m4
* Richard Hirst
- fix inverted test on USE_LANGUAGE_CHOOSER in rootdisk.sh
- ia64: turn on USE_LANGUAGE_CHOOSER
- ia64: move vars from make/ia64.rules to make/ia64.vars
- boxes.c, remove redundant cast, caused gcc warning on 64 bit
- we need to copy libraries if not doing library reduction
- ia64: avoid extra linux*.bin file entries in md5sum.txt
- revert part of the linux.bin change, cannot have linux.bin.gz on an
msdos format rescue.bin image - now have linux.bin or linux.gz
- m68k: avoid extra linux*.bin entries in md5sum.txt
- ia64: add support GPT partition tables, and include parted to
manage them
- hppa: turn on USE_LANGUAGE_CHOOSER
- hppa: avoid extra linux*.bin entries in md5sum.txt
* Andreas Wüst
- fix misspelling in German Version-Info, closes: #136842
* Falk Hueffner
- fixed mklibs.py to auto-detect ldlib string from the build environment
- disabled language chooser for Alpha because of space constraints
- disabled APB firmware support. There are no testers, and alternative
firmware is available (SRM)
* Jordi Mallach
- updates to Catalan dbootstrap translation and documentation.
- more manual updates (Antoni Bella)
* Eduard Bloch
- switched to 2.4.18-bf2.4 on i386/bf2.4
- new cdrom autodetection code, really closes: #123948, #133935
- updated german translation
- rearanged order of steps in rootdisk.sh; now dbootstrap
dependencies are reduced with all others, and resolveable libs are
copied trough the libreduction, where possible
- set cfdisk-utf8 dependency per arch, rootdisk.sh modifications to use
the both versions
- user-friendly LILO menu setup, including a warning about LILO security;
IMHO enough to say, closes: #27007
- added kernel features check in get_fs_type
- made old ext2 and reiserfs compatibility prompts appear in verbose mode only
- moved from del_loop/set_loop to external losetup program. Still no idea
why the kernel breaks on our functions, but having losetup on BFs is
better though. Closes: #135504 and partially #110717
* Petter Reinholdtsen
- canonicalize messages, closes: #136904, #137076
- define LANGUAGE_INST in dbootstrap_settings
- refactor release_notes.c
* Colin Walters
- don't use is_fstype to check powerpc mount types, closes: #136818
* Claus Hindsgaul
- Danish updates
* Andre Luis Lopes <andrelop@ig.com.br>
- Brazilian portuguese (pt_BR) dbootstrap updates
* Phil Blundell
- dbootstrap searches for extended language packs on CD-ROM
- centralise all terminfo files in /etc/terminfo
* Matt Kraai
- add subarch for prep kernel, closes: #131030
- do not reset mirror if debootstrap fails, closes: #122633
- log debootstrap output to /target, closes: #137089
* Stefan Gybas
- s390 now uses kernel 2.4.17 with the newly GPL'ed LCS module
- s390: required newer s390-tools because of a changed DASD API version
in kernel 2.4.17
- s390: disable DASD API version check when recognizing partitions
- s390: sleep 3 seconds after configuring the interfaces in netsetup
* Edmund GRIMLEY EVANS
- add language definition file for Esperanto
* Chris Tillman
- add bzip2 to Build-Depends for powerpc
- change file linux to linux.bin throughout for archive server
compatibility
* Thomas Poindessous <thomas@poindessous.com>
- fix dbootstrap screen clearing (closes: #124143)
(applied by dwhedon)
* Karsten Merker
- documentation updates and fixes (en/inst-methods.sgml,
en/rescue-boot.sgml)
* Junichi Uekawa
- debian/control: fix Build-Depends missing ","
- Japanese dbootstrap updates
- utilities/dbootstrap/losetup.c: include sys/types.h, sys/wait.h
waitpid was undeclared, potentially dangerous/segv
* Martin Quinson
- Keep french po file in sync
- Fix some typos in messages in bootconfig.c
* Christian T. Steigies
- m68k: turn on USE_LANGUAGE_CHOOSER
* Frank Fürst
- fix grammar and misspellings in German translation
* Petter Reinholdtsen:
- use %ld when printing 'long' content in utilities/dbootstrap/main.c.
Files:
6671d0d5d5ac932756e290ee82a0a6fb 1682 devel extra boot-floppies_3.0.21.dsc
2c87ae3b6e816f07dfe006dfe41859f6 3836583 devel extra boot-floppies_3.0.21.tar.gz
4cfc1f0499187be4c8827f3a4ca310a2 51457670 byhand - bf-arch_3.0.21_powerpc.tar.gz
9b9f46193a394283b8130e89149425e0 844 byhand - bf-archive-install_3.0.21_powerpc.sh
c4fcecf034bfa05d95f7d0b5ecced398 2062813 byhand - bf-doc_3.0.21_powerpc.tar.gz
f5ee503f7cf0871b947845845d283f3e 17928 byhand - bf-misc_3.0.21_powerpc.tar.gz
f6cc60e63915355a3d0648631a0044b4 68140 doc extra install-doc_3.0.21_powerpc.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iQCVAwUBPJF6N4/8QF79WmfNAQFsSgQApE+gc3nRRo0+/FwCY1JB4V9GK66B5m5D
q+1nipt9UophoE0NbcvCzK9Zmng/Pz7ALQ2HiYl/7k6fYvx/hnBLuoCJ+taLLkx+
V7Mf5UoU/XrF7s2lGmwl33wjphW4ToP1pxfEKYo+CLy8i1B1AFPNDUY1Zvh+DjU/
F3qm4/PmB08=
=C4v2
-----END PGP SIGNATURE-----
Reply to: