16 files changed, 67 insertions, 344 deletions
diff --git a/po/da/boot-installer.po b/po/da/boot-installer.po
index f8093da10..c0cec456c 100644
--- a/po/da/boot-installer.po
+++ b/po/da/boot-installer.po
@@ -113,7 +113,7 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:65
 #, fuzzy, no-c-format
-#| msgid "Boot Configuration"
+#| msgid "{-Boot Configuration-}{+Console configuration+}"
 msgid "Console configuration"
 msgstr "Opstartskonfiguration"
 
@@ -595,13 +595,15 @@ msgstr "Opstart fra USB-drev"
 #: boot-installer.xml:449
 #, fuzzy, no-c-format
 #| msgid ""
-#| "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
-#| "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
-#| "stick into some free USB connector and reboot the computer. The system "
-#| "should boot up, and unless you have used the flexible way to build the "
-#| "stick and not enabled it, you should be presented with the <prompt>boot:</"
-#| "prompt> prompt. Here you can enter optional boot arguments, or just hit "
-#| "&enterkey;."
+#| "{-Let's assume-}{+If your computer will boot from USB, this will probably "
+#| "be the easiest route for installation. Assuming+} you have prepared "
+#| "everything from <xref linkend=\"boot-dev-select\"/> and <xref "
+#| "linkend=\"boot-usb-files\"/>{-. Now-}{+,+} just plug your USB stick into "
+#| "some free USB connector and reboot the computer. The system should boot "
+#| "up, and unless you have used the flexible way to build the stick and not "
+#| "enabled it, you should be presented with {-the <prompt>-}{+a graphical +}"
+#| "boot{-:</prompt> prompt-}{+ menu+}. Here you can {-enter optional boot "
+#| "arguments-}{+select various installer options+}, or just hit &enterkey;."
 msgid ""
 "If your computer will boot from USB, this will probably be the easiest route "
 "for installation. Assuming you have prepared everything from <xref linkend="
@@ -1232,11 +1234,13 @@ msgstr ""
 #, fuzzy, no-c-format
 #| msgid ""
 #| "If you wish or need to add any boot parameters for either the installer "
-#| "or the kernel, press &tabkey;. This will display the default boot command "
-#| "for the selected menu entry and allow to add additional options. The help "
-#| "screens (see below) list some common possible options. Press &enterkey; "
-#| "to boot the installer with your options; pressing &escapekey; will return "
-#| "you to the boot menu and undo any changes you made."
+#| "or the kernel, press &tabkey;{+ (BIOS boot) or &ekey; (UEFI boot)+}. This "
+#| "will display the {-default -}boot command for the selected menu entry and "
+#| "allow {-to add additional options-}{+you to edit it to suit your needs+}. "
+#| "The help screens (see below) list some common possible options. Press "
+#| "&enterkey;{+ (BIOS boot) or &f10key; (UEFI boot)+} to boot the installer "
+#| "with your options; pressing &escapekey; will return you to the boot menu "
+#| "and undo any changes you made."
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
 "the kernel, press &tabkey; (BIOS boot) or &ekey; (UEFI boot). This will "
diff --git a/po/da/hardware.po b/po/da/hardware.po
index 4f11c2032..0c98ccb6b 100644
--- a/po/da/hardware.po
+++ b/po/da/hardware.po
@@ -879,13 +879,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:510
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Using a local display is technically possible without native display "
-#| "drivers via the <quote>simplefb</quote> infrastructure in the mainline "
-#| "kernel, which relies on the <quote>U-Boot</quote> bootloader for "
-#| "initializing the display hardware, but this is not supported by the u-"
-#| "boot version in &debian; 8."
+#, no-c-format
 msgid ""
 "Using a local display is technically possible without native display drivers "
 "via the <quote>simplefb</quote> infrastructure in the mainline kernel, which "
@@ -1004,14 +998,7 @@ msgstr "EfikaMX"
 
 #. Tag: para
 #: hardware.xml:584
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) "
-#| "has been supported in &debian; 7 with a platform-specific kernel, but is "
-#| "not supported anymore from &debian; 8 onwards. The code required to build "
-#| "the formerly used platform-specific kernel has been removed from the "
-#| "upstream Linux kernel source in 2012, so Debian cannot provide newer "
-#| "builds."
+#, no-c-format
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
 "been supported in &debian; 7 with a platform-specific kernel, but is no "
@@ -1165,15 +1152,7 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:683
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-#| "glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-#| "cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-#| "platform in &debian; 7, but does not support it anymore from version 8 on "
-#| "due to hardware constraints of the platform which make it unsuitable for "
-#| "the installation of newer &debian; releases."
+#, no-c-format
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
@@ -1199,12 +1178,7 @@ msgstr "MV78xx0"
 
 #. Tag: para
 #: hardware.xml:699
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-#| "board. It was supported in Debian 7 with a platform-specific kernel "
-#| "(based on the Linux kernel version 3.2), but is not supported anymore "
-#| "from Debian 8 onwards."
+#, no-c-format
 msgid ""
 "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
 "board. It was supported in Debian 7 with a platform-specific kernel (based "
diff --git a/po/da/partitioning.po b/po/da/partitioning.po
index ffe80233f..edf226d00 100644
--- a/po/da/partitioning.po
+++ b/po/da/partitioning.po
@@ -673,7 +673,9 @@ msgstr "Det andet diskettedrev er navngivet <filename>/dev/fd1</filename>."
 #. Tag: para
 #: partitioning.xml:335
 #, fuzzy, no-c-format
-#| msgid "The first DASD device is named <filename>/dev/dasda</filename>."
+#| msgid ""
+#| "The first {-DASD device-}{+hard disk detected+} is named <filename>/dev/{-"
+#| "dasda-}{+sda+}</filename>."
 msgid "The first hard disk detected is named <filename>/dev/sda</filename>."
 msgstr "Den første DASD-enhed er navngivet <filename>/dev/dasda</filename>."
 
@@ -681,8 +683,8 @@ msgstr "Den første DASD-enhed er navngivet <filename>/dev/dasda</filename>."
 #: partitioning.xml:340
 #, fuzzy, no-c-format
 #| msgid ""
-#| "The second DASD device is named <filename>/dev/dasdb</filename>, and so "
-#| "on."
+#| "The second {-DASD device-}{+hard disk detected+} is named <filename>/dev/"
+#| "{-dasdb-}{+sdb+}</filename>, and so on."
 msgid ""
 "The second hard disk detected is named <filename>/dev/sdb</filename>, and so "
 "on."
@@ -769,11 +771,12 @@ msgstr ""
 #| msgid ""
 #| "Linux represents the primary partitions as the drive name, plus the "
 #| "numbers 1 through 4. For example, the first primary partition on the "
-#| "first IDE drive is <filename>/dev/hda1</filename>. The logical partitions "
-#| "are numbered starting at 5, so the first logical partition on that same "
-#| "drive is <filename>/dev/hda5</filename>. Remember that the extended "
-#| "partition, that is, the primary partition holding the logical partitions, "
-#| "is not usable by itself. This applies to SCSI disks as well as IDE disks."
+#| "first {-IDE -}drive is <filename>/dev/{-hda1-}{+sda1+}</filename>. The "
+#| "logical partitions are numbered starting at 5, so the first logical "
+#| "partition on that same drive is <filename>/dev/{-hda5-}{+sda5+}</"
+#| "filename>. Remember that the extended partition, that is, the primary "
+#| "partition holding the logical partitions, is not usable by itself.{- This "
+#| "applies to SCSI disks as well as IDE disks.-}"
 msgid ""
 "Linux represents the primary partitions as the drive name, plus the numbers "
 "1 through 4. For example, the first primary partition on the first drive is "
diff --git a/po/da/preparing.po b/po/da/preparing.po
index 454285475..73c208bea 100644
--- a/po/da/preparing.po
+++ b/po/da/preparing.po
@@ -1532,7 +1532,7 @@ msgstr ""
 #. Tag: para
 #: preparing.xml:1275
 #, fuzzy, no-c-format
-#| msgid "Their order on the system."
+#| msgid "{-Their order-}{+an OS to be running+} on the system{-.-}{+;+}"
 msgid "an OS to be running on the system;"
 msgstr "Deres rækkefølge på systemet."
 
