Christian Perrier wrote: > > diff --git a/packages/hw-detect/debian/hw-detect.templates b/packages/hw-detect/debian/hw-detect.templates > > index 5301467..cf31ef3 100644 > > --- a/packages/hw-detect/debian/hw-detect.templates > > +++ b/packages/hw-detect/debian/hw-detect.templates > > @@ -67,9 +67,20 @@ Default: false > > # :sl2: > > _Description: Load missing drivers from removable media? > > A driver for your hardware is not available. You may need > > - to load drivers from removable media, such as a driver floppy. > > + to load drivers from removable media, such as a USB stick, or driver floppy. > > Here you mention "or driver floppy" > > > > If you have such media available now, insert it, and continue. > > > > +Template: hw-detect/load_firmware > > +Type: boolean > > +Default: false > > +# :sl2: > > +_Description: Load missing firmware from removable media? > > + Some of your hardware needs firmware files to operate. The firmware > > + can be loaded from removable media, such as a USB stick or floppy. > > And here just "or floppy". I think that last wording is slightly the > best of the two. We use the "driver floppy" wording elsewhere (cdrom-detect, floppy/*-drivers.img, disk label files). In the load_firmware prompt, what's being prompted for is not, strictly speaking a driver floppy, but a floppy with some firmware on it. > > + If you have such media available now, insert it, and continue. > > That sentence could be factorized out in its own paragraph Done in both places. > > + . > > + The missing firmware files are: ${FILES} > > + > > Missing sentence dot? (that's debatable: should a dot come after a > list of files? I'd say yes) I think it would just confuse things by looking like either an extra dot stuck at the end of a filename, or a reference to the current working directory. `grep ': ${' */debian/*templates` finds similar constructs w/o trailing dots. > > diff --git a/packages/hw-detect/debian/hw-detect.templates b/packages/hw-detect/debian/hw-detect.templates > > index cf31ef3..a06b928 100644 > > --- a/packages/hw-detect/debian/hw-detect.templates > > +++ b/packages/hw-detect/debian/hw-detect.templates > > @@ -81,6 +81,11 @@ _Description: Load missing firmware from removable media? > > . > > The missing firmware files are: ${FILES} > > > > +Template: base-installer/progress/hw-detect > > +Type: text > > +# :sl1: > > +_Description: Installing firmware... > > + > > Move to sublevel 2? Is that progress text shown on *any* default install? It'll be shown very briefly on all installs currently. I'd like to find a better wording for it, that doesn't imply there *is* firmware to install. (I considered only enabling the hook if firmware was installed by check-missing-firmware, but firmware can also be installed manually, or provided in a repacked image like tbm does for the nslu2; this hook can also handle installing such firmware.) Maybe "Checking for firmware..." ? -- see shy jo
Attachment:
signature.asc
Description: Digital signature