6 files changed, 8 insertions, 175 deletions
diff --git a/po/da/hardware.po b/po/da/hardware.po
index d48411bf6..d8b6e1eb2 100644
--- a/po/da/hardware.po
+++ b/po/da/hardware.po
@@ -806,7 +806,6 @@ msgstr "Cubietech Cubieboard 1 + 2 / Cubietruck"
 #. Tag: para
 #: hardware.xml:498
 #, no-c-format
-#| msgid "LeMaker Banana Pi"
 msgid "LeMaker Banana Pi and Banana Pro"
 msgstr "LeMaker Banana Pi og Banana Pro"
 
@@ -870,9 +869,9 @@ msgid ""
 msgstr ""
 "Hovedlinjen for Linuxkernen understøtter seriel konsol, ethernet, SATA, USB "
 "og MMC/SD-kort på Allwinner A10, A10s/A13 og A20 SOC'er, men har ikke en "
-"standarddriver for skærmen (HDMI/VGA/LCD) og lydudstyr i disse SoC'er. "
-"NAND-flashhukommelse, som er indbygget i nogle sunXi-baserede systemer, "
-"er ikke understøttet."
+"standarddriver for skærmen (HDMI/VGA/LCD) og lydudstyr i disse SoC'er. NAND-"
+"flashhukommelse, som er indbygget i nogle sunXi-baserede systemer, er ikke "
+"understøttet."
 
 #. Tag: para
 #: hardware.xml:535
@@ -883,10 +882,11 @@ msgid ""
 "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."
 msgstr ""
-"Brug af en lokal skærm er teknisk muligt uden standarddrivere for skærmen via "
-"infrastrukturen <quote>simplefb</quote> i hovedlinjekernen, som afhænger af "
-"opstartsindlæseren <quote>u-boot</quote> for initialisering af skærmudstyret, "
-"men dette er ikke understøttet af u-boot-versionen i &debian; 8."
+"Brug af en lokal skærm er teknisk muligt uden standarddrivere for skærmen "
+"via infrastrukturen <quote>simplefb</quote> i hovedlinjekernen, som afhænger "
+"af opstartsindlæseren <quote>u-boot</quote> for initialisering af "
+"skærmudstyret, men dette er ikke understøttet af u-boot-versionen i &debian; "
+"8."
 
 #. Tag: term
 #: hardware.xml:547
diff --git a/po/fr/boot-installer.po b/po/fr/boot-installer.po
index a00d1795c..a3984a714 100644
--- a/po/fr/boot-installer.po
+++ b/po/fr/boot-installer.po
@@ -396,14 +396,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:187
 #, no-c-format
-#| msgid ""
-#| "The autoboot framework in modern u-boot versions works similar to the "
-#| "boot ordering options in a PC BIOS, i.e. it checks a list of possible "
-#| "boot devices for a valid boot image and starts the first one it finds. If "
-#| "there is no operating system installed, plugging in the USB stick and "
-#| "powering up the system should result in starting the installer. You can "
-#| "also initiate the USB-boot process any time from the u-boot prompt by "
-#| "entering the <quote>run usb_boot</quote> command."
 msgid ""
 "The autoboot framework in modern u-boot versions works similar to the boot "
 "ordering options in a PC BIOS, i.e. it checks a list of possible boot "
@@ -425,22 +417,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:197
 #, no-c-format
-#| msgid ""
-#| "One problem that can come up when booting from a USB stick while using a "
-#| "serial console can be a console baudrate mismatch. If a console variable "
-#| "is defined in u-boot, the &d-i; boot script automatically passes it to "
-#| "the kernel to set the primary console device and, if applicable, the "
-#| "console baudrate. Unfortunately the handling of the console variable "
-#| "varies from platform to platform - on some platforms, the console "
-#| "variable includes the baudrate (as in <quote>console=ttyS0,115200</"
-#| "quote>), while on other platforms the console variable contains only the "
-#| "device (as in <quote>console=ttyS0</quote>). The latter case leads to a "
-#| "garbled console output when the default baudrate differs between u-boot "
-#| "and the kernel. Modern u-boot versions often use 115200 baud while the "
-#| "kernel still defaults to the traditional 9600 baud. If this happens, you "
-#| "should manually set the console variable to contain the correct baudrate "
-#| "for your system and then start the installer with the <quote>run "
-#| "usb_boot</quote> command."
 msgid ""
 "One problem that can come up when booting from a USB stick while using a "
 "serial console can be a console baudrate mismatch. If a console variable is "