diff --git a/po/da/random-bits.po b/po/da/random-bits.po
index 2f8aeae3d..d9d95811a 100644
--- a/po/da/random-bits.po
+++ b/po/da/random-bits.po
@@ -126,7 +126,8 @@ msgstr ""
 #. Tag: entry
 #: random-bits.xml:47
 #, fuzzy, no-c-format
-#| msgid "Tenth partition of the fourth SCSI hard disk"
+#| msgid ""
+#| "{-Tenth-}{+Seventh+} partition of the {-fourth SCSI-}{+second+} hard disk"
 msgid "Seventh partition of the second hard disk"
 msgstr "10. partition for den fjerde SCSI-harddisk"
 
diff --git a/po/da/using-d-i.po b/po/da/using-d-i.po
index d4b3c80b8..41c710e81 100644
--- a/po/da/using-d-i.po
+++ b/po/da/using-d-i.po
@@ -2316,10 +2316,13 @@ msgstr ""
 #: using-d-i.xml:1367
 #, fuzzy, no-c-format
 #| msgid ""
-#| "If you choose guided partitioning for your IA-64 system, there will be an "
-#| "additional partition, formatted as a FAT16 bootable filesystem, for the "
-#| "EFI boot loader. There is also an additional menu item in the formatting "
-#| "menu to manually set up a partition as an EFI boot partition."
+#| "If you {-choose-}{+have booted in EFI mode then within the+} guided "
+#| "partitioning {-for your IA-64 system,-}{+setup+} there will be an "
+#| "additional partition, formatted as a {-FAT16-}{+FAT32+} bootable "
+#| "filesystem, for the EFI boot loader{+. This partition is known as an EFI "
+#| "System Partition (ESP)+}. There is also an additional menu item in the "
+#| "formatting menu to manually set up a partition as an {-EFI boot "
+#| "partition-}{+ESP+}."
 msgid ""
 "If you have booted in EFI mode then within the guided partitioning setup "
 "there will be an additional partition, formatted as a FAT32 bootable "
@@ -2532,9 +2535,9 @@ msgstr ""
 #: using-d-i.xml:1465
 #, fuzzy, no-c-format
 #| msgid ""
-#| "If you forget to select and format an EFI boot partition, "
-#| "<command>partman</command> will detect this and will not let you continue "
-#| "until you allocate one."
+#| "If you{+ boot in EFI mode but+} forget to select and format an EFI {-boot "
+#| "partition-}{+System Partition+}, <command>partman</command> will detect "
+#| "this and will not let you continue until you allocate one."
 msgid ""
 "If you boot in EFI mode but forget to select and format an EFI System "
 "Partition, <command>partman</command> will detect this and will not let you "
@@ -5015,10 +5018,10 @@ msgstr ""
 #: using-d-i.xml:3038
 #, fuzzy, no-c-format
 #| msgid ""
-#| "By default, grub will be installed into the Master Boot Record (MBR), "
-#| "where it will take over complete control of the boot process. If you "
-#| "prefer, you can install it elsewhere. See the grub manual for complete "
-#| "information."
+#| "By default, {-grub-}{+Grub+} will be installed into the {-Master Boot "
+#| "Record (MBR)-}{+PReP partition+}, where it will{- take-} over complete "
+#| "control of the boot process.{- If you prefer, you can install it "
+#| "elsewhere. See the grub manual for complete information.-}"
 msgid ""
 "By default, Grub will be installed into the PReP partition, where it will "
 "over complete control of the boot process."
diff --git a/po/el/hardware.po b/po/el/hardware.po
index e474d6b10..54fe414e3 100644
--- a/po/el/hardware.po
+++ b/po/el/hardware.po
@@ -3181,14 +3181,7 @@ msgstr "USB stick μνήμης"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
@@ -3703,12 +3696,6 @@ msgstr ""
 #~ "config-option;</quote> στην ενότητα <quote>&smp-config-section;</quote> "
 #~ "των ρυθμίσεων του πυρήνα.</phrase>"
 
-#~| msgid ""
-#~| "You should be using a VGA-compatible display interface for the console "
-#~| "terminal. Nearly every modern display card is compatible with VGA. "
-#~| "Ancient standards such CGA, MDA, or HGA should also work, assuming you "
-#~| "do not require X11 support. Note that X11 is not used during the "
-#~| "installation process described in this document."
 #~ msgid ""
 #~ "You should be using a VGA-compatible display interface for the console "
 #~ "terminal. Nearly every modern display card is compatible with VGA. "
