[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Stretch, Jessie and Wheezy manuals from the wiki.

Holger Levsen holger at layer-acht.org
Tue Jun 7 10:19:24 UTC 2016 

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit 87f9302e4167c2c3d25001716c2ded7a414e4fa1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Jun 7 12:18:56 2016 +0200

    Update Debian Edu Stretch, Jessie and Wheezy manuals from the wiki.
---
 debian/changelog                                   |  1 +
 .../debian-edu-jessie-manual.da.po                 | 39 ++++++++--------
 .../debian-edu-jessie-manual.de.po                 | 50 ++++++++++-----------
 .../debian-edu-jessie-manual.es.po                 | 52 +++++++++++-----------
 .../debian-edu-jessie-manual.fr.po                 | 30 ++++++-------
 .../debian-edu-jessie-manual.it.po                 | 52 +++++++++++-----------
 .../debian-edu-jessie-manual.nb.po                 | 42 ++++++++---------
 .../debian-edu-jessie-manual.nl.po                 | 30 ++++++-------
 .../debian-edu-jessie/debian-edu-jessie-manual.pot | 30 ++++++-------
 .../debian-edu-jessie/debian-edu-jessie-manual.xml | 26 +++++------
 .../debian-edu-stretch-manual.da.po                | 34 +++++++-------
 .../debian-edu-stretch-manual.de.po                | 46 +++++++++----------
 .../debian-edu-stretch-manual.es.po                | 52 +++++++++++-----------
 .../debian-edu-stretch-manual.fr.po                | 30 ++++++-------
 .../debian-edu-stretch-manual.it.po                | 48 ++++++++++----------
 .../debian-edu-stretch-manual.nb.po                | 42 ++++++++---------
 .../debian-edu-stretch-manual.nl.po                | 28 ++++++------
 .../debian-edu-stretch-manual.pot                  | 28 ++++++------
 .../debian-edu-stretch-manual.xml                  | 22 ++++-----
 .../debian-edu-wheezy-manual.da.po                 | 28 ++++++------
 .../debian-edu-wheezy-manual.de.po                 | 44 +++++++++---------
 .../debian-edu-wheezy-manual.es.po                 | 40 ++++++++---------
 .../debian-edu-wheezy-manual.fr.po                 | 24 +++++-----
 .../debian-edu-wheezy-manual.it.po                 | 44 +++++++++---------
 .../debian-edu-wheezy-manual.nb.po                 | 38 ++++++++--------
 .../debian-edu-wheezy-manual.nl.po                 | 24 +++++-----
 .../debian-edu-wheezy/debian-edu-wheezy-manual.pot | 24 +++++-----
 .../debian-edu-wheezy/debian-edu-wheezy-manual.xml | 26 +++++------
 28 files changed, 487 insertions(+), 487 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ed1f89..6182396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 debian-edu-doc (1.902~20160604) UNRELEASED; urgency=medium
 
   * Add missing paragraph about GPL-3+ to debian/copyright, thanks lintian.
+  * Update Debian Edu Stretch, Jessie and Wheezy manuals from the wiki.
 
  -- Holger Levsen <holger at debian.org>  Sat, 04 Jun 2016 12:52:00 +0200
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
index 407617d..500d975 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-25 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -83,10 +83,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Umiddelbart efter installationen af en skoleserver - der kører alle "
 "tjenester krævet for et skolenetværk - sættes dette netværk op (se det næste "
@@ -1417,7 +1417,7 @@ msgstr ""
 "edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr "USB-drev/blue-ray-disk ISO-aftryk for i386 og amd64"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1723,11 +1723,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"USB-drevet for flere arktitekturer / Blue-ray-diskaftrykket har som standard "
+"USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket har som standard "
 "amd64-installgui på 64-bit x86-maskiner og installgui på 32-bit x86-maskiner."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2084,13 +2084,13 @@ msgstr ""
 "forbundet din bærbare til netværket og logget ind med din nye adgangskode)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "En kort bemærkning om USB-drev for flere arkitekturer / blue-ray-aftryk"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2188,7 +2188,7 @@ msgstr ""
 "gøres som standard."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr "Installation med brug af USB-drev i stedet for cd'er/blue-ray-diske"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2214,7 +2214,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Afhængig af hvilket aftryk du vælger, så vil USB-drevet opføre sig på samme "
 "måde som en cd eller blue-ray."
@@ -2394,7 +2394,7 @@ msgstr "Tilpassede aftryk"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -2745,8 +2745,8 @@ msgid ""
 "\"https://bugs.debian.org/791562#\">791562</ulink>."
 msgstr ""
 "Kør <computeroutput>sudo debian-edu-nscd-netgroup-cache disable</"
-"computeroutput> i en terminal for at omgå en Debianfejl <ulink url="
-"\"https://bugs.debian.org/791562#\">791562</ulink>."
+"computeroutput> i en terminal for at omgå en Debianfejl <ulink url=\"https://"
+"bugs.debian.org/791562#\">791562</ulink>."
 
 #. type: Content of: <article><section><section><para>
 msgid ""
@@ -5411,7 +5411,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Indsæt cd/dvd/blue-ray/USB-drev, monter den og brug kommandoen apt-cdrom:"
@@ -11089,10 +11089,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
-"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blue-ray-"
+"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blu-ray-"
 "diskaftryk, som opfører sig som dvd-aftrykket, men er for stort til at kunne "
 "være på en dvd."
 
@@ -12545,4 +12545,3 @@ msgid ""
 msgstr ""
 "Yderligere information om endnu ældre versioner kan findes på <ulink url="
 "\"http://developer.skolelinux.no/info/cdbygging/news.html\"/>."
-
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
index 1fa380c..933e6b8 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-23 13:50+0200\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -94,10 +94,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Unmittelbar nach der Installation eines Schulservers stehen alle für ein "
 "Schulnetzwerk notwendigen Dienste zur Verfügung (siehe Details dazu im "
@@ -107,7 +107,7 @@ msgstr ""
 "werden, was mit der komfortablen Weboberfläche von GOsa² oder einem anderen "
 "LDAP-Editor erfolgen kann. Eine Umgebung für das Booten über das Netzwerk "
 "mittels PXE wurde ebenfalls vorbereitet; damit können  nach der anfänglichen "
-"Installation des Hauptservers von CD, Blue-ray Disc oder USB-Stick alle "
+"Installation des Hauptservers von CD, Blu-ray Disc oder USB-Stick alle "
 "anderen Rechner über das Netz installiert werden - eingeschlossen mobile "
 "Arbeitsplatzrechner (also solche, die ausserhalb des Netzwerks benutzt "
 "werden können wie Laptops und Netbooks). Auch das Booten mittels PXE für "
@@ -1471,8 +1471,8 @@ msgstr ""
 "edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "USB-Stick / Blue-ray Disc ISO-Image für i386 und amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "USB-Stick / Blu-ray Disc ISO-Image für i386 und amd64"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1778,11 +1778,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"Das Multiarch-USB-Stick / Blue-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
+"Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
 "voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern »installgui« "
 "aus."
 
@@ -2151,20 +2151,20 @@ msgstr ""
 "neuen Passwort angemeldet haben.)"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blue-ray "
+"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blu-ray "
 "Disc«"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"Wenn Sie von einem Multi-Arch-USB-Stick / Blue-ray-Disc-Image installieren, "
+"Wenn Sie von einem Multi-Arch-USB-Stick / Blu-ray-Disc-Image installieren, "
 "enthält die Datei <computeroutput>/etc/apt/sources.list</computeroutput> nur "
 "Quellen von der DVD. Wenn Sie eine Internetverbindung haben, wird dringend "
 "empfohlen, die folgenden Zeilen zu der Datei hinzuzufügen. Damit stellen Sie "
@@ -2256,8 +2256,8 @@ msgstr ""
 "voreingestellt durchgeführt."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installation per USB-Stick anstelle von CD / Blue-ray Disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installation per USB-Stick anstelle von CD / Blu-ray Disc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2282,9 +2282,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
-"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blue-ray "
+"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blu-ray "
 "Disc verhalten."
 
 #. type: Content of: <article><section><section><section><title>
@@ -2464,13 +2464,13 @@ msgstr "Angepasste Images"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Angepasste CDs, DVDs oder Blue-ray Discs zu erstellen ist recht einfach, da "
+"Angepasste CDs, DVDs oder Blu-ray Discs zu erstellen ist recht einfach, da "
 "der <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian-Installer</"
 "ulink> verwendet wird, der ein modulares Design und andere schöne "
 "Eigenschaften hat. Mit dem sogenannten <ulink url=\"http://wiki.debian.org/"
@@ -5557,10 +5557,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-" Legen Sie die CD / DVD / Blue-ray Disc ein oder stecken Sie den USB-Stick "
+" Legen Sie die CD / DVD / Blu-ray Disc ein oder stecken Sie den USB-Stick "
 "ein, hängen Sie das Medium ein und benutzen Sie das Kommando apt-cdrom:"
 
 #. type: CDATA
@@ -11383,11 +11383,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "Das DVD-Image gibt es nicht mehr, stattdessen haben wir nun ein USB-Stick / "
-"Blue-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
+"Blu-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
 "ist, um auf eine DVD zu passen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
index 41c3812..40eb4fd 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgstr ""
 #| "\"Architecture\">details of the architecture of this setup</link>), just "
 #| "waiting for users and machines being added via GOsa², a comfortable Web-"
 #| "UI, or any other LDAP editor. A netbooting environment is prepared using "
-#| "PXE, so after initial installation of the main server from CD, Blue-ray "
+#| "PXE, so after initial installation of the main server from CD, Blu-ray "
 #| "disc or USB flash drive all other machines can be installed via the "
 #| "network, this includes \"roaming workstations\" (ones that can be taken "
 #| "away from the school network, usually laptops or netbooks) as well as PXE "
@@ -105,10 +105,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Inmediatamente después de la instalación, el servidor de la escuela "
 "ejecutará todos los servicios necesarios para que la red escolar sea "
@@ -117,7 +117,7 @@ msgstr ""
 "para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
 "cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
 "preparado usando PXE, así, después de la instalación inicial del servidor "
-"principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
+"principal desde CD, Blu-ray o unidad USB, las otras computadoras pueden ser "
 "instaladas a través de la red, esto incluye \"estaciones de trabajo "
 "itinerantes\" (pueden ser llevadas fuera de la red escolar, usualmente "
 "laptops o netbooks) y carga por PXE para computadoras sin disco duro como "
@@ -1463,9 +1463,9 @@ msgstr ""
 "edu-8.0+edu0-CD.iso ./debian-edu-8.0+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr ""
-"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blue-ray "
+"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blu-ray "
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1780,7 +1780,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2135,18 +2135,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
-msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blue-ray"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
+msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blu-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"Después de instalar desde una imagen multiarquitectura USB / Blue-ray, "
+"Después de instalar desde una imagen multiarquitectura USB / Blu-ray, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> contendrá fuentes de "
 "esa imagen. Si tiene conexión a Internet, le sugerimos agregar las "
 "siguientes lineas para que las actualizaciones de seguridad disponible se "
@@ -2228,8 +2228,8 @@ msgstr ""
 "chroot combinado y por eso se hace de forma predeterminada."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Instalación utilizando memorias USB lugar de CD / Blue-ray"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Instalación utilizando memorias USB lugar de CD / Blu-ray"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2255,10 +2255,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Dependiendo de la imágen seleccionada, la unidad USB se comportará como un "
-"CD o Blue-ray."
+"CD o Blu-ray."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2430,19 +2430,19 @@ msgstr "Imágenes personalizadas"
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we "
-#| "use the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
+#| "Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
+#| "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
 #| "installer</ulink>, which has a modular design and other nice features. "
 #| "<ulink url=\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</"
 #| "ulink> allows you to define answers to the questions normally asked."
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Crear CDs, DVDs o Blue-rays personalizados es bastante fácil, ya que se "
+"Crear CDs, DVDs o Blu-rays personalizados es bastante fácil, ya que se "
 "utilizamos el  <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
 "installer</ulink>, el cual es de diseño modular, y posee otras "
 "características útiles.La <ulink url=\"http://wiki.debian.org/"
@@ -5070,10 +5070,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Inserte el CD/DVD/Disco Blueray/Dispositivo USB en la unidad, montelo y use "
+"Inserte el CD/DVD/Disco Blu-ray/Dispositivo USB en la unidad, montelo y use "
 "el comando apt-cdrom:"
 
 #. type: CDATA
@@ -9568,8 +9568,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
index b6b3ef4..5cdb506 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-28 17:02+0100\n"
 "Last-Translator: Cedric Boutillier <boutil at boutil.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -85,10 +85,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Immédiatement après l'installation, un serveur faisant fonctionner tous les "
 "services pour le réseau de l'école est configuré (consultez le chapitre "
@@ -1470,7 +1470,7 @@ msgstr ""
 "edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr ""
 "image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
 
@@ -1782,7 +1782,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2156,14 +2156,14 @@ msgstr ""
 "authentifié avec le nouveau mot de passe)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "Une remarque sur les installations à partir de l'image multiarchitecture "
 "pour clé USB et disque Blu-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2260,7 +2260,7 @@ msgstr ""
 "chroots combinés à chaque fois, c'est pour cela que cela est fait par défaut."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
 "Installation depuis une clé USB au lieu d'un CD ou d'un disque Blu-ray."
 
@@ -2287,7 +2287,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "En fonction de l'image que vous choisissez, la clé USB se comportera "
 "exactement comme un CD ou un disque Blu-ray."
@@ -2474,7 +2474,7 @@ msgstr "Images personnalisées"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5588,7 +5588,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Insérez le CD, DVD, disque Blu-ray ou périphérique USB, montez-le et "
@@ -11438,8 +11438,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "L'image DVD a été abandonnée, en faveur d'une image pour clé USB ou disque "
 "Blu-ray qui se comporte comme celle-ci mais qui est trop grande pour tenir "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
index d14bdf8..836c7e0 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-25 19:22+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -83,10 +83,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Immediatamente dopo l'installazione è configurato un server della scuola che "
 "esegue tutti i servizi necessari per la rete scolastica (vedere il prossimo "
@@ -95,7 +95,7 @@ msgstr ""
 "essere usato. Solo utenti e macchine devono essere aggiunti usando GOsa², "
 "una comoda interfaccia Web, o da un qualsiasi altro editor LDAP. Dopo "
 "l'installazione principale del server da CD un ambiente di avvio dalla rete "
-"è disponibile utilizzando PXE. disco Blue-ray o penna USB, tutte le altre "
+"è disponibile utilizzando PXE. disco Blu-ray o penna USB, tutte le altre "
 "macchine possono essere installate via rete, comprese le \"postazioni mobili "
 "(roaming)\" (macchine che possono essere scollegate dalla rete della scuola, "
 "generalmente laptop o netbook), nonché l'avvio tramite PXE per macchine "
@@ -1442,8 +1442,8 @@ msgstr ""
 "edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "Immagine per flash drive USB / Blue-ray disc per i386 e amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1755,11 +1755,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"L'immagine multiarchitettura su flash drive USB / Blue-ray disc usa in modo "
+"L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in modo "
 "predefinito amd64-installgui su macchine x86 a 64-bit e installgui su "
 "macchine x86 a 32-bit."
 
@@ -2125,21 +2125,21 @@ msgstr ""
 "password)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"Una nota sull'installazione multi-architettura da flash drive USB / Blue-ray "
+"Una nota sull'installazione multi-architettura da flash drive USB / Blu-ray "
 "disc"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
 "Se si installa da un'immarighegine multi-architettura su flash drive USB / "
-"Blue-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
+"Blu-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
 "conterrà come sorgente solo quella immagine. Se si ha un collegamento "
 "Internet si raccomanda di aggiungere le seguenti righe al file in modo da "
 "avere disponibili e installare gli aggiornamenti di sicurezza:"
@@ -2229,8 +2229,8 @@ msgstr ""
 "sempre un chroot combinato come da impostazione predefinita. "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installazione da flash drive USB al posto di CD /Blue-ray disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installazione da flash drive USB al posto di CD /Blu-ray disc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2255,10 +2255,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "A seconda dell'immagine scelta, la penna USB si comporterà esattamente come "
-"un CD o Blue-ray disc."
+"un CD o Blu-ray disc."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2433,13 +2433,13 @@ msgstr "Immagini personalizzate"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Creare una versione personalizzata del CD, DVD o Blue-ray è possibile "
+"Creare una versione personalizzata del CD, DVD o Blu-ray è possibile "
 "abbastanza facilmente, usando l'<ulink url=\"http://wiki.debian.org/"
 "DebianInstaller/\">installatore Debian</ulink>, che ha un progetto modulare "
 "e altre interessanti caratteristiche. L'<ulink url=\"http://wiki.debian.org/"
@@ -5478,10 +5478,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Inserire il CD/ DVD / Blue-ray disc / drive flash USB, montarlo e usare il "
+"Inserire il CD/ DVD / Blu-ray disc / drive flash USB, montarlo e usare il "
 "comando apt-cdrom:"
 
 #. type: CDATA
@@ -10353,8 +10353,8 @@ msgstr ""
 "translations per trovare informazioni su come creare un nuovo file PO per la "
 "lingua se ancora non ne esiste uno e come aggiornare le traduzioni."
 
-#. <remark>
-#. status ignore</remark>
+#.  <remark>
+#. status ignore</remark> 
 #. type: Content of: <article><section><section><para>
 msgid ""
 "Please keep in mind that this manual is still under development, so don't "
@@ -11214,8 +11214,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "L'immagine del DVD è stata abbandonata, invece è stata aggiunta un'immagine "
 "per flash drive USB / Blu-ray, che si comporta come l'immagine del DVD, ma "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
index ec15859..5d52e91 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-24 20:50+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-24 15:16+0000\n"
 "Last-Translator: Ingrid Yrvin <ingrid.yrvin at gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/debian-"
@@ -96,10 +96,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Alle tjenester som trengs for et skolenettverk blir satt opp rett etter "
 "installasjonen av en skoleserver (se neste kapittel <link linkend="
@@ -107,7 +107,7 @@ msgstr ""
 "er klart til bruk. Bare brukere og maskiner må legges til via GOsa², et "
 "komfortabelt Web-brukergrensesnitt, eller med en hvilken som helst annen "
 "LDAP-redigerer. Et oppstartsmiljø som bruker PXE er også forberedt, så etter "
-"første installasjon av hovedserveren fra CD, Blue-ray-plate eller en USB-"
+"første installasjon av hovedserveren fra CD, Blu-ray-plate eller en USB-"
 "minnepenn, kan alle andre maskiner installeres via nettverket, medregnet "
 "mobile arbeidsstasjoner (de som kan være tatt bort fra skolens nettverk, "
 "vanligvis bærbare datamaskiner eller netbrett), samt PXE-oppstart for "
@@ -1429,7 +1429,7 @@ msgstr ""
 "edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr "USB-minnekort/Blu-ray Disk ISO-bilde for i386 og AMD64"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1738,11 +1738,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"USB Fler-arkitektur flash-disk/Blue-ray disk-typer er standard for bruk av "
+"USB Fler-arkitektur flash-disk/Blu-ray disk-typer er standard for bruk av "
 "AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
 "maskiner."
 
@@ -2096,14 +2096,14 @@ msgstr ""
 "knyttet din bærbare til nettverket og logget inn med det nye passordet)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"En merknad om USB-minnepinne- / Blue-ray-installasjon med flerarkitektur-"
+"En merknad om USB-minnepinne- / Blu-ray-installasjon med flerarkitektur-"
 "diskbilder"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2200,9 +2200,9 @@ msgstr ""
 "som standard. "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
-"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blue-ray-plate"
+"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blu-ray-plate"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2227,10 +2227,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Avhengig av hvilket bilde du velger vil USB-minnepinnen oppføre seg som en "
-"CD eller Blue-ray-disk."
+"CD eller Blu-ray-disk."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2403,7 +2403,7 @@ msgstr "Tilpassede bilder"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5410,7 +5410,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Sett inn en CD / DVD / Blu-ray plate / USB-minnepenn, monter den og bruk apt-"
@@ -11080,10 +11080,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
-"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blue-"
+"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blu-"
 "ray-plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
 "plass på en DVD."
 
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
index b7b4093..7dcdb28 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-23 17:29+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -82,10 +82,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Onmiddellijk na de installatie van een schoolserver worden alle diensten die "
 "nodig zijn in een schoolnetwerk ingesteld (Raadpleeg het volgende hoofdstuk "
@@ -1485,7 +1485,7 @@ msgstr ""
 "edu-8+edu0-CD.iso ./debian-edu-8+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr "USB-stick- / blu-ray-ISO-image voor i386 en amd64"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1808,7 +1808,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2190,14 +2190,14 @@ msgstr ""
 "aansluit op het schoolnetwerk en u daar aanmeldt met uw nieuwe wachtwoord.)"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "Een noot bij installaties met het multi-archimage voor USB-stick / blu-"
 "rayschijf"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2298,7 +2298,7 @@ msgstr ""
 "de normale werkwijze."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr "Installaties vanaf een USB-stick en niet vanaf een cd / blu-rayschijf"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2325,7 +2325,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Afhankelijk van het gebruikte image, zal de USB-stick zich gedragen als een "
 "cd of een blu-rayschijf."
@@ -2513,7 +2513,7 @@ msgstr "Images op maat"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5663,7 +5663,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Plaats de cd / dvd / blu-rayschijf / USB-stick in het station, koppel ze aan "
@@ -11580,8 +11580,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "Er is geen dvd-image meer. In de plaats kwam een image voor USB-stick / blu-"
 "rayschijf, dat zich als het vroegere dvd-image gedraagt, maar dat te groot "
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
index aca82b8..1f41dcd 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-23 22:18+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -72,10 +72,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -1072,7 +1072,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1312,7 +1312,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -1568,12 +1568,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -1639,7 +1639,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1659,7 +1659,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1785,7 +1785,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -4053,7 +4053,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 
@@ -8249,8 +8249,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
index 1c9ce64..e859c37 100644
--- a/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
+++ b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
@@ -19,7 +19,7 @@
 </title>
 <para>Debian Edu aka Skolelinux is a Linux distribution based on Debian providing an out-of-the box environment of a completely configured school network.   
 </para>
-<para>Directly after installation of a school server all services needed for a school network are set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>) and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, so after initial installation of the main server from CD, Blue-ray disc or USB flash drive  [...]
+<para>Directly after installation of a school server all services needed for a school network are set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>) and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, so after initial installation of the main server from CD, Blu-ray disc or USB flash drive a [...]
 </para>
 <para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe. 
 </para>