diff --git a/po/fr/hardware.po b/po/fr/hardware.po
index f1d6f8a63..4f274343c 100644
--- a/po/fr/hardware.po
+++ b/po/fr/hardware.po
@@ -490,17 +490,6 @@ msgstr "Microprocesseurs, cartes mère et cartes vidéo"
 #. Tag: para
 #: hardware.xml:284
 #, 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 ""
 "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 "
@@ -773,7 +762,6 @@ msgstr "Freescale MX53 Quick Start Board"
 #. Tag: para
 #: hardware.xml:466
 #, no-c-format
-#| msgid "The IMX53QSB is a development board based on the i.MX53 SOC."
 msgid "The IMX53QSB is a development board based on the i.MX53 SoC."
 msgstr "La IMX53QSB est une carte de développement basée sur la puce i.MX53."
 
@@ -805,11 +793,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:487
 #, no-c-format
-#| msgid ""
-#| "The armmp kernel supports several development boards and embedded systems "
-#| "based on the Allwinner A10 (architecture codename <quote>sun4i</quote>) "
-#| "and A20 (architecture codename <quote>sun7i</quote>) SOCs. Full installer "
-#| "support is currently available for the following sunXi-based systems:"
 msgid ""
 "The armmp kernel supports several development boards and embedded systems "
 "based on the Allwinner A10 (architecture codename <quote>sun4i</quote>), "
@@ -833,7 +816,6 @@ msgstr "Cubietech Cubieboard 1 + 2 / Cubietruck"
 #. Tag: para
 #: hardware.xml:498
 #, no-c-format
-#| msgid "LeMaker Banana Pi"
 msgid "LeMaker Banana Pi and Banana Pro"
 msgstr "LeMaker Banana Pi et Banana Pro"
 
@@ -858,9 +840,6 @@ msgstr "Miniand Hackberry"
 #. Tag: para
 #: hardware.xml:510
 #, no-c-format
-#| msgid ""
-#| "Olimex A10-Olinuxino-LIME / A10s-Olinuxino Micro / A13-Olinuxino / A13-"
-#| "Olinuxino Micro / A20-Olinuxino-LIME / A20-Olinuxino Micro"
 msgid ""
 "Olimex A10-Olinuxino-LIME / A10s-Olinuxino Micro / A13-Olinuxino / A13-"
 "Olinuxino Micro / A20-Olinuxino-LIME / A20-Olinuxino-LIME2 / A20-Olinuxino "
@@ -892,11 +871,6 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:527
 #, no-c-format
-#| msgid ""
-#| "The mainline Linux kernel generally supports serial console, ethernet, "
-#| "SATA, USB and MMC/SD-cards on Allwinner A10 and A20 SOCs, but it does not "
-#| "have local display (HDMI/VGA/LVDS) and audio support. The NAND flash "
-#| "memory that is built into some sunXi-based systems is not supported."
 msgid ""
 "The mainline Linux kernel generally supports serial console, ethernet, SATA, "
 "USB and MMC/SD-cards on Allwinner A10, A10s/A13 and A20 SoCs, but it does "
@@ -935,15 +909,6 @@ msgstr "SolidRun Cubox-i2eX / Cubox-i4Pro"
 #. Tag: para
 #: hardware.xml:549
 #, no-c-format
-#| msgid ""
-#| "The Cubox-i series is a set of small, cubical-shaped systems based on the "
-#| "Freescale i.MX6 SOC family. System support for the Cubox-i series is "
-#| "limited to drivers and device-tree information available in the mainline "
-#| "Linux kernel; the Freescale 3.0 kernel series for the Cubox-i is not "
-#| "supported by Debian. Available drivers in the mainline kernel include "
-#| "serial console, ethernet, USB, MMC/SD-card and display support over HDMI "
-#| "(console and X11). In addition to that, the eSATA port on the Cubox-i4Pro "
-#| "is supported."
 msgid ""
 "The Cubox-i series is a set of small, cubical-shaped systems based on the "
 "Freescale i.MX6 SoC family. System support for the Cubox-i series is limited "
diff --git a/po/fr/preseed.po b/po/fr/preseed.po
index a69a42b9d..0b9609b00 100644
--- a/po/fr/preseed.po
+++ b/po/fr/preseed.po
@@ -2808,52 +2808,6 @@ msgstr "Installation du programme d'amorçage"
 #. Tag: screen
 #: preseed.xml:1109
 #, no-c-format