@@ -3818,12 +3805,6 @@ msgstr ""
 #~ "κατασκευαστές περιφερειακών παρακάμπτουν την ενσωματωμένη επεξεργαστική "
 #~ "ισχύ του υλικού τους."
 
-#~| msgid ""
-#~| "You can help improve this situation by encouraging these manufacturers "
-#~| "to release the documentation and other resources necessary for us to "
-#~| "program their hardware, but the best strategy is simply to avoid this "
-#~| "sort of hardware until it is listed as working in the <ulink url=\"&url-"
-#~| "hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 #~ msgid ""
 #~ "You can help improve this situation by encouraging these manufacturers to "
 #~ "release the documentation and other resources necessary for us to program "
diff --git a/po/es/hardware.po b/po/es/hardware.po
index 8c009a2dd..00136aee8 100644
--- a/po/es/hardware.po
+++ b/po/es/hardware.po
@@ -3166,14 +3166,7 @@ msgstr "Dispositivo de memoria USB"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
diff --git a/po/fr/hardware.po b/po/fr/hardware.po
index 017267d43..ff73dbcb5 100644
--- a/po/fr/hardware.po
+++ b/po/fr/hardware.po
@@ -84,9 +84,6 @@ msgstr "Architectures reconnues"
 #. Tag: para
 #: hardware.xml:42
 #, no-c-format
-#| msgid ""
-#| "&debian; GNU/Linux &release; supports eight major architectures and "
-#| "several variations of each architecture known as <quote>flavors</quote>."
 msgid ""
 "&debian; GNU/Linux &release; supports ten major architectures and several "
 "variations of each architecture known as <quote>flavors</quote>."
@@ -361,7 +358,6 @@ msgstr "prep"
 #. Tag: entry
 #: hardware.xml:148
 #, no-c-format
-#| msgid "Amiga Power-UP Systems (APUS)"
 msgid "Power Systems"
 msgstr "Power Systems"
 
@@ -496,17 +492,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:279
 #, no-c-format
-#| msgid ""
-#| "ARM systems are a lot more heterogenous than the i386/amd64-based PC "
-#| "architecture, where all systems share a common system firmware (BIOS or/"
-#| "and UEFI) which handles the board-specific basic hardware initialization "
-#| "in a standardized way. The ARM architecture is used mainly in so-called "
-#| "<quote>systems-on-chip</quote> (SoCs). These SoCs are designed by many "
-#| "different companies with vastly varying hardware components even for the "
-#| "very basic functionality required to bring the system up. Systems using "
-#| "them usually lack a common system firmware interface and as a result, on "
-#| "ARM systems the Linux kernel has to take care of many system-specific low-"
-#| "level issues which are handled by the mainboard's BIOS in the PC world."
 msgid ""
 "The ARM architecture is used mainly in so-called <quote>systems-on-chip</"
 "quote> (SoCs). These SoCs are designed by many different companies with "
@@ -529,18 +514,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:292
 #, no-c-format
-#| msgid ""
-#| "At the beginning of the ARM support in the Linux kernel, this resulted in "
-#| "the requirement of having a seperate kernel for each ARM system in "
-#| "contrast to the <quote>one-fits-all</quote> kernel for PC systems. As "
-#| "this approach does not scale to a large number of different systems, work "
-#| "has started to be able to provide a single ARM kernel that can run on "
-#| "different ARM systems. Support for newer ARM systems gets implemented in "
-#| "a way that allows the use of such a multiplatform kernel, but for several "
-#| "older systems a seperate specific kernel is still required. Because of "
-#| "this, the standard &debian; distribution only supports installation on a "
-#| "selected number of older ARM systems in addition to the newer systems "
-#| "which are supported by the ARM multiplatform (armmp) kernel."
 msgid ""
 "At the beginning of the ARM support in the Linux kernel, the hardware "
 "variety resulted in the requirement of having a separate kernel for each ARM "
@@ -580,16 +553,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:313
 #, no-c-format
-#| msgid ""
-#| "The ARM architecture has evolved over time and modern ARM processors "
-#| "provide features which are not available in older models. &debian; "
-#| "therefore provides two ARM ports, the &debian;/armel and the &debian;/"
-#| "armhf port. &debian;/armel targets older ARM processors without support "
-#| "for a hardware floating point unit (FPU), while &debian;/armhf works only "
-#| "on newer ARM processors which implement at least the ARMv7 architecture "
-#| "with version 3 of the ARM vector floating point specification (VFPv3). "
-#| "&debian;/armhf makes use of the extended features and performance "
-#| "enhancements available on these models."
 msgid ""
 "The ARM architecture has evolved over time and modern ARM processors provide "
 "features which are not available in older models. &debian; therefore "
@@ -619,11 +582,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:350
 #, no-c-format
-#| msgid ""
-#| "Technically, several ARM CPUs can be run in either endian mode (big or "
-#| "little), but in practice the vast majority of currently available systems "
-#| "uses little-endian mode. Both &debian;/armhf and &debian;/armel support "
-#| "only little-endian systems."
 msgid ""
 "Technically, all currently available ARM CPUs can be run in either endian "
 "mode (big or little), but in practice the vast majority use little-endian "
@@ -639,7 +597,6 @@ msgstr ""
 #. Tag: title
 #: hardware.xml:357
 #, no-c-format
-#| msgid "Platforms supported by Debian/armel"
 msgid "Platforms supported by Debian/arm64"
 msgstr "Plates-formes prises en charge par Debian/arm64"
 
@@ -661,14 +618,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:368
 #, no-c-format
-#| msgid ""
-#| "Generally, the ARM multiplatform support in the Linux kernel allows "
-#| "running &d-i; on armhf systems not explicitly listed above, as long as "
-#| "the kernel used by &d-i; has support for the target system's components "
-#| "and a device-tree file for the target is available. In these cases, the "
-#| "installer can usually provide a working userland installation, but it "
-#| "probably cannot automatically make the system bootable, as doing that in "
-#| "many cases requires device-specific information."
 msgid ""
 "The tested platforms are listed below, but in general, the multiplatform "
 "support in the arm64 Linux kernel also allows running &d-i; on arm64 systems "
@@ -693,9 +642,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:382
 #, no-c-format
-#| msgid ""
-#| "The following platforms are supported by &debian;/armel; they require "
-#| "platform-specific kernels."
 msgid ""
 "The following platforms are known to be supported by &debian;/arm64 in this "
 "release. There is only one kernel, which supports all the listed platforms."
@@ -754,10 +700,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:420
 #, no-c-format
-#| msgid ""
-#| "When using &d-i; on such systems, you have to manually make the system "
-#| "bootable at the end of the installation, e.g. by running the required "
-#| "commands in a shell started from within &d-i;."
 msgid ""
 "When using &d-i; on non-UEFI systems, you may have to manually make the "
 "system bootable at the end of the installation, e.g. by running the required "
@@ -807,9 +749,6 @@ msgstr "Versatile Express"
 #. Tag: para
 #: hardware.xml:450
 #, no-c-format
-#| msgid ""
-#| "The Versatile Express is a development board series from ARM consisting "
-#| "of a baseboard which can be equipped with various CPU daughterboards."
 msgid ""
 "The Versatile Express is a development board series from ARM consisting of a "
 "baseboard which can be equipped with various CPU daughter boards."
@@ -858,7 +797,6 @@ msgstr "LeMaker Banana Pi et Banana Pro"
 #. Tag: para
 #: hardware.xml:476
 #, no-c-format
-#| msgid "LinkSprite pcDuino"
 msgid "LinkSprite pcDuino and pcDuino3"
 msgstr "LinkSprite pcDuino et pcDuino3"
 
@@ -924,12 +862,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:510
 #, no-c-format
-#| msgid ""
-#| "Using a local display is technically possible without native display "
-#| "drivers via the <quote>simplefb</quote> infrastructure in the mainline "
-#| "kernel, which relies on the <quote>U-Boot</quote> bootloader for "
-#| "initializing the display hardware, but this is not supported by the u-"
-#| "boot version in &debian; 8."
 msgid ""
 "Using a local display is technically possible without native display drivers "
 "via the <quote>simplefb</quote> infrastructure in the mainline kernel, which "
@@ -1024,10 +956,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:570
 #, no-c-format
-#| msgid ""
-#| "When using &d-i; on such systems, you have to manually make the system "
-#| "bootable at the end of the installation, e.g. by running the required "
-#| "commands in a shell started from within &d-i;."
 msgid ""
 "When using &d-i; on such systems, you may have to manually make the system "
 "bootable at the end of the installation, e.g. by running the required "
@@ -1053,13 +981,6 @@ msgstr "EfikaMX"
 #. Tag: para
 #: hardware.xml:584
 #, no-c-format
-#| msgid ""
-#| "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) "
-#| "has been supported in &debian; 7 with a platform-specific kernel, but is "
-#| "not supported anymore from &debian; 8 onwards. The code required to build "
-#| "the formerly used platform-specific kernel has been removed from the "
-#| "upstream Linux kernel source in 2012, so Debian cannot provide newer "
-#| "builds."
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
 "been supported in &debian; 7 with a platform-specific kernel, but is no "
@@ -1221,14 +1142,6 @@ msgstr "IOP32x"
 #. Tag: para
 #: hardware.xml:683
 #, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-#| "glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-#| "cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-#| "platform in &debian; 7, but does not support it anymore from version 8 on "
-#| "due to hardware constraints of the platform which make it unsuitable for "
-#| "the installation of newer &debian; releases."
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
@@ -1256,11 +1169,6 @@ msgstr "MV78xx0"
 #. Tag: para
 #: hardware.xml:699
 #, no-c-format
-#| msgid ""
-#| "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-#| "board. It was supported in Debian 7 with a platform-specific kernel "
-#| "(based on the Linux kernel version 3.2), but is not supported anymore "
-#| "from Debian 8 onwards."
 msgid ""
 "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
 "board. It was supported in Debian 7 with a platform-specific kernel (based "
@@ -3247,17 +3155,12 @@ msgstr "Pour CHRP, l'utilisation de disquette est actuellement impossible."
 #. Tag: title
 #: hardware.xml:2044
 #, no-c-format
-#| msgid "CD-ROM/DVD-ROM"
 msgid "CD-ROM/DVD-ROM/BD-ROM"
 msgstr "CD-ROM/DVD-ROM/BD-ROM"
 
 #. Tag: para
 #: hardware.xml:2046
 #, no-c-format
-#| msgid ""
-#| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
-#| "CD-ROMs and DVD-ROMs, because both technologies are really the same from "
-#| "the operating system's point of view."
 msgid ""
 "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to all of "
 "CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies are really the "
@@ -3278,9 +3181,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2056
 #, no-c-format
-#| msgid ""
-#| "USB CD-ROM drives are also supported, as are FireWire devices that are "
-#| "supported by the ohci1394 and sbp2 drivers."
 msgid ""
 "On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are FireWire "
 "devices that are supported by the ohci1394 and sbp2 drivers."
@@ -3318,13 +3218,6 @@ msgstr "Les clés USB"
 #. Tag: para
 #: hardware.xml:2087
 #, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
diff --git a/po/hu/hardware.po b/po/hu/hardware.po
index a4e52d488..26d0e9002 100644
--- a/po/hu/hardware.po
+++ b/po/hu/hardware.po
@@ -3072,14 +3072,7 @@ msgstr "USB háttértároló"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
@@ -3432,7 +3425,6 @@ msgstr ""
 #~ msgid "Freescale"
 #~ msgstr "Freescale"
 
-#~| msgid "<entry>xl</entry>"
 #~ msgid "<entry>mx5</entry>"
 #~ msgstr "<entry>mx5</entry>"
 
@@ -3448,7 +3440,6 @@ msgstr ""
 #~ msgid "cobalt"
 #~ msgstr "cobalt"
 
-#~| msgid "<entry>rpc</entry>"
 #~ msgid "<entry>powerpc</entry>"
 #~ msgstr "<entry>powerpc</entry>"
 
diff --git a/po/ja/hardware.po b/po/ja/hardware.po
index 52356becb..5f9f7f9de 100644
--- a/po/ja/hardware.po
+++ b/po/ja/hardware.po
@@ -3065,14 +3065,7 @@ msgstr "USB メモリ"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
diff --git a/po/ko/hardware.po b/po/ko/hardware.po
index 046d715cc..544cce62c 100644
--- a/po/ko/hardware.po
+++ b/po/ko/hardware.po
@@ -1004,14 +1004,7 @@ msgstr "EfikaMX"
 
 #. Tag: para
 #: hardware.xml:584
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) "
-#| "has been supported in &debian; 7 with a platform-specific kernel, but is "
-#| "not supported anymore from &debian; 8 onwards. The code required to build "
-#| "the formerly used platform-specific kernel has been removed from the "
-#| "upstream Linux kernel source in 2012, so Debian cannot provide newer "
-#| "builds."
+#, no-c-format
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
 "been supported in &debian; 7 with a platform-specific kernel, but is no "
@@ -1159,15 +1152,7 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:683
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-#| "glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-#| "cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-#| "platform in &debian; 7, but does not support it anymore from version 8 on "
-#| "due to hardware constraints of the platform which make it unsuitable for "
-#| "the installation of newer &debian; releases."
+#, no-c-format
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
@@ -1192,12 +1177,7 @@ msgstr "MV78xx0"
 
 #. Tag: para
 #: hardware.xml:699
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-#| "board. It was supported in Debian 7 with a platform-specific kernel "
-#| "(based on the Linux kernel version 3.2), but is not supported anymore "
-#| "from Debian 8 onwards."
+#, no-c-format
 msgid ""
 "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
 "board. It was supported in Debian 7 with a platform-specific kernel (based "
@@ -3183,14 +3163,7 @@ msgstr "USB 메모리"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
diff --git a/po/pt/hardware.po b/po/pt/hardware.po
index 181bc08a9..3ec01cb76 100644
--- a/po/pt/hardware.po
+++ b/po/pt/hardware.po
@@ -892,13 +892,7 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:510
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Using a local display is technically possible without native display "
-#| "drivers via the <quote>simplefb</quote> infrastructure in the mainline "
-#| "kernel, which relies on the <quote>U-Boot</quote> bootloader for "
-#| "initializing the display hardware, but this is not supported by the u-"
-#| "boot version in &debian; 8."
+#, no-c-format
 msgid ""
 "Using a local display is technically possible without native display drivers "
 "via the <quote>simplefb</quote> infrastructure in the mainline kernel, which "
@@ -1015,14 +1009,7 @@ msgstr "EfikaMX"
 
 #. Tag: para
 #: hardware.xml:584
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) "
-#| "has been supported in &debian; 7 with a platform-specific kernel, but is "
-#| "not supported anymore from &debian; 8 onwards. The code required to build "
-#| "the formerly used platform-specific kernel has been removed from the "
-#| "upstream Linux kernel source in 2012, so Debian cannot provide newer "
-#| "builds."
+#, no-c-format
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
 "been supported in &debian; 7 with a platform-specific kernel, but is no "
@@ -1176,15 +1163,7 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:683
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-#| "glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-#| "cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-#| "platform in &debian; 7, but does not support it anymore from version 8 on "
-#| "due to hardware constraints of the platform which make it unsuitable for "
-#| "the installation of newer &debian; releases."
+#, no-c-format
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
@@ -1210,12 +1189,7 @@ msgstr "MV78xx0"
 
 #. Tag: para
 #: hardware.xml:699
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-#| "board. It was supported in Debian 7 with a platform-specific kernel "
-#| "(based on the Linux kernel version 3.2), but is not supported anymore "
-#| "from Debian 8 onwards."
+#, no-c-format
 msgid ""
 "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
 "board. It was supported in Debian 7 with a platform-specific kernel (based "
@@ -3283,14 +3257,7 @@ msgstr "USB Memory Stick"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
@@ -3781,13 +3748,6 @@ msgstr ""
 #~ msgid "CHRP subarchitecture (unsupported)"
 #~ msgstr "Sub-arquitectura CHRP (não suportada)"
 
-#~| msgid ""
-#~| "Multiprocessor support &mdash; also called <quote>symmetric "
-#~| "multiprocessing</quote> or SMP &mdash; is available for this "
-#~| "architecture. The standard &debian; &release; kernel image has been "
-#~| "compiled with <firstterm>SMP-alternatives</firstterm> support. This "
-#~| "means that the kernel will detect the number of processors (or processor "
-#~| "cores) and will automatically deactivate SMP on uniprocessor systems."
 #~ msgid ""
 #~ "Multiprocessor support &mdash; also called <quote>symmetric "
 #~ "multiprocessing</quote> or SMP &mdash; is available for this "
diff --git a/po/ru/hardware.po b/po/ru/hardware.po
index 8d2970157..37273eca6 100644
--- a/po/ru/hardware.po
+++ b/po/ru/hardware.po
@@ -1021,14 +1021,7 @@ msgstr "EfikaMX"
 
 #. Tag: para
 #: hardware.xml:584
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) "
-#| "has been supported in &debian; 7 with a platform-specific kernel, but is "
-#| "not supported anymore from &debian; 8 onwards. The code required to build "
-#| "the formerly used platform-specific kernel has been removed from the "
-#| "upstream Linux kernel source in 2012, so Debian cannot provide newer "
-#| "builds."
+#, no-c-format
 msgid ""
 "The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
 "been supported in &debian; 7 with a platform-specific kernel, but is no "
@@ -1181,15 +1174,7 @@ msgstr "IOP32x"
 
 #. Tag: para
 #: hardware.xml:683
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Intel's I/O Processor (IOP) line is found in a number of products related "
-#| "to data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-#| "glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-#| "cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-#| "platform in &debian; 7, but does not support it anymore from version 8 on "
-#| "due to hardware constraints of the platform which make it unsuitable for "
-#| "the installation of newer &debian; releases."
+#, no-c-format
 msgid ""
 "Intel's I/O Processor (IOP) line is found in a number of products related to "
 "data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
@@ -1215,12 +1200,7 @@ msgstr "MV78xx0"
 
 #. Tag: para
 #: hardware.xml:699
-#, fuzzy, no-c-format
-#| msgid ""
-#| "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-#| "board. It was supported in Debian 7 with a platform-specific kernel "
-#| "(based on the Linux kernel version 3.2), but is not supported anymore "
-#| "from Debian 8 onwards."
+#, no-c-format
 msgid ""
 "The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
 "board. It was supported in Debian 7 with a platform-specific kernel (based "
@@ -3273,14 +3253,7 @@ msgstr "Карта памяти USB"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
diff --git a/po/sv/hardware.po b/po/sv/hardware.po
index 85c92e67c..e79d3cd97 100644
--- a/po/sv/hardware.po
+++ b/po/sv/hardware.po
@@ -3629,12 +3629,6 @@ msgstr ""
 #~ "att välja bort <quote>&smp-config-option;</quote> i avsnittet <quote>&smp-"
 #~ "config-section;</quote> i konfigurationen av kärnan.</phrase>"
 
-#~| msgid ""
-#~| "You should be using a VGA-compatible display interface for the console "
-#~| "terminal. Nearly every modern display card is compatible with VGA. "
-#~| "Ancient standards such CGA, MDA, or HGA should also work, assuming you "
-#~| "do not require X11 support. Note that X11 is not used during the "
-#~| "installation process described in this document."
 #~ msgid ""
 #~ "You should be using a VGA-compatible display interface for the console "
 #~ "terminal. Nearly every modern display card is compatible with VGA. "
@@ -3739,12 +3733,6 @@ msgstr ""
 #~ "kringutrustning snålar med den inbäddade processorkraften i sin "
 #~ "maskinvara."
 
-#~| msgid ""
-#~| "You can help improve this situation by encouraging these manufacturers "
-#~| "to release the documentation and other resources necessary for us to "
-#~| "program their hardware, but the best strategy is simply to avoid this "
-#~| "sort of hardware until it is listed as working in the <ulink url=\"&url-"
-#~| "hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>."
 #~ msgid ""
 #~ "You can help improve this situation by encouraging these manufacturers to "
 #~ "release the documentation and other resources necessary for us to program "
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index deca41178..7533bc787 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -2943,14 +2943,7 @@ msgstr "U 盘"
 
 #. Tag: para
 #: hardware.xml:2087
-#, fuzzy, no-c-format
-#| msgid ""
-#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
-#| "cheap storage device. Most modern computer systems also allow booting the "
-#| "&d-i; from such a stick. Many modern computer systems, in particular "
-#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
-#| "and booting from USB media ist the standard way of installing a new "
-#| "operating system on them."
+#, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"