@@ -449,8 +449,8 @@
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Installation--USB_flash_drive_.2BAC8_Blue-ray_disc_ISO_image_for_i386_and_amd64">
-<title>USB flash drive / Blue-ray disc ISO image for i386 and amd64
+<section id="Installation--USB_flash_drive_.2BAC8_Blu-ray_disc_ISO_image_for_i386_and_amd64">
+<title>USB flash drive / Blu-ray disc ISO image for i386 and amd64
 </title>
 <para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. Please note that internet access during installation is needed. Like the others it can be downloaded over FTP, HTTP or rsync via: 
 </para>
@@ -543,7 +543,7 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>The multi-architecture USB flash drive / Blue-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
+<para>The multi-architecture USB flash drive / Blu-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
 </para></listitem>
 <listitem>
 <para>If you want to boot the amd64 text mode with the multi-architecture image, that would be <computeroutput>amd64-install</computeroutput>. 
@@ -665,10 +665,10 @@
 </para>
 </section>
 
-<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blue-ray_disc_image_installs">
-<title>A note on multi-arch USB flash drive / Blue-ray disc image installs
+<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blu-ray_disc_image_installs">
+<title>A note on multi-arch USB flash drive / Blu-ray disc image installs
 </title>
-<para>After you install from the multi-arch USB flash drive / Blue-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
+<para>After you install from the multi-arch USB flash drive / Blu-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
 </para><screen><![CDATA[deb http://ftp.debian.org/debian/ jessie main 
 deb http://security.debian.org/ jessie/updates main 
 deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
@@ -695,14 +695,14 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
 </section>
 </section>
 
-<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blue-ray_discs">
-<title>Installation using USB flash drives instead of CD / Blue-ray discs
+<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blu-ray_discs">
+<title>Installation using USB flash drives instead of CD / Blu-ray discs
 </title>
 <para>Since the Squeeze release it is possible to directly copy the CD/DVD/BD <computeroutput>.iso</computeroutput> images to a USB flash drive (also known as "USB sticks") and boot from them. Simply execute a command like this, just adapting the file and device names to your needs: 
 </para>
 <para><computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX bs=1024</computeroutput> 
 </para>
-<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blue-ray disc. 
+<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blu-ray disc. 
 </para>
 </section>
 
@@ -745,7 +745,7 @@ deb http://ftp.skolelinux.org/skolelinux jessie local]]></screen>
 <section id="Installation--Custom_images">
 <title>Custom images
 </title>
-<para>Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">Debian Installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.  
+<para>Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">Debian Installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.  
 </para>
 <para>So all you need to do is to create a preseeding file with your answers (this is described in the appendix of the Debian Installer manual) and <ulink url="http://wiki.debian.org/DebianInstaller/Modify/CD">remaster the CD/DVD</ulink>. 
 </para>
@@ -1681,7 +1681,7 @@ apt-get update]]></screen>
 </title>
 <para>If you want to upgrade from one version to another (for example from Jessie 8.1+edu0 to 8.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps: 
 </para>
-<para>Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
+<para>Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
 </para><screen><![CDATA[mount /media/cdrom
 apt-cdrom add -m]]></screen>
 <para>To quote the apt-cdrom(8) man page: 
@@ -3767,7 +3767,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details. 
 </para></listitem>
 <listitem>
-<para>The DVD image was dropped, instead we added a USB flash drive / Blue-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD. 
+<para>The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD. 
 </para></listitem></itemizedlist>
 </section>
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
index ef7b5c5..e0c90bd 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual\n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-05-25 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -91,10 +91,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Umiddelbart efter installationen af en skoleserver - der kører alle "
 "tjenester krævet for et skolenetværk - sættes dette netværk op (se det næste "
@@ -1449,7 +1449,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
 msgstr "USB-drev/blue-ray-disk ISO-aftryk for i386 og amd64"
 
@@ -1762,11 +1762,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"USB-drevet for flere arktitekturer / Blue-ray-diskaftrykket har som standard "
+"USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket har som standard "
 "amd64-installgui på 64-bit x86-maskiner og installgui på 32-bit x86-maskiner."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2129,13 +2129,13 @@ msgstr ""
 "forbundet din bærbare til netværket og logget ind med din nye adgangskode)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "En kort bemærkning om USB-drev for flere arkitekturer / blue-ray-aftryk"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2237,7 +2237,7 @@ msgstr ""
 "gøres som standard."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr "Installation med brug af USB-drev i stedet for cd'er/blue-ray-diske"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2263,7 +2263,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Afhængig af hvilket aftryk du vælger, så vil USB-drevet opføre sig på samme "
 "måde som en cd eller blue-ray."
@@ -2448,7 +2448,7 @@ msgstr "Tilpassede aftryk"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5327,7 +5327,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Indsæt cd/dvd/blue-ray/USB-drev, monter den og brug kommandoen apt-cdrom:"
@@ -11193,10 +11193,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
-"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blue-ray-"
+"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blu-ray-"
 "diskaftryk, som opfører sig som dvd-aftrykket, men er for stort til at kunne "
 "være på en dvd."
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
index 656535c..dfbeb88 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-jessie-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-22 23:43+0100\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -90,10 +90,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Unmittelbar nach der Installation eines Schulservers stehen alle für ein "
 "Schulnetzwerk notwendigen Dienste zur Verfügung (siehe Details dazu im "
@@ -103,7 +103,7 @@ msgstr ""
 "werden, was mit der komfortablen Weboberfläche von GOsa² oder einem anderen "
 "LDAP-Editor erfolgen kann. Eine Umgebung für das Booten über das Netzwerk "
 "mittels PXE wurde ebenfalls vorbereitet; damit können  nach der anfänglichen "
-"Installation des Hauptservers von CD, Blue-ray Disc oder USB-Stick alle "
+"Installation des Hauptservers von CD, Blu-ray Disc oder USB-Stick alle "
 "anderen Rechner über das Netz installiert werden - eingeschlossen mobile "
 "Arbeitsplatzrechner (also solche, die ausserhalb des Netzwerks benutzt "
 "werden können wie Laptops und Netbooks). Auch das Booten mittels PXE für "
@@ -1749,11 +1749,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"Das Multiarch-USB-Stick / Blue-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
+"Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
 "voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern »installgui« "
 "aus."
 
@@ -2122,20 +2122,20 @@ msgstr ""
 "neuen Passwort angemeldet haben.)"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blue-ray "
+"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blu-ray "
 "Disc«"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"Wenn Sie von einem Multi-Arch-USB-Stick / Blue-ray-Disc-Image installieren, "
+"Wenn Sie von einem Multi-Arch-USB-Stick / Blu-ray-Disc-Image installieren, "
 "enthält die Datei <computeroutput>/etc/apt/sources.list</computeroutput> nur "
 "Quellen von der DVD. Wenn Sie eine Internetverbindung haben, wird dringend "
 "empfohlen, die folgenden Zeilen zu der Datei hinzuzufügen. Damit stellen Sie "
@@ -2227,8 +2227,8 @@ msgstr ""
 "voreingestellt durchgeführt."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installation per USB-Stick anstelle von CD / Blue-ray Disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installation per USB-Stick anstelle von CD / Blu-ray Disc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2253,9 +2253,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
-"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blue-ray "
+"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blu-ray "
 "Disc verhalten."
 
 #. type: Content of: <article><section><section><section><title>
@@ -2430,13 +2430,13 @@ msgstr "Angepasste Images"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Angepasste CDs, DVDs oder Blue-ray Discs zu erstellen ist recht einfach, da "
+"Angepasste CDs, DVDs oder Blu-ray Discs zu erstellen ist recht einfach, da "
 "der <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian-Installer</"
 "ulink> verwendet wird, der ein modulares Design und andere schöne "
 "Eigenschaften hat. Mit dem sogenannten <ulink url=\"http://wiki.debian.org/"
@@ -5224,10 +5224,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-" Legen Sie die CD / DVD / Blue-ray Disc ein oder stecken Sie den USB-Stick "
+" Legen Sie die CD / DVD / Blu-ray Disc ein oder stecken Sie den USB-Stick "
 "ein, hängen Sie das Medium ein und benutzen Sie das Kommando apt-cdrom:"
 
 #. type: CDATA
@@ -11140,11 +11140,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "Das DVD-Image gibt es nicht mehr, stattdessen haben wir nun ein USB-Stick / "
-"Blue-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
+"Blu-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
 "ist, um auf eine DVD zu passen."
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
index 07c37a4..7cee30b 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-03-30 22:30+0000\n"
 "Last-Translator: Rafael Ernesto Rivas <tatotat at gmail.com>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -95,7 +95,7 @@ msgstr ""
 #| "\"Architecture\">details of the architecture of this setup</link>), just "
 #| "waiting for users and machines being added via GOsa², a comfortable Web-"
 #| "UI, or any other LDAP editor. A netbooting environment is prepared using "
-#| "PXE, so after initial installation of the main server from CD, Blue-ray "
+#| "PXE, so after initial installation of the main server from CD, Blu-ray "
 #| "disc or USB flash drive all other machines can be installed via the "
 #| "network, this includes \"roaming workstations\" (ones that can be taken "
 #| "away from the school network, usually laptops or netbooks) as well as PXE "
@@ -107,10 +107,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Inmediatamente después de la instalación, el servidor de la escuela "
 "ejecutará todos los servicios necesarios para que la red escolar sea "
@@ -119,7 +119,7 @@ msgstr ""
 "para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
 "cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
 "preparado usando PXE, así, después de la instalación inicial del servidor "
-"principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
+"principal desde CD, Blu-ray o unidad USB, las otras computadoras pueden ser "
 "instaladas a través de la red, esto incluye \"estaciones de trabajo "
 "itinerantes\" (pueden ser llevadas fuera de la red escolar, usualmente "
 "laptops o netbooks) y carga por PXE para computadoras sin disco duro como "
@@ -1474,10 +1474,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
 msgstr ""
-"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blue-ray "
+"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blu-ray "
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -1786,7 +1786,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2147,18 +2147,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
-msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blue-ray"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
+msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blu-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"Después de instalar desde una imagen multiarquitectura USB / Blue-ray, "
+"Después de instalar desde una imagen multiarquitectura USB / Blu-ray, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> contendrá fuentes de "
 "esa imagen. Si tiene conexión a Internet, le sugerimos agregar las "
 "siguientes lineas para que las actualizaciones de seguridad disponible se "
@@ -2244,8 +2244,8 @@ msgstr ""
 "chroot combinado y por eso se hace de forma predeterminada."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Instalación utilizando memorias USB lugar de CD / Blue-ray"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Instalación utilizando memorias USB lugar de CD / Blu-ray"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2271,10 +2271,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Dependiendo de la imágen seleccionada, la unidad USB se comportará como un "
-"CD o Blue-ray."
+"CD o Blu-ray."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2451,19 +2451,19 @@ msgstr "Imágenes personalizadas"
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
 #| msgid ""
-#| "Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we "
-#| "use the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
+#| "Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
+#| "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
 #| "installer</ulink>, which has a modular design and other nice features. "
 #| "<ulink url=\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</"
 #| "ulink> allows you to define answers to the questions normally asked."
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Crear CDs, DVDs o Blue-rays personalizados es bastante fácil, ya que se "
+"Crear CDs, DVDs o Blu-rays personalizados es bastante fácil, ya que se "
 "utilizamos el  <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
 "installer</ulink>, el cual es de diseño modular, y posee otras "
 "características útiles.La <ulink url=\"http://wiki.debian.org/"
@@ -4925,10 +4925,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Inserte el CD/DVD/Disco Blueray/Dispositivo USB en la unidad, montelo y use "
+"Inserte el CD/DVD/Disco Blu-ray/Dispositivo USB en la unidad, montelo y use "
 "el comando apt-cdrom:"
 
 #. type: CDATA
@@ -9530,8 +9530,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
index 81bdce6..3b5bcbc 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-06-22 10:34+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -93,10 +93,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Immédiatement après l'installation, un serveur faisant fonctionner tous les "
 "services pour le réseau de l'école est configuré (consultez le chapitre "
@@ -1502,7 +1502,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
 msgstr ""
 "image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
@@ -1820,7 +1820,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2200,14 +2200,14 @@ msgstr ""
 "authentifié avec le nouveau mot de passe)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "Une remarque sur les installations à partir de l'image multiarchitecture "
 "pour clé USB et disque Blu-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2308,7 +2308,7 @@ msgstr ""
 "chroots combinés à chaque fois, c'est pour cela que cela est fait par défaut."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
 "Installation depuis une clé USB au lieu d'un CD ou d'un disque Blu-ray."
 
@@ -2335,7 +2335,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "En fonction de l'image que vous choisissez, la clé USB se comportera "
 "exactement comme un CD ou un disque Blu-ray."
@@ -2527,7 +2527,7 @@ msgstr "Images personnalisées"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5499,7 +5499,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Insérez le CD, DVD, disque Blu-ray ou périphérique USB, montez-le et "
@@ -11539,8 +11539,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "L'image DVD a été abandonnée, en faveur d'une image pour clé USB ou disque "
 "Blu-ray qui se comporte comme celle-ci mais qui est trop grande pour tenir "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
index b7c4082..ac2c00d 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-05-04 19:34+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -91,10 +91,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Immediatamente dopo l'installazione è configurato un server della scuola che "
 "esegue tutti i servizi necessari per la rete scolastica (vedere il prossimo "
@@ -103,7 +103,7 @@ msgstr ""
 "essere usato. Solo utenti e macchine devono essere aggiunti usando GOsa², "
 "una comoda interfaccia Web, o da un qualsiasi altro editor LDAP. Dopo "
 "l'installazione principale del server da CD un ambiente di avvio dalla rete "
-"è disponibile utilizzando PXE. disco Blue-ray o penna USB, tutte le altre "
+"è disponibile utilizzando PXE. disco Blu-ray o penna USB, tutte le altre "
 "macchine possono essere installate via rete, comprese le \"postazioni mobili "
 "(roaming)\" (macchine che possono essere scollegate dalla rete della scuola, "
 "generalmente laptop o netbook), nonché l'avvio tramite PXE per macchine "
@@ -1474,9 +1474,9 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
-msgstr "Immagine per flash drive USB / Blue-ray disc per i386 e amd64"
+msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -1793,11 +1793,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"L'immagine multiarchitettura su flash drive USB / Blue-ray disc usa in modo "
+"L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in modo "
 "predefinito amd64-installgui su macchine x86 a 64-bit e installgui su "
 "macchine x86 a 32-bit."
 
@@ -2169,21 +2169,21 @@ msgstr ""
 "password)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"Una nota sull'installazione multi-architettura da flash drive USB / Blue-ray "
+"Una nota sull'installazione multi-architettura da flash drive USB / Blu-ray "
 "disc"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
 "Se si installa da un'immarighegine multi-architettura su flash drive USB / "
-"Blue-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
+"Blu-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
 "conterrà come sorgente solo quella immagine. Se si ha un collegamento "
 "Internet si raccomanda di aggiungere le seguenti righe al file in modo da "
 "avere disponibili e installare gli aggiornamenti di sicurezza:"
@@ -2277,8 +2277,8 @@ msgstr ""
 "sempre un chroot combinato come da impostazione predefinita. "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installazione da flash drive USB al posto di CD /Blue-ray disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installazione da flash drive USB al posto di CD /Blu-ray disc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2303,10 +2303,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "A seconda dell'immagine scelta, la penna USB si comporterà esattamente come "
-"un CD o Blue-ray disc."
+"un CD o Blu-ray disc."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2486,13 +2486,13 @@ msgstr "Immagini personalizzate"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Creare una versione personalizzata del CD, DVD o Blue-ray è possibile "
+"Creare una versione personalizzata del CD, DVD o Blu-ray è possibile "
 "abbastanza facilmente, usando l'<ulink url=\"http://wiki.debian.org/"
 "DebianInstaller/\">installatore Debian</ulink>, che ha un progetto modulare "
 "e altre interessanti caratteristiche. L'<ulink url=\"http://wiki.debian.org/"
@@ -5392,10 +5392,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Inserire il CD/ DVD / Blue-ray disc / drive flash USB, montarlo e usare il "
+"Inserire il CD/ DVD / Blu-ray disc / drive flash USB, montarlo e usare il "
 "comando apt-cdrom:"
 
 #. type: CDATA
@@ -11320,8 +11320,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "L'immagine del DVD è stata abbandonata, invece è stata aggiunta un'immagine "
 "per flash drive USB / Blu-ray, che si comporta come l'immagine del DVD, ma "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
index bfdf1a0..81f6e38 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nb.po
@@ -21,7 +21,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-06-02 12:58+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -104,10 +104,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Alle tjenester som trengs for et skolenettverk blir satt opp rett etter "
 "installasjonen av en skoleserver (se neste kapittel <link linkend="
@@ -115,7 +115,7 @@ msgstr ""
 "er klart til bruk. Bare brukere og maskiner må legges til via GOsa², et "
 "komfortabelt Web-brukergrensesnitt, eller med en hvilken som helst annen "
 "LDAP-redigerer. Et oppstartsmiljø som bruker PXE er også forberedt, så etter "
-"første installasjon av hovedserveren fra CD, Blue-ray-plate eller en USB-"
+"første installasjon av hovedserveren fra CD, Blu-ray-plate eller en USB-"
 "minnepenn, kan alle andre maskiner installeres via nettverket, medregnet "
 "mobile arbeidsstasjoner (de som kan være tatt bort fra skolens nettverk, "
 "vanligvis bærbare datamaskiner eller netbrett), samt PXE-oppstart for "
@@ -1464,7 +1464,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
 #, fuzzy
-#| msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+#| msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgid "USB drive ISO image for i386 and amd64"
 msgstr "USB-minnekort/Blu-ray Disk ISO-bilde for i386 og AMD64"
 
@@ -1780,11 +1780,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"USB Fler-arkitektur flash-disk/Blue-ray disk-typer er standard for bruk av "
+"USB Fler-arkitektur flash-disk/Blu-ray disk-typer er standard for bruk av "
 "AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
 "maskiner."
 
@@ -2144,14 +2144,14 @@ msgstr ""
 "knyttet din bærbare til nettverket og logget inn med det nye passordet)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"En merknad om USB-minnepinne- / Blue-ray-installasjon med flerarkitektur-"
+"En merknad om USB-minnepinne- / Blu-ray-installasjon med flerarkitektur-"
 "diskbilder"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2252,9 +2252,9 @@ msgstr ""
 "som standard. "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
-"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blue-ray-plate"
+"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blu-ray-plate"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2279,10 +2279,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Avhengig av hvilket bilde du velger vil USB-minnepinnen oppføre seg som en "
-"CD eller Blue-ray-disk."
+"CD eller Blu-ray-disk."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2460,7 +2460,7 @@ msgstr "Tilpassede bilder"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5328,7 +5328,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Sett inn en CD / DVD / Blu-ray plate / USB-minnepenn, monter den og bruk apt-"
@@ -11194,10 +11194,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
-"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blue-"
+"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blu-"
 "ray-plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
 "plass på en DVD."
 
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
index 8d72575..9e1d96a 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-stretch-manual\n"
 "Report-Msgid-Bugs-To: debian-edu-doc at packages.debian.org\n"
-"POT-Creation-Date: 2016-06-04 10:57+0000\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2016-05-26 20:56+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -79,10 +79,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 "Onmiddellijk na de installatie van een schoolserver worden alle diensten die "
 "nodig zijn in een schoolnetwerk ingesteld (Raadpleeg het volgende hoofdstuk "
@@ -1783,7 +1783,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2165,14 +2165,14 @@ msgstr ""
 "aansluit op het schoolnetwerk en u daar aanmeldt met uw nieuwe wachtwoord.)"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "Een noot bij installaties met het multi-archimage voor USB-stick / blu-"
 "rayschijf"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2273,7 +2273,7 @@ msgstr ""
 "de normale werkwijze."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr "Installaties vanaf een USB-stick en niet vanaf een cd / blu-rayschijf"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2300,7 +2300,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Afhankelijk van het gebruikte image, zal de USB-stick zich gedragen als een "
 "cd of een blu-rayschijf."
@@ -2484,7 +2484,7 @@ msgstr "Images op maat"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5337,7 +5337,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Plaats de cd / dvd / blu-rayschijf / USB-stick in het station, koppel ze aan "
@@ -11347,8 +11347,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "Er is geen dvd-image meer. In de plaats kwam een image voor USB-stick / blu-"
 "rayschijf, dat zich als het vroegere dvd-image gedraagt, maar dat te groot "
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
index 4e75422..ffdc1a0 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-23 22:13+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -68,10 +68,10 @@ msgid ""
 "to be used. Only users and machines need to be added via GOsa², a "
 "comfortable Web-UI, or any other LDAP editor. A netbooting environment using "
 "PXE has also been prepared, so after initial installation of the main server "
-"from CD, Blue-ray disc or USB flash drive all other machines can be "
-"installed via the network, this includes \"roaming workstations\" (ones that "
-"can be taken away from the school network, usually laptops or netbooks) as "
-"well as PXE booting for diskless machines like traditional thin-clients."
+"from CD, Blu-ray disc or USB flash drive all other machines can be installed "
+"via the network, this includes \"roaming workstations\" (ones that can be "
+"taken away from the school network, usually laptops or netbooks) as well as "
+"PXE booting for diskless machines like traditional thin-clients."
 msgstr ""
 
 #. type: Content of: <article><section><para>
@@ -1285,7 +1285,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -1541,12 +1541,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -1612,7 +1612,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1632,7 +1632,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1754,7 +1754,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian Installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -3755,7 +3755,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 
@@ -8026,8 +8026,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
diff --git a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
index 606c201..568a08f 100644
--- a/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
+++ b/documentation/debian-edu-stretch/debian-edu-stretch-manual.xml
@@ -19,7 +19,7 @@
 </title>
 <para>Debian Edu aka Skolelinux is a Linux distribution based on Debian providing an out-of-the box environment of a completely configured school network.   
 </para>
-<para>Directly after installation of a school server all services needed for a school network are set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>) and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, so after initial installation of the main server from CD, Blue-ray disc or USB flash drive  [...]
+<para>Directly after installation of a school server all services needed for a school network are set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>) and the system is ready to be used. Only users and machines need to be added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment using PXE has also been prepared, so after initial installation of the main server from CD, Blu-ray disc or USB flash drive a [...]
 </para>
 <para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe. 
 </para>
