Re: Change templates: CD -> installation medium - proposal #2

[Justin B Rye <justin.byam.rye@gmail.com>]

Justin B Rye wrote:
> How about if I go ahead and try producing a patch that uses both
> "installation image" and "installation disk", just to see how that
> looks?

Well, I can't for the life of me work out how to get "git diff" to
work on debian-installer, so here's a bodged version.  It probably
needs more work, but what do people think about the general idea?
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package

diff -ur d-i.orig/apt-cdrom-setup.templates d-i.jbr/apt-cdrom-setup.templates
--- d-i.orig/apt-cdrom-setup.templates	2019-09-13 00:59:08.137525521 +0100
+++ d-i.jbr/apt-cdrom-setup.templates	2019-09-12 23:58:48.080551016 +0100
@@ -1,73 +1,71 @@
 Template: apt-setup/progress/cdrom
 Type: text
 # :sl1:
-_Description: Scanning the CD-ROM...
+_Description: Scanning the installation disk...
 
 Template: apt-setup/cdrom/failed
 Type: error
 # :sl2:
 _Description: apt configuration problem
- An attempt to configure apt to install additional packages from the CD
- failed.
+ An attempt to configure apt to install additional packages from the
+ installation disk failed.
 
 Template: apt-setup/cdrom/set-first
 Type: boolean
 Default: false
 #flag:translate!:3
 # :sl1:
-_Description: Scan another CD or DVD?
- Your installation CD or DVD has been scanned; its label is:
+_Description: Scan another installation disk?
+ Your installation disk has been scanned; its label is:
  .
  ${LABEL}
  .
- You now have the option to scan additional CDs or DVDs for use by the
+ You now have the option to scan additional disks for use by the
  package manager (apt). Normally these should be from the same set as the
- installation CD/DVD. If you do not have any additional CDs or DVDs
- available, this step can just be skipped.
+ one you booted from. If you do not have any more available, this step
+ can just be skipped.
  .
- If you wish to scan another CD or DVD, please insert it now.
+ If you wish to scan another, please insert it now.
 
 Template: apt-setup/cdrom/set-next
 Type: boolean
 Default: false
 #flag:translate!:3
 # :sl1:
-_Description: Scan another CD or DVD?
- The CD or DVD with the following label has been scanned:
+_Description: Scan another installation disk?
+ The installation disk with the following label has been scanned:
  .
  ${LABEL}
  .
- If you wish to scan another CD or DVD, please insert it now.
+ If you wish to scan another, please insert it now.
 
 Template: apt-setup/cdrom/set-double
 Type: boolean
 Default: true
 #flag:translate!:3
 # :sl1:
-_Description: Scan another CD or DVD?
- The CD or DVD with the following label has already been scanned:
+_Description: Scan another installation disk?
+ The installation disk with the following label has already been scanned:
  .
  ${LABEL}
  .
- Please replace it now if you wish to scan another CD or DVD.
+ Please replace it now if you wish to scan another.
 
 Template: apt-setup/cdrom/set-failed
 Type: boolean
 Default: true
 # :sl1:
-_Description: Scan another CD or DVD?
+_Description: Scan another installation disk?
  An attempt to configure apt to install additional packages from the
- CD/DVD failed.
+ disk failed.
  .
- Please check that the CD/DVD has been inserted correctly.
+ Please check that the disk has been inserted correctly.
 
 Template: apt-setup/cdrom/media-change
 Type: text
 # :sl1:
-# This template uses the same text as used in the package apt for apt-cdrom
-# Do not translate "/cdrom/" (the mount point)
 _Description: Media change
- /cdrom/: Please insert the disc labeled '${LABEL}' in the drive '/cdrom/'
+ Please insert the installation disk labeled '${LABEL}'
  and press enter.
 
 Template: finish-install/progress/apt-cdrom-setup
@@ -79,29 +77,29 @@
 Template: apt-setup/use/netinst_old
 Type: text
 # :sl1:
-_Description: If you are installing from a netinst CD and choose not to use a mirror, you will end up with only a very minimal base system.
+_Description: If you are installing from a netinst image and choose not to use a mirror, you will end up with only a very minimal base system.
 
 Template: apt-setup/use/netinst
 Type: text
 # :sl1:
-_Description: You are installing from a netinst CD, which by itself only allows installation of a very minimal base system. Use a mirror to install a more complete system.
+_Description: You are installing from a netinst image, which by itself only allows installation of a very minimal base system. Use a mirror to install a more complete system.
 
 Template: apt-setup/use/cd
 Type: text
 # :sl1:
-_Description: You are installing from a CD, which contains a limited selection of packages.
+_Description: You are installing from an installation image which contains a limited selection of packages.
 
 Template: apt-setup/use/cd-set1
 Type: text
 # :sl1:
 # The value of %i can be 2 or 3
-_Description: You have scanned %i CDs. Even though these contain a fair selection of packages, some may be missing (notably some packages needed to support languages other than English).
+_Description: You have scanned %i installation images. Even though these contain a fair selection of packages, some may be missing (notably some packages needed to support languages other than English).
 
 Template: apt-setup/use/cd-set2
 Type: text
 # :sl1:
 # The value of %i can be from 4 to 8
-_Description: You have scanned %i CDs. Even though these contain a large selection of packages, some may be missing.
+_Description: You have scanned %i installation images. Even though these contain a large selection of packages, some may be missing.
 
 Template: apt-setup/use/cd-note
 Type: text
@@ -111,7 +109,7 @@
 Template: apt-setup/use/dvd
 Type: text
 # :sl1:
-_Description: You are installing from a DVD. Even though the DVD contains a large selection of packages, some may be missing.
+_Description: You are installing from a DVD image. Even though the DVD contains a large selection of packages, some may be missing.
 
 Template: apt-setup/use/inet1
 Type: text
diff -ur d-i.orig/apt-mirror-setup.templates d-i.jbr/apt-mirror-setup.templates
--- d-i.orig/apt-mirror-setup.templates	2019-09-13 00:59:08.137525521 +0100
+++ d-i.jbr/apt-mirror-setup.templates	2019-09-13 00:01:03.544552157 +0100
@@ -47,7 +47,7 @@
 #flag:translate!:3
 _Description: Use a network mirror?
  A network mirror can be used to supplement the software that is included
- on the CD-ROM. This may also make newer versions of software available.
+ on the installation disk. This may also make newer versions of software available.
  .
  ${EXPLANATION}
 
@@ -58,5 +58,5 @@
 _Description: Continue without a network mirror?
  No network mirror was selected.
  .
- If you are installing from a netinst CD and choose not to use a mirror,
+ If you are installing from a netinst image and choose not to use a mirror,
  you will end up with only a very minimal base system.
diff -ur d-i.orig/bootstrap-base.templates d-i.jbr/bootstrap-base.templates
--- d-i.orig/bootstrap-base.templates	2019-09-13 00:59:16.601275280 +0100
+++ d-i.jbr/bootstrap-base.templates	2019-09-13 00:09:01.670401153 +0100
@@ -11,8 +11,8 @@
 # See http://www.debian.org/doc/debian-policy/ch-binary.html#s3.7
 # :sl2:
 _Description: Cannot install base system
- The installer cannot figure out how to install the base system. No
- installable CD-ROM was found and no valid mirror was configured.
+ The installer cannot figure out how to install the base system. It
+ found no installable image, and no valid mirror was configured.
 
 Template: base-installer/no_codename
 Type: error
@@ -185,7 +185,7 @@
 # Debootstrap is a program name: should not be translated
 _Description: Debootstrap Error
  Couldn't retrieve ${SUBST0}. This may be due to a network problem or a
- bad CD, depending on your installation method.
+ bad installation disk, depending on your installation method.
  .
  If you are installing from CD-R or CD-RW, burning the CD at a lower
  speed may help.
diff -ur d-i.orig/cdrom-checker.templates d-i.jbr/cdrom-checker.templates
--- d-i.orig/cdrom-checker.templates	2019-09-13 00:59:53.904172397 +0100
+++ d-i.jbr/cdrom-checker.templates	2019-09-13 00:18:22.893804276 +0100
@@ -2,68 +2,68 @@
 Type: boolean
 Default: false
 # :sl3:
-_Description: Check CD-ROM integrity?
+_Description: Check installation disk integrity?
  Warning: this check depends on your hardware and may take some time.
 
 Template: cdrom-checker/askmount
 Type: note
 # :sl3:
-_Description: Insert a Debian CD-ROM
- Please insert one of the official Debian CD-ROMs into the drive
+_Description: Insert a Debian installation disk
+ Please insert one of the official Debian installation disks into the drive
  before continuing.
 
 Template: cdrom-checker/mntfailed
 Type: error
 # :sl3:
-_Description: Failed to mount CD-ROM
- The CD-ROM ${CDROM} could not be mounted correctly. Please check the media
+_Description: Failed to mount installation disk
+ The installation disk ${CDROM} could not be mounted correctly. Please check the media
  and cables, and try it again.
 
 Template: cdrom-checker/wrongcd
 Type: error
 # :sl3:
-_Description: No valid Debian CD-ROM
- The CD-ROM you have inserted is not a valid Debian CD-ROM.
- Please change the disk.
+_Description: No valid Debian installation disk
+ What you have inserted is not a valid Debian installation disk.
+ Please try again.
 
 Template: cdrom-checker/md5file_failed
 Type: error
 # TRANSLATORS: MD5 is a file name, don't translate it.
 # :sl3:
 _Description: Failed to open checksum file
- Opening the MD5 file on the CD-ROM failed. This file contains the checksums
- of the files located on the CD-ROM.
+ Opening the MD5 file from the installation image failed. This file contains the
+ checksums of the files including on the installation disk.
 
 Template: cdrom-checker/passed
 Type: note
 # :sl3:
 _Description: Integrity test successful
- The CD-ROM integrity test was successful. The CD-ROM is valid.
+ The integrity test was successful. The installation image is valid.
 
 Template: cdrom-checker/mismatch
 Type: error
 # :sl3:
 _Description: Integrity test failed
- The ${FILE} file failed the MD5 checksum verification. Your CD-ROM or
+ The ${FILE} file failed the MD5 checksum verification. Your installation disk or
  this file may have been corrupted.
 
 Template: cdrom-checker/nextcd
 Type: boolean
 Default: false
 # :sl3:
-_Description: Check the integrity of another CD-ROM?
+_Description: Check the integrity of another installation image?
 
 Template: cdrom-checker/firstcd
 Type: note
 # :sl3:
-_Description: Insert Debian boot CD-ROM
- Please make sure you have inserted the Debian boot CD-ROM
- to continue with the installation.
+_Description: Insert Debian boot disk
+ Please make sure you have inserted the Debian installation disk you
+ booted from, to continue with the installation.
 
 Template: cdrom-checker/progress_title
 Type: text
 # :sl3:
-_Description: Checking CD-ROM integrity
+_Description: Checking installation image integrity
 
 Template: cdrom-checker/progress_step
 Type: text
@@ -75,5 +75,5 @@
 #  Main menu item
 # Translators: keep it under 65 columns
 # :sl2:
-_Description: Check the CD-ROM(s) integrity
+_Description: Check the integrity of the installation image
 
diff -ur d-i.orig/cdrom-detect.templates d-i.jbr/cdrom-detect.templates
--- d-i.orig/cdrom-detect.templates	2019-09-13 00:59:56.384099079 +0100
+++ d-i.jbr/cdrom-detect.templates	2019-09-13 00:29:18.002439775 +0100
@@ -5,15 +5,15 @@
 _Description: Load CD-ROM drivers from removable media?
  No common CD-ROM drive was detected.
  .
- You may need to load additional CD-ROM drivers from removable media, such as
- a driver floppy. If you have such media available now, insert it, and
+ You may need to load additional drivers from removable media, such as
+ a USB stick. If you have these available now, insert the media, and
  continue. Otherwise, you will be given the option to manually select
- CD-ROM modules.
+ some modules.
 
 Template: cdrom-detect/detect_progress_title
 Type: text
 # :sl1:
-_Description: Detecting hardware to find CD-ROM drives
+_Description: Detecting hardware to find installation disks
 
 Template: cdrom-detect/manual_config
 Type: boolean
@@ -80,7 +80,7 @@
 Template: cdrom-detect/scanning_progress_title
 Type: text
 # :sl1:
-_Description: Scanning CD-ROM
+_Description: Scanning installation disk
 
 Template: cdrom-detect/scanning_progress_step
 Type: text
@@ -90,40 +90,40 @@
 Template: cdrom-detect/success
 Type: note
 # :sl2:
-_Description: CD-ROM detected
- The CD-ROM autodetection was successful. A CD-ROM drive has been found and it
- currently contains the CD ${cdname}. The installation will now continue.
+_Description: Installation disk detected
+ Autodetection of the installation disk was successful. A drive has been found
+ that contains '${cdname}'. The installation will now continue.
 
 Template: cdrom-detect/unetbootin_detected
 Type: note
 # :sl3:
 _Description: UNetbootin media detected
- It appears that your installation medium was generated using
+ It appears that your installation disk was generated using
  UNetbootin. UNetbootin is regularly linked with difficult or
- unreproducible problem reports from users; if you have problems using
- this installation medium, please try your installation again without
+ irreproducible problem reports from users; if you have problems using
+ this installation disk, please try your installation again without
  using UNetbootin before reporting issues.
  .
- The installation guide contains more information on how to create a
- USB installation medium directly without UNetbootin.
+ The installation guide contains more information on how to create
+ USB installation media directly without UNetbootin.
 
 Template: cdrom-detect/wrong-cd
 Type: error
 # :sl2:
-_Description: Incorrect CD-ROM detected
- The CD-ROM drive contains a CD which cannot be used for installation.
+_Description: Incorrect disk detected
+ The detected disk cannot be used for installation.
  .
- Please insert a suitable CD to continue with the installation.
+ Please insert a suitable installation disk to continue.
 
 Template: cdrom-detect/no-release
 Type: error
 # Translators: DO NOT TRANSLATE "Release". This is the name of a file.
 # :sl2:
 _Description: Error reading Release file
- The CD-ROM does not seem to contain a valid 'Release' file, or that file
+ The installation disk does not seem to contain a valid 'Release' file, or that file
  could not be read correctly.
  .
- You may try to repeat CD-ROM detection but, even if it does succeed the
+ You may try to repeat installation disk detection, but even if it does succeed the
  second time, you may experience problems later in the installation.
 
 Template: cdrom-detect/eject
@@ -147,10 +147,10 @@
 Type: text
 # finish-install progress bar item
 # :sl1:
-_Description: Unmounting and ejecting CD-ROM...
+_Description: Unmounting and ejecting installation disk...
 
 Template: debian-installer/cdrom-detect/title
 Type: text
 #  Item in the main menu to select this package
 # :sl2:
-_Description: Detect and mount CD-ROM
+_Description: Detect and mount installation disk
diff -ur d-i.orig/cdrom-retriever.templates d-i.jbr/cdrom-retriever.templates
--- d-i.orig/cdrom-retriever.templates	2019-09-13 00:59:58.924023987 +0100
+++ d-i.jbr/cdrom-retriever.templates	2019-09-13 00:31:15.550965574 +0100
@@ -2,7 +2,7 @@
 Type: boolean
 Default: true
 # :sl2:
-_Description: Failed to copy file from CD-ROM. Retry?
- There was a problem reading data from the CD-ROM. Please make sure it is in
- the drive. If retrying does not work, you should check the integrity of
- your CD-ROM.
+_Description: Failed to copy file from installation disk. Retry?
+ There was a problem reading data from the installation disk. Please
+ make sure it has been inserted correctly. If retrying does not work,
+ you should check the integrity of your installation image.
diff -ur d-i.orig/load-cdrom.templates d-i.jbr/load-cdrom.templates
--- d-i.orig/load-cdrom.templates	2019-09-13 00:59:58.928023869 +0100
+++ d-i.jbr/load-cdrom.templates	2019-09-13 00:31:55.121796165 +0100
@@ -1,4 +1,4 @@
 Template: debian-installer/load-cdrom/title
 Type: text
 #  Main menu item
-_Description: Load installer components from CD
+_Description: Load installer components from installation disk
diff -ur d-i.orig/netcfg-dhcp.templates d-i.jbr/netcfg-dhcp.templates
--- d-i.orig/netcfg-dhcp.templates	2019-09-13 01:02:07.688217461 +0100
+++ d-i.jbr/netcfg-dhcp.templates	2019-09-13 00:34:52.300560832 +0100
@@ -63,8 +63,8 @@
  The network autoconfiguration was successful. However, no default route
  was set: the system does not know how to communicate with hosts on the
  Internet. This will make it impossible to continue with the installation
- unless you have the first installation CD-ROM, a 'Netinst' CD-ROM, or
- packages available on the local network.
+ unless you have the first installation disk from a set, a 'Netinst'
+ installation disk, or packages available on the local network.
  .
  If you are unsure, you should not continue without a default route:
  contact your local network administrator about this problem.