-#| msgid ""
-#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
-#| "If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true</phrase>\n"
-#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
-#| "uncomment this\n"
-#| "#d-i grub-installer/skip boolean true</phrase>\n"
-#| "\n"
-#| "# This is fairly safe to set, it makes grub install automatically to the "
-#| "MBR\n"
-#| "# if no other operating system is detected on the machine.\n"
-#| "d-i grub-installer/only_debian boolean true\n"
-#| "\n"
-#| "# This one makes grub-installer install to the MBR if it also finds some "
-#| "other\n"
-#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
-#| "d-i grub-installer/with_other_os boolean true\n"
-#| "\n"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev  string (hd0,1)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev  string (hd0,1) (hd1,1) (hd2,1)\n"
-#| "# To install to a particular device:\n"
-#| "#d-i grub-installer/bootdev  string /dev/sda\n"
-#| "# To install to the first device:\n"
-#| "#d-i grub-installer/bootdev  string default\n"
-#| "\n"
-#| "# Optional password for grub, either in clear text\n"
-#| "#d-i grub-installer/password password r00tme\n"
-#| "#d-i grub-installer/password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
-#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# Use the following option to add additional boot parameters for the\n"
-#| "# installed system (if supported by the bootloader installer).\n"
-#| "# Note: options passed to the installer will be added automatically.\n"
-#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
 "you want lilo installed\n"
diff --git a/po/pt/boot-installer.po b/po/pt/boot-installer.po
index 04d4446c8..714f0bc9f 100644
--- a/po/pt/boot-installer.po
+++ b/po/pt/boot-installer.po
@@ -420,22 +420,6 @@ msgstr ""
 #. Tag: para
 #: boot-installer.xml:197
 #, no-c-format
-#| msgid ""
-#| "One problem that can come up when booting from a USB stick while using a "
-#| "serial console can be a console baudrate mismatch. If a console variable "
-#| "is defined in u-boot, the &d-i; boot script automatically passes it to "
-#| "the kernel to set the primary console device and, if applicable, the "
-#| "console baudrate. Unfortunately the handling of the console variable "
-#| "varies from platform to platform - on some platforms, the console "
-#| "variable includes the baudrate (as in <quote>console=ttyS0,115200</"
-#| "quote>), while on other platforms the console variable contains only the "
-#| "device (as in <quote>console=ttyS0</quote>). The latter case leads to a "
-#| "garbled console output when the default baudrate differs between u-boot "
-#| "and the kernel. Modern u-boot versions often use 115200 baud while the "
-#| "kernel still defaults to the traditional 9600 baud. If this happens, you "
-#| "should manually set the console variable to contain the correct baudrate "
-#| "for your system and then start the installer with the <quote>run "
-#| "usb_boot</quote> command."
 msgid ""
 "One problem that can come up when booting from a USB stick while using a "
 "serial console can be a console baudrate mismatch. If a console variable is "
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 030aff3a7..82207bf77 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -2798,52 +2798,6 @@ msgstr "Instalação do gestor de arranque"
 #. Tag: screen
 #: preseed.xml:1109
 #, no-c-format
-#| msgid ""
-#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
-#| "If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true</phrase>\n"
-#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
-#| "uncomment this\n"
-#| "#d-i grub-installer/skip boolean true</phrase>\n"
-#| "\n"
-#| "# This is fairly safe to set, it makes grub install automatically to the "
-#| "MBR\n"
-#| "# if no other operating system is detected on the machine.\n"
-#| "d-i grub-installer/only_debian boolean true\n"
-#| "\n"
-#| "# This one makes grub-installer install to the MBR if it also finds some "
-#| "other\n"
-#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
-#| "d-i grub-installer/with_other_os boolean true\n"
-#| "\n"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev  string (hd0,1)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev  string (hd0,1) (hd1,1) (hd2,1)\n"
-#| "# To install to a particular device:\n"
-#| "#d-i grub-installer/bootdev  string /dev/sda\n"
-#| "# To install to the first device:\n"
-#| "#d-i grub-installer/bootdev  string default\n"
-#| "\n"
-#| "# Optional password for grub, either in clear text\n"
-#| "#d-i grub-installer/password password r00tme\n"
-#| "#d-i grub-installer/password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
-#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# Use the following option to add additional boot parameters for the\n"
-#| "# installed system (if supported by the bootloader installer).\n"
-#| "# Note: options passed to the installer will be added automatically.\n"
-#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
 "you want lilo installed\n"