@@ -543,7 +543,7 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>The multi-architecture USB flash drive / Blue-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
+<para>The multi-architecture USB flash drive / Blu-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
 </para></listitem>
 <listitem>
 <para>If you want to boot the amd64 text mode with the multi-architecture image, that would be <computeroutput>amd64-install</computeroutput>. 
@@ -665,10 +665,10 @@
 </para>
 </section>
 
-<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blue-ray_disc_image_installs">
-<title>A note on multi-arch USB flash drive / Blue-ray disc image installs
+<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blu-ray_disc_image_installs">
+<title>A note on multi-arch USB flash drive / Blu-ray disc image installs
 </title>
-<para>After you install from the multi-arch USB flash drive / Blue-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
+<para>After you install from the multi-arch USB flash drive / Blu-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
 </para><screen><![CDATA[deb http://ftp.debian.org/debian/ stretch main 
 deb http://security.debian.org/ stretch/updates main 
 deb http://ftp.skolelinux.org/skolelinux stretch local]]></screen>
@@ -695,14 +695,14 @@ deb http://ftp.skolelinux.org/skolelinux stretch local]]></screen>
 </section>
 </section>
 
-<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blue-ray_discs">
-<title>Installation using USB flash drives instead of CD / Blue-ray discs
+<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blu-ray_discs">
+<title>Installation using USB flash drives instead of CD / Blu-ray discs
 </title>
 <para>Since the Squeeze release it is possible to directly copy the CD/DVD/BD <computeroutput>.iso</computeroutput> images to a USB flash drive (also known as "USB sticks") and boot from them. Simply execute a command like this, just adapting the file and device names to your needs: 
 </para>
 <para><computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX bs=1024</computeroutput> 
 </para>
-<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blue-ray disc. 
+<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blu-ray disc. 
 </para>
 </section>
 
@@ -745,7 +745,7 @@ deb http://ftp.skolelinux.org/skolelinux stretch local]]></screen>
 <section id="Installation--Custom_images">
 <title>Custom images
 </title>
-<para>Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">Debian Installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.  
+<para>Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">Debian Installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.  
 </para>
 <para>So all you need to do is to create a preseeding file with your answers (this is described in the appendix of the Debian Installer manual) and <ulink url="http://wiki.debian.org/DebianInstaller/Modify/CD">remaster the CD/DVD</ulink>. 
 </para>
@@ -1640,7 +1640,7 @@ apt-get update]]></screen>
 </title>
 <para>If you want to upgrade from one version to another (for example from Stretch 9.1+edu0 to 9.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps: 
 </para>
-<para>Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
+<para>Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
 </para><screen><![CDATA[mount /media/cdrom
 apt-cdrom add -m]]></screen>
 <para>To quote the apt-cdrom(8) man page: 
@@ -3816,7 +3816,7 @@ FIXME". <!-- <remark>status ignore</remark> -->
 <para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details. 
 </para></listitem>
 <listitem>
-<para>The DVD image was dropped, instead we added a USB flash drive / Blue-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD. 
+<para>The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD. 
 </para></listitem></itemizedlist>
 </section>
 
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
index 1fc4ba8..2ea71a4 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2014-09-23 19:20+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -83,7 +83,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -1424,7 +1424,7 @@ msgstr ""
 "CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr "USB-drev/blue-ray-disk ISO-aftryk for i386 og amd64"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1766,11 +1766,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"USB-drevet for flere arktitekturer / Blue-ray-diskaftrykket har som standard "
+"USB-drevet for flere arktitekturer / Blu-ray-diskaftrykket har som standard "
 "amd64-installgui på 64-bit x86-maskiner og installgui på 32-bit x86-maskiner."
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
@@ -2124,13 +2124,13 @@ msgstr ""
 "forbundet din bærbare til netværket og logget ind med din nye adgangskode)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "En kort bemærkning om USB-drev for flere arkitekturer / blue-ray-aftryk"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2228,7 +2228,7 @@ msgstr ""
 "gøres som standard."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr "Installation med brug af USB-drev i stedet for cd'er/blue-ray-diske"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2254,7 +2254,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Afhængig af hvilket aftryk du vælger, så vil USB-drevet opføre sig på samme "
 "måde som en cd eller blue-ray."
@@ -2435,7 +2435,7 @@ msgstr "Tilpassede aftryk"
 # engelsk fejl lille d i Debian
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5192,7 +5192,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Indsæt cd/dvd/blue-ray/USB-drev, monter den og brug kommandoen apt-cdrom:"
@@ -9171,10 +9171,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
-"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blue-ray-"
+"Dvd-aftrykket blev droppet, i stedet tilføjede vi et USB-drev/Blu-ray-"
 "diskaftryk, som opfører sig som dvd-aftrykket, men er for stort til at kunne "
 "være på en dvd."
 
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
index b6bff38..27321df 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-wheezy-manual.de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-05-04 15:40+0000\n"
 "Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -93,7 +93,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -106,7 +106,7 @@ msgstr ""
 "der komfortablen Weboberfläche von GOsa² oder einem anderen LDAP-Editor "
 "erfolgen kann. Eine Umgebung für das Booten über das Netzwerk mittels PXE "
 "steht zur Verfügung; damit können  nach der anfänglichen Installation des "
-"Hauptservers von CD, Blue-ray Disc oder USB-Stick alle anderen Rechner über "
+"Hauptservers von CD, Blu-ray Disc oder USB-Stick alle anderen Rechner über "
 "das Netz installiert werden - eingeschlossen mobile Arbeitsplatzrechner "
 "(also solche, die ausserhalb des Netzwerks benutzt werden können wie Laptops "
 "und Netbooks). Auch das Booten mittels PXE für Rechner ohne Festplatten - "
@@ -1456,8 +1456,8 @@ msgstr ""
 "edu-7.1+edu0-CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "USB-Stick / Blue-ray Disc ISO-Image für i386 und amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "USB-Stick / Blu-ray Disc ISO-Image für i386 und amd64"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -1783,11 +1783,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"Das Multiarch-USB-Stick / Blue-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
+"Das Multiarch-USB-Stick / Blu-ray-Disc-Image führt auf x86-64-Bit-Rechnern "
 "voreingestellt »amd64-installgui« und auf x86-32-Bit-Rechnern »installgui« "
 "aus."
 
@@ -2146,20 +2146,20 @@ msgstr ""
 "neuen Passwort angemeldet haben.)"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blue-ray "
+"Ein Hinweis zur Installation mittels Image »Multi-Arch-USB-Stick / Blu-ray "
 "Disc«"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"Wenn Sie von einem Multi-Arch-USB-Stick / Blue-ray-Disc-Image installieren, "
+"Wenn Sie von einem Multi-Arch-USB-Stick / Blu-ray-Disc-Image installieren, "
 "enthält die Datei <computeroutput>/etc/apt/sources.list</computeroutput> nur "
 "Quellen von der DVD. Wenn Sie eine Internetverbindung haben, wird dringend "
 "empfohlen, die folgenden Zeilen zu der Datei hinzuzufügen. Damit stellen Sie "
@@ -2251,8 +2251,8 @@ msgstr ""
 "voreingestellt durchgeführt."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installation per USB-Stick anstelle von CD / Blue-ray Disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installation per USB-Stick anstelle von CD / Blu-ray Disc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2277,9 +2277,9 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
-"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blue-ray "
+"Je nach gewähltem Image wird sich der USB-Stick wie eine CD oder Blu-ray "
 "Disc verhalten."
 
 #. type: Content of: <article><section><section><section><title>
@@ -2459,13 +2459,13 @@ msgstr "Angepasste Images"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Angepasste CDs, DVDs oder Blue-ray Discs zu erstellen ist recht einfach, da "
+"Angepasste CDs, DVDs oder Blu-ray Discs zu erstellen ist recht einfach, da "
 "das <ulink url=\"http://wiki.debian.org/DebianInstaller/\">Debian-"
 "Installationsprogramm</ulink> verwendet wird, das ein modulares Design und "
 "andere schöne Eigenschaften hat. Mit dem sogenannten <ulink url=\"http://"
@@ -5281,10 +5281,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-" Legen Sie die CD / DVD / Blue-ray Disc ein oder stecken Sie den USB-Stick "
+" Legen Sie die CD / DVD / Blu-ray Disc ein oder stecken Sie den USB-Stick "
 "ein, hängen Sie das Medium ein und benutzen Sie das Kommando apt-cdrom:"
 
 #. type: CDATA
@@ -9352,11 +9352,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "Das DVD-Image gibt es nicht mehr, stattdessen haben wir nun ein USB-Stick / "
-"Blue-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
+"Blu-ray-Disc-Image, das sich wie das DVD-Image verhält, allerdings zu groß "
 "ist, um auf eine DVD zu passen."
 
 #. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
index 79cdd75..05c14a7 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: release-manual\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2013-12-02 00:31-0600\n"
 "Last-Translator: Norman Garcia Aguilar <norman at riseup.net>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -86,7 +86,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -99,7 +99,7 @@ msgstr ""
 "para agregar usuarios y equipos vía GOsa², que una interfaz de usuario web "
 "cómoda, o cualquier otro editor de LDAP. Un ambiente de carga por red es "
 "preparado usando PXE, así, después de la instalación inicial del servidor "
-"principal desde CD, Blue-ray o unidad USB, las otras computadoras pueden ser "
+"principal desde CD, Blu-ray o unidad USB, las otras computadoras pueden ser "
 "instaladas a través de la red, esto incluye \"estaciones de trabajo "
 "itinerantes\" (pueden ser llevadas fuera de la red escolar, usualmente "
 "laptops o netbooks) y carga por PXE para computadoras sin disco duro como "
@@ -1462,9 +1462,9 @@ msgstr ""
 "CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr ""
-"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blue-ray "
+"Imagen ISO para arquitectura i386 y amd64 en dispositivos USB y Blu-ray "
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -1806,7 +1806,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2176,18 +2176,18 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
-msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blue-ray"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
+msgstr "Nota sobre instalaciones con imagen multiarquitectura USB / Blu-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
-"Después de instalar desde una imagen multiarquitectura USB / Blue-ray, "
+"Después de instalar desde una imagen multiarquitectura USB / Blu-ray, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> contendrá fuentes de "
 "esa imagen. Si tiene conexión a Internet, le sugerimos agregar las "
 "siguientes lineas para que las actualizaciones de seguridad disponible se "
@@ -2291,8 +2291,8 @@ msgstr ""
 "chroot combinado y por eso se hace de forma predeterminada."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Instalación utilizando memorias USB lugar de CD / Blue-ray"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Instalación utilizando memorias USB lugar de CD / Blu-ray"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2318,10 +2318,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Dependiendo de la imágen seleccionada, la unidad USB se comportará como un "
-"CD o Blue-ray."
+"CD o Blu-ray."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2505,13 +2505,13 @@ msgstr "Imágenes personalizadas"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Crear CDs, DVDs o Blue-rays personalizados es bastante fácil, ya que se "
+"Crear CDs, DVDs o Blu-rays personalizados es bastante fácil, ya que se "
 "utilizamos el  <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian "
 "installer</ulink>, el cual es de diseño modular, y posee otras "
 "características útiles.La <ulink url=\"http://wiki.debian.org/"
@@ -5136,10 +5136,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Inserte el CD/DVD/Disco Blueray/Dispositivo USB en la unidad, montelo y use "
+"Inserte el CD/DVD/Disco Blu-ray/Dispositivo USB en la unidad, montelo y use "
 "el comando apt-cdrom:"
 
 #. type: CDATA
@@ -8590,8 +8590,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
index 0d9df14..ca78928 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2014-09-23 07:24+0200\n"
 "Last-Translator: Cédric Boutillier <boutil at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -84,7 +84,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -1471,7 +1471,7 @@ msgstr ""
 "CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr ""
 "image pour clé USB ou disque Blu-ray pour les architectures i386 et amd64"
 
@@ -1818,7 +1818,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2188,14 +2188,14 @@ msgstr ""
 "authentifié avec le nouveau mot de passe)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "Une remarque sur les installations à partir de l'image multiarchitecture "
 "pour clé USB et disque Blu-ray"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2292,7 +2292,7 @@ msgstr ""
 "chroots combinés à chaque fois, c'est pour cela que cela est fait par défaut."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
 "Installation depuis une clé USB au lieu d'un CD ou d'un disque Blu-ray."
 
@@ -2319,7 +2319,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "En fonction de l'image que vous choisissez, la clé USB se comportera "
 "exactement comme un CD ou un disque Blu-ray."
@@ -2506,7 +2506,7 @@ msgstr "Images personnalisées"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5347,7 +5347,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Insérez le CD, DVD, disque Blu-ray ou périphérique USB, montez-le et "
@@ -9460,8 +9460,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "L'image DVD a été abandonnée, en faveur d'une image pour clé USB ou disque "
 "Blu-ray qui se comporte comme celle-ci mais qui est trop grande pour tenir "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
index 855f106..484d258 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-squeeze-manual\n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2014-06-26 19:17+0200\n"
 "Last-Translator: Claudio Carboncini <claudio.carboncini at gmail.com>\n"
 "Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -82,7 +82,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -95,8 +95,8 @@ msgstr ""
 "e macchine siano aggiunti usando GOsa², una comoda interfaccia Web, o da "
 "qualsiasi altro editor LDAP. Un ambiente di avvio dalla rete è disponibile "
 "utilizzando PXE, così che dopo l'installazione iniziale del server "
-"principale da CD, disco Blue-ray o penna USB, tutte le altre macchine "
-"possono essere installate via rete, comprese le \"postazioni mobili "
+"principale da CD, disco Blu-ray o penna USB, tutte le altre macchine possono "
+"essere installate via rete, comprese le \"postazioni mobili "
 "(roaming)\" (macchine che possono essere allontanate dalla rete della "
 "scuola, generalmente laptop o netbook), nonché l'avvio tramite PXE per "
 "macchine senza disco come i tradizionali thin-client."
@@ -1442,8 +1442,8 @@ msgstr ""
 "CD.iso|debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
-msgstr "Immagine per flash drive USB / Blue-ray disc per i386 e amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
+msgstr "Immagine per flash drive USB / Blu-ray disc per i386 e amd64"
 
 #. type: Content of: <article><section><section><section><para>
 #, fuzzy
@@ -1790,11 +1790,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"L'immagine multiarchitettura su flash drive USB / Blue-ray disc usa in modo "
+"L'immagine multiarchitettura su flash drive USB / Blu-ray disc usa in modo "
 "predefinito amd64-installgui su macchine x86 a 64-bit e installgui su "
 "macchine x86 a 32-bit."
 
@@ -2157,21 +2157,21 @@ msgstr ""
 "password)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"Una nota sull'installazione multi-architettura da flash drive USB / Blue-ray "
+"Una nota sull'installazione multi-architettura da flash drive USB / Blu-ray "
 "disc"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
 "can be installed:"
 msgstr ""
 "Se si installa da un'immarighegine multi-architettura su flash drive USB / "
-"Blue-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
+"Blu-ray disc, <computeroutput>/etc/apt/sources.list</computeroutput> "
 "conterrà come sorgente solo quella immagine. Se si ha un collegamento "
 "Internet si raccomanda di aggiungere le seguenti righe al file in modo da "
 "avere disponibili e installare gli aggiornamenti di sicurezza:"
@@ -2261,8 +2261,8 @@ msgstr ""
 "sempre un chroot combinato come da impostazione predefinita. "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
-msgstr "Installazione da flash drive USB al posto di CD /Blue-ray disc"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
+msgstr "Installazione da flash drive USB al posto di CD /Blu-ray disc"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2287,10 +2287,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "A seconda dell'immagine scelta, la penna USB si comporterà esattamente come "
-"un CD o Blue-ray disc."
+"un CD o Blu-ray disc."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2465,13 +2465,13 @@ msgstr "Immagini personalizzate"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
 "you to define answers to the questions normally asked."
 msgstr ""
-"Creare una versione personalizzata del CD, DVD o Blue-ray è possibile "
+"Creare una versione personalizzata del CD, DVD o Blu-ray è possibile "
 "abbastanza facilmente, usando l'<ulink url=\"http://wiki.debian.org/"
 "DebianInstaller/\">installatore Debian</ulink>, che ha un progetto modulare "
 "e altre interessanti caratteristiche. L'<ulink url=\"http://wiki.debian.org/"
@@ -5248,10 +5248,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Inserire il CD/ DVD / Blue-ray disc / drive flash USB, montarlo e usare il "
+"Inserire il CD/ DVD / Blu-ray disc / drive flash USB, montarlo e usare il "
 "comando apt-cdrom:"
 
 #. type: CDATA
@@ -9274,8 +9274,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "L'immagine del DVD è stata abbandonata, invece è stata aggiunta un'immagine "
 "per flash drive USB / Blu-ray, che si comporta come l'immagine del DVD, ma "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
index 764bb2c..ed96b68 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
@@ -22,7 +22,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-06-08 08:35+0000\n"
 "Last-Translator: Ingrid Yrvin <iyrvin at hagan.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/"
@@ -96,7 +96,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -108,7 +108,7 @@ msgstr ""
 "Tjeneren vil vente på at brukere og maskiner blir lagt til via GOsa², og få "
 "et komfortabelt Web-brukergrensesnitt, eller foreta andre LDAP-redigeringer. "
 "Et nettoppstartsmiljø er utarbeidet ved hjelp av PXE slik at, etter første "
-"installasjon av hovedtjener fra en CD, Blue-ray-plate eller USB-minne, vil "
+"installasjon av hovedtjener fra en CD, Blu-ray-plate eller USB-minne, vil "
 "alle andre maskiner bli installert via nettverket.  Dette gjelder også  "
 "vandrende (mobile) arbeidsstasjoner som periodevis forlater det lokale "
 "skolenettverket. Dette kan være bærbare datamaskiner eller nettbrett, men "
@@ -1431,7 +1431,7 @@ msgstr ""
 "edu-7.1+edu0-CD.iso ./debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr "USB-minnekort/Blu-ray-disk ISO-bilde for i386 og AMD64"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1760,11 +1760,11 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
-"USB Fler-arkitektur flash-disk/Blue-ray-disktyper er standard for bruk av "
+"USB Fler-arkitektur flash-disk/Blu-ray-disktyper er standard for bruk av "
 "AMD64-installgui på 64-bit x86 maskiner, og installgui på 32-bit x86 "
 "maskiner."
 
@@ -2108,14 +2108,14 @@ msgstr ""
 "knyttet din bærbare til nettverket, og logget inn med det nye passordet)."
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
-"En merknad om USB-minnepinne / Blue-ray-installasjon med flerarkitektur-"
+"En merknad om USB-minnepinne / Blu-ray-installasjon med flerarkitektur-"
 "diskbilder"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2212,9 +2212,9 @@ msgstr ""
 "som standard. "
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
-"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blue-ray-plate"
+"Installasjon ved bruk av USB-minnepinne i stedet for CD eller Blu-ray-plate"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
@@ -2239,10 +2239,10 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Avhengig av hvilket bilde du velger, vil USB minnepinnen oppføre seg som en "
-"CD eller Blue-ray-disk."
+"CD eller Blu-ray-disk."
 
 #. type: Content of: <article><section><section><section><title>
 msgid "Installation over the network (PXE) and booting diskless clients"
@@ -2415,7 +2415,7 @@ msgstr "Tilpassede bilder"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5161,10 +5161,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
-"Sett inn en CD / DVD / Blue-ray-plate/USB-minnepenn, monter den, og bruk apt-"
+"Sett inn en CD / DVD / Blu-ray-plate/USB-minnepenn, monter den, og bruk apt-"
 "cdrom kommandoen:"
 
 #. type: CDATA
@@ -9116,10 +9116,10 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
-"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blue-"
+"DVD-avtrykket ble droppet, i stedet har vi lagt til en USB-minnepinne / Blu-"
 "ray-plate, som oppfører seg som et DVD-avtrykk, men er for stort til å få "
 "plass på en DVD."
 
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
index 14d485e..f9d1d69 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: 2015-05-05 23:36+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@ -81,7 +81,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -1474,7 +1474,7 @@ msgstr ""
 "edu-7.1+edu0-CD.iso ./debian-edu-7.1+edu0-CD.iso </computeroutput>"
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr "USB-stick- / blu-ray-ISO-image voor i386 en amd64"
 
 #. type: Content of: <article><section><section><section><para>
@@ -1817,7 +1817,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -2189,14 +2189,14 @@ msgstr ""
 "aansluit op het schoolnetwerk en u daar aanmeldt met uw nieuwe wachtwoord.)"
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 "Een noot bij installaties met het multi-archimage voor USB-stick / blu-"
 "rayschijf"
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -2297,7 +2297,7 @@ msgstr ""
 "de normale werkwijze."
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr "Installaties vanaf een USB-stick en niet vanaf een cd / blu-rayschijf"
 
 #. type: Content of: <article><section><section><section><para>
@@ -2324,7 +2324,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 "Afhankelijk van het gebruikte image, zal de USB-stick zich gedragen als een "
 "cd of een blu-rayschijf."
@@ -2512,7 +2512,7 @@ msgstr "Images op maat"
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -5391,7 +5391,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 "Plaats de cd / dvd / blu-rayschijf / USB-stick in het station, koppel ze aan "
@@ -9546,8 +9546,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 "Er is geen dvd-image meer. In de plaats kwam een image voor USB-stick / blu-"
 "rayschijf, dat zich als het vroegere dvd-image gedraagt, maar dat te groot "
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
index d064d84..daccc67 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-05-23 22:17+0200\n"
+"POT-Creation-Date: 2016-06-07 10:15+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -71,7 +71,7 @@ msgid ""
 "\"Architecture\">details of the architecture of this setup</link>), just "
 "waiting for users and machines being added via GOsa², a comfortable Web-UI, "
 "or any other LDAP editor. A netbooting environment is prepared using PXE, so "
-"after initial installation of the main server from CD, Blue-ray disc or USB "
+"after initial installation of the main server from CD, Blu-ray disc or USB "
 "flash drive all other machines can be installed via the network, this "
 "includes \"roaming workstations\" (ones that can be taken away from the "
 "school network, usually laptops or netbooks) as well as PXE booting for "
@@ -1063,7 +1063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "USB flash drive / Blue-ray disc ISO image for i386 and amd64"
+msgid "USB flash drive / Blu-ray disc ISO image for i386 and amd64"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1319,7 +1319,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The multi-architecture USB flash drive / Blue-ray disc image defaults to "
+"The multi-architecture USB flash drive / Blu-ray disc image defaults to "
 "using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 "
 "machines."
 msgstr ""
@@ -1568,12 +1568,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><title>
-msgid "A note on multi-arch USB flash drive / Blue-ray disc image installs"
+msgid "A note on multi-arch USB flash drive / Blu-ray disc image installs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><section><para>
 msgid ""
-"After you install from the multi-arch USB flash drive / Blue-ray disc image, "
+"After you install from the multi-arch USB flash drive / Blu-ray disc image, "
 "<computeroutput>/etc/apt/sources.list</computeroutput> will only contain "
 "sources from that image. If you have an Internet connection, we strongly "
 "suggest adding the following lines to it so that available security updates "
@@ -1639,7 +1639,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
-msgid "Installation using USB flash drives instead of CD / Blue-ray discs"
+msgid "Installation using USB flash drives instead of CD / Blu-ray discs"
 msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
@@ -1659,7 +1659,7 @@ msgstr ""
 #. type: Content of: <article><section><section><section><para>
 msgid ""
 "Depending on which image you choose, the USB flash drive will behave just "
-"like a CD or Blue-ray disc."
+"like a CD or Blu-ray disc."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
@@ -1785,7 +1785,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><para>
 msgid ""
-"Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use "
+"Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use "
 "the <ulink url=\"http://wiki.debian.org/DebianInstaller/\">debian installer</"
 "ulink>, which has a modular design and other nice features. <ulink url="
 "\"http://wiki.debian.org/DebianInstaller/Preseed\">Preseeding</ulink> allows "
@@ -3861,7 +3861,7 @@ msgstr ""
 
 #. type: Content of: <article><section><section><para>
 msgid ""
-"Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the "
+"Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the "
 "apt-cdrom command:"
 msgstr ""
 
@@ -6766,8 +6766,8 @@ msgstr ""
 
 #. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
 msgid ""
-"The DVD image was dropped, instead we added a USB flash drive / Blue-ray "
-"disc image, which behaves like the DVD image, but is too big to fit on a DVD."
+"The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc "
+"image, which behaves like the DVD image, but is too big to fit on a DVD."
 msgstr ""
 
 #. type: Content of: <article><section><section><section><title>
diff --git a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
index def6cda..4fcec62 100644
--- a/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
+++ b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
@@ -19,7 +19,7 @@
 </title>
 <para>Debian Edu aka Skolelinux is a Linux distribution based on Debian providing an out-of-the box environment of a completely configured school network.   
 </para>
-<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, Blue-ray disc or USB flash drive all other machines can be install [...]
+<para>Immediatly after installation a school server running all services needed for a school network is set up (see the next chapter <link linkend="Architecture">details of the architecture of this setup</link>), just waiting for users and machines being added via GOsa², a comfortable Web-UI, or any other LDAP editor. A netbooting environment is prepared using PXE, so after initial installation of the main server from CD, Blu-ray disc or USB flash drive all other machines can be installe [...]
 </para>
 <para>Several educational applications like celestia, drgeo, gcompris, kalzium, kgeography, solfege and scratch are included in the default desktop setup, which can be extended easily and almost endlessly via the Debian universe. 
 </para>
@@ -443,8 +443,8 @@
 </para></listitem></itemizedlist>
 </section>
 
-<section id="Installation--USB_flash_drive_.2BAC8_Blue-ray_disc_ISO_image_for_i386_and_amd64">
-<title>USB flash drive / Blue-ray disc ISO image for i386 and amd64
+<section id="Installation--USB_flash_drive_.2BAC8_Blu-ray_disc_ISO_image_for_i386_and_amd64">
+<title>USB flash drive / Blu-ray disc ISO image for i386 and amd64
 </title>
 <para>The multi-architecture ISO image is 5.2 GiB large and can be used for installation of amd64 and i386 machines. Please note that internet access during installation is needed. Like the others it can be downloaded over FTP, HTTP or rsync via: 
 </para>
@@ -544,7 +544,7 @@
 </para>
 <itemizedlist>
 <listitem>
-<para>The multi-architecture USB flash drive / Blue-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
+<para>The multi-architecture USB flash drive / Blu-ray disc image defaults to using amd64-installgui on 64-bit x86 machines, and installgui on 32-bit x86 machines. 
 </para></listitem>
 <listitem>
 <para>If you want to boot the amd64 text mode with the multi-architecture image, that would be <computeroutput>amd64-install</computeroutput>. 
@@ -663,10 +663,10 @@
 </para>
 </section>
 
-<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blue-ray_disc_image_installs">
-<title>A note on multi-arch USB flash drive / Blue-ray disc image installs
+<section id="Installation--A_note_on_multi-arch_USB_flash_drive_.2BAC8_Blu-ray_disc_image_installs">
+<title>A note on multi-arch USB flash drive / Blu-ray disc image installs
 </title>
-<para>After you install from the multi-arch USB flash drive / Blue-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
+<para>After you install from the multi-arch USB flash drive / Blu-ray disc image, <computeroutput>/etc/apt/sources.list</computeroutput> will only contain sources from that image. If you have an Internet connection, we strongly suggest adding the following lines to it so that available security updates can be installed: 
 </para><screen><![CDATA[deb http://ftp.debian.org/debian/ wheezy main 
 deb http://security.debian.org/ wheezy/updates main 
 deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
@@ -693,14 +693,14 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 </section>
 </section>
 
-<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blue-ray_discs">
-<title>Installation using USB flash drives instead of CD / Blue-ray discs
+<section id="Installation--Installation_using_USB_flash_drives_instead_of_CD_.2BAC8_Blu-ray_discs">
+<title>Installation using USB flash drives instead of CD / Blu-ray discs
 </title>
 <para>Since the Squeeze release it is possible to directly copy the CD/DVD/BD <computeroutput>.iso</computeroutput> images to a USB flash drive (also known as "USB sticks") and boot from them. Simply execute a command like this, just adapting the file and device names to your needs: 
 </para>
 <para><computeroutput>sudo dd if=debian-edu-amd64-i386-XXX.iso of=/dev/sdX bs=1024</computeroutput> 
 </para>
-<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blue-ray disc. 
+<para>Depending on which image you choose, the USB flash drive will behave just like a CD or Blu-ray disc. 
 </para>
 </section>
 
@@ -743,7 +743,7 @@ deb http://ftp.skolelinux.org/skolelinux wheezy local]]></screen>
 <section id="Installation--Custom_images">
 <title>Custom images
 </title>
-<para>Creating custom CDs, DVDs or Blue-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">debian installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.  
+<para>Creating custom CDs, DVDs or Blu-ray discs can be quite easy since we use the <ulink url="http://wiki.debian.org/DebianInstaller/">debian installer</ulink>, which has a modular design and other nice features. <ulink url="http://wiki.debian.org/DebianInstaller/Preseed">Preseeding</ulink> allows you to define answers to the questions normally asked.  
 </para>
 <para>So all you need to do is to create a preseeding file with your answers (this is described in the appendix of the debian installer manual) and <ulink url="http://wiki.debian.org/DebianInstaller/Modify/CD">remaster the CD/DVD</ulink>. 
 </para>
@@ -1611,7 +1611,7 @@ apt-get update]]></screen>
 </title>
 <para>If you want to upgrade from one version to another (for example from Wheezy 7.1+edu0 to 7.3+edu1) but you do not have Internet connectivity, only physical media, follow these steps: 
 </para>
-<para>Insert the CD / DVD / Blue-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
+<para>Insert the CD / DVD / Blu-ray disc / USB flash drive, mount it and use the apt-cdrom command: 
 </para><screen><![CDATA[mount /media/cdrom
 apt-cdrom add -m]]></screen>
 <para>To quote the apt-cdrom(8) man page: 
@@ -3058,7 +3058,7 @@ FIXMEs within the text. If you happen to know (a bit of) what needs to be explai
 <para>New version of debian-installer from Debian Wheezy, see <ulink url="http://www.debian.org/releases/wheezy/installmanual">installation manual</ulink> for more details. 
 </para></listitem>
 <listitem>
-<para>The DVD image was dropped, instead we added a USB flash drive / Blue-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD. 
+<para>The DVD image was dropped, instead we added a USB flash drive / Blu-ray disc image, which behaves like the DVD image, but is too big to fit on a DVD. 
 </para></listitem></itemizedlist>
 </section>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git

More information about the debian-edu-commits mailing list