Bug#136904: marked as done (boot-floopies: Ease translation by removing redundant phrases)
Your message dated Tue, 19 Mar 2002 02:58:00 -0500
with message-id <E16nEVM-0003sm-00@auric.debian.org>
and subject line Bug#136904: 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; 5 Mar 2002 10:50:41 +0000
>From pre@saruman.uio.no Tue Mar 05 04:50:41 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 16iCWn-0006ZA-00; Tue, 05 Mar 2002 04:50:41 -0600
Received: from saruman.uio.no ([129.240.201.202])
by mons.uio.no with esmtp (Exim 2.12 #7)
id 16iCWi-0002Dm-00; Tue, 5 Mar 2002 11:50:36 +0100
Received: from pre by saruman.uio.no with local (Exim 2.12 #7)
id 16iCWi-0006QZ-00; Tue, 5 Mar 2002 11:50:36 +0100
To: submit@bugs.debian.org
Subject: boot-floopies: Ease translation by removing redundant phrases
From: Petter Reinholdtsen <pere@hungry.com>
Message-Id: <E16iCWi-0006QZ-00@saruman.uio.no>
Sender: Petter Reinholdtsen <petter.reinholdtsen@usit.uio.no>
Date: Tue, 5 Mar 2002 11:50:36 +0100
Delivered-To: submit@bugs.debian.org
Package: boot-floopies
Version: n/a - current CVS
Severity: minor
Tags: patch
When checking utilities/dbootstrap/po/dbootstrap.pot, I find a few
redundant phrases that should be combined to reduce the number of
phrases to translate.
I suggest combining the following using the one I mark with a star
(*). I include a patch to fix it.
msgid "Mount Failed"
msgid "Mount failed" *
msgid "OK" *
msgid "Ok"
msgid "Need Valid Symlink"
msgid "Need valid symlink" *
msgid "Please Insert Disk"
msgid "Please insert disk"
msgid "Please insert the disk" *
msgid "Reboot system?"
msgid "Reboot the system?" *
Index: bootconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/bootconfig.c,v
retrieving revision 1.172
diff -u -3 -p -u -r1.172 bootconfig.c
--- bootconfig.c 2002/03/03 14:24:18 1.172
+++ bootconfig.c 2002/03/05 10:45:12
@@ -629,7 +629,7 @@ static int run_palo(void)
boxPopWindow();
problemBox(_("The requested operation cannot be performed because "
"the /target/vmlinux symlink could not be resolved."),
- _("Need Valid Symlink"));
+ _("Need valid symlink"));
return 1;
}
@@ -1191,7 +1191,7 @@ static int just_mount_the_damn_floppy(ch
if (!system("cat /proc/mounts | grep -q /floppy"))
execlog("umount /floppy", LOG_DEBUG);
- if (twoButtonBox(message, _("Please Insert Disk"),
+ if (twoButtonBox(message, _("Please insert the disk"),
_("Continue"), _("Cancel"), 1) == DLG_NO)
return -2;
for (fs_type = fs_type_tab; *fs_type; fs_type++) {
@@ -1266,7 +1266,7 @@ static int install_milo(const char* boot
if (just_mount_the_damn_floppy(prtbuf)) {
problemBox(_("Unable to mount the floppy. You may have "
"inserted the wrong floppy. Please try again.")
- , _("Mount Failed"));
+ , _("Mount failed"));
continue;
}
/* Try to find the MILO binary */
Index: boxes.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/boxes.c,v
retrieving revision 1.64
diff -u -3 -p -u -r1.64 boxes.c
--- boxes.c 2002/03/03 19:39:34 1.64
+++ boxes.c 2002/03/05 10:45:12
@@ -328,7 +328,7 @@ char *inputBox(const char *text, const c
newtCenteredWindow (INPUTBOX_LEN + 1, height+5, title);
i1 = newtEntry(1, height+2, proto, INPUTBOX_LEN - 1, &val,
NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
- b1 = newtCompactButton ( 20, height+4, _("Ok"));
+ b1 = newtCompactButton ( 20, height+4, _("OK"));
b2 = newtCompactButton ( 32, height+4, _("Cancel"));
f1 = newtForm(NULL, NULL, 0);
newtFormAddComponents (f1, t1, i1, b1, b2, NULL);
@@ -575,7 +575,7 @@ int checkBox(const char* text, const cha
newtFormSetHeight(sform, lheight);
newtFormSetWidth(sform,width - 10);
- okay = newtCompactButton ( (width-18)/3, height-_ButtonH, _("Ok"));
+ okay = newtCompactButton ( (width-18)/3, height-_ButtonH, _("OK"));
cancel = newtCompactButton ( (width-18)/3*2+9, height-_ButtonH, _("Cancel"));
newtFormAddComponents(form,tbox,sform,okay,cancel,NULL);
Index: choose_medium.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/choose_medium.c,v
retrieving revision 1.135
diff -u -3 -p -u -r1.135 choose_medium.c
--- choose_medium.c 2002/02/25 16:30:56 1.135
+++ choose_medium.c 2002/03/05 10:45:12
@@ -116,7 +116,7 @@ int mount_and_check_floppy(char *device,
(device[5] == 's') ? "SCSI" :
#endif
((device[7] == '0') ? _("first") : _("second")));
- if (twoButtonBox(prtbuf, _("Please insert disk"),
+ if (twoButtonBox(prtbuf, _("Please insert the disk"),
_("Continue"), _("Cancel"), 1) == DLG_NO) {
return DLG_CANCEL;
}
@@ -135,7 +135,7 @@ int mount_and_check_floppy(char *device,
snprintf(prtbuf, sizeof(prtbuf),
_("Unable to mount the %s. You may have inserted the wrong floppy. Please try again."),
text);
- problemBox(prtbuf, _("Mount Failed"));
+ problemBox(prtbuf, _("Mount failed"));
device = NULL;
continue;
} else {
@@ -143,7 +143,7 @@ int mount_and_check_floppy(char *device,
prompting again */
snprintf(prtbuf, sizeof(prtbuf),
_("Unable to mount the %s."), text);
- problemBox(prtbuf, _("Mount Failed"));
+ problemBox(prtbuf, _("Mount failed"));
return -1;
}
}
@@ -155,7 +155,7 @@ int mount_and_check_floppy(char *device,
(device[5] == 's') ? "SCSI" :
#endif
((device[7] == '0') ? _("first") : _("second")));
- problemBox(prtbuf, _("Mount Failed"));
+ problemBox(prtbuf, _("Mount failed"));
device = NULL;
continue;
}
@@ -843,7 +843,7 @@ choose_cdrom (void)
_("Please insert the CD-ROM"));
if (execlog("mount -t iso9660 -o nojoliet -r /dev/cdrom " CM_MOUNTPOINT_DIR, LOG_INFO)) {
- problemBox(_("The CD-ROM was not mounted successfully."), _("Mount Failed"));
+ problemBox(_("The CD-ROM was not mounted successfully."), _("Mount failed"));
/* db_errno = DB_CANNOT_MOUNT or something */
status = -1; /* #### DB_EXIT_ERROR */
goto cleanup_and_exit;
@@ -976,7 +976,7 @@ static int choose_idefloppy(void)
device, CM_MOUNTPOINT_DIR);
syslog(LOG_CRIT, prtbuf);
if (execlog(prtbuf, LOG_INFO)) {
- problemBox(_("The disk was not mounted successfully."), _("Mount Failed"));
+ problemBox(_("The disk was not mounted successfully."), _("Mount failed"));
status = -1;
} else {
status = choose_archive_dir(_("Please choose the path on the disk"
@@ -1019,7 +1019,7 @@ static int choose_harddisk(void)
type = fdisk_fstype_name_of(p->type);
if (! type) {
- vaproblemBox(_("Mount Failed"),
+ vaproblemBox(_("Mount failed"),
_("We do not seem to support the type of filesystem on the partition you selected, %s."),
fdisk_sysname(p->type));
return 1;
@@ -1040,7 +1040,7 @@ static int choose_harddisk(void)
(strcmp(type,"ext3")==0) ? "auto" : type, (disqtype == problem_report ? "" : "-r"), p->name);
if (execlog(prtbuf, LOG_INFO)) {
problemBox(_("The partition was not mounted successfully."),
- _("Mount Failed"));
+ _("Mount failed"));
return 1;
}
#endif
Index: partition_config.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/partition_config.c,v
retrieving revision 1.146
diff -u -3 -p -u -r1.146 partition_config.c
--- partition_config.c 2002/02/17 22:00:23 1.146
+++ partition_config.c 2002/03/05 10:45:13
@@ -558,7 +558,7 @@ _("Note on additional space for the Reis
INFOMSG("partition program returned %d", status);
if (root_on_disk &&
yesNoBox(_("You changed the partition scheme on a disk which is currently mounted. Often, in order to work with the new partitions, you may need to reboot the system. If you reboot, you will be able to carry on with installation from where you left off.\n\nReboot now?"),
- _("Reboot system?")) == DLG_YES) {
+ _("Reboot the system?")) == DLG_YES) {
INFOMSG("partition changed on mounted disk, rebooting");
reboot_system();
}
Index: problem_report.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/problem_report.c,v
retrieving revision 1.9
diff -u -3 -p -u -r1.9 problem_report.c
--- problem_report.c 2002/02/07 04:00:25 1.9
+++ problem_report.c 2002/03/05 10:45:13
@@ -63,7 +63,7 @@ generate_problem_report ()
{
if (yesNoBox
(_("I could not mount the floppy. Would you like to make an ext2 filesystem on the floppy (thus erasing all it's data)?"),
- _("Mount Failed")) == 0)
+ _("Mount failed")) == 0)
goto failure;
if (vexeclog
(LOG_DEBUG, "mke2fs %s >/dev/null 2>&1", floppy_device))
---------------------------------------
Received: (at 136904-close) by bugs.debian.org; 19 Mar 2002 08:02:22 +0000
>From rmurray@auric.debian.org Tue Mar 19 02:02:22 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 16nEZa-0001cx-00; Tue, 19 Mar 2002 02:02:22 -0600
Received: from rmurray by auric.debian.org with local (Exim 3.12 1 (Debian))
id 16nEVM-0003sm-00; Tue, 19 Mar 2002 02:58:00 -0500
From: Adam Di Carlo <aph@debian.org>
To: 136904-close@bugs.debian.org
X-Lisa: $Revision: 1.4 $
Subject: Bug#136904: fixed in boot-floppies 3.0.21
Message-Id: <E16nEVM-0003sm-00@auric.debian.org>
Sender: Ryan Murray <rmurray@auric.debian.org>
Date: Tue, 19 Mar 2002 02:58:00 -0500
Delivered-To: 136904-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 136904@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: