Re: Change templates: CD -> installation medium - final patch
Hi,
Nicholas D Steeves <nsteeves@gmail.com> wrote:
> Justin B Rye <justin.byam.rye@gmail.com> writes:
>
> > Holger Wansing wrote:
> >> And they all need to covered here.
> >> Maybe we cannot find a term that works perfectly for all of them, however
> >> having a suitable coverterm for all would be the major goal.
> >
> > Contenders so far:
> > * "insert another medium", "insert more media", and "insert another
> > item of media" all run the risk of annoying readers because they're
> > unidiomatic or "wrong" or clumsy.
>
> As far as I can tell "installation media" is the most commonly used term
> (Eg: RedHat, SUSE, Microsoft, Apple). While it might not be the ideal
> term, it's worth mentioning that idiosyncratic documentation may also
> have a "risk" of this kind. My vote is for "installation media" because
> I've never seen any of the proposed alternatives in print. It
> definitely needs "installation" for precision, because there are many
> types of media, and "media" is a generic and neutral term.
That's a good argument IMHO, not mentioned before.
And given that most people were fine with this term in the first run
(except of Ben), and there is no perfect choice in this case anyway,
I will move back to "installation media" and to Justins review from
https://lists.debian.org/debian-boot/2019/09/msg00082.html
The corresponding patch is attached.
I will apply it shortly.
Holger
--
Holger Wansing <hwansing@mailbox.org>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
--- change-cd-into-installation-media_by-package.txt 2019-09-08 14:34:06.000000000 +0200
+++ change-cd-into-installation-media_by-package_workingcopy.txt 2019-09-15 00:46:32.532122011 +0200
@@ -1,468 +1,465 @@
in Package: cdrom-retriever
#. Type: text
#. Description
#. Main menu item
#: ../load-cdrom.templates:1001
-msgid "Load installer components from CD"
+msgid "Load installer components from installation media"
msgstr ""
#. Type: boolean
#. Description
#. :sl2:
#: ../cdrom-retriever.templates:1001
-msgid "Failed to copy file from CD-ROM. Retry?"
+msgid "Failed to copy file from installation media. Retry?"
msgstr ""
#. Type: boolean
#. Description
#. :sl2:
#: ../cdrom-retriever.templates:1001
msgid ""
-"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."
+"There was a problem reading data. Please make sure you have inserted the installation "
+"media correctly. If retrying does not work, you should check the integrity of your "
+"installation media."
msgstr ""
in Package: iso-scan
#. Type: text
#. Description
#. Main menu item
#: ../load-iso.templates:1001
msgid "Load installer components from an installer ISO"
msgstr ""
in Package: cdrom-detect
#. Type: text
#. Description
#. :sl1:
#: ../cdrom-detect.templates:2001
-msgid "Detecting hardware to find CD-ROM drives"
+msgid "Detecting hardware to find installation media"
msgstr ""
#. Type: text
#. Description
#. :sl1:
#: ../cdrom-detect.templates:10001
-msgid "Scanning CD-ROM"
+msgid "Scanning installation media"
msgstr ""
#. Type: text
#. Description
#. finish-install progress bar item
#. :sl1:
#: ../cdrom-detect.templates:19001
-msgid "Unmounting and ejecting CD-ROM..."
+msgid "Unmounting/ejecting installation media..."
msgstr ""
#. Type: boolean
#. Description
#. :sl2:
#: ../cdrom-detect.templates:1001
msgid ""
-"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 "
-"continue. Otherwise, you will be given the option to manually select CD-ROM "
+"You may need to load additional drivers from removable media, such as "
+"a driver floppy or a USB stick. If you have these available now, insert the media, and "
+"continue. Otherwise, you will be given the option to manually select some "
"modules."
msgstr ""
#. Type: note
#. Description
#. :sl2:
#: ../cdrom-detect.templates:12001
-msgid "CD-ROM detected"
+msgid "Installation media detected"
msgstr ""
#. Type: note
#. Description
#. :sl2:
#: ../cdrom-detect.templates:12001
msgid ""
-"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."
+"Autodetection of the installation media was successful. A drive has been found "
+"that contains '${cdname}'. The installation will now continue."
msgstr ""
#. Type: error
#. Description
#. :sl2:
#: ../cdrom-detect.templates:14001
-msgid "Incorrect CD-ROM detected"
+msgid "Incorrect installation media detected"
msgstr ""
#. Type: error
#. Description
#. :sl2:
#: ../cdrom-detect.templates:14001
-msgid "The CD-ROM drive contains a CD which cannot be used for installation."
+msgid "The detected media cannot be used for installation."
msgstr ""
#. Type: error
#. Description
#. :sl2:
#: ../cdrom-detect.templates:14001
-msgid "Please insert a suitable CD to continue with the installation."
+msgid "Please provide suitable media to continue with the installation."
msgstr ""
#. Type: error
#. Description
#. Translators: DO NOT TRANSLATE "Release". This is the name of a file.
#. :sl2:
#: ../cdrom-detect.templates:15001
msgid ""
-"The CD-ROM does not seem to contain a valid 'Release' file, or that file "
+"The installation media do not seem to contain a valid 'Release' file, or that file "
"could not be read correctly."
msgstr ""
#. Type: error
#. Description
#. Translators: DO NOT TRANSLATE "Release". This is the name of a file.
#. :sl2:
#: ../cdrom-detect.templates:15001
msgid ""
-"You may try to repeat CD-ROM detection but, even if it does succeed the "
+"You may try to repeat the media detection, but even if it does succeed the "
"second time, you may experience problems later in the installation."
msgstr ""
#. Type: text
#. Description
#. Item in the main menu to select this package
#. :sl2:
#: ../cdrom-detect.templates:20001
-msgid "Detect and mount CD-ROM"
+msgid "Detect and mount installation media"
msgstr ""
in Package: apt-setup
#. Type: text
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:1001
-msgid "Scanning the CD-ROM..."
+msgid "Scanning the installation media..."
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#. Type: boolean
#. Description
#. :sl1:
#. Type: boolean
#. Description
#. :sl1:
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:3001 ../apt-cdrom-setup.templates:4001
#: ../apt-cdrom-setup.templates:5001 ../apt-cdrom-setup.templates:6001
-msgid "Scan another CD or DVD?"
+msgid "Scan extra installation media?"
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:3001
-msgid "Your installation CD or DVD has been scanned; its label is:"
+msgid "Scanning your installation media finds the label: "
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:3001
msgid ""
-"You now have the option to scan additional CDs or DVDs for use by the "
+"You now have the option of scanning additional media 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 additional media, this step "
+"can just be skipped."
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:3001 ../apt-cdrom-setup.templates:4001
-msgid "If you wish to scan another CD or DVD, please insert it now."
+msgid "If you wish to scan more media, please insert another one now."
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:4001
-msgid "The CD or DVD with the following label has been scanned:"
+msgid "The image with the following label has been scanned:"
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:5001
-msgid "The CD or DVD with the following label has already been scanned:"
+msgid "The image with the following label has already been scanned:"
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:5001
-msgid "Please replace it now if you wish to scan another CD or DVD."
+msgid "Please replace it now, if you wish to scan another."
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:6001
msgid ""
-"An attempt to configure apt to install additional packages from the CD/DVD "
+"An attempt to configure apt to install additional packages from the media "
"failed."
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:6001
-msgid "Please check that the CD/DVD has been inserted correctly."
+msgid "Please check that the media has been inserted correctly."
msgstr ""
#. Type: text
#. Description
#. :sl1:
-#. This template uses the same text as used in the package apt for apt-cdrom
-#. Do not translate "/cdrom/" (the mount point)
#: ../apt-cdrom-setup.templates:7001
msgid ""
-"/cdrom/: Please insert the disc labeled '${LABEL}' in the drive '/cdrom/' "
+"Please insert the media labeled '${LABEL}' "
"and press enter."
msgstr ""
#. Type: text
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:11001
msgid ""
-"You are installing from a CD, which contains a limited selection of packages."
+"You are installing from an image which contains a limited selection of packages."
msgstr ""
#. Type: text
#. Description
#. :sl1:
#. The value of %i can be 2 or 3
#: ../apt-cdrom-setup.templates:12001
#, no-c-format
msgid ""
-"You have scanned %i CDs. Even though these contain a fair selection of "
+"You have scanned %i images. Even though these contain a fair selection of "
"packages, some may be missing (notably some packages needed to support "
"languages other than English)."
msgstr ""
#. Type: text
#. Description
#. :sl1:
#. The value of %i can be from 4 to 8
#: ../apt-cdrom-setup.templates:13001
#, no-c-format
msgid ""
-"You have scanned %i CDs. Even though these contain a large selection of "
+"You have scanned %i images. Even though these contain a large selection of "
"packages, some may be missing."
msgstr ""
#. Type: text
#. Description
#. :sl1:
#: ../apt-cdrom-setup.templates:15001
msgid ""
-"You are installing from a DVD. Even though the DVD contains a large "
+"You are installing from a DVD image. Even though it contains a large "
"selection of packages, some may be missing."
msgstr ""
#. Type: error
#. Description
#. :sl2:
#: ../apt-cdrom-setup.templates:2001
msgid ""
-"An attempt to configure apt to install additional packages from the CD "
+"An attempt to configure apt to install additional packages from the media "
"failed."
msgstr ""
#. Type: boolean
#. Description
#. :sl1:
#: ../apt-mirror-setup.templates:5001
msgid ""
"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."
+"the installation media. This may also make newer versions of software available."
msgstr ""
in Package: netcfg
#. Type: boolean
#. Description
#. :sl2:
#: ../netcfg-dhcp.templates:8001
msgid ""
"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 "
+"have the first image from a set of installation media, a 'Netinst' image, or packages "
"available on the local network."
msgstr ""
in Package: cdrom-checker
#. Type: boolean
#. Description
#. :sl3:
#: ../cdrom-checker.templates:1001
-msgid "Check CD-ROM integrity?"
+msgid "Check integrity of the installation media?"
msgstr ""
#. Type: note
#. Description
#. :sl3:
#: ../cdrom-checker.templates:2001
-msgid "Insert a Debian CD-ROM"
+msgid "Insert Debian installation media"
msgstr ""
#. Type: note
#. Description
#. :sl3:
#: ../cdrom-checker.templates:2001
msgid ""
-"Please insert one of the official Debian CD-ROMs into the drive before "
+"Please insert one of the official Debian installation media before "
"continuing."
msgstr ""
#. Type: error
#. Description
#. :sl3:
#: ../cdrom-checker.templates:3001
-msgid "Failed to mount CD-ROM"
+msgid "Failed to mount installation media"
msgstr ""
#. Type: error
#. Description
#. :sl3:
#: ../cdrom-checker.templates:3001
msgid ""
-"The CD-ROM ${CDROM} could not be mounted correctly. Please check the media "
-"and cables, and try it again."
+"The device '${CDROM}' could not be mounted correctly. Please check the medium "
+"and cables, and try again."
msgstr ""
#. Type: error
#. Description
#. :sl3:
#: ../cdrom-checker.templates:4001
-msgid "No valid Debian CD-ROM"
+msgid "No valid Debian installation media"
msgstr ""
#. Type: error
#. Description
#. :sl3:
#: ../cdrom-checker.templates:4001
msgid ""
-"The CD-ROM you have inserted is not a valid Debian CD-ROM. Please change the "
-"disk."
+"What you have inserted is no valid Debian installation media. Please try again."
msgstr ""
#. Type: error
#. Description
#. TRANSLATORS: MD5 is a file name, don't translate it.
#. :sl3:
#: ../cdrom-checker.templates:5001
msgid ""
-"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 on the media failed. This file contains the checksums "
+"of the files located on the media."
msgstr ""
#. Type: note
#. Description
#. :sl3:
#: ../cdrom-checker.templates:6001
-msgid "The CD-ROM integrity test was successful. The CD-ROM is valid."
+msgid "The integrity test was successful. The installation image is valid."
msgstr ""
#. Type: error
#. Description
#. :sl3:
#: ../cdrom-checker.templates:7001
msgid ""
-"The ${FILE} file failed the MD5 checksum verification. Your CD-ROM or this "
+"The file ${FILE} failed the MD5 checksum verification. Your installation media or this "
"file may have been corrupted."
msgstr ""
#. Type: boolean
#. Description
#. :sl3:
#: ../cdrom-checker.templates:8001
-msgid "Check the integrity of another CD-ROM?"
+msgid "Check the integrity of another installation image?"
msgstr ""
#. Type: note
#. Description
#. :sl3:
#: ../cdrom-checker.templates:9001
-msgid "Insert Debian boot CD-ROM"
+msgid "Insert Debian boot media"
msgstr ""
#. Type: note
#. Description
#. :sl3:
#: ../cdrom-checker.templates:9001
msgid ""
-"Please make sure you have inserted the Debian boot CD-ROM to continue with "
-"the installation."
+"Please make sure you have inserted the Debian installation media you "
+"booted from, to continue with the installation."
msgstr ""
#. Type: text
#. Description
#. :sl3:
#: ../cdrom-checker.templates:10001
-msgid "Checking CD-ROM integrity"
+msgid "Checking integrity of installation image"
msgstr ""
in Package: base-installer
#. Type: error
#. Description
#. The base system is the minimal Debian system
#. See http://www.debian.org/doc/debian-policy/ch-binary.html#s3.7
#. :sl2:
#: ../bootstrap-base.templates:2001
msgid ""
-"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."
msgstr ""
#. Type: error
#. Description
#. :sl2:
#. SUBST0 is a filename or package name
#. Debootstrap is a program name: should not be translated
#: ../bootstrap-base.templates:22001
msgid ""
-"Couldn't retrieve ${SUBST0}. This may be due to a network problem or a bad "
-"CD, depending on your installation method."
+"Couldn't retrieve ${SUBST0}. This may be due to a network problem or bad "
+"media, depending on your installation method."
msgstr ""
#. Type: error
#. Description
#. :sl2:
#. SUBST0 is a filename or package name
#. Debootstrap is a program name: should not be translated
#: ../bootstrap-base.templates:22001
msgid ""
"If you are installing from CD-R or CD-RW, burning the CD at a lower speed "
"may help."
Reply to: