[debian-edu-commits] debian-edu/ 01/01: Update Debian Edu Buster manual from the wiki.
Holger Levsen
holger at layer-acht.org
Sun Apr 8 11:36:31 BST 2018
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 f53b5e8155facfd59523f042dd63be8feb26105a
Author: Holger Levsen <holger at layer-acht.org>
Date: Sun Apr 8 10:36:25 2018 +0000
Update Debian Edu Buster manual from the wiki.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
.../debian-edu-buster-manual.da.po | 55 ++++++++++-----
.../debian-edu-buster-manual.de.po | 61 +++++++++++------
.../debian-edu-buster-manual.es.po | 58 ++++++++++------
.../debian-edu-buster-manual.fr.po | 58 ++++++++++------
.../debian-edu-buster-manual.it.po | 55 ++++++++++-----
.../debian-edu-buster-manual.ja.po | 55 ++++++++++-----
.../debian-edu-buster-manual.nb.po | 55 ++++++++++-----
.../debian-edu-buster-manual.nl.po | 61 +++++++++++------
.../debian-edu-buster-manual.pl.po | 55 ++++++++++-----
.../debian-edu-buster/debian-edu-buster-manual.pot | 55 ++++++++++-----
.../debian-edu-buster/debian-edu-buster-manual.xml | 17 +++--
.../debian-edu-buster-manual.zh.po | 78 ++++++++++++++--------
12 files changed, 444 insertions(+), 219 deletions(-)
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.da.po b/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
index b39a336..6067860 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.da.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2016-10-06 19:20+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -1841,25 +1841,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "Installationsprocessen"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1871,59 +1872,77 @@ msgstr ""
"Formålet med forskellige profiler er forklaret i kapitlet <link linkend="
"\"Architecture\">netværksarkitektur</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.de.po b/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
index 120acec..7472e3d 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.de.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch-manual.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2018-02-02 13:34+0100\n"
"Last-Translator: Wolfgang Schweer <wschweer at arcor.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1749,25 +1749,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "Der Installationprozess"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1779,59 +1780,77 @@ msgstr ""
"Die Bedeutung der verschiedenen Profile wird im Kapitel <link linkend="
"\"Architecture\">Netzwerk-Architektur</link> erläutert."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
@@ -11091,7 +11110,8 @@ msgstr ""
#~ msgstr ""
#~ "# Zunächst einen geänderten Profilnamen anpassen:\n"
#~ "sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
-#~ "# Dann ist es am besten, einen neuen vorgegebenen Spiegelserver zu benutzen:\n"
+#~ "# Dann ist es am besten, einen neuen vorgegebenen Spiegelserver zu "
+#~ "benutzen:\n"
#~ "sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
#~ "# Zum Schluss stretch durch buster ersetzen.\n"
#~ "sed -i 's/stretch/buster/g' /etc/apt/sources.list\n"
@@ -11109,7 +11129,8 @@ msgstr ""
#~ msgstr ""
#~ "$ sudo apt-get update\n"
#~ " $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
-#~ " # Nach der Installation eine graphische Arbeitsumgebung für den Erstbenutzer starten\n"
+#~ " # Nach der Installation eine graphische Arbeitsumgebung für den "
+#~ "Erstbenutzer starten\n"
#~ " $ startx"
#~ msgid "Flash"
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.es.po b/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
index 7f22650..e1c1c8f 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.es.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+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"
@@ -1836,25 +1836,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "El proceso de instalación"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1866,59 +1867,77 @@ msgstr ""
"El propósito de los diferentes perfiles es explicado en el capítulo <link "
"linkend=\"Architecture\">Arquitecturas de red</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
@@ -9851,7 +9870,8 @@ msgstr ""
#~ msgstr ""
#~ "$ sudo apt-get update\n"
#~ " $ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
-#~ " # después de la instalación, inicie una sesión en modo gráfico para el primer usuario\n"
+#~ " # después de la instalación, inicie una sesión en modo gráfico para el "
+#~ "primer usuario\n"
#~ " $ startx"
#~ msgid "Flash"
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po b/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
index a6a19f5..9a77ce6 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+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"
@@ -1895,25 +1895,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "Le processus d'installation"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1925,59 +1926,77 @@ msgstr ""
"La signification des différents profils est expliquée dans le chapitre <link "
"linkend=\"Architecture\">architecture réseau</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
@@ -12113,7 +12132,8 @@ msgstr ""
#~ msgstr ""
#~ "$ sudo apt-get update\n"
#~ "$ sudo apt-get install gnome-session gnome-terminal firefox xorg\n"
-#~ "# après l'installation, démarrer une session graphique pour le premier utilisateur\n"
+#~ "# après l'installation, démarrer une session graphique pour le premier "
+#~ "utilisateur\n"
#~ "$ startx"
#~ msgid "Flash"
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.it.po b/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
index 2034210..7c42ec0 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-wheezy-manual\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2018-01-20 18:05+0100\n"
"Last-Translator: claudio <claudio.carboncini at gmail.com>\n"
"Language-Team: Italian <debian-l10n-italian at list.debian.org>\n"
@@ -1754,25 +1754,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "Il processo d'installazione"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1784,59 +1785,77 @@ msgstr ""
"Lo scopo dei diversi profili è spiegato nella sezione sulla <link linkend="
"\"Architecture\">architettura della rete</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po b/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
index c6868bb..cfe89fb 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.ja.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-stretch\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2017-10-09 05:36+0900\n"
"Last-Translator: victory <victory.deb at gmail.com>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -1700,25 +1700,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "インストールプロセス"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1730,59 +1731,77 @@ msgstr ""
"様々なプロファイルの目的については<link linkend=\"Architecture\">ネットワーク"
"構成</link>の章で説明しています。"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po b/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
index 8c558fb..2a50a09 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.nb.po
@@ -21,7 +21,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2018-04-02 21:38+0000\n"
"Last-Translator: Allan Nordhøy <epost at anotheragency.no>\n"
"Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/debian-"
@@ -1715,25 +1715,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "Installasjonsprosessen"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1745,59 +1746,77 @@ msgstr ""
"Egenskapene til de ulike profilene forklares i kapittelet <link url="
"\"Architecture\">nettverksarkitektur</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po b/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
index f80cceb..9339032 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.nl.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-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: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2018-03-08 21:04+0100\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"
@@ -1770,25 +1770,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "Het installatieproces"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1800,59 +1801,77 @@ msgstr ""
"De betekenis van de verschillende profielen werd verduidelijkt in het "
"hoofdstuk <link linkend=\"Architecture\">Architectuur van het netwerk</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
@@ -11293,7 +11312,8 @@ msgstr ""
#~ msgstr ""
#~ "# Vooreerst de aanpassing aan de gewijzigde profielnaam doorvoeren:\n"
#~ "sed -i 's/Thin-Client-Server/LTSP-Server/' /etc/debian-edu/config\n"
-#~ "# Vervolgens is het best om de nieuwe standaard spiegelserver te gebruiken:\n"
+#~ "# Vervolgens is het best om de nieuwe standaard spiegelserver te "
+#~ "gebruiken:\n"
#~ "sed -i 's/http.debian.net/deb.debian.org/g' /etc/apt/sources.list\n"
#~ "# Tenslotte moet u stretch door buster vervangen.\n"
#~ "sed -i 's/stretch/buster/g' /etc/apt/sources.list\n"
@@ -11311,7 +11331,8 @@ msgstr ""
#~ msgstr ""
#~ "$ sudo apt-get update\n"
#~ " $ sudo apt-get install gnome-session gnome-terminal firefox-esr xorg\n"
-#~ " # na de installatie een grafische sessie voor de eerste gebruiker opstarten \n"
+#~ " # na de installatie een grafische sessie voor de eerste gebruiker "
+#~ "opstarten \n"
#~ " $ startx"
#~ msgid "Flash"
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po b/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
index abb63bf..99f948d 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Polish (Debian Edu Documentation)\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2017-06-05 08:57+0000\n"
"Last-Translator: Stanisław Krukowski <stdf021 at riseup.net>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/debian-edu-"
@@ -1822,25 +1822,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1852,59 +1853,77 @@ msgstr ""
"Cele różnych profili są wyjaśnione w rozdziale <link linkend=\"Architecture"
"\">architektura sieciowa</link>."
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.pot b/documentation/debian-edu-buster/debian-edu-buster-manual.pot
index a298e2d..e3b3375 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.pot
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-04-07 20:54+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+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"
@@ -1229,83 +1229,102 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Connect all components like shown in the <link linkend=\"Architecture--"
"Network\">architecture</link> chapter."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.xml b/documentation/debian-edu-buster/debian-edu-buster-manual.xml
index afd8eae..189380e 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.xml
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.xml
@@ -541,10 +541,9 @@ FIXME: explain how here or add link to somewhere else.
<section id="Installation--Main_server_installation_scenarios">
<title>Main server installation scenarios
-</title>
-<itemizedlist>
+</title><orderedlist numeration="loweralpha">
<listitem>
-<para>Typical home network with Internet access through a router providing DHCP:
+<para>Typical school or home network with Internet access through a router providing DHCP:
</para>
<itemizedlist>
<listitem>
@@ -560,6 +559,16 @@ FIXME: explain how here or add link to somewhere else.
<para>The main server should have Internet connection once bootet the first time in the correct environment.
</para></listitem></itemizedlist></listitem>
<listitem>
+<para>Typical school or institution network, similar to the one above, but with proxy use required.
+</para>
+<itemizedlist>
+<listitem>
+<para>Add 'debian-edu-expert' to the kernel command line; see further below for details how this is done.
+</para></listitem>
+<listitem>
+<para>Some additional questions must be answered, the proxy server related one included.
+</para></listitem></itemizedlist></listitem>
+<listitem>
<para>Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP server) and Internet access:
</para>
<itemizedlist>
@@ -594,7 +603,7 @@ FIXME: explain how here or add link to somewhere else.
</para></listitem>
<listitem>
<para>Update the system once bootet the first time in the correct environment with Internet access.
-</para></listitem></itemizedlist></listitem></itemizedlist>
+</para></listitem></itemizedlist></listitem></orderedlist>
</section>
<section id="Installation--Installation_types_and_options">
diff --git a/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po b/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
index 2721a60..7e6453a 100644
--- a/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
+++ b/documentation/debian-edu-buster/debian-edu-buster-manual.zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debian-edu-doc\n"
-"POT-Creation-Date: 2018-03-08 23:19+0000\n"
+"POT-Creation-Date: 2018-04-08 10:35+0000\n"
"PO-Revision-Date: 2018-04-08 00:35+0000\n"
"Last-Translator: Ma Yong <debuser at yeah.net>\n"
"Language-Team: Chinese <https://hosted.weblate.org/projects/debian-edu-"
@@ -1659,25 +1659,26 @@ msgstr ""
msgid "Main server installation scenarios"
msgstr "安装过程"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
-"Typical home network with Internet access through a router providing DHCP:"
+"Typical school or home network with Internet access through a router "
+"providing DHCP:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Installation of a main server is possible, but after reboot there will be no "
"internet access (due to primary network interface IP 10.0.2.2/8)."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"See the <link linkend=\"Requirements--Internet_router\">Internet router</"
"link> chapter for details how to set up a gateway if it is not possible to "
"configure an existing one as needed."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
#, fuzzy
#| msgid ""
#| "The purpose of the different profiles is explained in the <link linkend="
@@ -1689,59 +1690,77 @@ msgstr ""
"不同profile的目的在 <link linkend=\"Architecture\">network architecture</"
"link> 章中解释。"
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"The main server should have Internet connection once bootet the first time "
"in the correct environment."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
+msgid ""
+"Typical school or institution network, similar to the one above, but with "
+"proxy use required."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Add 'debian-edu-expert' to the kernel command line; see further below for "
+"details how this is done."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
+msgid ""
+"Some additional questions must be answered, the proxy server related one "
+"included."
+msgstr ""
+
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid ""
"Network with router/gateway IP 10.0.0.1/8 (which does not provide a DHCP "
"server) and Internet access:"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"As soon as the automatic network configuration fails (due to missing DHCP), "
"choose manual network configuration"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.2.2/8 as host IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 10.0.0.1 as gateway IP"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><itemizedlist><listitem><para>
msgid "Enter 8.8.8.8 as nameserver IP unless you know better"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "The main server should just work after the first boot"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><para>
msgid "Offline (no Internet connection):"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Use the USB ISO image"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid "Make sure all (real/virtual) network cables are unplugged"
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Choose 'Do not configure the network at this time' (after DHCP failed to "
"configure the network and you pressed 'Continue')."
msgstr ""
-#. type: Content of: <article><section><section><section><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <article><section><section><section><orderedlist><listitem><itemizedlist><listitem><para>
msgid ""
"Update the system once bootet the first time in the correct environment with "
"Internet access."
@@ -5457,8 +5476,9 @@ msgid ""
"and as a special case, checking for the LDM ssh connection command to work "
"with LTSP thin clients."
msgstr ""
-"当有人在使用客户端的时候其不应被关闭。这由检查输出来自<computeroutput>谁</computeroutput>来确保,而作为特殊的情况,对同 "
-"LTSP 瘦客户端工作的 LDM ssh 连接命令进行检查。"
+"当有人在使用客户端的时候其不应被关闭。这由检查输出来自<computeroutput>谁</"
+"computeroutput>来确保,而作为特殊的情况,对同 LTSP 瘦客户端工作的 LDM ssh 连"
+"接命令进行检查。"
#. type: Content of: <article><section><section><itemizedlist><listitem><para>
msgid ""
@@ -5502,10 +5522,10 @@ msgid ""
"space; or create a script <computeroutput>/etc/shutdown-at-night/clients-"
"generator</computeroutput> to generate the list of clients on the fly."
msgstr ""
-"启用服务器上的 wake-on-lan,添加客户端到 <computeroutput>/etc/shutdown-at-night/"
-"clients</computeroutput>,每一行一个,第一个是 IP 地址,随后是 MAC 地址(网卡地址),分隔以空格;"
-"或者创建一个即时生成客户端列表的脚本 <computeroutput>/etc/shutdown-at-night/clients-"
-"generator</computeroutput>。"
+"启用服务器上的 wake-on-lan,添加客户端到 <computeroutput>/etc/shutdown-at-"
+"night/clients</computeroutput>,每一行一个,第一个是 IP 地址,随后是 MAC 地址"
+"(网卡地址),分隔以空格;或者创建一个即时生成客户端列表的脚本 "
+"<computeroutput>/etc/shutdown-at-night/clients-generator</computeroutput>。"
#. type: Content of: <article><section><section><section><para>
msgid ""
@@ -5534,8 +5554,8 @@ msgid ""
"clients is this script using the netgroup tool from the <computeroutput>ng-"
"utils</computeroutput> package:"
msgstr ""
-"如果用 netgroup 来激活客户端 shutdown-at-night 的另一种选择是这一脚本使用来自 <computeroutput>ng-"
-"utils</computeroutput> 软件包的 netgroup 工具:"
+"如果用 netgroup 来激活客户端 shutdown-at-night 的另一种选择是这一脚本使用来"
+"自 <computeroutput>ng-utils</computeroutput> 软件包的 netgroup 工具:"
#. type: CDATA
#, no-wrap
@@ -8059,9 +8079,9 @@ msgid ""
"from your local one, create or edit <computeroutput>~/.ssh/config</"
"computeroutput>. Add a config block like this:"
msgstr ""
-"要提交你的翻译你需要是 Alioth 项目 <computeroutput>debian-edu</computeroutput> 的成员。如果你的 "
-"Alioth 用户名不同于你的本地的,创建或编辑 <computeroutput>~/.ssh/"
-"config</computeroutput>。添加一个配置块例如这个:"
+"要提交你的翻译你需要是 Alioth 项目 <computeroutput>debian-edu</"
+"computeroutput> 的成员。如果你的 Alioth 用户名不同于你的本地的,创建或编辑 "
+"<computeroutput>~/.ssh/config</computeroutput>。添加一个配置块例如这个:"
#. type: CDATA
#, no-wrap
--
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